Merge remote-tracking branch 'upstream/master'

Author: Brett Forsyth

.github/workflows/cron.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        idf_branch: [release/v4.0]
+        idf_branch: [release/v3.3]
         #idf_branch: [release/v3.3, release/v4.0]
     steps:
     - uses: actions/checkout@v1

build.sh

@@ -35,6 +35,16 @@ if ! [ -x "$(command -v stat)" ]; then
   	exit 1
 fi
 
+awk="awk"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  awk="gawk"
+fi
+
+if ! [ -x "$(command -v $awk)" ]; then
+    echo "ERROR: $awk is not installed! Please install $awk first."
+    exit 1
+fi
+
 mkdir -p dist
 
 # update components from git

sdkconfig

@@ -192,6 +192,8 @@ CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN=0
 CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CTRL_AUTO_LATENCY=
 CONFIG_BTDM_CTRL_AUTO_LATENCY_EFF=
+CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT=y
+CONFIG_BTDM_CTRL_LEGACY_AUTH_VENDOR_EVT_EFF=y
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=2
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -238,6 +240,7 @@ CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
 CONFIG_HFP_AUDIO_DATA_PATH_HCI=
 CONFIG_BT_SSP_ENABLED=y
 CONFIG_GATTS_ENABLE=y
+CONFIG_GATTS_BLUFI_ENABLE=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
 CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
 CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0
@@ -274,6 +277,11 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=y
 CONFIG_SPI_SLAVE_IN_IRAM=
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 
+#
+# CAN Configuration
+#
+CONFIG_CAN_ISR_IN_IRAM=
+
 #
 # eFuse Bit Manager
 #
@@ -315,6 +323,7 @@ CONFIG_HP_LITE1=
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_ECO3_CACHE_LOCK_FIX=y
 CONFIG_ESP32_REV_MIN_0=y
 CONFIG_ESP32_REV_MIN_1=
 CONFIG_ESP32_REV_MIN_2=
@@ -455,8 +464,8 @@ CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
-CONFIG_ESP32_WIFI_IRAM_OPT=y
-CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
+CONFIG_ESP32_WIFI_IRAM_OPT=
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=
 
 #
 # PHY
@@ -474,8 +483,10 @@ CONFIG_PM_ENABLE=
 #
 # Camera configuration
 #
-CONFIG_OV2640_SUPPORT=y
+CONFIG_OV7670_SUPPORT=y
 CONFIG_OV7725_SUPPORT=y
+CONFIG_NT99141_SUPPORT=y
+CONFIG_OV2640_SUPPORT=y
 CONFIG_OV3660_SUPPORT=y
 CONFIG_OV5640_SUPPORT=y
 CONFIG_OV7740_SUPPORT=y
@@ -663,8 +674,10 @@ CONFIG_LWIP_SO_LINGER=
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 CONFIG_LWIP_SO_RCVBUF=y
-CONFIG_LWIP_IP_FRAG=
-CONFIG_LWIP_IP_REASSEMBLY=
+CONFIG_LWIP_IP4_FRAG=y
+CONFIG_LWIP_IP6_FRAG=y
+CONFIG_LWIP_IP4_REASSEMBLY=
+CONFIG_LWIP_IP6_REASSEMBLY=
 CONFIG_LWIP_STATS=
 CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
 CONFIG_ESP_GRATUITOUS_ARP=y
@@ -686,8 +699,10 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 #
 # TCP
 #
+CONFIG_LWIP_TCP_ISN_HOOK=y
 CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
+CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
 CONFIG_TCP_MAXRTX=12
 CONFIG_TCP_SYNMAXRTX=6
 CONFIG_TCP_MSS=1436
@@ -700,6 +715,7 @@ CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES=
 CONFIG_TCP_OVERSIZE_MSS=y
 CONFIG_TCP_OVERSIZE_QUARTER_MSS=
 CONFIG_TCP_OVERSIZE_DISABLE=
+CONFIG_LWIP_TCP_RTO_TIME=3000
 
 #
 # UDP
@@ -711,6 +727,8 @@ CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=
 CONFIG_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_TCPIP_TASK_AFFINITY_CPU1=
 CONFIG_TCPIP_TASK_AFFINITY=0x0
+CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
+CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
 CONFIG_PPP_SUPPORT=y
 CONFIG_PPP_NOTIFY_PHASE_SUPPORT=
 CONFIG_PPP_PAP_SUPPORT=y

tools/config.sh

@@ -2,11 +2,11 @@
 
 IDF_COMPS="$IDF_PATH/components"
 IDF_TOOLCHAIN="xtensa-esp32-elf"
-IDF_TOOLCHAIN_LINUX_ARMEL="https://dl.espressif.com/dl/xtensa-esp32-elf-linux-armel-1.22.0-87-gb57bad3-5.2.0.tar.gz"
-IDF_TOOLCHAIN_LINUX32="https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-80-g6c4433a-5.2.0.tar.gz"
-IDF_TOOLCHAIN_LINUX64="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz"
-IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-80-g6c4433a-5.2.0.zip"
-IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-80-g6c4433a-5.2.0.tar.gz"
+IDF_TOOLCHAIN_LINUX_ARMEL="https://dl.espressif.com/dl/xtensa-esp32-elf-linux-armel-1.22.0-96-g2852398-5.2.0.tar.gz"
+IDF_TOOLCHAIN_LINUX32="https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-96-g2852398-5.2.0.tar.gz"
+IDF_TOOLCHAIN_LINUX64="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-96-g2852398-5.2.0.tar.gz"
+IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-96-g2852398-5.2.0.zip"
+IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-osx-1.22.0-96-g2852398-5.2.0.tar.gz"
 
 if [ -z $IDF_BRANCH ]; then
 	IDF_BRANCH="release/v3.3"
