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/bluedriod_esp32c3' into 'master'

Browse Source 
ESP32C3: Fix for provisioning failure with ble transport mode and bluedriod stack

See merge request espressif/esp-idf!14124
This commit is contained in:
Hrishikesh Dhayagude
2021-07-23 08:33:22 +00:00
parent dcefc4d6f7 99cce49299
commit ab970ac0cf
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/protocomm/src/simple_ble/simple_ble.c
View File

@@ -228,7 +228,7 @@ esp_err_t simple_ble_start(simple_ble_cfg_t *cfg)
#ifdef CONFIG_BTDM_CTRL_MODE_BTDM #ifdef CONFIG_BTDM_CTRL_MODE_BTDM
ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM); ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM);
#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY #elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY || CONFIG_BT_CTRL_MODE_EFF
ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
#else #else
ESP_LOGE(TAG, "Configuration mismatch. Select BLE Only or BTDM mode from menuconfig"); ESP_LOGE(TAG, "Configuration mismatch. Select BLE Only or BTDM mode from menuconfig");

8
examples/provisioning/legacy/ble_prov/main/Kconfig.projbuild
View File

@@ -42,4 +42,12 @@ menu "Example Configuration"
default y default y
help help
Show the QR code for provisioning. Show the QR code for provisioning.
config EXAMPLE_PROV_USING_BLUEDROID
bool
depends on (BT_BLUEDROID_ENABLED && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3))
select BT_BLE_42_FEATURES_SUPPORTED
default y
help
This enables BLE 4.2 features for Bluedroid.
endmenu endmenu

8
examples/provisioning/wifi_prov_mgr/main/Kconfig.projbuild
View File

@@ -51,4 +51,12 @@ menu "Example Configuration"
default y default y
help help
Show the QR code for provisioning. Show the QR code for provisioning.
config EXAMPLE_PROV_USING_BLUEDROID
bool
depends on (BT_BLUEDROID_ENABLED && (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3))
select BT_BLE_42_FEATURES_SUPPORTED
default y
help
This enables BLE 4.2 features for Bluedroid.
endmenu endmenu