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

try to fix grbl flashing problem on pi

Browse source
This commit is contained in:
make-ing 2015-09-07 11:07:05 +02:00
parent e5cc1361c6
commit dabcca4297
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/octoprint/grbl/grblVersionRequirement.yml
View file

@ -1 +1 @@
{dirty: false, git: 694fb26, grbl: 0.9g, lastConnect: null, minor: ''}
{dirty: false, git: 694fb26, grbl: 0.9g, lastConnect: null}

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

@ -843,7 +843,8 @@ class MachineCom(object):
outfile.write(yaml.dump(versionDict, default_flow_style=True))
def _compareGrblVersion(self, versionDict):
with open("src/octoprint/grbl/grblVersionRequirement.yml", 'r') as infile:
cwd = os.path.dirname(__file__)
with open(cwd + "/../grbl/grblVersionRequirement.yml", 'r') as infile:
import yaml
grblReqDict = yaml.load(infile)
requiredGrblVer = str(grblReqDict['grbl']) + '_' + str(grblReqDict['git'])
@ -855,6 +856,8 @@ class MachineCom(object):
# compare actual and required grbl version
self._requiredGrblVer = requiredGrblVer
self._actualGrblVer = actualGrblVer
print repr(requiredGrblVer)
print repr(actualGrblVer)
if requiredGrblVer != actualGrblVer:
self._log("unsupported grbl version detected...")
self._log("required: " + requiredGrblVer)
@ -866,11 +869,14 @@ class MachineCom(object):
def _flashGrbl(self):
self._changeState(self.STATE_FLASHING)
self._serial.close()
cwd = os.getcwd()
pathToGrblHex = cwd + "/src/octoprint/grbl/grbl.hex"
cwd = os.path.dirname(__file__)
pathToGrblHex = cwd + "/../grbl/grbl.hex"
import subprocess
params = ["avrdude", "-patmega328p", "-carduino", "-b" + str(self._baudrate), "-P" + str(self._port), "-D", "-Uflash:w:" + pathToGrblHex]
returnCode = subprocess.call(params)
try:
params = ["avrdude", "-patmega328p", "-carduino", "-b" + str(self._baudrate), "-P" + str(self._port), "-D", "-Uflash:w:" + pathToGrblHex]
returnCode = subprocess.call(params)
except:
self._log("Error in subprocess.call()")
if returnCode == False:
self._log("successfully flashed new grbl version")
self._openSerial()