From 7b8681d070421759b276a405a23b41ba12261d82 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:21 +0800 Subject: [PATCH 1/8] change(ble): [AUTO_MR] Update lib_esp32h2 to 35fe65f4 (cherry picked from commit dbf7835a6b78ac39b180e0ff0719026fc9f9e3fa) Co-authored-by: zwl --- 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 bd09406c74..82cbc1dd93 160000 --- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib +++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib @@ -1 +1 @@ -Subproject commit bd09406c74d135d1d4e68c5e578540a8bcffbcac +Subproject commit 82cbc1dd9345010e7e6d78f8a7b022a7ae669e87 From 464d08acbc3d00285aa52d1c875bf202fc359c95 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:24 +0800 Subject: [PATCH 2/8] change(ble): [AUTO_MR] Update lib_esp32c6 to 35fe65f4 (cherry picked from commit 57c8d238001c471431bb1b054d71657e7e53f279) Co-authored-by: zwl --- 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 841466ff3c..250e75199e 160000 --- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib +++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib @@ -1 +1 @@ -Subproject commit 841466ff3cf6635bf061c18e836807ee7f99ce78 +Subproject commit 250e75199e8772a9ce44c53e7747063107d36155 From 9b5bb3598259e027deb0d8cbe70610d09d041e17 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:26 +0800 Subject: [PATCH 3/8] change(ble): [AUTO_MR] Update lib_esp32c2 to 7f72c031 (cherry picked from commit 4be18a2469488b26166400de0092a4c91a09b521) Co-authored-by: zwl --- 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 06c5ef1481..3ad0070589 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit 06c5ef1481e6e5ff9308d6abe9c1e576d60c946f +Subproject commit 3ad007058995a523c2cd212bcef4c6937533871e From 335ca347351a2285ca220e430dbac497676d89ab Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:28 +0800 Subject: [PATCH 4/8] fix(ble): fixed an occasional assertion issue during sync on ESP32-C6 (cherry picked from commit 3c8ba488e0b34586ccfa945ebb085b6e43e73fdb) Co-authored-by: zwl --- components/bt/controller/esp32c6/bt.c | 2 +- components/bt/controller/esp32h2/bt.c | 2 +- components/bt/include/esp32c6/include/esp_bt.h | 5 ++++- components/bt/include/esp32h2/include/esp_bt.h | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/components/bt/controller/esp32c6/bt.c b/components/bt/controller/esp32c6/bt.c index b4ede8ee80..105c71db5e 100644 --- a/components/bt/controller/esp32c6/bt.c +++ b/components/bt/controller/esp32c6/bt.c @@ -1741,7 +1741,7 @@ int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv) #endif // CONFIG_BT_LE_DEBUG_REMAIN_SCENE_ENABLED 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; diff --git a/components/bt/controller/esp32h2/bt.c b/components/bt/controller/esp32h2/bt.c index 5eb38543d3..c04e881cc6 100644 --- a/components/bt/controller/esp32h2/bt.c +++ b/components/bt/controller/esp32h2/bt.c @@ -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 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; diff --git a/components/bt/include/esp32c6/include/esp_bt.h b/components/bt/include/esp32c6/include/esp_bt.h index 9871c145f6..9947d755cd 100644 --- a/components/bt/include/esp32c6/include/esp_bt.h +++ b/components/bt/include/esp32c6/include/esp_bt.h @@ -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); -#define CONFIG_VERSION 0x20250513 +#define CONFIG_VERSION 0x20250526 #define CONFIG_MAGIC 0x5A5AA5A5 /** @@ -229,6 +229,7 @@ typedef struct { uint8_t fast_conn_data_tx_en; /*!< The option for fast transmission of connection data - 0 - Disable - 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 */ } esp_bt_controller_config_t; @@ -289,6 +290,7 @@ typedef struct { .ble_adv_tx_options = 0, \ .skip_unnecessary_checks_en = 0, \ .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, \ } #elif CONFIG_IDF_TARGET_ESP32C61 @@ -347,6 +349,7 @@ typedef struct { .ble_adv_tx_options = 0, \ .skip_unnecessary_checks_en = 0, \ .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, \ } #endif diff --git a/components/bt/include/esp32h2/include/esp_bt.h b/components/bt/include/esp32h2/include/esp_bt.h index bf9370eba1..0aafa744bd 100644 --- a/components/bt/include/esp32h2/include/esp_bt.h +++ b/components/bt/include/esp32h2/include/esp_bt.h @@ -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); -#define CONFIG_VERSION 0x20250513 +#define CONFIG_VERSION 0x20250526 #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 - 0 - Disable - 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 */ } esp_bt_controller_config_t; @@ -292,6 +293,7 @@ typedef struct { .ble_adv_tx_options = 0, \ .skip_unnecessary_checks_en = 0, \ .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, \ } From 401c1cece988f1881efcf7f4715cacf43232b442 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:30 +0800 Subject: [PATCH 5/8] fix(ble): change ld file on ESP32-C2 (cherry picked from commit 6c5bff1bd88f9e411e81b0f61ea15ded0cf9657e) Co-authored-by: zwl --- components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld | 6 +++--- components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld | 2 +- 2 files changed, 4 insertions(+), 4 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 5ca9466542..a121c94eee 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble-eco4.ld @@ -159,7 +159,7 @@ r_ble_ll_adv_sm_deinit = 0x40000cc4; r_ble_ll_adv_sm_event_init = 0x40000cc8; //r_ble_ll_adv_sm_find_configured = 0x40000ccc; 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_start = 0x40000cdc; 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_global_chanmap = 0x40000e28; 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_slave_start = 0x40000e38; 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_init = 0x40000e48; r_ble_ll_conn_tx_pkt_in = 0x40000e4c; diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld index b940fe9d11..4f89f0b638 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ble.ld @@ -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_global_chanmap = 0x40000e28; 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_sm_get = 0x40000e3c; r_ble_ll_conn_tx_pkt_in = 0x40000e4c; From 38bfa54f38df481b0f3e360de193c17919564ebd Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:32 +0800 Subject: [PATCH 6/8] fix(ble): change the default ble cca thresh on ESP32-C6 (cherry picked from commit 581521526b648ab720cb723378891a17910049c6) Co-authored-by: cjin --- components/bt/controller/esp32c6/Kconfig.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c6/Kconfig.in b/components/bt/controller/esp32c6/Kconfig.in index 4501db3cb8..949349aaaf 100644 --- a/components/bt/controller/esp32c6/Kconfig.in +++ b/components/bt/controller/esp32c6/Kconfig.in @@ -721,7 +721,7 @@ config BT_LE_CCA_RSSI_THRESH int "CCA RSSI threshold value" depends on BT_LE_TX_CCA_ENABLED range 20 100 - default 20 + default 65 help Power threshold of CCA in unit of -1 dBm. From 5eaabafd5186c6560d451ed1c4027a45c42b61dc Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:34 +0800 Subject: [PATCH 7/8] fix(ble): change the default ble cca thresh on ESP32-H2 (cherry picked from commit a2fab0ad60f581a5e4a64fdff4232bf5c77e1de1) Co-authored-by: cjin --- components/bt/controller/esp32h2/Kconfig.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/esp32h2/Kconfig.in b/components/bt/controller/esp32h2/Kconfig.in index e7d935cd97..14330540e0 100644 --- a/components/bt/controller/esp32h2/Kconfig.in +++ b/components/bt/controller/esp32h2/Kconfig.in @@ -716,7 +716,7 @@ config BT_LE_CCA_RSSI_THRESH int "CCA RSSI threshold value" depends on BT_LE_TX_CCA_ENABLED range 20 100 - default 20 + default 65 help Power threshold of CCA in unit of -1 dBm. From d39b945a3725f0c9d48ba5ba03b76fafffd5d108 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Mon, 9 Jun 2025 11:03:36 +0800 Subject: [PATCH 8/8] fix(ble): change the default ble cca thresh on ESP32-C2 (cherry picked from commit a10696d7e19b267fdc78f7bf31ae7772a522928c) Co-authored-by: cjin --- components/bt/controller/esp32c2/Kconfig.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/esp32c2/Kconfig.in b/components/bt/controller/esp32c2/Kconfig.in index e07c7213be..f3796bad13 100644 --- a/components/bt/controller/esp32c2/Kconfig.in +++ b/components/bt/controller/esp32c2/Kconfig.in @@ -583,7 +583,7 @@ config BT_LE_CCA_RSSI_THRESH int "CCA RSSI threshold value" depends on BT_LE_TX_CCA_ENABLED range 20 100 - default 20 + default 65 help Power threshold of CCA in unit of -1 dBm.