From b2c778b93122aacd93b983775c10b97d392e92b4 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 26 Jun 2019 10:45:06 -0400 Subject: mcu: Integrate query_endstop_wait() into query_endstop() There is no need to have two separate calls to query an endstop. Signed-off-by: Kevin O'Connor --- klippy/extras/probe.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'klippy/extras/probe.py') diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 92f0528c..a6c71428 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -145,8 +145,7 @@ class PrinterProbe: def cmd_QUERY_PROBE(self, params): toolhead = self.printer.lookup_object('toolhead') print_time = toolhead.get_last_move_time() - self.mcu_probe.query_endstop(print_time) - res = self.mcu_probe.query_endstop_wait() + res = self.mcu_probe.query_endstop(print_time) self.gcode.respond_info( "probe: %s" % (["open", "TRIGGERED"][not not res],)) cmd_PROBE_ACCURACY_help = "Probe Z-height accuracy at current XY position" @@ -244,7 +243,6 @@ class ProbeEndstopWrapper: self.home_start = self.mcu_endstop.home_start self.home_wait = self.mcu_endstop.home_wait self.query_endstop = self.mcu_endstop.query_endstop - self.query_endstop_wait = self.mcu_endstop.query_endstop_wait self.TimeoutError = self.mcu_endstop.TimeoutError def _build_config(self): kin = self.printer.lookup_object('toolhead').get_kinematics() -- cgit v1.2.3-70-g09d2