From c5ecbf27fcfbc21dd4dabcae81efc0f076be0430 Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 17 Jan 2025 16:53:49 +0800 Subject: [PATCH 1/4] change(ble): [AUTO_MR] Update lib_esp32h2 to bbc1903d (cherry picked from commit 4f5f0b0954465df3a8030fd0718ff95d5189465e) Co-authored-by: zhouxiao --- components/bt/controller/lib_esp32h2/esp32h2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib index f7ae7f056b..092666b0f4 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit f7ae7f056be96586e0915d9744d6233dc3ee5eef +Subproject commit 092666b0f427e4226325389fc53e4b8df4a8a1fc From e7ff7f041cd1e5bb27234238450e07e928460eff Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 17 Jan 2025 16:53:52 +0800 Subject: [PATCH 2/4] change(ble): [AUTO_MR] Update lib_esp32c6 to bbc1903d (cherry picked from commit 06a6b311a81d407e81fbbf9b8dd635e333452f4a) Co-authored-by: zhouxiao --- components/bt/controller/lib_esp32c6/esp32c6-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib index 04332117af..9cf1bbd021 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit 04332117afd5d5ed479560f1191a816eceba34a2 +Subproject commit 9cf1bbd021d98b3da9ad8465e7fbfca8085f3a1d From f7c66806f51c54dc683f23a5093cd2fb6633adca Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 17 Jan 2025 16:53:54 +0800 Subject: [PATCH 3/4] change(ble): [AUTO_MR] Update lib_esp32c2 to 7b7ee440 (cherry picked from commit c263c75897c4516a20a043635742e0f6832e3c1f) Co-authored-by: zhouxiao --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index c04f6f7c49..1e510cbc50 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit c04f6f7c4958b7343acf1b1d0c3cc27a48b177a0 +Subproject commit 1e510cbc50746259d53389309363058b89396a49 From 7a1dab88e5f5251791bad1c8661182e11fe3ac9b Mon Sep 17 00:00:00 2001 From: Zhou Xiao Date: Fri, 17 Jan 2025 16:53:56 +0800 Subject: [PATCH 4/4] change(ble): update esp32c2 rom ld file (cherry picked from commit e5feba6ed314c47aab4ae993edc77c377cb10b7e) Co-authored-by: Zhou Xiao --- components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld index dbc528eaaf..aa4fedcc1f 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld @@ -489,7 +489,7 @@ r_ble_ll_scan_dup_check_legacy = 0x400011ec; r_ble_ll_scan_dup_move_to_head = 0x400011f0; r_ble_ll_scan_dup_new = 0x400011f4; r_ble_ll_scan_dup_update_ext = 0x400011f8; -r_ble_ll_scan_dup_update_legacy = 0x400011fc; +//r_ble_ll_scan_dup_update_legacy = 0x400011fc; r_ble_ll_scan_enabled = 0x40001200; r_ble_ll_scan_end_adv_evt = 0x40001204; //r_ble_ll_scan_env_init = 0x40001208; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld index 4a17dd1354..c4e201cc07 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld @@ -394,7 +394,7 @@ r_ble_ll_scan_dup_check_legacy = 0x400011ec; r_ble_ll_scan_dup_move_to_head = 0x400011f0; r_ble_ll_scan_dup_new = 0x400011f4; r_ble_ll_scan_dup_update_ext = 0x400011f8; -r_ble_ll_scan_dup_update_legacy = 0x400011fc; +//r_ble_ll_scan_dup_update_legacy = 0x400011fc; r_ble_ll_scan_enabled = 0x40001200; r_ble_ll_scan_end_adv_evt = 0x40001204; r_ble_ll_scan_ext_initiator_start = 0x4000120c;