diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-18 22:22:02 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-07-18 22:22:02 +0000 |
| commit | 5008a83d14dd96fd953cd698c5d4a2780a77cea9 (patch) | |
| tree | e7d2fc2d61de30088b1fa463d85574c22e72882f /nuttx | |
| parent | 924c65c554d83fe6f12bc55a9ce6d4ab62597b94 (diff) | |
| download | px4-nuttx-5008a83d14dd96fd953cd698c5d4a2780a77cea9.tar.gz px4-nuttx-5008a83d14dd96fd953cd698c5d4a2780a77cea9.tar.bz2 px4-nuttx-5008a83d14dd96fd953cd698c5d4a2780a77cea9.zip | |
Add apps/examples/nxhello -- a VERY simple graphics example
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3797 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -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 |
3 files changed, 33 insertions, 3 deletions
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 |