diff options
| -rwxr-xr-x | apps/ChangeLog.txt | 3 | ||||
| -rw-r--r-- | apps/examples/README.txt | 34 | ||||
| -rw-r--r-- | apps/examples/nxhello/Makefile | 105 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello.h | 189 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello_bkgd.c | 437 | ||||
| -rw-r--r-- | apps/examples/nxhello/nxhello_main.c | 282 | ||||
| -rw-r--r-- | nuttx/arch/z80/src/ez80/ez80_serial.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/appconfig | 3 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/nsh2/defconfig | 29 |
9 files changed, 1082 insertions, 4 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 85da11502..2da96d02d 100755 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -74,4 +74,7 @@ * apps/examples/nx and nxtext: These examples can now be built as NSH "built-in" commands. + * apps/examples/nxhello: The simplest graphics example: It just says + "Hello, World!" in the center of the display. This example can also be + built as an NSH "built-in" command. diff --git a/apps/examples/README.txt b/apps/examples/README.txt index 6c1c1e55d..b08f79d4b 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -307,7 +307,39 @@ examples/nxflat the NXFLAT format and installed in a ROMFS file system. At run time, each program in the ROMFS file system is executed. Requires CONFIG_NXFLAT. -examples/nxtest +examplex/nxhello +^^^^^^^^^^^^^^^^ + + A very simple graphics example that just says "Hello, World!" in the + center of the display. + + The following configuration options can be selected: + + CONFIG_EXAMPLES_NXHELLO_BUILTIN -- Build the NXHELLO example as a "built-in" + that can be executed from the NSH command line + CONFIG_EXAMPLES_NXHELLO_VPLANE -- The plane to select from the frame- + buffer driver for use in the test. Default: 0 + CONFIG_EXAMPLES_NXHELLO_DEVNO - The LCD device to select from the LCD + driver for use in the test: Default: 0 + CONFIG_EXAMPLES_NXHELLO_BGCOLOR -- The color of the background. Default + depends on CONFIG_EXAMPLES_NXHELLO_BPP. + CONFIG_EXAMPLES_NXHELLO_FONTCOLOR -- The color of the fonts used in the + background window. Default depends on CONFIG_EXAMPLES_NXHELLO_BPP. + CONFIG_EXAMPLES_NXHELLO_BPP -- Pixels per pixel to use. Valid options + include 2, 4, 8, 16, 24, and 32. Default is 32. + CONFIG_EXAMPLES_NXHELLO_EXTERNINIT - The driver for the graphics device on + this platform requires some unusual initialization. This is the + for, for example, SPI LCD/OLED devices. If this configuration is + selected, then the platform code must provide an LCD initialization + function with a prototype like: + + #ifdef CONFIG_NX_LCDDRIVER + FAR struct lcd_dev_s *up_nxdrvinit(unsigned int devno); + #else + FAR struct fb_vtable_s *up_nxdrvinit(unsigned int devno); + #endif + +examples/nxtext ^^^^^^^^^^^^^^^ This directory contains another simple test of a subset of the NX APIs diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile new file mode 100644 index 000000000..84fb41775 --- /dev/null +++ b/apps/examples/nxhello/Makefile @@ -0,0 +1,105 @@ +############################################################################ +# apps/examples/nxhello/Makefile +# +# 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. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# NuttX NX Graphics Example. + +ASRCS = +CSRCS = nxhello_main.c nxhello_bkgd.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif + +ROOTDEPPATH = --dep-path . + +# NXHELLO built-in application info + +APPNAME = nxhello +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + +# Common build + +VPATH = + +all: .built +.PHONY: context clean depend distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + @( for obj in $(OBJS) ; do \ + $(call ARCHIVE, $(BIN), $${obj}); \ + done ; ) + @touch .built + +.context: +ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + @touch $@ +endif + +context: .context + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + @rm -f *.o *~ .*.swp .built + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend + +-include Make.dep diff --git a/apps/examples/nxhello/nxhello.h b/apps/examples/nxhello/nxhello.h new file mode 100644 index 000000000..d5d5c724b --- /dev/null +++ b/apps/examples/nxhello/nxhello.h @@ -0,0 +1,189 @@ +/**************************************************************************** + * examples/nxhello/nxhello.h + * + * 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. + * + ****************************************************************************/ + +#ifndef __APPS_EXAMPLES_NXHELLO_NXHELLO_H +#define __APPS_EXAMPLES_NXHELLO_NXHELLO_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#include <stdint.h> +#include <stdbool.h> +#include <semaphore.h> + +#include <nuttx/nx.h> +#include <nuttx/nxglib.h> + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ + +#ifndef CONFIG_NX +# error "NX is not enabled (CONFIG_NX)" +#endif + +#ifndef CONFIG_EXAMPLES_NXHELLO_VPLANE +# define CONFIG_EXAMPLES_NXHELLO_VPLANE 0 +#endif + +#ifndef CONFIG_EXAMPLES_NXHELLO_BPP +# define CONFIG_EXAMPLES_NXHELLO_BPP 32 +#endif + +#ifndef CONFIG_EXAMPLES_NXHELLO_BGCOLOR +# if CONFIG_EXAMPLES_NXHELLO_BPP == 24 || CONFIG_EXAMPLES_NXHELLO_BPP == 32 +# define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x007b68ee +# elif CONFIG_EXAMPLES_NXHELLO_BPP == 16 +# define CONFIG_EXAMPLES_NXHELLO_BGCOLOR 0x7b5d +# else +# define CONFIG_EXAMPLES_NXHELLO_BGCOLOR ' ' +# endif +#endif + +#ifndef CONFIG_EXAMPLES_NXHELLO_FONTCOLOR +# if CONFIG_EXAMPLES_NXHELLO_BPP == 24 || CONFIG_EXAMPLES_NXHELLO_BPP == 32 +# define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 0x00000000 +# elif CONFIG_EXAMPLES_NXHELLO_BPP == 16 +# define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 0x0000 +# else +# define CONFIG_EXAMPLES_NXHELLO_FONTCOLOR 'F' +# endif +#endif + +/* Debug ********************************************************************/ + +#ifdef CONFIG_CPP_HAVE_VARARGS +# ifdef CONFIG_DEBUG +# define message(...) lib_lowprintf(__VA_ARGS__) +# define msgflush() +# else +# define message(...) printf(__VA_ARGS__) +# define msgflush() fflush(stdout) +# endif +#else +# ifdef CONFIG_DEBUG +# define message lib_lowprintf +# define msgflush() +# else +# define message printf +# define msgflush() fflush(stdout) +# endif +#endif + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +enum exitcode_e +{ + NXEXIT_SUCCESS = 0, + NXEXIT_EXTINITIALIZE, + NXEXIT_FBINITIALIZE, + NXEXIT_FBGETVPLANE, + NXEXIT_LCDINITIALIZE, + NXEXIT_LCDGETDEV, + NXEXIT_NXOPEN, + NXEXIT_NXREQUESTBKGD, + NXEXIT_NXSETBGCOLOR +}; + +/* Describes one cached glyph bitmap */ + +struct nxhello_glyph_s +{ + uint8_t code; /* Character code */ + uint8_t height; /* Height of this glyph (in rows) */ + uint8_t width; /* Width of this glyph (in pixels) */ + uint8_t stride; /* Width of the glyph row (in bytes) */ + uint8_t usecnt; /* Use count */ + FAR uint8_t *bitmap; /* Allocated bitmap memory */ +}; + +/* Describes on character on the display */ + +struct nxhello_bitmap_s +{ + uint8_t code; /* Character code */ + uint8_t flags; /* See BMFLAGS_* */ + struct nxgl_point_s pos; /* Character position */ +}; + +struct nxhello_data_s +{ + /* The NX handle */ + + NXHANDLE hnx; + NXHANDLE hbkgd; + + /* The screen resolution */ + + nxgl_coord_t xres; + nxgl_coord_t yres; + + volatile bool havepos; + sem_t sem; + volatile int code; +}; + +/**************************************************************************** + * Public Variables + ****************************************************************************/ + +/* NXHELLO state data */ + +extern struct nxhello_data_s g_nxhello; + +/* NX callback vtables */ + +extern const struct nx_callback_s g_bgcb; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#ifdef CONFIG_EXAMPLES_NXHELLO_EXTERNINIT +extern FAR NX_DRIVERTYPE *up_nxdrvinit(unsigned int devno); +#endif + +/* Background window interfaces */ + +extern void nxhello_hello(NXWINDOW hwnd); + +#endif /* __APPS_EXAMPLES_NXHELLO_NXHELLO_H */ diff --git a/apps/examples/nxhello/nxhello_bkgd.c b/apps/examples/nxhello/nxhello_bkgd.c new file mode 100644 index 000000000..91df00f16 --- /dev/null +++ b/apps/examples/nxhello/nxhello_bkgd.c @@ -0,0 +1,437 @@ +/**************************************************************************** + * examples/nxhello/nxhello_bkgd.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 <stdint.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <semaphore.h> +#include <errno.h> +#include <debug.h> + +#include <nuttx/nx.h> +#include <nuttx/nxglib.h> +#include <nuttx/nxfonts.h> + +#include "nxhello.h" + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/* Select renderer -- Some additional logic would be required to support + * pixel depths that are not directly addressable (1,2,4, and 24). + */ + +#if CONFIG_EXAMPLES_NXHELLO_BPP == 1 +# define RENDERER nxf_convert_1bpp +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 2 +# define RENDERER nxf_convert_2bpp +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 4 +# define RENDERER nxf_convert_4bpp +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 8 +# define RENDERER nxf_convert_8bpp +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 16 +# define RENDERER nxf_convert_16bpp +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 24 +# define RENDERER nxf_convert_24bpp +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 32 +# define RENDERER nxf_convert_32bpp +#else +# error "Unsupported CONFIG_EXAMPLES_NXHELLO_BPP" +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, + bool morem, FAR void *arg); +static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, + FAR const struct nxgl_point_s *pos, + FAR const struct nxgl_rect_s *bounds, + FAR void *arg); +#ifdef CONFIG_NX_MOUSE +static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, + uint8_t buttons, FAR void *arg); +#endif + +#ifdef CONFIG_NX_KBD +static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, + FAR void *arg); +#endif + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static const char g_hello[] = "Hello, World!"; + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/* Background window call table */ + +const struct nx_callback_s g_bgcb = +{ + nxhello_redraw, /* redraw */ + nxhello_position /* position */ +#ifdef CONFIG_NX_MOUSE + , nxhello_mousein /* mousein */ +#endif +#ifdef CONFIG_NX_KBD + , nxhello_kbdin /* my kbdin */ +#endif +}; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxhello_redraw + ****************************************************************************/ + +static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect, + bool more, FAR void *arg) +{ + gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n", + hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y, + more ? "true" : "false"); +} + +/**************************************************************************** + * Name: nxhello_position + ****************************************************************************/ + +static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size, + FAR const struct nxgl_point_s *pos, + FAR const struct nxgl_rect_s *bounds, + FAR void *arg) +{ + /* Report the position */ + + gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n", + hwnd, size->w, size->h, pos->x, pos->y, + bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y); + + /* Have we picked off the window bounds yet? */ + + if (!g_nxhello.havepos) + { + /* Save the background window handle */ + + g_nxhello.hbkgd = hwnd; + + /* Save the window limits */ + + g_nxhello.xres = bounds->pt2.x + 1; + g_nxhello.yres = bounds->pt2.y + 1; + + g_nxhello.havepos = true; + sem_post(&g_nxhello.sem); + gvdbg("Have xres=%d yres=%d\n", g_nxhello.xres, g_nxhello.yres); + } +} + +/**************************************************************************** + * Name: nxhello_mousein + ****************************************************************************/ + +#ifdef CONFIG_NX_MOUSE +static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos, + uint8_t buttons, FAR void *arg) +{ + message("nxhello_mousein: hwnd=%p pos=(%d,%d) button=%02x\n", + hwnd, pos->x, pos->y, buttons); +} +#endif + +/**************************************************************************** + * Name: nxhello_kbdin + ****************************************************************************/ + +#ifdef CONFIG_NX_KBD +static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch, + FAR void *arg) +{ + gvdbg("hwnd=%p nch=%d\n", hwnd, nch); + + /* In this example, there is no keyboard so a keyboard event is not + * expected. + */ + + message("nxhello_kbdin: Unexpected keyboard callback\n"); +} +#endif + +/**************************************************************************** + * Name: nxhello_center + ****************************************************************************/ + +static void nxhello_center(FAR struct nxgl_point_s *pos, + FAR const struct nx_font_s *fontset) +{ + FAR const struct nx_fontbitmap_s *fbm; + FAR uint8_t *ptr; + unsigned int width; + + /* Get the width of the collection of characters so that we can center the + * hello world message. + */ + + for (ptr = (uint8_t*)g_hello, width = 0; *ptr; ptr++) + { + /* Get the font bitmap for this character */ + + fbm = nxf_getbitmap(*ptr); + if (fbm) + { + /* Add the font size */ + + width += fbm->metric.width; + } + else + { + /* Use the width of a space */ + + width += fontset->spwidth; + } + } + + /* Now we know how to center the string. Create a the position and + * the bounding box + */ + + pos->x = (g_nxhello.xres - width) / 2; + pos->y = (g_nxhello.yres - fbm->metric.height) / 2; +} + +/**************************************************************************** + * Name: nxhello_initglyph + ****************************************************************************/ + +static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height, + uint8_t width, uint8_t stride) +{ + FAR nxgl_mxpixel_t *ptr; +#if CONFIG_EXAMPLES_NXHELLO_BPP < 8 + nxgl_mxpixel_t pixel; +#endif + unsigned int row; + unsigned int col; + + /* Initialize the glyph memory to the background color */ + +#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 +# if CONFIG_EXAMPLES_NXHELLO_BPP == 1 + /* Pack 1-bit pixels into a 2-bits */ + + pixel &= 0x01; + pixel = (pixel) << 1 |pixel; + +# endif +# if CONFIG_EXAMPLES_NXHELLO_BPP < 4 + + /* Pack 2-bit pixels into a nibble */ + + pixel &= 0x03; + pixel = (pixel) << 2 |pixel; + +# endif + + /* Pack 4-bit nibbles into a byte */ + + pixel &= 0x0f; + pixel = (pixel) << 4 | pixel; + + ptr = (FAR nxgl_mxpixel_t *)glyph; + for (row = 0; row < fheight; row++) + { + for (col = 0; col < stride; col++) + { + /* Transfer the packed bytes into the buffer */ + + *ptr++ = pixel; + } + } + +#elif CONFIG_EXAMPLES_NXHELLO_BPP == 24 +# error "Additional logic is needed here for 24bpp support" + +#else /* CONFIG_EXAMPLES_NXHELLO_BPP = {8,16,32} */ + + ptr = (FAR nxgl_mxpixel_t *)glyph; + for (row = 0; row < height; row++) + { + /* Just copy the color value into the glyph memory */ + + for (col = 0; col < width; col++) + { + *ptr++ = CONFIG_EXAMPLES_NXHELLO_BGCOLOR; +#if CONFIG_NX_NPLANES > 1 +# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1" +#endif + } + } +#endif +} + + /**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxhello_write + * + * Description: + * Put a sequence of bytes in the window. + * + ****************************************************************************/ + +void nxhello_hello(NXWINDOW hwnd) +{ + FAR const struct nx_font_s *fontset; + FAR const struct nx_fontbitmap_s *fbm; + FAR uint8_t *glyph; + FAR const char *ptr; + FAR struct nxgl_point_s pos; + FAR struct nxgl_rect_s dest; + FAR const void *src[CONFIG_NX_NPLANES]; + unsigned int glyphsize; + int ret; + + /* Get information about the font we are going to use */ + + fontset = nxf_getfontset(); + + /* Allocate a bit of memory to hold the largest rendered font */ + + glyphsize = (unsigned int)fontset->mxheight * (unsigned int)fontset->mxwidth; + glyph = (FAR uint8_t*)malloc(glyphsize); + + /* NOTE: no check for failure to allocate the memory. In a real application + * you would need to handle that event. + */ + + /* Get a position so the the "Hello, World!" string will be centered on the + * display. + */ + + nxhello_center(&pos, fontset); + message("nxhello_hello: Position (%d,%d)\n", pos.x, pos.y); + + /* Now we can say "hello" in the center of the display. */ + + for (ptr = g_hello; *ptr; ptr++) + { + /* Get the bitmap font for this ASCII code */ + + fbm = nxf_getbitmap(*ptr); + if (fbm) + { + uint8_t fheight; /* Height of this glyph (in rows) */ + uint8_t fwidth; /* Width of this glyph (in pixels) */ + uint8_t fstride; /* Width of the glyph row (in bytes) */ + + /* Get information about the fount bitmap */ + + fwidth = fbm->metric.width + fbm->metric.xoffset; + fheight = fbm->metric.height + fbm->metric.yoffset; + fstride = (fwidth * CONFIG_EXAMPLES_NXHELLO_BPP + 7) / 8; + + /* Initialize the glyph memory to the background color */ + + nxhello_initglyph(glyph, fheight, fwidth, fstride); + + /* Then render the glyph into the allocated memory */ + +#if CONFIG_NX_NPLANES > 1 +# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1" +#endif + (void)RENDERER((FAR nxgl_mxpixel_t*)glyph, fheight, fwidth, + fstride, fbm, CONFIG_EXAMPLES_NXHELLO_FONTCOLOR); + + /* Describe the destination of the font with a rectangle */ + + dest.pt1.x = pos.x; + 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; +#if CONFIG_NX_NPLANES > 1 +# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1" +#endif + ret = nx_bitmap((NXWINDOW)hwnd, &dest, src, &pos, fstride); + if (ret < 0) + { + message("nxhello_write: nx_bitmapwindow failed: %d\n", errno); + } + + /* Skip to the right the width of the font */ + + pos.x += fwidth; + } + else + { + /* No bitmap (probably because the font is a space). Skip to the + * right the width of a space. + */ + + pos.x += fontset->spwidth; + } + } +} diff --git a/apps/examples/nxhello/nxhello_main.c b/apps/examples/nxhello/nxhello_main.c new file mode 100644 index 000000000..02b2f17a2 --- /dev/null +++ b/apps/examples/nxhello/nxhello_main.c @@ -0,0 +1,282 @@ +/**************************************************************************** + * examples/nxhello/nxhello_main.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 <stdio.h> +#include <unistd.h> +#include <time.h> +#include <string.h> +#include <sched.h> +#include <pthread.h> +#include <errno.h> +#include <debug.h> + +#ifdef CONFIG_NX_LCDDRIVER +# include <nuttx/lcd/lcd.h> +#else +# include <nuttx/fb.h> +#endif + +#include <nuttx/arch.h> +#include <nuttx/nx.h> +#include <nuttx/nxglib.h> + +#include "nxhello.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* Configuration ************************************************************/ +/* If not specified, assume that the hardware supports one video plane */ + +#ifndef CONFIG_EXAMPLES_NXHELLO_VPLANE +# define CONFIG_EXAMPLES_NXHELLO_VPLANE 0 +#endif + +/* If not specified, assume that the hardware supports one LCD device */ + +#ifndef CONFIG_EXAMPLES_NXHELLO_DEVNO +# define CONFIG_EXAMPLES_NXHELLO_DEVNO 0 +#endif + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +struct nxhello_data_s g_nxhello = +{ + NULL, /* hnx */ + NULL, /* hbkgd */ + 0, /* xres */ + 0, /* yres */ + false, /* havpos */ + { 0 }, /* sem */ + NXEXIT_SUCCESS /* exit code */ +}; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: nxhello_initialize + ****************************************************************************/ + +static inline int nxhello_initialize(void) +{ + FAR NX_DRIVERTYPE *dev; + +#if defined(CONFIG_EXAMPLES_NXHELLO_EXTERNINIT) + /* Use external graphics driver initialization */ + + message("nxhello_initialize: Initializing external graphics device\n"); + dev = up_nxdrvinit(CONFIG_EXAMPLES_NXHELLO_DEVNO); + if (!dev) + { + message("nxhello_initialize: up_nxdrvinit failed, devno=%d\n", + CONFIG_EXAMPLES_NXHELLO_DEVNO); + g_nxhello.code = NXEXIT_EXTINITIALIZE; + return ERROR; + } + +#elif defined(CONFIG_NX_LCDDRIVER) + int ret; + + /* Initialize the LCD device */ + + message("nxhello_initialize: Initializing LCD\n"); + ret = up_lcdinitialize(); + if (ret < 0) + { + message("nxhello_initialize: up_lcdinitialize failed: %d\n", -ret); + g_nxhello.code = NXEXIT_LCDINITIALIZE; + return ERROR; + } + + /* Get the device instance */ + + dev = up_lcdgetdev(CONFIG_EXAMPLES_NXHELLO_DEVNO); + if (!dev) + { + message("nxhello_initialize: up_lcdgetdev failed, devno=%d\n", CONFIG_EXAMPLES_NXHELLO_DEVNO); + g_nxhello.code = NXEXIT_LCDGETDEV; + return ERROR; + } + + /* Turn the LCD on at 75% power */ + + (void)dev->setpower(dev, ((3*CONFIG_LCD_MAXPOWER + 3)/4)); +#else + int ret; + + /* Initialize the frame buffer device */ + + message("nxhello_initialize: Initializing framebuffer\n"); + ret = up_fbinitialize(); + if (ret < 0) + { + message("nxhello_initialize: up_fbinitialize failed: %d\n", -ret); + g_nxhello.code = NXEXIT_FBINITIALIZE; + return ERROR; + } + + dev = up_fbgetvplane(CONFIG_EXAMPLES_NXHELLO_VPLANE); + if (!dev) + { + message("nxhello_initialize: up_fbgetvplane failed, vplane=%d\n", CONFIG_EXAMPLES_NXHELLO_VPLANE); + g_nxhello.code = NXEXIT_FBGETVPLANE; + return ERROR; + } +#endif + + /* Then open NX */ + + message("nxhello_initialize: Open NX\n"); + g_nxhello.hnx = nx_open(dev); + if (!g_nxhello.hnx) + { + message("nxhello_initialize: nx_open failed: %d\n", errno); + g_nxhello.code = NXEXIT_NXOPEN; + return ERROR; + } + return OK; +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: user_start/nxhello_main + ****************************************************************************/ + +#ifdef CONFIG_EXAMPLES_NXHELLO_BUILTIN +# define MAIN_NAME nxhello_main +# define MAIN_NAME_STRING "nxhello_main" +#else +# define MAIN_NAME user_start +# define MAIN_NAME_STRING "user_start" +#endif + +int MAIN_NAME(int argc, char *argv[]) +{ + nxgl_mxpixel_t color; + int ret; + + /* Initialize NX */ + + ret = nxhello_initialize(); + message(MAIN_NAME_STRING ": NX handle=%p\n", g_nxhello.hnx); + if (!g_nxhello.hnx || ret < 0) + { + message(MAIN_NAME_STRING ": Failed to get NX handle: %d\n", errno); + g_nxhello.code = NXEXIT_NXOPEN; + goto errout; + } + + /* Set the background to the configured background color */ + + message(MAIN_NAME_STRING ": Set background color=%d\n", + CONFIG_EXAMPLES_NXHELLO_BGCOLOR); + + color = CONFIG_EXAMPLES_NXHELLO_BGCOLOR; + ret = nx_setbgcolor(g_nxhello.hnx, &color); + if (ret < 0) + { + message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + g_nxhello.code = NXEXIT_NXSETBGCOLOR; + goto errout_with_nx; + } + + /* Get the background window */ + + ret = nx_requestbkgd(g_nxhello.hnx, &g_bgcb, NULL); + if (ret < 0) + { + message(MAIN_NAME_STRING ": nx_setbgcolor failed: %d\n", errno); + g_nxhello.code = NXEXIT_NXREQUESTBKGD; + goto errout_with_nx; + } + + /* Wait until we have the screen resolution. We'll have this immediately + * unless we are dealing with the NX server. + */ + + while (!g_nxhello.havepos) + { + (void)sem_wait(&g_nxhello.sem); + } + message(MAIN_NAME_STRING ": Screen resolution (%d,%d)\n", g_nxhello.xres, g_nxhello.yres); + + /* Now, say hello and exit, leeping a little before each. */ + + sleep(1); + nxhello_hello(g_nxhello.hbkgd); + sleep(1); + + /* Release background */ + + (void)nx_releasebkgd(g_nxhello.hbkgd); + + /* Close NX */ + +errout_with_nx: + message(MAIN_NAME_STRING ": Close NX\n"); + nx_close(g_nxhello.hnx); +errout: + return g_nxhello.code; +} diff --git a/nuttx/arch/z80/src/ez80/ez80_serial.c b/nuttx/arch/z80/src/ez80/ez80_serial.c index e5fefbd87..e6eaabd0c 100644 --- a/nuttx/arch/z80/src/ez80/ez80_serial.c +++ b/nuttx/arch/z80/src/ez80/ez80_serial.c @@ -678,7 +678,7 @@ void up_serialinit(void) /* Make sure that all UART interrupts are disabled */ ez80_disableuartint(TTYS0_DEV.priv); -#ifdef TTYS1DEV +#ifdef TTYS1_DEV ez80_disableuartint(TTYS1_DEV.priv); #endif @@ -729,7 +729,7 @@ void up_serialinit(void) (void)uart_register("/dev/console", &CONSOLE_DEV); #endif (void)uart_register("/dev/ttyS0", &TTYS0_DEV); -#ifdef TTYS1DEV +#ifdef TTYS1_DEV (void)uart_register("/dev/ttyS1", &TTYS1_DEV); #endif } diff --git a/nuttx/configs/stm3210e-eval/nsh2/appconfig b/nuttx/configs/stm3210e-eval/nsh2/appconfig index 62724fb96..d3fe4cc28 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/appconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/appconfig @@ -41,8 +41,9 @@ CONFIGURED_APPS += examples/nsh CONFIGURED_APPS += nshlib -# The NX example configured as an NX built-in command +# The NX and NXHELLO examples configured as an NX built-in commands CONFIGURED_APPS += examples/nx +CONFIGURED_APPS += examples/nxhello diff --git a/nuttx/configs/stm3210e-eval/nsh2/defconfig b/nuttx/configs/stm3210e-eval/nsh2/defconfig index 7b95b1a8e..988d659e4 100644 --- a/nuttx/configs/stm3210e-eval/nsh2/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh2/defconfig @@ -1009,6 +1009,35 @@ CONFIG_EXAMPLES_NX_NOTIFYSIGNO=4 CONFIG_EXAMPLES_NX_EXTERNINIT=n # +# Settings for examples/nx +# +# CONFIG_EXAMPLES_NXHELLO_BUILTIN -- Build the NXHELLO example as a "built-in" +# that can be executed from the NSH command line +# CONFIG_EXAMPLES_NXHELLO_VPLANE -- The plane to select from the frame- +# buffer driver for use in the test. Default: 0 +# CONFIG_EXAMPLES_NXHELLO_DEVNO - The LCD device to select from the LCD +# driver for use in the test: Default: 0 +# CONFIG_EXAMPLES_NXHELLO_BGCOLOR -- The color of the background. Default +# depends on CONFIG_EXAMPLES_NXHELLO_BPP. +# CONFIG_EXAMPLES_NXHELLO_FONTCOLOR -- The color of the fonts used in the +# background window. Default depends on CONFIG_EXAMPLES_NXHELLO_BPP. +# CONFIG_EXAMPLES_NXHELLO_BPP -- Pixels per pixel to use. Valid options +# include 2, 4, 8, 16, 24, and 32. Default is 32. +# CONFIG_EXAMPLES_NXHELLO_EXTERNINIT - The driver for the graphics device on +# this platform requires some unusual initialization. This is the +# for, for example, SPI LCD/OLED devices. If this configuration is +# selected, then the platform code must provide an LCD initialization +# function. +# +CONFIG_EXAMPLES_NXHELLO_BUILTIN=y +CONFIG_EXAMPLES_NXHELLO_VPLANE=0 +CONFIG_EXAMPLES_NXHELLO_DEVNO=0 +CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 +CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf +CONFIG_EXAMPLES_NXHELLO_BPP=16 +CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n + +# # Stack and heap information # # CONFIG_BOOT_RUNFROMFLASH - Some configurations support XIP |