From 27ca1592858f2d73f9bb1979c5eaf36446ab7f4c Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 7 Jun 2019 10:51:30 -0400 Subject: gcode_macro: Add a default parameter to load_template Signed-off-by: Kevin O'Connor --- klippy/extras/gcode_macro.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'klippy/extras/gcode_macro.py') 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') -- cgit v1.2.3-70-g09d2