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

fixed grbl version string bug; fixed grbl.hex not found flashing bug

Browse source
This commit is contained in:
make-ing 2015-09-05 13:09:57 +02:00
parent c482a487f6
commit e5cc1361c6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,6 +159,8 @@ class MachineCom(object):
self._timeout = None
self._errorValue = "Unknown Error"
self._alwaysSendChecksum = settings().getBoolean(["feature", "alwaysSendChecksum"])
self._sendChecksumWithUnknownCommands = settings().getBoolean(["feature", "sendChecksumWithUnknownCommands"])
self._unknownCommandsNeedAck = settings().getBoolean(["feature", "unknownCommandsNeedAck"])
@ -845,7 +847,7 @@ class MachineCom(object):
import yaml
grblReqDict = yaml.load(infile)
requiredGrblVer = str(grblReqDict['grbl']) + '_' + str(grblReqDict['git'])
if grblReqDict['dirty'] is not(None):
if grblReqDict['dirty'] is True:
requiredGrblVer += '-dirty'
actualGrblVer = str(versionDict['grbl']) + '_' + str(versionDict['git'])
if versionDict['dirty'] is not(None):
@ -864,14 +866,17 @@ class MachineCom(object):
def _flashGrbl(self):
self._changeState(self.STATE_FLASHING)
self._serial.close()
cwd = os.getcwd()
pathToGrblHex = cwd + "/src/octoprint/grbl/grbl.hex"
import subprocess
params = ["avrdude", "-patmega328p", "-carduino", "-b" + str(self._baudrate), "-P" + str(self._port), "-D", "-Uflash:w:grbl.hex"]
params = ["avrdude", "-patmega328p", "-carduino", "-b" + str(self._baudrate), "-P" + str(self._port), "-D", "-Uflash:w:" + pathToGrblHex]
returnCode = subprocess.call(params)
if returnCode == False:
self._log("successfully flashed new grbl version")
self._openSerial()
else:
self._log("error during flashing of new grbl version")
self._errorValue = "avrdude returncode: %s" % returnCode
self._changeState(self.STATE_CLOSED_WITH_ERROR)