From 4f30dce64f16ad17ba471538fa3abe0e63f5b91f Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 18 Nov 2016 12:42:39 -0500 Subject: homing: Add EndstopMoveError wrapper around EndstopError Allow an EndstopError to be raised without a destination position. Introduce EndstopMoveError wrapper so that current callers can continue to pass in a move destination. Signed-off-by: Kevin O'Connor --- klippy/delta.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'klippy/delta.py') diff --git a/klippy/delta.py b/klippy/delta.py index d54c0a3c..40df8ab6 100644 --- a/klippy/delta.py +++ b/klippy/delta.py @@ -118,11 +118,11 @@ class DeltaKinematics: xy2 = end_pos[0]**2 + end_pos[1]**2 if xy2 > self.limit_xy2 or end_pos[2] < 0.: if self.limit_xy2 < 0.: - raise homing.EndstopError(end_pos, "Must home first") - raise homing.EndstopError(end_pos) + raise homing.EndstopMoveError(end_pos, "Must home first") + raise homing.EndstopMoveError(end_pos) if end_pos[2] > self.limit_z: if end_pos[2] > self.max_z or xy2 > (self.max_z - end_pos[2])**2: - raise homing.EndstopError(end_pos) + raise homing.EndstopMoveError(end_pos) def move_z(self, move_time, move): if not move.axes_d[2]: return -- cgit v1.2.3-70-g09d2