Patches from Petteri Aimonen (plus a few other things)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5448 42af7a65-404d-4744-a932-0658087f49c3
2026-05-10 15:30:25 +08:00 · 2012-12-21 20:09:32 +00:00
parent ed79a906dc
commit cc022f93df
19 changed files with 1848 additions and 1061 deletions
@@ -3801,3 +3801,10 @@
 	  to find executables using a relative path.

 6.25 2013-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* graphics/: Adds 5x8 monospace font. This tiny font is useful for graph
+	  labels and for small bitmapped display.  Contributed by Petteri
+	  Aimonen.
+	* configs/stm3220g-eval/nxwm:  Converted to use the kconfig-fronteds
+	  configuration tool.
+
@@ -373,7 +373,7 @@
  <td><br></td>
  <td>
    <p>
-      <li>May be built either as an open, flat embedded RTOS or as a separtely built, secure micro-kernel with a system call interface.</li>
+      <li>May be built either as an open, flat embedded RTOS or as a separately built, secure micro-kernel with a system call interface.</li>
    </p>
 </tr>

@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated November 25, 2012)
+NuttX TODO List (Last updated December 20, 2012)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 This file summarizes known NuttX bugs, limitations, inconsistencies with 
@@ -15,7 +15,7 @@ nuttx/
  (6)  Binary loaders (binfmt/)
 (17)  Network (net/, drivers/net)
  (4)  USB (drivers/usbdev, drivers/usbhost)
- (11)  Libraries (libc/, )
+ (12)  Libraries (libc/, )
  (9)  File system/Generic drivers (fs/, drivers/)
  (5)  Graphics subystem (graphics/)
  (1)  Pascal add-on (pcode/)
@@ -637,6 +637,15 @@ o USB (drivers/usbdev, drivers/usbhost)
 o Libraries (libc/)
  ^^^^^^^^^^^^^^^^^

+  Title:       SIGNED time_t
+  Description: The NuttX time_t is type uint32_t. I think this is consistent
+               with all standards and with normal usage of time_t.  However,
+               according to Wikipedia, time_t is usually implemented as a
+               signed 32-bit value.
+  Status:      Open
+  Priority:    Very low unless there is some compelling issue that I do not
+               know about.
+
  Title:       ENVIRON
  Description: The definition of environ in stdlib.h is bogus and will not
               work as it should.  This is because the underlying
@@ -1077,6 +1077,21 @@ Where <subdir> is one of the following:
       $ cd ~/nuttx-code/nuttx
       $ make

+    NOTES:
+ 
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the mconf tool.  See nuttx/README.txt and
+          misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. This configuration is currently set up to build under Cygwin on
+       a Windows machine using the CodeSourcery Windows toolchain.
+       That configuration can be easy changed as described in Note 1.
+
  ostest:
  ------
    This configuration directory, performs a simple OS test using
@@ -1,53 +0,0 @@
-############################################################################
-# configs/stm3220g-eval/nxwm/appconfig
-#
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-# The NSH Library -- NOTE:  The NxWM unit test must be installed at
-# apps/external in order to build this example.  See
-# NxWidgets/UnitTests/README.txt for additional information
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# Networking libraries.
-
-ifeq ($(CONFIG_NET),y)
-CONFIGURED_APPS += netutils/uiplib
-CONFIGURED_APPS += netutils/resolv
-CONFIGURED_APPS += netutils/webclient
-CONFIGURED_APPS += netutils/tftpc
-ifeq ($(CONFIG_NSH_TELNET),y)
-CONFIGURED_APPS += netutils/telnetd
-endif
-endif
@@ -67,7 +67,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++

 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"

 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
@@ -123,6 +123,25 @@ config STMPE811_I2C

 endchoice

+config STMPE811_ACTIVELOW
+	bool "Active Low Interrupt"
+	default n
+	---help---
+		The STMPE811 interrupt is provided by a discrete input (usually a
+		GPIO interrupt on most MCU architectures).  This setting determines
+		whether the interrupt is active high (or rising edge triggered) or
+		active low (or falling edge triggered).  Default:  Active
+		high/rising edge.
+
+config STMPE811_EDGE
+	bool "Edge triggered Interrupt"
+	default n
+	---help---
+		The STMPE811 interrupt is provided by a discrete input (usually a
+		GPIO interrupt on most MCU architectures).  This setting determines
+		whether the interrupt is edge or level triggered.  Default: Level
+		triggered.
+
 config STMPE811_MULTIPLE
 	bool "Multiple STMPE811 Devices"
 	default n
