From 8e41186ac8cdb83d40e58f636262f39ea7e399fb Mon Sep 17 00:00:00 2001 From: chenjianhua Date: Thu, 13 Apr 2023 21:36:14 +0800 Subject: [PATCH 1/3] Update bt lib for ESP32-C3 and ESP32-S3 - Fixed non-connectable and non-scannable directed adv can't be scanned --- components/bt/controller/lib_esp32c3_family | 2 +- components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld | 2 ++ components/esp_rom/esp32s3/ld/esp32s3.rom.ld | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index d83f7d618a..688cc3e5db 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit d83f7d618a7a86f4703b909f8fc0ddcf8fd48a89 +Subproject commit 688cc3e5db392cd8e80c84c20b86b5ad5a7eff64 diff --git a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld index 8d6ed6e7f1..d1b71e56b2 100644 --- a/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld +++ b/components/esp_rom/esp32c3/ld/esp32c3.rom.eco3.ld @@ -55,7 +55,9 @@ r_lld_ext_adv_dynamic_pti_get = 0x40001b40; r_lld_ext_adv_dynamic_aux_pti_process = 0x40001b44; r_lld_ext_adv_dynamic_pti_process = 0x40001b48; r_lld_adv_ext_pkt_prepare_set = 0x40001b4c; +/* r_lld_adv_ext_chain_none_construct = 0x40001b50; +*/ r_lld_adv_ext_chain_connectable_construct = 0x40001b54; /* r_lld_adv_ext_chain_scannable_construct = 0x40001b58; diff --git a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld index 4fff5ccc76..4be67eac85 100644 --- a/components/esp_rom/esp32s3/ld/esp32s3.rom.ld +++ b/components/esp_rom/esp32s3/ld/esp32s3.rom.ld @@ -1667,7 +1667,9 @@ r_lld_ext_adv_dynamic_pti_get = 0x4000510c; r_lld_ext_adv_dynamic_aux_pti_process = 0x40005118; r_lld_ext_adv_dynamic_pti_process = 0x40005124; r_lld_adv_ext_pkt_prepare_set = 0x40005130; +/* r_lld_adv_ext_chain_none_construct = 0x4000513c; +*/ r_lld_adv_ext_chain_connectable_construct = 0x40005148; /* r_lld_adv_ext_chain_scannable_construct = 0x40005154; From 48c5f74cbc3e86853bd4d0267aa5ae5a6d8f6368 Mon Sep 17 00:00:00 2001 From: zwj Date: Fri, 14 Apr 2023 16:48:05 +0800 Subject: [PATCH 2/3] improve scan performance when scan and sync coexist on ESP32-C3 and ESP32-S3 --- components/bt/controller/lib_esp32c3_family | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c3_family b/components/bt/controller/lib_esp32c3_family index 688cc3e5db..4f71ee7fab 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit 688cc3e5db392cd8e80c84c20b86b5ad5a7eff64 +Subproject commit 4f71ee7fab59e3114d0ac0144b38df973c90261e From 59666637bcf5c641b4674a45b2dffa23d1f3c49a Mon Sep 17 00:00:00 2001 From: zhiweijian Date: Thu, 20 Apr 2023 14:46:05 +0800 Subject: [PATCH 3/3] Disable controller 5.0 feature bits if host 5.0 feature is not enabled --- components/bt/include/esp32c3/include/esp_bt.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/bt/include/esp32c3/include/esp_bt.h b/components/bt/include/esp32c3/include/esp_bt.h index 985e4181e3..3b62cf0215 100644 --- a/components/bt/include/esp32c3/include/esp_bt.h +++ b/components/bt/include/esp32c3/include/esp_bt.h @@ -157,13 +157,17 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status); #if defined (CONFIG_BT_BLE_50_FEATURES_SUPPORTED) || defined (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT) #ifdef CONFIG_BT_BLE_50_FEATURES_SUPPORTED #define BT_CTRL_50_FEATURE_SUPPORT (CONFIG_BT_BLE_50_FEATURES_SUPPORTED) -#endif +#endif // CONFIG_BT_BLE_50_FEATURES_SUPPORTED #ifdef CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT #define BT_CTRL_50_FEATURE_SUPPORT (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT) -#endif +#endif // CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT +#else +#if defined (CONFIG_BT_BLUEDROID_ENABLED) || defined (CONFIG_BT_NIMBLE_ENABLED) +#define BT_CTRL_50_FEATURE_SUPPORT (0) #else #define BT_CTRL_50_FEATURE_SUPPORT (1) -#endif +#endif // (CONFIG_BT_BLUEDROID_ENABLED) || (CONFIG_BT_NIMBLE_ENABLED) +#endif // (CONFIG_BT_BLE_50_FEATURES_SUPPORTED) || (CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT) #define AGC_RECORRECT_EN ((BT_CTRL_AGC_RECORRECT_EN << 0) | (BT_CTRL_CODED_AGC_RECORRECT <<1))