Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gcode: Convert get_status() last_xpos to use a namedtuple 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-08-15 16:07:07 -04:00
parent 2d5f9b6cda
commit 80a6f59c8f
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
klippy/extras/print_stats.py
View File

@ -12,7 +12,7 @@ class PrintStats:
self.reset() self.reset()
def _update_filament_usage(self, eventtime): def _update_filament_usage(self, eventtime):
gc_status = self.gcode.get_status(eventtime) gc_status = self.gcode.get_status(eventtime)
cur_epos = gc_status['last_epos'] cur_epos = gc_status['position'].e
self.filament_used += (cur_epos - self.last_epos) \ self.filament_used += (cur_epos - self.last_epos) \
/ gc_status['extrude_factor'] / gc_status['extrude_factor']
self.last_epos = cur_epos self.last_epos = cur_epos
@ -30,7 +30,7 @@ class PrintStats:
self.last_pause_time = None self.last_pause_time = None
# Reset last e-position # Reset last e-position
gc_status = self.gcode.get_status(curtime) gc_status = self.gcode.get_status(curtime)
self.last_epos = gc_status['last_epos'] self.last_epos = gc_status['position'].e
self.state = "printing" self.state = "printing"
self.error_message = "" self.error_message = ""
def note_pause(self): def note_pause(self):

5
klippy/gcode.py
View File

@ -183,11 +183,8 @@ class GCodeParser:
'extrude_factor': self.extrude_factor, 'extrude_factor': self.extrude_factor,
'absolute_coordinates': self.absolute_coord, 'absolute_coordinates': self.absolute_coord,
'absolute_extrude': self.absolute_extrude, 'absolute_extrude': self.absolute_extrude,
'last_xpos': self.last_position[0],
'last_ypos': self.last_position[1],
'last_zpos': self.last_position[2],
'last_epos': self.last_position[3],
'homing_origin': homing.Coord(*self.homing_position), 'homing_origin': homing.Coord(*self.homing_position),
'position': homing.Coord(*self.last_position),
'gcode_position': homing.Coord(*move_position), 'gcode_position': homing.Coord(*move_position),
} }
def dump_state(self): def dump_state(self):