From 2caaaea9a4bdd55846cdcf24b0efba60bcdfbd51 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 16 Aug 2020 22:43:03 -0400 Subject: toolhead: Add a manual_move() helper function Add a helper function for submitting relative movements. This function will also automatically ensure gcode.reset_last_position() is called. Signed-off-by: Kevin O'Connor --- klippy/extras/manual_probe.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'klippy/extras/manual_probe.py') diff --git a/klippy/extras/manual_probe.py b/klippy/extras/manual_probe.py index 663f3c8e..f42aaba8 100644 --- a/klippy/extras/manual_probe.py +++ b/klippy/extras/manual_probe.py @@ -93,11 +93,10 @@ class ManualProbeHelper: def move_z(self, z_pos): curpos = self.toolhead.get_position() try: - if curpos[2] - z_pos < Z_BOB_MINIMUM: - curpos[2] = z_pos + Z_BOB_MINIMUM - self.toolhead.move(curpos, self.speed) - curpos[2] = z_pos - self.toolhead.move(curpos, self.speed) + z_bob_pos = z_pos + Z_BOB_MINIMUM + if curpos[2] < z_bob_pos: + self.toolhead.manual_move([None, None, z_bob_pos], self.speed) + self.toolhead.manual_move([None, None, z_pos], self.speed) except homing.CommandError as e: self.finalize(False) raise -- cgit v1.2.3-70-g09d2