3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

homing: Minor simplification of verify_movement tracking 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2021-03-29 10:14:25 -04:00
parent 862d3f9633
commit df56c723b9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
klippy/extras/homing.py
View File

@ -15,9 +15,6 @@ class Homing:
self.printer = printer self.printer = printer
self.toolhead = printer.lookup_object('toolhead') self.toolhead = printer.lookup_object('toolhead')
self.changed_axes = [] self.changed_axes = []
self.verify_retract = True
if self.printer.get_start_args().get("debuginput"):
self.verify_retract = False
def set_axes(self, axes): def set_axes(self, axes):
self.changed_axes = axes self.changed_axes = axes
def get_axes(self): def get_axes(self):
@ -97,7 +94,8 @@ class Homing:
if error is not None: if error is not None:
raise self.printer.command_error(error) raise self.printer.command_error(error)
# Check if some movement occurred # 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: for s, name, spos, epos in end_mcu_pos:
if spos == epos: if spos == epos:
if probe_pos: if probe_pos:
@ -132,7 +130,7 @@ class Homing:
for rp, ad in zip(retractpos, axes_d)] for rp, ad in zip(retractpos, axes_d)]
self.toolhead.set_position(forcepos) self.toolhead.set_position(forcepos)
self.homing_move(movepos, endstops, hi.second_homing_speed, self.homing_move(movepos, endstops, hi.second_homing_speed,
verify_movement=self.verify_retract) verify_movement=True)
# Signal home operation complete # Signal home operation complete
self.toolhead.flush_step_generation() self.toolhead.flush_step_generation()
kin = self.toolhead.get_kinematics() kin = self.toolhead.get_kinematics()
@ -169,9 +167,8 @@ class PrinterHoming:
def probing_move(self, mcu_probe, pos, speed): def probing_move(self, mcu_probe, pos, speed):
homing_state = Homing(self.printer) homing_state = Homing(self.printer)
endstops = [(mcu_probe, "probe")] endstops = [(mcu_probe, "probe")]
verify = self.printer.get_start_args().get('debugoutput') is None
return homing_state.homing_move(pos, endstops, speed, 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): def cmd_G28(self, gcmd):
# Move to origin # Move to origin
axes = [] axes = []