3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-05 04:54:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

homing: Remove EndstopError

Browse source 
There's no reason to distinguish between an EndstopError and a
CommandError, so just use CommandError.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-09-04 11:41:57 -04:00
parent 1f3a160f47
commit f6dd97b784
11 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
klippy/extras/endstop_phase.py
View file

@ -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