Skip to content

Commit 1870aa8

Browse files
Jason2866Jason2866
authored
V5.5 arduino settings
1 parent 0c6c744 commit 1870aa8

13 files changed

+116
-156
lines changed

‎.github/workflows/push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: IDF v5.4
1+
name: IDF v5.5
22
on:
33
workflow_dispatch: # Manually start a workflow
44

‎configs/builds.json

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"file":"libspi_flash.a",
55
"src":"build/esp-idf/spi_flash/libspi_flash.a",
66
"out":"lib/libspi_flash.a",
7-
"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4"]
7+
"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4","esp32c5"]
88
},
99
{
1010
"file":"libesp_psram.a",
@@ -50,6 +50,34 @@
5050
}
5151
],
5252
"targets":[
53+
{
54+
"target": "esp32c5",
55+
"features":["qio_ram"],
56+
"idf_libs":["qio","80m"],
57+
"bootloaders":[
58+
["qio","80m"],
59+
["dio","80m"],
60+
["qio","40m"],
61+
["dio","40m"]
62+
],
63+
"mem_variants":[
64+
["dio","80m"]
65+
]
66+
},
67+
{
68+
"target": "esp32p4",
69+
"features":["qio_ram"],
70+
"idf_libs":["qio","80m"],
71+
"bootloaders":[
72+
["qio","80m"],
73+
["dio","80m"],
74+
["qio","40m"],
75+
["dio","40m"]
76+
],
77+
"mem_variants":[
78+
["dio","80m"]
79+
]
80+
},
5381
{
5482
"target": "esp32c2",
5583
"features":[],
@@ -92,20 +120,6 @@
92120
["dio","80m"]
93121
]
94122
},
95-
{
96-
"target": "esp32p4",
97-
"features":["qio_ram"],
98-
"idf_libs":["qio","80m"],
99-
"bootloaders":[
100-
["qio","80m"],
101-
["dio","80m"],
102-
["qio","40m"],
103-
["dio","40m"]
104-
],
105-
"mem_variants":[
106-
["dio","80m"]
107-
]
108-
},
109123
{
110124
"target": "esp32c3",
111125
"features":[],

‎configs/defconfig.esp32

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,12 @@ CONFIG_ETH_USE_ESP32_EMAC=y
3131
CONFIG_ETH_PHY_INTERFACE_RMII=y
3232
CONFIG_ETH_USE_SPI_ETHERNET=y
3333

34-
CONFIG_SPIRAM=y
3534
CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
35+
3636
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
37-
# CONFIG_UNITY_ENABLE_FLOAT is not set
38-
# CONFIG_UNITY_ENABLE_DOUBLE is not set
39-
# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
4037
# CONFIG_USE_WAKENET is not set
4138
# CONFIG_USE_MULTINET is not set
42-
# CONFIG_VFS_SUPPORT_SELECT is not set
43-
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
44-
# CONFIG_VFS_SUPPORT_TERMIOS is not set
39+
4540
CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
4641
CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
4742
CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y

‎configs/defconfig.esp32c2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ CONFIG_XTAL_FREQ_26=y
22
CONFIG_XTAL_FREQ=26
33

44
CONFIG_COMPILER_FLOAT_LIB_FROM_RVFPLIB=y
5+
CONFIG_NEWLIB_NANO_FORMAT=y
56

67
#
78
# Bluetooth

‎configs/defconfig.esp32c3

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CONFIG_NEWLIB_NANO_FORMAT=y
2+
13
#
24
# Bluetooth
35
#

‎configs/defconfig.esp32c5

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
CONFIG_XTAL_FREQ_AUTO=y
2+
CONFIG_XTAL_FREQ=0
3+
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
4+
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
5+
CONFIG_SPIRAM=y
6+
7+
CONFIG_NEWLIB_NANO_FORMAT=y
8+
9+
#
10+
# Bluetooth
11+
#
12+
CONFIG_BT_ENABLED=y
13+
CONFIG_BT_STACK_NO_LOG=y
14+
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
15+
# CONFIG_BLE_MESH is not set
16+
CONFIG_BT_NIMBLE_ENABLED=y
17+
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
18+
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=2
19+
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
20+
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
21+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
22+
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
23+
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set
24+
25+
CONFIG_BT_CTRL_MODEM_SLEEP=y
26+
CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
27+
CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y
28+
# CONFIG_BT_CTRL_LPCLK_SEL_RTC_SLOW is not set
29+
CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y
30+
CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y
31+
CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y
32+
CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y
33+
CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y
34+
CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y
35+
CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y
36+
CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y
37+
CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y
38+
CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y
39+
CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y
40+
CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y
41+
CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y
42+
CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y
43+
CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y
44+
CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y
45+
CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y
46+
CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y
47+
CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y
48+
CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y
49+
CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y
50+
CONFIG_RTC_CLK_CAL_CYCLES=576
51+
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
52+
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
53+
54+
# This Enables RISCV LP - but it can't be used within Arduino at this time.
55+
#CONFIG_ULP_COPROC_ENABLED=y
56+
#CONFIG_ULP_COPROC_LP_CORE=y
57+
#CONFIG_ULP_COPROC_RESERVE_MEM=4096
58+
59+
#
60+
# Zigbee
61+
#
62+
CONFIG_ZB_ENABLED=y
63+
CONFIG_ZB_ZED=y
64+
CONFIG_ZB_RADIO_NATIVE=y
65+
# end of Zigbee

‎configs/defconfig.esp32h2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CONFIG_NEWLIB_NANO_FORMAT=y
2+
13
#
24
# Bluetooth
35
#

‎configs/defconfig.esp32s2

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
CONFIG_NEWLIB_NANO_FORMAT=y
2+
13
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
24
CONFIG_SPIRAM=y
35
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
@@ -10,14 +12,6 @@ CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=4096
1012
# CONFIG_USE_MULTINET is not set
1113
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
1214
CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
13-
# CONFIG_UNITY_ENABLE_FLOAT is not set
14-
# CONFIG_UNITY_ENABLE_DOUBLE is not set
15-
# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
16-
# CONFIG_USE_WAKENET is not set
17-
# CONFIG_USE_MULTINET is not set
18-
# CONFIG_VFS_SUPPORT_SELECT is not set
19-
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
20-
# CONFIG_VFS_SUPPORT_TERMIOS is not set
2115

2216
#
2317
# PPP

‎configs/defconfig.esp32s3

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# CONFIG_IDF_EXPERIMENTAL_FEATURES=y
22

3+
CONFIG_NEWLIB_NANO_FORMAT=y
4+
35
CONFIG_ULP_COPROC_ENABLED=y
46
CONFIG_ULP_COPROC_TYPE_RISCV=y
57
CONFIG_ULP_COPROC_RESERVE_MEM=4096

‎patches/lwip_max_tcp_pcb.diff

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎tools/config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ if [ -z $IDF_PATH ]; then
66
fi
77

88
if [ -z $IDF_BRANCH ]; then
9-
export IDF_BRANCH="release/v5.4"
9+
export IDF_BRANCH="release/v5.5"
1010
fi
1111

1212
# Arduino branch to use
1313
if [ -z $AR_BRANCH ]; then
14-
AR_BRANCH="main"
14+
AR_BRANCH="release/v3.3.x"
1515
fi
1616

1717
if [ -z $IDF_TARGET ]; then

‎tools/copy-libs.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ LD_SCRIPT_DIRS=""
7575
PIO_CC_FLAGS="-flto=auto "
7676
PIO_C_FLAGS="-flto=auto "
7777
PIO_CXX_FLAGS="-flto=auto "
78+
# PIO_CXX_FLAGS="-flto=auto -std=gnu++2a "
7879
PIO_AS_FLAGS=""
7980
PIO_LD_FLAGS="-flto "
8081
PIO_LD_FUNCS=""
@@ -126,7 +127,7 @@ for item in "${@:2:${#@}-5}"; do
126127
DEFINES+="$item "
127128
fi
128129
elif [ "$prefix" = "-O" ]; then
129-
PIO_CC_FLAGS+="$item "
130+
PIO_CC_FLAGS+="$item "
130131
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
131132
if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" && "${item:0:19}" != "-fdebug-prefix-map=" && "${item:0:8}" != "-fno-lto" ]]; then
132133
C_FLAGS+="$item "
@@ -312,6 +313,9 @@ for item; do
312313
fi
313314
done
314315

316+
# Remove -std=gnu++2b from PIO_CXX_FLAGS
317+
# PIO_CXX_FLAGS="${PIO_CXX_FLAGS/-std=gnu++2b/}"
318+
315319
#
316320
# END OF DATA EXTRACTION FROM CMAKE
317321
#

‎tools/install-esp-idf.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,9 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
8181

8282
# 1) Temporarily patch the ESP32-S2 I2C LL driver to keep the clock source
8383
# 2) Temporarily fix for mmu map and late init of psram https://github.com/espressif/arduino-esp32/issues/9936
84-
cd $IDF_PATH
85-
patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff
86-
patch -p1 -N -i $AR_PATCHES/lwip_max_tcp_pcb.diff
87-
cd -
84+
#cd $IDF_PATH
85+
#patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff
86+
#cd -
8887

8988
# Get the exact IDF version from file "version.txt"
9089
cd $IDF_PATH

0 commit comments

Comments
 (0)