Update sqnsupgrade.py

Xykon · Xykon · commit b35b1e19c41e · 2021-01-26T15:07:29.000+01:00
Flush read buffer before starting stp session
diff --git a/lib/sqnsupgrade/sqnsupgrade.py b/lib/sqnsupgrade/sqnsupgrade.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-VERSION = "1.2.6"
+VERSION = "1.2.7"
 
-# Copyright (c) 2019, Pycom Limited.
+# Copyright (c) 2021, Pycom Limited.
 #
 # This software is licensed under the GNU GPL version 3 or any
 # later version, with permitted additional terms. For more information
@@ -350,7 +350,7 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
         load_fff = True if force_fff else load_fff
         target_baudrate = baudrate
         baudrate = self.__modem_speed if self.__speed_detected else baudrate
-        if debug: print('mirror? {}  recover? {}  resume? {}  direct? {}  atneg_only? {} bootrom? {} load_fff? {}'.format(mirror, recover, resume, direct, atneg_only, bootrom, load_fff))
+        if debug: print('file_path? {} mirror? {}  recover? {}  resume? {}  direct? {}  atneg_only? {} bootrom? {} load_fff? {}'.format(file_path, mirror, recover, resume, direct, atneg_only, bootrom, load_fff))
         if debug: print('baudrate: {} target_baudrate: {}'.format(baudrate, target_baudrate))
         abort = True
         external = False
@@ -522,7 +522,7 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
                 return self.uart_mirror(rgbled)
 
             elif bootrom:
-                if verbose: print('Starting STP')
+                if verbose: print('Starting STP [BR]')
             else:
                 if verbose:
                     if load_fff:
@@ -547,7 +547,6 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
                 except Exception as ex:
                     if debug: print('Exception: {}'.format(ex))
                     pass
-
             self.__serial.read()
         elif recover and (not direct):
             if atneg:
@@ -576,15 +575,18 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
         else:
             if debug: print('Starting STP mode...')
             self.__serial.write(b"AT+STP\n")
-            response = self.read_rsp(size=2)
+            response = self.read_rsp(size=4)
             if not b'OK' in response:
                 print('Failed to start STP mode!')
                 reconnect_uart()
                 return False
 
         try:
             if debug:
-                if verbose: print('Starting STP code upload')
+                if verbose: print('Starting STP code upload with pkgdebug={}'.format(pkgdebug))
+            time.sleep(.1)
+            self.__serial.read()
+            time.sleep(.1)
             start = stp.start(blob, blobsize, self.__serial, baudrate, AT=False, debug=debug, pkgdebug=pkgdebug)
             if debug: print('start returned {} type {}'.format(start, type(start)))
             if start == True:
