aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/extras/homing_override.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2020-04-24 22:38:25 -0400
committerKevin O'Connor <kevin@koconnor.net>2020-05-05 11:08:11 -0400
commit153c1cbe6074cf9c28edadd8d33240ca6845f8c2 (patch)
tree01b99557f2482f421e9a80265c096694c6c47326 /klippy/extras/homing_override.py
parent1f64ca4fd97a7ae8511accaa1124c862e7a03820 (diff)
downloadkutter-153c1cbe6074cf9c28edadd8d33240ca6845f8c2.tar.gz
kutter-153c1cbe6074cf9c28edadd8d33240ca6845f8c2.tar.xz
kutter-153c1cbe6074cf9c28edadd8d33240ca6845f8c2.zip
homing_override: Use new GCodeCommand wrappers
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/homing_override.py')
-rw-r--r--klippy/extras/homing_override.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/klippy/extras/homing_override.py b/klippy/extras/homing_override.py
index b15b3b9f..0f1bd0ba 100644
--- a/klippy/extras/homing_override.py
+++ b/klippy/extras/homing_override.py
@@ -16,16 +16,16 @@ class HomingOverride:
self.gcode = self.printer.lookup_object('gcode')
self.prev_G28 = self.gcode.register_command("G28", None)
self.gcode.register_command("G28", self.cmd_G28)
- def cmd_G28(self, params):
+ def cmd_G28(self, gcmd):
if self.in_script:
# Was called recursively - invoke the real G28 command
- self.prev_G28(params)
+ self.prev_G28(gcmd)
return
# if no axis is given as parameter we assume the override
no_axis = True
for axis in 'XYZ':
- if axis in params:
+ if gcmd.get(axis, None) is not None:
no_axis = False
break
@@ -35,11 +35,11 @@ class HomingOverride:
# check if we home an axsis which needs the override
override = False
for axis in self.axes:
- if axis in params:
+ if gcmd.get(axis, None) is not None:
override = True
if not override:
- self.gcode.cmd_G28(params)
+ self.gcode.cmd_G28(gcmd)
return
# Calculate forced position (if configured)
@@ -54,7 +54,7 @@ class HomingOverride:
self.gcode.reset_last_position()
# Perform homing
kwparams = { 'printer': self.template.create_status_wrapper() }
- kwparams['params'] = params.get_command_parameters()
+ kwparams['params'] = gcmd.get_command_parameters()
try:
self.in_script = True
self.template.run_gcode_from_command(kwparams)