diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-06-07 10:51:30 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-06-07 10:51:57 -0400 |
| commit | 27ca1592858f2d73f9bb1979c5eaf36446ab7f4c (patch) | |
| tree | 9e18c8d86d71f88300e4d867395d840ae73d4eef /klippy | |
| parent | 9613cd2c8a5e7e9dc1f24c153467d08b019da0a5 (diff) | |
| download | kutter-27ca1592858f2d73f9bb1979c5eaf36446ab7f4c.tar.gz kutter-27ca1592858f2d73f9bb1979c5eaf36446ab7f4c.tar.xz kutter-27ca1592858f2d73f9bb1979c5eaf36446ab7f4c.zip | |
gcode_macro: Add a default parameter to load_template
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/extras/gcode_macro.py | 8 | ||||
| -rw-r--r-- | klippy/extras/homing_override.py | 1 | ||||
| -rw-r--r-- | klippy/extras/probe.py | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/klippy/extras/gcode_macro.py b/klippy/extras/gcode_macro.py index 0ad695b6..977a763d 100644 --- a/klippy/extras/gcode_macro.py +++ b/klippy/extras/gcode_macro.py @@ -68,9 +68,12 @@ class PrinterGCodeMacro: def __init__(self, config): self.printer = config.get_printer() self.env = jinja2.Environment('{%', '%}', '{', '}') - def load_template(self, config, option): + def load_template(self, config, option, default=None): name = "%s:%s" % (config.get_name(), option) - script = config.get(option, '') + if default is None: + script = config.get(option) + else: + script = config.get(option, default) return TemplateWrapper(self.printer, self.env, name, script) def load_config(config): @@ -86,7 +89,6 @@ class GCodeMacro: name = config.get_name().split()[1] self.alias = name.upper() printer = config.get_printer() - config.get('gcode') gcode_macro = printer.try_load_module(config, 'gcode_macro') self.template = gcode_macro.load_template(config, 'gcode') self.gcode = printer.lookup_object('gcode') diff --git a/klippy/extras/homing_override.py b/klippy/extras/homing_override.py index 06058692..5e258d91 100644 --- a/klippy/extras/homing_override.py +++ b/klippy/extras/homing_override.py @@ -10,7 +10,6 @@ class HomingOverride: self.start_pos = [config.getfloat('set_position_' + a, None) for a in 'xyz'] self.axes = config.get('axes', 'XYZ').upper() - 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 diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py index 204375bf..b6deec4f 100644 --- a/klippy/extras/probe.py +++ b/klippy/extras/probe.py @@ -198,9 +198,9 @@ class ProbeEndstopWrapper: self.position_endstop = config.getfloat('z_offset') gcode_macro = self.printer.try_load_module(config, 'gcode_macro') self.activate_gcode = gcode_macro.load_template( - config, 'activate_gcode') + config, 'activate_gcode', '') self.deactivate_gcode = gcode_macro.load_template( - config, 'deactivate_gcode') + config, 'deactivate_gcode', '') # Create an "endstop" object to handle the probe pin ppins = self.printer.lookup_object('pins') pin = config.get('pin') |