Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 9cad83b

Browse filesBrowse files
authored
check for CONFIG_BT_BLUEDROID_ENABLED in esp32-hal-misc.c (espressif#11234)
* check for `CONFIG_BT_BLUEDROID_ENABLED` in esp32-hal-misc.c * overseen changes to `CONFIG_BT_BLUEDROID_ENABLED`
1 parent 60c8206 commit 9cad83b
Copy full SHA for 9cad83b

File tree

1 file changed

+4
-4
lines changed
Filter options

1 file changed

+4
-4
lines changed

‎cores/esp32/esp32-hal-misc.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-misc.c
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include "esp_ota_ops.h"
2626
#endif //CONFIG_APP_ROLLBACK_ENABLE
2727
#include "esp_private/startup_internal.h"
28-
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
28+
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
2929
#include "esp_bt.h"
30-
#endif //CONFIG_BT_ENABLED
30+
#endif //CONFIG_BT_BLUEDROID_ENABLED
3131
#include <sys/time.h>
3232
#include "soc/rtc.h"
3333
#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4)
@@ -243,7 +243,7 @@ bool verifyRollbackLater() {
243243
}
244244
#endif
245245

246-
#ifdef CONFIG_BT_ENABLED
246+
#ifdef CONFIG_BT_BLUEDROID_ENABLED
247247
#if CONFIG_IDF_TARGET_ESP32
248248
//overwritten in esp32-hal-bt.c
249249
bool btInUse() __attribute__((weak));
@@ -305,7 +305,7 @@ void initArduino() {
305305
if (err) {
306306
log_e("Failed to initialize NVS! Error: %u", err);
307307
}
308-
#if defined(CONFIG_BT_ENABLED) && SOC_BT_SUPPORTED
308+
#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
309309
if (!btInUse()) {
310310
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
311311
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.