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

fixed grbl version regexp bug

Browse source
This commit is contained in:
make-ing 2015-09-04 17:26:45 +02:00
parent 5b70cfb3e5
commit 46347cc95b
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -844,13 +844,9 @@ class MachineCom(object):
requiredGrblVer = str(grblReqDict['grbl']) + '_' + str(grblReqDict['git'])
if grblReqDict['dirty'] is not(None):
requiredGrblVer += '-dirty'
if grblReqDict['minor'] != '':
requiredGrblVer += ':' + grblReqDict['minor']
actualGrblVer = str(versionDict['grbl']) + '_' + str(versionDict['git'])
if versionDict['dirty'] is not(None):
actualGrblVer += '-dirty'
if versionDict['minor'] != '':
actualGrblVer += ':' + versionDict['minor']
# compare actual and required grbl version
self._requiredGrblVer = requiredGrblVer
self._actualGrblVer = actualGrblVer
@ -1007,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)?(?P<minor>.*) \[.+\]", 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)