From 4c5e93d51dca2393946a67646499fef5fdd034b0 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 5 Aug 2020 11:43:45 -0400 Subject: gcode: Split G0/G1 command handling to new gcode_move class Split up the main GCodeParser class into GCodeDispatch and GCodeMove classes. The GCodeMove class is now available using the "gcode_move" printer object name. This split simplifies the gcode.py code. Signed-off-by: Kevin O'Connor --- klippy/extras/print_stats.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'klippy/extras/print_stats.py') diff --git a/klippy/extras/print_stats.py b/klippy/extras/print_stats.py index 1a3fcb22..67bb2f33 100644 --- a/klippy/extras/print_stats.py +++ b/klippy/extras/print_stats.py @@ -7,11 +7,11 @@ class PrintStats: def __init__(self, config): printer = config.get_printer() - self.gcode = printer.lookup_object('gcode') + self.gcode_move = printer.lookup_object('gcode_move') self.reactor = printer.get_reactor() self.reset() def _update_filament_usage(self, eventtime): - gc_status = self.gcode.get_status(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'] @@ -29,7 +29,7 @@ class PrintStats: self.prev_pause_duration += pause_duration self.last_pause_time = None # Reset last e-position - gc_status = self.gcode.get_status(curtime) + gc_status = self.gcode_move.get_status(curtime) self.last_epos = gc_status['position'].e self.state = "printing" self.error_message = "" -- cgit v1.2.3-70-g09d2