stepper: Don't peak into PrinterStepper members

Add additional wrapper functions so that no outside callers need to
peak into the member variables of PrinterStepper.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-06-21 18:15:23 -04:00
parent 9a97a348ae
commit b96542f0e5
7 changed files with 26 additions and 24 deletions

View file

@ -69,7 +69,7 @@ class ZTilt:
except:
logging.exception("z_tilt adjust_steppers")
for s in self.z_steppers:
z.mcu_stepper.set_ignore_move(False)
z.set_ignore_move(False)
raise
def adjust_steppers(self, x_adjust, y_adjust, z_adjust, z_offset):
toolhead = self.printer.lookup_object('toolhead')
@ -78,7 +78,7 @@ class ZTilt:
# Find each stepper adjustment and disable all stepper movements
positions = []
for s, (x, y) in zip(self.z_steppers, self.z_positions):
s.mcu_stepper.set_ignore_move(True)
s.set_ignore_move(True)
stepper_offset = -(x*x_adjust + y*y_adjust)
positions.append((stepper_offset, s))
# Report on movements
@ -94,13 +94,13 @@ class ZTilt:
for i in range(len(positions)-1):
stepper_offset, stepper = positions[i]
next_stepper_offset, next_stepper = positions[i+1]
stepper.mcu_stepper.set_ignore_move(False)
stepper.set_ignore_move(False)
curpos[2] = z_low + next_stepper_offset
toolhead.move(curpos, speed)
toolhead.set_position(curpos)
# Z should now be level - do final cleanup
last_stepper_offset, last_stepper = positions[-1]
last_stepper.mcu_stepper.set_ignore_move(False)
last_stepper.set_ignore_move(False)
curpos[2] -= z_adjust - z_offset
toolhead.set_position(curpos)
self.gcode.reset_last_position()