MMDVM/MMDVMHost
1
0
Fork 0
mirror of https://github.com/g4klx/MMDVMHost synced 2025-12-24 01:25:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #205 from phl0/dev

Browse Source 
Add proper exit code and success message
This commit is contained in:
Jonathan Naylor
2016-11-08 20:49:00 +00:00
committed by GitHub
parent 3aac82a23d 6f3b581123
commit b59dceb911
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Nextion/nextion.py
View File

@@ -36,10 +36,15 @@ def getBaudrate(ser, fSize=None, checkModel=None):
if 'comok' in r: if 'comok' in r:
print 'Connected with baudrate: ' + str(baudrate) + '...' print 'Connected with baudrate: ' + str(baudrate) + '...'
noConnect = False noConnect = False
status, unknown1, model, unknown2, version, serial, flashSize = r.strip("\xff\x00").split(',') status, unknown1, model, fwversion, mcucode, serial, flashSize = r.strip("\xff\x00").split(',')
print 'Status: ' + status print 'Status: ' + status.split(' ')[0]
if status.split(' ')[1] == "1":
print 'Touchscreen: yes'
else:
print 'Touchscreen: no'
print 'Model: ' + model print 'Model: ' + model
print 'Version: ' + version print 'Firmware version: ' + fwversion
print 'MCU code: ' + mcucode
print 'Serial: ' + serial print 'Serial: ' + serial
print 'Flash size: ' + flashSize print 'Flash size: ' + flashSize
if fSize and fSize > flashSize: if fSize and fSize > flashSize:
@@ -80,23 +85,26 @@ def transferFile(ser, filename, fSize):
if "\x05" in r: if "\x05" in r:
continue continue
else: else:
print
return False
break break
print print
return True return True
def upload(ser, filename, checkModel=None): def upload(ser, filename, checkModel=None):
if not getBaudrate(ser, os.path.getsize(filename), checkModel): if not getBaudrate(ser, os.path.getsize(filename), checkModel):
print 'could not find baudrate' print 'Could not find baudrate'
exit(1) exit(1)
if not setDownloadBaudrate(ser, os.path.getsize(filename), 115200): if not setDownloadBaudrate(ser, os.path.getsize(filename), 115200):
print 'could not set download baudrate' print 'Could not set download baudrate'
exit(1) exit(1)
if not transferFile(ser, filename, os.path.getsize(filename)): if not transferFile(ser, filename, os.path.getsize(filename)):
print 'could not transfer file' print 'Could not transfer file'
exit(1) exit(1)
print 'File transferred successfully'
exit(0) exit(0)
if __name__ == "__main__": if __name__ == "__main__":
@@ -111,7 +119,7 @@ if __name__ == "__main__":
except serial.serialutil.SerialException: except serial.serialutil.SerialException:
print 'could not open serial device ' + sys.argv[2] print 'could not open serial device ' + sys.argv[2]
exit(1) exit(1)
if (serial.VERSION <= "3.0"): if serial.VERSION <= "3.0":
if not ser.isOpen(): if not ser.isOpen():
ser.open() ser.open()
else: else: