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

examples/fb: Extend test to include 1-bpp monochrome.

Browse Source
This commit is contained in:
Gregory Nutt 2017-09-13 10:58:29 -06:00
parent 0fd8ade4b5
commit cb13b7ed1b
2 changed files with 79 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/fb/Kconfig
View File

@ -8,7 +8,12 @@ config EXAMPLES_FB
default n
depends on VIDEO_FB
---help---
Enable the Framebuffer driver example
Enable the Framebuffer driver example.
This example currently supports only framebuffer devices with 1, 8,
16, or 24/32 pixel depth with only Mono, RGB323, RGB565, and RGB888
color formats, respectively. The example would have be extended to
support other bits-per-pixels or other color formats.
if EXAMPLES_FB

77
examples/fb/fb_main.c
View File

@ -122,7 +122,7 @@ static void draw_rect32(FAR struct fb_state_s *state,
}
static void draw_rect16(FAR struct fb_state_s *state,
FAR struct nxgl_rect_s *rect, int color)
FAR struct nxgl_rect_s *rect, int color)
{
FAR uint16_t *dest;
FAR uint8_t *row;
@ -143,7 +143,7 @@ static void draw_rect16(FAR struct fb_state_s *state,
}
static void draw_rect8(FAR struct fb_state_s *state,
FAR struct nxgl_rect_s *rect, int color)
FAR struct nxgl_rect_s *rect, int color)
{
FAR uint8_t *dest;
FAR uint8_t *row;
@ -163,6 +163,63 @@ static void draw_rect8(FAR struct fb_state_s *state,
}
}
static void draw_rect1(FAR struct fb_state_s *state,
FAR struct nxgl_rect_s *rect, int color)
{
FAR uint8_t *pixel;
FAR uint8_t *row;
uint8_t color8 = (color & 1) == 0 ? 0 : 0xff;
uint8_t lmask;
uint8_t rmask;
int startx;
int endx;
int x;
int y;
row = (FAR uint8_t *)state->fbmem + state->pinfo.stride * rect->pt1.y;
startx = (rect->pt1.x >> 3);
endx = (rect->pt2.x >> 3);
lmask = 0xff << (8 - (rect->pt1.x & 3));
rmask = 0xff >> (rect->pt2.x & 3);
for (y = rect->pt1.y; y <= rect->pt2.y; y++)
{
/* 'pixel' points to the 1st pixel the next row */
pixel = row + startx;
/* Special case: The row is less no more than one byte wide */
if (startx == endx)
{
uint8_t mask = lmask | rmask;
*pixel = (*pixel & mask) | (color8 & ~mask);
}
else
{
/* Special case the first byte of the row */
*pixel = (*pixel & lmask) | (color8 & ~lmask);
pixel++;
/* Handle all middle bytes */
for (x = startx + 1; x < endx; x++)
{
*pixel++ = color8;
}
/* Handle the final byte of the row */
*pixel = (*pixel & rmask) | (color8 & ~rmask);
}
row += state->pinfo.stride;
}
}
static void draw_rect(FAR struct fb_state_s *state,
FAR struct nxgl_rect_s *rect, int color)
{
@ -184,6 +241,10 @@ static void draw_rect(FAR struct fb_state_s *state,
default:
draw_rect8(state, rect, color);
break;
case 1:
draw_rect1(state, rect, color);
break;
}
#ifdef CONFIG_NX_UPDATE
@ -291,14 +352,22 @@ int fb_main(int argc, char *argv[])
* certain color formations are supported.
*/
if (state.pinfo.bpp != 32 && state.pinfo.bpp != 16 && state.pinfo.bpp != 8)
if (state.pinfo.bpp != 32 && state.pinfo.bpp != 16 &&
state.pinfo.bpp != 8 && state.pinfo.bpp != 1)
{
fprintf(stderr, "ERROR: bpp=%u not supported\n", state.pinfo.bpp);
close(state.fd);
return EXIT_FAILURE;
}
/* mmap() the framebuffer */
/* mmap() the framebuffer.
*
* NOTE: In the FLAT build the frame buffer address returned by the
* FBIOGET_PLANEINFO IOCTL command will be the same as the framebuffer
* address. mmap(), however, is the preferred way to get the framebuffer
* address because in the KERNEL build, it will perform the necessary
* address mapping to make the memory accessible to the application.
*/
state.fbmem = mmap(NULL, state.pinfo.fblen, PROT_READ|PROT_WRITE,
MAP_SHARED|MAP_FILE, state.fd, 0);