Fixed use of Bluedroid instead of BT in HAL. (#4879)

AronRubin · web-flow · commit bd3addeb8e9b · 2021-03-01T23:55:04.000+02:00
Fixed use of CONFIG_BLUEDROID_ENABLED instead of CONFIG_BT_ENABLED in HAL. This prevented compilation with Nimble-only configuration without apparent benefit.
diff --git 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
 

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,9 @@`
`18`	`18`
`19`	`19`	`bool btInUse(){ return true; }`
`20`	`20`
`21`		`-#ifdef CONFIG_BLUEDROID_ENABLED`
`22`	`21`	`#include "esp_bt.h"`
`23`	`22`
`24`		`-#ifdef CONFIG_CLASSIC_BT_ENABLED`
	`23`	`+#ifdef CONFIG_BT_CLASSIC_ENABLED`
`25`	`24`	`#define BT_MODE ESP_BT_MODE_BTDM`
`26`	`25`	`#else`
`27`	`26`	`#define BT_MODE ESP_BT_MODE_BLE`
`@@ -79,7 +78,7 @@ bool btStop(){`
`79`	`78`	`return false;`
`80`	`79`	`}`
`81`	`80`
`82`		`-#else`
	`81`	`+#else // CONFIG_BT_ENABLED`
`83`	`82`	`bool btStarted()`
`84`	`83`	`{`
`85`	`84`	`return false;`
`@@ -94,6 +93,6 @@ bool btStop()`
`94`	`93`	`{`
`95`	`94`	`return false;`
`96`	`95`	`}`
`97`		`-#endif`
`98`		`-#endif`
	`96`	`+`
	`97`	`+#endif // CONFIG_BT_ENABLED`
`99`	`98`