Add more fonts

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

1 files changed, 40 insertions, 13 deletions

diff --git a/nuttx/configs/stm3210e-eval/nxtext/defconfig b/nuttx/configs/stm3210e-eval/nxtext/defconfig
index a65e884b7..f8170193e 100644
--- a/nuttx/configs/stm3210e-eval/nxtext/defconfig
+++ b/nuttx/configs/stm3210e-eval/nxtext/defconfig
@@ -767,21 +767,42 @@ CONFIG_USBSTRG_REMOVABLE=y
 # CONFIG_NXFONTS_CHARBITS
 #   The number of bits in the character set.  Current options are
 #   only 7 and 8.  The default is 7.
+# CONFIG_NXFONT_SANS22X29
+#   This option enables support for a small, 22x29 san serif font
+#   (font ID FONTID_SANS22X29 == 1).
 # CONFIG_NXFONT_SANS23X27
-#   This option enables support for a small, 23x27 san serif font
-#   (font ID FONTID_SANS23X27 == 1)
+#   This option enables support for a tiny, 23x27 san serif font
+#   (font ID FONTID_SANS23X27 == 2).
+# CONFIG_NXFONT_SANS28X37
+#   This option enables support for a medium, 28x37 san serif font
+#   (font ID FONTID_SANS28X37 == 3).
+# CONFIG_NXFONT_SANS22X29B
+#   This option enables support for a small, 22x29 san serif bold font
+#   (font ID FONTID_SANS22X29B == 4).
 # CONFIG_NXFONT_SANS28X37B
 #   This option enables support for a medium, 28x37 san serif bold font
-#   (font ID FONTID_SANS28X37B == 2)
+#   (font ID FONTID_SANS28X37B == 5).
 # CONFIG_NXFONT_SANS40X49B
 #   This option enables support for a large, 40x49 san serif bold font
-#   (font ID FONTID_SANS40X49B == 3)
-# CONFIG_NXFONT_SERIF27X38B
-#   This option enables support for a medium, 27x38 bold font (with serifs)
-#   (font ID FONTID_SERIF27X38B == 4)
+#   (font ID FONTID_SANS40X49B == 6).
+# CONFIG_NXFONT_SERIF22X29
+#   This option enables support for a small, 22x29 font (with serifs)
+#   (font ID FONTID_SERIF22X29 == 7).
 # CONFIG_NXFONT_SERIF29X37
 #   This option enables support for a medium, 29x37 font (with serifs)
-#   (font ID FONTID_SERIF29X37 == 5)
+#   (font ID FONTID_SERIF29X37 == 8).
+# CONFIG_NXFONT_SERIF38X48
+#   This option enables support for a large, 38x48 font (with serifs)
+#   (font ID FONTID_SERIF38X48 == 9).
+# CONFIG_NXFONT_SERIF22X28B
+#   This option enables support for a small, 27x38 bold font (with serifs)
+#   (font ID FONTID_SERIF22X28B == 10).
+# CONFIG_NXFONT_SERIF27X38B
+#   This option enables support for a medium, 27x38 bold font (with serifs)
+#   (font ID FONTID_SERIF27X38B == 11).
+# CONFIG_NXFONT_SERIF38X49B:
+#   This option enables support for a large, 38x49 bold font (with serifs)
+#   (font ID FONTID_SERIF38X49B == 12).
 #
 # NX Multi-user only options:
 #
@@ -814,12 +835,18 @@ CONFIG_NX_KBD=y
 #CONFIG_NXTK_BORDERWIDTH=4
 CONFIG_NXTK_BORDERCOLOR1=0xd69a
 CONFIG_NXTK_BORDERCOLOR2=0xad55
-CONFIG_NXTK_AUTORAISE=n
+CONFIG_NXFONT_SANS22X29=n
 CONFIG_NXFONT_SANS23X27=y
-CONFIG_NXFONT_SANS28X37B=y
+CONFIG_NXFONT_SANS28X37=n
+CONFIG_NXFONT_SANS22X29B=n
+CONFIG_NXFONT_SANS28X37B=n
 CONFIG_NXFONT_SANS40X49B=n
-CONFIG_NXFONT_SERIF27X38B=n
+CONFIG_NXFONT_SERIF22X29=n
 CONFIG_NXFONT_SERIF29X37=n
+CONFIG_NXFONT_SERIF38X48=n
+CONFIG_NXFONT_SERIF22X28B=y
+CONFIG_NXFONT_SERIF27X38B=n
+CONFIG_NXFONT_SERIF38X49B=n
 CONFIG_NXFONTS_CHARBITS=7
 CONFIG_NX_BLOCKING=y
 CONFIG_NX_MXSERVERMSGS=32
@@ -1061,10 +1088,10 @@ CONFIG_EXAMPLES_NXTEXT_BUILTIN=n
 CONFIG_EXAMPLES_NXTEXT_VPLANE=0
 CONFIG_EXAMPLES_NXTEXT_DEVNO=0
 CONFIG_EXAMPLES_NXTEXT_BGCOLOR=0x0011
-CONFIG_EXAMPLES_NXTEXT_BGFONTID=2
+CONFIG_EXAMPLES_NXTEXT_BGFONTID=10
 CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR=0xffdf
 CONFIG_EXAMPLES_NXTEXT_PUCOLOR=0xfd20
-CONFIG_EXAMPLES_NXTEXT_PUFONTID=1
+CONFIG_EXAMPLES_NXTEXT_PUFONTID=2
 CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR=0x001f
 CONFIG_EXAMPLES_NXTEXT_BPP=16
 CONFIG_EXAMPLES_NXTEXT_NOGETRUN=y