espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'change/ble_update_lib_20250606' into 'master'

Browse Source 
change(ble): [AUTO_MR] 20250606 - Update ESP BLE Controller Lib

Closes BLERP-1921, BLERP-1919, BLERP-1955, BLERP-1951, BLERP-1950, BLERP-1933, BLERP-1932, BLERP-1929, BLERP-1927, BLERP-1893, BLERP-1885, and BLERP-1900

See merge request espressif/esp-idf!39712
This commit is contained in:
Island
2025-06-09 10:57:03 +08:00
parent 3b504812df a10696d7e1
commit 71da548124
16 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/controller/esp32c2/Kconfig.in
View File

@ -584,7 +584,7 @@ config BT_LE_CCA_RSSI_THRESH
int "CCA RSSI threshold value" int "CCA RSSI threshold value"
depends on BT_LE_TX_CCA_ENABLED depends on BT_LE_TX_CCA_ENABLED
range 20 100 range 20 100
default 20 default 65
help help
Power threshold of CCA in unit of -1 dBm. Power threshold of CCA in unit of -1 dBm.

2
components/bt/controller/esp32c5/Kconfig.in
View File

@ -681,7 +681,7 @@ config BT_LE_CCA_RSSI_THRESH
int "CCA RSSI threshold value" int "CCA RSSI threshold value"
depends on BT_LE_TX_CCA_ENABLED depends on BT_LE_TX_CCA_ENABLED
range 20 100 range 20 100
default 20 default 65
help help
Power threshold of CCA in unit of -1 dBm. Power threshold of CCA in unit of -1 dBm.

2
components/bt/controller/esp32c5/bt.c
View File

@ -1673,7 +1673,7 @@ int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv)
#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED #endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED
int IRAM_ATTR int IRAM_ATTR
ble_capture_info_user_handler(uint8_t type, uint32_t reason) ble_capture_info_user_handler(uint8_t type, uint32_t reason, uint32_t param1, uint32_t param2)
{ {
int i; int i;

2
components/bt/controller/esp32c6/Kconfig.in
View File

@ -721,7 +721,7 @@ config BT_LE_CCA_RSSI_THRESH
int "CCA RSSI threshold value" int "CCA RSSI threshold value"
depends on BT_LE_TX_CCA_ENABLED depends on BT_LE_TX_CCA_ENABLED
range 20 100 range 20 100
default 20 default 65
help help
Power threshold of CCA in unit of -1 dBm. Power threshold of CCA in unit of -1 dBm.

2
components/bt/controller/esp32c6/bt.c
View File

@ -1744,7 +1744,7 @@ int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv)
#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED #endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED
int IRAM_ATTR int IRAM_ATTR
ble_capture_info_user_handler(uint8_t type, uint32_t reason) ble_capture_info_user_handler(uint8_t type, uint32_t reason, uint32_t param1, uint32_t param2)
{ {
int i; int i;

2
components/bt/controller/esp32h2/Kconfig.in
View File

@ -716,7 +716,7 @@ config BT_LE_CCA_RSSI_THRESH
int "CCA RSSI threshold value" int "CCA RSSI threshold value"
depends on BT_LE_TX_CCA_ENABLED depends on BT_LE_TX_CCA_ENABLED
range 20 100 range 20 100
default 20 default 65
help help
Power threshold of CCA in unit of -1 dBm. Power threshold of CCA in unit of -1 dBm.

2
components/bt/controller/esp32h2/bt.c
View File

@ -1666,7 +1666,7 @@ int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv)
#endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED #endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED
int IRAM_ATTR int IRAM_ATTR
ble_capture_info_user_handler(uint8_t type, uint32_t reason) ble_capture_info_user_handler(uint8_t type, uint32_t reason, uint32_t param1, uint32_t param2)
{ {
int i; int i;

2
components/bt/controller/lib_esp32c2/esp32c2-bt-lib

Submodule components/bt/controller/lib_esp32c2/esp32c2-bt-lib updated: 06c5ef1481...3ad0070589

2
components/bt/controller/lib_esp32c5/esp32c5-bt-lib

Submodule components/bt/controller/lib_esp32c5/esp32c5-bt-lib updated: 19bce59850...40a1921b1f

2
components/bt/controller/lib_esp32c6/esp32c6-bt-lib

Submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib updated: 841466ff3c...250e75199e

2
components/bt/controller/lib_esp32h2/esp32h2-bt-lib

Submodule components/bt/controller/lib_esp32h2/esp32h2-bt-lib updated: bd09406c74...82cbc1dd93

4
components/bt/include/esp32c5/include/esp_bt.h
View File

@ -159,7 +159,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
*/ */
esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle); esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
#define CONFIG_VERSION 0x20250513 #define CONFIG_VERSION 0x20250526
#define CONFIG_MAGIC 0x5A5AA5A5 #define CONFIG_MAGIC 0x5A5AA5A5
/** /**
@ -231,6 +231,7 @@ typedef struct {
uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data
- 0 - Disable - 0 - Disable
- 1 - Enable (default) */ - 1 - Enable (default) */
int8_t ch39_txpwr; /*!< BLE transmit power (in dBm) used for BLE advertising on channel 39. */
uint32_t config_magic; /*!< Magic number for configuration validation */ uint32_t config_magic; /*!< Magic number for configuration validation */
} esp_bt_controller_config_t; } esp_bt_controller_config_t;
@ -289,6 +290,7 @@ typedef struct {
.ble_adv_tx_options = 0, \ .ble_adv_tx_options = 0, \
.skip_unnecessary_checks_en = 0, \ .skip_unnecessary_checks_en = 0, \
.fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \ .fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \
.ch39_txpwr = BLE_LL_TX_PWR_DBM_N, \
.config_magic = CONFIG_MAGIC, \ .config_magic = CONFIG_MAGIC, \
} }

