From 30f1c507d48a3b0dc4e1cfea061506ea9bf6bdcd Mon Sep 17 00:00:00 2001 From: luomanruo Date: Fri, 27 Oct 2023 14:33:49 +0800 Subject: [PATCH 1/3] ble: update c2 lib to 1d31e175 --- 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 4fb60aa91d..30e5c4f95b 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 4fb60aa91de64b0f1d0eb6292d38b6c22a3aa005 +Subproject commit 30e5c4f95bff1a17e06ce1042a165b0aa2bc4ca5 From 27f1557d70f1c173ebec030699994790b0cc8760 Mon Sep 17 00:00:00 2001 From: luomanruo Date: Fri, 27 Oct 2023 15:17:09 +0800 Subject: [PATCH 2/3] ble: update c2 rom.ld --- components/bt/controller/esp32c2/bt.c | 2 +- components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c index 84f9125ce6..667e7049c3 100644 --- a/components/bt/controller/esp32c2/bt.c +++ b/components/bt/controller/esp32c2/bt.c @@ -1005,7 +1005,7 @@ uint8_t esp_ble_get_chip_rev_version(void) static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, bool end) { for (int i = 0; i < len; i++) { - esp_rom_printf("%02x,", addr[i]); + esp_rom_printf("%02x ", addr[i]); } if (end) { esp_rom_printf("\n"); diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index f0f007eba6..f02faa9ca5 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1035,9 +1035,7 @@ r_ble_ll_utils_csa2_prng = 0x400013b8; r_ble_ll_utils_remapped_channel = 0x400013bc; r_ble_ll_whitelist_add = 0x400013c0; r_ble_ll_whitelist_chg_allowed = 0x400013c4; -r_ble_ll_whitelist_clear = 0x400013c8; r_ble_ll_whitelist_read_size = 0x400013cc; -r_ble_ll_whitelist_rmv = 0x400013d0; r_ble_ll_write_rf_path_compensation = 0x400013d8; r_ble_lll_adv_aux_schedule = 0x400013e0; r_ble_lll_adv_aux_schedule_first = 0x400013e4; @@ -1113,7 +1111,6 @@ r_ble_lll_conn_master_common_init = 0x40001530; r_ble_lll_conn_master_new = 0x40001534; r_ble_lll_conn_module_reset = 0x40001540; r_ble_lll_conn_pre_process = 0x40001548; -r_ble_lll_conn_process_acked_pdu = 0x4000154c; r_ble_lll_conn_recv_ack = 0x40001554; r_ble_lll_conn_recv_valid_packet = 0x40001558; r_ble_lll_conn_reset_pending_sched = 0x4000155c; @@ -1196,7 +1193,6 @@ r_ble_lll_scan_npl_store = 0x400016dc; r_ble_lll_scan_period_timer_cb = 0x400016e0; r_ble_lll_scan_process_adv_in_isr = 0x400016e4; r_ble_lll_scan_req_backoff = 0x400016ec; -r_ble_lll_scan_restart = 0x400016f0; r_ble_lll_scan_sched_next_aux = 0x40001700; r_ble_lll_scan_sched_remove = 0x40001704; r_ble_lll_scan_start = 0x40001708; From 21885a0cf940b916ddecf9684a967c78f9fbb50d Mon Sep 17 00:00:00 2001 From: luomanruo Date: Fri, 27 Oct 2023 20:07:19 +0800 Subject: [PATCH 3/3] ble: update c2 lib to 6ed444f2 --- 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 30e5c4f95b..ea33fbad1f 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 30e5c4f95bff1a17e06ce1042a165b0aa2bc4ca5 +Subproject commit ea33fbad1fa0879fe0e118359d20463b3e2f126b