From 9e1059afb46c9df439211d21590da987b32e2963 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 17 Nov 2016 17:24:03 -0500 Subject: homing: Create QueryEndstops class from gcode Create the QueryEndstops in the gcode handler instead of in the kinematic classes. This simplifies the gcode handler as it can directly register its response callback. Also, store the stepper name in the stepper class. Also, propagate the print_time of the query request to the mcu_endstop class. Signed-off-by: Kevin O'Connor --- klippy/stepper.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'klippy/stepper.py') diff --git a/klippy/stepper.py b/klippy/stepper.py index 51abd093..61a9d26a 100644 --- a/klippy/stepper.py +++ b/klippy/stepper.py @@ -6,9 +6,10 @@ import math, logging class PrinterStepper: - def __init__(self, printer, config): + def __init__(self, printer, config, name): self.printer = printer self.config = config + self.name = name self.mcu_stepper = self.mcu_enable = self.mcu_endstop = None self.step_dist = config.getfloat('step_distance') @@ -76,10 +77,11 @@ class PrinterStepper: mcu_time = self.mcu_endstop.print_to_mcu_time(move_time) self.mcu_endstop.home(mcu_time, step_time) return self.mcu_endstop - def query_endstop(self): + def query_endstop(self, print_time): if self.mcu_endstop is None: return None - self.mcu_endstop.query_endstop() + mcu_time = self.mcu_endstop.print_to_mcu_time(print_time) + self.mcu_endstop.query_endstop(mcu_time) return self.mcu_endstop def get_homed_offset(self): if not self.homing_stepper_phases or self.need_motor_enable: -- cgit v1.2.3-70-g09d2