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

Merge pull request #9549 from paul-szczepanek-arm/fix-scan-timeout 

BLE: fix missing scan timeout for 4.2 controllers using new API
pull/9572/head
Martin Kojtal 2019-01-31 11:19:29 +01:00 committed by GitHub
parent 7c578cf2c6 d9c919b7e1
commit 94baadfc34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,31 +570,28 @@ ble_error_t GenericGap::stopScan()
{
ble_error_t err;
if (!_scan_enabled) {
return BLE_ERROR_NONE;
}
_scan_enabled = false;
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);
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;
}
@ -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) {
@ -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) {
@ -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,
@ -2979,7 +2982,6 @@ ble_error_t GenericGap::startScan(
);
if (err) {
_scan_enabled = false;
return err;
}
} else {
@ -3005,6 +3007,8 @@ ble_error_t GenericGap::startScan(
}
}
_scan_enabled = true;
return BLE_ERROR_NONE;
}