Changed gcode regex slightly to be on the safe side (we don't want to accidentally capture comments etc)
parent
5b976b5300
commit
a9c35e5cf9
|
@ -801,18 +801,18 @@ class MachineCom(object):
|
||||||
return
|
return
|
||||||
|
|
||||||
if not self.isStreaming():
|
if not self.isStreaming():
|
||||||
gcode = re.search('([GM][0-9]+)', cmd)
|
gcode = re.search("^\s*([GM]\d+)", cmd)
|
||||||
if gcode:
|
if gcode:
|
||||||
gcode = gcode.group(1)
|
gcode = gcode.group(1)
|
||||||
|
|
||||||
if gcode in gcodeToEvent:
|
if gcode in gcodeToEvent:
|
||||||
eventManager().fire(gcodeToEvent[gcode])
|
eventManager().fire(gcodeToEvent[gcode])
|
||||||
|
|
||||||
gcodeHandler = "_gcode_" + gcode
|
gcodeHandler = "_gcode_" + gcode
|
||||||
if hasattr(self, gcodeHandler):
|
if hasattr(self, gcodeHandler):
|
||||||
cmd = getattr(self, gcodeHandler)(cmd)
|
cmd = getattr(self, gcodeHandler)(cmd)
|
||||||
|
|
||||||
if cmd:
|
if cmd is not None:
|
||||||
self._doSend(cmd, sendChecksum)
|
self._doSend(cmd, sendChecksum)
|
||||||
|
|
||||||
def _doSend(self, cmd, sendChecksum=False):
|
def _doSend(self, cmd, sendChecksum=False):
|
||||||
|
|
Loading…
Reference in New Issue