diff options
| -rw-r--r-- | nuttx/ChangeLog | 5 | ||||
| -rw-r--r-- | nuttx/Documentation/NXGraphicsSubsystem.html | 38 | ||||
| -rw-r--r-- | nuttx/TODO | 3 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/Makefile | 10 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/up_lcd.c | 428 | ||||
| -rw-r--r-- | nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c | 2 | ||||
| -rw-r--r-- | nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c | 9 |
7 files changed, 470 insertions, 25 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index b663b8f55..73a100a34 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1972,3 +1972,8 @@ for the LPC1764, LPC1756, and LPC1754 (submitted by Li Zhuoy (Lzzy)) * arch/arm/src/lpc17xx/lpc17_can.h: Revised CAN driver submitted by Li Zhuoy (Lzzy). The driver now supports both CAN1 and CAN2. + * arch/arm/sim/up_lcd.c: Add a simulated LCD driver. + * configs/stm3210e-eval/nxlines: Added a configuration to build + examples/nxlines. + * arch/graphics: Used apps/examples/nxlines to (finally) verify the NX + trapezoid drawing functions and (wide) line drawing functions. diff --git a/nuttx/Documentation/NXGraphicsSubsystem.html b/nuttx/Documentation/NXGraphicsSubsystem.html index a8367c607..930f84fb2 100644 --- a/nuttx/Documentation/NXGraphicsSubsystem.html +++ b/nuttx/Documentation/NXGraphicsSubsystem.html @@ -3294,8 +3294,10 @@ make </tr> <tr> <td align="left" valign="top"><a href="#nxglrunoffset"><code>nxgl_runoffset()</code></a></td> - <td><br></td> - <td align="center" bgcolor="lightgrey">NO</td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> <td align="left" valign="top"><a href="#nxglruncopy"><code>nxgl_runcopy()</code></a></td> @@ -3304,13 +3306,17 @@ make </tr> <tr> <td align="left" valign="top"><a href="#nxgltrapoffset"><code>nxgl_trapoffset()</code></a></td> - <td><br></td> - <td align="center" bgcolor="lightgrey">NO</td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> <td align="left" valign="top"><a href="#nxgltrapcopy"><code>nxgl_trapcopy()</code></a></td> - <td><br></td> - <td align="center" bgcolor="lightgrey">NO</td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> <td align="left" valign="top"><a href="#nxglcolorcopy"><code>nxgl_colorcopy</code></a></td> @@ -3319,8 +3325,10 @@ make </tr> <tr> <td align="left" valign="top"><a href="#nxglsplitline"><code>nxgl_splitline</code></a></td> - <td><br></td> - <td align="center" bgcolor="skyblue">PART</td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> </tr> </table></center> @@ -3404,7 +3412,7 @@ make <td align="left" valign="top"><a href="#nxopenwindow"><code>nx_openwindow()</code></a></td> <td>Change to <code>CONFIG_EXAMPLES_NX_RAWWINDOWS=y</code> in the <code><NuttX-Directory>/.config</code> file</td> -</td> + </td> <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> @@ -3464,13 +3472,17 @@ make </tr> <tr> <td align="left" valign="top"><a href="#nxfilltrapezoid"><code>nx_filltrapezoid()</code></a></td> - <td><br></td> - <td align="center" bgcolor="lightgrey">NO</td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> <td align="left" valign="top"><a href="#nxdrawline"><code>nx_drawline()</code></a></td> - <td><br></td> - <td align="center" bgcolor="lightgrey">NO</td> + <td> + Verified by <code>apps/examples/nxlines</code>. + </td> + <td align="center" bgcolor="skyblue">YES</td> </tr> <tr> <td align="left" valign="top"><a href="#nxglrgb2yuv"><code>nx_setbgcolor()</code></a></td> diff --git a/nuttx/TODO b/nuttx/TODO index ca036d79a..380006f47 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -488,7 +488,8 @@ o Graphics subystem (graphics/) negative X offsets. Negative x-offsets are necessary for certain glyphs (and is very common in italic fonts). For example Eth, icircumflex, idieresis, and oslash should have - offset=1 in the 40x49b font. + offset=1 in the 40x49b font (these missing negative offsets are + NOTE'ed in the font header files). Status: Open. The problem is that the x-offset is an unsigned bitfield in the current structure. Priority: Low. diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index 11f99afd2..5e49b0ff0 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -59,10 +59,16 @@ CSRCS = up_initialize.c up_idle.c up_interruptcontext.c \ up_releasestack.c up_unblocktask.c up_blocktask.c \ up_releasepending.c up_reprioritizertr.c \ up_exit.c up_schedulesigaction.c up_allocateheap.c \ - up_devconsole.c up_framebuffer.c + up_devconsole.c HOSTSRCS = up_stdio.c up_hostusleep.c + +ifeq ($(CONFIG_NX_LCDDRIVER),y) + CSRCS += up_lcd.c +else + CSRCS += up_framebuffer.c ifeq ($(USEX),y) - HOSTSRCS += up_x11framebuffer.c + HOSTSRCS += up_x11framebuffer.c +endif endif ifeq ($(CONFIG_FS_FAT),y) diff --git a/nuttx/arch/sim/src/up_lcd.c b/nuttx/arch/sim/src/up_lcd.c new file mode 100644 index 000000000..9d5e9ca5e --- /dev/null +++ b/nuttx/arch/sim/src/up_lcd.c @@ -0,0 +1,428 @@ +/**************************************************************************** + * arch/sim/src/up_lcd.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <sys/types.h> +#include <stdint.h> +#include <stdbool.h> +#include <string.h> +#include <errno.h> +#include <debug.h> + +#include <nuttx/arch.h> +#include <nuttx/lcd/lcd.h> + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ +/* Check contrast selection */ + +#if !defined(CONFIG_LCD_MAXCONTRAST) +# define CONFIG_LCD_MAXCONTRAST 100 +#endif + +/* Check power setting */ + +#if !defined(CONFIG_LCD_MAXPOWER) +# define CONFIG_LCD_MAXPOWER 100 +#endif + +/* Simulated LCD geometry and color format */ + +#ifndef CONFIG_SIM_FBWIDTH +# define CONFIG_SIM_FBWIDTH 320 /* Framebuffer width in pixels */ +#endif + +#ifndef CONFIG_SIM_FBHEIGHT +# define CONFIG_SIM_FBHEIGHT 240 /* Framebuffer height in pixels */ +#endif + +#ifndef CONFIG_SIM_FBBPP +# define CONFIG_SIM_FBBPP 16 /* Framebuffer bytes per pixel (RGB) */ +#endif + +#define FB_STRIDE ((CONFIG_SIM_FBBPP * CONFIG_SIM_FBWIDTH + 7) >> 3) + +#undef CONFIG_SIM_FBFMT +#if CONFIG_SIM_FBBPP == 1 +# define FB_FMT FB_FMT_RGB1 +#elif CONFIG_SIM_FBBPP == 4 +# define FB_FMT FB_FMT_RGB4 +#elif CONFIG_SIM_FBBPP == 8 +# define FB_FMT FB_FMT_RGB8 +#elif CONFIG_SIM_FBBPP == 16 +# define FB_FMT FB_FMT_RGB16_565 +#elif CONFIG_SIM_FBBPP == 24 +# define FB_FMT FB_FMT_RGB24 +#elif CONFIG_SIM_FBBPP == 32 +# define FB_FMT FB_FMT_RGB32 +#else +# error "Unsupported BPP" +#endif + +/* Debug ********************************************************************/ +/* Define CONFIG_DEBUG_LCD to enable detailed LCD debug output. Verbose debug must + * also be enabled. + */ + +#ifndef CONFIG_DEBUG +# undef CONFIG_DEBUG_VERBOSE +# undef CONFIG_DEBUG_GRAPHICS +# undef CONFIG_DEBUG_LCD +#endif + +#ifndef CONFIG_DEBUG_VERBOSE +# undef CONFIG_DEBUG_LCD +#endif + +#ifdef CONFIG_DEBUG_LCD +# define lcddbg(format, arg...) vdbg(format, ##arg) +#else +# define lcddbg(x...) +#endif + +/**************************************************************************** + * Private Type Definition + ****************************************************************************/ + +/* This structure describes the state of this driver */ + +struct sim_dev_s +{ + /* Publically visible device structure */ + + struct lcd_dev_s dev; + + /* Private LCD-specific information follows */ + + uint8_t power; /* Current power setting */ +}; + +/**************************************************************************** + * Private Function Protototypes + ****************************************************************************/ + +/* LCD Data Transfer Methods */ + +static int sim_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, + size_t npixels); +static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, + size_t npixels); + +/* LCD Configuration */ + +static int sim_getvideoinfo(FAR struct lcd_dev_s *dev, + FAR struct fb_videoinfo_s *vinfo); +static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, + FAR struct lcd_planeinfo_s *pinfo); + +/* LCD RGB Mapping */ + +#ifdef CONFIG_FB_CMAP +# error "RGB color mapping not supported by this driver" +#endif + +/* Cursor Controls */ + +#ifdef CONFIG_FB_HWCURSOR +# error "Cursor control not supported by this driver" +#endif + +/* LCD Specific Controls */ + +static int sim_getpower(struct lcd_dev_s *dev); +static int sim_setpower(struct lcd_dev_s *dev, int power); +static int sim_getcontrast(struct lcd_dev_s *dev); +static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast); + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/* This is working memory allocated by the LCD driver for each LCD device + * and for each color plane. This memory will hold one raster line of data. + * The size of the allocated run buffer must therefore be at least + * (bpp * xres / 8). Actual alignment of the buffer must conform to the + * bitwidth of the underlying pixel type. + * + * If there are multiple planes, they may share the same working buffer + * because different planes will not be operate on concurrently. However, + * if there are multiple LCD devices, they must each have unique run buffers. + */ + +static uint8_t g_runbuffer[FB_STRIDE]; + +/* This structure describes the overall LCD video controller */ + +static const struct fb_videoinfo_s g_videoinfo = +{ + .fmt = FB_FMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ + .xres = CONFIG_SIM_FBWIDTH, /* Horizontal resolution in pixel columns */ + .yres = CONFIG_SIM_FBHEIGHT, /* Vertical resolution in pixel rows */ + .nplanes = 1, /* Number of color planes supported */ +}; + +/* This is the standard, NuttX Plane information object */ + +static const struct lcd_planeinfo_s g_planeinfo = +{ + .putrun = sim_putrun, /* Put a run into LCD memory */ + .getrun = sim_getrun, /* Get a run from LCD memory */ + .buffer = (uint8_t*)g_runbuffer, /* Run scratch buffer */ + .bpp = CONFIG_SIM_FBBPP, /* Bits-per-pixel */ +}; + +/* This is the standard, NuttX LCD driver object */ + +static struct sim_dev_s g_lcddev = +{ + .dev = + { + /* LCD Configuration */ + + .getvideoinfo = sim_getvideoinfo, + .getplaneinfo = sim_getplaneinfo, + + /* LCD RGB Mapping -- Not supported */ + /* Cursor Controls -- Not supported */ + + /* LCD Specific Controls */ + + .getpower = sim_getpower, + .setpower = sim_setpower, + .getcontrast = sim_getcontrast, + .setcontrast = sim_setcontrast, + }, +}; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: sim_putrun + * + * Description: + * This method can be used to write a partial raster line to the LCD: + * + * row - Starting row to write to (range: 0 <= row < yres) + * col - Starting column to write to (range: 0 <= col <= xres-npixels) + * buffer - The buffer containing the run to be written to the LCD + * npixels - The number of pixels to write to the LCD + * (range: 0 < npixels <= xres-col) + * + ****************************************************************************/ + +static int sim_putrun(fb_coord_t row, fb_coord_t col, FAR const uint8_t *buffer, + size_t npixels) +{ + lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels); + return OK; +} + +/**************************************************************************** + * Name: sim_getrun + * + * Description: + * This method can be used to read a partial raster line from the LCD: + * + * row - Starting row to read from (range: 0 <= row < yres) + * col - Starting column to read read (range: 0 <= col <= xres-npixels) + * buffer - The buffer in which to return the run read from the LCD + * npixels - The number of pixels to read from the LCD + * (range: 0 < npixels <= xres-col) + * + ****************************************************************************/ + +static int sim_getrun(fb_coord_t row, fb_coord_t col, FAR uint8_t *buffer, + size_t npixels) +{ + lcddbg("row: %d col: %d npixels: %d\n", row, col, npixels); + return -ENOSYS; +} + +/**************************************************************************** + * Name: sim_getvideoinfo + * + * Description: + * Get information about the LCD video controller configuration. + * + ****************************************************************************/ + +static int sim_getvideoinfo(FAR struct lcd_dev_s *dev, + FAR struct fb_videoinfo_s *vinfo) +{ + DEBUGASSERT(dev && vinfo); + gvdbg("fmt: %d xres: %d yres: %d nplanes: %d\n", + g_videoinfo.fmt, g_videoinfo.xres, g_videoinfo.yres, g_videoinfo.nplanes); + memcpy(vinfo, &g_videoinfo, sizeof(struct fb_videoinfo_s)); + return OK; +} + +/**************************************************************************** + * Name: sim_getplaneinfo + * + * Description: + * Get information about the configuration of each LCD color plane. + * + ****************************************************************************/ + +static int sim_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, + FAR struct lcd_planeinfo_s *pinfo) +{ + DEBUGASSERT(dev && pinfo && planeno == 0); + gvdbg("planeno: %d bpp: %d\n", planeno, g_planeinfo.bpp); + memcpy(pinfo, &g_planeinfo, sizeof(struct lcd_planeinfo_s)); + return OK; +} + +/**************************************************************************** + * Name: sim_getpower + * + * Description: + * Get the LCD panel power status (0: full off - CONFIG_LCD_MAXPOWER: + * full on). On backlit LCDs, this setting may correspond to the backlight setting. + * + ****************************************************************************/ + +static int sim_getpower(struct lcd_dev_s *dev) +{ + gvdbg("power: %d\n", 0); + return g_lcddev.power; +} + +/**************************************************************************** + * Name: sim_setpower + * + * Description: + * Enable/disable LCD panel power (0: full off - CONFIG_LCD_MAXPOWER: + * full on). On backlit LCDs, this setting may correspond to the backlight + * setting. + * + ****************************************************************************/ + +static int sim_setpower(struct lcd_dev_s *dev, int power) +{ + gvdbg("power: %d\n", power); + DEBUGASSERT(power <= CONFIG_LCD_MAXPOWER); + + /* Set new power level */ + + g_lcddev.power = power; + return OK; +} + +/**************************************************************************** + * Name: sim_getcontrast + * + * Description: + * Get the current contrast setting (0-CONFIG_LCD_MAXCONTRAST). + * + ****************************************************************************/ + +static int sim_getcontrast(struct lcd_dev_s *dev) +{ + gvdbg("Not implemented\n"); + return -ENOSYS; +} + +/**************************************************************************** + * Name: sim_setcontrast + * + * Description: + * Set LCD panel contrast (0-CONFIG_LCD_MAXCONTRAST). + * + ****************************************************************************/ + +static int sim_setcontrast(struct lcd_dev_s *dev, unsigned int contrast) +{ + gvdbg("contrast: %d\n", contrast); + return -ENOSYS; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: up_lcdinitialize + * + * Description: + * Initialize the LCD video hardware. The initial state of the LCD is + * fully initialized, display memory cleared, and the LCD ready to use, + * but with the power setting at 0 (full off). + * + ****************************************************************************/ + +int up_lcdinitialize(void) +{ + gvdbg("Initializing\n"); + return OK; +} + +/**************************************************************************** + * Name: up_lcdgetdev + * + * Description: + * Return a a reference to the LCD object for the specified LCD. This + * allows support for multiple LCD devices. + * + ****************************************************************************/ + +FAR struct lcd_dev_s *up_lcdgetdev(int lcddev) +{ + DEBUGASSERT(lcddev == 0); + return &g_lcddev.dev; +} + +/**************************************************************************** + * Name: up_lcduninitialize + * + * Description: + * Unitialize the LCD support + * + ****************************************************************************/ + +void up_lcduninitialize(void) +{ +} + diff --git a/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c index 4f0c2f072..ddaa0f9bf 100644 --- a/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/fb/nxglib_filltrapezoid.c @@ -201,7 +201,7 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX)( * always draw at least one pixel. */ - if (x1 > x2 || ix2 < bounds->pt1.x || ix1 > bounds->pt2.x) + if (x1 <= x2 && ix2 >= bounds->pt1.x && ix1 <= bounds->pt2.x) { /* Get a clipped copies of the starting and ending X positions. This * clipped truncates "down" and gives the quantized pixel holding the diff --git a/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c b/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c index faeebbec7..0653da413 100644 --- a/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c +++ b/nuttx/graphics/nxglib/lcd/nxglib_filltrapezoid.c @@ -93,7 +93,6 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX) NXGL_PIXEL_T color) { unsigned int ncols; - unsigned int dy; unsigned int topy; unsigned int boty; unsigned int row; @@ -104,6 +103,7 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX) b16_t botx2; b16_t dx1dy; b16_t dx2dy; + int dy; int ix1; int ix2; @@ -174,13 +174,6 @@ void NXGL_FUNCNAME(nxgl_filltrapezoid,NXGLIB_SUFFIX) boty = bounds->pt2.y; } - /* Break out now if it was completely clipped */ - - if (topy > boty) - { - return; - } - /* Handle the special case where the sides cross (as in an hourglass) */ if (botx1 > botx2) |