From a9c35e5cf904e07c76401a42fac39fdc363ab669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Sat, 29 Jun 2013 19:06:14 +0200 Subject: [PATCH] Changed gcode regex slightly to be on the safe side (we don't want to accidentally capture comments etc) --- octoprint/util/comm.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/octoprint/util/comm.py b/octoprint/util/comm.py index 68ebb5c6..9e6a5c73 100644 --- a/octoprint/util/comm.py +++ b/octoprint/util/comm.py @@ -801,18 +801,18 @@ class MachineCom(object): return if not self.isStreaming(): - gcode = re.search('([GM][0-9]+)', cmd) + gcode = re.search("^\s*([GM]\d+)", cmd) if gcode: gcode = gcode.group(1) - if gcode in gcodeToEvent: - eventManager().fire(gcodeToEvent[gcode]) + if gcode in gcodeToEvent: + eventManager().fire(gcodeToEvent[gcode]) - gcodeHandler = "_gcode_" + gcode - if hasattr(self, gcodeHandler): - cmd = getattr(self, gcodeHandler)(cmd) + gcodeHandler = "_gcode_" + gcode + if hasattr(self, gcodeHandler): + cmd = getattr(self, gcodeHandler)(cmd) - if cmd: + if cmd is not None: self._doSend(cmd, sendChecksum) def _doSend(self, cmd, sendChecksum=False):