pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed grbl version regex to be non-greedy

Browse source
This commit is contained in:
make-ing 2015-09-04 18:14:55 +02:00
parent bc4e0f2e35
commit 6f1c9ed8d9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/util/comm_acc.py
View file

@ -1003,7 +1003,7 @@ class MachineCom(object):
eventManager().fire(Events.ERROR, {"error": self.getErrorString()})
if("Grbl" in line):
versionMatch = re.search("Grbl (?P<grbl>.+)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
versionMatch = re.search("Grbl (?P<grbl>.+?)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
if(versionMatch):
versionDict = versionMatch.groupdict()
self._writeGrblVersionToFile(versionDict)