@@ -36,9 +36,9 @@ AR_PLATFORMIO_PY="$AR_TOOLS/platformio-build.py"
 AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk"
+OSBITS=`uname -m`
 
 function get_os(){
-  	OSBITS=`arch`
   	if [[ "$OSTYPE" == "linux"* ]]; then
         if [[ "$OSBITS" == "i686" ]]; then
         	echo "linux32"
@@ -62,13 +62,16 @@ function get_os(){
 }
 
 AR_OS=`get_os`
+echo "OSTYPE: $OSTYPE, OSBITS: $OSBITS, OS: $AR_OS"
 
+export AWK="awk"
 export SED="sed"
 export SSTAT="stat -c %s"
 
 if [[ "$AR_OS" == "macos" ]]; then
 	export SED="gsed"
 	export SSTAT="stat -f %z"
+	export AWK="gawk"
 fi
 
 function git_commit_exists(){ #git_commit_exists <repo-path> <commit-message>

tools/copy-to-arduino.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 source ./tools/config.sh
 
-if [[ "$AR_OS" == "macos" ]]; then
-	ESP32_ARDUINO="$HOME/Documents/Arduino/hardware/espressif/esp32"
-else
-	ESP32_ARDUINO="$HOME/Arduino/hardware/espressif/esp32"
+if [ -z $ESP32_ARDUINO ]; then
+    if [[ "$AR_OS" == "macos" ]]; then
+    	ESP32_ARDUINO="$HOME/Documents/Arduino/hardware/espressif/esp32"
+    else
+    	ESP32_ARDUINO="$HOME/Arduino/hardware/espressif/esp32"
+    fi
 fi
 
 if ! [ -d "$ESP32_ARDUINO" ]; then

tools/prepare-libs.sh

@@ -9,8 +9,8 @@ fi
 mkdir -p "$AR_SDK"
 
 # start generation of platformio-build.py
-awk "/CPPPATH\=\[/{n++}{print>n\"pio_start.txt\"}" $AR_COMPS/arduino/tools/platformio-build.py
-awk "/LIBSOURCE_DIRS\=\[/{n++}{print>n\"pio_end.txt\"}" 1pio_start.txt
+$AWK "/CPPPATH\=\[/{n++}{print>n\"pio_start.txt\"}" $AR_COMPS/arduino/tools/platformio-build.py
+$AWK "/LIBSOURCE_DIRS\=\[/{n++}{print>n\"pio_end.txt\"}" 1pio_start.txt
 cat 2pio_start.txt >> 1pio_end.txt
 cat pio_start.txt > "$AR_PLATFORMIO_PY"
 rm pio_end.txt 1pio_start.txt 2pio_start.txt pio_start.txt
@@ -99,6 +99,17 @@ for lib in `find . -name '*.a'`; do
     PIO_LIBS+=", \"-l"$(basename ${lib:5} .a)"\""
 done
 PIO_LIBS+=", \"-lstdc++\""
+
+# copy libs for psram workaround
+for lib in `find $IDF_COMPS/newlib/lib -name '*-psram-workaround.a'`; do
+    lsize=$($SSTAT "$lib")
+    if (( lsize > minlsize )); then
+        cp -f $lib $AR_SDK/lib/
+    else
+        echo "skipping $lib: size too small $lsize"
+    fi
+done
+
 cd "$AR_ROOT"
 
 echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
@@ -117,9 +128,9 @@ cat 1pio_end.txt >> "$AR_PLATFORMIO_PY"
 rm 1pio_end.txt
 
 # arduino platform.txt
-awk "/compiler.cpreprocessor.flags\=/{n++}{print>n\"platform_start.txt\"}" $AR_COMPS/arduino/platform.txt
+$AWK "/compiler.cpreprocessor.flags\=/{n++}{print>n\"platform_start.txt\"}" $AR_COMPS/arduino/platform.txt
 $SED -i '/compiler.cpreprocessor.flags\=/d' 1platform_start.txt
-awk "/compiler.c.elf.libs\=/{n++}{print>n\"platform_mid.txt\"}" 1platform_start.txt
+$AWK "/compiler.c.elf.libs\=/{n++}{print>n\"platform_mid.txt\"}" 1platform_start.txt
 $SED -i '/compiler.c.elf.libs\=/d' 1platform_mid.txt
 rm 1platform_start.txt
 cat platform_start.txt > "$AR_PLATFORM_TXT"

tools/update-components.sh

@@ -5,12 +5,18 @@ source ./tools/config.sh
 #
 # CLONE/UPDATE ARDUINO
 #
+ARDUINO_BRANCH="master"
+ARDUINO_HAS_BRANCH=`git_branch_exists "$AR_COMPS/arduino" "idf-$IDF_BRANCH"`
+if [ "$ARDUINO_HAS_BRANCH" == "1" ]; then
+	ARDUINO_BRANCH="idf-$IDF_BRANCH"
+fi
 
 if [ ! -d "$AR_COMPS/arduino" ]; then
-	git clone $AR_REPO_URL "$AR_COMPS/arduino"
+	git clone $AR_REPO_URL "$AR_COMPS/arduino" -b $ARDUINO_BRANCH
 else
+	git -C "$AR_COMPS/arduino" checkout $ARDUINO_BRANCH && \
 	git -C "$AR_COMPS/arduino" fetch origin && \
-	git -C "$AR_COMPS/arduino" pull origin master
+	git -C "$AR_COMPS/arduino" pull origin $ARDUINO_BRANCH
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 git -C "$AR_COMPS/arduino" submodule update --init --recursive