diff options
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/bed_screws.py | 1 | ||||
| -rw-r--r-- | klippy/extras/manual_probe.py | 3 | ||||
| -rw-r--r-- | klippy/extras/manual_stepper.py | 4 | ||||
| -rw-r--r-- | klippy/extras/probe.py | 11 |
4 files changed, 8 insertions, 11 deletions
diff --git a/klippy/extras/bed_screws.py b/klippy/extras/bed_screws.py index 483fc7ef..ccf9b327 100644 --- a/klippy/extras/bed_screws.py +++ b/klippy/extras/bed_screws.py @@ -3,7 +3,6 @@ # Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net> # # This file may be distributed under the terms of the GNU GPLv3 license. -import homing def parse_coord(config, param): pair = config.get(param).strip().split(',', 1) diff --git a/klippy/extras/manual_probe.py b/klippy/extras/manual_probe.py index f42aaba8..e678bdf7 100644 --- a/klippy/extras/manual_probe.py +++ b/klippy/extras/manual_probe.py @@ -4,7 +4,6 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. import logging, bisect -import homing class ManualProbe: def __init__(self, config): @@ -97,7 +96,7 @@ class ManualProbeHelper: 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: + except self.printer.command_error as e: self.finalize(False) raise def report_z_status(self, warn_no_change=False, prev_pos=None): diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py index 5807c04c..fba23f6a 100644 --- a/klippy/extras/manual_stepper.py +++ b/klippy/extras/manual_stepper.py @@ -3,7 +3,7 @@ # Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net> # # This file may be distributed under the terms of the GNU GPLv3 license. -import stepper, homing, chelper +import stepper, chelper from . import force_move ENDSTOP_SAMPLE_TIME = .000015 @@ -110,7 +110,7 @@ class ManualStepper: error = str(e) self.sync_print_time() if error is not None: - raise homing.CommandError(error) + raise self.printer.command_error(error) cmd_MANUAL_STEPPER_help = "Command a manually configured stepper" def cmd_MANUAL_STEPPER(self, gcmd): enable = gcmd.get_int('ENABLE', None) diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index d97a5e7f..9b4f1cb0 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -115,11 +115,11 @@ class PrinterProbe: try: homing_state.homing_move(pos, endstops, speed, probe_pos=True, verify_movement=verify) - except homing.CommandError as e: + except self.printer.command_error as e: reason = str(e) if "Timeout during endstop homing" in reason: reason += HINT_TIMEOUT - raise homing.CommandError(reason) + raise self.printer.command_error(reason) pos = toolhead.get_position() self.gcode.respond_info("probe at %.3f,%.3f is z=%.6f" % (pos[0], pos[1], pos[2])) @@ -162,8 +162,7 @@ class PrinterProbe: z_positions = [p[2] for p in positions] if max(z_positions) - min(z_positions) > samples_tolerance: if retries >= samples_retries: - raise homing.CommandError( - "Probe samples exceed samples_tolerance") + raise gcmd.error("Probe samples exceed samples_tolerance") gcmd.respond_info("Probe samples exceed tolerance. Retrying...") retries += 1 positions = [] @@ -295,14 +294,14 @@ class ProbeEndstopWrapper: start_pos = toolhead.get_position() self.activate_gcode.run_gcode_from_command() if toolhead.get_position()[:3] != start_pos[:3]: - raise homing.CommandError( + raise self.printer.command_error( "Toolhead moved during probe activate_gcode script") def probe_finish(self): toolhead = self.printer.lookup_object('toolhead') start_pos = toolhead.get_position() self.deactivate_gcode.run_gcode_from_command() if toolhead.get_position()[:3] != start_pos[:3]: - raise homing.CommandError( + raise self.printer.command_error( "Toolhead moved during probe deactivate_gcode script") def get_position_endstop(self): return self.position_endstop |