From a62f013cd08d25fd252d7a148d1fb4c462d9d7ac Mon Sep 17 00:00:00 2001 From: ERAMOTO Masaya Date: Tue, 6 Feb 2018 14:27:29 +0900 Subject: [PATCH] shared/shell: Print out help if using invalid command Because Vincent Petry kindly reported that it is hard to use a command in a submenu, clients are changed to print out help messages as below when an invalid command is used. [bluetooth]# list-attributes Invalid command in menu main: list-attributes Use "help" for a list of available commands in a menu. Use "menu " if you want to enter any submenu. Use "back" if you want to return to menu main. --- src/shared/shell.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/shared/shell.c b/src/shared/shell.c index 30c1dfde1..12330ff53 100644 --- a/src/shared/shell.c +++ b/src/shared/shell.c @@ -198,6 +198,15 @@ static const struct bt_shell_menu_entry default_menu[] = { { } }; +static void shell_print_help(void) +{ + print_text(COLOR_HIGHLIGHT, + "\n" + "Use \"help\" for a list of available commands in a menu.\n" + "Use \"menu \" if you want to enter any submenu.\n" + "Use \"back\" if you want to return to menu main."); +} + static void shell_print_menu(void) { const struct bt_shell_menu_entry *entry; @@ -348,8 +357,12 @@ static void shell_exec(int argc, char *argv[]) return; if (menu_exec(default_menu, argc, argv) == -ENOENT) { - if (menu_exec(data.menu->entries, argc, argv) == -ENOENT) - print_text(COLOR_HIGHLIGHT, "Invalid command"); + if (menu_exec(data.menu->entries, argc, argv) == -ENOENT) { + print_text(COLOR_HIGHLIGHT, + "Invalid command in menu %s: %s", + data.menu->name , argv[0]); + shell_print_help(); + } } } -- 2.47.3