michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: Move default terminal width and height to Kconfig

Browse source 
Default values were fixed in the code. Moved to Kconfig to allow
customized configuration. Custom configuration may be used to prevent
line breaking injected on terminal width.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2020-05-13 07:49:57 +02:00 • committed by Carles Cufí
commit 1fb61ea01e
5 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
subsys/shell/shell_cmds.c
View file

@ -28,7 +28,7 @@
#define SHELL_HELP_STATISTICS_RESET \
"Reset shell statistics for the Logger module."
#define SHELL_HELP_RESIZE \
"Console gets terminal screen size or assumes 80 in case" \
"Console gets terminal screen size or assumes default in case" \
" the readout fails. It must be executed after each terminal" \
" width change to ensure correct text display."
#define SHELL_HELP_RESIZE_DEFAULT \
@ -56,6 +56,9 @@
/* 10 == {esc, [, 2, 5, 0, ;, 2, 5, 0, '\0'} */
#define SHELL_CURSOR_POSITION_BUFFER (10u)
#define SHELL_DEFAULT_TERMINAL_WIDTH 80
#define SHELL_DEFAULT_TERMINAL_HEIGHT 24
/* Function reads cursor position from terminal. */
static int cursor_position_get(const struct shell *shell, u16_t *x, u16_t *y)
{
@ -350,7 +353,7 @@ static int cmd_resize_default(const struct shell *shell,
ARG_UNUSED(argv);
SHELL_VT100_CMD(shell, SHELL_VT100_SETCOL_80);
shell->ctx->vt100_ctx.cons.terminal_wid = SHELL_DEFAULT_TERMINAL_WIDTH;
shell->ctx->vt100_ctx.cons.terminal_wid = SHELL_DEFAULT_TERMINAL_WIDTH;
shell->ctx->vt100_ctx.cons.terminal_hei = SHELL_DEFAULT_TERMINAL_HEIGHT;
return 0;
@ -369,9 +372,9 @@ static int cmd_resize(const struct shell *shell, size_t argc, char **argv)
err = terminal_size_get(shell);
if (err != 0) {
shell->ctx->vt100_ctx.cons.terminal_wid =
SHELL_DEFAULT_TERMINAL_WIDTH;
CONFIG_SHELL_DEFAULT_TERMINAL_WIDTH;
shell->ctx->vt100_ctx.cons.terminal_hei =
SHELL_DEFAULT_TERMINAL_HEIGHT;
CONFIG_SHELL_DEFAULT_TERMINAL_HEIGHT;
shell_warn(shell, "No response from the terminal, assumed 80x24"
" screen size");
return -ENOEXEC;