Merge branch 'husigeza-OTA_update_to_v20'

Author: iwahdan88

README.md

@@ -91,6 +91,20 @@ After cloning, make sure to checkout all the submodules:
 Finally, before building, export the IDF_PATH variable
 
     $ export IDF_PATH=~/pycom-esp-idf
+    
+This repository contains submodules! Clone using the --recursive option:
+
+    $ git clone --recursive https://github.com/pycom/pycom-micropython-sigfox.git
+    
+Alternatively checkout the modules manually:
+
+    $ cd pycom-micropython-sigfox
+    $ git submodule update --init
+
+``` text
+If you updated the repository from a previous revision and/or if switching between branches,<br>
+make sure to also update the submodules with the command above.
+```
 
 Prior to building the main firmware, you need to build mpy-cross
 

esp32/Makefile

@@ -22,6 +22,7 @@ OEM ?= 0
 BTYPE ?= release
 
 BUILD = build/$(BOARD)/$(BTYPE)
+LTE_LOG_BUFF ?= 0
 
 # by default Secure Boot and Flash Encryption are disabled
 SECURE ?= off
@@ -94,6 +95,19 @@ endif
 ifeq ($(BOARD), $(filter $(BOARD), SIPY))
     LIBS += sigfox/modsigfox_sipy.a
 endif
+# Enable or Disable LTE_LOG_BUFF
+ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+ifeq ($(LTE_LOG_BUFF),1)
+	CFLAGS += -DLTE_LOG
+endif #ifeq ($(LTE_LOG_BUFF),1)
+endif #ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+
+# Enable or Disable LTE_LOG_BUFF
+ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
+ifeq ($(LTE_DEBUG_BUFF),1)
+	CFLAGS += -DLTE_DEBUG_BUFF
+endif #ifeq ($(LTE_LOG_BUFF),1)
+endif #ifeq ($(BOARD), $(filter $(BOARD), GPY FIPY))
 
 B_LIBS = -Lbootloader/lib -Lbootloader -L$(BUILD)/bootloader -L$(ESP_IDF_COMP_PATH)/esp32/ld \
          -L$(ESP_IDF_COMP_PATH)/esp32/lib -llog -lcore -lbootloader_support \

esp32/application.mk

