From 8260a3a0c38e25168e3dfc414ed62fd23e380b21 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 8 Jan 2021 12:37:57 -0500 Subject: homing: Make homing.py an "extras" module Move klippy/homing.py to klippy/extras/homing.py and convert the code to an "extras" modules. Signed-off-by: Kevin O'Connor --- klippy/extras/probe.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'klippy/extras/probe.py') diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index e1115e0e..fe6cb151 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -1,10 +1,10 @@ # Z-Probe support # -# Copyright (C) 2017-2020 Kevin O'Connor +# Copyright (C) 2017-2021 Kevin O'Connor # # This file may be distributed under the terms of the GNU GPLv3 license. import logging -import pins, homing +import pins from . import manual_probe HINT_TIMEOUT = """ @@ -75,11 +75,11 @@ class PrinterProbe: def _handle_homing_move_end(self, endstops): if self.mcu_probe in endstops: self.mcu_probe.probe_finish() - def _handle_home_rails_begin(self, rails): + def _handle_home_rails_begin(self, homing_state, rails): endstops = [es for rail in rails for es, name in rail.get_endstops()] if self.mcu_probe in endstops: self.multi_probe_begin() - def _handle_home_rails_end(self, rails): + def _handle_home_rails_end(self, homing_state, rails): endstops = [es for rail in rails for es, name in rail.get_endstops()] if self.mcu_probe in endstops: self.multi_probe_end() @@ -112,7 +112,7 @@ class PrinterProbe: curtime = self.printer.get_reactor().monotonic() if 'z' not in toolhead.get_status(curtime)['homed_axes']: raise self.printer.command_error("Must home before probe") - homing_state = homing.Homing(self.printer) + homing_state = self.printer.lookup_object('homing').new_homing_state() pos = toolhead.get_position() pos[2] = self.z_position endstops = [(self.mcu_probe, "probe")] -- cgit v1.2.3-70-g09d2