From c0d860487a70a05d44973d53a981e935ce7b3ad0 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sat, 1 May 2021 00:27:43 -0400 Subject: stepper: Remove set_tag_position() code Have callers store the stepper positions in a dict. Signed-off-by: Kevin O'Connor --- klippy/extras/gcode_move.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'klippy/extras/gcode_move.py') diff --git a/klippy/extras/gcode_move.py b/klippy/extras/gcode_move.py index 306b4b35..77087162 100644 --- a/klippy/extras/gcode_move.py +++ b/klippy/extras/gcode_move.py @@ -247,12 +247,10 @@ class GCodeMove: steppers = kin.get_steppers() mcu_pos = " ".join(["%s:%d" % (s.get_name(), s.get_mcu_position()) for s in steppers]) - 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())]) + cinfo = [(s.get_name(), s.get_commanded_position()) for s in steppers] + stepper_pos = " ".join(["%s:%.6f" % (a, v) for a, v in cinfo]) + kinfo = zip("XYZ", kin.calc_position(dict(cinfo))) + kin_pos = " ".join(["%s:%.6f" % (a, v) for a, v in kinfo]) toolhead_pos = " ".join(["%s:%.6f" % (a, v) for a, v in zip( "XYZE", toolhead.get_position())]) gcode_pos = " ".join(["%s:%.6f" % (a, v) -- cgit v1.2.3-70-g09d2