homing: Move low-level probing logic from probe.py to homing.py

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 4 insertions, 8 deletions

diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py
index f99bd455..7b4ddcb7 100644
--- a/klippy/extras/probe.py
+++ b/klippy/extras/probe.py
@@ -113,23 +113,19 @@ 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 = self.printer.lookup_object('homing').new_homing_state()
+        phoming = self.printer.lookup_object('homing')
         pos = toolhead.get_position()
         pos[2] = self.z_position
-        endstops = [(self.mcu_probe, "probe")]
-        verify = self.printer.get_start_args().get('debugoutput') is None
         try:
-            homing_state.homing_move(pos, endstops, speed,
-                                     probe_pos=True, verify_movement=verify)
+            epos = phoming.probing_move(self.mcu_probe, pos, speed)
         except self.printer.command_error as e:
             reason = str(e)
             if "Timeout during endstop homing" in reason:
                 reason += HINT_TIMEOUT
             raise self.printer.command_error(reason)
-        pos = toolhead.get_position()
         self.gcode.respond_info("probe at %.3f,%.3f is z=%.6f"
-                                % (pos[0], pos[1], pos[2]))
-        return pos[:3]
+                                % (epos[0], epos[1], epos[2]))
+        return epos[:3]
     def _move(self, coord, speed):
         self.printer.lookup_object('toolhead').manual_move(coord, speed)
     def _calc_mean(self, positions):