diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2013-10-15 14:29:06 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2013-10-15 14:29:06 -0600 |
commit | 7ef1ad19448670543bece35c3a6119e6a440c778 (patch) | |
tree | 79292d132ebcbe2141042217e3bad7342e22e162 | |
parent | 24ee5014675d43c80c0580882fe5cc24ca17e7a8 (diff) | |
download | px4-nuttx-7ef1ad19448670543bece35c3a6119e6a440c778.tar.gz px4-nuttx-7ef1ad19448670543bece35c3a6119e6a440c778.tar.bz2 px4-nuttx-7ef1ad19448670543bece35c3a6119e6a440c778.zip |
Use NxWidgets::CScaledBitmap to scale icons in the NxWM taskbar
-rw-r--r-- | NxWidgets/ChangeLog.txt | 2 | ||||
-rw-r--r-- | NxWidgets/Kconfig | 22 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/include/cscaledbitmap.hxx | 4 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx | 2 | ||||
-rw-r--r-- | NxWidgets/libnxwidgets/src/cscaledbitmap.cxx | 62 | ||||
-rw-r--r-- | NxWidgets/nxwm/include/ctaskbar.hxx | 4 | ||||
-rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 24 | ||||
-rw-r--r-- | NxWidgets/nxwm/src/ctaskbar.cxx | 38 | ||||
-rw-r--r-- | apps/NxWidgets/Kconfig | 22 | ||||
-rw-r--r-- | nuttx/ChangeLog | 2 | ||||
-rw-r--r-- | nuttx/configs/sama5d3x-ek/nxwm/defconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/sim/nxwm/defconfig | 162 |
12 files changed, 292 insertions, 55 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt index 3fb1e5398..996ed236c 100644 --- a/NxWidgets/ChangeLog.txt +++ b/NxWidgets/ChangeLog.txt @@ -390,4 +390,6 @@ * NxWidgets::CScaledImage: This new class is a wrapper for an class the exports IBitMap. It will perform scaling via bi-linear interpolation so that images can be scaled to any size desired (2013-10-15). +* NxWM::CTaskbar:: Can now be configured to scale taskbasr icons using + NxWidgets::CScaledImage (2013-10-15) diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig index e1ca03169..2de112c3f 100644 --- a/NxWidgets/Kconfig +++ b/NxWidgets/Kconfig @@ -420,6 +420,28 @@ config NXWM_TASKBAR_WIDTH Task bar thickness (either vertical or horizontal). Default: 25 + 2*2 endif +config NXWM_TASKBAR_ICONSCALE + bool "Scale Icons" + default n + ---help--- + Enable scaling of icons in the task bar + +if NXWM_TASKBAR_ICONSCALE + +config NXWM_TASKBAR_ICONWIDTH + int "Icon Width (pixels)" + default 50 + ---help--- + Scaled width of each taskbar ICON in pixels. + +config NXWM_TASKBAR_ICONHEIGHT + int "Icon Height (rows)" + default 42 + ---help--- + Scaled height of each taskbar ICON in pixels. + +endif #NXWM_TASKBAR_ICONSCALE + config NXWM_DISABLE_MINIMIZE bool "Disable Minimize Button" default n diff --git a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx index 4c5d8f729..3c0594a1d 100644 --- a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx +++ b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx @@ -75,7 +75,7 @@ namespace NXWidgets FAR IBitmap *m_bitmap; /**< The bitmap that is being scaled */ struct nxgl_size_s m_size; /**< Scaled size of the image */ FAR uint8_t *m_rowCache[2]; /**< Two cached rows of the image */ - unsigned int m_row; /**< Row number of the first cached row */ + int m_row; /**< Row number of the first cached row */ b16_t m_xScale; /**< X scale factor */ b16_t m_yScale; /**< Y scale factor */ @@ -167,7 +167,7 @@ namespace NXWidgets * @return The bitmap's height (in rows). */ - inline const nxgl_coord_t getHeight(void) const; + const nxgl_coord_t getHeight(void) const; /** * Get the bitmap's width (in bytes). diff --git a/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx b/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx index 241736add..1fb2518a5 100644 --- a/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx +++ b/NxWidgets/libnxwidgets/src/crlepalettebitmap.cxx @@ -192,7 +192,7 @@ bool CRlePaletteBitmap::getRun(nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t widt { // Check ranges. Casts to unsigned int are ugly but permit one-sided comparisons - if (((unsigned int)x < (unsigned int)width) && + if (((unsigned int)x < (unsigned int)m_bitmap->width) && ((unsigned int)(x + width) <= (unsigned int)m_bitmap->width)) { // Seek to the requested row diff --git a/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx b/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx index 6fe211ca4..e274bbb0a 100644 --- a/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx +++ b/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx @@ -81,16 +81,17 @@ CScaledBitmap::CScaledBitmap(IBitmap *bitmap, struct nxgl_size_s &newSize) // yImage = yRequested * oldHeight / newHeight // = yRequested * yScale - m_xScale = itob16((uint32_t)m_bitmap->getHeight()) / newSize.h; + m_yScale = itob16((uint32_t)m_bitmap->getHeight()) / newSize.h; // Allocate and initialize the row cache size_t stride = bitmap->getStride(); - m_rowCache[0] = new uint8_t(stride); - m_rowCache[1] = new uint8_t(stride); + m_rowCache[0] = new uint8_t[stride]; + m_rowCache[1] = new uint8_t[stride]; // Read the first two rows into the cache + m_row = m_bitmap->getWidth(); // Set to an impossible value cacheRows(0); } @@ -100,6 +101,8 @@ CScaledBitmap::CScaledBitmap(IBitmap *bitmap, struct nxgl_size_s &newSize) CScaledBitmap::~CScaledBitmap(void) { + // Delete the allocated row cache memory + if (m_rowCache[0]) { delete m_rowCache[0]; @@ -108,6 +111,13 @@ CScaledBitmap::~CScaledBitmap(void) if (m_rowCache[1]) { delete m_rowCache[1]; + } + + // We are also responsible for deleting the contained IBitmap + + if (m_bitmap) + { + delete m_bitmap; } } @@ -372,7 +382,7 @@ bool CScaledBitmap::cacheRows(unsigned int row) row = bitmapHeight - 1; } - if (!m_bitmap->getRun(0, row, bitmapWidth, &m_rowCache[1])) + if (!m_bitmap->getRun(0, row, bitmapWidth, m_rowCache[1])) { gdbg("Failed to read bitmap row %d\n", row); return false; @@ -391,7 +401,7 @@ bool CScaledBitmap::cacheRows(unsigned int row) row = bitmapHeight - 1; } - if (!m_bitmap->getRun(0, row, bitmapWidth, &m_rowCache[0])) + if (!m_bitmap->getRun(0, row, bitmapWidth, m_rowCache[0])) { gdbg("Failed to read bitmap row %d\n", row); return false; @@ -408,7 +418,7 @@ bool CScaledBitmap::cacheRows(unsigned int row) row = bitmapHeight - 1; } - if (!m_bitmap->getRun(0, row, bitmapWidth, &m_rowCache[1])) + if (!m_bitmap->getRun(0, row, bitmapWidth, m_rowCache[1])) { gdbg("Failed to read bitmap row %d\n", row); return false; @@ -432,21 +442,33 @@ bool CScaledBitmap::scaleColor(FAR const struct rgbcolor_s &incolor1, FAR const struct rgbcolor_s &incolor2, b16_t fraction, FAR struct rgbcolor_s &outcolor) { - unsigned int red; - unsigned int green; - unsigned int blue; + uint8_t component; + b16_t red; + b16_t green; + b16_t blue; + + // A fraction of < 0.5 would mean to use use mostly color1; a fraction + // greater than 0.5 would men to use mostly color2 + b16_t remainder = b16ONE - fraction; - - red = (unsigned int)incolor1.r * fraction + - (unsigned int)incolor2.r * remainder; - green = (unsigned int)incolor1.g * fraction + - (unsigned int)incolor2.g * remainder; - blue = (unsigned int)incolor1.b * fraction + - (unsigned int)incolor2.b * remainder; - - outcolor.r = red < 256 ? red : 255; - outcolor.g = green < 256 ? green : 255; - outcolor.b = blue < 256 ? blue : 255; + + // Interpolate each color value (converting to b15) + + red = (b16_t)incolor1.r * remainder + (b16_t)incolor2.r * fraction; + green = (b16_t)incolor1.g * remainder + (b16_t)incolor2.g * fraction; + blue = (b16_t)incolor1.b * remainder + (b16_t)incolor2.b * fraction; + + // Return the integer, interpolated values, clipping to the range of + // uint8_t + + component = b16toi(red); + outcolor.r = component < 256 ? component : 255; + + component = b16toi(green); + outcolor.g = component < 256 ? component : 255; + + component = b16toi(blue); + outcolor.b = component < 256 ? component : 255; return true; } diff --git a/NxWidgets/nxwm/include/ctaskbar.hxx b/NxWidgets/nxwm/include/ctaskbar.hxx index 84c7b28f4..cbd35b52f 100644 --- a/NxWidgets/nxwm/include/ctaskbar.hxx +++ b/NxWidgets/nxwm/include/ctaskbar.hxx @@ -92,8 +92,8 @@ namespace NxWM struct STaskbarSlot { - IApplication *app; /**< A reference to the icon */ - NXWidgets::CImage *image; /**< The icon image that goes with the application */ + IApplication *app; /**< A reference to the application */ + NXWidgets::CImage *image; /**< The icon image for the application */ }; /** diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index 6e540fefc..7715224e2 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -223,6 +223,24 @@ # define CONFIG_NXWM_TASKBAR_TOP 1 #endif +// Taskbar ICON scaling + +#ifdef CONFIG_NXWM_TASKBAR_ICONSCALE +# ifndef CONFIG_NXWM_TASKBAR_ICONWIDTH +# error Scaling requires CONFIG_NXWM_TASKBAR_ICONWIDTH +# define CONFIG_NXWM_TASKBAR_ICONWIDTH 50 +# endif +# ifndef CONFIG_NXWM_TASKBAR_ICONHEIGHT +# error Scaling requires CONFIG_NXWM_TASKBAR_ICONHEIGHT +# define CONFIG_NXWM_TASKBAR_ICONHEIGHT 42 +# endif +#else +# undef CONFIG_NXWM_TASKBAR_ICONWIDTH +# define CONFIG_NXWM_TASKBAR_ICONWIDTH 25 // Used below +# undef CONFIG_NXWM_TASKBAR_ICONHEIGHT +# define CONFIG_NXWM_TASKBAR_ICONHEIGHT 21 // Used below (NOT) +#endif + /** * At present, all icons are 25 pixels in "width" and, hence require a * task bar of at least that size. @@ -230,9 +248,11 @@ #ifndef CONFIG_NXWM_TASKBAR_WIDTH # if defined(CONFIG_NXWM_TASKBAR_TOP) || defined(CONFIG_NXWM_TASKBAR_BOTTOM) -# define CONFIG_NXWM_TASKBAR_WIDTH (25+2*CONFIG_NXWM_TASKBAR_HSPACING) +# define CONFIG_NXWM_TASKBAR_WIDTH \ + (CONFIG_NXWM_TASKBAR_ICONWIDTH+2*CONFIG_NXWM_TASKBAR_HSPACING) # else -# define CONFIG_NXWM_TASKBAR_WIDTH (25+2*CONFIG_NXWM_TASKBAR_VSPACING) +# define CONFIG_NXWM_TASKBAR_WIDTH \ + (CONFIG_NXWM_TASKBAR_ICONWIDTH+2*CONFIG_NXWM_TASKBAR_VSPACING) # endif #endif diff --git a/NxWidgets/nxwm/src/ctaskbar.cxx b/NxWidgets/nxwm/src/ctaskbar.cxx index 226ebe7bb..3a5e44aec 100644 --- a/NxWidgets/nxwm/src/ctaskbar.cxx +++ b/NxWidgets/nxwm/src/ctaskbar.cxx @@ -46,6 +46,7 @@ #include "crect.hxx" #include "cwidgetcontrol.hxx" #include "cnxtkwindow.hxx" +#include "cscaledbitmap.hxx" #include "cwindowmessenger.hxx" #include "ctaskbar.hxx" @@ -456,12 +457,43 @@ bool CTaskbar::startApplication(IApplication *app, bool minimized) NXWidgets::IBitmap *bitmap = app->getIcon(); +#ifdef CONFIG_NXWM_TASKBAR_ICONSCALE + // Create a CScaledBitmap to scale the bitmap icon + + NXWidgets::CScaledBitmap *scaler = (NXWidgets::CScaledBitmap *)0; + if (bitmap) + { + // Create a CScaledBitmap to scale the bitmap icon + + struct nxgl_size_s iconSize; + iconSize.w = CONFIG_NXWM_TASKBAR_ICONWIDTH; + iconSize.h = CONFIG_NXWM_TASKBAR_ICONHEIGHT; + + scaler = new NXWidgets::CScaledBitmap(bitmap, iconSize); + if (!scaler) + { + return false; + } + } +#endif + // Create a CImage instance to manage the applications icon. Assume the // minimum size in case no bitmap is provided (bitmap == NULL) int w = 1; int h = 1; +#ifdef CONFIG_NXWM_TASKBAR_ICONSCALE + if (scaler) + { + w = scaler->getWidth(); + h = scaler->getHeight(); + } + + NXWidgets::CImage *image = + new NXWidgets::CImage(control, 0, 0, w, h, scaler, 0); + +#else if (bitmap) { w = bitmap->getWidth(); @@ -471,6 +503,8 @@ bool CTaskbar::startApplication(IApplication *app, bool minimized) NXWidgets::CImage *image = new NXWidgets::CImage(control, 0, 0, w, h, bitmap, 0); +#endif + if (!image) { return false; @@ -490,8 +524,8 @@ bool CTaskbar::startApplication(IApplication *app, bool minimized) // the task bar struct STaskbarSlot slot; - slot.app = app; - slot.image = image; + slot.app = app; + slot.image = image; m_slots.push_back(slot); // Initialize the application states diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig index e1ca03169..2de112c3f 100644 --- a/apps/NxWidgets/Kconfig +++ b/apps/NxWidgets/Kconfig @@ -420,6 +420,28 @@ config NXWM_TASKBAR_WIDTH Task bar thickness (either vertical or horizontal). Default: 25 + 2*2 endif +config NXWM_TASKBAR_ICONSCALE + bool "Scale Icons" + default n + ---help--- + Enable scaling of icons in the task bar + +if NXWM_TASKBAR_ICONSCALE + +config NXWM_TASKBAR_ICONWIDTH + int "Icon Width (pixels)" + default 50 + ---help--- + Scaled width of each taskbar ICON in pixels. + +config NXWM_TASKBAR_ICONHEIGHT + int "Icon Height (rows)" + default 42 + ---help--- + Scaled height of each taskbar ICON in pixels. + +endif #NXWM_TASKBAR_ICONSCALE + config NXWM_DISABLE_MINIMIZE bool "Disable Minimize Button" default n diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index d366a73dd..708544236 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -5765,4 +5765,6 @@ option just really cannot work (2013-10-13). * configs/sama5d3x-ek/nxwm: Add NxWM configuration for SAMA5D3x-EK (2013-10-13). + * configs/sama5d3x-ek/nxwm/defconfig: Now uses scaled icons in the + the NxWM taskbar (2013-10-15). diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig index 98fb311c9..acd57d8ed 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig +++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig @@ -889,6 +889,9 @@ CONFIG_NXWM_TASKBAR_HSPACING=8 CONFIG_NXWM_TASKBAR_LEFT=y # CONFIG_NXWM_TASKBAR_RIGHT is not set # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set +CONFIG_NXWM_TASKBAR_ICONSCALE=y +CONFIG_NXWM_TASKBAR_ICONWIDTH=50 +CONFIG_NXWM_TASKBAR_ICONHEIGHT=42 # CONFIG_NXWM_DISABLE_MINIMIZE is not set # CONFIG_NXWM_TASKBAR_NO_BORDER is not set diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig index 59fa96a6b..f812d1ed2 100644 --- a/nuttx/configs/sim/nxwm/defconfig +++ b/nuttx/configs/sim/nxwm/defconfig @@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y # # Build Configuration # -# CONFIG_APPS_DIR="../apps" +CONFIG_APPS_DIR="../apps" # CONFIG_BUILD_2PASS is not set # @@ -39,6 +39,7 @@ CONFIG_HOST_LINUX=y # Debug Options # # CONFIG_DEBUG is not set +# CONFIG_ARCH_HAVE_STACKCHECK is not set CONFIG_DEBUG_SYMBOLS=y # @@ -56,7 +57,6 @@ CONFIG_ARCH_SIM=y # CONFIG_ARCH_Z16 is not set # CONFIG_ARCH_Z80 is not set CONFIG_ARCH="sim" -CONFIG_BOARD_LOOPSPERMSEC= # # Simulation Configuration Options @@ -74,18 +74,22 @@ CONFIG_SIM_FBBPP=32 # Architecture Options # # CONFIG_ARCH_NOINTC is not set +# CONFIG_ARCH_VECNOTIRQ is not set # CONFIG_ARCH_DMA is not set # CONFIG_ARCH_IRQPRIO is not set # CONFIG_CUSTOM_STACK is not set # CONFIG_ADDRENV is not set +# CONFIG_ARCH_HAVE_VFORK is not set # CONFIG_ARCH_STACKDUMP is not set # CONFIG_ENDIAN_BIG is not set +# CONFIG_ARCH_HAVE_RAMFUNCS is not set +# CONFIG_ARCH_HAVE_RAMVECTORS is not set # # Board Settings # -CONFIG_RAM_START= -CONFIG_RAM_SIZE= +CONFIG_BOARD_LOOPSPERMSEC=5000 +# CONFIG_ARCH_CALIBRATION is not set # # Boot options @@ -97,6 +101,12 @@ CONFIG_BOOT_RUNFROMFLASH=y # CONFIG_BOOT_COPYTORAM is not set # +# Boot Memory Configuration +# +CONFIG_RAM_START=0x0 +CONFIG_RAM_SIZE=0 + +# # Board Selection # CONFIG_ARCH_BOARD_SIM=y @@ -115,10 +125,12 @@ CONFIG_NSH_MMCSDMINOR=0 # # RTOS Features # +# CONFIG_BOARD_INITIALIZE is not set CONFIG_MSEC_PER_TICK=10 CONFIG_RR_INTERVAL=0 # CONFIG_SCHED_INSTRUMENTATION is not set CONFIG_TASK_NAME_SIZE=32 +# CONFIG_SCHED_HAVE_PARENT is not set # CONFIG_JULIAN_TIME is not set CONFIG_START_YEAR=2012 CONFIG_START_MONTH=5 @@ -129,8 +141,8 @@ CONFIG_DEV_CONSOLE=y # CONFIG_FDCLONE_DISABLE is not set # CONFIG_FDCLONE_STDIO is not set CONFIG_SDCLONE_DISABLE=y -# CONFIG_SCHED_WORKQUEUE is not set CONFIG_SCHED_WAITPID=y +# CONFIG_SCHED_STARTHOOK is not set # CONFIG_SCHED_ATEXIT is not set CONFIG_SCHED_ONEXIT=y CONFIG_SCHED_ONEXIT_MAX=1 @@ -141,9 +153,16 @@ CONFIG_DISABLE_POSIX_TIMERS=y # CONFIG_DISABLE_PTHREAD is not set # CONFIG_DISABLE_SIGNALS is not set # CONFIG_DISABLE_MQUEUE is not set -# CONFIG_DISABLE_MOUNTPOINT is not set # CONFIG_DISABLE_ENVIRON is not set -CONFIG_DISABLE_POLL=y + +# +# Signal Numbers +# +CONFIG_SIG_SIGUSR1=1 +CONFIG_SIG_SIGUSR2=2 +CONFIG_SIG_SIGALARM=3 +CONFIG_SIG_SIGCONDTIMEDOUT=16 +CONFIG_SIG_SIGWORK=17 # # Sizes of configurable things (0 disables) @@ -171,6 +190,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=8192 # # Device Drivers # +CONFIG_DISABLE_POLL=y CONFIG_DEV_NULL=y # CONFIG_DEV_ZERO is not set # CONFIG_LOOP is not set @@ -182,6 +202,7 @@ CONFIG_DEV_NULL=y # CONFIG_RTC is not set # CONFIG_WATCHDOG is not set # CONFIG_ANALOG is not set +# CONFIG_AUDIO_DEVICES is not set # CONFIG_BCH is not set # CONFIG_INPUT is not set # CONFIG_LCD is not set @@ -191,11 +212,16 @@ CONFIG_DEV_NULL=y # CONFIG_PM is not set # CONFIG_POWER is not set # CONFIG_SENSORS is not set -# CONFIG_SERCOMM_CONSOLE is not set CONFIG_SERIAL=y # CONFIG_DEV_LOWCONSOLE is not set # CONFIG_16550_UART is not set + +# +# USART Configuration +# # CONFIG_STANDARD_SERIAL is not set +# CONFIG_SERIAL_IFLOWCONTROL is not set +# CONFIG_SERIAL_OFLOWCONTROL is not set # CONFIG_USBDEV is not set # CONFIG_USBHOST is not set # CONFIG_WIRELESS is not set @@ -221,19 +247,22 @@ CONFIG_SERIAL=y # # File system configuration # +# CONFIG_DISABLE_MOUNTPOINT is not set +# CONFIG_FS_RAMMAP is not set CONFIG_FS_FAT=y CONFIG_FAT_LCNAMES=y CONFIG_FAT_LFN=y CONFIG_FAT_MAXFNAME=32 # CONFIG_FS_FATTIME is not set # CONFIG_FAT_DMAMEMORY is not set -# CONFIG_FS_RAMMAP is not set # CONFIG_FS_NXFFS is not set CONFIG_FS_ROMFS=y +# CONFIG_FS_SMARTFS is not set # # System Logging # +# CONFIG_SYSLOG_ENABLE is not set # CONFIG_SYSLOG is not set # @@ -265,15 +294,14 @@ CONFIG_NX_KBD=y # Framed Window Borders # CONFIG_NXTK_BORDERWIDTH=4 -CONFIG_NXTK_BORDERCOLOR1=0x005a96bd -CONFIG_NXTK_BORDERCOLOR2=0x00233a49 -CONFIG_NXTK_BORDERCOLOR3=0x00f8f8f8 +CONFIG_NXTK_DEFAULT_BORDERCOLORS=y # CONFIG_NXTK_AUTORAISE is not set # # Font Selections # CONFIG_NXFONTS_CHARBITS=7 +# CONFIG_NXFONT_MONO5X8 is not set # CONFIG_NXFONT_SANS17X22 is not set # CONFIG_NXFONT_SANS20X26 is not set CONFIG_NXFONT_SANS23X27=y @@ -321,23 +349,34 @@ CONFIG_NX_MXCLIENTMSGS=16 # # Memory Management # +# CONFIG_MM_MULTIHEAP is not set # CONFIG_MM_SMALL is not set CONFIG_MM_REGIONS=1 # CONFIG_GRAN is not set # +# Audio Support +# +# CONFIG_AUDIO is not set + +# # Binary Formats # # CONFIG_BINFMT_DISABLE is not set # CONFIG_BINFMT_EXEPATH is not set # CONFIG_NXFLAT is not set # CONFIG_ELF is not set +# CONFIG_BUILTIN is not set # CONFIG_PIC is not set # CONFIG_SYMTAB_ORDEREDBYNAME is not set # # Library Routines # + +# +# Standard C Library Options +# CONFIG_STDIO_BUFFER_SIZE=64 CONFIG_STDIO_LINEBUFFER=y CONFIG_NUNGET_CHARS=2 @@ -345,10 +384,14 @@ CONFIG_LIB_HOMEDIR="/" # CONFIG_LIBM is not set # CONFIG_NOPRINTF_FIELDWIDTH is not set # CONFIG_LIBC_FLOATINGPOINT is not set +CONFIG_LIB_RAND_ORDER=1 # CONFIG_EOL_IS_CR is not set # CONFIG_EOL_IS_LF is not set # CONFIG_EOL_IS_BOTH_CRLF is not set CONFIG_EOL_IS_EITHER_CRLF=y +# CONFIG_LIBC_EXECFUNCS is not set +CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024 +CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048 # CONFIG_LIBC_STRERROR is not set # CONFIG_LIBC_PERROR_STDOUT is not set CONFIG_ARCH_LOWPUTC=y @@ -357,6 +400,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set # +# Non-standard Library Support +# +CONFIG_SCHED_WORKQUEUE=y +CONFIG_SCHED_HPWORK=y +CONFIG_SCHED_WORKPRIORITY=192 +CONFIG_SCHED_WORKPERIOD=50000 +CONFIG_SCHED_WORKSTACKSIZE=2048 +# CONFIG_SCHED_LPWORK is not set +# CONFIG_LIB_KBDCODEC is not set +# CONFIG_LIB_SLCDCODEC is not set + +# # Basic CXX Support # # CONFIG_C99_BOOL8 is not set @@ -374,17 +429,14 @@ CONFIG_HAVE_CXX=y # # -# Named Applications +# Built-In Applications # -# CONFIG_BUILTIN is not set # # Examples # # CONFIG_EXAMPLES_BUTTONS is not set # CONFIG_EXAMPLES_CAN is not set -# CONFIG_SYSTEM_CDCACM is not set -# CONFIG_SYSTEM_COMPOSITE is not set # CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_DHCPD is not set # CONFIG_EXAMPLES_ELF is not set @@ -398,9 +450,9 @@ CONFIG_HAVE_CXX=y # CONFIG_EXAMPLES_IGMP is not set # CONFIG_EXAMPLES_LCDRW is not set # CONFIG_EXAMPLES_MM is not set -# CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_MODBUS is not set -# CONFIG_EXAMPLES_NETTEST is not set +# CONFIG_EXAMPLES_MOUNT is not set +# CONFIG_EXAMPLES_NRF24L01TERM is not set # CONFIG_EXAMPLES_NSH is not set # CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NX is not set @@ -415,11 +467,15 @@ CONFIG_HAVE_CXX=y # CONFIG_EXAMPLES_PASHELLO is not set # CONFIG_EXAMPLES_PIPE is not set # CONFIG_EXAMPLES_POLL is not set +# CONFIG_EXAMPLES_POSIXSPAWN is not set # CONFIG_EXAMPLES_QENCODER is not set # CONFIG_EXAMPLES_RGMP is not set # CONFIG_EXAMPLES_ROMFS is not set # CONFIG_EXAMPLES_SENDMAIL is not set # CONFIG_EXAMPLES_SERLOOP is not set +# CONFIG_EXAMPLES_SLCD is not set +# CONFIG_EXAMPLES_SMART is not set +# CONFIG_EXAMPLES_TCPECHO is not set # CONFIG_EXAMPLES_TELNETD is not set # CONFIG_EXAMPLES_THTTPD is not set # CONFIG_EXAMPLES_TIFF is not set @@ -427,14 +483,13 @@ CONFIG_HAVE_CXX=y # CONFIG_EXAMPLES_UDP is not set # CONFIG_EXAMPLES_UIP is not set # CONFIG_EXAMPLES_USBSERIAL is not set -# CONFIG_SYSTEM_USBMSC is not set # CONFIG_EXAMPLES_USBTERM is not set # CONFIG_EXAMPLES_WATCHDOG is not set -# CONFIG_EXAMPLES_WLAN is not set # -# Interpreters +# Graphics Support # +# CONFIG_TIFF is not set # # Interpreters @@ -464,11 +519,7 @@ CONFIG_HAVE_CXX=y # CONFIG_NETUTILS_WEBCLIENT is not set # -# ModBus -# - -# -# FreeModbus +# FreeModBus # # CONFIG_MODBUS is not set @@ -480,10 +531,13 @@ CONFIG_NSH_LIBRARY=y # # Disable Individual commands # +# CONFIG_NSH_DISABLE_ADDROUTE is not set # CONFIG_NSH_DISABLE_CAT is not set # CONFIG_NSH_DISABLE_CD is not set # CONFIG_NSH_DISABLE_CP is not set +# CONFIG_NSH_DISABLE_CMP is not set # CONFIG_NSH_DISABLE_DD is not set +# CONFIG_NSH_DISABLE_DELROUTE is not set # CONFIG_NSH_DISABLE_ECHO is not set # CONFIG_NSH_DISABLE_EXEC is not set # CONFIG_NSH_DISABLE_EXIT is not set @@ -519,22 +573,34 @@ CONFIG_NSH_LIBRARY=y # CONFIG_NSH_DISABLE_USLEEP is not set # CONFIG_NSH_DISABLE_WGET is not set # CONFIG_NSH_DISABLE_XD is not set + +# +# Configure Command Options +# +# CONFIG_NSH_CMDOPT_DF_H is not set CONFIG_NSH_CODECS_BUFSIZE=128 CONFIG_NSH_FILEIOSIZE=1024 CONFIG_NSH_LINELEN=80 +CONFIG_NSH_MAXARGUMENTS=6 CONFIG_NSH_NESTDEPTH=3 # CONFIG_NSH_DISABLESCRIPT is not set # CONFIG_NSH_DISABLEBG is not set CONFIG_NSH_ROMFSETC=y +# CONFIG_NSH_ROMFSRC is not set CONFIG_NSH_ROMFSMOUNTPT="/etc" CONFIG_NSH_INITSCRIPT="init.d/rcS" CONFIG_NSH_ROMFSDEVNO=1 CONFIG_NSH_ROMFSSECTSIZE=64 +# CONFIG_NSH_ARCHROMFS is not set CONFIG_NSH_FATDEVNO=2 CONFIG_NSH_FATSECTSIZE=512 CONFIG_NSH_FATNSECTORS=1024 CONFIG_NSH_FATMOUNTPT="/tmp" CONFIG_NSH_CONSOLE=y + +# +# USB Trace Support +# # CONFIG_NSH_CONDEV is not set # CONFIG_NSH_ARCHINIT is not set @@ -608,7 +674,9 @@ CONFIG_NXWM_TASKBAR_HSPACING=2 CONFIG_NXWM_TASKBAR_LEFT=y # CONFIG_NXWM_TASKBAR_RIGHT is not set # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set +# CONFIG_NXWM_TASKBAR_ICONSCALE is not set # CONFIG_NXWM_DISABLE_MINIMIZE is not set +# CONFIG_NXWM_TASKBAR_NO_BORDER is not set # # Tool Bar Configuration @@ -622,6 +690,11 @@ CONFIG_NXWM_TASKBAR_LEFT=y CONFIG_NXWM_BACKGROUND_IMAGE="" # +# Application Window Configuration +# +# CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set + +# # Start Window Configuration # @@ -651,7 +724,9 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192 # # Calibration display settings # +CONFIG_NXWM_CALIBRATION_MARGIN=40 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set +# CONFIG_NXWM_CALIBRATION_MESSAGES is not set # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set CONFIG_NXWM_CALIBRATION_SIGNO=5 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100 @@ -663,12 +738,21 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID is not set +# CONFIG_NXWM_MEDIAPLAYER is not set # # System NSH Add-Ons # # +# USB CDC/ACM Device Commands +# + +# +# USB Composite Device Commands +# + +# # Custom Free Memory Command # # CONFIG_SYSTEM_FREE is not set @@ -683,6 +767,15 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048 # CONFIG_SYSTEM_INSTALL is not set # +# FLASH Erase-all Command +# + +# +# RAM test +# +# CONFIG_SYSTEM_RAMTEST is not set + +# # readline() # CONFIG_SYSTEM_READLINE=y @@ -707,3 +800,20 @@ CONFIG_READLINE_ECHO=y # Sysinfo # # CONFIG_SYSTEM_SYSINFO is not set + +# +# USB Monitor +# + +# +# Stack Monitor +# + +# +# USB Mass Storage Device Commands +# + +# +# Zmodem Commands +# +# CONFIG_SYSTEM_ZMODEM is not set |