From e4153a536fe10671abc248d9e34347fbaccb2ec3 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 4 Apr 2017 19:20:54 -0400 Subject: mcu: Change mcu_stepper.set_position() to take a location in millimeters Update the set_position() method to convert from millimeters to absolute step position. Also, update PrinterStepper.get_homed_offset() and mcu_stepper.get_commanded_position() to return millimeters. Signed-off-by: Kevin O'Connor --- klippy/cartesian.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'klippy/cartesian.py') diff --git a/klippy/cartesian.py b/klippy/cartesian.py index 6ec12a5b..c1e07a84 100644 --- a/klippy/cartesian.py +++ b/klippy/cartesian.py @@ -23,8 +23,7 @@ class CartKinematics: self.steppers[2].set_max_jerk(0., self.max_z_accel) def set_position(self, newpos): for i in StepList: - s = self.steppers[i] - s.mcu_stepper.set_position(int(newpos[i]*s.inv_step_dist + 0.5)) + self.steppers[i].mcu_stepper.set_position(newpos[i]) def home(self, homing_state): # Each axis is homed independently and in order for axis in homing_state.get_axes(): @@ -55,7 +54,7 @@ class CartKinematics: homing_state.home( list(coord), homepos, [s], s.homing_speed/2.0, second_home=True) # Set final homed position - coord[axis] = s.position_endstop + s.get_homed_offset()*s.step_dist + coord[axis] = s.position_endstop + s.get_homed_offset() homing_state.set_homed_position(coord) def motor_off(self, move_time): self.limits = [(1.0, -1.0)] * 3 -- cgit v1.2.3-70-g09d2