3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-08-05 21:14:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

gcode: Return previous handler from register_command(cmd, None)

Browse source 
When overriding a g-code command, allow the caller to obtain the
previous command handler.  Use this feature in homing_override and
safe_z_home.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2020-02-12 20:19:18 -05:00
parent 512ad4b3a4
commit 0cfab84e1a
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
klippy/extras/safe_z_home.py
View file

@ -21,7 +21,7 @@ class SafeZHoming:
self.speed = config.getfloat('speed', 50.0, above=0.)
self.move_to_previous = config.getboolean('move_to_previous', False)
self.gcode = self.printer.lookup_object('gcode')
self.gcode.register_command("G28", None)
self.prev_G28 = self.gcode.register_command("G28", None)
self.gcode.register_command("G28", self.cmd_G28)
if config.has_section("homing_override"):
@ -63,7 +63,7 @@ class SafeZHoming:
if need_y:
new_params['Y'] = '0'
if new_params:
self.gcode.cmd_G28(new_params)
self.prev_G28(new_params)
# Home Z axis if necessary
if need_z:
# Move to safe XY homing position
@ -75,7 +75,7 @@ class SafeZHoming:
toolhead.move(pos, self.speed)
self.gcode.reset_last_position()
# Home Z
self.gcode.cmd_G28({'Z': '0'})
self.prev_G28({'Z': '0'})
# Perform Z Hop again for pressure-based probes
pos = toolhead.get_position()
if self.z_hop: