diff options
Diffstat (limited to 'klippy/extras/print_stats.py')
| -rw-r--r-- | klippy/extras/print_stats.py | 87 |
1 files changed, 53 insertions, 34 deletions
diff --git a/klippy/extras/print_stats.py b/klippy/extras/print_stats.py index 2eb7a01e..e7b6e97e 100644 --- a/klippy/extras/print_stats.py +++ b/klippy/extras/print_stats.py @@ -4,31 +4,38 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. + class PrintStats: def __init__(self, config): printer = config.get_printer() - self.gcode_move = printer.load_object(config, 'gcode_move') + self.gcode_move = printer.load_object(config, "gcode_move") self.reactor = printer.get_reactor() self.reset() # Register commands - self.gcode = printer.lookup_object('gcode') + self.gcode = printer.lookup_object("gcode") self.gcode.register_command( - "SET_PRINT_STATS_INFO", self.cmd_SET_PRINT_STATS_INFO, - desc=self.cmd_SET_PRINT_STATS_INFO_help) - printer.register_event_handler("extruder:activate_extruder", - self._handle_activate_extruder) + "SET_PRINT_STATS_INFO", + self.cmd_SET_PRINT_STATS_INFO, + desc=self.cmd_SET_PRINT_STATS_INFO_help, + ) + printer.register_event_handler( + "extruder:activate_extruder", self._handle_activate_extruder + ) + def _handle_activate_extruder(self): gc_status = self.gcode_move.get_status() - self.last_epos = gc_status['position'].e + self.last_epos = gc_status["position"].e + def _update_filament_usage(self, eventtime): gc_status = self.gcode_move.get_status(eventtime) - cur_epos = gc_status['position'].e - self.filament_used += (cur_epos - self.last_epos) \ - / gc_status['extrude_factor'] + cur_epos = gc_status["position"].e + self.filament_used += (cur_epos - self.last_epos) / gc_status["extrude_factor"] self.last_epos = cur_epos + def set_current_file(self, filename): self.reset() self.filename = filename + def note_start(self): curtime = self.reactor.monotonic() if self.print_start_time is None: @@ -40,9 +47,10 @@ class PrintStats: self.last_pause_time = None # Reset last e-position gc_status = self.gcode_move.get_status(curtime) - self.last_epos = gc_status['position'].e + self.last_epos = gc_status["position"].e self.state = "printing" self.error_message = "" + def note_pause(self): if self.last_pause_time is None: curtime = self.reactor.monotonic() @@ -51,13 +59,17 @@ class PrintStats: self._update_filament_usage(curtime) if self.state != "error": self.state = "paused" + def note_complete(self): self._note_finish("complete") + def note_error(self, message): self._note_finish("error", message) + def note_cancel(self): self._note_finish("cancelled") - def _note_finish(self, state, error_message = ""): + + def _note_finish(self, state, error_message=""): if self.print_start_time is None: return self.state = state @@ -66,16 +78,16 @@ class PrintStats: self.total_duration = eventtime - self.print_start_time if self.filament_used < 0.0000001: # No positive extusion detected during print - self.init_duration = self.total_duration - \ - self.prev_pause_duration + self.init_duration = self.total_duration - self.prev_pause_duration self.print_start_time = None - cmd_SET_PRINT_STATS_INFO_help = "Pass slicer info like layer act and " \ - "total to klipper" + + cmd_SET_PRINT_STATS_INFO_help = ( + "Pass slicer info like layer act and " "total to klipper" + ) + def cmd_SET_PRINT_STATS_INFO(self, gcmd): - total_layer = gcmd.get_int("TOTAL_LAYER", self.info_total_layer, \ - minval=0) - current_layer = gcmd.get_int("CURRENT_LAYER", self.info_current_layer, \ - minval=0) + total_layer = gcmd.get_int("TOTAL_LAYER", self.info_total_layer, minval=0) + current_layer = gcmd.get_int("CURRENT_LAYER", self.info_current_layer, minval=0) if total_layer == 0: self.info_total_layer = None self.info_current_layer = None @@ -83,19 +95,23 @@ class PrintStats: self.info_total_layer = total_layer self.info_current_layer = 0 - if self.info_total_layer is not None and \ - current_layer is not None and \ - current_layer != self.info_current_layer: + if ( + self.info_total_layer is not None + and current_layer is not None + and current_layer != self.info_current_layer + ): self.info_current_layer = min(current_layer, self.info_total_layer) + def reset(self): self.filename = self.error_message = "" self.state = "standby" - self.prev_pause_duration = self.last_epos = 0. - self.filament_used = self.total_duration = 0. + self.prev_pause_duration = self.last_epos = 0.0 + self.filament_used = self.total_duration = 0.0 self.print_start_time = self.last_pause_time = None - self.init_duration = 0. + self.init_duration = 0.0 self.info_total_layer = None self.info_current_layer = None + def get_status(self, eventtime): time_paused = self.prev_pause_duration if self.print_start_time is not None: @@ -111,15 +127,18 @@ class PrintStats: self.init_duration = self.total_duration - time_paused print_duration = self.total_duration - self.init_duration - time_paused return { - 'filename': self.filename, - 'total_duration': self.total_duration, - 'print_duration': print_duration, - 'filament_used': self.filament_used, - 'state': self.state, - 'message': self.error_message, - 'info': {'total_layer': self.info_total_layer, - 'current_layer': self.info_current_layer} + "filename": self.filename, + "total_duration": self.total_duration, + "print_duration": print_duration, + "filament_used": self.filament_used, + "state": self.state, + "message": self.error_message, + "info": { + "total_layer": self.info_total_layer, + "current_layer": self.info_current_layer, + }, } + def load_config(config): return PrintStats(config) |