From b7f17f7531c46145e083bb37ce2184511216d51e Mon Sep 17 00:00:00 2001 From: luomanruo Date: Mon, 25 Sep 2023 14:04:27 +0800 Subject: [PATCH 1/2] ble:update c2 libble to 6a8d1f3d --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- components/bt/include/esp32c2/include/esp_bt.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index 9da8ad3ebd..fc690c13c6 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 9da8ad3ebd7932ea6f92578fb1337c7df5000ac7 +Subproject commit fc690c13c618d1cb8f94611c2bbe6aec2f1cc72e diff --git a/components/bt/include/esp32c2/include/esp_bt.h b/components/bt/include/esp32c2/include/esp_bt.h index 9707caaebb..a6adda488a 100644 --- a/components/bt/include/esp32c2/include/esp_bt.h +++ b/components/bt/include/esp32c2/include/esp_bt.h @@ -89,7 +89,7 @@ typedef enum { ESP_PWR_LVL_P12 = 12, /*!< Corresponding to +12dbm */ ESP_PWR_LVL_P15 = 13, /*!< Corresponding to +15dbm */ ESP_PWR_LVL_P18 = 14, /*!< Corresponding to +18dbm */ - ESP_PWR_LVL_P21 = 15, /*!< Corresponding to +21dbm */ + ESP_PWR_LVL_P20 = 15, /*!< Corresponding to +20dbm */ ESP_PWR_LVL_INVALID = 0xFF, /*!< Indicates an invalid value */ } esp_power_level_t; From 26fbfe7d94a79e34d89b5715fce9de732907970a Mon Sep 17 00:00:00 2001 From: luomanruo Date: Tue, 10 Oct 2023 11:57:10 +0800 Subject: [PATCH 2/2] ble: update tx power level index of ESP32-C2 --- components/bt/include/esp32c2/include/esp_bt.h | 1 + components/esp_rom/esp32c2/ld/esp32c2.rom.ld | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/components/bt/include/esp32c2/include/esp_bt.h b/components/bt/include/esp32c2/include/esp_bt.h index a6adda488a..ae6a6bde78 100644 --- a/components/bt/include/esp32c2/include/esp_bt.h +++ b/components/bt/include/esp32c2/include/esp_bt.h @@ -90,6 +90,7 @@ typedef enum { ESP_PWR_LVL_P15 = 13, /*!< Corresponding to +15dbm */ ESP_PWR_LVL_P18 = 14, /*!< Corresponding to +18dbm */ ESP_PWR_LVL_P20 = 15, /*!< Corresponding to +20dbm */ + ESP_PWR_LVL_P21 = 15, /*!< Corresponding to +20dbm, this enum variable has been deprecated */ ESP_PWR_LVL_INVALID = 0xFF, /*!< Indicates an invalid value */ } esp_power_level_t; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 0151bd937b..871a99614b 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -919,7 +919,6 @@ r_ble_ll_resolv_list_clr = 0x4000117c; r_ble_ll_resolv_list_find = 0x40001180; r_ble_ll_resolv_list_read_size = 0x40001184; r_ble_ll_resolv_list_reset = 0x40001188; -r_ble_ll_resolv_list_rmv = 0x4000118c; r_ble_ll_resolv_local_addr_rd = 0x40001190; r_ble_ll_resolv_peer_addr_rd = 0x40001194; r_ble_ll_resolv_peer_rpa_any = 0x40001198; @@ -1023,12 +1022,10 @@ r_ble_ll_sync_terminate = 0x4000136c; r_ble_ll_sync_transfer = 0x40001370; r_ble_ll_sync_transfer_get = 0x40001374; r_ble_ll_sync_transfer_received = 0x40001378; -r_ble_ll_trace_set_func = 0x40001380; r_ble_ll_trace_u32 = 0x40001384; r_ble_ll_trace_u32x2 = 0x40001388; r_ble_ll_trace_u32x3 = 0x4000138c; r_ble_ll_tx_flat_mbuf_pducb = 0x40001390; -r_ble_ll_tx_pkt_in = 0x40001398; r_ble_ll_update_max_tx_octets_phy_mode = 0x4000139c; r_ble_ll_usecs_to_ticks_round_up = 0x400013a0; r_ble_ll_utils_calc_access_addr = 0x400013a4;