Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: IDF v5.4
name: IDF v5.5
on:
workflow_dispatch: # Manually start a workflow

Expand Down
44 changes: 29 additions & 15 deletions configs/builds.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"file":"libspi_flash.a",
"src":"build/esp-idf/spi_flash/libspi_flash.a",
"out":"lib/libspi_flash.a",
"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4"]
"targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32p4","esp32c5"]
},
{
"file":"libesp_psram.a",
Expand Down Expand Up @@ -50,6 +50,34 @@
}
],
"targets":[
{
"target": "esp32c5",
"features":["qio_ram"],
"idf_libs":["qio","80m"],
"bootloaders":[
["qio","80m"],
["dio","80m"],
["qio","40m"],
["dio","40m"]
],
"mem_variants":[
["dio","80m"]
]
},
{
"target": "esp32p4",
"features":["qio_ram"],
"idf_libs":["qio","80m"],
"bootloaders":[
["qio","80m"],
["dio","80m"],
["qio","40m"],
["dio","40m"]
],
"mem_variants":[
["dio","80m"]
]
},
{
"target": "esp32c2",
"features":[],
Expand Down Expand Up @@ -92,20 +120,6 @@
["dio","80m"]
]
},
{
"target": "esp32p4",
"features":["qio_ram"],
"idf_libs":["qio","80m"],
"bootloaders":[
["qio","80m"],
["dio","80m"],
["qio","40m"],
["dio","40m"]
],
"mem_variants":[
["dio","80m"]
]
},
{
"target": "esp32c3",
"features":[],
Expand Down
9 changes: 2 additions & 7 deletions configs/defconfig.esp32
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,12 @@ CONFIG_ETH_USE_ESP32_EMAC=y
CONFIG_ETH_PHY_INTERFACE_RMII=y
CONFIG_ETH_USE_SPI_ETHERNET=y

CONFIG_SPIRAM=y
CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y

# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
# CONFIG_UNITY_ENABLE_FLOAT is not set
# CONFIG_UNITY_ENABLE_DOUBLE is not set
# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
# CONFIG_USE_WAKENET is not set
# CONFIG_USE_MULTINET is not set
# CONFIG_VFS_SUPPORT_SELECT is not set
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
# CONFIG_VFS_SUPPORT_TERMIOS is not set

CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
Expand Down
1 change: 1 addition & 0 deletions configs/defconfig.esp32c2
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CONFIG_XTAL_FREQ_26=y
CONFIG_XTAL_FREQ=26

CONFIG_COMPILER_FLOAT_LIB_FROM_RVFPLIB=y
CONFIG_NEWLIB_NANO_FORMAT=y

#
# Bluetooth
Expand Down
2 changes: 2 additions & 0 deletions configs/defconfig.esp32c3
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CONFIG_NEWLIB_NANO_FORMAT=y

#
# Bluetooth
#
Expand Down
65 changes: 65 additions & 0 deletions configs/defconfig.esp32c5
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
CONFIG_XTAL_FREQ_AUTO=y
CONFIG_XTAL_FREQ=0
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
CONFIG_SPIRAM=y

CONFIG_NEWLIB_NANO_FORMAT=y

#
# Bluetooth
#
CONFIG_BT_ENABLED=y
CONFIG_BT_STACK_NO_LOG=y
# CONFIG_BT_BLE_42_FEATURES_SUPPORTED is not set
# CONFIG_BLE_MESH is not set
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_LOG_LEVEL_NONE=y
CONFIG_BT_NIMBLE_MAX_CONNECTIONS=2
# CONFIG_BT_NIMBLE_NVS_PERSIST is not set
# CONFIG_BT_NIMBLE_CRYPTO_STACK_MBEDTLS is not set
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY is not set
# CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY is not set
# CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT is not set

CONFIG_BT_CTRL_MODEM_SLEEP=y
CONFIG_BT_CTRL_MODEM_SLEEP_MODE_1=y
CONFIG_BT_CTRL_LPCLK_SEL_MAIN_XTAL=y
# CONFIG_BT_CTRL_LPCLK_SEL_RTC_SLOW is not set
CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y
CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y
CONFIG_RTC_CLK_CAL_CYCLES=576
# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304

# This Enables RISCV LP - but it can't be used within Arduino at this time.
#CONFIG_ULP_COPROC_ENABLED=y
#CONFIG_ULP_COPROC_LP_CORE=y
#CONFIG_ULP_COPROC_RESERVE_MEM=4096

#
# Zigbee
#
CONFIG_ZB_ENABLED=y
CONFIG_ZB_ZED=y
CONFIG_ZB_RADIO_NATIVE=y
# end of Zigbee
2 changes: 2 additions & 0 deletions configs/defconfig.esp32h2
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CONFIG_NEWLIB_NANO_FORMAT=y

#
# Bluetooth
#
Expand Down
10 changes: 2 additions & 8 deletions configs/defconfig.esp32s2
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CONFIG_NEWLIB_NANO_FORMAT=y

CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
CONFIG_SPIRAM=y
CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
Expand All @@ -10,14 +12,6 @@ CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=4096
# CONFIG_USE_MULTINET is not set
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
# CONFIG_UNITY_ENABLE_FLOAT is not set
# CONFIG_UNITY_ENABLE_DOUBLE is not set
# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set
# CONFIG_USE_WAKENET is not set
# CONFIG_USE_MULTINET is not set
# CONFIG_VFS_SUPPORT_SELECT is not set
# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
# CONFIG_VFS_SUPPORT_TERMIOS is not set

#
# PPP
Expand Down
2 changes: 2 additions & 0 deletions configs/defconfig.esp32s3
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# CONFIG_IDF_EXPERIMENTAL_FEATURES=y

CONFIG_NEWLIB_NANO_FORMAT=y

CONFIG_ULP_COPROC_ENABLED=y
CONFIG_ULP_COPROC_TYPE_RISCV=y
CONFIG_ULP_COPROC_RESERVE_MEM=4096
Expand Down
118 changes: 0 additions & 118 deletions patches/lwip_max_tcp_pcb.diff

This file was deleted.

4 changes: 2 additions & 2 deletions tools/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ if [ -z $IDF_PATH ]; then
fi

if [ -z $IDF_BRANCH ]; then
export IDF_BRANCH="release/v5.4"
export IDF_BRANCH="release/v5.5"
fi

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

if [ -z $IDF_TARGET ]; then
Expand Down
6 changes: 5 additions & 1 deletion tools/copy-libs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ LD_SCRIPT_DIRS=""
PIO_CC_FLAGS="-flto=auto "
PIO_C_FLAGS="-flto=auto "
PIO_CXX_FLAGS="-flto=auto "
# PIO_CXX_FLAGS="-flto=auto -std=gnu++2a "
PIO_AS_FLAGS=""
PIO_LD_FLAGS="-flto "
PIO_LD_FUNCS=""
Expand Down Expand Up @@ -126,7 +127,7 @@ for item in "${@:2:${#@}-5}"; do
DEFINES+="$item "
fi
elif [ "$prefix" = "-O" ]; then
PIO_CC_FLAGS+="$item "
PIO_CC_FLAGS+="$item "
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
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
C_FLAGS+="$item "
Expand Down Expand Up @@ -312,6 +313,9 @@ for item; do
fi
done

# Remove -std=gnu++2b from PIO_CXX_FLAGS
# PIO_CXX_FLAGS="${PIO_CXX_FLAGS/-std=gnu++2b/}"

#
# END OF DATA EXTRACTION FROM CMAKE
#
Expand Down
7 changes: 3 additions & 4 deletions tools/install-esp-idf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,9 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then

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

# Get the exact IDF version from file "version.txt"
cd $IDF_PATH
Expand Down