From 591c43880ab581542b6662a9e47b155ee1be7268 Mon Sep 17 00:00:00 2001 From: Me No Dev Date: Fri, 6 Nov 2020 14:00:06 +0200 Subject: [PATCH] RE: Change check for BT_ENABLE to really be a check for BLUEDROID_ENABLED (#4497) * Change check for CONFIG_BT_ENABLE to really be a check for CONFIG_BLUEDROID_ENABLED Which is really what should have been tested. This allows use of the Arduino layer with the newer Nimble stack for those that don't want to use Bluedroid. In support of https://github.com/meshtastic/Meshtastic-device/issues/266 * Change check for CONFIG_BT_ENABLE to really be a check for CONFIG_BLUEDROID_ENABLED Which is really what should have been tested. This allows use of the Arduino layer with the newer Nimble stack for those that don't want to use Bluedroid. In support of https://github.com/meshtastic/Meshtastic-device/issues/266 * wifi prov changes * merge fixes Co-authored-by: geeksville --- libraries/BLE/src/BLE2902.cpp | 2 +- libraries/BLE/src/BLE2902.h | 4 ++-- libraries/BLE/src/BLE2904.cpp | 2 +- libraries/BLE/src/BLE2904.h | 4 ++-- libraries/BLE/src/BLEAddress.cpp | 2 +- libraries/BLE/src/BLEAddress.h | 4 ++-- libraries/BLE/src/BLEAdvertisedDevice.cpp | 4 ++-- libraries/BLE/src/BLEAdvertisedDevice.h | 4 ++-- libraries/BLE/src/BLEAdvertising.cpp | 4 ++-- libraries/BLE/src/BLEAdvertising.h | 4 ++-- libraries/BLE/src/BLEBeacon.cpp | 2 +- libraries/BLE/src/BLECharacteristic.cpp | 4 ++-- libraries/BLE/src/BLECharacteristic.h | 4 ++-- libraries/BLE/src/BLECharacteristicMap.cpp | 4 ++-- libraries/BLE/src/BLEClient.cpp | 4 ++-- libraries/BLE/src/BLEClient.h | 4 ++-- libraries/BLE/src/BLEDescriptor.cpp | 4 ++-- libraries/BLE/src/BLEDescriptor.h | 4 ++-- libraries/BLE/src/BLEDescriptorMap.cpp | 4 ++-- libraries/BLE/src/BLEDevice.cpp | 4 ++-- libraries/BLE/src/BLEDevice.h | 4 ++-- libraries/BLE/src/BLEEddystoneTLM.cpp | 2 +- libraries/BLE/src/BLEEddystoneURL.cpp | 2 +- libraries/BLE/src/BLEHIDDevice.cpp | 4 ++-- libraries/BLE/src/BLEHIDDevice.h | 4 ++-- libraries/BLE/src/BLERemoteCharacteristic.cpp | 4 ++-- libraries/BLE/src/BLERemoteCharacteristic.h | 4 ++-- libraries/BLE/src/BLERemoteDescriptor.cpp | 4 ++-- libraries/BLE/src/BLERemoteDescriptor.h | 4 ++-- libraries/BLE/src/BLERemoteService.cpp | 4 ++-- libraries/BLE/src/BLERemoteService.h | 4 ++-- libraries/BLE/src/BLEScan.cpp | 4 ++-- libraries/BLE/src/BLEScan.h | 4 ++-- libraries/BLE/src/BLESecurity.cpp | 4 ++-- libraries/BLE/src/BLESecurity.h | 4 ++-- libraries/BLE/src/BLEServer.cpp | 4 ++-- libraries/BLE/src/BLEServer.h | 4 ++-- libraries/BLE/src/BLEService.cpp | 4 ++-- libraries/BLE/src/BLEService.h | 4 ++-- libraries/BLE/src/BLEServiceMap.cpp | 4 ++-- libraries/BLE/src/BLEUUID.cpp | 4 ++-- libraries/BLE/src/BLEUUID.h | 4 ++-- libraries/BLE/src/BLEUtils.cpp | 4 ++-- libraries/BLE/src/BLEUtils.h | 4 ++-- libraries/BLE/src/BLEValue.cpp | 4 ++-- libraries/BLE/src/BLEValue.h | 4 ++-- libraries/WiFi/src/WiFiProv.cpp | 14 +++++++------- libraries/WiFi/src/WiFiProv.h | 5 ++--- 48 files changed, 95 insertions(+), 96 deletions(-) diff --git a/libraries/BLE/src/BLE2902.cpp b/libraries/BLE/src/BLE2902.cpp index 23d9c77c..0b695c26 100644 --- a/libraries/BLE/src/BLE2902.cpp +++ b/libraries/BLE/src/BLE2902.cpp @@ -10,7 +10,7 @@ * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLE2902.h" diff --git a/libraries/BLE/src/BLE2902.h b/libraries/BLE/src/BLE2902.h index 397360ab..b50ed750 100644 --- a/libraries/BLE/src/BLE2902.h +++ b/libraries/BLE/src/BLE2902.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2902_H_ #define COMPONENTS_CPP_UTILS_BLE2902_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEDescriptor.h" @@ -30,5 +30,5 @@ public: }; // BLE2902 -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLE2902_H_ */ diff --git a/libraries/BLE/src/BLE2904.cpp b/libraries/BLE/src/BLE2904.cpp index 02252a1d..23ad3e73 100644 --- a/libraries/BLE/src/BLE2904.cpp +++ b/libraries/BLE/src/BLE2904.cpp @@ -10,7 +10,7 @@ * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_presentation_format.xml */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLE2904.h" diff --git a/libraries/BLE/src/BLE2904.h b/libraries/BLE/src/BLE2904.h index cb337e22..4d607525 100644 --- a/libraries/BLE/src/BLE2904.h +++ b/libraries/BLE/src/BLE2904.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLE2904_H_ #define COMPONENTS_CPP_UTILS_BLE2904_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEDescriptor.h" @@ -70,5 +70,5 @@ private: BLE2904_Data m_data; }; // BLE2904 -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLE2904_H_ */ diff --git a/libraries/BLE/src/BLEAddress.cpp b/libraries/BLE/src/BLEAddress.cpp index 6d83b17e..b9e6e34e 100644 --- a/libraries/BLE/src/BLEAddress.cpp +++ b/libraries/BLE/src/BLEAddress.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEAddress.h" #include diff --git a/libraries/BLE/src/BLEAddress.h b/libraries/BLE/src/BLEAddress.h index 7eff4da4..81122c36 100644 --- a/libraries/BLE/src/BLEAddress.h +++ b/libraries/BLE/src/BLEAddress.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADDRESS_H_ #define COMPONENTS_CPP_UTILS_BLEADDRESS_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include // ESP32 BLE #include @@ -30,5 +30,5 @@ private: esp_bd_addr_t m_address; }; -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEADDRESS_H_ */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.cpp b/libraries/BLE/src/BLEAdvertisedDevice.cpp index 13e397c3..4a4b23a3 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.cpp +++ b/libraries/BLE/src/BLEAdvertisedDevice.cpp @@ -12,7 +12,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "BLEAdvertisedDevice.h" #include "BLEUtils.h" @@ -571,5 +571,5 @@ size_t BLEAdvertisedDevice::getPayloadLength() { return m_payloadLength; } -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.h b/libraries/BLE/src/BLEAdvertisedDevice.h index 4cfa494e..d92cc539 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.h +++ b/libraries/BLE/src/BLEAdvertisedDevice.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ #define COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include @@ -124,5 +124,5 @@ public: virtual void onResult(BLEAdvertisedDevice advertisedDevice) = 0; }; -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEAdvertising.cpp b/libraries/BLE/src/BLEAdvertising.cpp index 58f371ed..7eb56681 100644 --- a/libraries/BLE/src/BLEAdvertising.cpp +++ b/libraries/BLE/src/BLEAdvertising.cpp @@ -17,7 +17,7 @@ * */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEAdvertising.h" #include #include "BLEUtils.h" @@ -525,4 +525,4 @@ void BLEAdvertising::handleGAPEvent( } -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEAdvertising.h b/libraries/BLE/src/BLEAdvertising.h index bb3bc345..7a64952a 100644 --- a/libraries/BLE/src/BLEAdvertising.h +++ b/libraries/BLE/src/BLEAdvertising.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ #define COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "BLEUUID.h" #include @@ -77,5 +77,5 @@ private: bool m_scanResp = true; }; -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */ diff --git a/libraries/BLE/src/BLEBeacon.cpp b/libraries/BLE/src/BLEBeacon.cpp index 1056cd54..9f3519b8 100644 --- a/libraries/BLE/src/BLEBeacon.cpp +++ b/libraries/BLE/src/BLEBeacon.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "BLEBeacon.h" #include "esp32-hal-log.h" diff --git a/libraries/BLE/src/BLECharacteristic.cpp b/libraries/BLE/src/BLECharacteristic.cpp index 7daaa32a..a93c4637 100644 --- a/libraries/BLE/src/BLECharacteristic.cpp +++ b/libraries/BLE/src/BLECharacteristic.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include @@ -800,4 +800,4 @@ void BLECharacteristicCallbacks::onStatus(BLECharacteristic* pCharacteristic, St } // onStatus -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLECharacteristic.h b/libraries/BLE/src/BLECharacteristic.h index 55f94c94..3db891eb 100644 --- a/libraries/BLE/src/BLECharacteristic.h +++ b/libraries/BLE/src/BLECharacteristic.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ #define COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include "BLEUUID.h" @@ -150,5 +150,5 @@ public: virtual void onNotify(BLECharacteristic* pCharacteristic); virtual void onStatus(BLECharacteristic* pCharacteristic, Status s, uint32_t code); }; -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLECharacteristicMap.cpp b/libraries/BLE/src/BLECharacteristicMap.cpp index 6e648fc7..06aeb5bb 100644 --- a/libraries/BLE/src/BLECharacteristicMap.cpp +++ b/libraries/BLE/src/BLECharacteristicMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include "BLEService.h" @@ -131,4 +131,4 @@ std::string BLECharacteristicMap::toString() { } // toString -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEClient.cpp b/libraries/BLE/src/BLEClient.cpp index 9d947710..3895e1fb 100644 --- a/libraries/BLE/src/BLEClient.cpp +++ b/libraries/BLE/src/BLEClient.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include @@ -535,4 +535,4 @@ std::string BLEClient::toString() { } // toString -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEClient.h b/libraries/BLE/src/BLEClient.h index 75a288e4..faf2f0c3 100644 --- a/libraries/BLE/src/BLEClient.h +++ b/libraries/BLE/src/BLEClient.h @@ -9,7 +9,7 @@ #define MAIN_BLEDEVICE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include @@ -99,5 +99,5 @@ public: virtual void onDisconnect(BLEClient *pClient) = 0; }; -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif /* MAIN_BLEDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEDescriptor.cpp b/libraries/BLE/src/BLEDescriptor.cpp index 96b2de87..ef96dbe7 100644 --- a/libraries/BLE/src/BLEDescriptor.cpp +++ b/libraries/BLE/src/BLEDescriptor.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include @@ -284,4 +284,4 @@ void BLEDescriptorCallbacks::onWrite(BLEDescriptor* pDescriptor) { } // onWrite -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEDescriptor.h b/libraries/BLE/src/BLEDescriptor.h index 551f236d..e3ccc57b 100644 --- a/libraries/BLE/src/BLEDescriptor.h +++ b/libraries/BLE/src/BLEDescriptor.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ #define COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "BLEUUID.h" #include "BLECharacteristic.h" @@ -73,5 +73,5 @@ public: virtual void onRead(BLEDescriptor* pDescriptor); virtual void onWrite(BLEDescriptor* pDescriptor); }; -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLEDescriptorMap.cpp b/libraries/BLE/src/BLEDescriptorMap.cpp index 0b5d3175..49aeea21 100644 --- a/libraries/BLE/src/BLEDescriptorMap.cpp +++ b/libraries/BLE/src/BLEDescriptorMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include "BLECharacteristic.h" @@ -145,4 +145,4 @@ BLEDescriptor* BLEDescriptorMap::getNext() { m_iterator++; return pRet; } // getNext -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEDevice.cpp b/libraries/BLE/src/BLEDevice.cpp index 29f59854..681f0e40 100644 --- a/libraries/BLE/src/BLEDevice.cpp +++ b/libraries/BLE/src/BLEDevice.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include @@ -669,4 +669,4 @@ void BLEDevice::setCustomGattsHandler(gatts_event_handler handler) { m_customGattsHandler = handler; } -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEDevice.h b/libraries/BLE/src/BLEDevice.h index 4ecdf04c..aa548ddf 100644 --- a/libraries/BLE/src/BLEDevice.h +++ b/libraries/BLE/src/BLEDevice.h @@ -8,7 +8,7 @@ #ifndef MAIN_BLEDevice_H_ #define MAIN_BLEDevice_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include // ESP32 BLE #include // ESP32 BLE #include // Part of C++ STL @@ -96,5 +96,5 @@ public: }; // class BLE -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif /* MAIN_BLEDevice_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.cpp b/libraries/BLE/src/BLEEddystoneTLM.cpp index accc4db1..10cc657a 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.cpp +++ b/libraries/BLE/src/BLEEddystoneTLM.cpp @@ -10,7 +10,7 @@ * */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include "esp32-hal-log.h" diff --git a/libraries/BLE/src/BLEEddystoneURL.cpp b/libraries/BLE/src/BLEEddystoneURL.cpp index 19a56b28..1c23e52b 100644 --- a/libraries/BLE/src/BLEEddystoneURL.cpp +++ b/libraries/BLE/src/BLEEddystoneURL.cpp @@ -5,7 +5,7 @@ * Author: pcbreflux */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "esp32-hal-log.h" #include "BLEEddystoneURL.h" diff --git a/libraries/BLE/src/BLEHIDDevice.cpp b/libraries/BLE/src/BLEHIDDevice.cpp index 69e18be7..d3e8c105 100644 --- a/libraries/BLE/src/BLEHIDDevice.cpp +++ b/libraries/BLE/src/BLEHIDDevice.cpp @@ -5,7 +5,7 @@ * Author: chegewara */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEHIDDevice.h" #include "BLE2904.h" @@ -239,5 +239,5 @@ BLEService* BLEHIDDevice::batteryService() { return m_batteryService; } -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEHIDDevice.h b/libraries/BLE/src/BLEHIDDevice.h index 33e6b46c..fead92b7 100644 --- a/libraries/BLE/src/BLEHIDDevice.h +++ b/libraries/BLE/src/BLEHIDDevice.h @@ -9,7 +9,7 @@ #define _BLEHIDDEVICE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLECharacteristic.h" #include "BLEService.h" @@ -71,5 +71,5 @@ private: BLECharacteristic* m_protocolModeCharacteristic; //0x2a4e BLECharacteristic* m_batteryLevelCharacteristic; //0x2a19 }; -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif /* _BLEHIDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.cpp b/libraries/BLE/src/BLERemoteCharacteristic.cpp index d6771044..0a0b057e 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.cpp +++ b/libraries/BLE/src/BLERemoteCharacteristic.cpp @@ -8,7 +8,7 @@ #include "BLERemoteCharacteristic.h" #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include @@ -613,4 +613,4 @@ void BLERemoteCharacteristic::setAuth(esp_gatt_auth_req_t auth) { m_auth = auth; } -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.h b/libraries/BLE/src/BLERemoteCharacteristic.h index 92662841..5f7d4d82 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.h +++ b/libraries/BLE/src/BLERemoteCharacteristic.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -83,5 +83,5 @@ private: // We maintain a map of descriptors owned by this characteristic keyed by a string representation of the UUID. std::map m_descriptorMap; }; // BLERemoteCharacteristic -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.cpp b/libraries/BLE/src/BLERemoteDescriptor.cpp index b1e0bef2..1538741d 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.cpp +++ b/libraries/BLE/src/BLERemoteDescriptor.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "BLERemoteDescriptor.h" #include "GeneralUtils.h" @@ -201,4 +201,4 @@ void BLERemoteDescriptor::setAuth(esp_gatt_auth_req_t auth) { m_auth = auth; } -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.h b/libraries/BLE/src/BLERemoteDescriptor.h index fff9ff07..af370e43 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.h +++ b/libraries/BLE/src/BLERemoteDescriptor.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include @@ -54,5 +54,5 @@ private: }; -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLERemoteService.cpp b/libraries/BLE/src/BLERemoteService.cpp index 90de450f..9c6396b9 100644 --- a/libraries/BLE/src/BLERemoteService.cpp +++ b/libraries/BLE/src/BLERemoteService.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include "BLERemoteService.h" @@ -359,4 +359,4 @@ std::string BLERemoteService::toString() { } // toString -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLERemoteService.h b/libraries/BLE/src/BLERemoteService.h index 9d121c89..64aff5a1 100644 --- a/libraries/BLE/src/BLERemoteService.h +++ b/libraries/BLE/src/BLERemoteService.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ #define COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -81,5 +81,5 @@ private: uint16_t m_endHandle; // The ending handle of this service. }; // BLERemoteService -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEScan.cpp b/libraries/BLE/src/BLEScan.cpp index e6e962be..fd16c899 100644 --- a/libraries/BLE/src/BLEScan.cpp +++ b/libraries/BLE/src/BLEScan.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -330,4 +330,4 @@ void BLEScan::clearResults() { m_scanResults.m_vectorAdvertisedDevices.clear(); } -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEScan.h b/libraries/BLE/src/BLEScan.h index 14559bcc..14b47153 100644 --- a/libraries/BLE/src/BLEScan.h +++ b/libraries/BLE/src/BLEScan.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESCAN_H_ #define COMPONENTS_CPP_UTILS_BLESCAN_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include // #include @@ -81,5 +81,5 @@ private: void (*m_scanCompleteCB)(BLEScanResults scanResults); }; // BLEScan -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLESCAN_H_ */ diff --git a/libraries/BLE/src/BLESecurity.cpp b/libraries/BLE/src/BLESecurity.cpp index f3b2cd3c..b04acfda 100644 --- a/libraries/BLE/src/BLESecurity.cpp +++ b/libraries/BLE/src/BLESecurity.cpp @@ -7,7 +7,7 @@ #include "BLESecurity.h" #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) BLESecurity::BLESecurity() { } @@ -112,4 +112,4 @@ char* BLESecurity::esp_key_type_to_str(esp_ble_key_type_t key_type) { } return key_str; } // esp_key_type_to_str -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLESecurity.h b/libraries/BLE/src/BLESecurity.h index dc6d6d71..144f4bbd 100644 --- a/libraries/BLE/src/BLESecurity.h +++ b/libraries/BLE/src/BLESecurity.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESECURITY_H_ #define COMPONENTS_CPP_UTILS_BLESECURITY_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -69,5 +69,5 @@ public: virtual bool onConfirmPIN(uint32_t pin) = 0; }; // BLESecurityCallbacks -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif // COMPONENTS_CPP_UTILS_BLESECURITY_H_ diff --git a/libraries/BLE/src/BLEServer.cpp b/libraries/BLE/src/BLEServer.cpp index a63278c4..0b39c9ca 100644 --- a/libraries/BLE/src/BLEServer.cpp +++ b/libraries/BLE/src/BLEServer.cpp @@ -6,7 +6,7 @@ */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include "GeneralUtils.h" @@ -423,4 +423,4 @@ void BLEServer::disconnect(uint16_t connId) { esp_ble_gatts_close(m_gatts_if, connId); } -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEServer.h b/libraries/BLE/src/BLEServer.h index d50baaa9..2ae23edb 100644 --- a/libraries/BLE/src/BLEServer.h +++ b/libraries/BLE/src/BLEServer.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESERVER_H_ #define COMPONENTS_CPP_UTILS_BLESERVER_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include @@ -137,5 +137,5 @@ public: }; // BLEServerCallbacks -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVER_H_ */ diff --git a/libraries/BLE/src/BLEService.cpp b/libraries/BLE/src/BLEService.cpp index 3ea6141c..ea815825 100644 --- a/libraries/BLE/src/BLEService.cpp +++ b/libraries/BLE/src/BLEService.cpp @@ -8,7 +8,7 @@ // A service is identified by a UUID. A service is also the container for one or more characteristics. #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include @@ -410,4 +410,4 @@ BLEServer* BLEService::getServer() { return m_pServer; } // getServer -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEService.h b/libraries/BLE/src/BLEService.h index 9b0db24b..c801a2f5 100644 --- a/libraries/BLE/src/BLEService.h +++ b/libraries/BLE/src/BLEService.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLESERVICE_H_ #define COMPONENTS_CPP_UTILS_BLESERVICE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include @@ -93,5 +93,5 @@ private: }; // BLEService -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif /* COMPONENTS_CPP_UTILS_BLESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEServiceMap.cpp b/libraries/BLE/src/BLEServiceMap.cpp index a8a1f8e5..ec6fab25 100644 --- a/libraries/BLE/src/BLEServiceMap.cpp +++ b/libraries/BLE/src/BLEServiceMap.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include "BLEService.h" @@ -134,4 +134,4 @@ int BLEServiceMap::getRegisteredServiceCount(){ return m_handleMap.size(); } -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEUUID.cpp b/libraries/BLE/src/BLEUUID.cpp index 1a947367..45f698af 100644 --- a/libraries/BLE/src/BLEUUID.cpp +++ b/libraries/BLE/src/BLEUUID.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include #include #include @@ -383,4 +383,4 @@ std::string BLEUUID::toString() { return res; } // toString -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ diff --git a/libraries/BLE/src/BLEUUID.h b/libraries/BLE/src/BLEUUID.h index 01acb161..07617b9d 100644 --- a/libraries/BLE/src/BLEUUID.h +++ b/libraries/BLE/src/BLEUUID.h @@ -9,7 +9,7 @@ #define COMPONENTS_CPP_UTILS_BLEUUID_H_ #include "sdkconfig.h" #include -#if defined(CONFIG_BT_ENABLED) +#if CONFIG_BLUEDROID_ENABLED #include /** @@ -35,5 +35,5 @@ private: esp_bt_uuid_t m_uuid; // The underlying UUID structure that this class wraps. bool m_valueSet = false; // Is there a value set for this instance. }; // BLEUUID -#endif /* CONFIG_BT_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED */ #endif /* COMPONENTS_CPP_UTILS_BLEUUID_H_ */ diff --git a/libraries/BLE/src/BLEUtils.cpp b/libraries/BLE/src/BLEUtils.cpp index b9cf591f..bd27a079 100644 --- a/libraries/BLE/src/BLEUtils.cpp +++ b/libraries/BLE/src/BLEUtils.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEAddress.h" #include "BLEClient.h" #include "BLEUtils.h" @@ -2037,4 +2037,4 @@ const char* BLEUtils::searchEventTypeToString(esp_gap_search_evt_t searchEvt) { } } // searchEventTypeToString -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEUtils.h b/libraries/BLE/src/BLEUtils.h index 7981691c..580075df 100644 --- a/libraries/BLE/src/BLEUtils.h +++ b/libraries/BLE/src/BLEUtils.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEUTILS_H_ #define COMPONENTS_CPP_UTILS_BLEUTILS_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include // ESP32 BLE #include // ESP32 BLE #include // ESP32 BLE @@ -59,5 +59,5 @@ public: static const char* searchEventTypeToString(esp_gap_search_evt_t searchEvt); }; -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif /* COMPONENTS_CPP_UTILS_BLEUTILS_H_ */ diff --git a/libraries/BLE/src/BLEValue.cpp b/libraries/BLE/src/BLEValue.cpp index 40f6a20a..a42c92d1 100644 --- a/libraries/BLE/src/BLEValue.cpp +++ b/libraries/BLE/src/BLEValue.cpp @@ -5,7 +5,7 @@ * Author: kolban */ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include "BLEValue.h" #include "esp32-hal-log.h" @@ -127,4 +127,4 @@ void BLEValue::setValue(uint8_t* pData, size_t length) { } // setValue -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED diff --git a/libraries/BLE/src/BLEValue.h b/libraries/BLE/src/BLEValue.h index 5df904c1..31734e48 100644 --- a/libraries/BLE/src/BLEValue.h +++ b/libraries/BLE/src/BLEValue.h @@ -8,7 +8,7 @@ #ifndef COMPONENTS_CPP_UTILS_BLEVALUE_H_ #define COMPONENTS_CPP_UTILS_BLEVALUE_H_ #include "sdkconfig.h" -#if defined(CONFIG_BT_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) #include /** @@ -35,5 +35,5 @@ private: std::string m_value; }; -#endif // CONFIG_BT_ENABLED +#endif // CONFIG_BLUEDROID_ENABLED #endif /* COMPONENTS_CPP_UTILS_BLEVALUE_H_ */ diff --git a/libraries/WiFi/src/WiFiProv.cpp b/libraries/WiFi/src/WiFiProv.cpp index bed66497..9b413926 100644 --- a/libraries/WiFi/src/WiFiProv.cpp +++ b/libraries/WiFi/src/WiFiProv.cpp @@ -28,7 +28,7 @@ #include #include -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED #include "wifi_provisioning/scheme_ble.h" #endif #include @@ -86,20 +86,20 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t static char service_name_temp[32]; wifi_prov_mgr_config_t config; -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED if(prov_scheme == WIFI_PROV_SCHEME_BLE) { config.scheme = wifi_prov_scheme_ble; } else { #endif config.scheme = wifi_prov_scheme_softap; -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED } if(scheme_handler == WIFI_PROV_SCHEME_HANDLER_NONE){ #endif wifi_prov_event_handler_t scheme_event_handler = WIFI_PROV_EVENT_HANDLER_NONE; memcpy(&config.scheme_event_handler, &scheme_event_handler, sizeof(wifi_prov_event_handler_t)); -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED } else if(scheme_handler == WIFI_PROV_SCHEME_HANDLER_FREE_BTDM){ wifi_prov_event_handler_t scheme_event_handler = WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM; memcpy(&config.scheme_event_handler, &scheme_event_handler, sizeof(wifi_prov_event_handler_t)); @@ -126,7 +126,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t return; } if(provisioned == false) { -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED if(prov_scheme == WIFI_PROV_SCHEME_BLE) { service_key = NULL; if(uuid == NULL) { @@ -141,7 +141,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t service_name = (const char *)service_name_temp; } -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED if(prov_scheme == WIFI_PROV_SCHEME_BLE) { log_i("Starting AP using BLE. service_name : %s, pop : %s",service_name,pop); } else { @@ -151,7 +151,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t } else { log_i("Starting provisioning AP using SOFTAP. service_name : %s, password : %s, pop : %s",service_name,service_key,pop); } -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED } #endif diff --git a/libraries/WiFi/src/WiFiProv.h b/libraries/WiFi/src/WiFiProv.h index c3c7dabf..3cd34fa8 100644 --- a/libraries/WiFi/src/WiFiProv.h +++ b/libraries/WiFi/src/WiFiProv.h @@ -19,11 +19,10 @@ #include "WiFi.h" #include "wifi_provisioning/manager.h" - //Select the scheme using which you want to provision typedef enum { WIFI_PROV_SCHEME_SOFTAP, -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED WIFI_PROV_SCHEME_BLE, #endif WIFI_PROV_SCHEME_MAX @@ -31,7 +30,7 @@ typedef enum { typedef enum { WIFI_PROV_SCHEME_HANDLER_NONE, -#if CONFIG_IDF_TARGET_ESP32 +#if CONFIG_BLUEDROID_ENABLED WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SCHEME_HANDLER_FREE_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BT,