Skip to content

BLE: fix missing scan timeout for 4.2 controllers using new API #9549

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
Jan 31, 2019
Merged

BLE: fix missing scan timeout for 4.2 controllers using new API #9549

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f888f8
scan timeout for 4.2 controllers using new API
paul-szczepanek-arm Jan 30, 2019
e1a8fb5
check scanning status first
paul-szczepanek-arm Jan 30, 2019
d9c919b
review fixes
paul-szczepanek-arm Jan 30, 2019
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
36 changes: 20 additions & 16 deletions features/FEATURE_BLE/source/generic/GenericGap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,31 +570,28 @@ ble_error_t GenericGap::stopScan()
{
ble_error_t err;

if (is_extended_advertising_available()) {
if (!_scan_enabled) {
return BLE_ERROR_NONE;
}
if (!_scan_enabled) {
return BLE_ERROR_NONE;
}

_scan_enabled = false;
_scan_enabled = false;

if (is_extended_advertising_available()) {
err = _pal_gap.extended_scan_enable(false, pal::duplicates_filter_t::DISABLE, 0, 0);

if (err) {
_scan_enabled = true;
return err;
}
} else {
err = _pal_gap.scan_enable(false, false);
}

if (err) {
return err;
}
if (err) {
_scan_enabled = true;
return err;
}

// Stop address rotation if required
set_random_address_rotation(false);

_scan_timeout.detach();

return BLE_ERROR_NONE;
}

Expand Down Expand Up @@ -1210,6 +1207,8 @@ ble_error_t GenericGap::startRadioScan(const GapScanningParams &scanningParams)
return err;
}

_scan_enabled = true;

_scan_timeout.detach();
uint16_t timeout = scanningParams.getTimeout();
if (timeout) {
Expand Down Expand Up @@ -1488,6 +1487,12 @@ void GenericGap::on_scan_timeout()
return;
}

/* if timeout happened on a 4.2 chip we need to stop the scan manually */
if (!is_extended_advertising_available()) {
_pal_gap.scan_enable(false, false);
set_random_address_rotation(false);
}

_scan_enabled = false;

if (!_eventHandler) {
Expand Down Expand Up @@ -2969,8 +2974,6 @@ ble_error_t GenericGap::startScan(
}

if (is_extended_advertising_available()) {
_scan_enabled = true;

ble_error_t err = _pal_gap.extended_scan_enable(
/* enable */true,
filtering,
Expand All @@ -2979,7 +2982,6 @@ ble_error_t GenericGap::startScan(
);

if (err) {
_scan_enabled = false;
return err;
}
} else {
Expand All @@ -3005,6 +3007,8 @@ ble_error_t GenericGap::startScan(
}
}

_scan_enabled = true;

return BLE_ERROR_NONE;
}

Expand Down