Commit b6a66a4

konikoni428sandeepmistry

authored and

committed

Add (optional) company ID argument to BLE.setManufacturerData(....) (#18)

1 parent 5d10cba commit b6a66a4Copy full SHA for b6a66a4

File tree

+16

-0

lines changed

+16

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,11 @@ void BLELocalDevice::setManufacturerData(const uint8_t manufacturerData[], int m`
`185`	`185`	`GAP.setManufacturerData(manufacturerData, manufacturerDataLength);`
`186`	`186`	`}`
`187`	`187`
	`188`	`+void BLELocalDevice::setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength)`
	`189`	`+{`
	`190`	`+ GAP.setManufacturerData(companyId, manufacturerData, manufacturerDataLength);`
	`191`	`+}`
	`192`	`+`
`188`	`193`	`void BLELocalDevice::setLocalName(const char *localName)`
`189`	`194`	`{`
`190`	`195`	`GAP.setLocalName(localName);`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ class BLELocalDevice {`
`44`	`44`	`void setAdvertisedServiceUuid(const char* advertisedServiceUuid);`
`45`	`45`	`void setAdvertisedService(const BLEService& service);`
`46`	`46`	`void setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength);`
	`47`	`+ void setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength);`
`47`	`48`	`void setLocalName(const char *localName);`
`48`	`49`
`49`	`50`	`void setDeviceName(const char* deviceName);`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,15 @@ void GAPClass::setManufacturerData(const uint8_t manufacturerData[], int manufac`
`54`	`54`	`_manufacturerDataLength = manufacturerDataLength;`
`55`	`55`	`}`
`56`	`56`
	`57`	`+void GAPClass::setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength)`
	`58`	`+{`
	`59`	`+ uint8_t tmpManufacturerData[manufacturerDataLength + 2];`
	`60`	`+ tmpManufacturerData[0] = companyId & 0xff;`
	`61`	`+ tmpManufacturerData[1] = companyId >> 8;`
	`62`	`+ memcpy(&tmpManufacturerData[2], manufacturerData, manufacturerDataLength);`
	`63`	`+ this->setManufacturerData(tmpManufacturerData, manufacturerDataLength + 2);`
	`64`	`+}`
	`65`	`+`
`57`	`66`	`void GAPClass::setLocalName(const char *localName)`
`58`	`67`	`{`
`59`	`68`	`_localName = localName;`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class GAPClass {`
`31`	`31`
`32`	`32`	`void setAdvertisedServiceUuid(const char* advertisedServiceUuid);`
`33`	`33`	`void setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength);`
	`34`	`+ void setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength);`
`34`	`35`	`void setLocalName(const char *localName);`
`35`	`36`
`36`	`37`	`bool advertising();`

Comments

(0)