espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 13:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_some_ble_bugs_250628_cjh_esp32_v5.4' into 'release/v5.4'

Browse Source 
Fixed some BLE bugs 250628 on esp32(d9a3de0) (v5.4)

See merge request espressif/esp-idf!40797
This commit is contained in:
Island
2025-07-29 14:11:47 +08:00
parent 3dd2087108 b5151105d3
commit 8e094e7087
4 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/bt/controller/esp32/bt.c
View File

@@ -261,6 +261,7 @@ extern void bt_stack_enableCoexVsCmd(bool en);
extern void scan_stack_enableAdvFlowCtrlVsCmd(bool en); extern void scan_stack_enableAdvFlowCtrlVsCmd(bool en);
extern void adv_stack_enableClearLegacyAdvVsCmd(bool en); extern void adv_stack_enableClearLegacyAdvVsCmd(bool en);
extern void advFilter_stack_enableDupExcListVsCmd(bool en); extern void advFilter_stack_enableDupExcListVsCmd(bool en);
extern void arr_stack_enableMultiConnVsCmd(bool en);
#endif // (CONFIG_BT_NIMBLE_ENABLED) || (CONFIG_BT_BLUEDROID_ENABLED) #endif // (CONFIG_BT_NIMBLE_ENABLED) || (CONFIG_BT_BLUEDROID_ENABLED)
/* Local Function Declare /* Local Function Declare
@@ -1726,6 +1727,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
scan_stack_enableAdvFlowCtrlVsCmd(true); scan_stack_enableAdvFlowCtrlVsCmd(true);
adv_stack_enableClearLegacyAdvVsCmd(true); adv_stack_enableClearLegacyAdvVsCmd(true);
advFilter_stack_enableDupExcListVsCmd(true); advFilter_stack_enableDupExcListVsCmd(true);
arr_stack_enableMultiConnVsCmd(true);
#endif // (CONFIG_BT_NIMBLE_ENABLED) || (CONFIG_BT_BLUEDROID_ENABLED) #endif // (CONFIG_BT_NIMBLE_ENABLED) || (CONFIG_BT_BLUEDROID_ENABLED)
btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED; btdm_controller_status = ESP_BT_CONTROLLER_STATUS_INITED;
@@ -1765,6 +1767,7 @@ esp_err_t esp_bt_controller_deinit(void)
scan_stack_enableAdvFlowCtrlVsCmd(false); scan_stack_enableAdvFlowCtrlVsCmd(false);
adv_stack_enableClearLegacyAdvVsCmd(false); adv_stack_enableClearLegacyAdvVsCmd(false);
advFilter_stack_enableDupExcListVsCmd(false); advFilter_stack_enableDupExcListVsCmd(false);
arr_stack_enableMultiConnVsCmd(false);
#endif // (CONFIG_BT_NIMBLE_ENABLED) || (CONFIG_BT_BLUEDROID_ENABLED) #endif // (CONFIG_BT_NIMBLE_ENABLED) || (CONFIG_BT_BLUEDROID_ENABLED)
return ESP_OK; return ESP_OK;

2
components/bt/controller/lib_esp32

Submodule components/bt/controller/lib_esp32 updated: 37e0472ea2...b8a08a0680

4
components/soc/esp32/include/soc/Kconfig.soc_caps.in
View File

@@ -955,6 +955,10 @@ config SOC_BT_H2C_ENC_KEY_CTRL_ENH_VSC_SUPPORTED
bool bool
default y default y
config SOC_BLE_MULTI_CONN_OPTIMIZATION
bool
default y
config SOC_ULP_HAS_ADC config SOC_ULP_HAS_ADC
bool bool
default y default y

1
components/soc/esp32/include/soc/soc_caps.h
View File

@@ -453,6 +453,7 @@
#define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (0) /*!< Support BLE device privacy mode */ #define SOC_BLE_DEVICE_PRIVACY_SUPPORTED (0) /*!< Support BLE device privacy mode */
#define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */ #define SOC_BLUFI_SUPPORTED (1) /*!< Support BLUFI */
#define SOC_BT_H2C_ENC_KEY_CTRL_ENH_VSC_SUPPORTED (1) /*!< Support Bluetooth Classic encryption key size configuration through vendor-specific HCI command */ #define SOC_BT_H2C_ENC_KEY_CTRL_ENH_VSC_SUPPORTED (1) /*!< Support Bluetooth Classic encryption key size configuration through vendor-specific HCI command */
#define SOC_BLE_MULTI_CONN_OPTIMIZATION (1) /*!< Support multiple connections optimization */
/*-------------------------- ULP CAPS ----------------------------------------*/ /*-------------------------- ULP CAPS ----------------------------------------*/
#define SOC_ULP_HAS_ADC (1) /* ADC can be accessed from ULP */ #define SOC_ULP_HAS_ADC (1) /* ADC can be accessed from ULP */