IDF 5.2 Arduino

Jason2866 · web-flow · commit 86772176c48b · 2024-07-02T13:21:23.000+02:00
diff --git 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
 
diff --git 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
+#ifdef 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
 
diff --git 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"
diff --git 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",
@@ -136,7 +136,7 @@
 				["qio","120m","qio_ram"],
 				["qio","120m","opi_ram"],
 				["qio","80m","qio_ram"],
-                                ["qio","80m","opi_ram"],
+				["qio","80m","opi_ram"],
 				["opi","120m","qio_ram"],
 				["opi","120m","opi_ram"],
 				["opi","80m","qio_ram"],
@@ -146,7 +146,7 @@
 				["qio","120m","qio_ram"],
 				["qio","120m","opi_ram"],
 				["qio","80m","qio_ram"],
-                                ["qio","80m","opi_ram"],
+                ["qio","80m","opi_ram"],
 				["opi","120m","qio_ram"],
 				["opi","120m","opi_ram"],
 				["opi","80m","qio_ram"],
diff --git 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=y
+# CONFIG_SPI_FLASH_HPM_ENA=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
diff --git a/configs/defconfig.40m b/configs/defconfig.40m
@@ -1,2 +1 @@
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
-CONFIG_SPIRAM_SPEED_40M=y
diff --git a/configs/defconfig.80m b/configs/defconfig.80m
@@ -1,2 +1 @@
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-CONFIG_SPIRAM_SPEED_80M=y
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
@@ -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
diff --git a/tools/config.sh b/tools/config.sh
@@ -6,12 +6,12 @@ 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
 if [ -z $AR_BRANCH ]; then
-    AR_BRANCH="main"
+    AR_BRANCH="release/v5.2"
 fi
 
 if [ -z $IDF_TARGET ]; then

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: IDF v5.1`
	`1`	`+name: IDF v5.2`
`2`	`2`	`on:`
`3`	`3`	`workflow_dispatch: # Manually start a workflow`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`CONFIG_ESPTOOLPY_FLASHFREQ_40M=y`
`2`		`-CONFIG_SPIRAM_SPEED_40M=y`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`CONFIG_ESPTOOLPY_FLASHFREQ_80M=y`
`2`		`-CONFIG_SPIRAM_SPEED_80M=y`