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

Fix temperature autoreport after external reset

Browse source 
We didn't reset the capability flag and also didn't resend M155. Now we
do at least the latter if we detected that the printer supports
temperature auto reporting earlier.
This commit is contained in:
Gina Häußge 2017-10-30 12:59:43 +01:00
parent 02aad445aa
commit caaaa2e4e9
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -954,7 +954,7 @@ class MachineCom(object):
self._recordFilePosition()
self._callback.on_comm_print_job_cancelled()
def cancelPrint(self, firmware_error=None):
def cancelPrint(self, firmware_error=None, disable_log_position=False):
if not self.isOperational():
return
@ -987,7 +987,7 @@ class MachineCom(object):
except:
pass
if self._log_position_on_cancel:
if self._log_position_on_cancel and not disable_log_position:
self.sendCommand("M400", on_sent=_on_M400_sent)
else:
self._cancel_preparation_done()
@ -1582,7 +1582,7 @@ class MachineCom(object):
"Resetting line numbers to be on the safe side"
self._log(message)
self._logger.warn(message)
self.resetLineNumbers()
self._onExternalReset()
else:
verb = "streaming to SD" if self.isStreaming() else "printing"
@ -1590,7 +1590,8 @@ class MachineCom(object):
"Aborting job since printer lost state.".format(verb)
self._log(message)
self._logger.warn(message)
self.cancelPrint()
self.cancelPrint(disable_log_position=True)
self._onExternalReset()
eventManager().fire(Events.PRINTER_RESET)
@ -1804,6 +1805,12 @@ class MachineCom(object):
eventManager().fire(Events.CONNECTED, payload)
self.sendGcodeScript("afterPrinterConnected", replacements=dict(event=payload))
def _onExternalReset(self):
self.resetLineNumbers()
if self._temperature_autoreporting:
self._set_autoreport_temperature()
def _getTemperatureTimerInterval(self):
busy_default = 4.0
target_default = 2.0