Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-02 17:48:54 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add one more font; Fix ez80 serial bug

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3825 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2011-07-29 13:21:30 +00:00
parent 4e5fb58dbc
commit f5d191388b
16 changed files with 1066 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+4 -1
View File
@@ -1952,4 +1952,7 @@
stm32_reset() in order to return the write requests to the USB mass stm32_reset() in order to return the write requests to the USB mass
storage driver; it is possible that a similar but could exist for other storage driver; it is possible that a similar but could exist for other
architectures. architectures.
* graphics/nxfonts/nxfonts_*.h: Add serverl new fonts * graphics/nxfonts/nxfonts_*.h: Add serveral more new fonts
* arch/z80/src/ez80/ez80_serial.c: Fix some errors in serial driver
setup for UART1 (submitted by Paul Osmialowski).
Documentation/NXGraphicsSubsystem.html
+16 -13
View File
@@ -2723,42 +2723,45 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<dt><code>CONFIG_NXFONTS_CHARBITS</code>: <dt><code>CONFIG_NXFONTS_CHARBITS</code>:
<dd>The number of bits in the character set. Current options are <dd>The number of bits in the character set. Current options are
only 7 and 8. The default is 7. only 7 and 8. The default is 7.
<dt><code>CONFIG_NXFONT_SANS22X29</code>:
<dd>This option enables support for a small, 22x29 san serif font
(font <code>ID FONTID_SANS22X29</code> == 1).
<dt><code>CONFIG_NXFONT_SANS23X27</code>: <dt><code>CONFIG_NXFONT_SANS23X27</code>:
<dd>This option enables support for a tiny, 23x27 san serif font <dd>This option enables support for a tiny, 23x27 san serif font
(font <code>ID FONTID_SANS23X27</code> == 2). (font <code>ID FONTID_SANS23X27</code> == 1).
<dt><code>CONFIG_NXFONT_SANS22X29</code>:
<dd>This option enables support for a small, 22x29 san serif font
(font <code>ID FONTID_SANS22X29</code> == 2).
<dt><code>CONFIG_NXFONT_SANS28X37</code>: <dt><code>CONFIG_NXFONT_SANS28X37</code>:
<dd>This option enables support for a medium, 28x37 san serif font <dd>This option enables support for a medium, 28x37 san serif font
(font <code>ID FONTID_SANS28X37</code> == 3). (font <code>ID FONTID_SANS28X37</code> == 3).
<dt><code>CONFIG_NXFONT_SANS39X48</code>:
<dd>This option enables support for a large, 39x48 san serif font
(font <code>ID FONTID_SANS39X48</code> == 4).
<dt><code>CONFIG_NXFONT_SANS22X29B</code>: <dt><code>CONFIG_NXFONT_SANS22X29B</code>:
<dd>This option enables support for a small, 22x29 san serif bold font <dd>This option enables support for a small, 22x29 san serif bold font
(font ID <code>FONTID_SANS22X29B</code> == 4). (font ID <code>FONTID_SANS22X29B</code> == 5).
<dt><code>CONFIG_NXFONT_SANS28X37B</code>: <dt><code>CONFIG_NXFONT_SANS28X37B</code>:
<dd>This option enables support for a medium, 28x37 san serif bold font <dd>This option enables support for a medium, 28x37 san serif bold font
(font ID <code>FONTID_SANS28X37B</code> == 5). (font ID <code>FONTID_SANS28X37B</code> == 6).
<dt><code>CONFIG_NXFONT_SANS40X49B</code>: <dt><code>CONFIG_NXFONT_SANS40X49B</code>:
<dd>This option enables support for a large, 40x49 san serif bold font <dd>This option enables support for a large, 40x49 san serif bold font
(font ID <code>FONTID_SANS40X49B</code> == 6). (font ID <code>FONTID_SANS40X49B</code> == 7).
<dt><code>CONFIG_NXFONT_SERIF22X29</code>: <dt><code>CONFIG_NXFONT_SERIF22X29</code>:
<dd>This option enables support for a small, 22x29 font (with serifs) <dd>This option enables support for a small, 22x29 font (with serifs)
(font ID <code>FONTID_SERIF22X29</code> == 7). (font ID <code>FONTID_SERIF22X29</code> == 8).
<dt><code>CONFIG_NXFONT_SERIF29X37</code>: <dt><code>CONFIG_NXFONT_SERIF29X37</code>:
<dd>This option enables support for a medium, 29x37 font (with serifs) <dd>This option enables support for a medium, 29x37 font (with serifs)
(font ID <code>FONTID_SERIF29X37</code> == 8). (font ID <code>FONTID_SERIF29X37</code> == 9).
<dt><code>CONFIG_NXFONT_SERIF38X48</code>: <dt><code>CONFIG_NXFONT_SERIF38X48</code>:
<dd>This option enables support for a large, 38x48 font (with serifs) <dd>This option enables support for a large, 38x48 font (with serifs)
(font ID <code>FONTID_SERIF38X48</code> == 9). (font ID <code>FONTID_SERIF38X48</code> == 10).
<dt><code>CONFIG_NXFONT_SERIF22X28B</code>: <dt><code>CONFIG_NXFONT_SERIF22X28B</code>:
<dd>This option enables support for a small, 27x38 bold font (with serifs) <dd>This option enables support for a small, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF22X28B</code> == 10). (font ID <code>FONTID_SERIF22X28B</code> == 11).
<dt><code>CONFIG_NXFONT_SERIF27X38B</code>: <dt><code>CONFIG_NXFONT_SERIF27X38B</code>:
<dd>This option enables support for a medium, 27x38 bold font (with serifs) <dd>This option enables support for a medium, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF27X38B</code> == 11). (font ID <code>FONTID_SERIF27X38B</code> == 12).
<dt><code>CONFIG_NXFONT_SERIF38X49B</code>: <dt><code>CONFIG_NXFONT_SERIF38X49B</code>:
<dd>This option enables support for a large, 38x49 bold font (with serifs) <dd>This option enables support for a large, 38x49 bold font (with serifs)
(font ID <code>FONTID_SERIF38X49B</code> == 12). (font ID <code>FONTID_SERIF38X49B</code> == 13).
</dl> </dl>
</ul> </ul>
Documentation/NuttxPortingGuide.html
+20 -15
View File
@@ -4475,65 +4475,70 @@ build
The number of bits in the character set. Current options are The number of bits in the character set. Current options are
only 7 and 8. The default is 7. only 7 and 8. The default is 7.
</li> </li>
<li>
<code>CONFIG_NXFONT_SANS22X29</code>:
This option enables support for a small, 22x29 san serif font
(font <code>ID FONTID_SANS22X29</code> == 1).
</li>
<li> <li>
<code>CONFIG_NXFONT_SANS23X27</code>: <code>CONFIG_NXFONT_SANS23X27</code>:
This option enables support for a tiny, 23x27 san serif font This option enables support for a tiny, 23x27 san serif font
(font <code>ID FONTID_SANS23X27</code> == 2). (font <code>ID FONTID_SANS23X27</code> == 1).
</li>
<li>
<code>CONFIG_NXFONT_SANS22X29</code>:
This option enables support for a small, 22x29 san serif font
(font <code>ID FONTID_SANS22X29</code> == 2).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SANS28X37</code>: <code>CONFIG_NXFONT_SANS28X37</code>:
This option enables support for a medium, 28x37 san serif font This option enables support for a medium, 28x37 san serif font
(font <code>ID FONTID_SANS28X37</code> == 3). (font <code>ID FONTID_SANS28X37</code> == 3).
</li> </li>
<li>
<code>CONFIG_NXFONT_SANS39X48</code>:
This option enables support for a large, 39x48 san serif font
(font <code>ID FONTID_SANS39X48</code> == 4).
</li>
<li> <li>
<code>CONFIG_NXFONT_SANS22X29B</code>: <code>CONFIG_NXFONT_SANS22X29B</code>:
This option enables support for a small, 22x29 san serif bold font This option enables support for a small, 22x29 san serif bold font
(font ID <code>FONTID_SANS22X29B</code> == 4). (font ID <code>FONTID_SANS22X29B</code> == 5).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SANS28X37B</code>: <code>CONFIG_NXFONT_SANS28X37B</code>:
This option enables support for a medium, 28x37 san serif bold font This option enables support for a medium, 28x37 san serif bold font
(font ID <code>FONTID_SANS28X37B</code> == 5). (font ID <code>FONTID_SANS28X37B</code> == 6).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SANS40X49B</code>: <code>CONFIG_NXFONT_SANS40X49B</code>:
This option enables support for a large, 40x49 san serif bold font This option enables support for a large, 40x49 san serif bold font
(font ID <code>FONTID_SANS40X49B</code> == 6). (font ID <code>FONTID_SANS40X49B</code> == 7).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SERIF22X29</code>: <code>CONFIG_NXFONT_SERIF22X29</code>:
This option enables support for a small, 22x29 font (with serifs) This option enables support for a small, 22x29 font (with serifs)
(font ID <code>FONTID_SERIF22X29</code> == 7). (font ID <code>FONTID_SERIF22X29</code> == 8).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SERIF29X37</code>: <code>CONFIG_NXFONT_SERIF29X37</code>:
This option enables support for a medium, 29x37 font (with serifs) This option enables support for a medium, 29x37 font (with serifs)
(font ID <code>FONTID_SERIF29X37</code> == 8). (font ID <code>FONTID_SERIF29X37</code> == 9).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SERIF38X48</code>: <code>CONFIG_NXFONT_SERIF38X48</code>:
This option enables support for a large, 38x48 font (with serifs) This option enables support for a large, 38x48 font (with serifs)
(font ID <code>FONTID_SERIF38X48</code> == 9). (font ID <code>FONTID_SERIF38X48</code> == 10).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SERIF22X28B</code>: <code>CONFIG_NXFONT_SERIF22X28B</code>:
This option enables support for a small, 27x38 bold font (with serifs) This option enables support for a small, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF22X28B</code> == 10). (font ID <code>FONTID_SERIF22X28B</code> == 11).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SERIF27X38B</code>: <code>CONFIG_NXFONT_SERIF27X38B</code>:
This option enables support for a medium, 27x38 bold font (with serifs) This option enables support for a medium, 27x38 bold font (with serifs)
(font ID <code>FONTID_SERIF27X38B</code> == 11). (font ID <code>FONTID_SERIF27X38B</code> == 12).
</li> </li>
<li> <li>
<code>CONFIG_NXFONT_SERIF38X49B</code>: <code>CONFIG_NXFONT_SERIF38X49B</code>:
This option enables support for a large, 38x49 bold font (with serifs) This option enables support for a large, 38x49 bold font (with serifs)
(font ID <code>FONTID_SERIF38X49B</code> == 12). (font ID <code>FONTID_SERIF38X49B</code> == 13).
</li> </li>
</ul> </ul>
arch/z80/src/ez80/ez80_serial.c
+5 -5
View File
@@ -210,7 +210,7 @@ static uart_dev_t g_uart1port =
0, /* recv.head */ 0, /* recv.head */
0, /* recv.tail */ 0, /* recv.tail */
CONFIG_UART1_RXBUFSIZE, /* recv.size */ CONFIG_UART1_RXBUFSIZE, /* recv.size */
g_uart0rxbuffer, /* recv.buffer */ g_uart1rxbuffer, /* recv.buffer */
}, },
&g_uart_ops, /* ops */ &g_uart_ops, /* ops */
&g_uart1priv, /* priv */ &g_uart1priv, /* priv */
@@ -219,24 +219,24 @@ static uart_dev_t g_uart1port =
/* Now, which one with be tty0/console and which tty1? */ /* Now, which one with be tty0/console and which tty1? */
#if defined(CONFIG_UART0_SERIAL_CONSOLE) && !defined(CONFIG_DISABLE_UART0) #if defined(CONFIG_UART0_SERIAL_CONSOLE) && !defined(CONFIG_UART0_DISABLE)
# define CONSOLE_DEV g_uart0port # define CONSOLE_DEV g_uart0port
# define TTYS0_DEV g_uart0port # define TTYS0_DEV g_uart0port
# if !defined(CONFIG_UART1_DISABLE) # if !defined(CONFIG_UART1_DISABLE)
# define TTYS1_DEV g_uart1port # define TTYS1_DEV g_uart1port
# endif # endif
#elif defined(CONFIG_UART1_SERIAL_CONSOLE) && !defined(CONFIG_DISABLE_UART1) #elif defined(CONFIG_UART1_SERIAL_CONSOLE) && !defined(CONFIG_UART1_DISABLE)
# define CONSOLE_DEV g_uart1port # define CONSOLE_DEV g_uart1port
# define TTYS0_DEV g_uart1port # define TTYS0_DEV g_uart1port
# if !defined(CONFIG_UART0_DISABLE) # if !defined(CONFIG_UART0_DISABLE)
# define TTYS1_DEV g_uart0port # define TTYS1_DEV g_uart0port
# endif # endif
#elif !defined(CONFIG_DISABLE_UART0) #elif !defined(CONFIG_UART0_DISABLE)
# define TTYS0_DEV g_uart0port # define TTYS0_DEV g_uart0port
# if !defined(CONFIG_UART1_DISABLE) # if !defined(CONFIG_UART1_DISABLE)
# define TTYS1_DEV g_uart1port # define TTYS1_DEV g_uart1port
# endif # endif
#elif !defined(CONFIG_DISABLE_UART0) #elif !defined(CONFIG_UART0_DISABLE)
# define TTYS0_DEV g_uart1port # define TTYS0_DEV g_uart1port
#endif #endif
configs/README.txt
+16 -13
View File
@@ -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 The number of bits in the character set. Current options are
only 7 and 8. The default is 7. 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 CONFIG_NXFONT_SANS23X27
This option enables support for a tiny, 23x27 san serif font 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 CONFIG_NXFONT_SANS28X37
This option enables support for a medium, 28x37 san serif font This option enables support for a medium, 28x37 san serif font
(font ID FONTID_SANS28X37 == 3). (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 CONFIG_NXFONT_SANS22X29B
This option enables support for a small, 22x29 san serif bold font 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 CONFIG_NXFONT_SANS28X37B
This option enables support for a medium, 28x37 san serif bold font 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 CONFIG_NXFONT_SANS40X49B
This option enables support for a large, 40x49 san serif bold font 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 CONFIG_NXFONT_SERIF22X29
This option enables support for a small, 22x29 font (with serifs) This option enables support for a small, 22x29 font (with serifs)
(font ID FONTID_SERIF22X29 == 7). (font ID FONTID_SERIF22X29 == 8).
CONFIG_NXFONT_SERIF29X37 CONFIG_NXFONT_SERIF29X37
This option enables support for a medium, 29x37 font (with serifs) This option enables support for a medium, 29x37 font (with serifs)
(font ID FONTID_SERIF29X37 == 8). (font ID FONTID_SERIF29X37 == 9).
CONFIG_NXFONT_SERIF38X48 CONFIG_NXFONT_SERIF38X48
This option enables support for a large, 38x48 font (with serifs) This option enables support for a large, 38x48 font (with serifs)
(font ID FONTID_SERIF38X48 == 9). (font ID FONTID_SERIF38X48 == 10).
CONFIG_NXFONT_SERIF22X28B CONFIG_NXFONT_SERIF22X28B
This option enables support for a small, 27x38 bold font (with serifs) 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 CONFIG_NXFONT_SERIF27X38B
This option enables support for a medium, 27x38 bold font (with serifs) 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 CONFIG_NXFONT_SERIF38X49B
This option enables support for a large, 38x49 bold font (with serifs) 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: NX Multi-user only options:
configs/stm3210e-eval/nsh2/defconfig
+17 -14
View File
@@ -780,42 +780,45 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_NXFONTS_CHARBITS # CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are # The number of bits in the character set. Current options are
# only 7 and 8. The default is 7. # 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 # CONFIG_NXFONT_SANS23X27
# This option enables support for a tiny, 23x27 san serif font # 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 # CONFIG_NXFONT_SANS28X37
# This option enables support for a medium, 28x37 san serif font # This option enables support for a medium, 28x37 san serif font
# (font ID FONTID_SANS28X37 == 3). # (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 # CONFIG_NXFONT_SANS22X29B
# This option enables support for a small, 22x29 san serif bold font # 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 # CONFIG_NXFONT_SANS28X37B
# This option enables support for a medium, 28x37 san serif bold font # 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 # CONFIG_NXFONT_SANS40X49B
# This option enables support for a large, 40x49 san serif bold font # 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 # CONFIG_NXFONT_SERIF22X29
# This option enables support for a small, 22x29 font (with serifs) # This option enables support for a small, 22x29 font (with serifs)
# (font ID FONTID_SERIF22X29 == 7). # (font ID FONTID_SERIF22X29 == 8).
# CONFIG_NXFONT_SERIF29X37 # CONFIG_NXFONT_SERIF29X37
# This option enables support for a medium, 29x37 font (with serifs) # This option enables support for a medium, 29x37 font (with serifs)
# (font ID FONTID_SERIF29X37 == 8). # (font ID FONTID_SERIF29X37 == 9).
# CONFIG_NXFONT_SERIF38X48 # CONFIG_NXFONT_SERIF38X48
# This option enables support for a large, 38x48 font (with serifs) # This option enables support for a large, 38x48 font (with serifs)
# (font ID FONTID_SERIF38X48 == 9). # (font ID FONTID_SERIF38X48 == 10).
# CONFIG_NXFONT_SERIF22X28B # CONFIG_NXFONT_SERIF22X28B
# This option enables support for a small, 27x38 bold font (with serifs) # 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 # CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs) # 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 # CONFIG_NXFONT_SERIF38X49B
# This option enables support for a large, 38x49 bold font (with serifs) # 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: # NX Multi-user only options:
# #
@@ -1087,7 +1090,7 @@ CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
CONFIG_EXAMPLES_NXHELLO_VPLANE=0 CONFIG_EXAMPLES_NXHELLO_VPLANE=0
CONFIG_EXAMPLES_NXHELLO_DEVNO=0 CONFIG_EXAMPLES_NXHELLO_DEVNO=0
CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011 CONFIG_EXAMPLES_NXHELLO_BGCOLOR=0x0011
CONFIG_EXAMPLES_NXHELLO_FONTID=5 CONFIG_EXAMPLES_NXHELLO_FONTID=6
CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf CONFIG_EXAMPLES_NXHELLO_FONTCOLOR=0xffdf
CONFIG_EXAMPLES_NXHELLO_BPP=16 CONFIG_EXAMPLES_NXHELLO_BPP=16
CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n CONFIG_EXAMPLES_NXHELLO_EXTERNINIT=n
configs/stm3210e-eval/nx/defconfig
+16 -13
View File
@@ -767,42 +767,45 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_NXFONTS_CHARBITS # CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are # The number of bits in the character set. Current options are
# only 7 and 8. The default is 7. # 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 # CONFIG_NXFONT_SANS23X27
# This option enables support for a tiny, 23x27 san serif font # 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 # CONFIG_NXFONT_SANS28X37
# This option enables support for a medium, 28x37 san serif font # This option enables support for a medium, 28x37 san serif font
# (font ID FONTID_SANS28X37 == 3). # (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 # CONFIG_NXFONT_SANS22X29B
# This option enables support for a small, 22x29 san serif bold font # 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 # CONFIG_NXFONT_SANS28X37B
# This option enables support for a medium, 28x37 san serif bold font # 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 # CONFIG_NXFONT_SANS40X49B
# This option enables support for a large, 40x49 san serif bold font # 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 # CONFIG_NXFONT_SERIF22X29
# This option enables support for a small, 22x29 font (with serifs) # This option enables support for a small, 22x29 font (with serifs)
# (font ID FONTID_SERIF22X29 == 7). # (font ID FONTID_SERIF22X29 == 8).
# CONFIG_NXFONT_SERIF29X37 # CONFIG_NXFONT_SERIF29X37
# This option enables support for a medium, 29x37 font (with serifs) # This option enables support for a medium, 29x37 font (with serifs)
# (font ID FONTID_SERIF29X37 == 8). # (font ID FONTID_SERIF29X37 == 9).
# CONFIG_NXFONT_SERIF38X48 # CONFIG_NXFONT_SERIF38X48
# This option enables support for a large, 38x48 font (with serifs) # This option enables support for a large, 38x48 font (with serifs)
# (font ID FONTID_SERIF38X48 == 9). # (font ID FONTID_SERIF38X48 == 10).
# CONFIG_NXFONT_SERIF22X28B # CONFIG_NXFONT_SERIF22X28B
# This option enables support for a small, 27x38 bold font (with serifs) # 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 # CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs) # 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 # CONFIG_NXFONT_SERIF38X49B
# This option enables support for a large, 38x49 bold font (with serifs) # 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: # NX Multi-user only options:
# #
configs/stm3210e-eval/nxtext/defconfig
+19 -16
View File
@@ -767,42 +767,45 @@ CONFIG_USBSTRG_REMOVABLE=y
# CONFIG_NXFONTS_CHARBITS # CONFIG_NXFONTS_CHARBITS
# The number of bits in the character set. Current options are # The number of bits in the character set. Current options are
# only 7 and 8. The default is 7. # 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 # CONFIG_NXFONT_SANS23X27
# This option enables support for a tiny, 23x27 san serif font # 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 # CONFIG_NXFONT_SANS28X37
# This option enables support for a medium, 28x37 san serif font # This option enables support for a medium, 28x37 san serif font
# (font ID FONTID_SANS28X37 == 3). # (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 # CONFIG_NXFONT_SANS22X29B
# This option enables support for a small, 22x29 san serif bold font # 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 # CONFIG_NXFONT_SANS28X37B
# This option enables support for a medium, 28x37 san serif bold font # 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 # CONFIG_NXFONT_SANS40X49B
# This option enables support for a large, 40x49 san serif bold font # 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 # CONFIG_NXFONT_SERIF22X29
# This option enables support for a small, 22x29 font (with serifs) # This option enables support for a small, 22x29 font (with serifs)
# (font ID FONTID_SERIF22X29 == 7). # (font ID FONTID_SERIF22X29 == 8).
# CONFIG_NXFONT_SERIF29X37 # CONFIG_NXFONT_SERIF29X37
# This option enables support for a medium, 29x37 font (with serifs) # This option enables support for a medium, 29x37 font (with serifs)
# (font ID FONTID_SERIF29X37 == 8). # (font ID FONTID_SERIF29X37 == 9).
# CONFIG_NXFONT_SERIF38X48 # CONFIG_NXFONT_SERIF38X48
# This option enables support for a large, 38x48 font (with serifs) # This option enables support for a large, 38x48 font (with serifs)
# (font ID FONTID_SERIF38X48 == 9). # (font ID FONTID_SERIF38X48 == 10).
# CONFIG_NXFONT_SERIF22X28B # CONFIG_NXFONT_SERIF22X28B
# This option enables support for a small, 27x38 bold font (with serifs) # 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 # CONFIG_NXFONT_SERIF27X38B
# This option enables support for a medium, 27x38 bold font (with serifs) # 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: # CONFIG_NXFONT_SERIF38X49B
# This option enables support for a large, 38x49 bold font (with serifs) # 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: # NX Multi-user only options:
# #
@@ -1088,10 +1091,10 @@ CONFIG_EXAMPLES_NXTEXT_BUILTIN=n
CONFIG_EXAMPLES_NXTEXT_VPLANE=0 CONFIG_EXAMPLES_NXTEXT_VPLANE=0
CONFIG_EXAMPLES_NXTEXT_DEVNO=0 CONFIG_EXAMPLES_NXTEXT_DEVNO=0
CONFIG_EXAMPLES_NXTEXT_BGCOLOR=0x0011 CONFIG_EXAMPLES_NXTEXT_BGCOLOR=0x0011
CONFIG_EXAMPLES_NXTEXT_BGFONTID=10 CONFIG_EXAMPLES_NXTEXT_BGFONTID=11
CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR=0xffdf CONFIG_EXAMPLES_NXTEXT_BGFONTCOLOR=0xffdf
CONFIG_EXAMPLES_NXTEXT_PUCOLOR=0xfd20 CONFIG_EXAMPLES_NXTEXT_PUCOLOR=0xfd20
CONFIG_EXAMPLES_NXTEXT_PUFONTID=2 CONFIG_EXAMPLES_NXTEXT_PUFONTID=1
CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR=0x001f CONFIG_EXAMPLES_NXTEXT_PUFONTCOLOR=0x001f
CONFIG_EXAMPLES_NXTEXT_BPP=16 CONFIG_EXAMPLES_NXTEXT_BPP=16
CONFIG_EXAMPLES_NXTEXT_NOGETRUN=y CONFIG_EXAMPLES_NXTEXT_NOGETRUN=y
graphics/Makefile
+14 -37
View File
@@ -119,68 +119,45 @@ gen32bppsources:
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
genfontsources: genfontsources:
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
# SANS
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SANS28X37),y) ifeq ($(CONFIG_NXFONT_SANS28X37),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SANS39X48),y)
# SANS-BOLD
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
# SERIF
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
# SERIF-BOLD
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES) @$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES)
endif endif
ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=13 EXTRADEFINES=$(EXTRADEFINES)
endif
gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
graphics/README.txt
+16 -13
View File
@@ -263,42 +263,45 @@ CONFIG_NXFONTS_CHARBITS
The number of bits in the character set. Current options are only 7 and 8. The number of bits in the character set. Current options are only 7 and 8.
The default is 7. 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 CONFIG_NXFONT_SANS23X27
This option enables support for a tiny, 23x27 san serif font 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 CONFIG_NXFONT_SANS28X37
This option enables support for a medium, 28x37 san serif font This option enables support for a medium, 28x37 san serif font
(font ID FONTID_SANS28X37 == 3). (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 CONFIG_NXFONT_SANS22X29B
This option enables support for a small, 22x29 san serif bold font 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 CONFIG_NXFONT_SANS28X37B
This option enables support for a medium, 28x37 san serif bold font 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 CONFIG_NXFONT_SANS40X49B
This option enables support for a large, 40x49 san serif bold font 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 CONFIG_NXFONT_SERIF22X29
This option enables support for a small, 22x29 font (with serifs) This option enables support for a small, 22x29 font (with serifs)
(font ID FONTID_SERIF22X29 == 7). (font ID FONTID_SERIF22X29 == 8).
CONFIG_NXFONT_SERIF29X37 CONFIG_NXFONT_SERIF29X37
This option enables support for a medium, 29x37 font (with serifs) This option enables support for a medium, 29x37 font (with serifs)
(font ID FONTID_SERIF29X37 == 8). (font ID FONTID_SERIF29X37 == 9).
CONFIG_NXFONT_SERIF38X48 CONFIG_NXFONT_SERIF38X48
This option enables support for a large, 38x48 font (with serifs) This option enables support for a large, 38x48 font (with serifs)
(font ID FONTID_SERIF38X48 == 9). (font ID FONTID_SERIF38X48 == 10).
CONFIG_NXFONT_SERIF22X28B CONFIG_NXFONT_SERIF22X28B
This option enables support for a small, 27x38 bold font (with serifs) 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 CONFIG_NXFONT_SERIF27X38B
This option enables support for a medium, 27x38 bold font (with serifs) 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 CONFIG_NXFONT_SERIF38X49B
This option enables support for a large, 38x49 bold font (with serifs) 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: NX Multi-user only options:
graphics/nxfonts/Make.defs
+8 -4
View File
@@ -44,18 +44,22 @@ NXFSET_CSRCS =
# SANS # SANS
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(CONFIG_NXFONT_SANS23X27),y) ifeq ($(CONFIG_NXFONT_SANS23X27),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans23x27.c NXFSET_CSRCS += nxfonts_bitmaps_sans23x27.c
endif endif
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(CONFIG_NXFONT_SANS28X37),y) ifeq ($(CONFIG_NXFONT_SANS28X37),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans28x37.c NXFSET_CSRCS += nxfonts_bitmaps_sans28x37.c
endif endif
ifeq ($(CONFIG_NXFONT_SANS39X48),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans39x48.c
endif
# SANS-BOLD # SANS-BOLD
ifeq ($(CONFIG_NXFONT_SANS22X29B),y) ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
graphics/nxfonts/Makefile.sources
+18 -13
View File
@@ -76,13 +76,13 @@ ifdef NXFONTS_FONTID
# SANS # SANS
ifeq ($(NXFONTS_FONTID),1) ifeq ($(NXFONTS_FONTID),1)
NXFONTS_PREFIX := g_sans22x29_ NXFONTS_PREFIX := g_sans23x27_
GEN_CSRC = nxfonts_bitmaps_sans22x29.c GEN_CSRC = nxfonts_bitmaps_sans23x27.c
endif endif
ifeq ($(NXFONTS_FONTID),2) ifeq ($(NXFONTS_FONTID),2)
NXFONTS_PREFIX := g_sans23x27_ NXFONTS_PREFIX := g_sans22x29_
GEN_CSRC = nxfonts_bitmaps_sans23x27.c GEN_CSRC = nxfonts_bitmaps_sans22x29.c
endif endif
ifeq ($(NXFONTS_FONTID),3) ifeq ($(NXFONTS_FONTID),3)
@@ -90,53 +90,58 @@ NXFONTS_PREFIX := g_sans28x37_
GEN_CSRC = nxfonts_bitmaps_sans28x37.c GEN_CSRC = nxfonts_bitmaps_sans28x37.c
endif endif
ifeq ($(NXFONTS_FONTID),4)
NXFONTS_PREFIX := g_sans39x48_
GEN_CSRC = nxfonts_bitmaps_sans39x48.c
endif
# SANS-BOLD # SANS-BOLD
ifeq ($(NXFONTS_FONTID),4) ifeq ($(NXFONTS_FONTID),5)
NXFONTS_PREFIX := g_sans22x29b_ NXFONTS_PREFIX := g_sans22x29b_
GEN_CSRC = nxfonts_bitmaps_sans22x29b.c GEN_CSRC = nxfonts_bitmaps_sans22x29b.c
endif endif
ifeq ($(NXFONTS_FONTID),5) ifeq ($(NXFONTS_FONTID),6)
NXFONTS_PREFIX := g_sans28x37b_ NXFONTS_PREFIX := g_sans28x37b_
GEN_CSRC = nxfonts_bitmaps_sans28x37b.c GEN_CSRC = nxfonts_bitmaps_sans28x37b.c
endif endif
ifeq ($(NXFONTS_FONTID),6) ifeq ($(NXFONTS_FONTID),7)
NXFONTS_PREFIX := g_sans40x49b_ NXFONTS_PREFIX := g_sans40x49b_
GEN_CSRC = nxfonts_bitmaps_sans40x49b.c GEN_CSRC = nxfonts_bitmaps_sans40x49b.c
endif endif
# SERIF # SERIF
ifeq ($(NXFONTS_FONTID),7) ifeq ($(NXFONTS_FONTID),8)
NXFONTS_PREFIX := g_serif22x29_ NXFONTS_PREFIX := g_serif22x29_
GEN_CSRC = nxfonts_bitmaps_serif22x29.c GEN_CSRC = nxfonts_bitmaps_serif22x29.c
endif endif
ifeq ($(NXFONTS_FONTID),8) ifeq ($(NXFONTS_FONTID),9)
NXFONTS_PREFIX := g_serif29x37_ NXFONTS_PREFIX := g_serif29x37_
GEN_CSRC = nxfonts_bitmaps_serif29x37.c GEN_CSRC = nxfonts_bitmaps_serif29x37.c
endif endif
ifeq ($(NXFONTS_FONTID),9) ifeq ($(NXFONTS_FONTID),10)
NXFONTS_PREFIX := g_serif38x48_ NXFONTS_PREFIX := g_serif38x48_
GEN_CSRC = nxfonts_bitmaps_serif38x48.c GEN_CSRC = nxfonts_bitmaps_serif38x48.c
endif endif
# SERIF-BOLD # SERIF-BOLD
ifeq ($(NXFONTS_FONTID),10) ifeq ($(NXFONTS_FONTID),11)
NXFONTS_PREFIX := g_serif22x28b_ NXFONTS_PREFIX := g_serif22x28b_
GEN_CSRC = nxfonts_bitmaps_serif22x28b.c GEN_CSRC = nxfonts_bitmaps_serif22x28b.c
endif endif
ifeq ($(NXFONTS_FONTID),11) ifeq ($(NXFONTS_FONTID),12)
NXFONTS_PREFIX := g_serif27x38b_ NXFONTS_PREFIX := g_serif27x38b_
GEN_CSRC = nxfonts_bitmaps_serif27x38b.c GEN_CSRC = nxfonts_bitmaps_serif27x38b.c
endif endif
ifeq ($(NXFONTS_FONTID),12) ifeq ($(NXFONTS_FONTID),13)
NXFONTS_PREFIX := g_serif38x49b_ NXFONTS_PREFIX := g_serif38x49b_
GEN_CSRC = nxfonts_bitmaps_serif38x49b.c GEN_CSRC = nxfonts_bitmaps_serif38x49b.c
endif endif
graphics/nxfonts/nxfonts_bitmaps.c
+12 -10
View File
@@ -47,28 +47,30 @@
/* Pick the fontset */ /* Pick the fontset */
#if NXFONTS_FONTID == 1 #if NXFONTS_FONTID == 1
# include "nxfonts_sans22x29.h"
#elif NXFONTS_FONTID == 2
# include "nxfonts_sans23x27.h" # include "nxfonts_sans23x27.h"
#elif NXFONTS_FONTID == 2
# include "nxfonts_sans22x29.h"
#elif NXFONTS_FONTID == 3 #elif NXFONTS_FONTID == 3
# include "nxfonts_sans28x37.h" # include "nxfonts_sans28x37.h"
#elif NXFONTS_FONTID == 4 #elif NXFONTS_FONTID == 4
# include "nxfonts_sans22x29b.h" # include "nxfonts_sans39x48.h"
#elif NXFONTS_FONTID == 5 #elif NXFONTS_FONTID == 5
# include "nxfonts_sans28x37b.h" # include "nxfonts_sans22x29b.h"
#elif NXFONTS_FONTID == 6 #elif NXFONTS_FONTID == 6
# include "nxfonts_sans40x49b.h" # include "nxfonts_sans28x37b.h"
#elif NXFONTS_FONTID == 7 #elif NXFONTS_FONTID == 7
# include "nxfonts_serif22x29.h" # include "nxfonts_sans40x49b.h"
#elif NXFONTS_FONTID == 8 #elif NXFONTS_FONTID == 8
# include "nxfonts_serif29x37.h" # include "nxfonts_serif22x29.h"
#elif NXFONTS_FONTID == 9 #elif NXFONTS_FONTID == 9
# include "nxfonts_serif38x48.h" # include "nxfonts_serif29x37.h"
#elif NXFONTS_FONTID == 10 #elif NXFONTS_FONTID == 10
# include "nxfonts_serif22x28b.h" # include "nxfonts_serif38x48.h"
#elif NXFONTS_FONTID == 11 #elif NXFONTS_FONTID == 11
# include "nxfonts_serif27x38b.h" # include "nxfonts_serif22x28b.h"
#elif NXFONTS_FONTID == 12 #elif NXFONTS_FONTID == 12
# include "nxfonts_serif27x38b.h"
#elif NXFONTS_FONTID == 13
# include "nxfonts_serif38x49b.h" # include "nxfonts_serif38x49b.h"
#else #else
# error "No font ID specified" # error "No font ID specified"
graphics/nxfonts/nxfonts_getfont.c
+8 -4
View File
@@ -62,18 +62,22 @@
/* SANS */ /* SANS */
#ifdef CONFIG_NXFONT_SANS22X29
extern const struct nx_fontpackage_s g_sans22x29_package;
#endif
#ifdef CONFIG_NXFONT_SANS23X27 #ifdef CONFIG_NXFONT_SANS23X27
extern const struct nx_fontpackage_s g_sans23x27_package; extern const struct nx_fontpackage_s g_sans23x27_package;
#endif #endif
#ifdef CONFIG_NXFONT_SANS22X29
extern const struct nx_fontpackage_s g_sans22x29_package;
#endif
#ifdef CONFIG_NXFONT_SANS28X37 #ifdef CONFIG_NXFONT_SANS28X37
extern const struct nx_fontpackage_s g_sans28x37_package; extern const struct nx_fontpackage_s g_sans28x37_package;
#endif #endif
#ifdef CONFIG_NXFONT_SANS39X48
extern const struct nx_fontpackage_s g_sans39x48_package;
#endif
/* SANS-BOLD */ /* SANS-BOLD */
#ifdef CONFIG_NXFONT_SANS22X29B #ifdef CONFIG_NXFONT_SANS22X29B
graphics/nxfonts/nxfonts_sans39x48.h
+849
View File
File diff suppressed because it is too large Load Diff
include/nuttx/nx/nxfonts.h
+25 -22
View File
@@ -50,25 +50,24 @@
/**************************************************************************** /****************************************************************************
* Pre-processor definitions * Pre-processor definitions
****************************************************************************/ ****************************************************************************/
/* Select the default font. If no fonts are select, then a compilation error /* Select the default font. If no fonts are selected, then a compilation error
* is likely down the road. * is likely down the road.
*/ */
#ifdef CONFIG_NXFONT_SANS23X27
# define NXFONT_DEFAULT FONTID_SANS23X27
#endif
/* SANS */ /* SANS */
#if defined(CONFIG_NXFONT_SANS22X29) #if defined(CONFIG_NXFONT_SANS23X27) /* The "legacy," tiny NuttX font */
# define NXFONT_DEFAULT FONTID_SANS22X29
#elif defined(CONFIG_NXFONT_SANS23X27)
# define NXFONT_DEFAULT FONTID_SANS23X27 # define NXFONT_DEFAULT FONTID_SANS23X27
#elif defined(CONFIG_NXFONT_SANS22X29)
# define NXFONT_DEFAULT FONTID_SANS22X29
#elif defined(CONFIG_NXFONT_SANS28X37) #elif defined(CONFIG_NXFONT_SANS28X37)
# define NXFONT_DEFAULT FONTID_SANS28X37 # define NXFONT_DEFAULT FONTID_SANS28X37
#elif defined(CONFIG_NXFONT_SANS39X48)
# define NXFONT_DEFAULT FONTID_SANS39X48
/* SANS-BOLD */ /* SANS-BOLD */
#elif defined(CONFIG_NXFONT_SANS22X29B) #elif defined(CONFIG_NXFONT_SANS22X29B)
@@ -117,58 +116,62 @@ enum nx_fontid_e
/* SANS */ /* SANS */
#ifdef CONFIG_NXFONT_SANS22X29 #ifdef CONFIG_NXFONT_SANS23X27
, FONTID_SANS22X29 = 1 /* The 22x29 sans serif font */ , FONTID_SANS23X27 = 1 /* The 23x27 sans serif font */
#endif #endif
#ifdef CONFIG_NXFONT_SANS23X27 #ifdef CONFIG_NXFONT_SANS22X29
, FONTID_SANS23X27 = 2 /* The 23x27 sans serif font */ , FONTID_SANS22X29 = 2 /* The 22x29 sans serif font */
#endif #endif
#ifdef CONFIG_NXFONT_SANS28X37 #ifdef CONFIG_NXFONT_SANS28X37
, FONTID_SANS28X37 = 3 /* The 28x37 sans serif font */ , FONTID_SANS28X37 = 3 /* The 28x37 sans serif font */
#endif #endif
#ifdef CONFIG_NXFONT_SANS39X48
, FONTID_SANS39X48 = 4 /* The 39x48 sans serif font */
#endif
/* SANS-BOLD */ /* SANS-BOLD */
#ifdef CONFIG_NXFONT_SANS22X29B #ifdef CONFIG_NXFONT_SANS22X29B
, FONTID_SANS22X29B = 4 /* The 22x29 sans bold font */ , FONTID_SANS22X29B = 5 /* The 22x29 sans bold font */
#endif #endif
#ifdef CONFIG_NXFONT_SANS28X37B #ifdef CONFIG_NXFONT_SANS28X37B
, FONTID_SANS28X37B = 5 /* The 28x37 sans bold font */ , FONTID_SANS28X37B = 6 /* The 28x37 sans bold font */
#endif #endif
#ifdef CONFIG_NXFONT_SANS40X49B #ifdef CONFIG_NXFONT_SANS40X49B
, FONTID_SANS40X49B = 6 /* The 40x49 sans bold font */ , FONTID_SANS40X49B = 7 /* The 40x49 sans bold font */
#endif #endif
/* SERIF */ /* SERIF */
#ifdef CONFIG_NXFONT_SERIF22X29 #ifdef CONFIG_NXFONT_SERIF22X29
, FONTID_SERIF22X29 = 7 /* The 22x29 serif font */ , FONTID_SERIF22X29 = 8 /* The 22x29 serif font */
#endif #endif
#ifdef CONFIG_NXFONT_SERIF29X37 #ifdef CONFIG_NXFONT_SERIF29X37
, FONTID_SERIF29X37 = 8 /* The 29x37 serif font */ , FONTID_SERIF29X37 = 9 /* The 29x37 serif font */
#endif #endif
#ifdef CONFIG_NXFONT_SERIF38X48 #ifdef CONFIG_NXFONT_SERIF38X48
, FONTID_SERIF38X48 = 9 /* The 38x48 serif font */ , FONTID_SERIF38X48 = 10 /* The 38x48 serif font */
#endif #endif
/* SERIF-BOLD */ /* SERIF-BOLD */
#ifdef CONFIG_NXFONT_SERIF22X28B #ifdef CONFIG_NXFONT_SERIF22X28B
, FONTID_SERIF22X28B = 10 /* The 22x28 serif bold font */ , FONTID_SERIF22X28B = 11 /* The 22x28 serif bold font */
#endif #endif
#ifdef CONFIG_NXFONT_SERIF27X38B #ifdef CONFIG_NXFONT_SERIF27X38B
, FONTID_SERIF27X38B = 11 /* The 27x38 serif bold font */ , FONTID_SERIF27X38B = 12 /* The 27x38 serif bold font */
#endif #endif
#ifdef CONFIG_NXFONT_SERIF38X49B #ifdef CONFIG_NXFONT_SERIF38X49B
, FONTID_SERIF38X49B = 12 /* The 38x49 serif bold font */ , FONTID_SERIF38X49B = 13 /* The 38x49 serif bold font */
#endif #endif
}; };