Change ownership of local advertising data from GAP to BLELocalDevice

Author: polldo

src/BLEAdvertisingData.cpp

@@ -96,12 +96,12 @@ bool BLEAdvertisingData::updateData()
   return success;
 }
 
-uint8_t* BLEAdvertisingData::getData()
+uint8_t* BLEAdvertisingData::data() 
 {
   return _data;
 }
 
-int BLEAdvertisingData::getDataLength()
+int BLEAdvertisingData::dataLength() const
 {
   return _dataLength;
 }

src/BLEAdvertisingData.h

@@ -48,9 +48,8 @@ class BLEAdvertisingData {
   void setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length);
 
   bool updateData();
-
-  uint8_t* getData();
-  int getDataLength();
+  uint8_t* data();
+  int dataLength() const;
 
 private:
   bool addAdvertisedServiceUuid(const char* advertisedServiceUuid);

src/local/BLELocalCharacteristic.cpp

@@ -18,6 +18,7 @@
 */
 
 #include <Arduino.h>
+#include "BLELocalDevice.h"
 
 #include "utility/ATT.h"
 #include "utility/GAP.h"
@@ -121,10 +122,10 @@ int BLELocalCharacteristic::writeValue(const uint8_t value[], int length)
   if (_broadcast) {
     uint16_t serviceUuid = GATT.serviceUuidForCharacteristic(this);
 
-    GAP.setAdvertisedServiceData(serviceUuid, value, length);
+    BLE.setAdvertisedServiceData(serviceUuid, value, length);
 
     if (!ATT.connected() && GAP.advertising()) {
-      GAP.advertise();
+      BLE.advertise();
     }
   }
 

src/local/BLELocalDevice.cpp

@@ -185,27 +185,32 @@ int BLELocalDevice::rssi()
 
 void BLELocalDevice::setAdvertisedServiceUuid(const char* advertisedServiceUuid)
 {
-  GAP.setAdvertisedServiceUuid(advertisedServiceUuid);
+  _advertisingData.setAdvertisedServiceUuid(advertisedServiceUuid);
 }
 
 void BLELocalDevice::setAdvertisedService(const BLEService& service)
 {
   setAdvertisedServiceUuid(service.uuid());
 }
 
+void BLELocalDevice::setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length)
+{
+  _advertisingData.setAdvertisedServiceData(uuid, data, length);
+}
+
 void BLELocalDevice::setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength)
 {
-  GAP.setManufacturerData(manufacturerData, manufacturerDataLength);
+  _advertisingData.setManufacturerData(manufacturerData, manufacturerDataLength);
 }
 
 void BLELocalDevice::setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength)
 {
-  GAP.setManufacturerData(companyId, manufacturerData, manufacturerDataLength);
+  _advertisingData.setManufacturerData(companyId, manufacturerData, manufacturerDataLength);
 }
 
 void BLELocalDevice::setLocalName(const char *localName)
 {
-  GAP.setLocalName(localName);
+  _scanResponseData.setLocalName(localName);  
 }
 
 void BLELocalDevice::setDeviceName(const char* deviceName)
@@ -225,7 +230,10 @@ void BLELocalDevice::addService(BLEService& service)
 
 int BLELocalDevice::advertise()
 {
-  return GAP.advertise();
+  _advertisingData.updateData();
+  _scanResponseData.updateData();
+  return GAP.advertise( _advertisingData.data(), _advertisingData.dataLength(), 
+                        _scanResponseData.data(), _scanResponseData.dataLength());
 }
 
 void BLELocalDevice::stopAdvertise()

src/local/BLELocalDevice.h

@@ -22,6 +22,7 @@
 
 #include "BLEDevice.h"
 #include "BLEService.h"
+#include "BLEAdvertisingData.h"
 
 class BLELocalDevice {
 public:
@@ -43,6 +44,7 @@ class BLELocalDevice {
 
   void setAdvertisedServiceUuid(const char* advertisedServiceUuid);
   void setAdvertisedService(const BLEService& service);
+  void setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length);
   void setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength);
   void setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength);
   void setLocalName(const char *localName);
