Skip to content

BLE SimpleAdvertisingBuilder moved functions out of mbed_assert calls #10270

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

Merged
merged 1 commit into from
Apr 1, 2019
Merged

BLE SimpleAdvertisingBuilder moved functions out of mbed_assert calls #10270

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 27 additions & 18 deletions features/FEATURE_BLE/ble/gap/AdvertisingDataSimpleBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setAppearance(adv_data_appearance_t appearance)
{
MBED_ASSERT(_builder.setAppearance(appearance) == BLE_ERROR_NONE);
ble_error_t res = _builder.setAppearance(appearance);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -96,7 +97,8 @@ class AdvertisingDataSimpleBuilder {
adv_data_flags_t flags = adv_data_flags_t::default_flags
)
{
MBED_ASSERT(_builder.setFlags(flags) == BLE_ERROR_NONE);
ble_error_t res = _builder.setFlags(flags);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -111,7 +113,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setTxPowerAdvertised(advertising_power_t txPower)
{
MBED_ASSERT(_builder.setTxPowerAdvertised(txPower) == BLE_ERROR_NONE);
ble_error_t res = _builder.setTxPowerAdvertised(txPower);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -129,7 +132,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setName(const char *name, bool complete = true)
{
MBED_ASSERT(_builder.setName(name, complete) == BLE_ERROR_NONE);
ble_error_t res = _builder.setName(name, complete);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -144,7 +148,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setManufacturerSpecificData(mbed::Span<const uint8_t> data)
{
MBED_ASSERT(_builder.setManufacturerSpecificData(data) == BLE_ERROR_NONE);
ble_error_t res = _builder.setManufacturerSpecificData(data);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -157,7 +162,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setAdvertisingInterval(adv_interval_t interval)
{
MBED_ASSERT(_builder.setAdvertisingInterval(interval) == BLE_ERROR_NONE);
ble_error_t res = _builder.setAdvertisingInterval(interval);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -174,7 +180,8 @@ class AdvertisingDataSimpleBuilder {
conn_interval_t max
)
{
MBED_ASSERT(_builder.setConnectionIntervalPreference(min, max) == BLE_ERROR_NONE);
ble_error_t res = _builder.setConnectionIntervalPreference(min, max);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -190,7 +197,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setServiceData(UUID service, mbed::Span<const uint8_t> data)
{
MBED_ASSERT(_builder.setServiceData(service, data) == BLE_ERROR_NONE);
ble_error_t res = _builder.setServiceData(service, data);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -210,11 +218,10 @@ class AdvertisingDataSimpleBuilder {
bool complete = true
)
{
MBED_ASSERT(
_builder.setLocalServiceList(
ble_error_t res = _builder.setLocalServiceList(
mbed::make_Span(&data, 1), complete
) == BLE_ERROR_NONE
);
);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -235,7 +242,8 @@ class AdvertisingDataSimpleBuilder {
bool complete = true
)
{
MBED_ASSERT(_builder.setLocalServiceList(data, complete) == BLE_ERROR_NONE);
ble_error_t res = _builder.setLocalServiceList(data, complete);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -250,9 +258,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setRequestedService(const UUID& data)
{
MBED_ASSERT(
_builder.setRequestedServiceList(mbed::make_Span(&data, 1)) == BLE_ERROR_NONE
);
ble_error_t res = _builder.setRequestedServiceList(mbed::make_Span(&data, 1));
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -267,7 +274,8 @@ class AdvertisingDataSimpleBuilder {
*/
AdvertisingDataSimpleBuilder &setRequestedServiceList(mbed::Span<const UUID> data)
{
MBED_ASSERT(_builder.setRequestedServiceList(data) == BLE_ERROR_NONE);
ble_error_t res = _builder.setRequestedServiceList(data);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand All @@ -286,7 +294,8 @@ class AdvertisingDataSimpleBuilder {
mbed::Span<const uint8_t> fieldData
)
{
MBED_ASSERT(_builder.addData(advDataType, fieldData) == BLE_ERROR_NONE);
ble_error_t res = _builder.addData(advDataType, fieldData);
MBED_ASSERT(res == BLE_ERROR_NONE);
return *this;
}

Expand Down