From 9184b5854cd88995a51553b4f9b5d2def30fc1ca Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 28 Mar 2012 16:06:56 +0000 Subject: [PATCH] NX console updates git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4534 42af7a65-404d-4744-a932-0658087f49c3 --- configs/sim/README.txt | 10 ++++++++-- configs/sim/nsh2/appconfig | 5 +++++ configs/sim/nx/defconfig | 3 +++ configs/sim/nx11/defconfig | 3 +++ configs/stm3210e-eval/nsh2/appconfig | 5 ++++- configs/stm3210e-eval/nsh2/defconfig | 3 +++ configs/stm3210e-eval/nx/defconfig | 3 +++ configs/stm3210e-eval/nxlines/defconfig | 3 +++ configs/stm3210e-eval/nxtext/defconfig | 3 +++ configs/vsn/nsh/appconfig | 8 -------- 10 files changed, 35 insertions(+), 11 deletions(-) diff --git a/configs/sim/README.txt b/configs/sim/README.txt index 71542a1b4eb..2a65300d973 100644 --- a/configs/sim/README.txt +++ b/configs/sim/README.txt @@ -367,8 +367,14 @@ nx11 examples/nxconsole ------------------ This configuration is also set up to use the examples/nxconsole - test instead of examples/nx. Simply comment out the following - in the appconfig file: + test instead of examples/nx. To enable this configuration, + First, select Multi-User mode as described above. Then add the + following definitions to the defconfig file: + + -CONFIG_NXCONSOLE=n + +CONFIG_NXCONSOLE=y + + Comment out the following in the appconfig file: -CONFIGURED_APPS += examples/nx +#CONFIGURED_APPS += examples/nx diff --git a/configs/sim/nsh2/appconfig b/configs/sim/nsh2/appconfig index c967980a526..3a12d6f79de 100644 --- a/configs/sim/nsh2/appconfig +++ b/configs/sim/nsh2/appconfig @@ -48,3 +48,8 @@ CONFIGURED_APPS += examples/nx CONFIGURED_APPS += examples/nxhello CONFIGURED_APPS += examples/nxlines CONFIGURED_APPS += examples/touchscreen + +ifeq ($(CONFIG_NXCONSOLE),y) +CONFIGURED_APPS += examples/nxconsole +endif + diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index fcac93e098e..05cfbf5acd2 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -424,6 +424,8 @@ CONFIG_NX_MXCLIENTMSGS=16 # # NxConsole Configuration Settings: # +# CONFIG_NXCONSOLE +# Enables building of the NxConsole driver. # CONFIG_NXCONSOLE_BPP # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. @@ -452,6 +454,7 @@ CONFIG_NX_MXCLIENTMSGS=16 # of the window. This setting can be defining to change this behavior so # that the text is simply truncated until a new line is encountered. # +CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=8 # CONFIG_NXCONSOLE_NOGETRUN # CONFIG_NXCONSOLE_MXCHARS diff --git a/configs/sim/nx11/defconfig b/configs/sim/nx11/defconfig index 890e08592bf..d3962c49bda 100644 --- a/configs/sim/nx11/defconfig +++ b/configs/sim/nx11/defconfig @@ -425,6 +425,8 @@ CONFIG_NX_MXCLIENTMSGS=16 # # NxConsole Configuration Settings: # +# CONFIG_NXCONSOLE +# Enables building of the NxConsole driver. # CONFIG_NXCONSOLE_BPP # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. @@ -453,6 +455,7 @@ CONFIG_NX_MXCLIENTMSGS=16 # of the window. This setting can be defining to change this behavior so # that the text is simply truncated until a new line is encountered. # +CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=32 # CONFIG_NXCONSOLE_NOGETRUN # CONFIG_NXCONSOLE_MXCHARS diff --git a/configs/stm3210e-eval/nsh2/appconfig b/configs/stm3210e-eval/nsh2/appconfig index de15b0ddfd4..dadecb4fc78 100644 --- a/configs/stm3210e-eval/nsh2/appconfig +++ b/configs/stm3210e-eval/nsh2/appconfig @@ -50,9 +50,12 @@ CONFIGURED_APPS += examples/nx CONFIGURED_APPS += examples/nxhello #CONFIGURED_APPS += examples/nxlines #CONFIGURED_APPS += examples/nxtext -#CONFIGURED_APPS += examples/nxconsole CONFIGURED_APPS += examples/usbstorage +ifeq ($(CONFIG_NXCONSOLE),y) +CONFIGURED_APPS += examples/nxconsole +endif + ifeq ($(CONFIG_I2C),y) CONFIGURED_APPS += system/i2c endif diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 09a701b8df9..1891c7e21f8 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -1043,6 +1043,8 @@ CONFIG_NX_MXCLIENTMSGS=16 # # NxConsole Configuration Settings: # +# CONFIG_NXCONSOLE +# Enables building of the NxConsole driver. # CONFIG_NXCONSOLE_BPP # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. @@ -1071,6 +1073,7 @@ CONFIG_NX_MXCLIENTMSGS=16 # of the window. This setting can be defining to change this behavior so # that the text is simply truncated until a new line is encountered. # +CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 # CONFIG_NXCONSOLE_NOGETRUN # CONFIG_NXCONSOLE_MXCHARS diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index 7532dab55c4..f1a5d46d328 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -893,6 +893,8 @@ CONFIG_NX_MXCLIENTMSGS=16 # # NxConsole Configuration Settings: # +# CONFIG_NXCONSOLE +# Enables building of the NxConsole driver. # CONFIG_NXCONSOLE_BPP # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. @@ -921,6 +923,7 @@ CONFIG_NX_MXCLIENTMSGS=16 # of the window. This setting can be defining to change this behavior so # that the text is simply truncated until a new line is encountered. # +CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 # CONFIG_NXCONSOLE_NOGETRUN # CONFIG_NXCONSOLE_MXCHARS diff --git a/configs/stm3210e-eval/nxlines/defconfig b/configs/stm3210e-eval/nxlines/defconfig index 7f912995fa7..0175dc9b5a6 100644 --- a/configs/stm3210e-eval/nxlines/defconfig +++ b/configs/stm3210e-eval/nxlines/defconfig @@ -892,6 +892,8 @@ CONFIG_NX_MXCLIENTMSGS=16 # # NxConsole Configuration Settings: # +# CONFIG_NXCONSOLE +# Enables building of the NxConsole driver. # CONFIG_NXCONSOLE_BPP # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. @@ -920,6 +922,7 @@ CONFIG_NX_MXCLIENTMSGS=16 # of the window. This setting can be defining to change this behavior so # that the text is simply truncated until a new line is encountered. # +CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 # CONFIG_NXCONSOLE_NOGETRUN # CONFIG_NXCONSOLE_MXCHARS diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index 07a97e2c89d..0b92dac4576 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -892,6 +892,8 @@ CONFIG_NX_MXCLIENTMSGS=16 # # NxConsole Configuration Settings: # +# CONFIG_NXCONSOLE +# Enables building of the NxConsole driver. # CONFIG_NXCONSOLE_BPP # Currently, NxConsole supports only a single pixel depth. This # configuration setting must be provided to support that single pixel depth. @@ -920,6 +922,7 @@ CONFIG_NX_MXCLIENTMSGS=16 # of the window. This setting can be defining to change this behavior so # that the text is simply truncated until a new line is encountered. # +CONFIG_NXCONSOLE=n CONFIG_NXCONSOLE_BPP=16 # CONFIG_NXCONSOLE_NOGETRUN # CONFIG_NXCONSOLE_MXCHARS diff --git a/configs/vsn/nsh/appconfig b/configs/vsn/nsh/appconfig index ab296219f4e..a070590790e 100755 --- a/configs/vsn/nsh/appconfig +++ b/configs/vsn/nsh/appconfig @@ -46,18 +46,12 @@ # Path to example in apps/examples containing the user_start entry point CONFIGURED_APPS += examples/nsh -# Invoke the following application after NuttX starts -#CONFIG_BUILTIN_APP_START="hello" - # Application Libraries CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib # Individual selection of built-in applications: -# Hello world provide a simple skeleton/demo application -CONFIGURED_APPS += vsn/hello - # Provide poweroff command to switch off the board CONFIGURED_APPS += vsn/poweroff @@ -79,5 +73,3 @@ CONFIGURED_APPS += system/free # Provide FLASH program installation support CONFIGURED_APPS += system/install - -