diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-06-03 13:07:22 -0400 |
|---|---|---|
| committer | KevinOConnor <kevin@koconnor.net> | 2019-06-06 10:08:58 -0400 |
| commit | 1fd490ddf94b874088eee5a96f3767333d76fdd3 (patch) | |
| tree | a965591c2e0b910a96cbbd8ad3493051efbfe606 | |
| parent | 67964e71f17df13e03a0aaa1a6dcd6c9253da97d (diff) | |
| download | kutter-1fd490ddf94b874088eee5a96f3767333d76fdd3.tar.gz kutter-1fd490ddf94b874088eee5a96f3767333d76fdd3.tar.xz kutter-1fd490ddf94b874088eee5a96f3767333d76fdd3.zip | |
probe: No need to re-raise an EndstopError
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/extras/bltouch.py | 4 | ||||
| -rw-r--r-- | klippy/extras/probe.py | 29 |
2 files changed, 9 insertions, 24 deletions
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 34593ae8..c5e8e6e7 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -68,7 +68,7 @@ class BLTouchEndstopWrapper: def handle_connect(self): try: self.raise_probe() - except homing.EndstopError as e: + except homing.CommandError as e: logging.warning("BLTouch raise probe error: %s", str(e)) def sync_mcu_print_time(self): curtime = self.printer.get_reactor().monotonic() @@ -114,7 +114,7 @@ class BLTouchEndstopWrapper: try: self.verify_state(check_start_time, check_end_time, False, "raise probe") - except homing.EndstopError as e: + except homing.CommandError as e: if retry >= 2: raise msg = "Failed to verify BLTouch probe is raised; retrying." diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index f2baa25b..fdf35b0f 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -66,11 +66,11 @@ class PrinterProbe: try: homing_state.homing_move(pos, endstops, speed, probe_pos=True, verify_movement=verify) - except homing.EndstopError as e: + except homing.CommandError as e: reason = str(e) if "Timeout during endstop homing" in reason: reason += HINT_TIMEOUT - raise self.gcode.error(reason) + raise homing.CommandError(reason) pos = toolhead.get_position() self.gcode.respond_info("probe at %.3f,%.3f is z=%.6f" % ( pos[0], pos[1], pos[2])) @@ -82,10 +82,7 @@ class PrinterProbe: for i in range(len(coord)): if coord[i] is not None: curpos[i] = coord[i] - try: - toolhead.move(curpos, speed) - except homing.EndstopError as e: - raise self.gcode.error(str(e)) + toolhead.move(curpos, speed) self.gcode.reset_last_position() def _calc_mean(self, positions): count = float(len(positions)) @@ -224,16 +221,10 @@ class ProbeEndstopWrapper: for stepper in kin.get_steppers('Z'): stepper.add_to_endstop(self) def home_prepare(self): - try: - self.activate_gcode.run_gcode_from_command() - except self.gcode.error as e: - raise homing.EndstopError(str(e)) + self.activate_gcode.run_gcode_from_command() self.mcu_endstop.home_prepare() def home_finalize(self): - try: - self.deactivate_gcode.run_gcode_from_command() - except self.gcode.error as e: - raise homing.EndstopError(str(e)) + self.deactivate_gcode.run_gcode_from_command() self.mcu_endstop.home_finalize() def get_position_endstop(self): return self.position_endstop @@ -278,10 +269,7 @@ class ProbePointsHelper: speed = self.speed curpos = toolhead.get_position() curpos[2] = self.horizontal_move_z - try: - toolhead.move(curpos, speed) - except homing.EndstopError as e: - raise self.gcode.error(str(e)) + toolhead.move(curpos, speed) # Check if done probing if len(self.results) >= len(self.probe_points): self.gcode.reset_last_position() @@ -290,10 +278,7 @@ class ProbePointsHelper: return True # Move to next XY probe point curpos[:2] = self.probe_points[len(self.results)] - try: - toolhead.move(curpos, self.speed) - except homing.EndstopError as e: - raise self.gcode.error(str(e)) + toolhead.move(curpos, self.speed) self.gcode.reset_last_position() return False def start_probe(self, params): |