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/homing.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'klippy/homing.py') diff --git a/klippy/homing.py b/klippy/homing.py index b4c5290f..fb0f4ca7 100644 --- a/klippy/homing.py +++ b/klippy/homing.py @@ -104,9 +104,11 @@ class QueryEndstops: return False class EndstopError(Exception): - def __init__(self, pos, msg="Move out of range"): - self.pos = pos - self.msg = msg + def __init__(self, msg="Endstop error"): + self._msg = msg def __str__(self): - return "%s: %.3f %.3f %.3f [%.3f]" % ( - self.msg, self.pos[0], self.pos[1], self.pos[2], self.pos[3]) + return self._msg + +def EndstopMoveError(pos, msg="Move out of range"): + return EndstopError("%s: %.3f %.3f %.3f [%.3f]" % ( + msg, pos[0], pos[1], pos[2], pos[3])) -- cgit v1.2.3-70-g09d2