From f6dd97b78443548c236038ce50a69c24866e156d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 4 Sep 2020 11:41:57 -0400 Subject: homing: Remove EndstopError There's no reason to distinguish between an EndstopError and a CommandError, so just use CommandError. Signed-off-by: Kevin O'Connor --- klippy/toolhead.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'klippy/toolhead.py') diff --git a/klippy/toolhead.py b/klippy/toolhead.py index c6797942..f14e81b9 100644 --- a/klippy/toolhead.py +++ b/klippy/toolhead.py @@ -55,9 +55,9 @@ class Move: self.delta_v2 = 2.0 * self.move_d * self.accel self.smooth_delta_v2 = min(self.smooth_delta_v2, self.delta_v2) def move_error(self, msg="Move out of range"): - pos = self.end_pos - return homing.EndstopError("%s: %.3f %.3f %.3f [%.3f]" - % (msg, pos[0], pos[1], pos[2], pos[3])) + ep = self.end_pos + m = "%s: %.3f %.3f %.3f [%.3f]" % (msg, ep[0], ep[1], ep[2], ep[3]) + return self.toolhead.printer.command_error(m) def calc_junction(self, prev_move): if not self.is_kinematic_move or not prev_move.is_kinematic_move: return -- cgit v1.2.3-70-g09d2