Update STM3240G-EVAL defconfig to support NxConsole keyboard input; increase spacing of icons on the start window

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4765 42af7a65-404d-4744-a932-0658087f49c3

5 files changed, 33 insertions, 10 deletions

diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index f688f846c..83d0e8912 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -152,3 +152,4 @@
   changes when the widget is selected.  Thenthe background color
   in the font is wrong.  Fixed in CButtonArrary, but the problem
   probably exists in other places as well.
+* NxWM:  Increase default spacing of icons on the Start Window.
diff --git a/NxWidgets/TODO.txt b/NxWidgets/TODO.txt
index ebf136798..b767f3536 100644
--- a/NxWidgets/TODO.txt
+++ b/NxWidgets/TODO.txt
@@ -4,9 +4,10 @@ NxWidgets
 NxWM
 ----
 
- (4) General issues
- (3) NxConsole issues
- (1) Platform specific issues
+ (4) General Issues
+ (3) NxConsole Issues
+ (1) CHexCalculator Issues
+ (1) Platform specific Issues
 
 See also the NuttX TODO list graphics/ section for related issues.
 
@@ -109,7 +110,20 @@ o NxConsole Issues
   Status:      Open
   Priorioty:   Low, this would be necessary to fix to productize the windows.
 
-o Platform specific issues
+o CHexCalculator Issues
+  ---------------------
+
+  Title:       NEW DATA ENTRY IS APPENDED TO PREVIOUS RESULT
+  Description: For example 1+2= and 3 is shown.  But if you enter 4, then
+               34 is shown.  You have to manually clear the calculator ("C")
+               before entering the next number.
+  Status:      Open
+  Priority:    Low, this is only a demo.  This would, of course, have to be
+               fixed if you wanted a production quality calculator (but then
+               you would probably also want to add quite a few more features
+               as well).
+
+o Platform specific Issues
   ------------------------
 
   Title:       MISSING TOUCH RELEASE
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx
index ad51e7884..46cfa7410 100644
--- a/NxWidgets/nxwm/include/nxwmconfig.hxx
+++ b/NxWidgets/nxwm/include/nxwmconfig.hxx
@@ -261,8 +261,8 @@
 /**
  * Horizontal and vertical spacing of icons in the task bar.
  *
- * CONFIG_NXWM_STARTWINDOW_VSPACING - Vertical spacing.  Default: 2 pixels
- * CONFIG_NXWM_STARTWINDOW_HSPACING - Horizontal spacing.  Default: 2 rows
+ * CONFIG_NXWM_STARTWINDOW_VSPACING - Vertical spacing.  Default: 4 pixels
+ * CONFIG_NXWM_STARTWINDOW_HSPACING - Horizontal spacing.  Default: 4 rows
  * CONFIG_NXWM_STARTWINDOW_ICON - The glyph to use as the start window icon
  * CONFIG_NXWM_STARTWINDOW_MQNAME - The well known name of the message queue
  *   Used to communicated from CWindowMessenger to the start window thread. 
@@ -280,11 +280,11 @@
  */
 
 #ifndef CONFIG_NXWM_STARTWINDOW_VSPACING
-#  define CONFIG_NXWM_STARTWINDOW_VSPACING (2)
+#  define CONFIG_NXWM_STARTWINDOW_VSPACING (4)
 #endif
 
 #ifndef CONFIG_NXWM_STARTWINDOW_HSPACING
-#  define CONFIG_NXWM_STARTWINDOW_HSPACING (2)
+#  define CONFIG_NXWM_STARTWINDOW_HSPACING (4)
 #endif
 
 /**
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 3705363b2..836c5670f 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2798,5 +2798,7 @@
 	  Fix some conditional compilation that included a few too many lines of code.
 	* drivers/input/stmpe11_tsc.c and stmpe11.h:  Add a timeout to catch missed
 	  pen up events.  Now the STM3240G-EVAL touchscreen works very smoothly.
+	* configs/stm3240g-eval/nxwm/defconfig: Enable support for NxConsole keyboard
+	  input. Increasing spacing of icons.
 
 
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index 2a3cf3c86..339572c8f 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -1277,8 +1277,10 @@ CONFIG_NX_MXCLIENTMSGS=16
 # Use all defaults except
 # 1. 16 bits-per-pixel
 # 2. Make the NxWidgets background color match the NxWM back color
-# 3. Taskbar on the left
-# 4. We do have a touchscreen
+# 3. Build in support for keyboard input in NxConsole
+# 4. Taskbar on the left
+# 5. We do have a touchscreen
+# 6. We do want the NxWM keybard listener
 #
 CONFIG_NXWIDGETS_BPP=16
 CONFIG_NXWIDGETS_SERVERSTACK=2048
@@ -1287,10 +1289,14 @@ CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)
 CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=MKRGB(206,227,241)
 CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=MKRGB(35,58,73)
 
+CONFIG_NXCONSOLE_NXKBDIN=y
+
 CONFIG_NXWM_TASKBAR_LEFT=y
 CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
+CONFIG_NXWM_TASKBAR_VSPACING=4
 CONFIG_NXWM_UNITTEST=y
 CONFIG_NXWM_TOUCHSCREEN=y
+CONFIG_NXWM_KEYBOARD=y
 
 #
 # NxConsole Configuration Settings: