Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 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
graphics/Makefile
+14 -37
View File
@@ -119,68 +119,45 @@ gen32bppsources:
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
genfontsources:
# SANS
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=2 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS28X37),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=3 EXTRADEFINES=$(EXTRADEFINES)
endif
# SANS-BOLD
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
ifeq ($(CONFIG_NXFONT_SANS39X48),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=4 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=5 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
ifeq ($(CONFIG_NXFONT_SANS28X37B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=6 EXTRADEFINES=$(EXTRADEFINES)
endif
# SERIF
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
ifeq ($(CONFIG_NXFONT_SANS40X49B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=7 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
ifeq ($(CONFIG_NXFONT_SERIF22X29),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=8 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
ifeq ($(CONFIG_NXFONT_SERIF29X37),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=9 EXTRADEFINES=$(EXTRADEFINES)
endif
# SERIF-BOLD
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
ifeq ($(CONFIG_NXFONT_SERIF38X48),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=10 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
ifeq ($(CONFIG_NXFONT_SERIF22X28B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=11 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
ifeq ($(CONFIG_NXFONT_SERIF27X38B),y)
@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=12 EXTRADEFINES=$(EXTRADEFINES)
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
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 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:
graphics/nxfonts/Make.defs
+8 -4
View File
@@ -44,18 +44,22 @@ NXFSET_CSRCS =
# SANS
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(CONFIG_NXFONT_SANS23X27),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans23x27.c
endif
ifeq ($(CONFIG_NXFONT_SANS22X29),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(CONFIG_NXFONT_SANS28X37),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans28x37.c
endif
ifeq ($(CONFIG_NXFONT_SANS39X48),y)
NXFSET_CSRCS += nxfonts_bitmaps_sans39x48.c
endif
# SANS-BOLD
ifeq ($(CONFIG_NXFONT_SANS22X29B),y)
graphics/nxfonts/Makefile.sources
+18 -13
View File
@@ -76,13 +76,13 @@ ifdef NXFONTS_FONTID
# SANS
ifeq ($(NXFONTS_FONTID),1)
NXFONTS_PREFIX := g_sans22x29_
GEN_CSRC = nxfonts_bitmaps_sans22x29.c
NXFONTS_PREFIX := g_sans23x27_
GEN_CSRC = nxfonts_bitmaps_sans23x27.c
endif
ifeq ($(NXFONTS_FONTID),2)
NXFONTS_PREFIX := g_sans23x27_
GEN_CSRC = nxfonts_bitmaps_sans23x27.c
NXFONTS_PREFIX := g_sans22x29_
GEN_CSRC = nxfonts_bitmaps_sans22x29.c
endif
ifeq ($(NXFONTS_FONTID),3)
@@ -90,53 +90,58 @@ NXFONTS_PREFIX := g_sans28x37_
GEN_CSRC = nxfonts_bitmaps_sans28x37.c
endif
ifeq ($(NXFONTS_FONTID),4)
NXFONTS_PREFIX := g_sans39x48_
GEN_CSRC = nxfonts_bitmaps_sans39x48.c
endif
# SANS-BOLD
ifeq ($(NXFONTS_FONTID),4)
ifeq ($(NXFONTS_FONTID),5)
NXFONTS_PREFIX := g_sans22x29b_
GEN_CSRC = nxfonts_bitmaps_sans22x29b.c
endif
ifeq ($(NXFONTS_FONTID),5)
ifeq ($(NXFONTS_FONTID),6)
NXFONTS_PREFIX := g_sans28x37b_
GEN_CSRC = nxfonts_bitmaps_sans28x37b.c
endif
ifeq ($(NXFONTS_FONTID),6)
ifeq ($(NXFONTS_FONTID),7)
NXFONTS_PREFIX := g_sans40x49b_
GEN_CSRC = nxfonts_bitmaps_sans40x49b.c
endif
# SERIF
ifeq ($(NXFONTS_FONTID),7)
ifeq ($(NXFONTS_FONTID),8)
NXFONTS_PREFIX := g_serif22x29_
GEN_CSRC = nxfonts_bitmaps_serif22x29.c
endif
ifeq ($(NXFONTS_FONTID),8)
ifeq ($(NXFONTS_FONTID),9)
NXFONTS_PREFIX := g_serif29x37_
GEN_CSRC = nxfonts_bitmaps_serif29x37.c
endif
ifeq ($(NXFONTS_FONTID),9)
ifeq ($(NXFONTS_FONTID),10)
NXFONTS_PREFIX := g_serif38x48_
GEN_CSRC = nxfonts_bitmaps_serif38x48.c
endif
# SERIF-BOLD
ifeq ($(NXFONTS_FONTID),10)
ifeq ($(NXFONTS_FONTID),11)
NXFONTS_PREFIX := g_serif22x28b_
GEN_CSRC = nxfonts_bitmaps_serif22x28b.c
endif
ifeq ($(NXFONTS_FONTID),11)
ifeq ($(NXFONTS_FONTID),12)
NXFONTS_PREFIX := g_serif27x38b_
GEN_CSRC = nxfonts_bitmaps_serif27x38b.c
endif
ifeq ($(NXFONTS_FONTID),12)
ifeq ($(NXFONTS_FONTID),13)
NXFONTS_PREFIX := g_serif38x49b_
GEN_CSRC = nxfonts_bitmaps_serif38x49b.c
endif
graphics/nxfonts/nxfonts_bitmaps.c
+12 -10
View File
@@ -47,28 +47,30 @@
/* Pick the fontset */
#if NXFONTS_FONTID == 1
# include "nxfonts_sans22x29.h"
#elif NXFONTS_FONTID == 2
# include "nxfonts_sans23x27.h"
#elif NXFONTS_FONTID == 2
# include "nxfonts_sans22x29.h"
#elif NXFONTS_FONTID == 3
# include "nxfonts_sans28x37.h"
#elif NXFONTS_FONTID == 4
# include "nxfonts_sans22x29b.h"
# include "nxfonts_sans39x48.h"
#elif NXFONTS_FONTID == 5
# include "nxfonts_sans28x37b.h"
# include "nxfonts_sans22x29b.h"
#elif NXFONTS_FONTID == 6
# include "nxfonts_sans40x49b.h"
# include "nxfonts_sans28x37b.h"
#elif NXFONTS_FONTID == 7
# include "nxfonts_serif22x29.h"
# include "nxfonts_sans40x49b.h"
#elif NXFONTS_FONTID == 8
# include "nxfonts_serif29x37.h"
# include "nxfonts_serif22x29.h"
#elif NXFONTS_FONTID == 9
# include "nxfonts_serif38x48.h"
# include "nxfonts_serif29x37.h"
#elif NXFONTS_FONTID == 10
# include "nxfonts_serif22x28b.h"
# include "nxfonts_serif38x48.h"
#elif NXFONTS_FONTID == 11
# include "nxfonts_serif27x38b.h"
# include "nxfonts_serif22x28b.h"
#elif NXFONTS_FONTID == 12
# include "nxfonts_serif27x38b.h"
#elif NXFONTS_FONTID == 13
# include "nxfonts_serif38x49b.h"
#else
# error "No font ID specified"
graphics/nxfonts/nxfonts_getfont.c
+8 -4
View File
@@ -62,18 +62,22 @@
/* SANS */
#ifdef CONFIG_NXFONT_SANS22X29
extern const struct nx_fontpackage_s g_sans22x29_package;
#endif
#ifdef CONFIG_NXFONT_SANS23X27
extern const struct nx_fontpackage_s g_sans23x27_package;
#endif
#ifdef CONFIG_NXFONT_SANS22X29
extern const struct nx_fontpackage_s g_sans22x29_package;
#endif
#ifdef CONFIG_NXFONT_SANS28X37
extern const struct nx_fontpackage_s g_sans28x37_package;
#endif
#ifdef CONFIG_NXFONT_SANS39X48
extern const struct nx_fontpackage_s g_sans39x48_package;
#endif
/* SANS-BOLD */
#ifdef CONFIG_NXFONT_SANS22X29B
graphics/nxfonts/nxfonts_sans39x48.h
+849
View File
File diff suppressed because it is too large Load Diff