q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed gcode regex slightly to be on the safe side (we don't want to accidentally capture comments etc)

master
Gina Häußge 2013-06-29 19:06:14 +02:00
parent 5b976b5300
commit a9c35e5cf9
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
octoprint/util/comm.py
View File

@ -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):