ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

scan timeout for 4.2 controllers using new API

pull/9646/head
paul-szczepanek-arm 2019-01-30 11:37:17 +00:00 committed by adbridge
parent 3180422483
commit a0b5b60e6b
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -570,25 +570,21 @@ ble_error_t GenericGap::stopScan()
{ {
ble_error_t err; ble_error_t err;
if (!_scan_enabled) {
return BLE_ERROR_NONE;
}
_scan_enabled = false;
if (is_extended_advertising_available()) { if (is_extended_advertising_available()) {
if (!_scan_enabled) {
return BLE_ERROR_NONE;
}
_scan_enabled = false;
err = _pal_gap.extended_scan_enable(false, pal::duplicates_filter_t::DISABLE, 0, 0); err = _pal_gap.extended_scan_enable(false, pal::duplicates_filter_t::DISABLE, 0, 0);
if (err) {
_scan_enabled = true;
return err;
}
} else { } else {
err = _pal_gap.scan_enable(false, false); err = _pal_gap.scan_enable(false, false);
}
if (err) { if (err) {
return err; _scan_enabled = true;
} return err;
} }
// Stop address rotation if required // Stop address rotation if required
@ -1210,6 +1206,8 @@ ble_error_t GenericGap::startRadioScan(const GapScanningParams &scanningParams)
return err; return err;
} }
_scan_enabled = true;
_scan_timeout.detach(); _scan_timeout.detach();
uint16_t timeout = scanningParams.getTimeout(); uint16_t timeout = scanningParams.getTimeout();
if (timeout) { if (timeout) {
@ -1482,6 +1480,12 @@ BLE_DEPRECATED_API_USE_END()
void GenericGap::on_scan_timeout() void GenericGap::on_scan_timeout()
{ {
/* 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);
}
if (!_scan_enabled) { if (!_scan_enabled) {
return; return;
} }
@ -2906,8 +2910,6 @@ ble_error_t GenericGap::startScan(
} }
if (is_extended_advertising_available()) { if (is_extended_advertising_available()) {
_scan_enabled = true;
ble_error_t err = _pal_gap.extended_scan_enable( ble_error_t err = _pal_gap.extended_scan_enable(
/* enable */true, /* enable */true,
filtering, filtering,
@ -2916,9 +2918,10 @@ ble_error_t GenericGap::startScan(
); );
if (err) { if (err) {
_scan_enabled = false;
return err; return err;
} }
_scan_enabled = true;
} else { } else {
if (period.value() != 0) { if (period.value() != 0) {
return BLE_ERROR_INVALID_PARAM; return BLE_ERROR_INVALID_PARAM;
@ -2933,6 +2936,8 @@ ble_error_t GenericGap::startScan(
return err; return err;
} }
_scan_enabled = true;
_scan_timeout.detach(); _scan_timeout.detach();
if (duration.value()) { if (duration.value()) {
_scan_timeout.attach_us( _scan_timeout.attach_us(