diff options
author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-28 16:06:56 +0000 |
---|---|---|
committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-03-28 16:06:56 +0000 |
commit | 7cf33ab655c02790c34ff8227698ca5e7a69accc (patch) | |
tree | d57d866e590029f590543adf137fffaeb234ab84 | |
parent | 5bae5c561af045acf7c6b9252ca1bb772fc91fec (diff) |
NX console updates
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4534 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rw-r--r-- | apps/examples/README.txt | 16 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_internal.h | 40 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_main.c | 2 | ||||
-rw-r--r-- | apps/examples/nxconsole/nxcon_toolbar.c | 10 | ||||
-rw-r--r-- | nuttx/Documentation/NXGraphicsSubsystem.html | 2 | ||||
-rw-r--r-- | nuttx/configs/sim/README.txt | 10 | ||||
-rw-r--r-- | nuttx/configs/sim/nsh2/appconfig | 5 | ||||
-rw-r--r-- | nuttx/configs/sim/nx/defconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/sim/nx11/defconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/appconfig | 5 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/defconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nx/defconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nxlines/defconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/stm3210e-eval/nxtext/defconfig | 3 | ||||
-rwxr-xr-x | nuttx/configs/vsn/nsh/appconfig | 8 | ||||
-rw-r--r-- | nuttx/graphics/Makefile | 2 | ||||
-rw-r--r-- | nuttx/graphics/README.txt | 2 | ||||
-rwxr-xr-x | nuttx/graphics/nxconsole/nxcon_driver.c | 5 | ||||
-rw-r--r-- | nuttx/include/nuttx/nx/nxconsole.h | 34 | ||||
-rw-r--r-- | nuttx/lib/stdio/lib_libfflush.c | 2 |
20 files changed, 128 insertions, 33 deletions
diff --git a/apps/examples/README.txt b/apps/examples/README.txt index f7b6d74e79..01d4fb0ecb 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -627,18 +627,20 @@ examples/nxconsole buffer driver for use in the test. Default: 0 CONFIG_EXAMPLES_NXCON_DEVNO - The LCD device to select from the LCD driver for use in the test: Default: 0 - CONFIG_EXAMPLES_NXCON_BGCOLOR -- The color of the background. Default depends on - CONFIG_EXAMPLES_NXCON_BPP. - CONFIG_EXAMPLES_NXCON_WCOLOR -- The color of the window. Default depends on - CONFIG_EXAMPLES_NXCON_BPP. - CONFIG_EXAMPLES_NXCON_FONTID - Selects the font (see font ID numbers in + CONFIG_EXAMPLES_NXCON_BGCOLOR -- The color of the background. Default + Default is a darker royal blue. + CONFIG_EXAMPLES_NXCON_WCOLOR -- The color of the window. Default is a light + slate blue. + CONFIG_EXAMPLES_NXCON_FONTID -- Selects the font (see font ID numbers in include/nuttx/nx/nxfonts.h) - CONFIG_EXAMPLES_NXCON_FONTCOLOR -- The color of the fonts. Default depends on - CONFIG_EXAMPLES_NXCON_BPP. + CONFIG_EXAMPLES_NXCON_FONTCOLOR -- The color of the fonts. Default is + black. CONFIG_EXAMPLES_NXCON_BPP -- Pixels per pixel to use. Valid options include 2, 4, 8, 16, 24, and 32. Default is 32. CONFIG_EXAMPLES_NXCON_TOOLBAR_HEIGHT -- The height of the toolbar. Default: 16 + CONFIG_EXAMPLES_NXCON_TBCOLOR -- The color of the toolbar. Default is + a medium grey. CONFIG_EXAMPLES_NXCON_EXTERNINIT - The driver for the graphics device on this platform requires some unusual initialization. This is the for, for example, SPI LCD/OLED devices. If this configuration is diff --git a/apps/examples/nxconsole/nxcon_internal.h b/apps/examples/nxconsole/nxcon_internal.h index f5d88e6006..fd37773341 100644 --- a/apps/examples/nxconsole/nxcon_internal.h +++ b/apps/examples/nxconsole/nxcon_internal.h @@ -46,6 +46,8 @@ #include <stdbool.h> #include <semaphore.h> +#include <nuttx/rgbcolors.h> + #include <nuttx/nx/nx.h> #include <nuttx/nx/nxglib.h> #include <nuttx/nx/nxtk.h> @@ -61,6 +63,10 @@ # error "NX is not enabled (CONFIG_NX)" #endif +#ifndef CONFIG_NXCONSOLE +# error "NxConsole is not enabled (CONFIG_NXCONSOLE)" +#endif + /* If not specified, assume that the hardware supports one video plane */ #if CONFIG_NX_NPLANES != 1 @@ -93,30 +99,42 @@ # endif #endif -/* Background color */ +/* Background color (default is darker royal blue) */ #ifndef CONFIG_EXAMPLES_NXCON_BGCOLOR # if CONFIG_EXAMPLES_NXCON_BPP == 24 || CONFIG_EXAMPLES_NXCON_BPP == 32 -# define CONFIG_EXAMPLES_NXCON_BGCOLOR 0x007b68ee +# define CONFIG_EXAMPLES_NXCON_BGCOLOR RGBTO24(39, 64, 139) # elif CONFIG_EXAMPLES_NXCON_BPP == 16 -# define CONFIG_EXAMPLES_NXCON_BGCOLOR 0x7b5d +# define CONFIG_EXAMPLES_NXCON_BGCOLOR RGBTO16(39, 64, 139) # else -# define CONFIG_EXAMPLES_NXCON_BGCOLOR ' ' +# define CONFIG_EXAMPLES_NXCON_BGCOLOR RGBTO8(39, 64, 139) # endif #endif -/* Window color */ +/* Window color (lighter steel blue) */ #ifndef CONFIG_EXAMPLES_NXCON_WCOLOR # if CONFIG_EXAMPLES_NXCON_BPP == 24 || CONFIG_EXAMPLES_NXCON_BPP == 32 -# define CONFIG_EXAMPLES_NXCON_WCOLOR 0x007b68ee +# define CONFIG_EXAMPLES_NXCON_WCOLOR RGBTO24(202, 225, 255) # elif CONFIG_EXAMPLES_NXCON_BPP == 16 -# define CONFIG_EXAMPLES_NXCON_WCOLOR 0x7b5d +# define CONFIG_EXAMPLES_NXCON_WCOLOR RGBTO16(202, 225, 255) # else -# define CONFIG_EXAMPLES_NXCON_WCOLOR ' ' +# define CONFIG_EXAMPLES_NXCON_WCOLOR RGBTO8(202, 225, 255) # endif #endif +/* Toolbar color (medium grey) */ + +#ifndef CONFIG_EXAMPLES_NXCON_TBCOLOR +# if CONFIG_EXAMPLES_NX_BPP == 24 || CONFIG_EXAMPLES_NX_BPP == 32 +# define CONFIG_EXAMPLES_NXCON_TBCOLOR RGBTO24(188, 188, 188) +# elif CONFIG_EXAMPLES_NX_BPP == 16 +# define CONFIG_EXAMPLES_NXCON_TBCOLOR RGBTO16(188, 188, 188) +# else +# define CONFIG_EXAMPLES_NXCON_TBCOLOR RGBTO8(188, 188, 188) +# endif +#endif + /* Font ID */ #ifndef CONFIG_EXAMPLES_NXCON_FONTID @@ -127,11 +145,11 @@ #ifndef CONFIG_EXAMPLES_NXCON_FONTCOLOR # if CONFIG_EXAMPLES_NXCON_BPP == 24 || CONFIG_EXAMPLES_NXCON_BPP == 32 -# define CONFIG_EXAMPLES_NXCON_FONTCOLOR 0x00000000 +# define CONFIG_EXAMPLES_NXCON_FONTCOLOR RGBTO24(0, 0, 0) # elif CONFIG_EXAMPLES_NXCON_BPP == 16 -# define CONFIG_EXAMPLES_NXCON_FONTCOLOR 0x0000 +# define CONFIG_EXAMPLES_NXCON_FONTCOLOR RGBTO16(0, 0, 0) # else -# define CONFIG_EXAMPLES_NXCON_FONTCOLOR 'F' +# define CONFIG_EXAMPLES_NXCON_FONTCOLOR RGBTO8(0, 0, 0) # endif #endif diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c index 2edea83bab..fad6b9c0ca 100644 --- a/apps/examples/nxconsole/nxcon_main.c +++ b/apps/examples/nxconsole/nxcon_main.c @@ -490,7 +490,7 @@ int MAIN_NAME(int argc, char **argv) if (++ndx >= NCON_MSG_NLINES) { #ifdef CONFIG_NSH_BUILTIN_APPS - /* If this is an NSH built-in apps, then just return after all + /* If this is an NSH built-in app, then just return after all * of the lines have been presented. */ diff --git a/apps/examples/nxconsole/nxcon_toolbar.c b/apps/examples/nxconsole/nxcon_toolbar.c index 38b5c1ee38..d4432b2f4d 100644 --- a/apps/examples/nxconsole/nxcon_toolbar.c +++ b/apps/examples/nxconsole/nxcon_toolbar.c @@ -114,9 +114,19 @@ const struct nx_callback_s g_nxtoolcb = static void nxtool_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, bool more, FAR void *arg) { + nxgl_mxpixel_t color[CONFIG_NX_NPLANES]; + int ret; + gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, more ? "true" : "false"); + + color[0] = CONFIG_EXAMPLES_NXCON_TBCOLOR; + ret = nxtk_filltoolbar(hwnd, rect, color); + if (ret < 0) + { + gdbg("nxtk_filltoolbar failed: %d\n", errno); + } } /**************************************************************************** diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index 81ead3ed23..9a4080668b 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -3353,6 +3353,8 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height, <ul> <dl> + <dt><code>CONFIG_NXCONSOLE</code>: + <dd>Enables building of the NxConsole driver. <dt><code>CONFIG_NXCONSOLE_BPP</code>: <dd>Currently, NxConsole supports only a single pixel depth. This configuration setting must be provided to support that single pixel depth. diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt index 71542a1b4e..2a65300d97 100644 --- a/nuttx/configs/sim/README.txt +++ b/nuttx/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/nuttx/configs/sim/nsh2/appconfig b/nuttx/configs/sim/nsh2/appconfig index c967980a52..3a12d6f79d 100644 --- a/nuttx/configs/sim/nsh2/appconfig +++ b/nuttx/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/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index fcac93e098..05cfbf5acd 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/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/nuttx/configs/sim/nx11/defconfig b/nuttx/configs/sim/nx11/defconfig index 890e08592b..d3962c49bd 100644 --- a/nuttx/configs/sim/nx11/defconfig +++ b/nuttx/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/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig index de15b0ddfd..dadecb4fc7 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/appconfig +++ b/nuttx/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/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 09a701b8df..1891c7e21f 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/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/nuttx/configs/stm3210e-eval/nx/defconfig b/nuttx/configs/stm3210e-eval/nx/defconfig index 7532dab55c..f1a5d46d32 100644 --- a/nuttx/configs/stm3210e-eval/nx/defconfig +++ b/nuttx/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/nuttx/configs/stm3210e-eval/nxlines/defconfig b/nuttx/configs/stm3210e-eval/nxlines/defconfig index 7f912995fa..0175dc9b5a 100644 --- a/nuttx/configs/stm3210e-eval/nxlines/defconfig +++ b/nuttx/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/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig index 07a97e2c89..0b92dac457 100644 --- a/nuttx/configs/stm3210e-eval/nxtext/defconfig +++ b/nuttx/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/nuttx/configs/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig index ab296219f4..a070590790 100755 --- a/nuttx/configs/vsn/nsh/appconfig +++ b/nuttx/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 - - diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile index 590e41ffad..4ba9b7d4f1 100644 --- a/nuttx/graphics/Makefile +++ b/nuttx/graphics/Makefile @@ -68,9 +68,11 @@ include nxfonts/Make.defs DEPPATH += --dep-path nxfonts CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxfonts} +ifeq ($(CONFIG_NXCONSOLE),y) include nxconsole/Make.defs DEPPATH += --dep-path nxconsole CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/graphics/nxconsole} +endif ASRCS = $(NXGLIB_ASRCS) $(NXBE_ASRCS) $(NX_ASRCS) $(NXTK_ASRCS) $(NXFONTS_ASRCS) $(NXCON_ASRCS) AOBJS = $(ASRCS:.S=$(OBJEXT)) diff --git a/nuttx/graphics/README.txt b/nuttx/graphics/README.txt index d5027c1f0c..3e7f61bcf4 100644 --- a/nuttx/graphics/README.txt +++ b/nuttx/graphics/README.txt @@ -319,6 +319,8 @@ CONFIG_NXFONT_SERIF38X49B 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. diff --git a/nuttx/graphics/nxconsole/nxcon_driver.c b/nuttx/graphics/nxconsole/nxcon_driver.c index dc7d5f3530..d4ab71464d 100755 --- a/nuttx/graphics/nxconsole/nxcon_driver.c +++ b/nuttx/graphics/nxconsole/nxcon_driver.c @@ -124,6 +124,7 @@ static ssize_t nxcon_write(FAR struct file *filep, FAR const char *buffer, size_t buflen) { FAR struct nxcon_state_s *priv; + ssize_t remaining; char ch; int lineheight; int ret; @@ -145,7 +146,7 @@ static ssize_t nxcon_write(FAR struct file *filep, FAR const char *buffer, lineheight = (priv->fheight + CONFIG_NXCONSOLE_LINESEPARATION); - while (buflen-- > 0) + for (remaining = (ssize_t)buflen; remaining > 0; remaining--) { /* Ignore carriage returns */ @@ -195,7 +196,7 @@ static ssize_t nxcon_write(FAR struct file *filep, FAR const char *buffer, } sem_post(&priv->exclsem); - return buflen; + return (ssize_t)buflen; } /**************************************************************************** diff --git a/nuttx/include/nuttx/nx/nxconsole.h b/nuttx/include/nuttx/nx/nxconsole.h index 3980d3a1ea..bf2c321607 100644 --- a/nuttx/include/nuttx/nx/nxconsole.h +++ b/nuttx/include/nuttx/nx/nxconsole.h @@ -45,9 +45,42 @@ #include <nuttx/nx/nx.h> #include <nuttx/nx/nxtk.h> +#ifdef CONFIG_NXCONSOLE + /**************************************************************************** * Pre-processor definitions ****************************************************************************/ +/* Configuration ************************************************************/ +/* 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. + * Default: The smallest enabled pixel depth. (see CONFIG_NX_DISABLE_*BPP) + * CONFIG_NXCONSOLE_NOGETRUN + * NxConsole needs to know if it can read from the LCD or not. If reading + * from the LCD is supported, then NxConsole can do more efficient + * scrolling. Default: Supported + * CONFIG_NXCONSOLE_MXCHARS + * NxConsole needs to remember every character written to the console so + * that it can redraw the window. This setting determines the size of some + * internal memory allocations used to hold the character data. Default: 128. + * CONFIG_NXCONSOLE_FONTCACHE + * If this setting is defined, then caching of fonts will be supported by + * NxConsole. Each font must be rendered from the tiny font storage format + * to the full display size and pixel depth. If this setting is defined, then + * the more recently used font glyphs will be retained in a cache of size + * CONFIG_NXCONSOLE_CACHESIZE. Default: No font caching. + * CONFIG_NXCONSOLE_CACHESIZE + * If CONFIG_NXCONSOLE_FONTCACHE, then this setting will control the size + * of the font cache (in number of glyphs). Default: 16. + * CONFIG_NXCONSOLE_LINESEPARATION + * This the space (in rows) between each row of test. Default: 2 + * CONFIG_NXCONSOLE_NOWRAP + * By default, lines will wrap when the test reaches the right hand side + * 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. + */ /**************************************************************************** * Public Types @@ -198,4 +231,5 @@ EXTERN void nxcon_redraw(NXCONSOLE handle, FAR const struct nxgl_rect_s *rect, } #endif +#endif /* CONFIG_NXCONSOLE */ #endif /* __INCLUDE_NUTTX_NX_NXCONSOLE_H */ diff --git a/nuttx/lib/stdio/lib_libfflush.c b/nuttx/lib/stdio/lib_libfflush.c index ec1591e7a6..fb5a8768e9 100644 --- a/nuttx/lib/stdio/lib_libfflush.c +++ b/nuttx/lib/stdio/lib_libfflush.c @@ -122,7 +122,7 @@ ssize_t lib_fflush(FAR FILE *stream, bool bforce) lib_take_semaphore(stream); - /* Make sure tht the buffer holds valid data */ + /* Make sure that the buffer holds valid data */ if (stream->fs_bufpos != stream->fs_bufstart) { |