respond: Use new GCodeCommand wrappers

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

1 files changed, 12 insertions, 12 deletions

diff --git a/klippy/extras/respond.py b/klippy/extras/respond.py
index 745ccc7c..0e228108 100644
--- a/klippy/extras/respond.py
+++ b/klippy/extras/respond.py
@@ -17,11 +17,11 @@ class HostResponder:
         self.default_prefix = config.getchoice('default_type', respond_types,
                                                'echo')
         self.default_prefix = config.get('default_prefix', self.default_prefix)
-        self.gcode = self.printer.lookup_object('gcode')
-        self.gcode.register_command('M118', self.cmd_M118, True)
-        self.gcode.register_command('RESPOND', self.cmd_RESPOND, True)
-    def cmd_M118(self, params):
-        msg = params['#original']
+        gcode = self.printer.lookup_object('gcode')
+        gcode.register_command('M118', self.cmd_M118, True)
+        gcode.register_command('RESPOND', self.cmd_RESPOND, True)
+    def cmd_M118(self, gcmd):
+        msg = gcmd.get_commandline()
         umsg = msg.upper()
         if not umsg.startswith('M118'):
             # Parse out additional info if M118 recd during a print
@@ -32,21 +32,21 @@ class HostResponder:
             msg = msg[5:]
         else:
             msg = ''
-        self.gcode.respond_raw("%s %s" % (self.default_prefix, msg))
-    def cmd_RESPOND(self, params):
-        respond_type = self.gcode.get_str('TYPE', params, None)
+        gcmd.respond_raw("%s %s" % (self.default_prefix, msg))
+    def cmd_RESPOND(self, gcmd):
+        respond_type = gcmd.get('TYPE', None)
         prefix = self.default_prefix
         if(respond_type != None):
             respond_type = respond_type.lower()
             if(respond_type in respond_types):
                 prefix = respond_types[respond_type]
             else:
-                raise self.gcode.error(
+                raise gcmd.error(
                     "RESPOND TYPE '%s' is invalid. Must be one"
                     " of 'echo', 'command', or 'error'" % (respond_type,))
-        prefix = self.gcode.get_str('PREFIX', params, prefix)
-        msg = self.gcode.get_str('MSG', params, '')
-        self.gcode.respond_raw("%s %s" %(prefix, msg))
+        prefix = gcmd.get('PREFIX', prefix)
+        msg = gcmd.get('MSG', '')
+        gcmd.respond_raw("%s %s" % (prefix, msg))
 
 def load_config(config):
     return HostResponder(config)