diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-03-29 10:14:25 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-03-29 21:17:53 -0400 |
| commit | df56c723b9e2c164ee555352913653e8fae8afcb (patch) | |
| tree | db1a95fa54914eb38264cb17ee60f0e4bd8444e2 /klippy/extras | |
| parent | 862d3f9633cd0234a92a198c62481a5b6b90074f (diff) | |
| download | kutter-df56c723b9e2c164ee555352913653e8fae8afcb.tar.gz kutter-df56c723b9e2c164ee555352913653e8fae8afcb.tar.xz kutter-df56c723b9e2c164ee555352913653e8fae8afcb.zip | |
homing: Minor simplification of verify_movement tracking
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras')
| -rw-r--r-- | klippy/extras/homing.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/klippy/extras/homing.py b/klippy/extras/homing.py index dfadf9cb..89327e4c 100644 --- a/klippy/extras/homing.py +++ b/klippy/extras/homing.py @@ -15,9 +15,6 @@ class Homing: self.printer = printer self.toolhead = printer.lookup_object('toolhead') self.changed_axes = [] - self.verify_retract = True - if self.printer.get_start_args().get("debuginput"): - self.verify_retract = False def set_axes(self, axes): self.changed_axes = axes def get_axes(self): @@ -97,7 +94,8 @@ class Homing: if error is not None: raise self.printer.command_error(error) # Check if some movement occurred - if verify_movement: + can_verify = self.printer.get_start_args().get('debuginput') is None + if verify_movement and can_verify: for s, name, spos, epos in end_mcu_pos: if spos == epos: if probe_pos: @@ -132,7 +130,7 @@ class Homing: for rp, ad in zip(retractpos, axes_d)] self.toolhead.set_position(forcepos) self.homing_move(movepos, endstops, hi.second_homing_speed, - verify_movement=self.verify_retract) + verify_movement=True) # Signal home operation complete self.toolhead.flush_step_generation() kin = self.toolhead.get_kinematics() @@ -169,9 +167,8 @@ class PrinterHoming: def probing_move(self, mcu_probe, pos, speed): homing_state = Homing(self.printer) endstops = [(mcu_probe, "probe")] - verify = self.printer.get_start_args().get('debugoutput') is None return homing_state.homing_move(pos, endstops, speed, - probe_pos=True, verify_movement=verify) + probe_pos=True, verify_movement=True) def cmd_G28(self, gcmd): # Move to origin axes = [] |