Rename and guard Bluedroid Files

Author: lucasssvaz

CMakeLists.txt

@@ -296,32 +296,32 @@ set(ARDUINO_LIBRARY_Zigbee_SRCS
 set(ARDUINO_LIBRARY_BLE_SRCS
   libraries/BLE/src/BLE2901.cpp
   libraries/BLE/src/BLE2902.cpp
-  libraries/BLE/src/BLE2904.cpp
-  libraries/BLE/src/BLEAddress.cpp
-  libraries/BLE/src/BLEAdvertisedDevice.cpp
-  libraries/BLE/src/BLEAdvertising.cpp
-  libraries/BLE/src/BLEBeacon.cpp
-  libraries/BLE/src/BLECharacteristic.cpp
-  libraries/BLE/src/BLECharacteristicMap.cpp
-  libraries/BLE/src/BLEClient.cpp
-  libraries/BLE/src/BLEDescriptor.cpp
-  libraries/BLE/src/BLEDescriptorMap.cpp
-  libraries/BLE/src/BLEDevice.cpp
-  libraries/BLE/src/BLEEddystoneTLM.cpp
-  libraries/BLE/src/BLEEddystoneURL.cpp
-  libraries/BLE/src/BLEExceptions.cpp
-  libraries/BLE/src/BLEHIDDevice.cpp
-  libraries/BLE/src/BLERemoteCharacteristic.cpp
-  libraries/BLE/src/BLERemoteDescriptor.cpp
-  libraries/BLE/src/BLERemoteService.cpp
-  libraries/BLE/src/BLEScan.cpp
-  libraries/BLE/src/BLESecurity.cpp
-  libraries/BLE/src/BLEServer.cpp
-  libraries/BLE/src/BLEService.cpp
-  libraries/BLE/src/BLEServiceMap.cpp
-  libraries/BLE/src/BLEUtils.cpp
-  libraries/BLE/src/BLEUUID.cpp
-  libraries/BLE/src/BLEValue.cpp
+  libraries/BLE/src/Bluedroid2904.cpp
+  libraries/BLE/src/BluedroidAddress.cpp
+  libraries/BLE/src/BluedroidAdvertisedDevice.cpp
+  libraries/BLE/src/BluedroidAdvertising.cpp
+  libraries/BLE/src/BluedroidBeacon.cpp
+  libraries/BLE/src/BluedroidCharacteristic.cpp
+  libraries/BLE/src/BluedroidCharacteristicMap.cpp
+  libraries/BLE/src/BluedroidClient.cpp
+  libraries/BLE/src/BluedroidDescriptor.cpp
+  libraries/BLE/src/BluedroidDescriptorMap.cpp
+  libraries/BLE/src/BluedroidDevice.cpp
+  libraries/BLE/src/BluedroidEddystoneTLM.cpp
+  libraries/BLE/src/BluedroidEddystoneURL.cpp
+  libraries/BLE/src/BluedroidExceptions.cpp
+  libraries/BLE/src/BluedroidHIDDevice.cpp
+  libraries/BLE/src/BluedroidRemoteCharacteristic.cpp
+  libraries/BLE/src/BluedroidRemoteDescriptor.cpp
+  libraries/BLE/src/BluedroidRemoteService.cpp
+  libraries/BLE/src/BluedroidScan.cpp
+  libraries/BLE/src/BluedroidSecurity.cpp
+  libraries/BLE/src/BluedroidServer.cpp
+  libraries/BLE/src/BluedroidService.cpp
+  libraries/BLE/src/BluedroidServiceMap.cpp
+  libraries/BLE/src/BluedroidUtils.cpp
+  libraries/BLE/src/BluedroidUUID.cpp
+  libraries/BLE/src/BluedroidValue.cpp
   libraries/BLE/src/FreeRTOS.cpp
   libraries/BLE/src/GeneralUtils.cpp
   )
@@ -357,6 +357,10 @@ if(NOT CONFIG_ARDUINO_SELECTIVE_COMPILATION OR CONFIG_ARDUINO_SELECTIVE_OpenThre
   endif()
 endif()
 
+if(IDF_TARGET NOT STREQUAL "esp32") # Remove this when Bluedroid support is dropped
+  list(APPEND requires esp_nimble)
+endif()
+
 if(IDF_TARGET STREQUAL "esp32p4")
   list(APPEND requires esp_driver_touch_sens)
 endif()

libraries/BLE/src/BLE2901.cpp

@@ -19,22 +19,30 @@
 #if SOC_BLE_SUPPORTED
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BLUEDROID_ENABLED)
+#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
 
 #include "BLE2901.h"
+#include "BLEUUID.h"
+
+#ifdef CONFIG_NIMBLE_ENABLED
+#include "host/ble_att.h" // for Nimble
+#else
+#include "esp_gatt_defs.h" // for Bluedroid
+#define BLE_ATT_ATTR_MAX_LEN ESP_GATT_MAX_ATTR_LEN // for Bluedroid
+#endif
 
 BLE2901::BLE2901() : BLEDescriptor(BLEUUID((uint16_t)0x2901)) {}  // BLE2901
 
 /**
  * @brief Set the Characteristic User Description
  */
 void BLE2901::setDescription(String userDesc) {
-  if (userDesc.length() > ESP_GATT_MAX_ATTR_LEN) {
-    log_e("Size %d too large, must be no bigger than %d", userDesc.length(), ESP_GATT_MAX_ATTR_LEN);
+  if (userDesc.length() > BLE_ATT_ATTR_MAX_LEN) {
+    log_e("Size %d too large, must be no bigger than %d", userDesc.length(), BLE_ATT_ATTR_MAX_LEN);
     return;
   }
   setValue(userDesc);
 }
 
-#endif
+#endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */

libraries/BLE/src/BLE2901.h

@@ -22,16 +22,17 @@
 #if SOC_BLE_SUPPORTED
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BLUEDROID_ENABLED)
+#if defined(CONFIG_BLUEDROID_ENABLED) || defined(CONFIG_NIMBLE_ENABLED)
 
 #include "BLEDescriptor.h"
 
+[[deprecated("This class is deprecated and will be removed in a future release. Use BLEDescriptor instead.")]]
 class BLE2901 : public BLEDescriptor {
 public:
   BLE2901();
   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_ */

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"
 

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"
 
@@ -23,7 +23,15 @@
  * See also:
  * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.client_characteristic_configuration.xml
  */
+#if defined(CONFIG_NIMBLE_ENABLED)
+class [[deprecated(" \
+NimBLE automatically creates the 0x2902 descriptor if a characteristic has a notification or indication property assigned to it. \
+BLECharacteristicCallbacks::onSubscribe was added to handle callback functionality and the client subscription status is handled internally. \
+Attempting to create a 0x2902 descriptor will trigger a warning message and flag it internally as removed and will not be functional. \
+")]] BLE2902 : public BLEDescriptor {
+#else
 class BLE2902 : public BLEDescriptor {
+#endif
 public:
   BLE2902();
   bool getNotifications();
@@ -33,6 +41,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_ */

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)
+
 #include "BLEUUID.h"
 /**
  * @brief Representation of a beacon.
@@ -44,5 +47,6 @@ class BLEBeacon {
   void setSignalPower(int8_t signalPower);
 };  // BLEBeacon
 
+#endif /* CONFIG_BLUEDROID_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */
 #endif /* COMPONENTS_CPP_UTILS_BLEBEACON_H_ */

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)
+
 #include "BLEUUID.h"
 #include <BLEAdvertisedDevice.h>
 
@@ -57,5 +60,6 @@ class BLEEddystoneTLM {
   } __attribute__((packed)) m_eddystoneData;
 };  // BLEEddystoneTLM
 
+#endif /* CONFIG_BLUEDROID_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */
 #endif /* _BLEEddystoneTLM_H_ */

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)
+
 #include "BLEUUID.h"
 #include <BLEAdvertisedDevice.h>
 #include "esp_bt.h"
@@ -57,5 +60,6 @@ class BLEEddystoneURL {
   char BLEHeadder[12];
 };  // BLEEddystoneURL
 
+#endif /* CONFIG_BLUEDROID_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */
 #endif /* _BLEEddystoneURL_H_ */

libraries/BLE/src/BLEExceptions.h

@@ -11,6 +11,7 @@
 #if SOC_BLE_SUPPORTED
 
 #include "sdkconfig.h"
+#if defined(CONFIG_BLUEDROID_ENABLED)
 
 #if CONFIG_CXX_EXCEPTIONS != 1
 #error "C++ exception handling must be enabled within make menuconfig. See Compiler Options > Enable C++ Exceptions."
@@ -30,5 +31,6 @@ class BLEUuidNotFoundException : public std::exception {
   }
 };
 
+#endif /* CONFIG_BLUEDROID_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */
 #endif /* COMPONENTS_CPP_UTILS_BLEEXCEPTIONS_H_ */