Fix #523: strip comments in brackets and ; comments in printcore

printrun/gcoder.py

@@ -25,6 +25,7 @@ gcode_parsed_args = ["x", "y", "e", "f", "z", "i", "j"]
 gcode_parsed_nonargs = ["g", "t", "m", "n"]
 to_parse = "".join(gcode_parsed_args + gcode_parsed_nonargs)
 gcode_exp = re.compile("\([^\(\)]*\)|;.*|[/\*].*\n|([%s])([-+]?[0-9]*\.?[0-9]*)" % to_parse)
+gcode_strip_comment_exp = re.compile("\([^\(\)]*\)")
 m114_exp = re.compile("\([^\(\)]*\)|[/\*].*\n|([XYZ]):?([-+]?[0-9]*\.?[0-9]*)")
 specific_exp = "(?:\([^\(\)]*\))|(?:;.*)|(?:[/\*].*\n)|(%s[-+]?[0-9]*\.?[0-9]*)"
 move_gcodes = ["G0", "G1", "G2", "G3"]

printrun/printcore.py

@@ -551,8 +551,9 @@ class printcore():
                 self.clear = True
                 return
 
-            tline = tline.split(";")[0]
-            if len(tline) > 0:
+            # Strip comments
+            tline = gcoder.gcode_strip_comment_exp.sub("", tline)
+            if tline:
                 self._send(tline, self.lineno, True)
                 self.lineno += 1
                 if self.printsendcb: