From 9226a38276f8db14a4de54c84fd96d68b2f59a91 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 29 Jul 2011 13:21:30 +0000 Subject: [PATCH] Add one more font; Fix ez80 serial bug git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3825 42af7a65-404d-4744-a932-0658087f49c3 --- configs/README.txt | 29 +++++++++++---------- configs/stm3210e-eval/nsh2/defconfig | 31 ++++++++++++----------- configs/stm3210e-eval/nx/defconfig | 29 +++++++++++---------- configs/stm3210e-eval/nxtext/defconfig | 35 ++++++++++++++------------ 4 files changed, 68 insertions(+), 56 deletions(-) diff --git a/configs/README.txt b/configs/README.txt index b0ffff2ebd8..41c90e38768 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -974,42 +974,45 @@ defconfig -- This is a configuration file similar to the Linux 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 tiny, 23x27 san serif font - (font ID FONTID_SANS23X27 == 2). + (font ID FONTID_SANS23X27 == 1). + CONFIG_NXFONT_SANS22X29 + This option enables support for a small, 22x29 san serif font + (font ID FONTID_SANS22X29 == 2). CONFIG_NXFONT_SANS28X37 This option enables support for a medium, 28x37 san serif font (font ID FONTID_SANS28X37 == 3). + CONFIG_NXFONT_SANS39X48 + This option enables support for a large, 39x48 san serif font + (font ID FONTID_SANS39X48 == 4). CONFIG_NXFONT_SANS22X29B This option enables support for a small, 22x29 san serif bold font - (font ID FONTID_SANS22X29B == 4). + (font ID FONTID_SANS22X29B == 5). CONFIG_NXFONT_SANS28X37B This option enables support for a medium, 28x37 san serif bold font - (font ID FONTID_SANS28X37B == 5). + (font ID FONTID_SANS28X37B == 6). CONFIG_NXFONT_SANS40X49B This option enables support for a large, 40x49 san serif bold font - (font ID FONTID_SANS40X49B == 6). + (font ID FONTID_SANS40X49B == 7). CONFIG_NXFONT_SERIF22X29 This option enables support for a small, 22x29 font (with serifs) - (font ID FONTID_SERIF22X29 == 7). + (font ID FONTID_SERIF22X29 == 8). CONFIG_NXFONT_SERIF29X37 This option enables support for a medium, 29x37 font (with serifs) - (font ID FONTID_SERIF29X37 == 8). + (font ID FONTID_SERIF29X37 == 9). CONFIG_NXFONT_SERIF38X48 This option enables support for a large, 38x48 font (with serifs) - (font ID FONTID_SERIF38X48 == 9). + (font ID FONTID_SERIF38X48 == 10). CONFIG_NXFONT_SERIF22X28B This option enables support for a small, 27x38 bold font (with serifs) - (font ID FONTID_SERIF22X28B == 10). + (font ID FONTID_SERIF22X28B == 11). CONFIG_NXFONT_SERIF27X38B This option enables support for a medium, 27x38 bold font (with serifs) - (font ID FONTID_SERIF27X38B == 11). + (font ID FONTID_SERIF27X38B == 12). CONFIG_NXFONT_SERIF38X49B This option enables support for a large, 38x49 bold font (with serifs) - (font ID FONTID_SERIF38X49B == 12). + (font ID FONTID_SERIF38X49B == 13). NX Multi-user only options: diff --git a/configs/stm3210e-eval/nsh2/defconfig b/configs/stm3210e-eval/nsh2/defconfig index 7660247004c..3d51891a5bf 100644 --- a/configs/stm3210e-eval/nsh2/defconfig +++ b/configs/stm3210e-eval/nsh2/defconfig @@ -780,42 +780,45 @@ 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 tiny, 23x27 san serif font -# (font ID FONTID_SANS23X27 == 2). +# (font ID FONTID_SANS23X27 == 1). +# CONFIG_NXFONT_SANS22X29 +# This option enables support for a small, 22x29 san serif font +# (font ID FONTID_SANS22X29 == 2). # CONFIG_NXFONT_SANS28X37 # This option enables support for a medium, 28x37 san serif font # (font ID FONTID_SANS28X37 == 3). +# CONFIG_NXFONT_SANS39X48 +# This option enables support for a large, 39x48 san serif font +# (font ID FONTID_SANS39X48 == 4). # CONFIG_NXFONT_SANS22X29B # This option enables support for a small, 22x29 san serif bold font -# (font ID FONTID_SANS22X29B == 4). +# (font ID FONTID_SANS22X29B == 5). # CONFIG_NXFONT_SANS28X37B # This option enables support for a medium, 28x37 san serif bold font -# (font ID FONTID_SANS28X37B == 5). +# (font ID FONTID_SANS28X37B == 6). # CONFIG_NXFONT_SANS40X49B # This option enables support for a large, 40x49 san serif bold font -# (font ID FONTID_SANS40X49B == 6). +# (font ID FONTID_SANS40X49B == 7). # CONFIG_NXFONT_SERIF22X29 # This option enables support for a small, 22x29 font (with serifs) -# (font ID FONTID_SERIF22X29 == 7). +# (font ID FONTID_SERIF22X29 == 8). # CONFIG_NXFONT_SERIF29X37 # This option enables support for a medium, 29x37 font (with serifs) -# (font ID FONTID_SERIF29X37 == 8). +# (font ID FONTID_SERIF29X37 == 9). # CONFIG_NXFONT_SERIF38X48 # This option enables support for a large, 38x48 font (with serifs) -# (font ID FONTID_SERIF38X48 == 9). +# (font ID FONTID_SERIF38X48 == 10). # CONFIG_NXFONT_SERIF22X28B # This option enables support for a small, 27x38 bold font (with serifs) -# (font ID FONTID_SERIF22X28B == 10). +# (font ID FONTID_SERIF22X28B == 11). # CONFIG_NXFONT_SERIF27X38B # This option enables support for a medium, 27x38 bold font (with serifs) -# (font ID FONTID_SERIF27X38B == 11). +# (font ID FONTID_SERIF27X38B == 12). # CONFIG_NXFONT_SERIF38X49B # This option enables support for a large, 38x49 bold font (with serifs) -# (font ID FONTID_SERIF38X49B == 12). +# (font ID FONTID_SERIF38X49B == 13). # # NX Multi-user only options: # @@ -1087,7 +1090,7 @@ CONFIG_EXAMPLES_NXHELLO_BUILTIN=y CONFIG_EXAMPLES_NXHELLO_VPLANE=0 CONFIG_EXAMPLES_NXHELLO_DEVNO=0 CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 -CONFIG_EXAMPLES_NXHELLO_FONTID=5 +CONFIG_EXAMPLES_NXHELLO_FONTID=6 CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf CONFIG_EXAMPLES_NXHELLO_BPP=16 CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n diff --git a/configs/stm3210e-eval/nx/defconfig b/configs/stm3210e-eval/nx/defconfig index 0421bfc8f4d..2a6c2846d53 100644 --- a/configs/stm3210e-eval/nx/defconfig +++ b/configs/stm3210e-eval/nx/defconfig @@ -767,42 +767,45 @@ 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 tiny, 23x27 san serif font -# (font ID FONTID_SANS23X27 == 2). +# (font ID FONTID_SANS23X27 == 1). +# CONFIG_NXFONT_SANS22X29 +# This option enables support for a small, 22x29 san serif font +# (font ID FONTID_SANS22X29 == 2). # CONFIG_NXFONT_SANS28X37 # This option enables support for a medium, 28x37 san serif font # (font ID FONTID_SANS28X37 == 3). +# CONFIG_NXFONT_SANS39X48 +# This option enables support for a large, 39x48 san serif font +# (font ID FONTID_SANS39X48 == 4). # CONFIG_NXFONT_SANS22X29B # This option enables support for a small, 22x29 san serif bold font -# (font ID FONTID_SANS22X29B == 4). +# (font ID FONTID_SANS22X29B == 5). # CONFIG_NXFONT_SANS28X37B # This option enables support for a medium, 28x37 san serif bold font -# (font ID FONTID_SANS28X37B == 5). +# (font ID FONTID_SANS28X37B == 6). # CONFIG_NXFONT_SANS40X49B # This option enables support for a large, 40x49 san serif bold font -# (font ID FONTID_SANS40X49B == 6). +# (font ID FONTID_SANS40X49B == 7). # CONFIG_NXFONT_SERIF22X29 # This option enables support for a small, 22x29 font (with serifs) -# (font ID FONTID_SERIF22X29 == 7). +# (font ID FONTID_SERIF22X29 == 8). # CONFIG_NXFONT_SERIF29X37 # This option enables support for a medium, 29x37 font (with serifs) -# (font ID FONTID_SERIF29X37 == 8). +# (font ID FONTID_SERIF29X37 == 9). # CONFIG_NXFONT_SERIF38X48 # This option enables support for a large, 38x48 font (with serifs) -# (font ID FONTID_SERIF38X48 == 9). +# (font ID FONTID_SERIF38X48 == 10). # CONFIG_NXFONT_SERIF22X28B # This option enables support for a small, 27x38 bold font (with serifs) -# (font ID FONTID_SERIF22X28B == 10). +# (font ID FONTID_SERIF22X28B == 11). # CONFIG_NXFONT_SERIF27X38B # This option enables support for a medium, 27x38 bold font (with serifs) -# (font ID FONTID_SERIF27X38B == 11). +# (font ID FONTID_SERIF27X38B == 12). # CONFIG_NXFONT_SERIF38X49B # This option enables support for a large, 38x49 bold font (with serifs) -# (font ID FONTID_SERIF38X49B == 12). +# (font ID FONTID_SERIF38X49B == 13). # # NX Multi-user only options: # diff --git a/configs/stm3210e-eval/nxtext/defconfig b/configs/stm3210e-eval/nxtext/defconfig index f8170193ecc..ca75976562e 100644 --- a/configs/stm3210e-eval/nxtext/defconfig +++ b/configs/stm3210e-eval/nxtext/defconfig @@ -767,42 +767,45 @@ 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 tiny, 23x27 san serif font -# (font ID FONTID_SANS23X27 == 2). +# (font ID FONTID_SANS23X27 == 1). +# CONFIG_NXFONT_SANS22X29 +# This option enables support for a small, 22x29 san serif font +# (font ID FONTID_SANS22X29 == 2). # CONFIG_NXFONT_SANS28X37 # This option enables support for a medium, 28x37 san serif font # (font ID FONTID_SANS28X37 == 3). +# CONFIG_NXFONT_SANS39X48 +# This option enables support for a large, 39x48 san serif font +# (font ID FONTID_SANS39X48 == 4). # CONFIG_NXFONT_SANS22X29B # This option enables support for a small, 22x29 san serif bold font -# (font ID FONTID_SANS22X29B == 4). +# (font ID FONTID_SANS22X29B == 5). # CONFIG_NXFONT_SANS28X37B # This option enables support for a medium, 28x37 san serif bold font -# (font ID FONTID_SANS28X37B == 5). +# (font ID FONTID_SANS28X37B == 6). # CONFIG_NXFONT_SANS40X49B # This option enables support for a large, 40x49 san serif bold font -# (font ID FONTID_SANS40X49B == 6). +# (font ID FONTID_SANS40X49B == 7). # CONFIG_NXFONT_SERIF22X29 # This option enables support for a small, 22x29 font (with serifs) -# (font ID FONTID_SERIF22X29 == 7). +# (font ID FONTID_SERIF22X29 == 8). # CONFIG_NXFONT_SERIF29X37 # This option enables support for a medium, 29x37 font (with serifs) -# (font ID FONTID_SERIF29X37 == 8). +# (font ID FONTID_SERIF29X37 == 9). # CONFIG_NXFONT_SERIF38X48 # This option enables support for a large, 38x48 font (with serifs) -# (font ID FONTID_SERIF38X48 == 9). +# (font ID FONTID_SERIF38X48 == 10). # CONFIG_NXFONT_SERIF22X28B # This option enables support for a small, 27x38 bold font (with serifs) -# (font ID FONTID_SERIF22X28B == 10). +# (font ID FONTID_SERIF22X28B == 11). # CONFIG_NXFONT_SERIF27X38B # This option enables support for a medium, 27x38 bold font (with serifs) -# (font ID FONTID_SERIF27X38B == 11). -# CONFIG_NXFONT_SERIF38X49B: +# (font ID FONTID_SERIF27X38B == 12). +# CONFIG_NXFONT_SERIF38X49B # This option enables support for a large, 38x49 bold font (with serifs) -# (font ID FONTID_SERIF38X49B == 12). +# (font ID FONTID_SERIF38X49B == 13). # # NX Multi-user only options: # @@ -1088,10 +1091,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=10 +CONFIG_EXAMPLES_NXTEXT_BGFONTID=11 CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR=0xffdf CONFIG_EXAMPLES_NXTEXT_PUCOLOR=0xfd20 -CONFIG_EXAMPLES_NXTEXT_PUFONTID=2 +CONFIG_EXAMPLES_NXTEXT_PUFONTID=1 CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR=0x001f CONFIG_EXAMPLES_NXTEXT_BPP=16 CONFIG_EXAMPLES_NXTEXT_NOGETRUN=y