aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/homing.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2017-12-06 09:59:00 -0500
committerKevin O'Connor <kevin@koconnor.net>2017-12-06 19:13:54 -0500
commit8d9ca6f2dd96e5b1c71999fb8497487fcb091493 (patch)
treedda12433dace1ab95dc26d38fb4dbf752591cb39 /klippy/homing.py
parent1d6af72de5b28a32ef5506b312943caeecaf787b (diff)
downloadkutter-8d9ca6f2dd96e5b1c71999fb8497487fcb091493.tar.gz
kutter-8d9ca6f2dd96e5b1c71999fb8497487fcb091493.tar.xz
kutter-8d9ca6f2dd96e5b1c71999fb8497487fcb091493.zip
homing: Directly interact with the kinematic class when homing
Move the homing logic out of toolhead.py and into homing.py. This simplifies the toolhead logic and centralizes the homing code. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/homing.py')
-rw-r--r--klippy/homing.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/klippy/homing.py b/klippy/homing.py
index db99fea9..8ee78530 100644
--- a/klippy/homing.py
+++ b/klippy/homing.py
@@ -10,9 +10,9 @@ ENDSTOP_SAMPLE_TIME = .000015
ENDSTOP_SAMPLE_COUNT = 4
class Homing:
- def __init__(self, toolhead, changed_axes):
+ def __init__(self, toolhead):
self.toolhead = toolhead
- self.changed_axes = changed_axes
+ self.changed_axes = []
self.verify_retract = True
def set_no_verify_retract(self):
self.verify_retract = False
@@ -79,6 +79,13 @@ class Homing:
if s.get_mcu_position() == pos:
raise EndstopError(
"Endstop %s still triggered after retract" % (name,))
+ def home_axes(self, axes):
+ self.changed_axes = axes
+ try:
+ self.toolhead.get_kinematics().home(self)
+ except EndstopError:
+ self.toolhead.motor_off()
+ raise
def query_endstops(print_time, query_flags, steppers):
if query_flags == "get_mcu_position":