Merge remote-tracking branch 'upstream/master'

Author: Brett Forsyth

.github/workflows/cron.yml

@@ -25,9 +25,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Install dependencies
-      run: sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache
-    - name: Install Python Wheel
-      run: pip install wheel
+      run: bash ./tools/prepare-ci.sh
     - name: Build
       env:
         GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}

.github/workflows/push.yml

@@ -14,9 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Install dependencies
-      run: sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache
-    - name: Install Python Wheel
-      run: pip install wheel
+      run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs
       run: bash ./build.sh
     - name: Upload archive

.github/workflows/repository_dispatch.yml

@@ -9,9 +9,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Install dependencies
-      run: sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache
-    - name: Install Python Wheel
-      run: pip install wheel
+      run: bash ./tools/prepare-ci.sh
     - name: Handle Event
       env:
         GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}

sdkconfig

@@ -613,7 +613,7 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
 CONFIG_FREERTOS_ISR_STACKSIZE=1536
 CONFIG_FREERTOS_LEGACY_HOOKS=
 CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
-CONFIG_SUPPORT_STATIC_ALLOCATION=
+CONFIG_SUPPORT_STATIC_ALLOCATION=y
 CONFIG_TIMER_TASK_PRIORITY=1
 CONFIG_TIMER_TASK_STACK_DEPTH=2048
 CONFIG_TIMER_QUEUE_LENGTH=10

tools/prepare-ci.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo apt-get install -y git wget curl libssl-dev libncurses-dev flex bison gperf python3 cmake ninja-build ccache
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && python3 get-pip.py && \
+pip3 install setuptools pyserial click future wheel cryptography pyparsing pyelftools

tools/prepare-libs.sh

@@ -21,31 +21,33 @@ echo "    CPPPATH=[" >> "$AR_PLATFORMIO_PY" && echo "       join(FRAMEWORK_DIR,
 while [ "$1" != "" ]; do
 	cpath=$1
 	cname=$(echo $cpath| cut -d'/' -f 1)
-	if [ -d "$AR_COMPS/$cpath" ]; then
-		full_cpath="$AR_COMPS/$cpath"
-	else
-		full_cpath="$IDF_COMPS/$cpath"
+	if [ "$cname" != "nimble" ]; then
+		if [ -d "$AR_COMPS/$cpath" ]; then
+			full_cpath="$AR_COMPS/$cpath"
+		else
+			full_cpath="$IDF_COMPS/$cpath"
+		fi
+		out_cpath="$AR_SDK/include/$cname"
+		if [ ! -d $out_cpath ]; then
+			#first encounter of this component
+			AR_INC+=" \"-I{compiler.sdk.path}/include/$cname\""
+			echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"include\", \"$cname\")," >> "$AR_PLATFORMIO_PY"
+		fi
+		for f in `find $full_cpath -name '*.h'`; do
+			rel_f=${f#*$cpath/}
+			full_f=/$rel_f
+			rel_p=${full_f%/*}
+			mkdir -p "$out_cpath$rel_p"
+			cp -f $f "$out_cpath$rel_p/"
+		done
+		for f in `find $full_cpath -name '*.hpp'`; do
+			rel_f=${f#*$cpath/}
+			full_f=/$rel_f
+			rel_p=${full_f%/*}
+			mkdir -p "$out_cpath$rel_p"
+			cp -f $f "$out_cpath$rel_p/"
+		done
 	fi
-	out_cpath="$AR_SDK/include/$cname"
-	if [ ! -d $out_cpath ]; then
-		#first encounter of this component
-		AR_INC+=" \"-I{compiler.sdk.path}/include/$cname\""
-		echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"include\", \"$cname\")," >> "$AR_PLATFORMIO_PY"
-	fi
-	for f in `find $full_cpath -name '*.h'`; do
-		rel_f=${f#*$cpath/}
-		full_f=/$rel_f
-		rel_p=${full_f%/*}
-		mkdir -p "$out_cpath$rel_p"
-		cp -f $f "$out_cpath$rel_p/"
-	done
-	for f in `find $full_cpath -name '*.hpp'`; do
-		rel_f=${f#*$cpath/}
-		full_f=/$rel_f
-		rel_p=${full_f%/*}
-		mkdir -p "$out_cpath$rel_p"
-		cp -f $f "$out_cpath$rel_p/"
-	done
 	shift
 done
 echo "        join(FRAMEWORK_DIR, \"cores\", env.BoardConfig().get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"