Merge branch 'feature/update_idf_version' into 'master'

feat: Upgraded esp-idf version to 64849cb7 (commit after v5.1.5 tag) See merge request application/esp-at!1689
espressif · Dec 17, 2024 · 967d88b · 967d88b
2 parents b2f6168 + c7e27ee
commit 967d88b
Show file tree

Hide file tree

Showing 99 changed files with 192 additions and 2,328 deletions.
diff --git a/components/at/idf_component.yml b/components/at/idf_component.yml
@@ -1,7 +1,7 @@
 ## IDF Component Manager Manifest File
 dependencies:
   espressif/mdns:
-    version: "~1.0.0"
+    version: "~1.4.2"
   espressif/esp_websocket_client:
     version: "~1.2.0"
   espressif/bootloader_support_plus:

diff --git a/components/at/lib/VERSION b/components/at/lib/VERSION
@@ -1,6 +1,6 @@
-ESP32:   239a73b
-ESP32C3: 239a73b
-ESP32C2: 239a73b
-ESP32C5: 239a73b
-ESP32C6: 239a73b
-ESP32S2: 239a73b
+ESP32:   752008f
+ESP32C3: 752008f
+ESP32C2: 752008f
+ESP32C5: 8834929
+ESP32C6: 752008f
+ESP32S2: 752008f
diff --git a/components/at/lib/libesp32_at_core.a b/components/at/lib/libesp32_at_core.a
diff --git a/components/at/lib/libesp32_at_core_silence.a b/components/at/lib/libesp32_at_core_silence.a
diff --git a/components/at/lib/libesp32c2_at_core.a b/components/at/lib/libesp32c2_at_core.a
diff --git a/components/at/lib/libesp32c2_at_core_silence.a b/components/at/lib/libesp32c2_at_core_silence.a
diff --git a/components/at/lib/libesp32c3_at_core.a b/components/at/lib/libesp32c3_at_core.a
diff --git a/components/at/lib/libesp32c3_at_core_silence.a b/components/at/lib/libesp32c3_at_core_silence.a
diff --git a/components/at/lib/libesp32c6_at_core.a b/components/at/lib/libesp32c6_at_core.a
diff --git a/components/at/lib/libesp32c6_at_core_silence.a b/components/at/lib/libesp32c6_at_core_silence.a
diff --git a/components/at/lib/libesp32s2_at_core.a b/components/at/lib/libesp32s2_at_core.a
diff --git a/components/at/lib/libesp32s2_at_core_silence.a b/components/at/lib/libesp32s2_at_core_silence.a
diff --git a/examples/at_override_module_config/IDF_VERSION b/examples/at_override_module_config/IDF_VERSION
@@ -1,3 +1,3 @@
-branch:release/v5.0
-commit:bcca689866db3dfda47f77670bf8df2a7ec94721
+branch:release/v5.1
+commit:64849cb7039a93b7b3a4ad8e8da328fa9c09c5e7
 repository:https://github.com/espressif/esp-idf.git
diff --git a/examples/at_override_module_config/README.md b/examples/at_override_module_config/README.md
@@ -69,8 +69,8 @@ The build system will use `at_override_module_config/at_customize.csv` as your s
 It is strongly recommended to use the default `ESP-IDF` version of the `ESP-AT` project, and **NOT** recommended to update it (because of the potential [application binary interface](https://en.wikipedia.org/wiki/Application_binary_interface) incompatibility between the underlying ESP-IDF versions of `libesp_at_core.a` and the esp-at repository, which may cause incorrect operation of the firmware.), but we still keep the option to update the ESP-IDF for testing purposes. The native esp-idf version file is `esp-at/module_config/<your_module>/IDF_VERSION`. You can copy the native esp-idf version to `at_override_module_config/IDF_VERSION`, and keep it as it is.
 
 ```
-branch:release/v5.0
-commit:bcca689866db3dfda47f77670bf8df2a7ec94721
+branch:release/v5.1
+commit:64849cb7039a93b7b3a4ad8e8da328fa9c09c5e7
 repository:https://github.com/espressif/esp-idf.git
 ```
 

diff --git a/module_config/module_esp32-d2wd/IDF_VERSION b/module_config/module_esp32-d2wd/IDF_VERSION
@@ -1,3 +1,3 @@
-branch:release/v5.0
-commit:bcca689866db3dfda47f77670bf8df2a7ec94721
+branch:release/v5.1
+commit:64849cb7039a93b7b3a4ad8e8da328fa9c09c5e7
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32-d2wd/patch/esp_tls_parse_ecc_key.patch b/module_config/module_esp32-d2wd/patch/esp_tls_parse_ecc_key.patch
diff --git a/module_config/module_esp32-d2wd/patch/fatfs_generation.patch b/module_config/module_esp32-d2wd/patch/fatfs_generation.patch
diff --git a/module_config/module_esp32-d2wd/patch/libbtdm_app.a b/module_config/module_esp32-d2wd/patch/libbtdm_app.a
diff --git a/module_config/module_esp32-d2wd/patch/modify_bluedroid_conn_timeout.patch b/module_config/module_esp32-d2wd/patch/modify_bluedroid_conn_timeout.patch
@@ -1,13 +1,21 @@
+From a41350b35c58721084eccf43993366335c0bb34d Mon Sep 17 00:00:00 2001
+From: xiewenxiang <[email protected]>
+Date: Tue, 17 Dec 2024 10:13:28 +0800
+Subject: [PATCH] modify bluedroid conn timeout
+
+---
+ components/bt/host/bluedroid/stack/l2cap/l2c_ble.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
 diff --git a/components/bt/host/bluedroid/stack/l2cap/l2c_ble.c b/components/bt/host/bluedroid/stack/l2cap/l2c_ble.c
-index 4e6c8534ec..fa7a877491 100644
+index 36f91cfe08..69f7038696 100644
 --- a/components/bt/host/bluedroid/stack/l2cap/l2c_ble.c
 +++ b/components/bt/host/bluedroid/stack/l2cap/l2c_ble.c
-@@ -950,16 +950,19 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb)
-         L2CAP_TRACE_ERROR("initate direct connection fail, topology limitation");
+@@ -952,16 +952,18 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb)
+         L2CAP_TRACE_ERROR("initiate direct connection fail, topology limitation");
          return FALSE;
      }
 -    uint32_t link_timeout = L2CAP_BLE_LINK_CONNECT_TOUT;
