From bd3addeb8e9b05766979caf32b74ee0a0e2ae4c8 Mon Sep 17 00:00:00 2001 From: Aron Rubin Date: Mon, 1 Mar 2021 16:55:04 -0500 Subject: [PATCH] Fixed use of Bluedroid instead of BT in HAL. (#4879) Fixed use of CONFIG_BLUEDROID_ENABLED instead of CONFIG_BT_ENABLED in HAL. This prevented compilation with Nimble-only configuration without apparent benefit. --- cores/esp32/esp32-hal-bt.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cores/esp32/esp32-hal-bt.c b/cores/esp32/esp32-hal-bt.c index fc518e38..375986d7 100644 --- a/cores/esp32/esp32-hal-bt.c +++ b/cores/esp32/esp32-hal-bt.c @@ -18,10 +18,9 @@ bool btInUse(){ return true; } -#ifdef CONFIG_BLUEDROID_ENABLED #include "esp_bt.h" -#ifdef CONFIG_CLASSIC_BT_ENABLED +#ifdef CONFIG_BT_CLASSIC_ENABLED #define BT_MODE ESP_BT_MODE_BTDM #else #define BT_MODE ESP_BT_MODE_BLE @@ -79,7 +78,7 @@ bool btStop(){ return false; } -#else +#else // CONFIG_BT_ENABLED bool btStarted() { return false; @@ -94,6 +93,6 @@ bool btStop() { return false; } -#endif -#endif + +#endif // CONFIG_BT_ENABLED