diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:18:08 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-20 14:18:08 -0600 |
| commit | 4860036d8f145187cfe700743def8d0ee3548f1b (patch) | |
| tree | df2196f51b1ee2be9f6986f54da4f6056a5ebfd0 /nuttx/configs | |
| parent | 29268dcf2e63a5b3b2d9d8d9f56215819e9e3970 (diff) | |
| download | px4-nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.gz px4-nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.tar.bz2 px4-nuttx-4860036d8f145187cfe700743def8d0ee3548f1b.zip | |
Rename CONFIG_NXCONSOLE* to CONFIG_NXTERM*
Diffstat (limited to 'nuttx/configs')
40 files changed, 140 insertions, 140 deletions
diff --git a/nuttx/configs/compal_e99/nsh_highram/defconfig b/nuttx/configs/compal_e99/nsh_highram/defconfig index c2b4143cd..31d081cc0 100644 --- a/nuttx/configs/compal_e99/nsh_highram/defconfig +++ b/nuttx/configs/compal_e99/nsh_highram/defconfig @@ -442,7 +442,7 @@ CONFIG_NXFONT_SANS17X22=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig index f138c43c2..c21b8d070 100644 --- a/nuttx/configs/hymini-stm32v/nsh2/defconfig +++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig @@ -574,7 +574,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index ecf685b1a..3a8937b56 100644 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -501,7 +501,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index 48eddce40..9a5fb168a 100644 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -509,7 +509,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig index 3493ab8a1..0b91b49c6 100644 --- a/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig +++ b/nuttx/configs/lpcxpresso-lpc1768/nx/defconfig @@ -562,7 +562,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/maple/nx/defconfig b/nuttx/configs/maple/nx/defconfig index bf092dc6e..1e957f7bf 100644 --- a/nuttx/configs/maple/nx/defconfig +++ b/nuttx/configs/maple/nx/defconfig @@ -656,7 +656,7 @@ CONFIG_NXFONT_MONO5X8=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig index cafb64c89..40a9c8ffa 100644 --- a/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig +++ b/nuttx/configs/mikroe-stm32f4/fulldemo/defconfig @@ -795,24 +795,24 @@ CONFIG_NXFONT_SANS28X37B=y CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=128 -CONFIG_NXCONSOLE_CACHESIZE=16 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=128 +CONFIG_NXTERM_CACHESIZE=16 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/mikroe-stm32f4/nx/defconfig b/nuttx/configs/mikroe-stm32f4/nx/defconfig index 24cb3e12e..7b70b70c6 100644 --- a/nuttx/configs/mikroe-stm32f4/nx/defconfig +++ b/nuttx/configs/mikroe-stm32f4/nx/defconfig @@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/mikroe-stm32f4/nxlines/defconfig b/nuttx/configs/mikroe-stm32f4/nxlines/defconfig index 97701635b..8092b9b74 100644 --- a/nuttx/configs/mikroe-stm32f4/nxlines/defconfig +++ b/nuttx/configs/mikroe-stm32f4/nxlines/defconfig @@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/mikroe-stm32f4/nxtext/defconfig b/nuttx/configs/mikroe-stm32f4/nxtext/defconfig index bd9ea94bf..82fd22bf4 100644 --- a/nuttx/configs/mikroe-stm32f4/nxtext/defconfig +++ b/nuttx/configs/mikroe-stm32f4/nxtext/defconfig @@ -579,7 +579,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index 2269ecf68..365f20b00 100644 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -573,7 +573,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/open1788/nxlines/defconfig b/nuttx/configs/open1788/nxlines/defconfig index 1439ad34c..9012a7ebe 100644 --- a/nuttx/configs/open1788/nxlines/defconfig +++ b/nuttx/configs/open1788/nxlines/defconfig @@ -483,7 +483,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index bdc315fa5..ffe63cf20 100644 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -542,7 +542,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sam3u-ek/nxwm/defconfig b/nuttx/configs/sam3u-ek/nxwm/defconfig index 8271d94da..0fd1c56e7 100644 --- a/nuttx/configs/sam3u-ek/nxwm/defconfig +++ b/nuttx/configs/sam3u-ek/nxwm/defconfig @@ -571,24 +571,24 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=325 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/sam4e-ek/nxwm/defconfig b/nuttx/configs/sam4e-ek/nxwm/defconfig index 4a786be28..59d1ae2df 100644 --- a/nuttx/configs/sam4e-ek/nxwm/defconfig +++ b/nuttx/configs/sam4e-ek/nxwm/defconfig @@ -832,24 +832,24 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=396 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=396 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/sama5d3x-ek/nx/defconfig b/nuttx/configs/sama5d3x-ek/nx/defconfig index 9e30c599c..1100c1173 100644 --- a/nuttx/configs/sama5d3x-ek/nx/defconfig +++ b/nuttx/configs/sama5d3x-ek/nx/defconfig @@ -641,7 +641,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig index 817bea787..e76e692a1 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig @@ -685,24 +685,24 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=640 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=640 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/sama5d4-ek/nsh/defconfig b/nuttx/configs/sama5d4-ek/nsh/defconfig index f9fb269b4..f24b57be0 100644 --- a/nuttx/configs/sama5d4-ek/nsh/defconfig +++ b/nuttx/configs/sama5d4-ek/nsh/defconfig @@ -955,7 +955,7 @@ CONFIG_NXFONTS_CHARBITS=7 CONFIG_NXFONT_SERIF22X28B=y # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sama5d4-ek/nxwm/defconfig b/nuttx/configs/sama5d4-ek/nxwm/defconfig index 5ba960064..8b18b926a 100644 --- a/nuttx/configs/sama5d4-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d4-ek/nxwm/defconfig @@ -919,24 +919,24 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=640 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=640 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig index f48264661..83bc63bc6 100644 --- a/nuttx/configs/shenzhou/nxwm/defconfig +++ b/nuttx/configs/shenzhou/nxwm/defconfig @@ -734,24 +734,24 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=325 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt index 7cedabed7..7fe91efd9 100644 --- a/nuttx/configs/sim/README.txt +++ b/nuttx/configs/sim/README.txt @@ -459,8 +459,8 @@ nx11 First, select Multi-User mode as described above. Then add the following definitions to the defconfig file: - -CONFIG_NXCONSOLE=n - +CONFIG_NXCONSOLE=y + -CONFIG_NXTERM=n + +CONFIG_NXTERM=y -CONFIG_NX_MULTIUSER=n +CONFIG_NX_MULTIUSER=y diff --git a/nuttx/configs/sim/nsh2/defconfig b/nuttx/configs/sim/nsh2/defconfig index c23c92379..9c0a53b88 100644 --- a/nuttx/configs/sim/nsh2/defconfig +++ b/nuttx/configs/sim/nsh2/defconfig @@ -351,7 +351,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index 78fe7db94..873a96b5c 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -376,7 +376,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig index 3de91c405..8a7555f21 100644 --- a/nuttx/configs/sim/nx11/defconfig +++ b/nuttx/configs/sim/nx11/defconfig @@ -377,7 +377,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sim/nxlines/defconfig b/nuttx/configs/sim/nxlines/defconfig index fe3082e7c..d703bda12 100644 --- a/nuttx/configs/sim/nxlines/defconfig +++ b/nuttx/configs/sim/nxlines/defconfig @@ -376,7 +376,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig index 70258c8d7..a3e158ae2 100644 --- a/nuttx/configs/sim/nxwm/defconfig +++ b/nuttx/configs/sim/nxwm/defconfig @@ -367,24 +367,24 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=32 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=256 -CONFIG_NXCONSOLE_CACHESIZE=16 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=32 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=256 +CONFIG_NXTERM_CACHESIZE=16 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/sim/touchscreen/defconfig b/nuttx/configs/sim/touchscreen/defconfig index 69f8da57e..01279db9e 100644 --- a/nuttx/configs/sim/touchscreen/defconfig +++ b/nuttx/configs/sim/touchscreen/defconfig @@ -385,7 +385,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt index d253c0ff0..7b8763f94 100644 --- a/nuttx/configs/stm3210e-eval/README.txt +++ b/nuttx/configs/stm3210e-eval/README.txt @@ -926,7 +926,7 @@ Where <subdir> is one of the following: The following definition in the defconfig file to enables the NxConsole driver: - CONFIG_NXCONSOLE=y + CONFIG_NXTERM=y And this selects apps/examples/nxconsole instead of apps/examples/nsh: diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 13cff4338..2ff295f99 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -752,7 +752,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index d653e5e69..ff91b744d 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/configs/stm3210e-eval/nx/defconfig @@ -678,7 +678,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/stm3210e-eval/nxconsole/defconfig b/nuttx/configs/stm3210e-eval/nxconsole/defconfig index 92e280bbc..cdb898a62 100644 --- a/nuttx/configs/stm3210e-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3210e-eval/nxconsole/defconfig @@ -655,24 +655,24 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=256 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=256 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/stm3210e-eval/pm/defconfig b/nuttx/configs/stm3210e-eval/pm/defconfig index 941002e24..9c4f8e611 100644 --- a/nuttx/configs/stm3210e-eval/pm/defconfig +++ b/nuttx/configs/stm3210e-eval/pm/defconfig @@ -676,7 +676,7 @@ CONFIG_NXFONT_SANS28X37B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig index c48715089..7d8f4d7cb 100644 --- a/nuttx/configs/stm3220g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig @@ -788,24 +788,24 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=325 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt index f3be1fa4f..0d5feef1c 100644 --- a/nuttx/configs/stm3240g-eval/README.txt +++ b/nuttx/configs/stm3240g-eval/README.txt @@ -1424,7 +1424,7 @@ Where <subdir> is one of the following: The following definition in the defconfig file to enables the NxConsole driver: - CONFIG_NXCONSOLE=y + CONFIG_NXTERM=y And this selects examples/nxconsole instead of examples/nsh: diff --git a/nuttx/configs/stm3240g-eval/knxwm/defconfig b/nuttx/configs/stm3240g-eval/knxwm/defconfig index 0ac4f2c90..f4304e54c 100644 --- a/nuttx/configs/stm3240g-eval/knxwm/defconfig +++ b/nuttx/configs/stm3240g-eval/knxwm/defconfig @@ -788,7 +788,7 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig index ef13a86cf..60f4643a3 100644 --- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig +++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig @@ -761,24 +761,24 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=256 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=256 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -# CONFIG_NXCONSOLE_NXKBDIN is not set -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +# CONFIG_NXTERM_NXKBDIN is not set +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig index 7cd0c9a0c..b73f68a31 100644 --- a/nuttx/configs/stm3240g-eval/nxwm/defconfig +++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig @@ -783,24 +783,24 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -CONFIG_NXCONSOLE=y +CONFIG_NXTERM=y # # NxConsole Output Text/Graphics Options # -CONFIG_NXCONSOLE_BPP=16 -CONFIG_NXCONSOLE_CURSORCHAR=137 -CONFIG_NXCONSOLE_MXCHARS=325 -CONFIG_NXCONSOLE_CACHESIZE=32 -CONFIG_NXCONSOLE_LINESEPARATION=0 -# CONFIG_NXCONSOLE_NOWRAP is not set +CONFIG_NXTERM_BPP=16 +CONFIG_NXTERM_CURSORCHAR=137 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_LINESEPARATION=0 +# CONFIG_NXTERM_NOWRAP is not set # # NxConsole Input options # -CONFIG_NXCONSOLE_NXKBDIN=y -CONFIG_NXCONSOLE_KBDBUFSIZE=16 -CONFIG_NXCONSOLE_NPOLLWAITERS=4 +CONFIG_NXTERM_NXKBDIN=y +CONFIG_NXTERM_KBDBUFSIZE=16 +CONFIG_NXTERM_NPOLLWAITERS=4 # # NX Multi-user only options diff --git a/nuttx/configs/stm32f4discovery/nxlines/defconfig b/nuttx/configs/stm32f4discovery/nxlines/defconfig index 29c5dac3a..4b8e2d22d 100644 --- a/nuttx/configs/stm32f4discovery/nxlines/defconfig +++ b/nuttx/configs/stm32f4discovery/nxlines/defconfig @@ -664,7 +664,7 @@ CONFIG_NXFONT_SANS22X29B=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/zkit-arm-1769/nxhello/defconfig b/nuttx/configs/zkit-arm-1769/nxhello/defconfig index eebed8b3e..1c3a1e4a7 100644 --- a/nuttx/configs/zkit-arm-1769/nxhello/defconfig +++ b/nuttx/configs/zkit-arm-1769/nxhello/defconfig @@ -667,7 +667,7 @@ CONFIG_NXFONT_SANS23X27=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options diff --git a/nuttx/configs/zp214xpa/nxlines/defconfig b/nuttx/configs/zp214xpa/nxlines/defconfig index 9a9852fca..d01456331 100644 --- a/nuttx/configs/zp214xpa/nxlines/defconfig +++ b/nuttx/configs/zp214xpa/nxlines/defconfig @@ -378,7 +378,7 @@ CONFIG_NXFONT_MONO5X8=y # CONFIG_NXFONT_SERIF22X28B is not set # CONFIG_NXFONT_SERIF27X38B is not set # CONFIG_NXFONT_SERIF38X49B is not set -# CONFIG_NXCONSOLE is not set +# CONFIG_NXTERM is not set # # NX Multi-user only options |