From 8980d3bde9c36509cc13c8e29916de7fc4e205a4 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 26 May 2021 18:19:10 +0200 Subject: [PATCH 01/10] trigger --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b14b38f3c..7a34de818 100644 --- a/README.md +++ b/README.md @@ -12,3 +12,4 @@ git clone https://github.com/espressif/esp32-arduino-lib-builder cd esp32-arduino-lib-builder ./build.sh ``` + From cd9e4b253778c4c8732ac538006f8178a40b23a8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 26 May 2021 18:23:27 +0200 Subject: [PATCH 02/10] Arduino branch changed to release/v1.0 --- tools/archive-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/archive-build.sh b/tools/archive-build.sh index cd1730c2b..2bb31172a 100755 --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -22,7 +22,7 @@ mkdir -p dist && rm -rf "$archive_path" "$build_archive_path" if [ -d "out" ]; then cd out echo "Creating framework-arduinoespressif32" - git clone https://github.com/espressif/arduino-esp32 -b idf-release/v3.3 + git clone https://github.com/espressif/arduino-esp32 -b release/v1.0 rm -rf arduino-esp32/tools/sdk rm -rf arduino-esp32/docs cp -Rf tools/sdk arduino-esp32/tools/sdk From 4817fd9cdad9b53c0d313e926cb39c0c6364b96f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 27 May 2021 10:53:26 +0200 Subject: [PATCH 03/10] Change source toolchain --- tools/config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/config.sh b/tools/config.sh index 1d06a4ddf..cfab8beaf 100755 --- a/tools/config.sh +++ b/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-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_LINUX32="https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_LINUX64="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip" -IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX_ARMEL="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX64="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_WIN32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip" +IDF_TOOLCHAIN_MACOS="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz" if [ -z $IDF_BRANCH ]; then IDF_BRANCH="release/v3.3" From 0e65840a31999f546dd2797ee571d2ea666c924d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 27 May 2021 11:00:41 +0200 Subject: [PATCH 04/10] Update sdkconfig --- sdkconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdkconfig b/sdkconfig index 89656389e..5acde6fc3 100644 --- a/sdkconfig +++ b/sdkconfig @@ -282,6 +282,11 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_CAN_ISR_IN_IRAM= +# +# UART configuration +# +CONFIG_UART_ISR_IN_IRAM= + # # eFuse Bit Manager # @@ -622,6 +627,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536 CONFIG_FREERTOS_LEGACY_HOOKS= CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 CONFIG_SUPPORT_STATIC_ALLOCATION=y +CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK= CONFIG_TIMER_TASK_PRIORITY=1 CONFIG_TIMER_TASK_STACK_DEPTH=2048 CONFIG_TIMER_QUEUE_LENGTH=10 @@ -936,6 +942,7 @@ CONFIG_UNITY_ENABLE_DOUBLE=y CONFIG_UNITY_ENABLE_COLOR= CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y CONFIG_UNITY_ENABLE_FIXTURE= +CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL= # # Virtual file system From ca1dd0f8ee213daad92332913b18d6bd19663b14 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 27 May 2021 11:27:38 +0200 Subject: [PATCH 05/10] Update config.sh --- tools/config.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index cfab8beaf..c249ff1f4 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -12,6 +12,10 @@ if [ -z $IDF_BRANCH ]; then IDF_BRANCH="release/v3.3" fi +if [ -z $AR_PR_TARGET_BRANCH ]; then + AR_PR_TARGET_BRANCH="release/v1.0" +fi + # Owner of the target ESP32 Arduino repository AR_USER="espressif" @@ -96,13 +100,14 @@ function git_pr_exists(){ # git_pr_exists function git_create_pr(){ # git_create_pr local pr_branch="$1" local pr_title="$2" + local pr_target="$3" local pr_body="" for component in `ls "$AR_COMPS"`; do if [ ! $component == "arduino" ] && [ -d "$AR_COMPS/$component/.git" ]; then pr_body+="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)"\r\n" fi done - local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"master\"}" + local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"$pr_target\"}" git_create_pr_res=`echo "$pr_data" | curl -k -H "Authorization: token $GITHUB_TOKEN" -H "Accept: application/vnd.github.v3.raw+json" --data @- "https://api.github.com/repos/$AR_REPO/pulls"` local done_pr=`echo "$git_create_pr_res" | jq -r '.title'` if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi From 2ea5924831721f3d1f6d8ec67382389743906c60 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 27 May 2021 11:49:41 +0200 Subject: [PATCH 06/10] Back to espressif source --- tools/config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/config.sh b/tools/config.sh index c249ff1f4..a0a2ab2ff 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -2,11 +2,11 @@ IDF_COMPS="$IDF_PATH/components" IDF_TOOLCHAIN="xtensa-esp32-elf" -IDF_TOOLCHAIN_LINUX_ARMEL="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_LINUX32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_LINUX64="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_WIN32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip" -IDF_TOOLCHAIN_MACOS="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX_ARMEL="https://dl.espressif.com/dl/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX32="https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX64="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip" +IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz" if [ -z $IDF_BRANCH ]; then IDF_BRANCH="release/v3.3" From 8372d51f3e9d455ae5f970b2fc99cf3c91db7054 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 27 May 2021 16:03:25 +0200 Subject: [PATCH 07/10] Copy all new files --- tools/archive-build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/archive-build.sh b/tools/archive-build.sh index 2bb31172a..f69c85f94 100755 --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -25,7 +25,15 @@ if [ -d "out" ]; then git clone https://github.com/espressif/arduino-esp32 -b release/v1.0 rm -rf arduino-esp32/tools/sdk rm -rf arduino-esp32/docs + rm -rf arduino-esp32/tools/esptool.py + rm -rf arduino-esp32/tools/gen_esp32part.py + rm -rf arduino-esp32/tools/platformio-build.py + rm -rf arduino-esp32/platform.txt cp -Rf tools/sdk arduino-esp32/tools/sdk + cp -Rf tools/esptool.py arduino-esp32/tools/esptool.py + cp -Rf tools/gen_esp32part.py arduino-esp32/tools/gen_esp32part.py + cp -Rf tools/platformio-build.py arduino-esp32/tools/platformio-build.py + cp -Rf platform.txt arduino-esp32/platform.txt cp ../core_version.h arduino-esp32/cores/esp32/core_version.h mv arduino-esp32/ framework-arduinoespressif32/ tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/ From 2805c0264408c980f8692cc4637a85fc6412534b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 31 May 2021 17:57:04 +0200 Subject: [PATCH 08/10] Update config.sh --- tools/config.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/config.sh b/tools/config.sh index a0a2ab2ff..c249ff1f4 100755 --- a/tools/config.sh +++ b/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-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_LINUX32="https://dl.espressif.com/dl/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_LINUX64="https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz" -IDF_TOOLCHAIN_WIN32="https://dl.espressif.com/dl/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip" -IDF_TOOLCHAIN_MACOS="https://dl.espressif.com/dl/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX_ARMEL="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux-armel-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux32-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_LINUX64="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz" +IDF_TOOLCHAIN_WIN32="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-win32-1.22.0-97-gc752ad5-5.2.0.zip" +IDF_TOOLCHAIN_MACOS="https://github.com/espressif/arduino-esp32/releases/download/1.0.5-rc5/xtensa-esp32-elf-macos-1.22.0-97-gc752ad5-5.2.0.tar.gz" if [ -z $IDF_BRANCH ]; then IDF_BRANCH="release/v3.3" From 545bdd7e864ab252e04c3df9cb9530be45a5afc9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 31 May 2021 17:58:10 +0200 Subject: [PATCH 09/10] Update install-esp-idf.sh --- tools/install-esp-idf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index 9b625d0ab..370e2f1f9 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -128,7 +128,7 @@ if ! [ -x "$(command -v $IDF_TOOLCHAIN-gcc)" ]; then exit 1 fi echo "Downloading $TC_LINK" - curl -k -o $IDF_TOOLCHAIN.$TC_EXT $TC_LINK || exit 1 + curl -Lk -o $IDF_TOOLCHAIN.$TC_EXT $TC_LINK || exit 1 fi if [[ "$AR_OS" == "win32" ]]; then unzip $IDF_TOOLCHAIN.$TC_EXT || exit 1 From 56d79c56762219b689acf8e83e314c20df04449f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 31 May 2021 18:08:58 +0200 Subject: [PATCH 10/10] trigger --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 7a34de818..b14b38f3c 100644 --- a/README.md +++ b/README.md @@ -12,4 +12,3 @@ git clone https://github.com/espressif/esp32-arduino-lib-builder cd esp32-arduino-lib-builder ./build.sh ``` -