Skip to content

Commit 0ab39ca

Browse files
committed
change BLEUuid begin() return type to bool
1 parent 8db3f2e commit 0ab39ca

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

libraries/Bluefruit52Lib/src/BLEUuid.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,18 @@ size_t BLEUuid::size (void) const
102102
return 0;
103103
}
104104

105-
err_t BLEUuid::begin(void)
105+
bool BLEUuid::begin(void)
106106
{
107107
/* Add base uuid and decode to get uuid16
108108
* This should cover the already added base uuid128 previously
109109
*/
110110
if (_uuid.type == BLE_UUID_TYPE_UNKNOWN && _uuid128 != NULL )
111111
{
112112
(void) sd_ble_uuid_vs_add( (ble_uuid128_t const*) _uuid128, &_uuid.type );
113-
VERIFY_STATUS( sd_ble_uuid_decode(16, _uuid128, &_uuid) );
113+
VERIFY_STATUS( sd_ble_uuid_decode(16, _uuid128, &_uuid), false );
114114
}
115115

116-
return ERROR_NONE;
116+
return true;
117117
}
118118

119119
bool BLEUuid::operator== (const BLEUuid& uuid) const

libraries/Bluefruit52Lib/src/BLEUuid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class BLEUuid
5959
size_t size (void) const;
6060

6161
// Add UUID128 if needed, in case of UUID16, no actions is required
62-
err_t begin(void);
62+
bool begin(void);
6363

6464
bool operator==(const BLEUuid& uuid) const;
6565
bool operator!=(const BLEUuid& uuid) const;

libraries/Bluefruit52Lib/src/services/BLEAdafruitSensor.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,12 @@ class BLEAdafruitSensor : public BLEService
4242
void startMeasuring(void);
4343
void stopMeasuring(void);
4444

45+
protected:
4546
BLECharacteristic Period;
4647

47-
protected:
4848
measure_callback_t _measure_cb;
4949
SoftwareTimer _timer;
5050

51-
5251
static void sensor_timer_cb(TimerHandle_t xTimer);
5352
static void sensor_period_write_cb(uint16_t conn_hdl, BLECharacteristic* chr, uint8_t* data, uint16_t len);
5453
};

0 commit comments

Comments
 (0)