Skip to content

Don't destroy set before it stops #380

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 3 commits into from
Jun 18, 2021
Merged

Don't destroy set before it stops #380

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3356eb
don't destroy set before it stops
paul-szczepanek-arm Jun 2, 2021
4f4364f
check handle of the adv set that ended
paul-szczepanek-arm Jun 2, 2021
1cdea9c
check event error codes for adv stop
paul-szczepanek-arm Jun 9, 2021
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
49 changes: 38 additions & 11 deletions BLE_GAP/source/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,9 +330,40 @@ class GapDemo : private mbed::NonCopyable<GapDemo>, public ble::Gap::EventHandle

void onAdvertisingEnd(const ble::AdvertisingEndEvent &event) override
{
if (event.isConnected()) {
printf("Stopped advertising early due to connection\r\n");
ble::advertising_handle_t adv_handle = event.getAdvHandle();
if (event.getStatus() == BLE_ERROR_UNSPECIFIED) {
printf("Error: Failed to stop advertising set %d\r\n", adv_handle);
} else {
printf("Stopped advertising set %d\r\n", adv_handle);

if (event.getStatus() == BLE_ERROR_TIMEOUT) {
printf("Stopped due to timeout\r\n");
} else if (event.getStatus() == BLE_ERROR_LIMIT_REACHED) {
printf("Stopped due to max number of adv events reached\r\n");
} else if (event.getStatus() == BLE_ERROR_NONE) {
if (event.isConnected()) {
printf("Stopped early due to connection\r\n");
} else {
printf("Stopped due to user request\r\n");
}
}
}

#if BLE_FEATURE_EXTENDED_ADVERTISING
if (event.getAdvHandle() == _extended_adv_handle) {
/* we were waiting for it to stop before destroying it and starting scanning */
ble_error_t error = _gap.destroyAdvertisingSet(_extended_adv_handle);
if (error) {
print_error(error, "Error caused by Gap::destroyAdvertisingSet");
}

_extended_adv_handle = ble::INVALID_ADVERTISING_HANDLE;

_is_in_scanning_phase = true;

_event_queue.call_in(delay, [this]{ scan(); });
}
#endif //BLE_FEATURE_EXTENDED_ADVERTISING
}

void onAdvertisingStart(const ble::AdvertisingStartEvent &event) override
Expand Down Expand Up @@ -488,6 +519,8 @@ class GapDemo : private mbed::NonCopyable<GapDemo>, public ble::Gap::EventHandle
{
print_advertising_performance();

printf("Requesting stop advertising.\r\n");

_gap.stopAdvertising(ble::LEGACY_ADVERTISING_HANDLE);

#if BLE_FEATURE_EXTENDED_ADVERTISING
Expand All @@ -499,19 +532,13 @@ class GapDemo : private mbed::NonCopyable<GapDemo>, public ble::Gap::EventHandle
print_error(error, "Error caused by Gap::stopAdvertising");
}
}

ble_error_t error = _gap.destroyAdvertisingSet(_extended_adv_handle);
if (error) {
print_error(error, "Error caused by Gap::destroyAdvertisingSet");
}

_extended_adv_handle = ble::INVALID_ADVERTISING_HANDLE;
}
#endif // BLE_FEATURE_EXTENDED_ADVERTISING

/* we have to wait before we destroy it until it's stopped */
#else
_is_in_scanning_phase = true;

_event_queue.call_in(delay, [this]{ scan(); });
#endif // BLE_FEATURE_EXTENDED_ADVERTISING
}

/** print some information about our radio activity */
Expand Down