michaelh/zephyr
1
0
Fork 0
Code Releases Activity

bluetooth: shell: Use helper function to convert string to int

Browse source 
Use helper function to convert string to int for appearance value.
This makes the code more clear, as the big-endian conversion function
gives the wrong impression about the byte order of advertising data.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2023-12-01 18:33:02 +01:00 • committed by Carles Cufí
commit f390f7d0a1
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1196,17 +1196,21 @@ static int cmd_appearance(const struct shell *sh, size_t argc, char *argv[])
#if defined(CONFIG_BT_DEVICE_APPEARANCE_DYNAMIC) #if defined(CONFIG_BT_DEVICE_APPEARANCE_DYNAMIC)
uint16_t app; uint16_t app;
int err; int err = 0;
const char *val; const char *val;
val = argv[1]; val = argv[1];
if (strlen(val) != 6 || strncmp(val, "0x", 2) ||
!hex2bin(&val[2], strlen(&val[2]), ((uint8_t *)&app), sizeof(app))) { if (strlen(val) != 6 || strncmp(val, "0x", 2)) {
shell_error(sh, "Argument must be 0x followed by exactly 4 hex digits."); shell_error(sh, "Argument must be 0x followed by exactly 4 hex digits.");
return -EINVAL; return -EINVAL;
} }
app = sys_be16_to_cpu(app); app = shell_strtoul(val, 16, &err);
if (err) {
shell_error(sh, "Argument must be 0x followed by exactly 4 hex digits.");
return -EINVAL;
}
err = bt_set_appearance(app); err = bt_set_appearance(app);
if (err) { if (err) {