michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mesh: Port shell module to the new shell

Browse source 
This makes mesh shell to register commands with the new shell subsystem
and stop using the legacy shell.

Fixes #11056

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2018-11-06 16:12:08 +02:00 • committed by Carles Cufí
commit 7aa58ff91d
4 changed files with 444 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

2
subsys/bluetooth/host/mesh/Kconfig
View file

@ -425,7 +425,7 @@ config BT_MESH_HEALTH_CLI
config BT_MESH_SHELL config BT_MESH_SHELL
bool "Enable Bluetooth Mesh shell" bool "Enable Bluetooth Mesh shell"
select CONSOLE_SHELL select SHELL
depends on BT_MESH_CFG_CLI depends on BT_MESH_CFG_CLI
depends on BT_MESH_HEALTH_CLI depends on BT_MESH_HEALTH_CLI
help help

778
subsys/bluetooth/host/mesh/shell.c
View file

File diff suppressed because it is too large Load diff

5
tests/bluetooth/mesh_shell/prj.conf
View file

@ -1,12 +1,11 @@
CONFIG_TEST=y CONFIG_TEST=y
#CONFIG_INIT_STACKS=y #CONFIG_INIT_STACKS=y
CONFIG_USERSPACE=n CONFIG_USERSPACE=n
CONFIG_MAIN_STACK_SIZE=320 CONFIG_MAIN_STACK_SIZE=448
CONFIG_ISR_STACK_SIZE=1024 CONFIG_ISR_STACK_SIZE=1024
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
CONFIG_CONSOLE_HANDLER=y CONFIG_CONSOLE_HANDLER=y
CONFIG_CONSOLE_SHELL=y
CONFIG_BT_SETTINGS=y CONFIG_BT_SETTINGS=y
CONFIG_FLASH=y CONFIG_FLASH=y
@ -32,7 +31,7 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n
CONFIG_BT_CTLR_ADV_EXT=n CONFIG_BT_CTLR_ADV_EXT=n
CONFIG_BT_CTLR_PRIVACY=n CONFIG_BT_CTLR_PRIVACY=n
CONFIG_BT_RX_BUF_COUNT=30 CONFIG_BT_RX_BUF_COUNT=28
CONFIG_BT_L2CAP_RX_MTU=69 CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69 CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BT_L2CAP_TX_BUF_COUNT=4 CONFIG_BT_L2CAP_TX_BUF_COUNT=4

6
tests/bluetooth/mesh_shell/src/main.c
View file

@ -11,12 +11,10 @@
#include <misc/printk.h> #include <misc/printk.h>
#include <zephyr.h> #include <zephyr.h>
#include <shell/legacy_shell.h> #include <shell/shell.h>
void main(void) void main(void)
{ {
printk("Type \"help\" for supported commands.\n"); printk("Type \"help\" for supported commands.\n");
printk("Before any Bluetooth commands you must run \"init\"\n"); printk("Before any Mesh commands you must run \"mesh init\"\n");
shell_register_default_module("mesh");
} }