sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More NX Console fixes... good progress but still not ready for prime time

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4533 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-03-28 01:52:00 +00:00
parent 7bdfdb2623
commit 6267d6405c
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/nxconsole/nxcon_internal.h
View File

@ -71,7 +71,7 @@
# define CONFIG_EXAMPLES_NXCON_VPLANE 0 # define CONFIG_EXAMPLES_NXCON_VPLANE 0
#endif #endif
/* Pixel depth. If non provided, pick the smallest enabled pixel depth */ /* Pixel depth. If none provided, pick the smallest enabled pixel depth */
#ifndef CONFIG_EXAMPLES_NXCON_BPP #ifndef CONFIG_EXAMPLES_NXCON_BPP
# if !defined(CONFIG_NX_DISABLE_1BPP) # if !defined(CONFIG_NX_DISABLE_1BPP)

40
examples/nxtext/nxtext_internal.h
View File

@ -64,10 +64,30 @@
# define CONFIG_EXAMPLES_NXTEXT_VPLANE 0 # define CONFIG_EXAMPLES_NXTEXT_VPLANE 0
#endif #endif
/* Pixel depth. If none provided, pick the smallest enabled pixel depth */
#ifndef CONFIG_EXAMPLES_NXTEXT_BPP #ifndef CONFIG_EXAMPLES_NXTEXT_BPP
# define CONFIG_EXAMPLES_NXTEXT_BPP 32 # if !defined(CONFIG_NX_DISABLE_1BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 1
# elif !defined(CONFIG_NX_DISABLE_2BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 2
# elif !defined(CONFIG_NX_DISABLE_4BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 4
# elif !defined(CONFIG_NX_DISABLE_8BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 8
# elif !defined(CONFIG_NX_DISABLE_16BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 16
//#elif !defined(CONFIG_NX_DISABLE_24BPP)
//# define CONFIG_NXCONSOLE_BPP 24
# elif !defined(CONFIG_NX_DISABLE_32BPP)
# define CONFIG_EXAMPLES_NXTEXT_BPP 32
# else
# error "No pixel depth provided"
# endif
#endif #endif
/* Background color */
#ifndef CONFIG_EXAMPLES_NXTEXT_BGCOLOR #ifndef CONFIG_EXAMPLES_NXTEXT_BGCOLOR
# if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32 # if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
# define CONFIG_EXAMPLES_NXTEXT_BGCOLOR 0x007b68ee # define CONFIG_EXAMPLES_NXTEXT_BGCOLOR 0x007b68ee
@ -78,10 +98,14 @@
# endif # endif
#endif #endif
/* Pop-up font ID */
#ifndef CONFIG_EXAMPLES_NXTEXT_PUFONTID #ifndef CONFIG_EXAMPLES_NXTEXT_PUFONTID
# define CONFIG_EXAMPLES_NXTEXT_PUFONTID NXFONT_DEFAULT # define CONFIG_EXAMPLES_NXTEXT_PUFONTID NXFONT_DEFAULT
#endif #endif
/* Pop-up window color */
#ifndef CONFIG_EXAMPLES_NXTEXT_PUCOLOR #ifndef CONFIG_EXAMPLES_NXTEXT_PUCOLOR
# if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32 # if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
# define CONFIG_EXAMPLES_NXTEXT_PUCOLOR 0x00dcdcdc # define CONFIG_EXAMPLES_NXTEXT_PUCOLOR 0x00dcdcdc
@ -92,10 +116,14 @@
# endif # endif
#endif #endif
/* Background font ID */
#ifndef CONFIG_EXAMPLES_NXTEXT_BGFONTID #ifndef CONFIG_EXAMPLES_NXTEXT_BGFONTID
# define CONFIG_EXAMPLES_NXTEXT_BGFONTID NXFONT_DEFAULT # define CONFIG_EXAMPLES_NXTEXT_BGFONTID NXFONT_DEFAULT
#endif #endif
/* Background font color */
#ifndef CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR #ifndef CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR
# if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32 # if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
# define CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR 0x00000000 # define CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR 0x00000000
@ -106,6 +134,8 @@
# endif # endif
#endif #endif
/* Pop-up font color */
#ifndef CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR #ifndef CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR
# if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32 # if CONFIG_EXAMPLES_NXTEXT_BPP == 24 || CONFIG_EXAMPLES_NXTEXT_BPP == 32
# define CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR 0x00000000 # define CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR 0x00000000
@ -116,14 +146,20 @@
# endif # endif
#endif #endif
/* Character caching */
#ifndef CONFIG_EXAMPLES_NXTEXT_BMCACHE #ifndef CONFIG_EXAMPLES_NXTEXT_BMCACHE
# define CONFIG_EXAMPLES_NXTEXT_BMCACHE 128 # define CONFIG_EXAMPLES_NXTEXT_BMCACHE 128
#endif #endif
/* Font glyph caching */
#ifndef CONFIG_EXAMPLES_NXTEXT_GLCACHE #ifndef CONFIG_EXAMPLES_NXTEXT_GLCACHE
# define CONFIG_EXAMPLES_NXTEXT_BMCACHE 16 # define CONFIG_EXAMPLES_NXTEXT_GLCACHE 16
#endif #endif
/* NX muli-user mode */
#ifdef CONFIG_NX_MULTIUSER #ifdef CONFIG_NX_MULTIUSER
# ifdef CONFIG_DISABLE_MQUEUE # ifdef CONFIG_DISABLE_MQUEUE
# error "The multi-threaded example requires MQ support (CONFIG_DISABLE_MQUEUE=n)" # error "The multi-threaded example requires MQ support (CONFIG_DISABLE_MQUEUE=n)"