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

probe: Rename probe_prepare/finalize to probe_prepare/finish 

The probe_finalize() name is used for callbacks in both the
PrinterProbe and ProbePointsHelper classes.  Rename the PrinterProbe
callback to avoid confusion.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-04-25 12:01:52 -04:00
parent 64031ab3d7
commit c590bf7643
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
klippy/extras/bltouch.py
View File

@ -182,7 +182,7 @@ class BLTouchEndstopWrapper:
toolhead.flush_step_generation()
self.start_mcu_pos = [(s, s.get_mcu_position())
for s in self.mcu_endstop.get_steppers()]
def probe_finalize(self):
def probe_finish(self):
if self.multi == 'OFF':
self.raise_probe()
self.sync_print_time()

4
klippy/extras/probe.py
View File

@ -71,7 +71,7 @@ class PrinterProbe:
self.mcu_probe.probe_prepare()
def _handle_homing_move_end(self, endstops):
if self.mcu_probe in endstops:
self.mcu_probe.probe_finalize()
self.mcu_probe.probe_finish()
def _handle_home_rails_begin(self, rails):
endstops = [es for rail in rails for es, name in rail.get_endstops()]
if self.mcu_probe in endstops:
@ -311,7 +311,7 @@ class ProbeEndstopWrapper:
if toolhead.get_position()[:3] != start_pos[:3]:
raise homing.CommandError(
"Toolhead moved during probe activate_gcode script")
def probe_finalize(self):
def probe_finish(self):
toolhead = self.printer.lookup_object('toolhead')
start_pos = toolhead.get_position()
self.deactivate_gcode.run_gcode_from_command()