Skip to content

Commit ab1379b

Browse files
authored
27052021 (#5)
* trigger * Arduino branch changed to release/v1.0 * Change source toolchain * Update sdkconfig * Update config.sh * Back to espressif source
1 parent 7dad38e commit ab1379b

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ git clone https://github.com/espressif/esp32-arduino-lib-builder
1212
cd esp32-arduino-lib-builder
1313
./build.sh
1414
```
15+

sdkconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,11 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
282282
#
283283
CONFIG_CAN_ISR_IN_IRAM=
284284

285+
#
286+
# UART configuration
287+
#
288+
CONFIG_UART_ISR_IN_IRAM=
289+
285290
#
286291
# eFuse Bit Manager
287292
#
@@ -622,6 +627,7 @@ CONFIG_FREERTOS_ISR_STACKSIZE=1536
622627
CONFIG_FREERTOS_LEGACY_HOOKS=
623628
CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
624629
CONFIG_SUPPORT_STATIC_ALLOCATION=y
630+
CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK=
625631
CONFIG_TIMER_TASK_PRIORITY=1
626632
CONFIG_TIMER_TASK_STACK_DEPTH=2048
627633
CONFIG_TIMER_QUEUE_LENGTH=10
@@ -936,6 +942,7 @@ CONFIG_UNITY_ENABLE_DOUBLE=y
936942
CONFIG_UNITY_ENABLE_COLOR=
937943
CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
938944
CONFIG_UNITY_ENABLE_FIXTURE=
945+
CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL=
939946

940947
#
941948
# Virtual file system

tools/archive-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
2222
if [ -d "out" ]; then
2323
cd out
2424
echo "Creating framework-arduinoespressif32"
25-
git clone https://github.com/espressif/arduino-esp32 -b idf-release/v3.3
25+
git clone https://github.com/espressif/arduino-esp32 -b release/v1.0
2626
rm -rf arduino-esp32/tools/sdk
2727
rm -rf arduino-esp32/docs
2828
cp -Rf tools/sdk arduino-esp32/tools/sdk

tools/config.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ if [ -z $IDF_BRANCH ]; then
1212
IDF_BRANCH="release/v3.3"
1313
fi
1414

15+
if [ -z $AR_PR_TARGET_BRANCH ]; then
16+
AR_PR_TARGET_BRANCH="release/v1.0"
17+
fi
18+
1519
# Owner of the target ESP32 Arduino repository
1620
AR_USER="espressif"
1721

@@ -96,13 +100,14 @@ function git_pr_exists(){ # git_pr_exists <branch-name>
96100
function git_create_pr(){ # git_create_pr <branch> <title>
97101
local pr_branch="$1"
98102
local pr_title="$2"
103+
local pr_target="$3"
99104
local pr_body=""
100105
for component in `ls "$AR_COMPS"`; do
101106
if [ ! $component == "arduino" ] && [ -d "$AR_COMPS/$component/.git" ]; then
102107
pr_body+="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)"\r\n"
103108
fi
104109
done
105-
local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"master\"}"
110+
local pr_data="{\"title\": \"$pr_title\", \"body\": \"$pr_body\", \"head\": \"$AR_USER:$pr_branch\", \"base\": \"$pr_target\"}"
106111
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"`
107112
local done_pr=`echo "$git_create_pr_res" | jq -r '.title'`
108113
if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi

0 commit comments

Comments
 (0)