diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-04-03 13:20:36 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-08-17 22:01:23 -0400 |
| commit | 1dc2ab048f7ec681ab1dfdd394660c45f6ff4cd9 (patch) | |
| tree | ae7f0405bce0e2c2b3d5aed0c653d2eda08117d0 /klippy/extras | |
| parent | 128a2f8cd6e1558c21c21f98a9c0b3efaf543b51 (diff) | |
| download | kutter-1dc2ab048f7ec681ab1dfdd394660c45f6ff4cd9.tar.gz kutter-1dc2ab048f7ec681ab1dfdd394660c45f6ff4cd9.tar.xz kutter-1dc2ab048f7ec681ab1dfdd394660c45f6ff4cd9.zip | |
mcu: Return time of trigger from home_wait()
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/bltouch.py | 3 | ||||
| -rw-r--r-- | klippy/extras/homing.py | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py index 05822c01..48759752 100644 --- a/klippy/extras/bltouch.py +++ b/klippy/extras/bltouch.py @@ -116,7 +116,8 @@ class BLTouchEndstopWrapper: self.mcu_endstop.home_start(self.action_end_time, ENDSTOP_SAMPLE_TIME, ENDSTOP_SAMPLE_COUNT, ENDSTOP_REST_TIME, triggered=triggered) - return self.mcu_endstop.home_wait(self.action_end_time + 0.100) + trigger_time = self.mcu_endstop.home_wait(self.action_end_time + 0.100) + return trigger_time > 0. def raise_probe(self): self.sync_mcu_print_time() if not self.pin_up_not_triggered: diff --git a/klippy/extras/homing.py b/klippy/extras/homing.py index dc7acd62..67a19513 100644 --- a/klippy/extras/homing.py +++ b/klippy/extras/homing.py @@ -76,9 +76,11 @@ class HomingMove: # Wait for endstops to trigger move_end_print_time = self.toolhead.get_last_move_time() for mcu_endstop, name in self.endstops: - did_trigger = mcu_endstop.home_wait(move_end_print_time) - if not did_trigger and check_triggered and error is None: - error = "Failed to home %s: Timeout during homing" % (name,) + trigger_time = mcu_endstop.home_wait(move_end_print_time) + if trigger_time < 0. and error is None: + error = "Communication timeout during homing %s" % (name,) + elif not trigger_time and check_triggered and error is None: + error = "No trigger on %s after full movement" % (name,) # Determine stepper halt positions self.toolhead.flush_step_generation() self.end_mcu_pos = [(s, name, spos, s.get_mcu_position()) |