Change singleton definition.

This change is needed for mocking BLE classes in the CI environment

Author: polldo

src/local/BLELocalDevice.cpp

@@ -343,4 +343,5 @@ void BLELocalDevice::noDebug()
   HCI.noDebug();
 }
 
-BLELocalDevice BLE;
+BLELocalDevice BLEObj;
+BLELocalDevice& BLE = BLEObj;

src/local/BLELocalDevice.h

@@ -89,6 +89,6 @@ class BLELocalDevice {
   BLEAdvertisingData _scanResponseData;
 };
 
-extern BLELocalDevice BLE;
+extern BLELocalDevice& BLE;
 
 #endif

src/utility/ATT.cpp

@@ -1687,4 +1687,5 @@ void ATTClass::writeCmd(uint16_t connectionHandle, uint16_t handle, const uint8_
   sendReq(connectionHandle, &writeReq, 3 + dataLen, NULL);
 }
 
-ATTClass ATT;
+ATTClass ATTObj;
+ATTClass& ATT = ATTObj;

src/utility/ATT.h

@@ -137,6 +137,6 @@ class ATTClass {
   BLEDeviceEventHandler _eventHandlers[2];
 };
 
-extern ATTClass ATT;
+extern ATTClass& ATT;
 
 #endif

src/utility/GAP.cpp

@@ -258,4 +258,5 @@ bool GAPClass::matchesScanFilter(const BLEDevice& device)
   return true;
 }
 
-GAPClass GAP;
+GAPClass GAPObj;
+GAPClass& GAP = GAPObj;

src/utility/GAP.h

@@ -69,6 +69,6 @@ class GAPClass {
   String _scanAddressFilter;
 };
 
-extern GAPClass GAP;
+extern GAPClass& GAP;
 
 #endif

src/utility/GATT.cpp

@@ -172,4 +172,5 @@ void GATTClass::clearAttributes()
   _attributes.clear();
 }
 
-GATTClass GATT;
+GATTClass GATTObj;
+GATTClass& GATT = GATTObj;

src/utility/GATT.h

@@ -67,6 +67,6 @@ class GATTClass {
   BLELocalCharacteristic*       _servicesChangedCharacteristic;
 };
 
-extern GATTClass GATT;
+extern GATTClass& GATT;
 
 #endif

src/utility/HCI.cpp

@@ -686,4 +686,5 @@ void HCIClass::dumpPkt(const char* prefix, uint8_t plen, uint8_t pdata[])
   }
 }
 
-HCIClass HCI;
+HCIClass HCIObj;
+HCIClass& HCI = HCIObj;

src/utility/HCI.h

@@ -96,6 +96,6 @@ class HCIClass {
   uint8_t _aclPktBuffer[255];
 };
 
-extern HCIClass HCI;
+extern HCIClass& HCI;
 
 #endif

src/utility/L2CAPSignaling.cpp

@@ -146,4 +146,5 @@ void L2CAPSignalingClass::connectionParameterUpdateResponse(uint16_t /*handle*/,
 {
 }
 
-L2CAPSignalingClass L2CAPSignaling;
+L2CAPSignalingClass L2CAPSignalingObj;
+L2CAPSignalingClass& L2CAPSignaling = L2CAPSignalingObj;

src/utility/L2CAPSignaling.h

@@ -49,6 +49,6 @@ class L2CAPSignalingClass {
   uint16_t _maxInterval;
 };
 
-extern L2CAPSignalingClass L2CAPSignaling;
+extern L2CAPSignalingClass& L2CAPSignaling;
 
 #endif