3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-05 04:54:11 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mcu: Integrate query_endstop_wait() into query_endstop()

Browse source 
There is no need to have two separate calls to query an endstop.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-06-26 10:45:06 -04:00 • committed by KevinOConnor
parent ced5e35f0c
commit b2c778b931
5 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
klippy/extras/query_endstops.py
View file

@ -1,6 +1,6 @@
# Utility for querying the current state of all endstops
#
# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
# Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
@ -16,14 +16,10 @@ class QueryEndstops:
self.endstops.append((mcu_endstop, name))
cmd_QUERY_ENDSTOPS_help = "Report on the status of each endstop"
def cmd_QUERY_ENDSTOPS(self, params):
toolhead = self.printer.lookup_object('toolhead')
print_time = toolhead.get_last_move_time()
# Query the endstops
for mcu_endstop, name in self.endstops:
mcu_endstop.query_endstop(print_time)
out = []
for mcu_endstop, name in self.endstops:
out.append((name, mcu_endstop.query_endstop_wait()))
print_time = self.printer.lookup_object('toolhead').get_last_move_time()
out = [(name, mcu_endstop.query_endstop(print_time))
for mcu_endstop, name in self.endstops]
# Report results
msg = " ".join(["%s:%s" % (name, ["open", "TRIGGERED"][not not t])
for name, t in out])