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

Merge pull request #807 from mrbeam/vanilla_devel

Browse source 
made dwelling (G4 P...) commands more tolerant, because GRBL needs floats as P value.
This commit is contained in:
Gina Häußge 2015-03-10 19:32:38 +01:00
commit 46b48cb7c4
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

@ -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