@@ -124,6 +124,9 @@ gen32bppsources:
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)

 genfontsources:
+ifeq ($(CONFIG_NXFONT_MONO5X8),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=18 EXTRADEFINES=$(EXTRADEFINES)
+endif
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
 endif
@@ -42,6 +42,12 @@ NXFCONV_CSRCS	= nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
 NXFSET_ASRCS	=
 NXFSET_CSRCS	=

+# Monospace fonts
+
+ifeq ($(CONFIG_NXFONT_MONO5X8),y)
+NXFSET_CSRCS    += nxfonts_bitmaps_mono5x8.c
+endif
+
 # Sans serif fonts

 ifeq ($(CONFIG_NXFONT_SANS17X22),y)
@@ -72,6 +72,13 @@ endif

 ifdef NXFONTS_FONTID

+# MONO
+
+ifeq ($(NXFONTS_FONTID),18)
+NXFONTS_PREFIX	:= g_mono5x8_
+GEN_CSRC	= nxfonts_bitmaps_mono5x8.c
+endif
+
 # SANS

 ifeq ($(NXFONTS_FONTID),14)
@@ -80,6 +80,8 @@
 #  include "nxfonts_sans17x23b.h"
 #elif NXFONTS_FONTID == 17
 #  include "nxfonts_sans20x27b.h"
+#elif NXFONTS_FONTID == 18
+#  include "nxfonts_mono5x8.h"
 #else
 #  error "No font ID specified"
 #endif
@@ -60,6 +60,12 @@
 * Private Data
 ****************************************************************************/

+/* MONO */
+
+#ifdef CONFIG_NXFONT_MONO5X8
+extern const struct nx_fontpackage_s g_mono5x8_package;
+#endif
+
 /* SANS */

 #ifdef CONFIG_NXFONT_SANS17X22
@@ -139,6 +145,12 @@ extern const struct nx_fontpackage_s g_serif38x49b_package;
 static FAR const struct nx_fontpackage_s *g_fontpackages[] =
 {

+/* MONO */
+
+#ifdef CONFIG_NXFONT_MONO5X8
+  &g_mono5x8_package,
+#endif
+  
 /* SANS */

 #ifdef CONFIG_NXFONT_SANS17X22
@@ -125,6 +125,12 @@ enum nx_fontid_e
 {
  FONTID_DEFAULT     = 0         /* The default font */

+/* Monospace fonts */
+
+#ifdef CONFIG_NXFONT_MONO5X8
+  , FONTID_MONO5X8 = 18          /* The 5x8 monospace font */
+#endif
+  
 /* Sans Serif fonts */

 #ifdef CONFIG_NXFONT_SANS17X22
@@ -41,15 +41,15 @@
 ********************************************************************************/

 #include <nuttx/config.h>   /* Default settings */
-#include <nuttx/compiler.h> /* Compiler settings */
+#include <nuttx/compiler.h> /* Compiler settings, noreturn_function */

 #include <sys/types.h>      /* Needed for general types */
 #include <stdint.h>         /* C99 fixed width integer types */
 #include <stdbool.h>        /* C99 boolean types */
+#include <unistd.h>         /* For getpid */
 #include <semaphore.h>      /* Needed for sem_t */
 #include <signal.h>         /* Needed for sigset_t */
 #include <time.h>           /* Needed for struct timespec */
-#include <nuttx/compiler.h> /* For noreturn_function */

 /********************************************************************************
 * Compilation Switches
@@ -90,8 +90,8 @@
 #  define bool _Bool8
 #endif

-#define true  1
-#define false 0
+#define true  (bool)1
+#define false (bool)0

 #define __bool_true_false_are_defined 1

@@ -43,6 +43,7 @@
 * Included Files
 ****************************************************************************/

+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>