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

bounce scan timeout of the queue

pull/10219/head
paul-szczepanek-arm 2019-03-25 16:24:35 +00:00 committed by Cruz Monrreal II
parent ca62922c9f
commit dad6844167
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/ble/generic/GenericGap.h
View File

@ -782,7 +782,7 @@ private:
);
void on_scan_timeout_();
void process_legacy_scan_timeout();
private:
pal::EventQueue &_event_queue;

40
features/FEATURE_BLE/source/generic/GenericGap.tpp
View File

@ -1605,21 +1605,38 @@ void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandl
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);
#if BLE_FEATURE_PRIVACY
set_random_address_rotation(false);
#endif
}
_scan_enabled = false;
if (!_eventHandler) {
return;
/* if timeout happened on a 4.2 chip we need to stop the scan manually */
if (!is_extended_advertising_available()) {
_event_queue.post(
mbed::callback(
this,
&GenericGap<
PalGapImpl,
PalSecurityManager,
ConnectionEventMonitorEventHandler
>::process_legacy_scan_timeout
)
);
} else {
if (_eventHandler) {
_eventHandler->onScanTimeout(ScanTimeoutEvent());
}
}
}
_eventHandler->onScanTimeout(ScanTimeoutEvent());
template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
void GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEventHandler>::process_legacy_scan_timeout()
{
_pal_gap.scan_enable(false, false);
#if BLE_FEATURE_PRIVACY
set_random_address_rotation(false);
#endif
if (_eventHandler) {
_eventHandler->onScanTimeout(ScanTimeoutEvent());
}
}
template <template<class> class PalGapImpl, class PalSecurityManager, class ConnectionEventMonitorEventHandler>
@ -3263,6 +3280,7 @@ ble_error_t GenericGap<PalGapImpl, PalSecurityManager, ConnectionEventMonitorEve
_scan_timeout.detach();
if (duration.value()) {
/**/
_scan_timeout.attach_us(
mbed::callback(this, &GenericGap::on_scan_timeout_),
microsecond_t(duration).value()