diff options
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/bltouch.py | 10 | ||||
| -rw-r--r-- | klippy/extras/endstop_phase.py | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 50e27e0e..71c731f2 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -4,7 +4,6 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. import logging -import homing from . import probe SIGNAL_PERIOD = 0.020 @@ -82,7 +81,7 @@ class BLTouchEndstopWrapper: self.set_output_mode(self.output_mode) try: self.raise_probe() - except homing.CommandError as e: + except self.printer.command_error as e: logging.warning("BLTouch raise probe error: %s", str(e)) def sync_mcu_print_time(self): curtime = self.printer.get_reactor().monotonic() @@ -128,7 +127,8 @@ class BLTouchEndstopWrapper: # The "probe raised" test completed successfully break if retry >= 2: - raise homing.EndstopError("BLTouch failed to raise probe") + raise self.printer.command_error( + "BLTouch failed to raise probe") msg = "Failed to verify BLTouch probe is raised; retrying." self.gcode.respond_info(msg) self.sync_mcu_print_time() @@ -161,7 +161,7 @@ class BLTouchEndstopWrapper: return msg = "BLTouch failed to verify sensor state" if retry >= 2: - raise homing.EndstopError(msg) + raise self.printer.command_error(msg) self.gcode.respond_info(msg + '; retrying.') self.send_cmd('reset', duration=RETRY_RESET_TIME) def multi_probe_begin(self): @@ -191,7 +191,7 @@ class BLTouchEndstopWrapper: # Verify the probe actually deployed during the attempt for s, mcu_pos in self.start_mcu_pos: if s.get_mcu_position() == mcu_pos: - raise homing.EndstopError("BLTouch failed to deploy") + raise self.printer.command_error("BLTouch failed to deploy") def home_start(self, print_time, sample_time, sample_count, rest_time): rest_time = min(rest_time, ENDSTOP_REST_TIME) return self.mcu_endstop.home_start(print_time, sample_time, diff --git a/klippy/extras/endstop_phase.py b/klippy/extras/endstop_phase.py index 8cfea7fd..ae22720d 100644 --- a/klippy/extras/endstop_phase.py +++ b/klippy/extras/endstop_phase.py @@ -4,7 +4,6 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. import math, logging -import homing TRINAMIC_DRIVERS = ["tmc2130", "tmc2208", "tmc2209", "tmc2660", "tmc5160"] @@ -81,7 +80,7 @@ class EndstopPhase: except Exception as e: msg = "Unable to get stepper %s phase: %s" % (self.name, str(e)) logging.exception(msg) - raise homing.EndstopError(msg) + raise self.printer.command_error(msg) if stepper.is_dir_inverted(): phase = (self.phases - 1) - phase else: @@ -95,7 +94,7 @@ class EndstopPhase: if delta >= self.phases - self.endstop_phase_accuracy: delta -= self.phases elif delta > self.endstop_phase_accuracy: - raise homing.EndstopError( + raise self.printer.command_error( "Endstop %s incorrect phase (got %d vs %d)" % ( self.name, phase, self.endstop_phase)) return delta * self.step_dist |