gcode_macro: adds RELOAD_GCODE_MACROS

README.md

@@ -44,6 +44,8 @@ See the [Danger Features document](https://dangerklipper.io/Danger_Features.html
 
 - [gcode: HEATER_INTERRUPT gcode command](https://github.com/DangerKlippers/danger-klipper/pull/94)
 
+- [gcode: RELOAD_GCODE_MACROS command](https://github.com/DangerKlippers/danger-klipper/pull/305)
+
 - [probe: dockable Probe](https://github.com/DangerKlippers/danger-klipper/pull/43) ([klipper#4328](https://github.com/Klipper3d/klipper/pull/4328))
 
 - [probe: drop the first result](https://github.com/DangerKlippers/danger-klipper/pull/2) ([klipper#3397](https://github.com/Klipper3d/klipper/issues/3397))

docs/Danger_Features.md

@@ -49,6 +49,7 @@
 
 - The jinja `do` extension has been enabled. You can now call functions in your macros without resorting to dirty hacks: `{% do array.append(5) %}`
 - The python [`math`](https://docs.python.org/3/library/math.html) library is available to macros. `{math.sin(math.pi * variable)}` and more!
+- New [`RELOAD_GCODE_MACROS`](./G-Codes.md#reload_gcode_macros) G-Code command to reload `[gcode_macro]` templates without requiring a restart.
 
 ## [Plugins](./Plugins.md)
 Extend your Danger Klipper installation with custom plugins.

docs/G-Codes.md

@@ -380,7 +380,7 @@ commands are available when a
 - `MOVE_TO_DETACH_PROBE`: Move away from the dock to disconnect the probe
   from the toolhead.
 - `MOVE_AVOIDING_DOCK [X=<value>] [Y=<value>] [SPEED=<value>]`: Move to the
-  defined point (absolute coordinates) avoiding the safe dock area 
+  defined point (absolute coordinates) avoiding the safe dock area
 
 ### [dual_carriage]
 
@@ -742,6 +742,12 @@ enabled (also see the
 This command allows one to change the value of a gcode_macro variable
 at run-time. The provided VALUE is parsed as a Python literal.
 
+#### RELOAD_GCODE_MACROS
+`RELOAD_GCODE_MACROS`: This command reads the config files and reloads
+all previously loaded gcode templates. It does not load new `[gcode_macro]`
+objects or unload deleted ones. Variables modified with SET_GCODE_VARIABLE
+remain unaffected.
+
 ### [gcode_move]
 
 The gcode_move module is automatically loaded.

klippy/configfile.py

@@ -273,9 +273,12 @@ def __init__(self, printer):
         self.unused_options = []
         self.save_config_pending = False
         gcode = self.printer.lookup_object("gcode")
-        gcode.register_command(
-            "SAVE_CONFIG", self.cmd_SAVE_CONFIG, desc=self.cmd_SAVE_CONFIG_help
-        )
+        if "SAVE_CONFIG" not in gcode.ready_gcode_handlers:
+            gcode.register_command(
+                "SAVE_CONFIG",
+                self.cmd_SAVE_CONFIG,
+                desc=self.cmd_SAVE_CONFIG_help,
+            )
 
     def get_printer(self):
         return self.printer

klippy/console.py

@@ -75,7 +75,9 @@ def connect(self, eventtime):
         message_count = len(msgparser.get_messages())
         app = msgparser.get_app_info()
         version, build_versions = msgparser.get_version_info()
-        self.output(f"Loaded {message_count} commands ({app} {version} / {build_versions})")
+        self.output(
+            f"Loaded {message_count} commands ({app} {version} / {build_versions})"
+        )
         self.output(
             "MCU config: %s"
             % (

klippy/extras/gcode_macro.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import traceback, logging, ast, copy, json
 import jinja2, math
-
+import configfile
 
 ######################################################################
 # Template handling
@@ -79,6 +79,25 @@ def run_gcode_from_command(self, context=None):
         self.gcode.run_script_from_command(self.render(context))
 
 
+class Template:
+    def __init__(self, printer, env, name, script) -> None:
+        self.name = name
+        self.printer = printer
+        self.env = env
+        self.function = TemplateWrapper(self.printer, self.env, name, script)
+
+    def __call__(self, context=None):
+        return self.function(context)
+
+    def __getattr__(self, name):
+        return getattr(self.function, name)
+
+    def reload(self, script):
+        self.function = TemplateWrapper(
+            self.printer, self.env, self.name, script
+        )
+
+
 # Main gcode macro template tracking
 class PrinterGCodeMacro:
     def __init__(self, config):
@@ -87,13 +106,18 @@ def __init__(self, config):
             "{%", "%}", "{", "}", extensions=["jinja2.ext.do"]
         )
 
+        self.gcode = self.printer.lookup_object("gcode")
+        self.gcode.register_command(
+            "RELOAD_GCODE_MACROS", self.cmd_RELOAD_GCODE_MACROS
+        )
+
     def load_template(self, config, option, default=None):
         name = "%s:%s" % (config.get_name(), option)
         if default is None:
             script = config.get(option)
         else:
             script = config.get(option, default)
-        return TemplateWrapper(self.printer, self.env, name, script)
+        return Template(self.printer, self.env, name, script)
 
     def _action_emergency_stop(self, msg="action_emergency_stop"):
         self.printer.invoke_shutdown("Shutdown due to %s" % (msg,))
@@ -124,6 +148,23 @@ def create_template_context(self, eventtime=None):
             "math": math,
         }
 
+    def cmd_RELOAD_GCODE_MACROS(self, gcmd):
+        pconfig = configfile.PrinterConfig(self.printer)
+        new_config = pconfig.read_main_config()
+        for name, obj in self.printer.lookup_objects("gcode_macro"):
+            try:
+                new_section = new_config.getsection(name)
+            except:
+                continue
+
+            if name in [
+                s.get_name()
+                for s in new_config.get_prefix_sections("gcode_macro")
+            ]:
+                template = obj.template
+                new_script = new_section.get("gcode").strip()
+                template.reload(new_script)
+
 
 def load_config(config):
     return PrinterGCodeMacro(config)

test/klippy/gcode_jinja2_ext_do.test

@@ -22,3 +22,9 @@ NONE_TEST
 
 # Move again
 G1 Z9
+
+# Reload macros command
+RELOAD_GCODE_MACROS
+
+# test again
+NONE_TEST