diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2016-12-08 12:42:12 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2016-12-09 17:09:51 -0500 |
| commit | a6de1db94d108f401f7f3e67f735743106e16837 (patch) | |
| tree | 8b26f59cc412e155b3d1d271a2413338ee7ff015 /klippy/gcode.py | |
| parent | ed9d7e4fae6eb042f93504553c9445cb8d136c4e (diff) | |
| download | kutter-a6de1db94d108f401f7f3e67f735743106e16837.tar.gz kutter-a6de1db94d108f401f7f3e67f735743106e16837.tar.xz kutter-a6de1db94d108f401f7f3e67f735743106e16837.zip | |
gcode: Rework endstop query to use greenlets
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/gcode.py')
| -rw-r--r-- | klippy/gcode.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/klippy/gcode.py b/klippy/gcode.py index 0d5e832a..f280b43e 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -345,10 +345,13 @@ class GCodeParser: # Get Endstop Status if self.is_fileinput: return - print_time = self.toolhead.get_last_move_time() - query_state = homing.QueryEndstops(print_time, self.respond) - self.toolhead.query_endstops(query_state) - self.set_busy(query_state) + try: + res = self.toolhead.query_endstops() + except self.printer.mcu.error, e: + self.respond_error(str(e)) + return + self.respond(" ".join(["%s:%s" % (name, ["open", "TRIGGERED"][not not t]) + for name, t in res])) cmd_PID_TUNE_help = "Run PID Tuning" cmd_PID_TUNE_aliases = ["M303"] def cmd_PID_TUNE(self, params): |