aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2020-02-19 13:34:06 -0500
committerKevin O'Connor <kevin@koconnor.net>2020-02-19 13:38:22 -0500
commit15f21be5ec83733706328dbf2b6870332056e3ff (patch)
treebbcbbb8b7826b5f67614ccc851f1396020fe3dff /klippy/extras
parent804f95ebe4961566603747165ec90a1676a0dc7d (diff)
downloadkutter-15f21be5ec83733706328dbf2b6870332056e3ff.tar.gz
kutter-15f21be5ec83733706328dbf2b6870332056e3ff.tar.xz
kutter-15f21be5ec83733706328dbf2b6870332056e3ff.zip
manual_stepper: Support ignoring errors on STOP_ON_ENDSTOP
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
-rw-r--r--klippy/extras/manual_stepper.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py
index ea3d63cf..87e6515d 100644
--- a/klippy/extras/manual_stepper.py
+++ b/klippy/extras/manual_stepper.py
@@ -74,7 +74,7 @@ class ManualStepper:
toolhead = self.printer.lookup_object('toolhead')
toolhead.note_kinematic_activity(self.next_cmd_time)
self.sync_print_time()
- def do_homing_move(self, movepos, speed, accel, triggered):
+ def do_homing_move(self, movepos, speed, accel, triggered, check_trigger):
if not self.can_home:
raise self.gcode.error("No endstop for this manual stepper")
# Start endstop checking
@@ -92,7 +92,7 @@ class ManualStepper:
error = None
for mcu_endstop, name in endstops:
did_trigger = mcu_endstop.home_wait(self.next_cmd_time)
- if not did_trigger and error is None:
+ if not did_trigger and check_trigger and error is None:
error = "Failed to home %s: Timeout during homing" % (name,)
self.sync_print_time()
if error is not None:
@@ -109,7 +109,8 @@ class ManualStepper:
accel = self.gcode.get_float('ACCEL', params, self.accel, minval=0.)
if homing_move:
movepos = self.gcode.get_float('MOVE', params)
- self.do_homing_move(movepos, speed, accel, homing_move > 0)
+ self.do_homing_move(movepos, speed, accel,
+ homing_move > 0, abs(homing_move) == 1)
elif 'MOVE' in params:
movepos = self.gcode.get_float('MOVE', params)
self.do_move(movepos, speed, accel)