From 96f9fac9c1848b032c70de80fd637a89f28b7917 Mon Sep 17 00:00:00 2001 From: zhiweijian Date: Thu, 20 Apr 2023 14:46:05 +0800 Subject: [PATCH 1/2] 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 f726539419..ae2e8df762 100644 --- a/components/bt/include/esp32c3/include/esp_bt.h +++ b/components/bt/include/esp32c3/include/esp_bt.h @@ -150,13 +150,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)) From 0ca4644ad1dd9340403fa32fc3bbf6bba7a7ba79 Mon Sep 17 00:00:00 2001 From: zhiweijian Date: Sun, 23 Apr 2023 22:00:14 +0800 Subject: [PATCH 2/2] - improve scan performance when scan and sync coexist on ESP32-C3 and ESP32-S3 - Fixed non-connectable and non-scannable directed adv can't be scanned 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 036564af71..261eafc3be 160000 --- a/components/bt/controller/lib_esp32c3_family +++ b/components/bt/controller/lib_esp32c3_family @@ -1 +1 @@ -Subproject commit 036564af715f6c3f0b27238fd7d68fab27aa29c2 +Subproject commit 261eafc3be3ad4813a1d76dd2325b900ed473b53