Merge pull request #18 from brentru/update-to-esp-idf-3-3-1

Update to use ESP-IDF v3.3.1

.travis.yml

@@ -23,8 +23,8 @@ install:
   - tar -xzf xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
   # Make xtensa-esp32-elf available for all terminal sessions
   - export PATH=$PATH:$HOME/esp/xtensa-esp32-elf/bin
-  # Get ESP-IDF v3.3
+  # Get ESP-IDF v3.3.1
-  - git clone --branch v3.3 --recursive https://github.com/espressif/esp-idf.git
+  - git clone --branch v3.3.1 --recursive https://github.com/espressif/esp-idf.git
   # Set the path to ESP-IDF directory
   - export IDF_PATH=~/esp/esp-idf 
   # Install Required Python Packages

CHANGELOG

@@ -1,3 +1,7 @@
+Adafruit's Arduino NINA-W102 firmware 1.6.0 - 2019.12.28
+
+* Updated to build with ESP-IDF 3.3.1
+
 Adafruit's Arduino NINA-W102 firmware 1.5.0 - 2019.10.21
 
 * Added Digital Read and Analog Read

Makefile

@@ -28,7 +28,7 @@ load-passthrough:
 	cp passthrough.UF2  $(BOOT_VOLUME)
 
 load-nina:
-	esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.5.0.bin
+	esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.6.0.bin
 
 load-circuitpython:
 	cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME)

README.md

@@ -10,8 +10,8 @@ This firmware uses [Espressif's IDF](https://github.com/espressif/esp-idf)
 ## Contributing to nina-fw
 
 Please be aware that by contributing to this project
-you are agreeing to the [Code of Conduct](https://github.com/adafruit/nina-fw/code-of-conduct.md).
+you are agreeing to the [Code of Conduct](https://github.com/adafruit/nina-fw/blob/master/code-of-conduct.md).
-Contributors who follow the [Code of Conduct](https://github.com/adafruit/nina-fw/code-of-conduct.md)
+Contributors who follow the [Code of Conduct](https://github.com/adafruit/nina-fw/blob/master/code-of-conduct.md)
 are welcome to submit pull requests and they will be promptly
 reviewed by project admins. Please join the [Discord](https://adafru.it/discord) too.
 
@@ -27,9 +27,9 @@ The firmware shipped in Adafruit's products is compiled following these
 instructions. These may differ from the instructions included in the
 original Arduino firmware repository.
 
-1. [Download the ESP32 toolchain](https://docs.espressif.com/projects/esp-idf/en/v3.3/get-started/index.html#setup-toolchain)
+1. [Download the ESP32 toolchain](https://docs.espressif.com/projects/esp-idf/en/v3.3.1/get-started/index.html#setup-toolchain)
 1. Extract it and add it to your `PATH`: `export PATH=$PATH:<path/to/toolchain>/bin`
-1. Clone **v3.3** of the IDF: `git clone --branch v3.3 --recursive https://github.com/espressif/esp-idf.git`
+1. Clone **v3.3.1** of the IDF: `git clone --branch v3.3.1 --recursive https://github.com/espressif/esp-idf.git`
 1. Set the `IDF_PATH` environment variable: `export IDF_PATH=<path/to/idf>`
 1. Run `make firmware` to build the firmware (in the directory of this read me)
 1. You should have a file named `NINA_W102-x.x.x.bin` in the top directory

combine.py

@@ -31,7 +31,7 @@ for i in range(0, len(certsData)):
 # zero terminate the pem file
 outputData[0x10000 + len(certsData)] = 0
 
-outputFilename = "NINA_W102-1.5.0.bin"
+outputFilename = "NINA_W102-1.6.0.bin"
 if (len(sys.argv) > 1):
 	outputFilename = sys.argv[1]
 

main/CommandHandler.cpp

@@ -28,7 +28,7 @@
 
 #include "Arduino.h"
 
-const char FIRMWARE_VERSION[6] = "1.5.0";
+const char FIRMWARE_VERSION[6] = "1.6.0";
 
 // Optional, user-defined X.509 certificate
 char CERT_BUF[1300];

sdkconfig

@@ -3,6 +3,7 @@
 # Espressif IoT Development Framework Configuration
 #
 CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
@@ -140,6 +141,7 @@ CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
 CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
 CONFIG_BTDM_CONTROLLER_MODE_BTDM=
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -285,6 +287,7 @@ CONFIG_DISABLE_BASIC_ROM_CONSOLE=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 
 #
 # Wi-Fi
@@ -338,6 +341,7 @@ CONFIG_EVENT_LOOP_PROFILING=
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
 
 #
 # HTTP Server
@@ -489,7 +493,6 @@ CONFIG_USE_ONLY_LWIP_SELECT=
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 CONFIG_LWIP_SO_RCVBUF=y
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
@@ -550,6 +553,12 @@ CONFIG_LWIP_BROADCAST_PING=
 #
 CONFIG_LWIP_MAX_RAW_PCBS=16
 
+#
+# SNTP
+#
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+
 #
 # mbedTLS
 #
@@ -559,6 +568,8 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
+CONFIG_MBEDTLS_ECP_RESTARTABLE=
+CONFIG_MBEDTLS_CMAC_C=
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=
 CONFIG_MBEDTLS_HARDWARE_SHA=