riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkg/nimble/scanner: add function to set scan duration

Browse Source 
Co-authored-by: Roudy Dagher <roudy.dagher@inria.fr>
This commit is contained in:
Francisco Molina 2021-08-03 11:53:53 +02:00
parent 54a76ab2ce
commit 4d01b3815f
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/nimble/scanner/include/nimble_scanner.h
View File

@ -68,6 +68,9 @@ int nimble_scanner_init(const struct ble_gap_disc_params *params,
/** /**
* @brief Start scanning using timing parameters configured on initialization * @brief Start scanning using timing parameters configured on initialization
*
* @note Scanning will run for ever unless stopped or unless a different
* scan duration is set with @ref nimble_scanner_set_scan_duration
*/ */
int nimble_scanner_start(void); int nimble_scanner_start(void);
@ -84,6 +87,15 @@ void nimble_scanner_stop(void);
*/ */
int nimble_scanner_status(void); int nimble_scanner_status(void);
/**
* @brief Set the duration for the scanning procedure.
*
* If there is an active scanning process, it will be restarted.
*
* @param[in] duration_ms duration of scanning procedure in ms
*/
void nimble_scanner_set_scan_duration(int32_t duration_ms);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

17
pkg/nimble/scanner/nimble_scanner.c
View File

@ -32,6 +32,9 @@
static nimble_scanner_cb _disc_cb = NULL; static nimble_scanner_cb _disc_cb = NULL;
static struct ble_gap_disc_params _scan_params = { 0 }; static struct ble_gap_disc_params _scan_params = { 0 };
/* duration of the scanning procedure */
static int32_t _scan_duration = BLE_HS_FOREVER;
static int _on_scan_evt(struct ble_gap_event *event, void *arg) static int _on_scan_evt(struct ble_gap_event *event, void *arg)
{ {
/* only interested in the DISC event */ /* only interested in the DISC event */
@ -39,6 +42,9 @@ static int _on_scan_evt(struct ble_gap_event *event, void *arg)
_disc_cb(event->disc.event_type, &event->disc.addr, event->disc.rssi, _disc_cb(event->disc.event_type, &event->disc.addr, event->disc.rssi,
event->disc.data, (size_t)event->disc.length_data); event->disc.data, (size_t)event->disc.length_data);
} }
else if (event->type == BLE_GAP_EVENT_DISC_COMPLETE) {
DEBUG("[scanner] scan cycle completed\n");
}
else { else {
/* this should never happen */ /* this should never happen */
DEBUG("[scanner] unknown event triggered (%i)\n", (int)event->type); DEBUG("[scanner] unknown event triggered (%i)\n", (int)event->type);
@ -51,7 +57,7 @@ static int _on_scan_evt(struct ble_gap_event *event, void *arg)
int nimble_scanner_start(void) int nimble_scanner_start(void)
{ {
if (ble_gap_disc_active() == 0) { if (ble_gap_disc_active() == 0) {
int res = ble_gap_disc(nimble_riot_own_addr_type, BLE_HS_FOREVER, int res = ble_gap_disc(nimble_riot_own_addr_type, _scan_duration,
&_scan_params, _on_scan_evt, NULL); &_scan_params, _on_scan_evt, NULL);
if (res != 0) { if (res != 0) {
DEBUG("[scanner] err: start failed (%i)\n", res); DEBUG("[scanner] err: start failed (%i)\n", res);
@ -79,6 +85,15 @@ int nimble_scanner_status(void)
: NIMBLE_SCANNER_STOPPED; : NIMBLE_SCANNER_STOPPED;
} }
void nimble_scanner_set_scan_duration(int32_t duration_ms)
{
_scan_duration = duration_ms;
if (ble_gap_disc_active()) {
nimble_scanner_stop();
nimble_scanner_start();
}
}
int nimble_scanner_init(const struct ble_gap_disc_params *params, int nimble_scanner_init(const struct ble_gap_disc_params *params,
nimble_scanner_cb disc_cb) nimble_scanner_cb disc_cb)
{ {