Add API function to set advertising and scan response data

polldo · polldo · commit d27fff5fcc39 · 2020-10-16T12:49:58.000+02:00
diff --git a/src/BLEAdvertisingData.cpp b/src/BLEAdvertisingData.cpp
@@ -63,6 +63,45 @@ int BLEAdvertisingData::availableForWrite()
   return available; 
 }
 
+void BLEAdvertisingData::clear()
+{
+  _remainingLength = MAX_AD_DATA_LENGTH;
+  _rawData = NULL;
+  _rawDataLength = 0;
+  _hasFlags = false;
+  _localName = NULL;
+  _manufacturerData = NULL;
+  _manufacturerDataLength = 0;
+  _hasManufacturerCompanyId = false;
+  _advertisedServiceUuid = NULL;
+  _serviceData = NULL;
+  _serviceDataLength = 0;
+}
+
+void BLEAdvertisingData::copy(const BLEAdvertisingData& adv)
+{
+  _remainingLength = adv._remainingLength;
+  _rawData = adv._rawData;
+  _rawDataLength = adv._rawDataLength;
+  _flags = adv._flags;
+  _hasFlags = adv._hasFlags;
+  _localName = adv._localName;
+  _manufacturerData = adv._manufacturerData;
+  _manufacturerDataLength = adv._manufacturerDataLength;
+  _manufacturerCompanyId = adv._manufacturerCompanyId;
+  _hasManufacturerCompanyId = adv._hasManufacturerCompanyId;
+  _advertisedServiceUuid = adv._advertisedServiceUuid;
+  _serviceDataUuid = adv._serviceDataUuid;
+  _serviceData = adv._serviceData;
+  _serviceDataLength = adv._serviceDataLength;
+}
+
+BLEAdvertisingData& BLEAdvertisingData::operator=(const BLEAdvertisingData &other) 
+{
+  copy(other);
+  return *this;
+}
+
 bool BLEAdvertisingData::setAdvertisedServiceUuid(const char* advertisedServiceUuid)
 {
   BLEUuid uuid(advertisedServiceUuid);
diff --git a/src/BLEAdvertisingData.h b/src/BLEAdvertisingData.h
@@ -52,6 +52,9 @@ class BLEAdvertisingData {
   virtual ~BLEAdvertisingData();
 
   int availableForWrite(); 
+  void clear();
+  void copy(const BLEAdvertisingData& adv);
+  BLEAdvertisingData& operator=(const BLEAdvertisingData &other);
 
   bool setAdvertisedService(const BLEService& service);
   bool setAdvertisedServiceUuid(const char* advertisedServiceUuid);
diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp
@@ -214,6 +214,26 @@ void BLELocalDevice::setLocalName(const char *localName)
   _scanResponseData.setLocalName(localName);  
 }
 
+void BLELocalDevice::setAdvertisingData(BLEAdvertisingData& advertisingData)
+{
+  _advertisingData = advertisingData;
+}
+
+void BLELocalDevice::setScanResponseData(BLEAdvertisingData& scanResponseData)
+{
+  _scanResponseData = scanResponseData;
+}
+
+BLEAdvertisingData& BLELocalDevice::getAdvertisingData()
+{
+  return _advertisingData;
+}
+
+BLEAdvertisingData& BLELocalDevice::getScanResponseData()
+{
+  return _scanResponseData;
+}
+
 void BLELocalDevice::setDeviceName(const char* deviceName)
 {
   GATT.setDeviceName(deviceName);
diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h
@@ -49,6 +49,9 @@ class BLELocalDevice {
   void setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength);
   void setLocalName(const char *localName);
 
+  void setAdvertisingData(BLEAdvertisingData& advertisingData);
+  void setScanResponseData(BLEAdvertisingData& scanResponseData);
+
   void setDeviceName(const char* deviceName);
   void setAppearance(uint16_t appearance);
 
@@ -76,6 +79,10 @@ class BLELocalDevice {
 
   void debug(Stream& stream);
   void noDebug();
+  
+protected:
+  BLEAdvertisingData& getAdvertisingData();
+  BLEAdvertisingData& getScanResponseData();
 
 private:
   BLEAdvertisingData _advertisingData;