@@ -76,6 +78,8 @@ class BLELocalDevice {
   void noDebug();
 
 private:
+  BLEAdvertisingData _advertisingData;
+  BLEAdvertisingData _scanResponseData;
 };
 
 extern BLELocalDevice BLE;

src/utility/GAP.cpp

@@ -41,61 +41,28 @@ GAPClass::~GAPClass()
 {
 }
 
-void GAPClass::setAdvertisedServiceUuid(const char* advertisedServiceUuid)
-{
-  _advertisingData.setAdvertisedServiceUuid(advertisedServiceUuid);
-}
-
-void GAPClass::setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength)
-{
-  _advertisingData.setManufacturerData(manufacturerData, manufacturerDataLength);
-}
-
-void GAPClass::setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength)
-{
-  _advertisingData.setManufacturerData(companyId, manufacturerData, manufacturerDataLength);
-}
-
-void GAPClass::setLocalName(const char *localName)
-{
-  _scanResponseData.setLocalName(localName);  
-}
-
-void GAPClass::setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length)
-{
-  _advertisingData.setAdvertisedServiceData(uuid, data, length);
-}
-
 bool GAPClass::advertising()
 {
   return _advertising;
 }
 
-int GAPClass::advertise()
+int GAPClass::advertise(uint8_t* advData, uint8_t advDataLen, uint8_t* scanData, uint8_t scanDataLen)
 {
   uint8_t directBdaddr[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-  _advertisingData.updateData();
-  _scanResponseData.updateData();
-
-  uint8_t scanLength = _scanResponseData.getDataLength();
-  uint8_t type = (_connectable) ? GAP_ADV_IND : (scanLength ? GAP_ADV_SCAN_IND : GAP_ADV_NONCONN_IND);
+  uint8_t type = (_connectable) ? GAP_ADV_IND : (scanDataLen ? GAP_ADV_SCAN_IND : GAP_ADV_NONCONN_IND);
 
   stopAdvertise();
 
   if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, 0x00, 0x00, directBdaddr, 0x07, 0) != 0) {
     return 0;
   }
 
-  uint8_t* advertisingData = _advertisingData.getData();
-  uint8_t advertisingDataLen = _advertisingData.getDataLength();
-  if (HCI.leSetAdvertisingData(advertisingDataLen, advertisingData) != 0) {
+  if (HCI.leSetAdvertisingData(advDataLen, advData) != 0) {
     return 0;
   }
 
-  uint8_t* scanResponseData = _scanResponseData.getData();
-  uint8_t scanResponseDataLen = _scanResponseData.getDataLength();
-  if (HCI.leSetScanResponseData(scanResponseDataLen, scanResponseData) != 0) {
+  if (HCI.leSetScanResponseData(scanDataLen, scanData) != 0) {
     return 0;
   }
 

src/utility/GAP.h

@@ -22,21 +22,15 @@
 
 #include "utility/BLELinkedList.h"
 
-#include "BLEAdvertisingData.h"
 #include "BLEDevice.h"
 
 class GAPClass {
 public:
   GAPClass();
   virtual ~GAPClass();
 
-  void setAdvertisedServiceUuid(const char* advertisedServiceUuid);
-  void setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength);
-  void setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength);
-  void setLocalName(const char *localName);
-
   bool advertising();
-  int advertise();
+  int advertise(uint8_t* advData, uint8_t advDataLength, uint8_t* scanData, uint8_t scanDataLength);
   void stopAdvertise();
 
   int scan(bool withDuplicates);
@@ -51,11 +45,6 @@ class GAPClass {
 
   void setEventHandler(BLEDeviceEvent event, BLEDeviceEventHandler eventHandler);
 
-protected:
-  friend class BLELocalCharacteristic;
-
-  void setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length);
-
 protected:
   friend class HCIClass;
 
@@ -78,9 +67,6 @@ class GAPClass {
   String _scanNameFilter;
   String _scanUuidFilter;
   String _scanAddressFilter;
-
-  BLEAdvertisingData _advertisingData;
-  BLEAdvertisingData _scanResponseData;
 };
 
 extern GAPClass GAP;