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

Also set heating flag when sending heatup GCODE through comm layer

Browse source
This commit is contained in:
Gina Häußge 2015-03-04 23:04:45 +01:00
parent 923fe98a99
commit ee73e51d03
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -844,7 +844,6 @@ class MachineCom(object):
if line.strip().startswith("ok"):
self._clear_to_send.set()
self._blocking_command = False
self._heating = False
##~~ Temperature processing
if ' T:' in line or line.startswith('T:') or ' T0:' in line or line.startswith('T0:'):
@ -887,6 +886,7 @@ class MachineCom(object):
if 'ok' in line and self._heatupWaitStartTime:
self._heatupWaitTimeLost = self._heatupWaitTimeLost + (time.time() - self._heatupWaitStartTime)
self._heatupWaitStartTime = None
self._heating = False
##~~ SD Card handling
elif 'SD init fail' in line or 'volume.init failed' in line or 'openRoot failed' in line:
@ -1501,11 +1501,13 @@ class MachineCom(object):
def _gcode_M109(self, cmd):
self._heatupWaitStartTime = time.time()
self._blocking_command = True
self._heating = True
return self._gcode_M104(cmd)
def _gcode_M190(self, cmd):
self._heatupWaitStartTime = time.time()
self._blocking_command = True
self._heating = True
return self._gcode_M140(cmd)
def _gcode_M110(self, cmd):