pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mrbeam-stable' into mrbeam

Browse source
This commit is contained in:
Teja 2015-04-01 16:37:54 +02:00
commit f11a10b05f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/util/comm.py
View file

@ -1410,10 +1410,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 = getNewTimeout("communication") + _timeout
return cmd