From 20ddeb0bc57ade69cb1b117bf32e75aa16e7fe2d Mon Sep 17 00:00:00 2001 From: Lucas Saavedra Vaz <32426024+lucasssvaz@users.noreply.github.com> Date: Tue, 11 Feb 2025 15:57:27 -0300 Subject: [PATCH] Add guards --- libraries/BLE/src/BLE2901.cpp | 2 +- libraries/BLE/src/BLE2901.h | 4 +- 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/BLEBeacon.h | 4 + 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 | 4 +- .../BLE/src/BLEEddystoneTLM.cppwithheadder | 202 ------------------ libraries/BLE/src/BLEEddystoneTLM.h | 4 + libraries/BLE/src/BLEEddystoneURL.cpp | 2 +- libraries/BLE/src/BLEEddystoneURL.h | 4 + libraries/BLE/src/BLEEddystoneURL.h.orig | 66 ------ 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 +- 53 files changed, 102 insertions(+), 358 deletions(-) delete mode 100644 libraries/BLE/src/BLEEddystoneTLM.cppwithheadder delete mode 100644 libraries/BLE/src/BLEEddystoneURL.h.orig diff --git a/libraries/BLE/src/BLE2901.cpp b/libraries/BLE/src/BLE2901.cpp index e929262b023..a1d56a8ceb1 100644 --- a/libraries/BLE/src/BLE2901.cpp +++ b/libraries/BLE/src/BLE2901.cpp @@ -19,7 +19,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLE2901.h" diff --git a/libraries/BLE/src/BLE2901.h b/libraries/BLE/src/BLE2901.h index f5ad7c94add..23991bd8247 100644 --- a/libraries/BLE/src/BLE2901.h +++ b/libraries/BLE/src/BLE2901.h @@ -22,7 +22,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEDescriptor.h" @@ -32,6 +32,6 @@ class BLE2901 : public BLEDescriptor { void setDescription(String desc); }; // BLE2901 -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2901_H_ */ diff --git a/libraries/BLE/src/BLE2902.cpp b/libraries/BLE/src/BLE2902.cpp index 90cdf088ff2..01f4830f964 100644 --- a/libraries/BLE/src/BLE2902.cpp +++ b/libraries/BLE/src/BLE2902.cpp @@ -13,7 +13,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLE2902.h" diff --git a/libraries/BLE/src/BLE2902.h b/libraries/BLE/src/BLE2902.h index 74a477f3151..453ae7f4bac 100644 --- a/libraries/BLE/src/BLE2902.h +++ b/libraries/BLE/src/BLE2902.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEDescriptor.h" @@ -33,6 +33,6 @@ class BLE2902 : public BLEDescriptor { }; // BLE2902 -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2902_H_ */ diff --git a/libraries/BLE/src/BLE2904.cpp b/libraries/BLE/src/BLE2904.cpp index aeed11ebad1..40b52a4db88 100644 --- a/libraries/BLE/src/BLE2904.cpp +++ b/libraries/BLE/src/BLE2904.cpp @@ -13,7 +13,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLE2904.h" diff --git a/libraries/BLE/src/BLE2904.h b/libraries/BLE/src/BLE2904.h index 3ba66da0dc8..89378c1ab5c 100644 --- a/libraries/BLE/src/BLE2904.h +++ b/libraries/BLE/src/BLE2904.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEDescriptor.h" @@ -73,6 +73,6 @@ class BLE2904 : public BLEDescriptor { BLE2904_Data m_data; }; // BLE2904 -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLE2904_H_ */ diff --git a/libraries/BLE/src/BLEAddress.cpp b/libraries/BLE/src/BLEAddress.cpp index b91ef3cc4de..cacb7a7021d 100644 --- a/libraries/BLE/src/BLEAddress.cpp +++ b/libraries/BLE/src/BLEAddress.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEAddress.h" #include diff --git a/libraries/BLE/src/BLEAddress.h b/libraries/BLE/src/BLEAddress.h index f1c8aa9b632..7cdced2bc1a 100644 --- a/libraries/BLE/src/BLEAddress.h +++ b/libraries/BLE/src/BLEAddress.h @@ -12,7 +12,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include // ESP32 BLE #include @@ -39,6 +39,6 @@ class BLEAddress { esp_bd_addr_t m_address; }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADDRESS_H_ */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.cpp b/libraries/BLE/src/BLEAdvertisedDevice.cpp index 8752d24a199..88a696c2da0 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.cpp +++ b/libraries/BLE/src/BLEAdvertisedDevice.cpp @@ -14,7 +14,7 @@ #include "soc/soc_caps.h" #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include "BLEAdvertisedDevice.h" #include "BLEUtils.h" @@ -595,5 +595,5 @@ size_t BLEAdvertisedDevice::getPayloadLength() { return m_payloadLength; } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAdvertisedDevice.h b/libraries/BLE/src/BLEAdvertisedDevice.h index 700e5704034..19211a417a5 100644 --- a/libraries/BLE/src/BLEAdvertisedDevice.h +++ b/libraries/BLE/src/BLEAdvertisedDevice.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -147,6 +147,6 @@ class BLEExtAdvertisingCallbacks { }; #endif // SOC_BLE_50_SUPPORTED -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISEDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEAdvertising.cpp b/libraries/BLE/src/BLEAdvertising.cpp index 2d71c4d7478..1f4e82ff4e1 100644 --- a/libraries/BLE/src/BLEAdvertising.cpp +++ b/libraries/BLE/src/BLEAdvertising.cpp @@ -20,7 +20,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEAdvertising.h" #include #include "BLEUtils.h" @@ -801,5 +801,5 @@ void BLEMultiAdvertising::setDuration(uint8_t instance, int duration, int max_ev #endif // SOC_BLE_50_SUPPORTED -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEAdvertising.h b/libraries/BLE/src/BLEAdvertising.h index 9da70a3d9ca..09e1238c97a 100644 --- a/libraries/BLE/src/BLEAdvertising.h +++ b/libraries/BLE/src/BLEAdvertising.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include "BLEUUID.h" #include @@ -112,6 +112,6 @@ class BLEMultiAdvertising { #endif // SOC_BLE_50_SUPPORTED -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEADVERTISING_H_ */ diff --git a/libraries/BLE/src/BLEBeacon.cpp b/libraries/BLE/src/BLEBeacon.cpp index 43366a7b2d9..6e420077c26 100644 --- a/libraries/BLE/src/BLEBeacon.cpp +++ b/libraries/BLE/src/BLEBeacon.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEBeacon.h" #include "esp32-hal-log.h" diff --git a/libraries/BLE/src/BLEBeacon.h b/libraries/BLE/src/BLEBeacon.h index dcc41aafeb4..a05a91b8a75 100644 --- a/libraries/BLE/src/BLEBeacon.h +++ b/libraries/BLE/src/BLEBeacon.h @@ -10,6 +10,9 @@ #include "soc/soc_caps.h" #if SOC_BLE_SUPPORTED +#include "sdkconfig.h" +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) + #include "BLEUUID.h" /** * @brief Representation of a beacon. @@ -44,5 +47,6 @@ class BLEBeacon { void setSignalPower(int8_t signalPower); }; // BLEBeacon +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEBEACON_H_ */ diff --git a/libraries/BLE/src/BLECharacteristic.cpp b/libraries/BLE/src/BLECharacteristic.cpp index b03d524a6a5..63616e2d47b 100644 --- a/libraries/BLE/src/BLECharacteristic.cpp +++ b/libraries/BLE/src/BLECharacteristic.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include @@ -795,5 +795,5 @@ void BLECharacteristicCallbacks::onStatus(BLECharacteristic *pCharacteristic, St log_d("<< onStatus"); } // onStatus -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLECharacteristic.h b/libraries/BLE/src/BLECharacteristic.h index 29f105868fd..8166bc33b7e 100644 --- a/libraries/BLE/src/BLECharacteristic.h +++ b/libraries/BLE/src/BLECharacteristic.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include "BLEUUID.h" @@ -184,6 +184,6 @@ class BLECharacteristicCallbacks { virtual void onStatus(BLECharacteristic *pCharacteristic, Status s, uint32_t code); }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLECharacteristicMap.cpp b/libraries/BLE/src/BLECharacteristicMap.cpp index 6f2c0bb1154..abae74c697a 100644 --- a/libraries/BLE/src/BLECharacteristicMap.cpp +++ b/libraries/BLE/src/BLECharacteristicMap.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include "BLEService.h" @@ -130,5 +130,5 @@ String BLECharacteristicMap::toString() { return res; } // toString -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEClient.cpp b/libraries/BLE/src/BLEClient.cpp index 29fa0fbc140..549f282feb7 100644 --- a/libraries/BLE/src/BLEClient.cpp +++ b/libraries/BLE/src/BLEClient.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include @@ -582,5 +582,5 @@ String BLEClient::toString() { return res; } // toString -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEClient.h b/libraries/BLE/src/BLEClient.h index ddb932fcd95..1b99ae7b2cb 100644 --- a/libraries/BLE/src/BLEClient.h +++ b/libraries/BLE/src/BLEClient.h @@ -12,7 +12,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -98,6 +98,6 @@ class BLEClientCallbacks { virtual void onDisconnect(BLEClient *pClient) = 0; }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* MAIN_BLEDEVICE_H_ */ diff --git a/libraries/BLE/src/BLEDescriptor.cpp b/libraries/BLE/src/BLEDescriptor.cpp index 69a93e57201..8e7a8317b0f 100644 --- a/libraries/BLE/src/BLEDescriptor.cpp +++ b/libraries/BLE/src/BLEDescriptor.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include @@ -268,5 +268,5 @@ void BLEDescriptorCallbacks::onWrite(BLEDescriptor *pDescriptor) { log_d("BLEDescriptorCallbacks", "<< onWrite"); } // onWrite -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDescriptor.h b/libraries/BLE/src/BLEDescriptor.h index e155a1f2971..584f056b9e0 100644 --- a/libraries/BLE/src/BLEDescriptor.h +++ b/libraries/BLE/src/BLEDescriptor.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include "BLEUUID.h" #include "BLECharacteristic.h" @@ -73,6 +73,6 @@ class BLEDescriptorCallbacks { virtual void onWrite(BLEDescriptor *pDescriptor); }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLEDescriptorMap.cpp b/libraries/BLE/src/BLEDescriptorMap.cpp index 732fb62cdcf..ff503994ec0 100644 --- a/libraries/BLE/src/BLEDescriptorMap.cpp +++ b/libraries/BLE/src/BLEDescriptorMap.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include "BLECharacteristic.h" @@ -142,5 +142,5 @@ BLEDescriptor *BLEDescriptorMap::getNext() { return pRet; } // getNext -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDevice.cpp b/libraries/BLE/src/BLEDevice.cpp index 186b36d6a33..186d2df005b 100644 --- a/libraries/BLE/src/BLEDevice.cpp +++ b/libraries/BLE/src/BLEDevice.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include @@ -650,5 +650,5 @@ void BLEDevice::setCustomGattsHandler(gatts_event_handler handler) { m_customGattsHandler = handler; } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEDevice.h b/libraries/BLE/src/BLEDevice.h index 01bf143c101..7975a83b483 100644 --- a/libraries/BLE/src/BLEDevice.h +++ b/libraries/BLE/src/BLEDevice.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include // ESP32 BLE #include // ESP32 BLE #include // Part of C++ STL @@ -93,6 +93,6 @@ class BLEDevice { }; // class BLE -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* MAIN_BLEDevice_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.cpp b/libraries/BLE/src/BLEEddystoneTLM.cpp index 1a301f09011..f2fd2ae2158 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.cpp +++ b/libraries/BLE/src/BLEEddystoneTLM.cpp @@ -13,7 +13,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include "esp32-hal-log.h" @@ -176,5 +176,5 @@ void BLEEddystoneTLM::setTime(uint32_t tmil) { m_eddystoneData.tmil = tmil; } // setTime -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEEddystoneTLM.cppwithheadder b/libraries/BLE/src/BLEEddystoneTLM.cppwithheadder deleted file mode 100644 index 07002dbab1f..00000000000 --- a/libraries/BLE/src/BLEEddystoneTLM.cppwithheadder +++ /dev/null @@ -1,202 +0,0 @@ -/* - * BLEEddystoneTLM.cpp - * - * Created on: Mar 12, 2018 - * Author: pcbreflux - * Edited on: Mar 20, 2020 by beegee-tokyo - * Fix temperature value (8.8 fixed format) - * Fix time stamp (0.1 second resolution) - * Fixes based on EddystoneTLM frame specification https://github.com/google/eddystone/blob/master/eddystone-tlm/tlm-plain.md - * - */ -#include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) -#include -#include -#include "esp32-hal-log.h" -#include "BLEEddystoneTLM.h" - -static const char LOG_TAG[] = "BLEEddystoneTLM"; - -BLEEddystoneTLM::BLEEddystoneTLM() { - m_eddystoneData.frameType = EDDYSTONE_TLM_FRAME_TYPE; - m_eddystoneData.version = 0; - m_eddystoneData.volt = 3300; // 3300mV = 3.3V - m_eddystoneData.temp = (uint16_t) ((float) 23.00)/256; - m_eddystoneData.advCount = 0; - m_eddystoneData.tmil = 0; - _initHeadder(); -} // BLEEddystoneTLM - -BLEEddystoneTLM::BLEEddystoneTLM(BLEAdvertisedDevice *advertisedDevice){ - char* payload = (char*)advertisedDevice->getPayload(); - for(int i = 0; i < advertisedDevice->getPayloadLength(); ++i){ - if(payload[i] == 0x16 && advertisedDevice->getPayloadLength() >= i+2+sizeof(m_eddystoneData) && payload[i+1] == 0xAA && payload[i+2] == 0xFE && payload[i+3] == 0x20){ - log_d("Eddystone TLM data frame starting at byte [%d]", i+3); - setData(std::string(payload+i+3, sizeof(m_eddystoneData))); - break; - } - } - _initHeadder(); -} - -String BLEEddystoneTLM::getData() { - return String((char*) &m_eddystoneData, sizeof(m_eddystoneData)); -} // getData - -BLEUUID BLEEddystoneTLM::getUUID() { - return beaconUUID; -} // getUUID - -uint8_t BLEEddystoneTLM::getVersion() { - return m_eddystoneData.version; -} // getVersion - -uint16_t BLEEddystoneTLM::getVolt() { - return ENDIAN_CHANGE_U16(m_eddystoneData.volt); -} // getVolt - -float BLEEddystoneTLM::getTemp() { - return EDDYSTONE_TEMP_U16_TO_FLOAT(m_eddystoneData.temp); -} // getTemp - -uint16_t BLEEddystoneTLM::getRawTemp() { - return ENDIAN_CHANGE_U16(m_eddystoneData.temp); -} // getRawTemp - -uint32_t BLEEddystoneTLM::getCount() { - return ENDIAN_CHANGE_U32(m_eddystoneData.advCount); -} // getCount - -uint32_t BLEEddystoneTLM::getTime() { - return (ENDIAN_CHANGE_U32(m_eddystoneData.tmil)) / 10; -} // getTime - -String BLEEddystoneTLM::getFrame(){ - String frame(BLEHeadder); - frame += String((char*) &m_eddystoneData, sizeof(m_eddystoneData)); - log_d("Compiled frame of length %d Bytes", frame.length()); - for(int i = 0; i < frame.length(); ++i){ - log_d("[%d]=0x%02X",i, frame[i]); - } - return frame; -} // getServiceData - -String BLEEddystoneTLM::toString() { - String out = ""; - uint32_t rawsec = ENDIAN_CHANGE_U32(m_eddystoneData.tmil); - char val[12]; - - out += "Version "; // + std::string(m_eddystoneData.version); - snprintf(val, sizeof(val), "%d", m_eddystoneData.version); - out += val; - out += "\n"; - out += "Battery Voltage "; // + ENDIAN_CHANGE_U16(m_eddystoneData.volt); - snprintf(val, sizeof(val), "%d", ENDIAN_CHANGE_U16(m_eddystoneData.volt)); - out += val; - out += " mV\n"; - - out += "Temperature "; - snprintf(val, sizeof(val), "%.2f", ((int16_t)ENDIAN_CHANGE_U16(m_eddystoneData.temp)) / 256.0f); - out += val; - out += " C\n"; - - out += "Adv. Count "; - snprintf(val, sizeof(val), "%d", ENDIAN_CHANGE_U32(m_eddystoneData.advCount)); - out += val; - out += "\n"; - - out += "Time in seconds "; - snprintf(val, sizeof(val), "%d", rawsec/10); - out += val; - out += "\n"; - - out += "Time "; - - snprintf(val, sizeof(val), "%04d", rawsec / 864000); - out += val; - out += "."; - - snprintf(val, sizeof(val), "%02d", (rawsec / 36000) % 24); - out += val; - out += ":"; - - snprintf(val, sizeof(val), "%02d", (rawsec / 600) % 60); - out += val; - out += ":"; - - snprintf(val, sizeof(val), "%02d", (rawsec / 10) % 60); - out += val; - out += "\n"; - - return out; -} // toString - -/** - * Set the raw data for the beacon record. - * Example: - * uint8_t *payload = advertisedDevice.getPayload(); - * eddystoneTLM.setData(std::string((char*)payload+22, advertisedDevice.getPayloadLength() - 22)); - * Note: the offset 22 works for current implementation of example BLE_EddystoneTLM Beacon.ino, however - * the position is not static and it is programmers responsibility to align the data. - * Data frame: - * | Field || Len | Type | UUID | EddyStone TLM | - * | Offset || 0 | 1 | 2 | 4 | - * | Len || 1 B | 1 B | 2 B | 14 B | - * | Data || ?? | ?? | 0xAA | 0xFE | ??? | - * - * EddyStone TLM frame: - * | Field || Type | Version | Batt mV | Beacon temp | Cnt since boot | Time since boot | - * | Offset || 0 | 1 | 2 | 4 | 6 | 10 | - * | Len || 1 B | 1 B | 2 B | 2 B | 4 B | 4 B | - * | Data || 0x20 | ?? | ?? | ?? | ?? | ?? | | | | | | | | | - */ -void BLEEddystoneTLM::setData(std::string data) { - if (data.length() != sizeof(m_eddystoneData)) { - log_e("Unable to set the data ... length passed in was %d and expected %d", data.length(), sizeof(m_eddystoneData)); - return; - } - memcpy(&m_eddystoneData, data.data(), data.length()); -} // setData - -void BLEEddystoneTLM::setUUID(BLEUUID l_uuid) { - beaconUUID = l_uuid; -} // setUUID - -void BLEEddystoneTLM::setVersion(uint8_t version) { - m_eddystoneData.version = version; -} // setVersion - -// Set voltage in ESP32 native Big endian and convert it to little endian used for BLE Frame -void BLEEddystoneTLM::setVolt(uint16_t volt) { - m_eddystoneData.volt = ENDIAN_CHANGE_U16(volt); -} // setVolt - -void BLEEddystoneTLM::setTemp(float temp) { - m_eddystoneData.temp = EDDYSTONE_TEMP_FLOAT_TO_U16(temp); -} // setTemp - -void BLEEddystoneTLM::setCount(uint32_t advCount) { - m_eddystoneData.advCount = advCount; -} // setCount - -void BLEEddystoneTLM::setTime(uint32_t tmil) { - m_eddystoneData.tmil = tmil; -} // setTime - -void BLEEddystoneTLM::_initHeadder(){ - BLEHeadder[0] = 0x02; // Len - BLEHeadder[1] = 0x01; // Type Flags - BLEHeadder[2] = 0x06; // GENERAL_DISC_MODE 0x02 | BR_EDR_NOT_SUPPORTED 0x04 - BLEHeadder[3] = 0x03; // Len - BLEHeadder[4] = 0x03; // Type 16-Bit UUID - BLEHeadder[5] = 0xAA; // Eddystone UUID 2 -> 0xFEAA LSB - BLEHeadder[6] = 0xFE; // Eddystone UUID 1 MSB - BLEHeadder[7] = 0x11; // Length of TLM Beacon Data is constant 17 B (not counting the length field itself) - BLEHeadder[8] = 0x16; // Type Service Data - BLEHeadder[9] = 0xAA; // Eddystone UUID 2 -> 0xFEAA LSB - BLEHeadder[10] = 0xFE; // Eddystone UUID 1 MSB - BLEHeadder[11] = 0x20; // Eddystone Frame Type - TLM -} - -#endif diff --git a/libraries/BLE/src/BLEEddystoneTLM.h b/libraries/BLE/src/BLEEddystoneTLM.h index 3981af4a4a9..f178bde586c 100644 --- a/libraries/BLE/src/BLEEddystoneTLM.h +++ b/libraries/BLE/src/BLEEddystoneTLM.h @@ -10,6 +10,9 @@ #include "soc/soc_caps.h" #if SOC_BLE_SUPPORTED +#include "sdkconfig.h" +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) + #include "BLEUUID.h" #include @@ -57,5 +60,6 @@ class BLEEddystoneTLM { } __attribute__((packed)) m_eddystoneData; }; // BLEEddystoneTLM +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* _BLEEddystoneTLM_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneURL.cpp b/libraries/BLE/src/BLEEddystoneURL.cpp index ddee8af0b30..b6097890c13 100644 --- a/libraries/BLE/src/BLEEddystoneURL.cpp +++ b/libraries/BLE/src/BLEEddystoneURL.cpp @@ -10,7 +10,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include "esp32-hal-log.h" #include "BLEEddystoneURL.h" diff --git a/libraries/BLE/src/BLEEddystoneURL.h b/libraries/BLE/src/BLEEddystoneURL.h index 92668eb6855..172dc52cde5 100644 --- a/libraries/BLE/src/BLEEddystoneURL.h +++ b/libraries/BLE/src/BLEEddystoneURL.h @@ -13,6 +13,9 @@ #include "soc/soc_caps.h" #if SOC_BLE_SUPPORTED +#include "sdkconfig.h" +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) + #include "BLEUUID.h" #include #include "esp_bt.h" @@ -57,5 +60,6 @@ class BLEEddystoneURL { char BLEHeadder[12]; }; // BLEEddystoneURL +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* _BLEEddystoneURL_H_ */ diff --git a/libraries/BLE/src/BLEEddystoneURL.h.orig b/libraries/BLE/src/BLEEddystoneURL.h.orig deleted file mode 100644 index 57722d0b769..00000000000 --- a/libraries/BLE/src/BLEEddystoneURL.h.orig +++ /dev/null @@ -1,66 +0,0 @@ -/* - * BLEEddystoneURL.cpp - * - * Created on: Mar 12, 2018 - * Author: pcbreflux - * Upgraded on: Feb 17, 2023 - * By: Tomas Pilny - * - */ - -#ifndef _BLEEddystoneURL_H_ -#define _BLEEddystoneURL_H_ -#include "BLEUUID.h" -#include -#include - -#define EDDYSTONE_URL_FRAME_TYPE 0x10 - -extern String EDDYSTONE_URL_PREFIX[]; -extern String EDDYSTONE_URL_SUFFIX[]; - -/** - * @brief Representation of a beacon. - * See: - * * https://github.com/google/eddystone - */ -class BLEEddystoneURL { -public: - BLEEddystoneURL(); - BLEEddystoneURL(BLEAdvertisedDevice *advertisedDevice); - std::string getData(); - String getFrame(); - BLEUUID getUUID(); - int8_t getPower(); - std::string getURL(); - String getPrefix(); - String getSuffix(); - std::string getDecodedURL(); - void setData(std::string data); - void setUUID(BLEUUID l_uuid); - void setPower(int8_t advertisedTxPower); - void setURL(std::string url); - int setSmartURL(String url); - -private: -<<<<<<< Updated upstream - uint16_t beaconUUID; - uint8_t lengthURL; - struct { - uint8_t frameType; - int8_t advertisedTxPower; - uint8_t url[18]; // 18 bytes: 1 byte for URL scheme + up to 17 bytes of URL - } __attribute__((packed)) m_eddystoneData; - -======= - uint8_t lengthURL; // Describes length of URL part including prefix and suffix - max 18 B (excluding TX power, frame type and preceding header) - struct { - int8_t advertisedTxPower; - uint8_t url[18]; // Byte [0] is for prefix. Last byte **can** contain suffix - } __attribute__((packed)) m_eddystoneData; - void _initHeadder(); - char BLEHeadder[12]; ->>>>>>> Stashed changes -}; // BLEEddystoneURL - -#endif /* _BLEEddystoneURL_H_ */ diff --git a/libraries/BLE/src/BLEHIDDevice.cpp b/libraries/BLE/src/BLEHIDDevice.cpp index 0873aa1049f..9ea8abd5a24 100644 --- a/libraries/BLE/src/BLEHIDDevice.cpp +++ b/libraries/BLE/src/BLEHIDDevice.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEHIDDevice.h" #include "BLE2904.h" @@ -252,5 +252,5 @@ BLEService *BLEHIDDevice::batteryService() { return m_batteryService; } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEHIDDevice.h b/libraries/BLE/src/BLEHIDDevice.h index a92a23c21d5..bbcd3403a59 100644 --- a/libraries/BLE/src/BLEHIDDevice.h +++ b/libraries/BLE/src/BLEHIDDevice.h @@ -12,7 +12,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLECharacteristic.h" #include "BLEService.h" @@ -75,6 +75,6 @@ class BLEHIDDevice { BLECharacteristic *m_batteryLevelCharacteristic; //0x2a19 }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* _BLEHIDDEVICE_H_ */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.cpp b/libraries/BLE/src/BLERemoteCharacteristic.cpp index 60d5108c1fc..b2d069ae481 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.cpp +++ b/libraries/BLE/src/BLERemoteCharacteristic.cpp @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -597,5 +597,5 @@ void BLERemoteCharacteristic::setAuth(esp_gatt_auth_req_t auth) { m_auth = auth; } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteCharacteristic.h b/libraries/BLE/src/BLERemoteCharacteristic.h index dc63a3bc1a6..53fc7d75352 100644 --- a/libraries/BLE/src/BLERemoteCharacteristic.h +++ b/libraries/BLE/src/BLERemoteCharacteristic.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -85,6 +85,6 @@ class BLERemoteCharacteristic { std::map m_descriptorMap; }; // BLERemoteCharacteristic -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTECHARACTERISTIC_H_ */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.cpp b/libraries/BLE/src/BLERemoteDescriptor.cpp index b6d654cf9ec..09419c62d30 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.cpp +++ b/libraries/BLE/src/BLERemoteDescriptor.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include "BLERemoteDescriptor.h" #include "GeneralUtils.h" @@ -208,5 +208,5 @@ void BLERemoteDescriptor::setAuth(esp_gatt_auth_req_t auth) { m_auth = auth; } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteDescriptor.h b/libraries/BLE/src/BLERemoteDescriptor.h index 94b11f1490a..e0072eb9adb 100644 --- a/libraries/BLE/src/BLERemoteDescriptor.h +++ b/libraries/BLE/src/BLERemoteDescriptor.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -52,6 +52,6 @@ class BLERemoteDescriptor { esp_gatt_auth_req_t m_auth; }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTEDESCRIPTOR_H_ */ diff --git a/libraries/BLE/src/BLERemoteService.cpp b/libraries/BLE/src/BLERemoteService.cpp index e4cc31dbb33..4de090ce884 100644 --- a/libraries/BLE/src/BLERemoteService.cpp +++ b/libraries/BLE/src/BLERemoteService.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include "BLERemoteService.h" @@ -330,5 +330,5 @@ String BLERemoteService::toString() { return res; } // toString -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLERemoteService.h b/libraries/BLE/src/BLERemoteService.h index 49845a0a1e8..d3fb648b91c 100644 --- a/libraries/BLE/src/BLERemoteService.h +++ b/libraries/BLE/src/BLERemoteService.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include @@ -80,6 +80,6 @@ class BLERemoteService { uint16_t m_endHandle; // The ending handle of this service. }; // BLERemoteService -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEREMOTESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEScan.cpp b/libraries/BLE/src/BLEScan.cpp index 0a99b46c61d..0595f331386 100644 --- a/libraries/BLE/src/BLEScan.cpp +++ b/libraries/BLE/src/BLEScan.cpp @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include @@ -497,5 +497,5 @@ void BLEScan::clearResults() { m_scanResults.m_vectorAdvertisedDevices.clear(); } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEScan.h b/libraries/BLE/src/BLEScan.h index 080e3b803b2..b67980d8c46 100644 --- a/libraries/BLE/src/BLEScan.h +++ b/libraries/BLE/src/BLEScan.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include // #include @@ -116,6 +116,6 @@ class BLEPeriodicScanCallbacks { virtual void onStop(esp_bt_status_t status) {} }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESCAN_H_ */ diff --git a/libraries/BLE/src/BLESecurity.cpp b/libraries/BLE/src/BLESecurity.cpp index 34fc3e69e9e..a12054afee6 100644 --- a/libraries/BLE/src/BLESecurity.cpp +++ b/libraries/BLE/src/BLESecurity.cpp @@ -10,7 +10,7 @@ #include "BLESecurity.h" #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) BLESecurity::BLESecurity() {} @@ -91,5 +91,5 @@ char *BLESecurity::esp_key_type_to_str(esp_ble_key_type_t key_type) { return key_str; } // esp_key_type_to_str -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLESecurity.h b/libraries/BLE/src/BLESecurity.h index 2e3a44b42d1..4ea4ad670d2 100644 --- a/libraries/BLE/src/BLESecurity.h +++ b/libraries/BLE/src/BLESecurity.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include @@ -71,6 +71,6 @@ class BLESecurityCallbacks { virtual bool onConfirmPIN(uint32_t pin) = 0; }; // BLESecurityCallbacks -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif // COMPONENTS_CPP_UTILS_BLESECURITY_H_ diff --git a/libraries/BLE/src/BLEServer.cpp b/libraries/BLE/src/BLEServer.cpp index a338cf61451..f57ab789adc 100644 --- a/libraries/BLE/src/BLEServer.cpp +++ b/libraries/BLE/src/BLEServer.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include "GeneralUtils.h" @@ -423,5 +423,5 @@ void BLEServer::disconnect(uint16_t connId) { esp_ble_gatts_close(m_gatts_if, connId); } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEServer.h b/libraries/BLE/src/BLEServer.h index aa10f2210fa..383e98751bb 100644 --- a/libraries/BLE/src/BLEServer.h +++ b/libraries/BLE/src/BLEServer.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -146,6 +146,6 @@ class BLEServerCallbacks { virtual void onMtuChanged(BLEServer *pServer, esp_ble_gatts_cb_param_t *param); }; // BLEServerCallbacks -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVER_H_ */ diff --git a/libraries/BLE/src/BLEService.cpp b/libraries/BLE/src/BLEService.cpp index 58c5d4eb9c3..e1720f191ee 100644 --- a/libraries/BLE/src/BLEService.cpp +++ b/libraries/BLE/src/BLEService.cpp @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include @@ -390,5 +390,5 @@ BLEServer *BLEService::getServer() { return m_pServer; } // getServer -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEService.h b/libraries/BLE/src/BLEService.h index 61f867b2a02..d45272487e8 100644 --- a/libraries/BLE/src/BLEService.h +++ b/libraries/BLE/src/BLEService.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include @@ -94,6 +94,6 @@ class BLEService { //void setService(esp_gatt_srvc_id_t srvc_id); }; // BLEService -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLESERVICE_H_ */ diff --git a/libraries/BLE/src/BLEServiceMap.cpp b/libraries/BLE/src/BLEServiceMap.cpp index 30a9db499f1..c311185e24f 100644 --- a/libraries/BLE/src/BLEServiceMap.cpp +++ b/libraries/BLE/src/BLEServiceMap.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include "BLEService.h" @@ -133,5 +133,5 @@ int BLEServiceMap::getRegisteredServiceCount() { return m_handleMap.size(); } -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUUID.cpp b/libraries/BLE/src/BLEUUID.cpp index 8074ea82f8f..4ae2b8279f3 100644 --- a/libraries/BLE/src/BLEUUID.cpp +++ b/libraries/BLE/src/BLEUUID.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include #include #include @@ -385,5 +385,5 @@ String BLEUUID::toString() { return res; } // toString -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUUID.h b/libraries/BLE/src/BLEUUID.h index 1be013942e3..14561eb36b3 100644 --- a/libraries/BLE/src/BLEUUID.h +++ b/libraries/BLE/src/BLEUUID.h @@ -12,7 +12,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if CONFIG_BLUEDROID_ENABLED +#if CONFIG_BLUEDROID_ENABLED || defined(CONFIG_NIMBLE_ENABLED) #include /** @@ -39,6 +39,6 @@ class BLEUUID { bool m_valueSet = false; // Is there a value set for this instance. }; // BLEUUID -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEUUID_H_ */ diff --git a/libraries/BLE/src/BLEUtils.cpp b/libraries/BLE/src/BLEUtils.cpp index 05e1e32deed..74e5936e5dc 100644 --- a/libraries/BLE/src/BLEUtils.cpp +++ b/libraries/BLE/src/BLEUtils.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEAddress.h" #include "BLEClient.h" #include "BLEUtils.h" @@ -1817,5 +1817,5 @@ const char *BLEUtils::searchEventTypeToString(esp_gap_search_evt_t searchEvt) { } } // searchEventTypeToString -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEUtils.h b/libraries/BLE/src/BLEUtils.h index 7c6f58d284b..e823a4c1194 100644 --- a/libraries/BLE/src/BLEUtils.h +++ b/libraries/BLE/src/BLEUtils.h @@ -11,7 +11,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include // ESP32 BLE #include // ESP32 BLE #include // ESP32 BLE @@ -54,6 +54,6 @@ class BLEUtils { static const char *searchEventTypeToString(esp_gap_search_evt_t searchEvt); }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEUTILS_H_ */ diff --git a/libraries/BLE/src/BLEValue.cpp b/libraries/BLE/src/BLEValue.cpp index 26811c985ac..2ed2008aa15 100644 --- a/libraries/BLE/src/BLEValue.cpp +++ b/libraries/BLE/src/BLEValue.cpp @@ -8,7 +8,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) #include "BLEValue.h" #include "esp32-hal-log.h" @@ -120,5 +120,5 @@ void BLEValue::setValue(uint8_t *pData, size_t length) { m_value = String((char *)pData, length); } // setValue -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ diff --git a/libraries/BLE/src/BLEValue.h b/libraries/BLE/src/BLEValue.h index f9c91bdcd4e..b4c1ac33387 100644 --- a/libraries/BLE/src/BLEValue.h +++ b/libraries/BLE/src/BLEValue.h @@ -12,7 +12,7 @@ #if SOC_BLE_SUPPORTED #include "sdkconfig.h" -#if defined(CONFIG_BLUEDROID_ENABLED) +#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED) /** * @brief The model of a %BLE value. @@ -37,6 +37,6 @@ class BLEValue { uint16_t m_readOffset; String m_value; }; -#endif /* CONFIG_BLUEDROID_ENABLED */ +#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */ #endif /* SOC_BLE_SUPPORTED */ #endif /* COMPONENTS_CPP_UTILS_BLEVALUE_H_ */