Merge branch 'pr-183'

alranel · alranel · commit 970718f3c444 · 2022-05-11T20:21:05.000+02:00
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@
 * https://github.com/arduino-libraries/ArduinoBLE/pull/110
 * https://github.com/arduino-libraries/ArduinoBLE/pull/134
 * https://github.com/arduino-libraries/ArduinoBLE/pull/156
+* https://github.com/arduino-libraries/ArduinoBLE/pull/183
 <!-- pull requests -->
 
 You can consider this as an experimental version of the library, that you can use to test features contributed by the community that haven't been merged yet.
diff --git a/src/BLEDevice.cpp b/src/BLEDevice.cpp
@@ -86,11 +86,6 @@ bool BLEDevice::hasLocalName() const
   return (localName().length() > 0);
 }
 
-bool BLEDevice::hasManufacturerData() const
-{
-  return (manufacturerData().length() > 0);
-}
-
 bool BLEDevice::hasAdvertisedServiceUuid() const
 {
   return hasAdvertisedServiceUuid(0);
@@ -209,15 +204,68 @@ String BLEDevice::advertisedServiceUuid(int index) const
   return serviceUuid;
 }
 
-int BLEDevice::advertisementData(uint8_t value[], int length)
+bool BLEDevice::hasAdvertisementData() const
+{
+  return (_eirDataLength > 0);
+}
+
+int BLEDevice::advertisementDataLength() const
+{
+  return _eirDataLength;
+}
+
+int BLEDevice::advertisementData(uint8_t value[], int length) const
 {
-  if (_eirDataLength > length) return 0;  // Check that buffer size is sufficient
+  if (length > _eirDataLength) length = _eirDataLength;
 
-  if (_eirDataLength) {
-    memcpy(value, _eirData, _eirDataLength);
+  if (length) {
+    memcpy(value, _eirData, length);
   }
 
-  return _eirDataLength;
+  return length;
+}
+
+bool BLEDevice::hasManufacturerData() const
+{
+  return (manufacturerDataLength() > 0);
+}
+
+int BLEDevice::manufacturerDataLength() const
+{
+  int length = 0;
+
+  for (int i = 0; i < _eirDataLength;) {
+    int eirLength = _eirData[i++];
+    int eirType = _eirData[i++];
+
+    if (eirType == 0xFF) {
+      length = (eirLength - 1);
+      break;
+    }
+
+    i += (eirLength - 1);
+  }
+
+  return length;
+}
+
+int BLEDevice::manufacturerData(uint8_t value[], int length) const
+{
+  for (int i = 0; i < _eirDataLength;) {
+    int eirLength = _eirData[i++];
+    int eirType = _eirData[i++];
+
+    if (eirType == 0xFF) {
+      if (length > (eirLength - 1)) length = (eirLength - 1);
+
+      memcpy(value, &_eirData[i], length);
+      break;
+    }
+
+    i += (eirLength - 1);
+  }
+
+  return length;
 }
 
 int BLEDevice::rssi()
diff --git a/src/BLEDevice.h b/src/BLEDevice.h
@@ -50,7 +50,6 @@ class BLEDevice {
   virtual String address() const;
 
   bool hasLocalName() const;
-  bool hasManufacturerData() const;
 
   bool hasAdvertisedServiceUuid() const;
   bool hasAdvertisedServiceUuid(int index) const;
@@ -61,7 +60,13 @@ class BLEDevice {
   String advertisedServiceUuid() const;
   String advertisedServiceUuid(int index) const;
 
-  int advertisementData(uint8_t value[], int length);
+  bool hasAdvertisementData() const;
+  int advertisementDataLength() const;
+  int advertisementData(uint8_t value[], int length) const;
+
+  bool hasManufacturerData() const;
+  int manufacturerDataLength() const;
+  int manufacturerData(uint8_t value[], int length) const;
 
   virtual int rssi();
 
