michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: shell: Fix directed adv parameter check

Browse source 
Fix the mandatory and optional parameter counts for the
directed adv shell command definition. Also, refactor the
command for consistency.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2019-08-08 08:47:16 +05:30 • committed by Carles Cufí
commit 857bcd96bd
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
subsys/bluetooth/shell/bt.c
View file

@ -634,19 +634,15 @@ static int cmd_directed_adv(const struct shell *shell,
return err; return err;
} }
if (argc == 3) { if (argc > 3) {
goto connect; if (!strcmp(argv[3], "low")) {
}
if (strcmp(argv[3], "low")) {
shell_help(shell);
/* shell returns 1 when help is printed */
return 1;
}
param = BT_LE_ADV_CONN_DIR_LOW_DUTY; param = BT_LE_ADV_CONN_DIR_LOW_DUTY;
} else {
shell_help(shell);
return -ENOEXEC;
}
}
connect:
conn = bt_conn_create_slave_le(&addr, param); conn = bt_conn_create_slave_le(&addr, param);
if (!conn) { if (!conn) {
shell_error(shell, "Failed to start directed advertising"); shell_error(shell, "Failed to start directed advertising");
@ -1341,7 +1337,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(bt_cmds,
cmd_advertise, 2, 1), cmd_advertise, 2, 1),
#if defined(CONFIG_BT_PERIPHERAL) #if defined(CONFIG_BT_PERIPHERAL)
SHELL_CMD_ARG(directed-adv, NULL, HELP_ADDR_LE " [mode: low]", SHELL_CMD_ARG(directed-adv, NULL, HELP_ADDR_LE " [mode: low]",
cmd_directed_adv, 1, 1), cmd_directed_adv, 3, 1),
#endif /* CONFIG_BT_PERIPHERAL */ #endif /* CONFIG_BT_PERIPHERAL */
#endif /* CONFIG_BT_BROADCASTER */ #endif /* CONFIG_BT_BROADCASTER */
#if defined(CONFIG_BT_CONN) #if defined(CONFIG_BT_CONN)