From ee73e51d036ba284164fb91e1692a876fdb56ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 4 Mar 2015 23:04:45 +0100 Subject: [PATCH] Also set heating flag when sending heatup GCODE through comm layer --- src/octoprint/util/comm.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/octoprint/util/comm.py b/src/octoprint/util/comm.py index d073dccd..bfe0d66c 100644 --- a/src/octoprint/util/comm.py +++ b/src/octoprint/util/comm.py @@ -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):