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

gcode_macro: Add a default parameter to load_template

Browse source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-06-07 10:51:30 -04:00
parent 9613cd2c8a
commit 27ca159285
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
klippy/extras/gcode_macro.py
View file

@ -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')