From 16e63824f1a5ccc587724c0197be7b5367783486 Mon Sep 17 00:00:00 2001 From: Teja Date: Tue, 10 Mar 2015 18:56:57 +0100 Subject: [PATCH] made dwelling (G4 P...) commands more tolerant. Conflicts: src/octoprint/util/comm.py --- src/octoprint/util/comm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index 77066212..f5a4c742 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -1548,10 +1548,10 @@ class MachineCom(object): _timeout = 0 if p_idx != -1: # dwell time is specified in milliseconds - _timeout = int(cmd[p_idx+1:]) / 1000.0 + _timeout = float(cmd[p_idx+1:]) / 1000.0 elif s_idx != -1: # dwell time is specified in seconds - _timeout = int(cmd[s_idx+1:]) + _timeout = float(cmd[s_idx+1:]) self._timeout = get_new_timeout("communication") + _timeout self._blocking_command = True return cmd