Use multiple-data style also for scan data

Author: Jaakko Kangasharju

src/BLEDevice.h

@@ -11,11 +11,11 @@
 #include "BLERemoteCharacteristic.h"
 #include "BLERemoteService.h"
 
-struct BLEAdvertisementData
+struct BLEEirData
 {
   unsigned char length;
   unsigned char type;
-  unsigned char data[BLE_ADVERTISEMENT_DATA_MAX_VALUE_LENGTH];
+  unsigned char data[BLE_EIR_DATA_MAX_VALUE_LENGTH];
 };
 
 class BLEDevice;
@@ -57,10 +57,9 @@ class BLEDevice
     void setBondStore(BLEBondStore& bondStore);
 
     virtual void begin(unsigned char /*advertisementDataSize*/,
-                BLEAdvertisementData * /*advertisementData*/,
-                unsigned char /*scanDataType*/,
-                unsigned char /*scanDataLength*/,
-                const unsigned char* /*scanData*/,
+                BLEEirData * /*advertisementData*/,
+                unsigned char /*scanDataSize*/,
+                BLEEirData * /*scanData*/,
                 BLELocalAttribute** /*localAttributes*/,
                 unsigned char /*numLocalAttributes*/,
                 BLERemoteAttribute** /*remoteAttributes*/,

src/BLEDeviceLimits.h

@@ -22,13 +22,15 @@
 
 #define BLE_ADVERTISEMENT_DATA_MAX_VALUE_LENGTH    26
 #define BLE_SCAN_DATA_MAX_VALUE_LENGTH             29
+#define BLE_EIR_DATA_MAX_VALUE_LENGTH              29
 #define BLE_ATTRIBUTE_MAX_VALUE_LENGTH             20
 #define BLE_REMOTE_ATTRIBUTE_MAX_VALUE_LENGTH      22
 
 #else
 
 #define BLE_ADVERTISEMENT_DATA_MAX_VALUE_LENGTH    20
 #define BLE_SCAN_DATA_MAX_VALUE_LENGTH             20
+#define BLE_EIR_DATA_MAX_VALUE_LENGTH              20
 #define BLE_ATTRIBUTE_MAX_VALUE_LENGTH             20
 #define BLE_REMOTE_ATTRIBUTE_MAX_VALUE_LENGTH      22
 

src/BLEPeripheral.cpp

@@ -69,13 +69,10 @@ BLEPeripheral::~BLEPeripheral() {
 }
 
 void BLEPeripheral::begin() {
-  unsigned char scanDataType = 0;
-
   unsigned char advertisementDataSize = 0;
-  unsigned char scanDataLength = 0;
 
-  BLEAdvertisementData advertisementData[3];
-  unsigned char scanData[BLE_SCAN_DATA_MAX_VALUE_LENGTH];
+  BLEEirData advertisementData[3];
+  BLEEirData scanData = { 0 };
 
   unsigned char remainingAdvertisementDataLength = BLE_ADVERTISEMENT_DATA_MAX_VALUE_LENGTH + 2;
   if (this->_serviceSolicitationUuid){
@@ -121,15 +118,15 @@ void BLEPeripheral::begin() {
 
   if (this->_localName){
     unsigned char localNameLength = strlen(this->_localName);
-    scanDataLength = localNameLength;
+    scanData.length = localNameLength;
 
-    if (scanDataLength > sizeof(scanData)) {
-      scanDataLength = sizeof(scanData);
+    if (scanData.length > BLE_SCAN_DATA_MAX_VALUE_LENGTH) {
+      scanData.length = BLE_SCAN_DATA_MAX_VALUE_LENGTH;
     }
 
-    scanDataType = (localNameLength > scanDataLength) ? 0x08 : 0x09;
+    scanData.type = (localNameLength > scanData.length) ? 0x08 : 0x09;
 
-    memcpy(scanData, this->_localName, scanDataLength);
+    memcpy(scanData.data, this->_localName, scanData.length);
   }
 
   if (this->_localAttributes == NULL) {
@@ -160,7 +157,7 @@ void BLEPeripheral::begin() {
   }
 
   this->_device->begin(advertisementDataSize, advertisementData,
-                        scanDataType, scanDataLength, scanData,
+                        scanData.length > 0 ? 1 : 0, &scanData,
                         this->_localAttributes, this->_numLocalAttributes,
                         this->_remoteAttributes, this->_numRemoteAttributes);
 

src/nRF51822.cpp

@@ -77,10 +77,9 @@ nRF51822::~nRF51822() {
 }
 
 void nRF51822::begin(unsigned char advertisementDataSize,
-                      BLEAdvertisementData *advertisementData,
-                      unsigned char scanDataType,
-                      unsigned char scanDataLength,
-                      const unsigned char* scanData,
+                      BLEEirData *advertisementData,
+                      unsigned char scanDataSize,
+                      BLEEirData *scanData,
                       BLELocalAttribute** localAttributes,
                       unsigned char numLocalAttributes,
                       BLERemoteAttribute** remoteAttributes,
@@ -207,12 +206,16 @@ void nRF51822::begin(unsigned char advertisementDataSize,
     }
   }
 
-  if (scanDataType && scanDataLength && scanData) {
-    srData[0] = scanDataLength + 1;
-    srData[1] = scanDataType;
-    memcpy(&srData[2], scanData, scanDataLength);
+  if (scanDataSize && scanData) {
+    for (int i = 0; i < scanDataSize; i++) {
+      srData[srDataLen + 0] = scanData[i].length + 1;
+      srData[srDataLen + 1] = scanData[i].type;
+      srDataLen += 2;
 
-    srDataLen = 2 + scanDataLength;
+      memcpy(&srData[srDataLen], scanData[i].data, scanData[i].length);
+
+      srDataLen += scanData[i].length;
+    }
   }
 
   sd_ble_gap_adv_data_set(this->_advData, this->_advDataLen, srData, srDataLen);

src/nRF51822.h

@@ -53,10 +53,9 @@ class nRF51822 : public BLEDevice
     virtual ~nRF51822();
 
     virtual void begin(unsigned char advertisementDataSize,
-                BLEAdvertisementData *advertisementData,
-                unsigned char scanDataType,
-                unsigned char scanDataLength,
-                const unsigned char* scanData,
+                BLEEirData *advertisementData,
+                unsigned char scanDataSize,
+                BLEEirData *scanData,
                 BLELocalAttribute** localAttributes,
                 unsigned char numLocalAttributes,
                 BLERemoteAttribute** remoteAttributes,

src/nRF8001.cpp

@@ -144,10 +144,9 @@ nRF8001::~nRF8001() {
 }
 
 void nRF8001::begin(unsigned char advertisementDataSize,
-                      BLEAdvertisementData *advertisementData,
-                      unsigned char scanDataType,
-                      unsigned char scanDataLength,
-                      const unsigned char* scanData,
+                      BLEEirData *advertisementData,
+                      unsigned char scanDataSize,
+                      BLEEirData *scanData,
                       BLELocalAttribute** localAttributes,
                       unsigned char numLocalAttributes,
                       BLERemoteAttribute** remoteAttributes,
@@ -261,7 +260,7 @@ void nRF8001::begin(unsigned char advertisementDataSize,
   setupMsg.status_byte = 0;
 
   bool hasAdvertisementData = advertisementDataSize && advertisementData;
-  bool hasScanData          = scanDataType && scanDataLength && scanData;
+  bool hasScanData          = scanDataSize && scanData;
 
   for (int i = 0; i < NB_BASE_SETUP_MESSAGES; i++) {
     int setupMsgSize = pgm_read_byte_near(&baseSetupMsgs[i].buffer[0]) + 2;
@@ -308,9 +307,9 @@ void nRF8001::begin(unsigned char advertisementDataSize,
       setupMsgData->data[1] = advertisementData[0].length;
       memcpy(&setupMsgData->data[2], advertisementData[0].data, advertisementData[0].length);
     } else if (i == 6 && hasScanData) {
-      setupMsgData->data[0] = scanDataType;
-      setupMsgData->data[1] = scanDataLength;
-      memcpy(&setupMsgData->data[2], scanData, scanDataLength);
+      setupMsgData->data[0] = scanData[0].type;
+      setupMsgData->data[1] = scanData[0].length;
+      memcpy(&setupMsgData->data[2], scanData[0].data, scanData[0].length);
     }
 
     this->sendSetupMessage(&setupMsg);

src/nRF8001.h

@@ -47,10 +47,9 @@ class nRF8001 : protected BLEDevice
     virtual ~nRF8001();
 
     virtual void begin(unsigned char advertisementDataSize,
-                BLEAdvertisementData *advertisementData,
-                unsigned char scanDataType,
-                unsigned char scanDataLength,
-                const unsigned char* scanData,
+                BLEEirData *advertisementData,
+                unsigned char scanDataSize,
+                BLEEirData *scanData,
                 BLELocalAttribute** localAttributes,
                 unsigned char numLocalAttributes,
                 BLERemoteAttribute** remoteAttributes,