From 77117d3d11f932965b2bccdb420405f7d33fe663 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:32:33 +0200 Subject: [PATCH 01/22] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2faff00ce..c84407ec2 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: IDF v5.1 +name: IDF v5.2 on: workflow_dispatch: # Manually start a workflow From cf474aa22ea3a4644219b4b1a942057e4bd7230d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:33:09 +0200 Subject: [PATCH 02/22] Update config.sh --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index a5cdfe840..9c8ae775f 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -11,7 +11,7 @@ fi # Arduino branch to use if [ -z $AR_BRANCH ]; then - AR_BRANCH="main" + AR_BRANCH="release/v5.2" fi if [ -z $IDF_TARGET ]; then From 5dde6c4cf15002610c642bd235c32666af265712 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 09:34:17 +0200 Subject: [PATCH 03/22] IDF 5.2 --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index 9c8ae775f..3476d8dda 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - export IDF_BRANCH="release/v5.1" + export IDF_BRANCH="release/v5.2" fi # Arduino branch to use From 057acf03a7daf26b06b161dbfb11e55c9ee72134 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:46:08 +0200 Subject: [PATCH 04/22] Update defconfig.esp32 --- configs/defconfig.esp32 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 9ceab04e5..2b41cdb3d 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -43,11 +43,3 @@ CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y - -# -# PPP -# -CONFIG_LWIP_PPP_SUPPORT=y -CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y -CONFIG_LWIP_PPP_PAP_SUPPORT=y -CONFIG_LWIP_PPP_ENABLE_IPV6=n From 434eb50813e788c2686b0e29a451d22db7c1c665 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:46:45 +0200 Subject: [PATCH 05/22] Update defconfig.esp32h2 --- configs/defconfig.esp32h2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2 index 6d18ad8cc..c3c5f8518 100644 --- a/configs/defconfig.esp32h2 +++ b/configs/defconfig.esp32h2 @@ -42,11 +42,3 @@ 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 - -# -# PPP -# -CONFIG_LWIP_PPP_SUPPORT=y -CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y -CONFIG_LWIP_PPP_PAP_SUPPORT=y -CONFIG_LWIP_PPP_ENABLE_IPV6=n From cb5999da5de5d288ff4157328f99aed584c89401 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:47:06 +0200 Subject: [PATCH 06/22] Update defconfig.esp32s3 --- configs/defconfig.esp32s3 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index c8375eeef..b772c28b1 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -36,11 +36,3 @@ CONFIG_BT_NIMBLE_MAX_CONNECTIONS=1 # 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 - -# -# PPP -# -CONFIG_LWIP_PPP_SUPPORT=y -CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y -CONFIG_LWIP_PPP_PAP_SUPPORT=y -CONFIG_LWIP_PPP_ENABLE_IPV6=n From d4801c18c2439c112604b2844ff7792e76bf2ba4 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:47:25 +0200 Subject: [PATCH 07/22] Update defconfig.esp32s2 --- configs/defconfig.esp32s2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index f3fca9b8f..4363869bf 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -18,11 +18,3 @@ CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n # CONFIG_VFS_SUPPORT_SELECT is not set # CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set # CONFIG_VFS_SUPPORT_TERMIOS is not set - -# -# PPP -# -CONFIG_LWIP_PPP_SUPPORT=y -CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT=y -CONFIG_LWIP_PPP_PAP_SUPPORT=y -CONFIG_LWIP_PPP_ENABLE_IPV6=n From d0b0613d5a3afbcffc55f6edac53b715331ce632 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:47:41 +0200 Subject: [PATCH 08/22] Update defconfig.esp32c2 --- configs/defconfig.esp32c2 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32c2 b/configs/defconfig.esp32c2 index 6517ecba1..943a7a45f 100644 --- a/configs/defconfig.esp32c2 +++ b/configs/defconfig.esp32c2 @@ -34,11 +34,3 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 # CONFIG_ETH_SPI_ETHERNET_DM9051 is not set # CONFIG_ETH_SPI_ETHERNET_W5500 is not set # CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set - -# -# Disable PPP -# -# CONFIG_LWIP_PPP_SUPPORT is not set -# CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT is not set -# CONFIG_LWIP_PPP_PAP_SUPPORT is not set -# CONFIG_LWIP_PPP_ENABLE_IPV6 is not set From 2dba1acb013fd57c1413cdc10317239be240085a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:47:55 +0200 Subject: [PATCH 09/22] Update defconfig.esp32c3 --- configs/defconfig.esp32c3 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 607e53e86..c3c5f8518 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -42,11 +42,3 @@ 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 - -# -# PPP -# -# CONFIG_LWIP_PPP_SUPPORT is not set -# CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT is not set -# CONFIG_LWIP_PPP_PAP_SUPPORT is not set -# CONFIG_LWIP_PPP_ENABLE_IPV6 is not set From c22337ab25cb5bd65f4768e712a933b0c03a877a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 12:48:09 +0200 Subject: [PATCH 10/22] Update defconfig.esp32c6 --- configs/defconfig.esp32c6 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6 index 68ddf8a67..e950a2489 100644 --- a/configs/defconfig.esp32c6 +++ b/configs/defconfig.esp32c6 @@ -52,11 +52,3 @@ 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 - -# -# PPP -# -# CONFIG_LWIP_PPP_SUPPORT is not set -# CONFIG_LWIP_PPP_NOTIFY_PHASE_SUPPORT is not set -# CONFIG_LWIP_PPP_PAP_SUPPORT is not set -# CONFIG_LWIP_PPP_ENABLE_IPV6 is not set From 69c6697930e3b465ac98fa3e3ccf879e289e78af Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:19:23 +0200 Subject: [PATCH 11/22] remove some OPI variants --- configs/builds.json | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/configs/builds.json b/configs/builds.json index 02695519c..30aaecf2f 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -4,7 +4,7 @@ "file":"libspi_flash.a", "src":"build/esp-idf/spi_flash/libspi_flash.a", "out":"lib/libspi_flash.a", - "targets":["esp32","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2","esp32c2"] + "targets":["esp32","esp32c2","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2"] }, { "file":"libesp_psram.a", @@ -131,26 +131,19 @@ { "target": "esp32s3", "features":[], - "idf_libs":["qio","80m","opi_ram"], + "idf_libs":["qio","80m","qio_ram"], "bootloaders":[ ["qio","120m","qio_ram"], - ["qio","120m","opi_ram"], ["qio","80m","qio_ram"], - ["qio","80m","opi_ram"], - ["opi","120m","qio_ram"], - ["opi","120m","opi_ram"], - ["opi","80m","qio_ram"], + ["dio","80m","qio_ram"], ["opi","80m","opi_ram"] ], "mem_variants":[ - ["qio","120m","qio_ram"], - ["qio","120m","opi_ram"], - ["qio","80m","qio_ram"], - ["qio","80m","opi_ram"], - ["opi","120m","qio_ram"], - ["opi","120m","opi_ram"], - ["opi","80m","qio_ram"], - ["opi","80m","opi_ram"] + ["qio","80m","opi_ram"], + ["dio","80m","qio_ram"], + ["dio","80m","opi_ram"], + ["opi","80m","opi_ram"], + ["opi","80m","qio_ram"] ] } ] From 016a71e23a11661e161a736cd959e044e7495a89 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:20:30 +0200 Subject: [PATCH 12/22] S3 only --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index cef559e19..bcd4fca1c 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then exit 1 fi -export TARGET="all" +export TARGET="esp32s3" BUILD_TYPE="all" SKIP_ENV=0 COPY_OUT=0 From b7a672316ba0aabe8a40fba74908d31a6ad9a943 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:33:32 +0200 Subject: [PATCH 13/22] Update defconfig.esp32s3 --- configs/defconfig.esp32s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index b772c28b1..741cf9fe4 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -1,4 +1,4 @@ -CONFIG_IDF_EXPERIMENTAL_FEATURES=y +# CONFIG_IDF_EXPERIMENTAL_FEATURES=y CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_RISCV=y From 801c7ad89f691545c6890310868a11e9ecd39cb7 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:34:34 +0200 Subject: [PATCH 14/22] Update defconfig.120m --- configs/defconfig.120m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.120m b/configs/defconfig.120m index 11d11177f..f04d2354e 100644 --- a/configs/defconfig.120m +++ b/configs/defconfig.120m @@ -1,3 +1,3 @@ CONFIG_ESPTOOLPY_FLASHFREQ_120M=y CONFIG_SPIRAM_SPEED_120M=y -CONFIG_SPI_FLASH_HPM_ENA=y +# CONFIG_SPI_FLASH_HPM_ENA is not set From f74e00d77ad401276d077d0de6cbefe9a5fafcff Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:33:34 +0200 Subject: [PATCH 15/22] Update builds.json --- configs/builds.json | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/configs/builds.json b/configs/builds.json index 30aaecf2f..af264eabe 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -131,19 +131,26 @@ { "target": "esp32s3", "features":[], - "idf_libs":["qio","80m","qio_ram"], + "idf_libs":["qio","80m","opi_ram"], "bootloaders":[ ["qio","120m","qio_ram"], + ["qio","120m","opi_ram"], ["qio","80m","qio_ram"], - ["dio","80m","qio_ram"], + ["qio","80m","opi_ram"], + ["opi","120m","qio_ram"], + ["opi","120m","opi_ram"], + ["opi","80m","qio_ram"], ["opi","80m","opi_ram"] ], "mem_variants":[ - ["qio","80m","opi_ram"], - ["dio","80m","qio_ram"], - ["dio","80m","opi_ram"], - ["opi","80m","opi_ram"], - ["opi","80m","qio_ram"] + ["qio","120m","qio_ram"], + ["qio","120m","opi_ram"], + ["qio","80m","qio_ram"], + ["qio","80m","opi_ram"], + ["opi","120m","qio_ram"], + ["opi","120m","opi_ram"], + ["opi","80m","qio_ram"], + ["opi","80m","opi_ram"] ] } ] From 5e303018dd2486ac5d92653c6b21ccdc215ee065 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:33:59 +0200 Subject: [PATCH 16/22] Update defconfig.120m --- configs/defconfig.120m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configs/defconfig.120m b/configs/defconfig.120m index f04d2354e..1dce09930 100644 --- a/configs/defconfig.120m +++ b/configs/defconfig.120m @@ -1,3 +1,5 @@ +CONFIG_IDF_EXPERIMENTAL_FEATURES=y CONFIG_ESPTOOLPY_FLASHFREQ_120M=y CONFIG_SPIRAM_SPEED_120M=y -# CONFIG_SPI_FLASH_HPM_ENA is not set +# CONFIG_SPI_FLASH_HPM_ENA=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y From 22aa8e81570877a90369ec543445961ae900bf17 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:34:22 +0200 Subject: [PATCH 17/22] Update defconfig.40m --- configs/defconfig.40m | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.40m b/configs/defconfig.40m index 079a0336a..ffc4b5c1c 100644 --- a/configs/defconfig.40m +++ b/configs/defconfig.40m @@ -1,2 +1 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y -CONFIG_SPIRAM_SPEED_40M=y \ No newline at end of file From e5a326816ae3ba02808c74ae24743b0c53482d6f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 19:34:35 +0200 Subject: [PATCH 18/22] Update defconfig.80m --- configs/defconfig.80m | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.80m b/configs/defconfig.80m index 38980b0d9..7014fa954 100644 --- a/configs/defconfig.80m +++ b/configs/defconfig.80m @@ -1,2 +1 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y -CONFIG_SPIRAM_SPEED_80M=y \ No newline at end of file From b8bce25432255639040232a98a9aa9bf8ad36a5d Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 21:04:10 +0200 Subject: [PATCH 19/22] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index bcd4fca1c..cef559e19 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then exit 1 fi -export TARGET="esp32s3" +export TARGET="all" BUILD_TYPE="all" SKIP_ENV=0 COPY_OUT=0 From 79f937b6b40b090aca46c7d8beedc13686470e2c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 21:11:01 +0200 Subject: [PATCH 20/22] Update dcd_esp32sx.c --- components/arduino_tinyusb/src/dcd_esp32sx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/arduino_tinyusb/src/dcd_esp32sx.c b/components/arduino_tinyusb/src/dcd_esp32sx.c index 324aad595..9d4d8bf7c 100755 --- a/components/arduino_tinyusb/src/dcd_esp32sx.c +++ b/components/arduino_tinyusb/src/dcd_esp32sx.c @@ -31,7 +31,7 @@ #if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) || (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && CFG_TUD_ENABLED) // Espressif -#include "freertos/xtensa_api.h" +#include "xtensa_api.h" #include "esp_intr_alloc.h" #include "esp_log.h" #include "soc/dport_reg.h" From 73a25a43aa806492edd5101fdd0706205707aad5 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 21:29:18 +0200 Subject: [PATCH 21/22] Update tusb_config.h --- components/arduino_tinyusb/include/tusb_config.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/components/arduino_tinyusb/include/tusb_config.h b/components/arduino_tinyusb/include/tusb_config.h index ee1e5d270..2e6fcb439 100755 --- a/components/arduino_tinyusb/include/tusb_config.h +++ b/components/arduino_tinyusb/include/tusb_config.h @@ -76,7 +76,10 @@ extern "C" { /* COMMON CONFIGURATION */ /* */ -#define CFG_TUSB_MCU OPT_MCU_ESP32S2 +#idef CFG_TUSB_MCU +#undef CFG_TUSB_MCU +#endif +#define CFG_TUSB_MCU OPT_MCU_ESP32S2 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE #define CFG_TUSB_OS OPT_OS_FREERTOS From cd537f2e5a41c7a1945422d172a8ea3a2e336a1b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 1 Jul 2024 23:45:34 +0200 Subject: [PATCH 22/22] silly typo --- components/arduino_tinyusb/include/tusb_config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/arduino_tinyusb/include/tusb_config.h b/components/arduino_tinyusb/include/tusb_config.h index 2e6fcb439..9f7f2566a 100755 --- a/components/arduino_tinyusb/include/tusb_config.h +++ b/components/arduino_tinyusb/include/tusb_config.h @@ -76,8 +76,8 @@ extern "C" { /* COMMON CONFIGURATION */ /* */ -#idef CFG_TUSB_MCU -#undef CFG_TUSB_MCU +#ifdef CFG_TUSB_MCU +# undef CFG_TUSB_MCU #endif #define CFG_TUSB_MCU OPT_MCU_ESP32S2 #define CFG_TUSB_RHPORT0_MODE OPT_MODE_DEVICE