guard SimpleBLE

Author: Jason2866

cores/esp32/esp32-hal-bt.c

@@ -14,7 +14,7 @@
 
 #include "sdkconfig.h"
 #include "soc/soc_caps.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
 
 #include "esp_bt.h"
 #include "esp_bt_main.h"
@@ -102,4 +102,4 @@ bool btStop() {
     return true;
 }
 
-#endif
+#endif /* CONFIG_BT_ENABLED CONFIG_BLUEDROID_ENABLED SOC_BT_SUPPORTED */

cores/esp32/esp32-hal-bt.h

@@ -16,7 +16,7 @@
 #define _ESP32_ESP32_HAL_BT_H_
 
 #include "soc/soc_caps.h"
-#if SOC_BLE_SUPPORTED
+#if SOC_BT_SUPPORTED
 
 #include "esp32-hal.h"
 
@@ -40,6 +40,6 @@ bool btStop();
 }
 #endif
 
-#endif /* SOC_BLE_SUPPORTED */
+#endif /* SOC_BT_SUPPORTED */
 
 #endif /* _ESP32_ESP32_HAL_BT_H_ */

cores/esp32/esp32-hal-misc.c

@@ -26,7 +26,7 @@
 #include "esp_ota_ops.h"
 #endif  //CONFIG_APP_ROLLBACK_ENABLE
 #include "esp_private/startup_internal.h"
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_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));
@@ -304,7 +304,7 @@ void initArduino() {
   if (err) {
     log_e("Failed to initialize NVS! Error: %u", err);
   }
-#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BLE_SUPPORTED
+#if defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
   if (!btInUse()) {
     esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
   }

libraries/SimpleBLE/src/SimpleBLE.cpp

@@ -12,11 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "sdkconfig.h"
-
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
-
 #include "SimpleBLE.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
+
 #include "esp32-hal-log.h"
 
 #include "esp_bt.h"

libraries/SimpleBLE/src/SimpleBLE.h

@@ -16,8 +16,8 @@
 #define _SIMPLE_BLE_H_
 
 #include "sdkconfig.h"
-
-#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
+#include "soc/soc_caps.h"
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
 
 #include <cstdint>
 #include <cstdio>