diff options
Diffstat (limited to 'klippy/extras/probe.py')
| -rw-r--r-- | klippy/extras/probe.py | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index ee7757fe..99e4e80e 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -181,16 +181,24 @@ class ProbePointsHelper: self.busy = True self.move_next() if self.probe is not None: - while self.busy: - self.gcode.run_script("PROBE") - self.cmd_NEXT({}) + try: + while self.busy: + self.gcode.run_script("PROBE") + self.cmd_NEXT({}) + except: + self.finalize(False) + raise def move_next(self): x, y = self.probe_points[len(self.results)] curpos = self.toolhead.get_position() curpos[0] = x curpos[1] = y curpos[2] = self.horizontal_move_z - self.toolhead.move(curpos, self.speed) + try: + self.toolhead.move(curpos, self.speed) + except homing.EndstopError as e: + self.finalize(False) + raise self.gcode.error(str(e)) self.gcode.reset_last_position() cmd_NEXT_help = "Move to the next XY position to probe" def cmd_NEXT(self, params): @@ -200,7 +208,11 @@ class ProbePointsHelper: # Lift toolhead curpos = self.toolhead.get_position() curpos[2] = self.horizontal_move_z - self.toolhead.move(curpos, self.lift_speed) + try: + self.toolhead.move(curpos, self.lift_speed) + except homing.EndstopError as e: + self.finalize(False) + raise self.gcode.error(str(e)) # Move to next position if len(self.results) == len(self.probe_points): self.toolhead.get_last_move_time() |