mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/add_bluedroid_support_for_esp_ip' into 'master'
Some checks failed
docker / docker (push) Has been cancelled
Some checks failed
docker / docker (push) Has been cancelled
fix(wifi_prov): Add support for ESP IP controller chips in bluedroid Closes MEGH-5841 See merge request espressif/esp-idf!32465
This commit is contained in:
commit
6e5414b6c4
@ -241,14 +241,15 @@ esp_err_t simple_ble_start(simple_ble_cfg_t *cfg)
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BTDM_CTRL_MODE_BTDM
|
||||
ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM);
|
||||
#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY || CONFIG_BT_CTRL_MODE_EFF
|
||||
ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
|
||||
#else
|
||||
#ifdef CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY
|
||||
ESP_LOGE(TAG, "Configuration mismatch. Select BLE Only or BTDM mode from menuconfig");
|
||||
return ESP_FAIL;
|
||||
#elif CONFIG_BTDM_CTRL_MODE_BTDM
|
||||
ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM);
|
||||
#else //For all other chips supporting BLE Only
|
||||
ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
|
||||
#endif
|
||||
|
||||
if (ret) {
|
||||
ESP_LOGE(TAG, "%s enable controller failed %d", __func__, ret);
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user