Skip to content

Add broadcast support for longer uuids #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+23 −7
Open

Add broadcast support for longer uuids #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8928cd1
Add broadcast support for longer UUIDs
PRosenb Dec 29, 2020
83466d0
document characteristics to service assignment
PRosenb Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/BLEPeripheral.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,13 @@ class BLEPeripheral : public BLEDeviceEventListener,
void setDeviceName(const char* deviceName);
void setAppearance(unsigned short appearance);

/**
* @brief Add local services, characteristics and descriptors. Characteristics are assigned to the last added service.
*/
void addAttribute(BLELocalAttribute& attribute);
/**
* @brief Add local services, characteristics and descriptors. Characteristics are assigned to the last added service.
*/
void addLocalAttribute(BLELocalAttribute& localAttribute);
void addRemoteAttribute(BLERemoteAttribute& remoteAttribute);

Expand Down
24 changes: 17 additions & 7 deletions src/nRF51822.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,16 +1112,26 @@ bool nRF51822::broadcastCharacteristic(BLECharacteristic& characteristic) {
// copy the existing advertisement data
memcpy(advData, this->_advData, advDataLen);

advDataLen += (4 + characteristic.valueLength());
BLEUuid serviceUuid = BLEUuid(localCharacteristicInfo->service->uuid());
unsigned char serviceUuidLength = serviceUuid.length();

if (advDataLen <= 31) {
BLEUuid uuid = BLEUuid(localCharacteristicInfo->service->uuid());
// length + type + uuidLength + value-length
advDataLen += 1 + 1 + serviceUuidLength + characteristic.valueLength();

advData[this->_advDataLen + 0] = 3 + characteristic.valueLength();
advData[this->_advDataLen + 1] = 0x16;
if (advDataLen <= 31) { // adjust check

memcpy(&advData[this->_advDataLen + 2], uuid.data(), 2);
memcpy(&advData[this->_advDataLen + 4], characteristic.value(), characteristic.valueLength());
advData[this->_advDataLen + 0] = 1 + serviceUuidLength + characteristic.valueLength();
// https://www.bluetooth.com/specifications/assigned-numbers/generic-access-profile/
if (serviceUuidLength == 2) {
advData[this->_advDataLen + 1] = 0x16; // Service Data - 16-bit UUID
} else if (serviceUuidLength == 4) {
advData[this->_advDataLen + 1] = 0x20; // Service Data - 32-bit UUID
} else {
advData[this->_advDataLen + 1] = 0x21; // Service Data - 128-bit UUID
}

memcpy(&advData[this->_advDataLen + 2], serviceUuid.data(), serviceUuidLength);
memcpy(&advData[this->_advDataLen + 2 + serviceUuidLength], characteristic.value(), characteristic.valueLength());

sd_ble_gap_adv_data_set(advData, advDataLen, NULL, 0); // update advertisement data
success = true;
Expand Down