aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-01-04 20:41:56 -0500
committerKevin O'Connor <kevin@koconnor.net>2019-01-21 09:52:11 -0500
commit8a97bc592b646e7c5ec60985e44fbf867841b121 (patch)
tree1130c8ca9ecd90064c0d0ed4bf8878f28078b9cc
parent56141c21d74a40f8a0eb8c41cd33a0fca2e07183 (diff)
downloadkutter-8a97bc592b646e7c5ec60985e44fbf867841b121.tar.gz
kutter-8a97bc592b646e7c5ec60985e44fbf867841b121.tar.xz
kutter-8a97bc592b646e7c5ec60985e44fbf867841b121.zip
bltouch: Add a pin_up_touch_mode_reports_triggered config option
Rework the undocumented test_sensor_pin config option into a pin_up_touch_mode_reports_triggered option and document it. Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--config/example-extras.cfg5
-rw-r--r--klippy/extras/bltouch.py6
2 files changed, 9 insertions, 2 deletions
diff --git a/config/example-extras.cfg b/config/example-extras.cfg
index 4eba6625..34f1c4e1 100644
--- a/config/example-extras.cfg
+++ b/config/example-extras.cfg
@@ -63,6 +63,11 @@
# triggered" state after a successful "pin_up" command. This should
# be True for a genuine BLTouch; some BLTouch clones may require
# False. The default is True.
+#pin_up_touch_mode_reports_triggered: True
+# Set if the BLTouch consistently reports a "triggered" state after
+# the commands "pin_up" followed by "touch_mode". This should be
+# True for a genuine BLTouch; some BLTouch clones may require
+# False. The default is True.
#x_offset:
#y_offset:
#z_offset:
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py
index ba3cc288..93256707 100644
--- a/klippy/extras/bltouch.py
+++ b/klippy/extras/bltouch.py
@@ -42,7 +42,8 @@ class BLTouchEndstopWrapper:
self.next_test_time = 0.
self.pin_up_not_triggered = config.getboolean(
'pin_up_reports_not_triggered', True)
- self.test_sensor_pin = config.getboolean('test_sensor_pin', True)
+ self.pin_up_touch_triggered = config.getboolean(
+ 'pin_up_touch_mode_reports_triggered', True)
self.start_mcu_pos = []
# Calculate pin move time
pmt = max(config.getfloat('pin_move_time', 0.200), MIN_CMD_TIME)
@@ -105,7 +106,8 @@ class BLTouchEndstopWrapper:
self.verify_state(check_start_time, check_end_time,
False, "raise probe")
def test_sensor(self):
- if not self.test_sensor_pin:
+ if not self.pin_up_touch_triggered:
+ # Nothing to test
return
toolhead = self.printer.lookup_object('toolhead')
print_time = toolhead.get_last_move_time()