h3n3/klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

homing: Add EndstopMoveError wrapper around EndstopError

Browse Source 
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 <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2016-11-18 12:42:39 -05:00
parent 2b5b899d35
commit 4f30dce64f
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klippy/delta.py
View File

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