Avram add speedup lora flashlora bug fix timeralarm sleep rgb persistent

.gitignore

@@ -13,6 +13,7 @@
 ######################
 esp32/build/
 esp32/build-*/
+esp32/factory_fw/binary/
 mpy-cross/build/*
 # This map file is generated here instead of the build folder...
 mpy-cross/*.map

.gitmodules

@@ -1,20 +1,36 @@
+[submodule "lib/asf4"]
+	path = lib/asf4
+	url = https://github.com/adafruit/asf4
 [submodule "lib/axtls"]
 	path = lib/axtls
 	url = https://github.com/pfalcon/axtls
-	branch = micropython
+[submodule "lib/berkeley-db-1.xx"]
+	path = lib/berkeley-db-1.xx
+	url = https://github.com/pfalcon/berkeley-db-1.xx
+[submodule "lib/btstack"]
+	path = lib/btstack
+	url = https://github.com/bluekitchen/btstack.git
 [submodule "lib/libffi"]
 	path = lib/libffi
 	url = https://github.com/atgreen/libffi
 [submodule "lib/lwip"]
 	path = lib/lwip
 	url = https://git.savannah.gnu.org/r/lwip.git
-[submodule "lib/berkeley-db-1.xx"]
-	path = lib/berkeley-db-1.xx
-	url = https://github.com/pfalcon/berkeley-db-1.xx
-[submodule "lib/stm32lib"]
-	path = lib/stm32lib
-	url = https://github.com/micropython/stm32lib
-	branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
+[submodule "lib/mbedtls"]
+	path = lib/mbedtls
+	url = https://github.com/ARMmbed/mbedtls.git
+[submodule "lib/mynewt-nimble"]
+	path = lib/mynewt-nimble
+	url = https://github.com/apache/mynewt-nimble.git
 [submodule "lib/nrfx"]
 	path = lib/nrfx
 	url = https://github.com/NordicSemiconductor/nrfx.git
+[submodule "lib/nxp_driver"]
+	path = lib/nxp_driver
+	url = https://github.com/hathach/nxp_driver.git
+[submodule "lib/stm32lib"]
+	path = lib/stm32lib
+	url = https://github.com/micropython/stm32lib
+[submodule "lib/tinyusb"]
+	path = lib/tinyusb
+	url = https://github.com/hathach/tinyusb

Jenkinsfile

@@ -1,5 +1,5 @@
 def buildVersion
-def boards_to_build = ["WiPy", "LoPy", "SiPy", "GPy", "FiPy", "LoPy4"]
+def boards_to_build = ["WiPy", "LoPy", "GPy", "FiPy", "LoPy4"]
 def variants_to_build = [ "PYBYTES" ]
 // FIXME: there must be a better way of adding PYGATE to Jenkins, but it evades me :(
 def pygate_boards_to_build = ["WiPy", "GPy", "LoPy4"]
@@ -12,11 +12,12 @@ node {
     stage('Checkout') {
         checkout scm
         sh 'rm -rf esp-idf'
-        sh 'git clone --recursive -b idf_v3.3.1 https://github.com/pycom/pycom-esp-idf.git esp-idf'
+        sh 'git clone --recursive -b idf_v4.1 git@github.com:pycom/pycom-esp-idf.git esp-idf'
         IDF_HASH=get_idf_hash()
         dir('esp-idf'){
             sh 'git checkout ' + IDF_HASH
             sh 'git submodule update --init --recursive'
+            sh 'git clean -d -f -f'
         }
     }
 
@@ -84,13 +85,13 @@ for (variant in variants_to_build) {
 def boardBuild(name, variant, open_thread) {
     return {
         release_dir = "${JENKINS_HOME}/release/${JOB_NAME}/" + PYCOM_VERSION + "/" + GIT_TAG + "/"
-        sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
+        sh '''export PATH=$PATH:/opt/2020r3/xtensa-esp32-elf/bin/;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         make -C esp32 clean BOARD=''' + name.toUpperCase() + ' VARIANT=' + variant
-        sh '''export PATH=$PATH:/opt/xtensa-esp32-elf/bin;
+        sh '''export PATH=$PATH:/opt/2020r3/xtensa-esp32-elf/bin/;
         export IDF_PATH=${WORKSPACE}/esp-idf;
         make -C esp32 -j2 release BOARD=''' + name.toUpperCase() + ' VARIANT=' + variant + ' OPENTHREAD=' + open_thread
-        sh 'mkdir -p ' + release_dir + variant + '/' 
+        sh 'mkdir -p ' + release_dir + variant + '/'
         sh 'cp esp32/build-' + variant + '/' + name + '-' + PYCOM_VERSION + '.tar.gz ' + release_dir + variant + '/'
         sh 'mv esp32/build-' + variant + '/' + name.toUpperCase() + '/release/application.elf ' + release_dir + variant + '/' + name + "-" + PYCOM_VERSION + '-application.elf'
     }

README.md

@@ -1,7 +1,7 @@
 The MicroPython project
 =======================
 <p align="center">
-  <img src="https://raw.githubusercontent.com/pycom/LoPy/master/images/LopySide.jpg" alt="The LoPy"/>
+  <img src="https://pycom.io/wp-content/uploads/2018/08/fipySide.png" alt="The FiPy"/>
 </p>
 
 This is the MicroPython project, which aims to put an implementation
@@ -41,7 +41,7 @@ Additional components:
 The subdirectories above may include READMEs with additional info.
 
 "make" is used to build the components, or "gmake" on BSD-based systems.
-You will also need bash and Python (at least 2.7 or 3.3).
+You will also need bash and Python 3.
 
 The ESP32 version
 -----------------
@@ -51,15 +51,16 @@ the Espressif website:
 
 - for 64-bit Linux::
 
-    https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
+    https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-linux-amd64.tar.gz
 
 - for 32-bit Linux::
 
-    https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-80-g6c4433a-5.2.0.tar.gz
+    https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-linux-i686.tar.gz
 
 - for Mac OS:
 
-    https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz
+    https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_4_0-esp-2020r3-macos.tar.gz
+
 
 To use it, you will need to update your ``PATH`` environment variable in ``~/.bash_profile`` file. To make ``xtensa-esp32-elf`` available for all terminal sessions, add the following line to your ``~/.bash_profile`` file::
 
@@ -74,7 +75,7 @@ Then when you need the toolchain you can type ``get_esp32`` on the command line
 You also need the ESP IDF along side this repository in order to build the ESP32 port.
 To get it:
 
-    $ git clone --recursive -b idf_v3.3.1 https://github.com/pycom/pycom-esp-idf.git
+    $ git clone --recursive -b idf_v4.1 https://github.com/pycom/pycom-esp-idf.git
 
 After cloning, if you did not specify the --recursive option, make sure to checkout all the submodules:
 
@@ -128,8 +129,7 @@ By default, both bootloader and application are built. To build them separately:
 
     $ cd esp32
     $ make clean
-    $ make TARGET=boot
-    $ make TARGET=app
+    $ make release
     $ make flash
 
 You can change the board type by using the BOARD variable:
@@ -141,7 +141,7 @@ You can change the board type by using the BOARD variable:
 
 We currently support the following BOARD types:
 
-	WIPY LOPY SIPY GPY FIPY LOPY4
+	WIPY LOPY GPY FIPY LOPY4
 
 For OEM modules, please use the following BOARD type:
 
@@ -155,7 +155,7 @@ G01: GPY
 To specify a serial port other than /dev/ttyUSB0, use ESPPORT variable:
 
     $ # On MacOS
-    $ make ESPPORT=/dev/tty.usbserial-DQ008HQY flash
+    $ make ESPPORT=/dev/tty.usbmodemPy8eaa911 flash
     $ # On Windows
     $ make ESPPORT=COM3 flash
     $ # On linux
@@ -179,7 +179,7 @@ To create a release package that can be flashed with the Pycom firmware tool:
 To create a release package for all currently supported Pycom boards:
 
     $ cd esp32
-    $ for BOARD in WIPY LOPY SIPY GPY FIPY LOPY4; do make BOARD=$BOARD clean && make BOARD=$BOARD release; done
+    $ for BOARD in WIPY LOPY GPY FIPY LOPY4; do make BOARD=$BOARD clean && make BOARD=$BOARD release; done
 
 To specify a directory other than the default build/ directory:
 
@@ -190,7 +190,7 @@ To specify a directory other than the default build/ directory:
 To create a release package for all currently supported Pycom boards in a directory other than the default build/ directory:
 
     $ cd esp32
-    $ for BOARD in WIPY LOPY SIPY GPY FIPY LOPY4; do make BOARD=$BOARD clean && make BOARD=$BOARD RELEASE_DIR=~/pycom-packages release; done
+    $ for BOARD in WIPY LOPY GPY FIPY LOPY4; do make BOARD=$BOARD clean && make BOARD=$BOARD RELEASE_DIR=~/pycom-packages release; done
 
 To inclue a step for copying IDF libs from IDF_PATH specify the following variable in the make command
 
@@ -206,81 +206,4 @@ To Disable RGB Led control use the following make variable
 
 ## Steps for using Secure Boot and Flash Encryption
 
-### Summary
-
-1. Obtain keys (for Secure Boot and Flash Encryption)
-2. Flash keys and parameters in efuses
-3. Compile bootloader and application with `make SECURE=on`
-4. Flash: bootloader-digest at address 0x0 and encrypted; all the others (partitions and application) encrypted, too.
-
-### Prerequisites
-
-    $ export IDF_PATH=<pycom-esp-idf_PATH>
-    $ cd esp32
-
-Hold valid keys for Flash Encryption and Secure Boot; they can be generated randomly with the following commands:
-
-    python $IDF_PATH/components/esptool_py/esptool/espsecure.py generate_flash_encryption_key flash_encryption_key.bin
-    python $IDF_PATH/components/esptool_py/esptool/espsecure.py generate_signing_key secure_boot_signing_key.pem
-
-The Secure Boot key `secure_boot_signing_key.pem` has to be transformed into `secure-bootloader-key.bin`, to be burnt into efuses. This can be done in 2 ways:
-
-    python $IDF_PATH/components/esptool_py/esptool/espefuse.py extract_public_key --keyfile secure_boot_signing_key.pem signature_verification_key.bin
-
-    # or, as an artifact of the make build process, on the same directory level as Makefile
-    make BOARD=GPY SECURE=on TARGET=boot
-
-Flash keys (`flash_encryption_key.bin` and `secure-bootloader-key.bin`) into the efuses (write and read protected):
-
-**_Note: Irreversible operations_**
-
-    # Burning Encryption Key
-    python $IDF_PATH/components/esptool_py/esptool/espefuse.py --port /dev/ttyUSB0 burn_key flash_encryption flash_encryption_key.bin
-    # Burning Secure Boot Key
-    python $IDF_PATH/components/esptool_py/esptool/espefuse.py --port /dev/ttyUSB0 burn_key secure_boot secure-bootloader-key.bin
-    # Enabling Flash Encryption mechanism
-    python $IDF_PATH/components/esptool_py/esptool/espefuse.py --port /dev/ttyUSB0 burn_efuse FLASH_CRYPT_CNT
-    # Configuring Flash Encryption to use all address bits togheter with Encryption key (max value 0x0F)
-    python $IDF_PATH/components/esptool_py/esptool/espefuse.py --port /dev/ttyUSB0 burn_efuse FLASH_CRYPT_CONFIG 0x0F
-    # Enabling Secure Boot mechanism
-    python $IDF_PATH/components/esptool_py/esptool/espefuse.py --port /dev/ttyUSB0 burn_efuse ABS_DONE_0
-
-**_If the keys are not written in efuse, before flashing the bootloader, then random keys will be generated by the ESP32, they can never be read nor re-written, so bootloader can never be updated. Even more, the application can be re-flashed (by USB) just 3 more times._**
-
-### Makefile options:
-
-    make BOARD=GPY SECURE=on SECURE_KEY=secure_boot_signing_key.pem ENCRYPT_KEY=flash_encryption_key.bin
-
-- `SECURE=on` is the main flag; it's not optional
-- if `SECURE=on` by default:
-    - encryption is enabled        
-    - secure_boot_signing_key.pem is the secure boot key, located relatively to Makefile
-    - flash_encryption_key.bin is the flash encryption key, located relatively to Makefile
-
-For flashing the bootloader digest and the encrypted versions of all binaries:
-
-    make BOARD=GPY SECURE=on flash
-
-### Flashing
-
-For flashing the bootloader-reflash-digest.bin has to be written at address 0x0, instead of the bootloader.bin (at address 0x1000).
-
-Build is done using `SECURE=on` option; additionally, all the binaries are pre-encrypted.
-
-    make BOARD=GPY clean
-    make BOARD=GPY SECURE=on
-    make BOARD=GPY SECURE=on flash
-
-Manual flash command:
-
-    python $IDF_PATH/components/esptool_py/esptool/esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 921600 --before no_reset --after no_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0x0 build/GPY/release/bootloader/bootloader-reflash-digest.bin_enc 0x8000 build/GPY/release/lib/partitions.bin_enc 0x10000 build/GPY/release/gpy.bin_enc_0x10000
-
-### OTA update
-
-The OTA should be done using the pre-encrypted application image.
-
-Because the encryption is done based on the physical flash address, there are 2 application binaries generated:
-- gpy.bin_enc_0x10000 which has to be written at default factory address: 0x10000
-- gpy.bin_enc_0x1A0000 which has to be written at the ota_0 partition address (0x1A0000)
-
-*__Hint:__ on micropython interface, the method `pycom.ota_slot()` responds with the address of the next OTA partition available (either 0x10000 or 0x1A0000).*
+For Secure Boot and Flash Encryption please check: https://docs.pycom.io/advance/encryption/

drivers/bus/qspi.h

@@ -28,6 +28,8 @@
 
 #include "py/mphal.h"
 
+#define MP_SPI_ADDR_IS_32B(addr) (addr & 0xff000000)
+
 enum {
     MP_QSPI_IOCTL_INIT,
     MP_QSPI_IOCTL_DEINIT,
@@ -54,4 +56,19 @@ typedef struct _mp_soft_qspi_obj_t {
 
 extern const mp_qspi_proto_t mp_soft_qspi_proto;
 
+static inline uint8_t mp_spi_set_addr_buff(uint8_t *buf, uint32_t addr) {
+    if (MP_SPI_ADDR_IS_32B(addr)) {
+        buf[0] = addr >> 24;
+        buf[1] = addr >> 16;
+        buf[2] = addr >> 8;
+        buf[3] = addr;
+        return 4;
+    } else {
+        buf[0] = addr >> 16;
+        buf[1] = addr >> 8;
+        buf[2] = addr;
+        return 3;
+    }
+}
+
 #endif // MICROPY_INCLUDED_DRIVERS_BUS_QSPI_H

drivers/bus/softqspi.c

@@ -168,9 +168,10 @@ STATIC void mp_soft_qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len,
 
 STATIC void mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
-    uint8_t cmd_buf[4] = {cmd, addr >> 16, addr >> 8, addr};
+    uint8_t cmd_buf[5] = {cmd};
+    uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
     CS_LOW(self);
-    mp_soft_qspi_transfer(self, 4, cmd_buf, NULL);
+    mp_soft_qspi_transfer(self, addr_len + 1, cmd_buf, NULL);
     mp_soft_qspi_transfer(self, len, src, NULL);
     CS_HIGH(self);
 }
@@ -186,10 +187,11 @@ STATIC uint32_t mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
 
 STATIC void mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
-    uint8_t cmd_buf[7] = {cmd, addr >> 16, addr >> 8, addr};
+    uint8_t cmd_buf[7] = {cmd};
+    uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
     CS_LOW(self);
     mp_soft_qspi_transfer(self, 1, cmd_buf, NULL);
-    mp_soft_qspi_qwrite(self, 6, &cmd_buf[1]); // 3 addr bytes, 1 extra byte (0), 2 dummy bytes (4 dummy cycles)
+    mp_soft_qspi_qwrite(self, addr_len + 3, &cmd_buf[1]); // 3/4 addr bytes, 1 extra byte (0), 2 dummy bytes (4 dummy cycles)
     mp_soft_qspi_qread(self, len, dest);
     CS_HIGH(self);
 }

drivers/cc3000/inc/cc3000_common.h

@@ -165,15 +165,15 @@ extern int CC3000_EXPORT(errno);
 //*****************************************************************************
 //                  Compound Types
 //*****************************************************************************
-typedef INT32 time_t;
+typedef INT32 cc3000_time_t;
 typedef UINT32 clock_t;
 typedef INT32 suseconds_t;
 
 typedef struct cc3000_timeval cc3000_timeval;
 
 struct cc3000_timeval
 {
-    time_t         tv_sec;                  /* seconds */
+    cc3000_time_t  tv_sec;                  /* seconds */
     suseconds_t    tv_usec;                 /* microseconds */
 };
 

drivers/cyw43/README.md

@@ -0,0 +1,17 @@
+CYW43xx WiFi SoC driver
+=======================
+
+This is a driver for the CYW43xx WiFi SoC.
+
+There are four layers to the driver:
+
+1. SDIO bus interface, provided by the host device/system.
+
+2. Low-level CYW43xx interface, managing the bus, control messages, Ethernet
+   frames and asynchronous events.  Includes download of SoC firmware.  The
+   header file `cyw43_ll.h` defines the interface to this layer.
+
+3. Mid-level CYW43xx control, to control and set WiFi parameters and manage
+   events.  See `cyw43_ctrl.c`.
+
+4. TCP/IP bindings to lwIP.  See `cyw43_lwip.c`.