From 24773be75424863910db96fdf498cb2189eacf6c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 21 May 2019 14:49:19 -0600 Subject: [PATCH] Squashed commit of the following: configs/lpcxpresso-lpc54628: Cosmetic update to a defconfig. Update to README. configs/lpcxpresso-lpc54628: Update Twm4Nx configurations. configs/lpcxpresso-lpc54628: Add another Twm4Nx configuration for working out the new CONTEMPORARY theme. --- configs/b-l475e-iot01a/include/board.h | 1 - configs/lpcxpresso-lpc54628/README.txt | 16 ++- .../{twm4nx => twm4nx1}/defconfig | 1 + configs/lpcxpresso-lpc54628/twm4nx2/defconfig | 107 ++++++++++++++++++ 4 files changed, 121 insertions(+), 4 deletions(-) rename configs/lpcxpresso-lpc54628/{twm4nx => twm4nx1}/defconfig (98%) create mode 100644 configs/lpcxpresso-lpc54628/twm4nx2/defconfig diff --git a/configs/b-l475e-iot01a/include/board.h b/configs/b-l475e-iot01a/include/board.h index e4d408990f..207b9ed25e 100644 --- a/configs/b-l475e-iot01a/include/board.h +++ b/configs/b-l475e-iot01a/include/board.h @@ -173,7 +173,6 @@ #define GPIO_QSPI_IO3 (GPIO_QSPI_BK1_IO3_2 | GPIO_FLOAT | GPIO_PUSHPULL | GPIO_SPEED_100MHz) #define GPIO_QSPI_SCK (GPIO_QSPI_CLK_2 | GPIO_FLOAT | GPIO_PUSHPULL | GPIO_SPEED_100MHz) - /************************************************************************************ * Public Data ************************************************************************************/ diff --git a/configs/lpcxpresso-lpc54628/README.txt b/configs/lpcxpresso-lpc54628/README.txt index 4c357e3ca6..19f28d1aee 100644 --- a/configs/lpcxpresso-lpc54628/README.txt +++ b/configs/lpcxpresso-lpc54628/README.txt @@ -516,10 +516,14 @@ Configurations 2019-03-20: Everything works fine! - twm4nx: + twm4nx1 and twmnx2: - This configuration exercises the port of TWM to NuttX. A description of - that port is available at apps/graphics/twm4nx/README.txt. + These configuration exercises the port of TWM to NuttX. A description of + that port is available at apps/graphics/twm4nx/README.txt. The two + configurations are identical, differing on in the "theme" of the UI. + twm4nx1 uses framed windows in dark, bright primary colors reminiscent of + Windows98. twm4nx2 uses border-less windows in pastel shades for a more + contemporary look. NOTES: 1. This version uses the on-board display with the touchscreen for @@ -557,3 +561,9 @@ Configurations very top of the display where it can be very difficult to touch buttons or grab'n'move object. + 4. Color artifacts: In the CLASSIC configuration, the background of the + cental NX image is a slightly different hue of blue. For the + CONTEMPORARY configuration, the toolbar buttons are supposed to be + borderless. There is however, a fine border around each toolbar + widget with ruins the feel that the theme was trying for. + diff --git a/configs/lpcxpresso-lpc54628/twm4nx/defconfig b/configs/lpcxpresso-lpc54628/twm4nx1/defconfig similarity index 98% rename from configs/lpcxpresso-lpc54628/twm4nx/defconfig rename to configs/lpcxpresso-lpc54628/twm4nx1/defconfig index 0561c06bc5..1d701edb22 100644 --- a/configs/lpcxpresso-lpc54628/twm4nx/defconfig +++ b/configs/lpcxpresso-lpc54628/twm4nx1/defconfig @@ -60,6 +60,7 @@ CONFIG_NSH_READLINE=y CONFIG_NX=y CONFIG_NXFONT_SANS22X29B=y CONFIG_NXFONT_SANS23X27=y +CONFIG_NXGLYPHS_BACKGROUNDCOLOR=0x9dfb CONFIG_NXTERM=y CONFIG_NXTERM_CACHESIZE=32 CONFIG_NXTERM_CURSORCHAR=95 diff --git a/configs/lpcxpresso-lpc54628/twm4nx2/defconfig b/configs/lpcxpresso-lpc54628/twm4nx2/defconfig new file mode 100644 index 0000000000..35239ffbe4 --- /dev/null +++ b/configs/lpcxpresso-lpc54628/twm4nx2/defconfig @@ -0,0 +1,107 @@ +# +# This file is autogenerated: PLEASE DO NOT EDIT IT. +# +# You can use "make menuconfig" to make any modifications to the installed .config file. +# You can then do "make savedefconfig" to generate a new defconfig file that includes your +# modifications. +# +# CONFIG_ARCH_FPU is not set +# CONFIG_NXFONTS_DISABLE_16BPP is not set +# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set +# CONFIG_NX_DISABLE_16BPP is not set +CONFIG_ARCH="arm" +CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" +CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP_LPC54628=y +CONFIG_ARCH_CHIP_LPC54XX=y +CONFIG_ARCH_INTERRUPTSTACK=2048 +CONFIG_ARCH_STACKDUMP=y +CONFIG_ARCH_STDARG_H=y +CONFIG_BOARD_LOOPSPERMSEC=21082 +CONFIG_EXPERIMENTAL=y +CONFIG_FS_PROCFS=y +CONFIG_FT5X06_POLLMODE=y +CONFIG_FT5X06_SINGLEPOINT=y +CONFIG_FT5X06_SWAPXY=y +CONFIG_FT5X06_THRESHX=8 +CONFIG_FT5X06_THRESHY=8 +CONFIG_GRAPHICS_TWM4NX=y +CONFIG_HAVE_CXX=y +CONFIG_HAVE_CXXINITIALIZE=y +CONFIG_INPUT=y +CONFIG_INPUT_FT5X06=y +CONFIG_LIB_HOSTNAME="LPCXpresso-LPC54628" +CONFIG_LPC54_EMC=y +CONFIG_LPC54_EMC_DYNAMIC_CS0=y +CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000 +CONFIG_LPC54_EMC_DYNAMIC_CS0_SIZE=0x00f80000 +CONFIG_LPC54_GPIOIRQ=y +CONFIG_LPC54_I2C2_MASTER=y +CONFIG_LPC54_LCD=y +CONFIG_LPC54_LCD_BGR=y +CONFIG_LPC54_LCD_BPP16_565=y +CONFIG_LPC54_LCD_HBACKPORCH=43 +CONFIG_LPC54_LCD_HFRONTPORCH=8 +CONFIG_LPC54_LCD_VBACKPORCH=12 +CONFIG_LPC54_LCD_VFRONTPORCH=4 +CONFIG_LPC54_LCD_VPULSE=10 +CONFIG_LPC54_LCD_VRAMBASE=0xa0000000 +CONFIG_LPC54_USART0=y +CONFIG_MAX_TASKS=16 +CONFIG_MAX_WDOGPARMS=2 +CONFIG_MM_REGIONS=2 +CONFIG_MQ_MAXMSGSIZE=64 +CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_STREAMS=8 +CONFIG_NSH_FILEIOSIZE=512 +CONFIG_NSH_LIBRARY=y +CONFIG_NSH_LINELEN=64 +CONFIG_NSH_READLINE=y +CONFIG_NX=y +CONFIG_NXFONT_SANS22X29B=y +CONFIG_NXFONT_SANS23X27=y +CONFIG_NXGLYPHS_BACKGROUNDCOLOR=0xc54a +CONFIG_NXTERM=y +CONFIG_NXTERM_CACHESIZE=32 +CONFIG_NXTERM_CURSORCHAR=95 +CONFIG_NXTERM_MXCHARS=325 +CONFIG_NXTK_BORDERCOLOR1=0x5cb7 +CONFIG_NXTK_BORDERCOLOR2=0x21c9 +CONFIG_NXTK_BORDERCOLOR3=0xffdf +CONFIG_NXTK_BORDERWIDTH=0 +CONFIG_NXWIDGETS_BPP=16 +CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS=y +CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS=y +CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=0xdd71 +CONFIG_NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR=0xc618 +CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=0xfeb0 +CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=0x21e9 +CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=0xffdf +CONFIG_NXWIDGETS_SIZEOFCHAR=1 +CONFIG_NX_BLOCKING=y +CONFIG_NX_KBD=y +CONFIG_NX_SWCURSOR=y +CONFIG_NX_XYINPUT_TOUCHSCREEN=y +CONFIG_PREALLOC_MQ_MSGS=64 +CONFIG_PREALLOC_TIMERS=4 +CONFIG_PREALLOC_WDOGS=8 +CONFIG_RAM_SIZE=163840 +CONFIG_RAM_START=0x20000000 +CONFIG_RAW_BINARY=y +CONFIG_RR_INTERVAL=200 +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_ONEXIT=y +CONFIG_SCHED_WAITPID=y +CONFIG_SDCLONE_DISABLE=y +CONFIG_START_DAY=4 +CONFIG_START_MONTH=5 +CONFIG_START_YEAR=2019 +CONFIG_SYMTAB_ORDEREDBYNAME=y +CONFIG_TASK_NAME_SIZE=0 +CONFIG_TWM4NX_ARCHINIT=y +CONFIG_TWM4NX_CONTEMPORARY=y +CONFIG_TWM4NX_NOKEYBOARD=y +CONFIG_TWM4NX_TOUCHSCREEN=y +CONFIG_USART0_SERIAL_CONSOLE=y +CONFIG_USER_ENTRYPOINT="twm4nx_main" +CONFIG_WDOG_INTRESERVE=0