summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-09 19:31:48 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-09 19:31:48 +0000
commitd97899b6e2c22b4f33f23a8333a03cd323bcd45e (patch)
tree3275cf363a5ddb67c70108c4712f8903fb0b958c /nuttx
parent0f72f7085182b9038e0037c3b949458ac3306fdc (diff)
downloadpx4-nuttx-d97899b6e2c22b4f33f23a8333a03cd323bcd45e.tar.gz
px4-nuttx-d97899b6e2c22b4f33f23a8333a03cd323bcd45e.tar.bz2
px4-nuttx-d97899b6e2c22b4f33f23a8333a03cd323bcd45e.zip
NxWidgets: Remove modal loops, Add CWindowEventHandler*. NxWM: Add support for full screen applications
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4716 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog4
-rw-r--r--nuttx/Documentation/NuttX.html5
-rw-r--r--nuttx/configs/stm3240g-eval/nxwm/defconfig8
3 files changed, 13 insertions, 4 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index e6a156b1c..ff02f1c2c 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2720,4 +2720,8 @@
Then add CONFIG_NX_WRITEONLY which is the more generic way of saying that
no NX component should try to read from the underlying graphic device (LCD
or other).
+ * configs/stm3240g-eval/src/up_stmpe11.c: Add board-specific support for the
+ the STMPE11 I/O expander on the STM3240G-EVAL board. Verfied that the
+ STM3240G-EVAL touchscreen is now fully functional.
+
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index f85dcf784..5c9748ad9 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
<tr align="center" bgcolor="#e4e4e4">
<td>
<h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
- <p>Last Updated: April 25, 2012</p>
+ <p>Last Updated: May 8, 2012</p>
</td>
</tr>
</table>
@@ -1846,7 +1846,8 @@
The NuttX6.16 release also includes and logic for saving/restoring F4 FPU registers in context switches.
Networking intensions include support for Telnet NSH sessions and new configurations for DHPCD and the networking test (nettest).
A more complete port would include support for SDIO and USB OTG which are not available in NuttX 6.13.
- The USB OTG device controller driver and function I2C driver were added in NuttX 6.17.
+ The USB OTG device controller driver, and LCD driver and a function I2C driver were added in NuttX 6.17.
+ A touchscreen driver for the STM3240G-EVAL based on the STMPE11 I/O expander was added in NuttX 6.18.
</p>
</ul>
</td>
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index ce1be631e..c3d2062e7 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -1261,9 +1261,12 @@ CONFIG_NX_MXCLIENTMSGS=16
# NxWidgets / NxWM
#
# Use all defaults except
-# 1. Make the NxWidgets background color match the NxWM back color
-# 2. Taskbar on the left
+# 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
#
+CONFIG_NXWIDGETS_BPP=16
CONFIG_NXWIDGETS_SERVERSTACK=2048
CONFIG_NXWIDGETS_LISTENERSTACK=2048
CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)
@@ -1273,6 +1276,7 @@ CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=MKRGB(35,58,73)
CONFIG_NXWM_TASKBAR_LEFT=y
CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
CONFIG_NXWM_UNITTEST=y
+CONFIG_NXWM_TOUCHSCREEN=y
#
# NxConsole Configuration Settings: