gcode: Create new wrapper class for gcode command parameters

Instead of passing a dictionary to the command handlers, create a
wrapper class and pass that class to the command handlers.  This can
simplify the command handler code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/klippy/extras/gcode_macro.py b/klippy/extras/gcode_macro.py
index 2d4ebc75..b462e2cd 100644
--- a/klippy/extras/gcode_macro.py
+++ b/klippy/extras/gcode_macro.py
@@ -154,10 +154,10 @@ class GCodeMacro:
                 value,))
         self.variables[variable] = literal
     cmd_desc = "G-Code macro"
-    def cmd(self, params):
+    def cmd(self, gcmd):
         if self.in_script:
-            raise self.gcode.error(
-                "Macro %s called recursively" % (self.alias,))
+            raise gcmd.error("Macro %s called recursively" % (self.alias,))
+        params = gcmd.get_command_parameters()
         kwparams = dict(self.kwparams)
         kwparams.update(params)
         kwparams.update(self.variables)