diff options
Diffstat (limited to 'klippy/extras/print_stats.py')
| -rw-r--r-- | klippy/extras/print_stats.py | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/klippy/extras/print_stats.py b/klippy/extras/print_stats.py index 9589aede..668cd7d0 100644 --- a/klippy/extras/print_stats.py +++ b/klippy/extras/print_stats.py @@ -10,6 +10,11 @@ class PrintStats: 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.register_command( + "SET_PRINT_STATS_INFO", self.cmd_SET_PRINT_STATS_INFO, + desc=self.cmd_SET_PRINT_STATS_INFO_help) def _update_filament_usage(self, eventtime): gc_status = self.gcode_move.get_status(eventtime) cur_epos = gc_status['position'].e @@ -59,6 +64,24 @@ class PrintStats: 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" + 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) + if total_layer == 0: + self.info_total_layer = None + self.info_current_layer = None + elif total_layer != self.info_total_layer: + 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: + self.info_current_layer = min(current_layer, self.info_total_layer) def reset(self): self.filename = self.error_message = "" self.state = "standby" @@ -66,6 +89,8 @@ class PrintStats: self.filament_used = self.total_duration = 0. self.print_start_time = self.last_pause_time = None self.init_duration = 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: @@ -86,7 +111,9 @@ class PrintStats: 'print_duration': print_duration, 'filament_used': self.filament_used, 'state': self.state, - 'message': self.error_message + 'message': self.error_message, + 'info': {'total_layer': self.info_total_layer, + 'current_layer': self.info_current_layer} } def load_config(config): |