diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2018-06-21 18:15:23 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2018-06-22 14:09:01 -0400 |
| commit | b96542f0e5d2ea7c0fe025d5d4ffecfcb697e457 (patch) | |
| tree | 0fa65d55e266ef416419a50df45b8fe93f45b61b /klippy/extras | |
| parent | 9a97a348ae8ba765f8e6877b41eeb76805911863 (diff) | |
| download | kutter-b96542f0e5d2ea7c0fe025d5d4ffecfcb697e457.tar.gz kutter-b96542f0e5d2ea7c0fe025d5d4ffecfcb697e457.tar.xz kutter-b96542f0e5d2ea7c0fe025d5d4ffecfcb697e457.zip | |
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>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/stepper_buzz.py | 10 | ||||
| -rw-r--r-- | klippy/extras/z_tilt.py | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/klippy/extras/stepper_buzz.py b/klippy/extras/stepper_buzz.py index 1e106b2a..f6dae303 100644 --- a/klippy/extras/stepper_buzz.py +++ b/klippy/extras/stepper_buzz.py @@ -39,21 +39,21 @@ class StepperBuzz: # Move stepper toolhead = self.printer.lookup_object('toolhead') toolhead.wait_moves() - pos = stepper.mcu_stepper.get_commanded_position() + pos = stepper.get_commanded_position() print_time = toolhead.get_last_move_time() if need_motor_enable: stepper.motor_enable(print_time, 1) print_time += .1 - was_ignore = stepper.mcu_stepper.set_ignore_move(False) - prev_sk = stepper.mcu_stepper.setup_itersolve(self.stepper_kinematics) + was_ignore = stepper.set_ignore_move(False) + prev_sk = stepper.setup_itersolve(self.stepper_kinematics) for i in range(10): self.manual_move(print_time, stepper, 0., 1.) print_time += .3 self.manual_move(print_time, stepper, 1., -1.) toolhead.reset_print_time(print_time + .7) print_time = toolhead.get_last_move_time() - stepper.mcu_stepper.setup_itersolve(prev_sk) - stepper.mcu_stepper.set_ignore_move(was_ignore) + stepper.setup_itersolve(prev_sk) + stepper.set_ignore_move(was_ignore) if need_motor_enable: print_time += .1 stepper.motor_enable(print_time, 0) diff --git a/klippy/extras/z_tilt.py b/klippy/extras/z_tilt.py index 7b20f387..9fad2cd1 100644 --- a/klippy/extras/z_tilt.py +++ b/klippy/extras/z_tilt.py @@ -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() |