5
components/bt/include/esp32c6/include/esp_bt.h
View File

@ -156,7 +156,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
*/ */
esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle); esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
#define CONFIG_VERSION 0x20250513 #define CONFIG_VERSION 0x20250526
#define CONFIG_MAGIC 0x5A5AA5A5 #define CONFIG_MAGIC 0x5A5AA5A5
/** /**
@ -231,6 +231,7 @@ typedef struct {
uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data
- 0 - Disable - 0 - Disable
- 1 - Enable (default) */ - 1 - Enable (default) */
int8_t ch39_txpwr; /*!< BLE transmit power (in dBm) used for BLE advertising on channel 39. */
uint32_t config_magic; /*!< Magic number for configuration validation */ uint32_t config_magic; /*!< Magic number for configuration validation */
} esp_bt_controller_config_t; } esp_bt_controller_config_t;
@ -292,6 +293,7 @@ typedef struct {
.ble_adv_tx_options = 0, \ .ble_adv_tx_options = 0, \
.skip_unnecessary_checks_en = 0, \ .skip_unnecessary_checks_en = 0, \
.fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \ .fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \
.ch39_txpwr = BLE_LL_TX_PWR_DBM_N, \
.config_magic = CONFIG_MAGIC, \ .config_magic = CONFIG_MAGIC, \
} }
#elif CONFIG_IDF_TARGET_ESP32C61 #elif CONFIG_IDF_TARGET_ESP32C61
@ -350,6 +352,7 @@ typedef struct {
.ble_adv_tx_options = 0, \ .ble_adv_tx_options = 0, \
.skip_unnecessary_checks_en = 0, \ .skip_unnecessary_checks_en = 0, \
.fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \ .fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \
.ch39_txpwr = BLE_LL_TX_PWR_DBM_N, \
.config_magic = CONFIG_MAGIC, \ .config_magic = CONFIG_MAGIC, \
} }
#endif #endif

4
components/bt/include/esp32h2/include/esp_bt.h
View File

@ -161,7 +161,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
*/ */
esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle); esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);
#define CONFIG_VERSION 0x20250513 #define CONFIG_VERSION 0x20250526
#define CONFIG_MAGIC 0x5A5AA5A5 #define CONFIG_MAGIC 0x5A5AA5A5
/** /**
@ -233,6 +233,7 @@ typedef struct {
uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data
- 0 - Disable - 0 - Disable
- 1 - Enable (default) */ - 1 - Enable (default) */
int8_t ch39_txpwr; /*!< BLE transmit power (in dBm) used for BLE advertising on channel 39. */
uint32_t config_magic; /*!< Configuration magic value */ uint32_t config_magic; /*!< Configuration magic value */
} esp_bt_controller_config_t; } esp_bt_controller_config_t;
@ -292,6 +293,7 @@ typedef struct {
.ble_adv_tx_options = 0, \ .ble_adv_tx_options = 0, \
.skip_unnecessary_checks_en = 0, \ .skip_unnecessary_checks_en = 0, \
.fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \ .fast_conn_data_tx_en = DEFAULT_BT_LE_CTRL_FAST_CONN_DATA_TX_EN, \
.ch39_txpwr = BLE_LL_TX_PWR_DBM_N, \
.config_magic = CONFIG_MAGIC, \ .config_magic = CONFIG_MAGIC, \
} }

