3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

klippy: stats() method must check that mcu and toolhead classes exist 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2016-12-01 16:51:20 -05:00
parent 71b4923208
commit 00b40b720f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
klippy/klippy.py
View File

@ -99,8 +99,10 @@ class Printer:
out = [] out = []
out.append(self.gcode.stats(eventtime)) out.append(self.gcode.stats(eventtime))
toolhead = self.objects.get('toolhead') toolhead = self.objects.get('toolhead')
out.append(toolhead.stats(eventtime)) if toolhead is not None:
out.append(self.mcu.stats(eventtime)) out.append(toolhead.stats(eventtime))
if self.mcu is not None:
out.append(self.mcu.stats(eventtime))
logging.info("Stats %.0f: %s" % (eventtime, ' '.join(out))) logging.info("Stats %.0f: %s" % (eventtime, ' '.join(out)))
return eventtime + 1. return eventtime + 1.
def load_config(self): def load_config(self):
@ -186,9 +188,12 @@ class Printer:
self.gcode.set_printer_ready(False) self.gcode.set_printer_ready(False)
self.gcode.motor_heater_off() self.gcode.motor_heater_off()
def disconnect(self): def disconnect(self):
if self.mcu is not None: try:
self.stats(time.time()) if self.mcu is not None:
self.mcu.disconnect() self.stats(time.time())
self.mcu.disconnect()
except:
logging.exception("Unhandled exception during disconnect")
def request_restart(self): def request_restart(self):
self.run_result = "restart" self.run_result = "restart"
self.reactor.end() self.reactor.end()