respond: Simplify M118 handling

No need to check for '#original' in params - it's always there.
Properly handle a lower case m118 command.  Don't register a help text
for the legacy M118 g-code command.

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

1 files changed, 13 insertions, 16 deletions

diff --git a/klippy/extras/respond.py b/klippy/extras/respond.py
index dadd0ecc..b700b5e2 100644
--- a/klippy/extras/respond.py
+++ b/klippy/extras/respond.py
@@ -18,24 +18,21 @@ class HostResponder:
                                                'echo')
         self.default_prefix = config.get('default_prefix', self.default_prefix)
         self.gcode = self.printer.lookup_object('gcode')
-        self.cmd_M118_help = "Send a message to the host prefixed with '%s'" % (
-            self.default_prefix,)
-        self.gcode.register_command(
-            'M118', self.cmd_M118, True, desc=self.cmd_M118_help)
+        self.gcode.register_command('M118', self.cmd_M118, True)
         self.gcode.register_command('RESPOND', self.cmd_RESPOND, True)
     def cmd_M118(self, params):
-        if '#original' in params:
-            msg = params['#original']
-            if not msg.startswith('M118'):
-                # Parse out additional info if M118 recd during a print
-                start = msg.find('M118')
-                end = msg.rfind('*')
-                msg = msg[start:end]
-            if len(msg) > 5:
-                msg = msg[5:]
-            else:
-                msg = ''
-            self.gcode.respond("%s %s" %(self.default_prefix, msg))
+        msg = params['#original']
+        umsg = msg.upper()
+        if not umsg.startswith('M118'):
+            # Parse out additional info if M118 recd during a print
+            start = umsg.find('M118')
+            end = msg.rfind('*')
+            msg = msg[start:end]
+        if len(msg) > 5:
+            msg = msg[5:]
+        else:
+            msg = ''
+        self.gcode.respond("%s %s" % (self.default_prefix, msg))
     def cmd_RESPOND(self, params):
         respond_type = self.gcode.get_str('TYPE', params, None)
         prefix = self.default_prefix