Skip to content

Commit

Permalink
Merge branch 'bugfix/add_bluedroid_support_for_esp_ip' into 'master'
Browse files Browse the repository at this point in the history
fix(wifi_prov): Add support for ESP IP controller chips in bluedroid

Closes MEGH-5841

See merge request espressif/esp-idf!32465
  • Loading branch information
mahavirj committed Aug 29, 2024
2 parents 1fa27cb + 338d9f4 commit 6e5414b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions components/protocomm/src/simple_ble/simple_ble.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6e5414b

Please sign in to comment.