diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-24 12:37:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-24 12:37:02 -0600 |
| commit | 860429a8eaaa2437d7d8e5f1cb6b2b684fbda295 (patch) | |
| tree | 71600620a4fdfb47ab13390b5dd264f30dbf1efc /apps | |
| parent | 4919eb3fd671887db91cb5e7f099fddd5a2c487c (diff) | |
| download | nuttx-860429a8eaaa2437d7d8e5f1cb6b2b684fbda295.tar.gz nuttx-860429a8eaaa2437d7d8e5f1cb6b2b684fbda295.tar.bz2 nuttx-860429a8eaaa2437d7d8e5f1cb6b2b684fbda295.zip | |
Fix UG-2832HSWEG04 landscape. Add reverse landscape support to UG_2864AMBAG01 and UG-9964HSWAG01. Fixe NXHELLO default colors for 1-bit mono modes
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ChangeLog.txt | 3 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello.h | 4 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello_bkgd.c | 6 |
3 files changed, 10 insertions, 3 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index dc2c6e279..bbe571785 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -594,3 +594,6 @@ * apps/examples/nxhello: Minor fix for compilation error when the display resolution is low (< 8bpp) due to a typo that has been there for a long time (2013-6-23). + * apps/examplex/nxhello: Correct default colors when in Y1 code mode. + (2013-6-24). + diff --git a/apps/examples/nxhello/nxhello.h b/apps/examples/nxhello/nxhello.h index f395b7018..39e63ee0d 100644 --- a/apps/examples/nxhello/nxhello.h +++ b/apps/examples/nxhello/nxhello.h @@ -73,6 +73,8 @@ # define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x007b68ee # elif CONFIG_EXAMPLES_NXHELLO_BPP == 16 # define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x7b5d +# elif CONFIG_EXAMPLES_NXHELLO_BPP < 8 +# define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x00 # else # define CONFIG_EXAMPLES_NXHELLO_BGCOLOR ' ' # endif @@ -87,6 +89,8 @@ # define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 0x00000000 # elif CONFIG_EXAMPLES_NXHELLO_BPP == 16 # define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 0x0000 +# elif CONFIG_EXAMPLES_NXHELLO_BPP < 1 +# define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 0x01 # else # define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 'F' # endif diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c index d0de6d841..053078655 100644 --- a/apps/examples/nxhello/nxhello_bkgd.c +++ b/apps/examples/nxhello/nxhello_bkgd.c @@ -270,7 +270,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height, #if CONFIG_EXAMPLES_NXHELLO_BPP < 8 pixel = CONFIG_EXAMPLES_NXHELLO_BGCOLOR; - + #if CONFIG_NX_NPLANES > 1 # warning "More logic is needed for the case where CONFIG_NX_PLANES > 1" #endif @@ -279,7 +279,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height, pixel &= 0x01; pixel = (pixel) << 1 |pixel; - + # endif # if CONFIG_EXAMPLES_NXHELLO_BPP < 4 @@ -410,7 +410,7 @@ void nxhello_hello(NXWINDOW hwnd) dest.pt1.y = pos.y; dest.pt2.x = pos.x + fwidth - 1; dest.pt2.y = pos.y + fheight - 1; - + /* Then put the font on the display */ src[0] = (FAR const void *)glyph; |