Selaa lähdekoodia

Merge branch 'bugfix/0925_update_libble_c6_h2_c2' into 'master'

update c6 h2 c2 libble to 7ec5b5c1

Closes BLERP-92, BLERP-122, BLERP-93, BLERP-94, BLERP-89, BLERP-90, BLERP-95, BLERP-97, BLERP-98, BLERP-99, BLERP-100, BLERP-101, BLERP-102, BLERP-120, and BLERP-123

See merge request espressif/esp-idf!26176
Island 2 vuotta sitten
vanhempi
sitoutus
f19f1dbd91

+ 1 - 1
components/bt/controller/lib_esp32c2/esp32c2-bt-lib

@@ -1 +1 @@
-Subproject commit 9da8ad3ebd7932ea6f92578fb1337c7df5000ac7
+Subproject commit fc690c13c618d1cb8f94611c2bbe6aec2f1cc72e

+ 1 - 1
components/bt/controller/lib_esp32c6/esp32c6-bt-lib

@@ -1 +1 @@
-Subproject commit 97499655f3148ee273baadb6b48bbb168207d90b
+Subproject commit da045016531dbe7bf334507a79cd7d40d7549e7b

+ 1 - 1
components/bt/controller/lib_esp32h2/esp32h2-bt-lib

@@ -1 +1 @@
-Subproject commit ff664688f4fedb16c7eafc5bc88a4dacbc3e8ba5
+Subproject commit 32c856a1d942cbb0100420373db2ea8c46721739

+ 2 - 1
components/bt/include/esp32c2/include/esp_bt.h

@@ -89,7 +89,8 @@ 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_P21 = 15,              /*!< Corresponding to  +20dbm, this enum variable has been deprecated */
     ESP_PWR_LVL_INVALID = 0xFF,         /*!< Indicates an invalid value */
 } esp_power_level_t;
 

+ 5 - 5
components/bt/include/esp32h2/include/esp_bt.h

@@ -88,11 +88,11 @@ typedef enum {
     ESP_PWR_LVL_P9  = 11,             /*!< Corresponding to  +9dbm */
     ESP_PWR_LVL_P12 = 12,             /*!< Corresponding to  +12dbm */
     ESP_PWR_LVL_P15 = 13,             /*!< Corresponding to  +15dbm */
-    ESP_PWR_LVL_P16 = 14,             /*!< Corresponding to  +16dbm */
-    ESP_PWR_LVL_P17 = 15,             /*!< Corresponding to  +17dbm */
-    ESP_PWR_LVL_P18 = 16,             /*!< Corresponding to  +18dbm */
-    ESP_PWR_LVL_P19 = 17,             /*!< Corresponding to  +19dbm */
-    ESP_PWR_LVL_P20 = 18,             /*!< Corresponding to  +20dbm */
+    ESP_PWR_LVL_P16 = 14,             /*!< Corresponding to  +18dbm, this enum variable has been deprecated */
+    ESP_PWR_LVL_P17 = 14,             /*!< Corresponding to  +18dbm, this enum variable has been deprecated */
+    ESP_PWR_LVL_P18 = 14,             /*!< Corresponding to  +18dbm */
+    ESP_PWR_LVL_P19 = 15,             /*!< Corresponding to  +20dbm, this enum variable has been deprecated */
+    ESP_PWR_LVL_P20 = 15,             /*!< Corresponding to  +20dbm */
     ESP_PWR_LVL_INVALID = 0xFF,       /*!< Indicates an invalid value */
 } esp_power_level_t;
 

+ 0 - 3
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;