Skip to content

Commit e0ee816

Browse files
me-no-devme-no-dev
committed
Update for IDF 3.3
1 parent b86ba2b commit e0ee816

File tree

5 files changed

+35
-7
lines changed

5 files changed

+35
-7
lines changed

‎build.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ if ! [ -x "$(command -v stat)" ]; then
3535
exit 1
3636
fi
3737

38+
awk="awk"
39+
if [[ "$OSTYPE" == "darwin"* ]]; then
40+
awk="gawk"
41+
fi
42+
43+
if ! [ -x "$(command -v $awk)" ]; then
44+
echo "ERROR: $awk is not installed! Please install $awk first."
45+
exit 1
46+
fi
47+
3848
mkdir -p dist
3949

4050
# update components from git

‎sdkconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONFIG_ARDUINO_RUN_CORE0=
2929
CONFIG_ARDUINO_RUN_CORE1=y
3030
CONFIG_ARDUINO_RUN_NO_AFFINITY=
3131
CONFIG_ARDUINO_RUNNING_CORE=1
32+
CONFIG_ARDUINO_LOOP_STACK_SIZE=8192
3233
CONFIG_ARDUINO_EVENT_RUN_CORE0=
3334
CONFIG_ARDUINO_EVENT_RUN_CORE1=y
3435
CONFIG_ARDUINO_EVENT_RUN_NO_AFFINITY=
@@ -239,6 +240,7 @@ CONFIG_HFP_AUDIO_DATA_PATH_PCM=y
239240
CONFIG_HFP_AUDIO_DATA_PATH_HCI=
240241
CONFIG_BT_SSP_ENABLED=y
241242
CONFIG_GATTS_ENABLE=y
243+
CONFIG_GATTS_BLUFI_ENABLE=y
242244
CONFIG_GATTS_SEND_SERVICE_CHANGE_MANUAL=
243245
CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO=y
244246
CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0
@@ -275,6 +277,11 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=y
275277
CONFIG_SPI_SLAVE_IN_IRAM=
276278
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
277279

280+
#
281+
# CAN Configuration
282+
#
283+
CONFIG_CAN_ISR_IN_IRAM=
284+
278285
#
279286
# eFuse Bit Manager
280287
#
@@ -693,6 +700,7 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
693700
CONFIG_LWIP_TCP_ISN_HOOK=y
694701
CONFIG_LWIP_MAX_ACTIVE_TCP=16
695702
CONFIG_LWIP_MAX_LISTENING_TCP=16
703+
CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
696704
CONFIG_TCP_MAXRTX=12
697705
CONFIG_TCP_SYNMAXRTX=6
698706
CONFIG_TCP_MSS=1436
@@ -951,3 +959,4 @@ CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
951959
# Supplicant
952960
#
953961
CONFIG_WPA_WPS_WARS=
962+
CONFIG_WPA_DEBUG_PRINT=

‎tools/config.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ AR_PLATFORMIO_PY="$AR_TOOLS/platformio-build.py"
3636
AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
3737
AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
3838
AR_SDK="$AR_TOOLS/sdk"
39+
OSBITS=`arch`
3940

4041
function get_os(){
41-
OSBITS=`arch`
4242
if [[ "$OSTYPE" == "linux"* ]]; then
4343
if [[ "$OSBITS" == "i686" ]]; then
4444
echo "linux32"
@@ -62,13 +62,16 @@ function get_os(){
6262
}
6363

6464
AR_OS=`get_os`
65+
echo "OSTYPE: $OSTYPE, OSBITS: $OSBITS, OS: $AR_OS"
6566

67+
export AWK="awk"
6668
export SED="sed"
6769
export SSTAT="stat -c %s"
6870

6971
if [[ "$AR_OS" == "macos" ]]; then
7072
export SED="gsed"
7173
export SSTAT="stat -f %z"
74+
export AWK="gawk"
7275
fi
7376

7477
function git_commit_exists(){ #git_commit_exists <repo-path> <commit-message>

‎tools/prepare-libs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ fi
99
mkdir -p "$AR_SDK"
1010

1111
# start generation of platformio-build.py
12-
awk "/CPPPATH\=\[/{n++}{print>n\"pio_start.txt\"}" $AR_COMPS/arduino/tools/platformio-build.py
13-
awk "/LIBSOURCE_DIRS\=\[/{n++}{print>n\"pio_end.txt\"}" 1pio_start.txt
12+
$AWK "/CPPPATH\=\[/{n++}{print>n\"pio_start.txt\"}" $AR_COMPS/arduino/tools/platformio-build.py
13+
$AWK "/LIBSOURCE_DIRS\=\[/{n++}{print>n\"pio_end.txt\"}" 1pio_start.txt
1414
cat 2pio_start.txt >> 1pio_end.txt
1515
cat pio_start.txt > "$AR_PLATFORMIO_PY"
1616
rm pio_end.txt 1pio_start.txt 2pio_start.txt pio_start.txt
@@ -117,9 +117,9 @@ cat 1pio_end.txt >> "$AR_PLATFORMIO_PY"
117117
rm 1pio_end.txt
118118

119119
# arduino platform.txt
120-
awk "/compiler.cpreprocessor.flags\=/{n++}{print>n\"platform_start.txt\"}" $AR_COMPS/arduino/platform.txt
120+
$AWK "/compiler.cpreprocessor.flags\=/{n++}{print>n\"platform_start.txt\"}" $AR_COMPS/arduino/platform.txt
121121
$SED -i '/compiler.cpreprocessor.flags\=/d' 1platform_start.txt
122-
awk "/compiler.c.elf.libs\=/{n++}{print>n\"platform_mid.txt\"}" 1platform_start.txt
122+
$AWK "/compiler.c.elf.libs\=/{n++}{print>n\"platform_mid.txt\"}" 1platform_start.txt
123123
$SED -i '/compiler.c.elf.libs\=/d' 1platform_mid.txt
124124
rm 1platform_start.txt
125125
cat platform_start.txt > "$AR_PLATFORM_TXT"

‎tools/update-components.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@ source ./tools/config.sh
55
#
66
# CLONE/UPDATE ARDUINO
77
#
8+
ARDUINO_BRANCH="master"
9+
ARDUINO_HAS_BRANCH=`git_branch_exists "$AR_COMPS/arduino" "idf-$IDF_BRANCH"`
10+
if [ "$ARDUINO_HAS_BRANCH" == "1" ]; then
11+
ARDUINO_BRANCH="idf-$IDF_BRANCH"
12+
fi
813

914
if [ ! -d "$AR_COMPS/arduino" ]; then
10-
git clone $AR_REPO_URL "$AR_COMPS/arduino"
15+
git clone $AR_REPO_URL "$AR_COMPS/arduino" -b $ARDUINO_BRANCH
1116
else
17+
git -C "$AR_COMPS/arduino" checkout $ARDUINO_BRANCH && \
1218
git -C "$AR_COMPS/arduino" fetch origin && \
13-
git -C "$AR_COMPS/arduino" pull origin master
19+
git -C "$AR_COMPS/arduino" pull origin $ARDUINO_BRANCH
1420
fi
1521
if [ $? -ne 0 ]; then exit 1; fi
1622
git -C "$AR_COMPS/arduino" submodule update --init --recursive

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy