Skip to content

Release/v3.3 solo1 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions sdkconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion tools/archive-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,18 @@ 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
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/
Expand Down
17 changes: 11 additions & 6 deletions tools/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@

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"
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"

Expand Down Expand Up @@ -96,13 +100,14 @@ function git_pr_exists(){ # git_pr_exists <branch-name>
function git_create_pr(){ # git_create_pr <branch> <title>
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
Expand Down
2 changes: 1 addition & 1 deletion tools/install-esp-idf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down