Skip to content

check for CONFIG_BT_BLUEDROID_ENABLED in esp32-hal-misc.c #11234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2025
Merged

check for CONFIG_BT_BLUEDROID_ENABLED in esp32-hal-misc.c #11234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69f0c69
check for `CONFIG_BT_BLUEDROID_ENABLED` in esp32-hal-misc.c
Jason2866 Apr 10, 2025
b4e3e02
overseen changes to `CONFIG_BT_BLUEDROID_ENABLED`
Jason2866 Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cores/esp32/esp32-hal-misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#include "esp_ota_ops.h"
#endif //CONFIG_APP_ROLLBACK_ENABLE
#include "esp_private/startup_internal.h"
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
#include "esp_bt.h"
#endif //CONFIG_BT_ENABLED
#endif //CONFIG_BT_BLUEDROID_ENABLED
#include <sys/time.h>
#include "soc/rtc.h"
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4)
Expand Down Expand Up @@ -243,7 +243,7 @@ bool verifyRollbackLater() {
}
#endif

#ifdef CONFIG_BT_ENABLED
#ifdef CONFIG_BT_BLUEDROID_ENABLED
#if CONFIG_IDF_TARGET_ESP32
//overwritten in esp32-hal-bt.c
bool btInUse() __attribute__((weak));
Expand Down Expand Up @@ -305,7 +305,7 @@ void initArduino() {
if (err) {
log_e("Failed to initialize NVS! Error: %u", err);
}
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
if (!btInUse()) {
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
}
Expand Down
Loading