From d29f0526806fe4c43eaef8c4a463f6816d1b3409 Mon Sep 17 00:00:00 2001 From: Paolo Calao Date: Mon, 2 Nov 2020 14:52:04 +0100 Subject: [PATCH] API: set advertising param functions return success The functions to set the parameters of the advertising data return a bool value. return 'true' -> advertising parameter is correctly set return 'false' -> advertising parameter is not set, there is no enough space in the packet to advertise it --- src/local/BLELocalDevice.cpp | 24 ++++++++++++------------ src/local/BLELocalDevice.h | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/local/BLELocalDevice.cpp b/src/local/BLELocalDevice.cpp index 4dd96399..0ca0220f 100644 --- a/src/local/BLELocalDevice.cpp +++ b/src/local/BLELocalDevice.cpp @@ -184,34 +184,34 @@ int BLELocalDevice::rssi() return 127; } -void BLELocalDevice::setAdvertisedServiceUuid(const char* advertisedServiceUuid) +bool BLELocalDevice::setAdvertisedServiceUuid(const char* advertisedServiceUuid) { - _advertisingData.setAdvertisedServiceUuid(advertisedServiceUuid); + return _advertisingData.setAdvertisedServiceUuid(advertisedServiceUuid); } -void BLELocalDevice::setAdvertisedService(const BLEService& service) +bool BLELocalDevice::setAdvertisedService(const BLEService& service) { - setAdvertisedServiceUuid(service.uuid()); + return setAdvertisedServiceUuid(service.uuid()); } -void BLELocalDevice::setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length) +bool BLELocalDevice::setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length) { - _advertisingData.setAdvertisedServiceData(uuid, data, length); + return _advertisingData.setAdvertisedServiceData(uuid, data, length); } -void BLELocalDevice::setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength) +bool BLELocalDevice::setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength) { - _advertisingData.setManufacturerData(manufacturerData, manufacturerDataLength); + return _advertisingData.setManufacturerData(manufacturerData, manufacturerDataLength); } -void BLELocalDevice::setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength) +bool BLELocalDevice::setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength) { - _advertisingData.setManufacturerData(companyId, manufacturerData, manufacturerDataLength); + return _advertisingData.setManufacturerData(companyId, manufacturerData, manufacturerDataLength); } -void BLELocalDevice::setLocalName(const char *localName) +bool BLELocalDevice::setLocalName(const char *localName) { - _scanResponseData.setLocalName(localName); + return _scanResponseData.setLocalName(localName); } void BLELocalDevice::setAdvertisingData(BLEAdvertisingData& advertisingData) diff --git a/src/local/BLELocalDevice.h b/src/local/BLELocalDevice.h index 03bd12b5..9ebb0bc2 100644 --- a/src/local/BLELocalDevice.h +++ b/src/local/BLELocalDevice.h @@ -42,12 +42,12 @@ class BLELocalDevice { virtual int rssi(); - virtual void setAdvertisedServiceUuid(const char* advertisedServiceUuid); - virtual void setAdvertisedService(const BLEService& service); - virtual void setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length); - virtual void setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength); - virtual void setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength); - virtual void setLocalName(const char *localName); + virtual bool setAdvertisedServiceUuid(const char* advertisedServiceUuid); + virtual bool setAdvertisedService(const BLEService& service); + virtual bool setAdvertisedServiceData(uint16_t uuid, const uint8_t data[], int length); + virtual bool setManufacturerData(const uint8_t manufacturerData[], int manufacturerDataLength); + virtual bool setManufacturerData(const uint16_t companyId, const uint8_t manufacturerData[], int manufacturerDataLength); + virtual bool setLocalName(const char *localName); virtual void setAdvertisingData(BLEAdvertisingData& advertisingData); virtual void setScanResponseData(BLEAdvertisingData& scanResponseData);