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/stepper.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'klippy/stepper.py') diff --git a/klippy/stepper.py b/klippy/stepper.py index 97a1283e..eff0fa67 100644 --- a/klippy/stepper.py +++ b/klippy/stepper.py @@ -29,7 +29,7 @@ class MCU_stepper: "Stepper dir pin must be on same mcu as step pin") self._dir_pin = dir_pin_params['pin'] self._invert_dir = dir_pin_params['invert'] - self._mcu_position_offset = 0. + self._mcu_position_offset = self._tag_position = 0. self._min_stop_interval = 0. self._reset_cmd_id = self._get_position_cmd = None self._active_callbacks = [] @@ -107,6 +107,10 @@ class MCU_stepper: if mcu_pos >= 0.: return int(mcu_pos + 0.5) return int(mcu_pos - 0.5) + def get_tag_position(self): + return self._tag_position + def set_tag_position(self, position): + self._tag_position = position def set_stepper_kinematics(self, sk): old_sk = self._stepper_kinematics self._stepper_kinematics = sk @@ -193,6 +197,8 @@ class PrinterRail: self.endstops = [] self.add_extra_stepper(config) self.get_commanded_position = self.steppers[0].get_commanded_position + self.get_tag_position = self.steppers[0].get_tag_position + self.set_tag_position = self.steppers[0].set_tag_position # Primary endstop position mcu_endstop = self.endstops[0][0] if hasattr(mcu_endstop, "get_position_endstop"): -- cgit v1.2.3-70-g09d2