-+
 +    extern int32_t bluedroid_conn_wait_time;
 +
 +    uint32_t link_timeout = bluedroid_conn_wait_time;
@@ -26,3 +34,6 @@ index 4e6c8534ec..fa7a877491 100644
          }
      }
 
+-- 
+2.25.1
+
diff --git a/module_config/module_esp32-d2wd/patch/patch_list.ini b/module_config/module_esp32-d2wd/patch/patch_list.ini
@@ -1,21 +1,9 @@
 ; Add your patches to the section below
 
-[esp_tls_parse_ecc_key.patch]
-    path = esp-idf
-    note = "Fixed an issue where esp-tls is unable to parse ECC keys"
-
-[fatfs_generation.patch]
-    path = esp-idf
-    note = "Fixed an issue where data read after writing fatfs partition more than 63 times might be incorrect"
-
 [support_ext_partition.patch]
     path = esp-idf
     note = "[IDF-9560] Support to use partition table outside of the project directory"
 
 [modify_bluedroid_conn_timeout.patch]
     path = esp-idf
     note = "[ESPAT-1972] Support to modify the timeout period for BLE connections"
-
-[libbtdm_app.a]
-    path = esp-idf/components/bt/controller/lib_esp32/esp32/libbtdm_app.a
-    note = "[ESPAT-1962] Fixed ble disconnection fail issue"
diff --git a/module_config/module_esp32-d2wd/sdkconfig.defaults b/module_config/module_esp32-d2wd/sdkconfig.defaults
@@ -45,7 +45,7 @@ CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL=y
 CONFIG_PM_SLP_DISABLE_GPIO=y
 
 # Wi-Fi
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
 CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
@@ -81,6 +81,9 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=n
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
 
+# Heap memory debugging
+CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y
+
 # LWIP
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_RCVBUF=y

diff --git a/module_config/module_esp32-d2wd/sdkconfig_silence.defaults b/module_config/module_esp32-d2wd/sdkconfig_silence.defaults
@@ -45,7 +45,7 @@ CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL=y
 CONFIG_PM_SLP_DISABLE_GPIO=y
 
 # Wi-Fi
-CONFIG_ESP32_WIFI_SW_COEXIST_ENABLE=y
+CONFIG_ESP_COEX_SW_COEXIST_ENABLE=y
 CONFIG_ESP_WIFI_SLP_IRAM_OPT=y
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=0
@@ -85,6 +85,9 @@ CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=n
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
 CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
 
+# Heap memory debugging
+CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH=y
+
 # LWIP
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_RCVBUF=y

diff --git a/module_config/module_esp32-sdio/IDF_VERSION b/module_config/module_esp32-sdio/IDF_VERSION
@@ -1,3 +1,3 @@
-branch:release/v5.0
-commit:bcca689866db3dfda47f77670bf8df2a7ec94721
+branch:release/v5.1
+commit:64849cb7039a93b7b3a4ad8e8da328fa9c09c5e7
 repository:https://github.com/espressif/esp-idf.git
diff --git a/module_config/module_esp32-sdio/patch/esp_tls_parse_ecc_key.patch b/module_config/module_esp32-sdio/patch/esp_tls_parse_ecc_key.patch