6
components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld
View File

@ -159,7 +159,7 @@ r_ble_ll_adv_sm_deinit = 0x40000cc4;
r_ble_ll_adv_sm_event_init = 0x40000cc8; r_ble_ll_adv_sm_event_init = 0x40000cc8;
//r_ble_ll_adv_sm_find_configured = 0x40000ccc; //r_ble_ll_adv_sm_find_configured = 0x40000ccc;
r_ble_ll_adv_sm_get = 0x40000cd0; r_ble_ll_adv_sm_get = 0x40000cd0;
r_ble_ll_adv_sm_init = 0x40000cd4; //r_ble_ll_adv_sm_init = 0x40000cd4;
r_ble_ll_adv_sm_reset = 0x40000cd8; r_ble_ll_adv_sm_reset = 0x40000cd8;
r_ble_ll_adv_sm_start = 0x40000cdc; r_ble_ll_adv_sm_start = 0x40000cdc;
r_ble_ll_adv_sm_start_periodic = 0x40000ce0; r_ble_ll_adv_sm_start_periodic = 0x40000ce0;
@ -245,11 +245,11 @@ r_ble_ll_conn_set_csa = 0x40000e20;
r_ble_ll_conn_set_ext_con_params = 0x40000e24; r_ble_ll_conn_set_ext_con_params = 0x40000e24;
r_ble_ll_conn_set_global_chanmap = 0x40000e28; r_ble_ll_conn_set_global_chanmap = 0x40000e28;
r_ble_ll_conn_set_phy = 0x40000e2c; r_ble_ll_conn_set_phy = 0x40000e2c;
r_ble_ll_conn_set_txpwr_by_handle = 0x40000e30; //r_ble_ll_conn_set_txpwr_by_handle = 0x40000e30;
r_ble_ll_conn_set_unknown_rx_octets = 0x40000e34; r_ble_ll_conn_set_unknown_rx_octets = 0x40000e34;
//r_ble_ll_conn_slave_start = 0x40000e38; //r_ble_ll_conn_slave_start = 0x40000e38;
r_ble_ll_conn_sm_get = 0x40000e3c; r_ble_ll_conn_sm_get = 0x40000e3c;
r_ble_ll_conn_sm_new = 0x40000e40; //r_ble_ll_conn_sm_new = 0x40000e40;
r_ble_ll_conn_sm_npl_deinit = 0x40000e44; r_ble_ll_conn_sm_npl_deinit = 0x40000e44;
r_ble_ll_conn_sm_npl_init = 0x40000e48; r_ble_ll_conn_sm_npl_init = 0x40000e48;
r_ble_ll_conn_tx_pkt_in = 0x40000e4c; r_ble_ll_conn_tx_pkt_in = 0x40000e4c;

2
components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld
View File

@ -196,7 +196,7 @@ r_ble_ll_conn_set_csa = 0x40000e20;
r_ble_ll_conn_set_ext_con_params = 0x40000e24; r_ble_ll_conn_set_ext_con_params = 0x40000e24;
r_ble_ll_conn_set_global_chanmap = 0x40000e28; r_ble_ll_conn_set_global_chanmap = 0x40000e28;
r_ble_ll_conn_set_phy = 0x40000e2c; r_ble_ll_conn_set_phy = 0x40000e2c;
r_ble_ll_conn_set_txpwr_by_handle = 0x40000e30; //r_ble_ll_conn_set_txpwr_by_handle = 0x40000e30;
r_ble_ll_conn_set_unknown_rx_octets = 0x40000e34; r_ble_ll_conn_set_unknown_rx_octets = 0x40000e34;
r_ble_ll_conn_sm_get = 0x40000e3c; r_ble_ll_conn_sm_get = 0x40000e3c;
r_ble_ll_conn_tx_pkt_in = 0x40000e4c; r_ble_ll_conn_tx_pkt_in = 0x40000e4c;