Code cleanup

Author: h2zero

src/NimBLEDevice.cpp

@@ -30,8 +30,9 @@
 #include "services/gap/ble_svc_gap.h"
 #include "services/gatt/ble_svc_gatt.h"
 
-#ifdef ARDUINO_ARCH_ESP32
-#include "esp32-hal-bt.h"
+#ifdef CONFIG_ENABLE_ARDUINO_DEPENDS
+extern "C" bool btInUse();
+bool btInUse(){ return true; }
 #endif
 
 #include "NimBLELog.h"
@@ -739,12 +740,6 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
     if(!initialized){
         int rc=0;
         esp_err_t errRc = ESP_OK;
-
-#ifdef ARDUINO_ARCH_ESP32
-        // make sure the linker includes esp32-hal-bt.c so ardruino init doesn't release BLE memory.
-        btStarted();
-#endif
-
         errRc = nvs_flash_init();
 
         if (errRc == ESP_ERR_NVS_NO_FREE_PAGES || errRc == ESP_ERR_NVS_NEW_VERSION_FOUND) {

src/NimBLEScan.cpp

@@ -110,7 +110,7 @@ NimBLEScan::~NimBLEScan() {
 
             advertisedDevice->m_timestamp = time(nullptr);
             advertisedDevice->setRSSI(event->disc.rssi);
-            advertisedDevice->setPayload(event->disc.data, event->disc.length_data, 
+            advertisedDevice->setPayload(event->disc.data, event->disc.length_data,
             event->disc.event_type == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP);
 
             if (pScan->m_pAdvertisedDeviceCallbacks) {
@@ -128,7 +128,7 @@ NimBLEScan::~NimBLEScan() {
                     advertisedDevice->m_callbackSent = true;
                     pScan->m_pAdvertisedDeviceCallbacks->onResult(advertisedDevice);
                 }
-                // If not storing results and we have invoked the callback, delete the device. 
+                // If not storing results and we have invoked the callback, delete the device.
                 if(pScan->m_maxResults == 0 && advertisedDevice->m_callbackSent) {
                     pScan->erase(advertisedAddress);
                 }