Merge pull request arduino-libraries#29 from sandeepmistry/service-data-fixes

facchinm · web-flow · commit 633e1aa04954 · 2020-08-17T11:48:50.000+02:00
Fix for advertised service data not working
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
@@ -79,7 +79,7 @@ int GAPClass::advertise()
 
   uint8_t type = (_connectable) ? 0x00 : (_localName ? 0x02 : 0x03);
 
-  _advertising = false;
+  stopAdvertise();
 
   if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, 0x00, 0x00, directBdaddr, 0x07, 0) != 0) {
     return 0;
@@ -110,7 +110,7 @@ int GAPClass::advertise()
     advertisingDataLen += _manufacturerDataLength;
   }
 
-  if (_serviceData && _serviceDataLength > 0 && advertisingDataLen >= (_serviceDataLength + 4)) {
+  if (_serviceData && _serviceDataLength > 0 && (sizeof(advertisingData) - advertisingDataLen) >= (_serviceDataLength + 4)) {
     advertisingData[advertisingDataLen++] = _serviceDataLength + 3;
     advertisingData[advertisingDataLen++] = 0x16;
 
@@ -153,7 +153,7 @@ int GAPClass::advertise()
     return 0;
   }
 
-  _advertising = false;
+  _advertising = true;
 
   return 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ int GAPClass::advertise()`
`79`	`79`
`80`	`80`	`uint8_t type = (_connectable) ? 0x00 : (_localName ? 0x02 : 0x03);`
`81`	`81`
`82`		`- _advertising = false;`
	`82`	`+ stopAdvertise();`
`83`	`83`
`84`	`84`	`if (HCI.leSetAdvertisingParameters(_advertisingInterval, _advertisingInterval, type, 0x00, 0x00, directBdaddr, 0x07, 0) != 0) {`
`85`	`85`	`return 0;`
`@@ -110,7 +110,7 @@ int GAPClass::advertise()`
`110`	`110`	`advertisingDataLen += _manufacturerDataLength;`
`111`	`111`	`}`
`112`	`112`
`113`		`- if (_serviceData && _serviceDataLength > 0 && advertisingDataLen >= (_serviceDataLength + 4)) {`
	`113`	`+ if (_serviceData && _serviceDataLength > 0 && (sizeof(advertisingData) - advertisingDataLen) >= (_serviceDataLength + 4)) {`
`114`	`114`	`advertisingData[advertisingDataLen++] = _serviceDataLength + 3;`
`115`	`115`	`advertisingData[advertisingDataLen++] = 0x16;`
`116`	`116`
`@@ -153,7 +153,7 @@ int GAPClass::advertise()`
`153`	`153`	`return 0;`
`154`	`154`	`}`
`155`	`155`
`156`		`- _advertising = false;`
	`156`	`+ _advertising = true;`
`157`	`157`
`158`	`158`	`return 1;`
`159`	`159`	`}`