From 1f3a160f47175c44722a3ce1e58e90c359b99c99 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 3 Sep 2020 16:22:54 -0400 Subject: toolhead: Add a move.move_error() helper Move the EndstopMoveError() code from homing.py to a new method in the toolhead Move class. Signed-off-by: Kevin O'Connor --- klippy/kinematics/delta.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'klippy/kinematics/delta.py') diff --git a/klippy/kinematics/delta.py b/klippy/kinematics/delta.py index 885ce940..427fabda 100644 --- a/klippy/kinematics/delta.py +++ b/klippy/kinematics/delta.py @@ -118,7 +118,7 @@ class DeltaKinematics: # Normal XY move return if self.need_home: - raise homing.EndstopMoveError(end_pos, "Must home first") + raise move.move_error("Must home first") end_z = end_pos[2] limit_xy2 = self.max_xy2 if end_z > self.limit_z: @@ -127,7 +127,7 @@ class DeltaKinematics: # Move out of range - verify not a homing move if (end_pos[:2] != self.home_position[:2] or end_z < self.min_z or end_z > self.home_position[2]): - raise homing.EndstopMoveError(end_pos) + raise move.move_error() limit_xy2 = -1. if move.axes_d[2]: move.limit_speed(self.max_z_velocity, move.accel) -- cgit v1.2.3-70-g09d2