diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-04-02 22:09:37 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-04-04 18:35:23 -0400 |
| commit | 79ecee0996452ec102f6d92b11246fc1208c64b2 (patch) | |
| tree | ba73f2d1d94582042b6d1b69ccc716438fa92929 /klippy/extras/homing_override.py | |
| parent | 7d246e26244669e7ae3a81a37560be41787e2420 (diff) | |
| download | kutter-79ecee0996452ec102f6d92b11246fc1208c64b2.tar.gz kutter-79ecee0996452ec102f6d92b11246fc1208c64b2.tar.xz kutter-79ecee0996452ec102f6d92b11246fc1208c64b2.zip | |
homing_override: Use gcode_macro style templates on gcode
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/extras/homing_override.py')
| -rw-r--r-- | klippy/extras/homing_override.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/klippy/extras/homing_override.py b/klippy/extras/homing_override.py index 117fdf7c..06058692 100644 --- a/klippy/extras/homing_override.py +++ b/klippy/extras/homing_override.py @@ -10,7 +10,9 @@ class HomingOverride: self.start_pos = [config.getfloat('set_position_' + a, None) for a in 'xyz'] self.axes = config.get('axes', 'XYZ').upper() - self.script = config.get('gcode') + config.get('gcode') + gcode_macro = self.printer.try_load_module(config, 'gcode_macro') + self.template = gcode_macro.load_template(config, 'gcode') self.in_script = False self.gcode = self.printer.lookup_object('gcode') self.gcode.register_command("G28", None) @@ -54,7 +56,7 @@ class HomingOverride: # Perform homing try: self.in_script = True - self.gcode.run_script_from_command(self.script) + self.template.run_gcode_from_command() finally: self.in_script = False |