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

examples/nimble_scanner: use nimble_scanner_ser_scan_duration

Browse Source 
Replace xtimer by ztimer

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

1
examples/nimble_scanner/Makefile
View File

@ -8,7 +8,6 @@ BOARD ?= nrf52dk
RIOTBASE ?= $(CURDIR)/../.. RIOTBASE ?= $(CURDIR)/../..
# We use the xtimer and the shell in this example # We use the xtimer and the shell in this example
USEMODULE += xtimer
USEMODULE += shell USEMODULE += shell
# configure and use Nimble # configure and use Nimble

15
examples/nimble_scanner/main.c
View File

@ -22,7 +22,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "xtimer.h" #include "timex.h"
#include "ztimer.h"
#include "shell.h" #include "shell.h"
#include "shell_commands.h" #include "shell_commands.h"
@ -30,25 +31,25 @@
#include "nimble_scanlist.h" #include "nimble_scanlist.h"
/* default scan duration (1s) */ /* default scan duration (1s) */
#define DEFAULT_DURATION (1000000U) #define DEFAULT_DURATION_MS (1 * MS_PER_SEC)
int _cmd_scan(int argc, char **argv) int _cmd_scan(int argc, char **argv)
{ {
uint32_t timeout = DEFAULT_DURATION; uint32_t timeout = DEFAULT_DURATION_MS;
if ((argc == 2) && (memcmp(argv[1], "help", 4) == 0)) { if ((argc == 2) && (memcmp(argv[1], "help", 4) == 0)) {
printf("usage: %s [timeout in ms]\n", argv[0]); printf("usage: %s [timeout in ms]\n", argv[0]);
return 0; return 0;
} }
if (argc >= 2) { if (argc >= 2) {
timeout = (uint32_t)(atoi(argv[1]) * 1000); timeout = atoi(argv[1]);
} }
nimble_scanlist_clear(); nimble_scanlist_clear();
printf("Scanning for %ums now ...", (unsigned)(timeout / 1000)); printf("Scanning for %"PRIu32" ms now ...", timeout);
nimble_scanner_set_scan_duration(timeout);
nimble_scanner_start(); nimble_scanner_start();
xtimer_usleep(timeout); ztimer_sleep(ZTIMER_MSEC, timeout);
nimble_scanner_stop();
puts(" done\n\nResults:"); puts(" done\n\nResults:");
nimble_scanlist_print(); nimble_scanlist_print();
puts(""); puts("");