From 224574da4a623e3f37ebfe8082a546a9df697638 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 13 Nov 2019 17:59:40 -0500 Subject: stepper: Add get/set_tag_position() and convert calc_position() Rename calc_position() to calc_tag_position() and have it calculate the value of the position from the last stepper set_tag_position() call. This enables the calc_tag_position() code to be more flexible as it can be run with arbitrary positions. Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'klippy/gcode.py') diff --git a/klippy/gcode.py b/klippy/gcode.py index ff61df4e..323d5527 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -690,11 +690,12 @@ class GCodeParser: steppers = kin.get_steppers() mcu_pos = " ".join(["%s:%d" % (s.get_name(), s.get_mcu_position()) for s in steppers]) - stepper_pos = " ".join( - ["%s:%.6f" % (s.get_name(), s.get_commanded_position()) - for s in steppers]) - kinematic_pos = " ".join(["%s:%.6f" % (a, v) - for a, v in zip("XYZE", kin.calc_position())]) + for s in steppers: + s.set_tag_position(s.get_commanded_position()) + stepper_pos = " ".join(["%s:%.6f" % (s.get_name(), s.get_tag_position()) + for s in steppers]) + kin_pos = " ".join(["%s:%.6f" % (a, v) + for a, v in zip("XYZ", kin.calc_tag_position())]) toolhead_pos = " ".join(["%s:%.6f" % (a, v) for a, v in zip( "XYZE", self.toolhead.get_position())]) gcode_pos = " ".join(["%s:%.6f" % (a, v) @@ -703,16 +704,15 @@ class GCodeParser: for a, v in zip("XYZE", self.base_position)]) homing_pos = " ".join(["%s:%.6f" % (a, v) for a, v in zip("XYZ", self.homing_position)]) - self.respond_info( - "mcu: %s\n" - "stepper: %s\n" - "kinematic: %s\n" - "toolhead: %s\n" - "gcode: %s\n" - "gcode base: %s\n" - "gcode homing: %s" % ( - mcu_pos, stepper_pos, kinematic_pos, toolhead_pos, - gcode_pos, base_pos, homing_pos)) + self.respond_info("mcu: %s\n" + "stepper: %s\n" + "kinematic: %s\n" + "toolhead: %s\n" + "gcode: %s\n" + "gcode base: %s\n" + "gcode homing: %s" + % (mcu_pos, stepper_pos, kin_pos, toolhead_pos, + gcode_pos, base_pos, homing_pos)) def request_restart(self, result): if self.is_printer_ready: print_time = self.toolhead.get_last_move_time() -- cgit v1.2.3-70-g09d2