diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2013-06-23 14:39:56 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2013-06-23 14:39:56 -0600 |
| commit | 9d4f3f645e606d812e3bec76a10940691b30b5ff (patch) | |
| tree | ec970f690586d7ce93d937df8d6389bc1ecbdf57 /apps | |
| parent | 333edc2da8d4bad41a3ea553bf635cbad5119427 (diff) | |
| download | nuttx-9d4f3f645e606d812e3bec76a10940691b30b5ff.tar.gz nuttx-9d4f3f645e606d812e3bec76a10940691b30b5ff.tar.bz2 nuttx-9d4f3f645e606d812e3bec76a10940691b30b5ff.zip | |
Add support for the UG-2843HHSWEG04 OLED and for the SAM4L Xplained Pro OLED module that uses that OLED.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ChangeLog.txt | 3 | ||||
| -rw-r--r-- | apps/examples/nxhello/Kconfig | 2 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello_bkgd.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 96208f250..dc2c6e279 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -591,3 +591,6 @@ will do C++ initialization unless configured do otherwise (2013-6-21). * apps/examples/cxxtext: Add ostream test as provided by Michael (2013-6-21). + * 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). diff --git a/apps/examples/nxhello/Kconfig b/apps/examples/nxhello/Kconfig index 52924e38e..4f15c94f6 100644 --- a/apps/examples/nxhello/Kconfig +++ b/apps/examples/nxhello/Kconfig @@ -29,7 +29,7 @@ config EXAMPLES_NXHELLO_BPP int "Bits-Per-Pixel" default 32 ---help--- - Pixels per pixel to use. Valid options include 2, 4, 8, 16, 24, + Pixels per pixel to use. Valid options include 1, 2, 4, 8, 16, 24, and 32. Default is 32. diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c index ad1b99d24..d0de6d841 100644 --- a/apps/examples/nxhello/nxhello_bkgd.c +++ b/apps/examples/nxhello/nxhello_bkgd.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/nxhello/nxhello_bkgd.c * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -296,7 +296,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height, pixel = (pixel) << 4 | pixel; ptr = (FAR nxgl_mxpixel_t *)glyph; - for (row = 0; row < fheight; row++) + for (row = 0; row < height; row++) { for (col = 0; col < stride; col++) { |