@@ -140,6 +140,7 @@ APP_MODS_SRC_C = $(addprefix mods/,\
 	machwdt.c \
 	machrmt.c \
 	lwipsocket.c \
+	machtouch.c \
 	)
 
 APP_MODS_LORA_SRC_C = $(addprefix mods/,\
@@ -167,6 +168,7 @@ APP_UTIL_SRC_C = $(addprefix util/,\
 	mpirq.c \
 	mpsleep.c \
 	timeutils.c \
+	esp32chipinfo.c \
 	)
 
 APP_FATFS_SRC_C = $(addprefix fatfs/src/,\

esp32/bootloader/bootloader.h

@@ -41,11 +41,18 @@ typedef struct _boot_info_t
   uint32_t  crc;
 } boot_info_t;
 
-#define IMG_SIZE                            ((1024 + 512) * 1024)
+#define IMG_SIZE_8MB                        (1980 * 1024)
+#define IMG_UPDATE1_OFFSET_8MB              (2112 * 1024)  // taken from the partitions table
+#define OTA_DATA_ADDRESS_8MB                (0x1FF000)     // calculated from partitions table
+
+#define IMG_SIZE_4MB                        (1720 * 1024)
+#define IMG_UPDATE1_OFFSET_4MB              (1792 * 1024)  // taken from the partitions table
+#define OTA_DATA_ADDRESS_4MB                (0x1BE000)     // calculated from partitions table
+
 #define OTAA_DATA_SIZE                      (4 * 1024)
 #define OTA_DATA_INDEX                      2
 #define IMG_FACTORY_OFFSET                  (64 * 1024)
-#define IMG_UPDATE1_OFFSET                  (1664 * 1024)  // taken from the partitions table
+
 #define IMG_UPDATE2_OFFSET                  (IMG_FACTORY_OFFSET)
 
 #define IMG_STATUS_CHECK                    0
@@ -58,7 +65,8 @@ typedef struct _boot_info_t
 #define BOOT_VERSION                        "V0.2"
 #define SPI_SEC_SIZE                        0x1000
 
-#define PARTITIONS_COUNT                    7
+#define PARTITIONS_COUNT_8MB                5
+#define PARTITIONS_COUNT_4MB                7
 
 #define PART_TYPE_APP                       0x00
 #define PART_SUBTYPE_FACTORY                0x00

esp32/fatfs/src/drivers/sflash_diskio.c

@@ -14,6 +14,7 @@
 
 #include "esp_spi_flash.h"
 #include "esp_flash_encrypt.h"
+#include "esp32chipinfo.h"
 
 static uint8_t *sflash_block_cache;
 static bool sflash_cache_is_dirty;
@@ -43,7 +44,7 @@ static bool sflash_write (void) {
 DRESULT sflash_disk_init (void) {
     if (!sflash_init_done) {
         // this is how we diferentiate flash sizes in Pycom modules
-        if (esp_get_revision() > 0) {
+        if (esp32_get_chip_rev() > 0) {
             sflash_start_address = SFLASH_START_ADDR_8MB;
             sflash_fs_sector_count = SFLASH_FS_SECTOR_COUNT_8MB;
         } else {

esp32/frozen/LTE/sqnsupgrade.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-VERSION = "1.2.3"
+VERSION = "1.2.5"
 
 # Copyright (c) 2019, Pycom Limited.
 #
@@ -67,6 +67,7 @@ def special_print(self, msg, flush=None, end='\n'):
             print(msg, flush=flush, end=end)
 
     def read_rsp(self, size=None, timeout=-1):
+        time.sleep(.25)
         if timeout < 0:
             timeout = 20000
         elif timeout is None:
@@ -338,15 +339,17 @@ def __get_wait_msg(self, load_fff=True):
 
 
 
-    def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_ffh=False, mirror=False, switch_ffh=False, bootrom=False, rgbled=0x050505, debug=False, pkgdebug=False, atneg=True, max_try=10, direct=True, atneg_only=False, info_only=False, expected_smod=None, verbose=False, load_fff=False):
+    def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_ffh=False, mirror=False, switch_ffh=False, bootrom=False, rgbled=0x050505, debug=False, pkgdebug=False, atneg=True, max_try=10, direct=True, atneg_only=False, info_only=False, expected_smod=None, verbose=False, load_fff=False, mtools=False):
         self.__wait_msg = False
         mirror = True if atneg_only else mirror
         recover = True if atneg_only else load_ffh
         resume = True if mirror or recover or atneg_only or info_only else resume
         verbose = True if debug else verbose
         load_fff = False if bootrom and switch_ffh 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('baudrate: {} target_baudrate: {}'.format(baudrate, target_baudrate))
         abort = True
         external = False
         self.__serial = None
@@ -416,7 +419,7 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
             if not self.wakeup_modem(baudrate, port, 10, 1, debug):
                 return False
 
-        if not resume:
+        if (not resume) or mtools:
 
             # bind to AT channel
             self.__serial.write(b"AT+BIND=AT\r\n")
@@ -430,17 +433,42 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
             response = self.read_rsp(size=100)
             if debug: print("ATE0 returned {}".format(response))
 
-            self.__serial.read(100)
+            self.__serial.read()
             if debug: print('Entering upgrade mode...')
 
+            if verbose: print("Sending AT+SMLOG?")
+            self.__serial.write(b'AT+SMLOG?\r\n')
+            response = self.read_rsp(size=100)
+            if verbose: print("AT+SMLOG? returned {}".format(response))
+
             self.__serial.write(b"AT+SMOD?\r\n")
             response = self.return_pretty_response(self.read_rsp(size=7))
-            self.__serial.read(100)
             if debug: print("AT+SMOD? returned {}".format(response))
 
+            if verbose: print('Sending AT+FSRDFILE="/fs/crashdump"')
+            self.__serial.write(b'AT+FSRDFILE="/fs/crashdump"\r\n')
+            response = self.read_rsp(size=100)
+            if verbose: print('AT+FSRDFILE="/fs/crashdump" returned {}'.format(response))
+            self.__serial.read()
+
             self.__serial.write(b"AT+SQNSUPGRADENTF=\"started\"\r\n")
+            response = self.read_rsp(size=100)
+            if verbose: print('AT+SQNSUPGRADENTF="started" returned {}'.format(response))
             self.wait_for_modem()
-            if not load_fff:
+
+            if verbose: print('Sending AT+SQNWL="sqndcc",2')
+            self.__serial.write(b'AT+SQNWL="sqndcc",2\r\n')
+            response = self.read_rsp(size=100)
+            if verbose: print('AT+SQNWL="sqndcc",2 returned {}'.format(response))
+            self.__serial.read(100)
+
+            if verbose: print("Sending AT+CFUN=4")
+            self.__serial.write(b'AT+CFUN=4\r\n')
+            response = self.read_rsp(size=100)
+            if verbose: print("AT+CFUN=4 returned {}".format(response))
+            self.__serial.read(100)
+
+            if not (load_fff or mtools):
                 self.__serial.write(b"AT+SMSWBOOT=3,1\r\n")
                 resp = self.read_rsp(100)
                 if debug: print('AT+SMSWBOOT=3,1 returned: {}'.format(resp))
@@ -463,6 +491,23 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
                 self.wait_for_modem()
                 self.__serial.write(b"AT\r\n")
 
+                if verbose: print("Sending AT+CFUN=4")
+                self.__serial.write(b'AT+CFUN=4\r\n')
+                response = self.read_rsp(size=100)
+                if verbose: print("AT+CFUN=4 returned {}".format(response))
+
+                if verbose: print("Sending AT+SMLOG?")
+                self.__serial.write(b'AT+SMLOG?\r\n')
+                response = self.read_rsp(size=100)
+                if verbose: print("AT+SMLOG? returned {}".format(response))
+
+                if verbose: print('Sending AT+FSRDFILE="/fs/crashdump"')
+                self.__serial.write(b'AT+FSRDFILE="/fs/crashdump"\r\n')
+                response = self.read_rsp(size=100)
+                if verbose: print('AT+FSRDFILE="/fs/crashdump" returned {}'.format(response))
+                self.__serial.read()
+
+
         else:
             self.__serial.read(100)
             if debug: print('Entering recovery mode')
@@ -492,10 +537,6 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
                         print('Starting STP ON_THE_FLY')
 
             self.__serial.read(100)
-            if verbose: print("Sending AT+CFUN=4")
-            resonse = self.__serial.write(b'AT+CFUN=4\r\n')
-            if verbose: print("AT+CFUN=4 returned {}".format(response))
-            self.__serial.read(100)
 
             if load_fff:
                 if debug: print("Sending AT+SMSTPU")
@@ -512,8 +553,11 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
             self.__serial.read()
         elif recover and (not direct):
             if atneg:
-                result = self.at_negotiation(baudrate, port, max_try, mirror, atneg_only, debug)
+                result = self.at_negotiation(baudrate, port, max_try, mirror, atneg_only, debug, target_baudrate)
                 if result:
+                    baudrate = target_baudrate
+                    self.__modem_speed = target_baudrate
+                    self.__speed_detected = True
                     if atneg_only:
                         return True
                     if mirror:
@@ -671,7 +715,15 @@ def __run(self, file_path=None, baudrate=921600, port=None, resume=False, load_f
                 time.sleep(0.5)
 
                 if 'success' in sqnup_result:
+                    if verbose: print('Sending AT+SQNSUPGRADENTF="success"')
                     self.__serial.write(b"AT+SQNSUPGRADENTF=\"success\"\r\n")
+                    resonse = self.read_rsp(100)
+                    if verbose: print('AT+SQNSUPGRADENTF="success" returned {}'.format(response))
+                    time.sleep(.25)
+                    if verbose: print('Sending AT+FSRDFILE="/fs/crashdump"')
+                    self.__serial.write(b'AT+FSRDFILE="/fs/crashdump"\r\n')
+                    resonse = self.read_rsp(100)
+                    if verbose: print('AT+FSRDFILE="/fs/crashdump" returned {}'.format(response))
                     self.__serial.read()
                     return True
                 elif sqnup_result is None:
@@ -712,7 +764,11 @@ def wakeup_modem(self, baudrate, port, max_try, delay, debug, msg='Attempting AT
         MAX_TRY = max_try
         count = 0
         if msg is not None:
-            print(msg)
+            if debug:
+                print(msg + ' [{}]'.format(baudrate))
+            else:
+                print(msg)
+
         self.__serial.read()
         self.__serial.write(b"AT\r\n")
         response = self.read_rsp(size=25)
@@ -729,10 +785,13 @@ def wakeup_modem(self, baudrate, port, max_try, delay, debug, msg='Attempting AT
             self.__serial = UART(1, baudrate=baudrate, pins=self.__pins, timeout_chars=100)
         return count < MAX_TRY
 
-    def at_negotiation(self, baudrate, port, max_try, mirror, atneg_only, debug):
+    def at_negotiation(self, baudrate, port, max_try, mirror, atneg_only, debug, target_baudrate):
         MAX_TRY = max_try
         count = 0
-        print('Attempting AT auto-negotiation...')
+        if debug:
+            print('Attempting AT auto-negotiation... with baudrate {} and target_baudrate {}'.format(baudrate, target_baudrate))
+        else:
+            print('Attempting AT auto-negotiation...')
         self.__serial.write(b"AT\r\n")
         response = self.read_rsp(size=20)
         if debug: print('{}'.format(response))
@@ -746,19 +805,21 @@ def at_negotiation(self, baudrate, port, max_try, mirror, atneg_only, debug):
             if debug: print('{}'.format(response))
         if b'OK' in response:
             self.__serial.read()
-            cmd = "AT+IPR=%d\n"%baudrate
-            if debug: print('Setting baudrate to {}'.format(baudrate))
+            cmd = "AT+IPR=%d\n"%target_baudrate
+            if debug: print('Setting baudrate to {}'.format(target_baudrate))
             self.__serial.write(cmd.encode())
             response = self.read_rsp(size=6)
             if debug: print('{}'.format(response))
             if b'OK' in response:
+                self.__modem_speed = target_baudrate
+                self.__speed_detected =  True
                 if atneg_only:
                     return True
                 if 'FiPy' in self.__sysname or 'GPy' in self.__sysname:
-                    self.__serial = UART(1, baudrate=baudrate, pins=self.__pins, timeout_chars=100)
+                    self.__serial = UART(1, baudrate=target_baudrate, pins=self.__pins, timeout_chars=100)
                 else:
                     self.__serial = None
-                    self.__serial = serial.Serial(port, baudrate, bytesize=serial.EIGHTBITS, timeout=0.1)
+                    self.__serial = serial.Serial(port, target_baudrate, bytesize=serial.EIGHTBITS, timeout=0.1)
                     self.__serial.reset_input_buffer()
                     self.__serial.reset_output_buffer()
                     self.__serial.flush()
@@ -774,7 +835,7 @@ def at_negotiation(self, baudrate, port, max_try, mirror, atneg_only, debug):
                     print('ERROR in AT+SMOD returned {}'.format(response))
                     return False
             else:
-                print('ERROR in AT+IPR={} returned {}'.format(baudrate, response))
+                print('ERROR in AT+IPR={} returned {}'.format(target_baudrate, response))
                 return False
         else:
             print('ERROR sending AT command... no response? {}'.format(response))
@@ -794,7 +855,7 @@ def success_message(self, port=None, verbose=False, debug=False):
         print("Here is the current firmware version:\n")
         self.show_info(port=port, verbose=verbose, debug=debug)
 
-    def upgrade(self, ffile, mfile=None, baudrate=921600, retry=False, resume=False, debug=False, pkgdebug=False, verbose=False, load_fff=True, load_only=False):
+    def upgrade(self, ffile, mfile=None, baudrate=921600, retry=False, resume=False, debug=False, pkgdebug=False, verbose=False, load_fff=True, load_only=False, mtools=False):
         success = True
         if not retry and mfile is not None:
             if resume or self.__check_br(br_only=True, verbose=verbose, debug=debug):
@@ -819,7 +880,7 @@ def upgrade(self, ffile, mfile=None, baudrate=921600, retry=False, resume=False,
             print('Unable to upgrade bootrom.')
         if debug: print('Success2? {}'.format(success))
         if success:
-            if self.__run(file_path=ffile, resume=True if mfile is not None else resume, baudrate=baudrate, direct=False, debug=debug, pkgdebug=pkgdebug, verbose=verbose, load_fff=False if mfile else load_fff):
+            if self.__run(file_path=ffile, resume=True if mfile is not None else resume, baudrate=baudrate, direct=False, debug=debug, pkgdebug=pkgdebug, verbose=verbose, load_fff=False if mfile else load_fff, mtools=mtools):
                 if self.__check_br(verbose=verbose, debug=debug):
                     self.__run(bootrom=True, debug=debug, direct=False, pkgdebug=pkgdebug, verbose=verbose, load_fff=True)
                 self.success_message(verbose=verbose, debug=debug)
@@ -839,8 +900,15 @@ def upgrade_uart(self, ffh_mode=False, mfile=None, retry=False, resume=False, co
         print('Preparing modem for upgrade...')
         if not retry and ffh_mode:
             success = False
-            success = self.__run(bootrom=True, resume=resume, switch_ffh=True, direct=False, debug=debug, pkgdebug=pkgdebug, verbose=verbose)
-            time.sleep(1)
+            if self.__check_br(verbose=verbose, debug=debug):
+                success = self.__run(bootrom=True, resume=resume, switch_ffh=True, direct=False, debug=debug, pkgdebug=pkgdebug, verbose=verbose)
+                time.sleep(1)
+            else:
+                print('FFH mode is not necessary... ignoring!')
+                print('Do not specify updater.elf when updating!')
+                mfile = None
+                ffh_mode = False
+                success = True
         if success:
             if mfile is not None:
                 success = False
@@ -904,6 +972,7 @@ def run(ffile, mfile=None, baudrate=921600, verbose=False, debug=False, load_fff
         print_welcome()
         retry = False
         resume = False
+        mtools = False
         sqnup = sqnsupgrade()
         if sqnup.check_files(ffile, mfile, debug):
             state = sqnup.detect_modem_state(debug=debug, hangup=hangup)
@@ -916,11 +985,13 @@ def run(ffile, mfile=None, baudrate=921600, verbose=False, debug=False, load_fff
                     print('Your modem is in recovery mode. Please specify updater.elf file')
                     reconnect_uart()
                     sys.exit(1)
-            elif state == 4 or state == 1:
+            elif state == 4:
                 resume = True
+            elif state == 1:
+                mtools = True
             elif state == -1:
                 detect_error()
-            sqnup.upgrade(ffile=ffile, mfile=mfile, baudrate=baudrate, retry=retry, resume=resume, debug=debug, pkgdebug=False, verbose=verbose, load_fff=load_fff)
+            sqnup.upgrade(ffile=ffile, mfile=mfile, baudrate=baudrate, retry=retry, resume=resume, debug=debug, pkgdebug=False, verbose=verbose, load_fff=load_fff, mtools=mtools)
         reconnect_uart()
 
     def uart(ffh_mode=False, mfile=None, color=0x050505, verbose=False, debug=False, hangup=True):