Merge branch 'master' into master

Author: me-no-dev

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

@@ -29,6 +29,7 @@ CONFIG_ARDUINO_RUN_CORE0=
 CONFIG_ARDUINO_RUN_CORE1=y
 CONFIG_ARDUINO_RUN_NO_AFFINITY=
 CONFIG_ARDUINO_RUNNING_CORE=1
+CONFIG_ARDUINO_LOOP_STACK_SIZE=8192
 CONFIG_ARDUINO_EVENT_RUN_CORE0=
 CONFIG_ARDUINO_EVENT_RUN_CORE1=y
 CONFIG_ARDUINO_EVENT_RUN_NO_AFFINITY=
@@ -239,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
@@ -275,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
 #
@@ -693,6 +700,7 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
 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
@@ -951,3 +959,4 @@ CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
 # Supplicant
 #
 CONFIG_WPA_WPS_WARS=
+CONFIG_WPA_DEBUG_PRINT=

tools/config.sh

@@ -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=`uname -m`
   	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/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
@@ -117,9 +117,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