more safe guards

Author: Jason2866

cores/esp32/esp32-hal-bt.c

@@ -13,7 +13,8 @@
 // limitations under the License.
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
+#include "soc/soc_caps.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
 
 #include "esp_bt.h"
 #include "esp_bt_main.h"

cores/esp32/esp32-hal-misc.c

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include "sdkconfig.h"
+#include "soc/soc_caps.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_attr.h"
@@ -25,7 +26,7 @@
 #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_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
 #include "esp_bt.h"
 #if CONFIG_IDF_TARGET_ESP32
 bool btInUse() __attribute__((weak));
@@ -38,7 +39,7 @@ bool btInUse() {
   return false;
 }
 #endif
-#endif  //CONFIG_BT_ENABLED
+#endif  //CONFIG_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)
@@ -303,7 +304,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_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
   if (!btInUse()) {
     esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
   }

libraries/BLE/src/BLEDevice.cpp

@@ -8,7 +8,7 @@
 #if SOC_BT_SUPPORTED
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BLUEDROID_ENABLED)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 #include <freertos/FreeRTOS.h>
 #include <freertos/event_groups.h>
 #include <freertos/task.h>