From 81708858f82a292d060dc4ac43bea30127c8542d Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2016 16:10:12 +0100 Subject: [PATCH 1/6] Add info about touchscreen support --- Nextion/nextion.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Nextion/nextion.py b/Nextion/nextion.py index 18de35a..c193735 100644 --- a/Nextion/nextion.py +++ b/Nextion/nextion.py @@ -37,7 +37,11 @@ def getBaudrate(ser, fSize=None, checkModel=None): print 'Connected with baudrate: ' + str(baudrate) + '...' noConnect = False status, unknown1, model, unknown2, version, 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 'Version: ' + version print 'Serial: ' + serial From 61b87bea2073a76d67ab9001a56a716d23cce90e Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2016 16:11:57 +0100 Subject: [PATCH 2/6] Add info about firmware version --- Nextion/nextion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nextion/nextion.py b/Nextion/nextion.py index c193735..54aa6d4 100644 --- a/Nextion/nextion.py +++ b/Nextion/nextion.py @@ -36,14 +36,14 @@ def getBaudrate(ser, fSize=None, checkModel=None): if 'comok' in r: print 'Connected with baudrate: ' + str(baudrate) + '...' noConnect = False - status, unknown1, model, unknown2, version, serial, flashSize = r.strip("\xff\x00").split(',') + status, unknown1, model, fwversion, version, serial, flashSize = r.strip("\xff\x00").split(',') print 'Status: ' + status.split(' ')[0] if (status.split(' ')[1] == "1"): print 'Touchscreen: yes' else: print 'Touchscreen: no' print 'Model: ' + model - print 'Version: ' + version + print 'Firmware version: ' + fwversion print 'Serial: ' + serial print 'Flash size: ' + flashSize if fSize and fSize > flashSize: From 6ff224f13e5f15978e8a05ee780ba8b9516947fa Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2016 16:14:12 +0100 Subject: [PATCH 3/6] Move version info to MCU version --- Nextion/nextion.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Nextion/nextion.py b/Nextion/nextion.py index 54aa6d4..b08c7a9 100644 --- a/Nextion/nextion.py +++ b/Nextion/nextion.py @@ -36,7 +36,7 @@ def getBaudrate(ser, fSize=None, checkModel=None): if 'comok' in r: print 'Connected with baudrate: ' + str(baudrate) + '...' noConnect = False - status, unknown1, model, fwversion, version, serial, flashSize = r.strip("\xff\x00").split(',') + status, unknown1, model, fwversion, mcuversion, serial, flashSize = r.strip("\xff\x00").split(',') print 'Status: ' + status.split(' ')[0] if (status.split(' ')[1] == "1"): print 'Touchscreen: yes' @@ -44,6 +44,7 @@ def getBaudrate(ser, fSize=None, checkModel=None): print 'Touchscreen: no' print 'Model: ' + model print 'Firmware version: ' + fwversion + print 'MCU version: ' + mcuversion print 'Serial: ' + serial print 'Flash size: ' + flashSize if fSize and fSize > flashSize: From 63aa842c706c36223422ebca412351b64ea7e4b5 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2016 16:22:47 +0100 Subject: [PATCH 4/6] Remove needless brackets --- Nextion/nextion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nextion/nextion.py b/Nextion/nextion.py index b08c7a9..ecb11a8 100644 --- a/Nextion/nextion.py +++ b/Nextion/nextion.py @@ -38,7 +38,7 @@ def getBaudrate(ser, fSize=None, checkModel=None): noConnect = False status, unknown1, model, fwversion, mcuversion, serial, flashSize = r.strip("\xff\x00").split(',') print 'Status: ' + status.split(' ')[0] - if (status.split(' ')[1] == "1"): + if status.split(' ')[1] == "1": print 'Touchscreen: yes' else: print 'Touchscreen: no' @@ -116,7 +116,7 @@ if __name__ == "__main__": except serial.serialutil.SerialException: print 'could not open serial device ' + sys.argv[2] exit(1) - if (serial.VERSION <= "3.0"): + if serial.VERSION <= "3.0": if not ser.isOpen(): ser.open() else: From 2b80ca7732d1701cb8c8dde9564b9e531589b988 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2016 16:26:26 +0100 Subject: [PATCH 5/6] Change MCU version to MCU code --- Nextion/nextion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Nextion/nextion.py b/Nextion/nextion.py index ecb11a8..7360845 100644 --- a/Nextion/nextion.py +++ b/Nextion/nextion.py @@ -36,7 +36,7 @@ def getBaudrate(ser, fSize=None, checkModel=None): if 'comok' in r: print 'Connected with baudrate: ' + str(baudrate) + '...' noConnect = False - status, unknown1, model, fwversion, mcuversion, serial, flashSize = r.strip("\xff\x00").split(',') + status, unknown1, model, fwversion, mcucode, serial, flashSize = r.strip("\xff\x00").split(',') print 'Status: ' + status.split(' ')[0] if status.split(' ')[1] == "1": print 'Touchscreen: yes' @@ -44,7 +44,7 @@ def getBaudrate(ser, fSize=None, checkModel=None): print 'Touchscreen: no' print 'Model: ' + model print 'Firmware version: ' + fwversion - print 'MCU version: ' + mcuversion + print 'MCU code: ' + mcucode print 'Serial: ' + serial print 'Flash size: ' + flashSize if fSize and fSize > flashSize: From 6f3b581123949b836093652e2e20944ba45efcc1 Mon Sep 17 00:00:00 2001 From: phl0 Date: Tue, 8 Nov 2016 21:45:52 +0100 Subject: [PATCH 6/6] Add proper exit code and success message --- Nextion/nextion.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Nextion/nextion.py b/Nextion/nextion.py index 7360845..b9e501e 100644 --- a/Nextion/nextion.py +++ b/Nextion/nextion.py @@ -85,23 +85,26 @@ def transferFile(ser, filename, fSize): if "\x05" in r: continue else: + print + return False break print return True def upload(ser, filename, checkModel=None): if not getBaudrate(ser, os.path.getsize(filename), checkModel): - print 'could not find baudrate' + print 'Could not find baudrate' exit(1) if not setDownloadBaudrate(ser, os.path.getsize(filename), 115200): - print 'could not set download baudrate' + print 'Could not set download baudrate' exit(1) if not transferFile(ser, filename, os.path.getsize(filename)): - print 'could not transfer file' + print 'Could not transfer file' exit(1) + print 'File transferred successfully' exit(0) if __name__ == "__main__":