espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-17 14:39:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #173 from rymanluk/btshell_impr

Browse Source 
btshell: Improvements in advertising shell command
This commit is contained in:
Łukasz Rymanowski
2018-08-28 23:53:14 +02:00
committed by GitHub
parent b1fb8a098a 9b2ffa532d
commit 46e80d7f4c
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/btshell/src/cmd.c
+26 -9
View File
@@ -117,7 +117,7 @@ static bool adv_instances[BLE_ADV_INSTANCES];
static int
cmd_advertise_configure(int argc, char **argv)
{
struct ble_gap_ext_adv_params params;
struct ble_gap_ext_adv_params params = {0};
int8_t selected_tx_power;
uint8_t instance;
int rc;
@@ -140,13 +140,24 @@ cmd_advertise_configure(int argc, char **argv)
memset(&params, 0, sizeof(params));
params.connectable = parse_arg_bool_dflt("connectable", 0, &rc);
params.legacy_pdu = parse_arg_bool_dflt("legacy", 0, &rc);
if (rc != 0) {
console_printf("invalid 'legacy' parameter\n");
return rc;
}
if (params.legacy_pdu) {
params.connectable = 1;
params.scannable = 1;
}
params.connectable = parse_arg_bool_dflt("connectable", params.connectable, &rc);
if (rc != 0) {
console_printf("invalid 'connectable' parameter\n");
return rc;
}
params.scannable = parse_arg_bool_dflt("scannable", 0, &rc);
params.scannable = parse_arg_bool_dflt("scannable", params.scannable, &rc);
if (rc != 0) {
console_printf("invalid 'scannable' parameter\n");
return rc;
@@ -164,12 +175,6 @@ cmd_advertise_configure(int argc, char **argv)
return rc;
}
params.legacy_pdu = parse_arg_bool_dflt("legacy", 0, &rc);
if (rc != 0) {
console_printf("invalid 'legacy' parameter\n");
return rc;
}
params.include_tx_power = parse_arg_bool_dflt("include_tx_power", 0, &rc);
if (rc != 0) {
console_printf("invalid 'include_tx_power' parameter\n");
@@ -201,6 +206,17 @@ cmd_advertise_configure(int argc, char **argv)
return rc;
}
params.directed = parse_arg_bool_dflt("directed", params.directed, &rc);
if (rc != 0) {
console_printf("invalid 'directed' parameter\n");
return rc;
}
if (params.directed && params.legacy_pdu) {
params.scannable = 0;
}
params.own_addr_type = parse_arg_kv_dflt("own_addr_type",
cmd_own_addr_types,
BLE_OWN_ADDR_PUBLIC, &rc);
@@ -430,6 +446,7 @@ static const struct shell_param advertise_configure_params[] = {
{"instance", "default: 0"},
{"connectable", "connectable advertising, usage: =[0-1], default: 0"},
{"scannable", "scannable advertising, usage: =[0-1], default: 0"},
{"directed", "directed advertising, usage: =[0-1], default: 0"},
{"peer_addr_type", "usage: =[public|random|public_id|random_id], default: public"},
{"peer_addr", "usage: =[XX:XX:XX:XX:XX:XX]"},
{"own_addr_type", "usage: =[public|random|rpa_pub|rpa_rnd], default: public"},