Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-25 01:39:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Two new fonts from Pierre-noel Bouteville

Browse Source
This commit is contained in:
Gregory Nutt
2014-11-26 14:15:34 -06:00
parent c39d9f08b3
commit a7b6369825
27 changed files with 1679 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/Kconfig
+14
View File
@@ -355,6 +355,20 @@ config NXFONT_SERIF38X49B
This option enables support for a large, 38x49 bold font (with serifs)
(font ID FONTID_SERIF38X49B == 13).
config NXFONT_PIXEL_UNICODE
bool "Pixel UniCode"
default n
---help---
This option enables support for a small LCD, The "Pixel UniCode"
(font ID FONTID_PIXEL_UNICODE == 19).
config NXFONT_PIXEL_LCD_MACHINE
bool "Pixel lcd machine"
default n
---help---
This option enables support for a small LCD, The "Pixel lcd machine"
(font ID FONTID_PIXEL_LCD_MACHINE == 20).
endmenu
menuconfig NXTERM
include/nuttx/nx/nxfonts.h
+18
View File
@@ -113,6 +113,14 @@
#elif defined(CONFIG_NXFONT_SERIF38X49B)
# define NXFONT_DEFAULT FONTID_SERIF38X49B
/* Pixel fonts */
#elif defined(CONFIG_NXFONT_PIXEL_UNICODE)
# define NXFONT_DEFAULT FONTID_PIXEL_UNICODE
#elif defined(CONFIG_NXFONT_PIXEL_LCD_MACHINE)
# define NXFONT_DEFAULT FONTID_PIXEL_LCD_MACHINE
/* Mono-space fonts */
#elif defined(CONFIG_NXFONT_MONO5X8)
@@ -211,6 +219,16 @@ enum nx_fontid_e
#ifdef CONFIG_NXFONT_SERIF38X49B
, FONTID_SERIF38X49B = 13 /* The 38x49 serif bold font */
#endif
/* Pixel fonts */
#ifdef CONFIG_NXFONT_PIXEL_UNICODE
, FONTID_PIXEL_UNICODE = 19 /* Pixel UniCode font */
#endif
#ifdef CONFIG_NXFONT_PIXEL_LCD_MACHINE
, FONTID_PIXEL_LCD_MACHINE = 20 /* Pixel lcd machine font */
#endif
};
/* This structures provides the metrics for one glyph */
libnx/Makefile
+6
View File
@@ -152,6 +152,12 @@ endif
ifeq ($(CONFIG_NXFONT_SANS20X26),y)
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=15 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_PIXEL_UNICODE),y)
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=19 EXTRADEFINES=$(EXTRADEFINES)
endif
ifeq ($(CONFIG_NXFONT_PIXEL_LCD_MACHINE),y)
$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=20 EXTRADEFINES=$(EXTRADEFINES)
endif
gensources: gen1bppsources gen2bppsource gen4bppsource gen8bppsource gen16bppsource gen24bppsource gen32bppsources genfontsources
libnx/nxfonts/Make.defs
+10
View File
@@ -125,6 +125,16 @@ ifeq ($(CONFIG_NXFONT_SERIF38X49B),y)
CSRCS += nxfonts_bitmaps_serif38x49b.c
endif
# Pixel fonts
ifeq ($(CONFIG_NXFONT_PIXEL_UNICODE),y)
CSRCS += nxfonts_bitmaps_pixel-unicode.c
endif
ifeq ($(CONFIG_NXFONT_PIXEL_LCD_MACHINE),y)
CSRCS += nxfonts_bitmaps_pixel-lcd-machine.c
endif
# Add the nxfont/ directory to the build
DEPPATH += --dep-path nxfonts
libnx/nxfonts/Makefile.sources
+12
View File
@@ -172,6 +172,18 @@ NXFONTS_PREFIX := g_serif38x49b_
GEN_CSRC = nxfonts_bitmaps_serif38x49b.c
endif
# Pixel fonts
ifeq ($(NXFONTS_FONTID),19)
NXFONTS_PREFIX := g_pixel_unicode_
GEN_CSRC = nxfonts_bitmaps_pixel-unicode.c
endif
ifeq ($(NXFONTS_FONTID),20)
NXFONTS_PREFIX := g_pixel_lcd_machine_
GEN_CSRC = nxfonts_bitmaps_pixel-lcd-machine.c
endif
DEPENDENCY := nxfonts_bitmaps.c
CPPFLAGS += -DNXFONTS_FONTID=$(NXFONTS_FONTID)
CPPFLAGS += -DNXFONTS_PREFIX=$(NXFONTS_PREFIX)
libnx/nxfonts/nxfonts_bitmaps.c
+4
View File
@@ -82,6 +82,10 @@
# include "nxfonts_sans20x27b.h"
#elif NXFONTS_FONTID == 18
# include "nxfonts_mono5x8.h"
#elif NXFONTS_FONTID == 19
# include "nxfonts_pixel-unicode.h"
#elif NXFONTS_FONTID == 20
# include "nxfonts_pixel-lcd-machine.h"
#else
# error "No font ID specified"
#endif
libnx/nxfonts/nxfonts_internal.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_INTERNAL_H
#define __GRAPHICS_NXFONTS_NXFONTS_INTERNAL_H
#ifndef __LIBNX_NXFONTS_NXFONTS_INTERNAL_H
#define __LIBNX_NXFONTS_NXFONTS_INTERNAL_H
/****************************************************************************
* Included Files
@@ -85,4 +85,4 @@ EXTERN struct nx_font_s g_fonts;
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_INTERNAL_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_INTERNAL_H */
libnx/nxfonts/nxfonts_mono5x8.h
+2 -2
View File
@@ -36,8 +36,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_MONO5X8_H
#define __GRAPHICS_NXFONTS_NXFONTS_MONO5X8_H
#ifndef __LIBNX_NXFONTS_NXFONTS_MONO5X8_H
#define __LIBNX_NXFONTS_NXFONTS_MONO5X8_H
#define NXFONT_ID FONTID_MONO5X8
libnx/nxfonts/nxfonts_pixel-lcd-machine.h
+709
View File
File diff suppressed because it is too large Load Diff
libnx/nxfonts/nxfonts_pixel-unicode.h
+850
View File
File diff suppressed because it is too large Load Diff
libnx/nxfonts/nxfonts_sans17x22.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS17X22_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS17X22_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS17X22_H
#define __LIBNX_NXFONTS_NXFONTS_SANS17X22_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS17X22_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS17X22_H */
libnx/nxfonts/nxfonts_sans17x23b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS17X23B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS17X23B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS17X23B_H
#define __LIBNX_NXFONTS_NXFONTS_SANS17X23B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS17X23B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS17X23B_H */
libnx/nxfonts/nxfonts_sans20x26.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS20X26_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS20X26_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS20X26_H
#define __LIBNX_NXFONTS_NXFONTS_SANS20X26_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS20X26_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS20X26_H */
libnx/nxfonts/nxfonts_sans20x27b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS20X27B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS20X27B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS20X27B_H
#define __LIBNX_NXFONTS_NXFONTS_SANS20X27B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS20X27B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS20X27B_H */
libnx/nxfonts/nxfonts_sans22x29.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS22X29_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS22X29_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS22X29_H
#define __LIBNX_NXFONTS_NXFONTS_SANS22X29_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS22X29_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS22X29_H */
libnx/nxfonts/nxfonts_sans22x29b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS22X29B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS22X29B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS22X29B_H
#define __LIBNX_NXFONTS_NXFONTS_SANS22X29B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS22X29B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS22X29B_H */
libnx/nxfonts/nxfonts_sans23x27.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS23X27_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS23X27_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS23X27_H
#define __LIBNX_NXFONTS_NXFONTS_SANS23X27_H
/****************************************************************************
* Included Files
@@ -856,4 +856,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS23X27_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS23X27_H */
libnx/nxfonts/nxfonts_sans28x37.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS28X37_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS28X37_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS28X37_H
#define __LIBNX_NXFONTS_NXFONTS_SANS28X37_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS28X37_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS28X37_H */
libnx/nxfonts/nxfonts_sans28x37b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS28X37B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS28X37B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS28X37B_H
#define __LIBNX_NXFONTS_NXFONTS_SANS28X37B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS28X37B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS28X37B_H */
libnx/nxfonts/nxfonts_sans39x48.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF39X48_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF39X48_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF39X48_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF39X48_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF39X48_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF39X48_H */
libnx/nxfonts/nxfonts_sans40x49b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SANS40X49B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SANS40X49B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SANS40X49B_H
#define __LIBNX_NXFONTS_NXFONTS_SANS40X49B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SANS40X49B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SANS40X49B_H */
libnx/nxfonts/nxfonts_serif22x28b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF22X28B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF22X28B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF22X28B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF22X28B_H */
libnx/nxfonts/nxfonts_serif22x29.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF22X29_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF22X29_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF22X29_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF22X29_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF22X29_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF22X29_H */
libnx/nxfonts/nxfonts_serif27x38b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF27X38B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF27X38B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF27X38B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF27X38B_H */
libnx/nxfonts/nxfonts_serif29x37.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF29X37_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF29X37_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF29X37_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF29X37_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF29X37_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF29X37_H */
libnx/nxfonts/nxfonts_serif38x48.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF38X48_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF38X48_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF38X48_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF38X48_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF38X48_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF38X48_H */
libnx/nxfonts/nxfonts_serif38x49b.h
+3 -3
View File
@@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXFONTS_NXFONTS_SERIF38X49B_H
#define __GRAPHICS_NXFONTS_NXFONTS_SERIF38X49B_H
#ifndef __LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H
#define __LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H
/****************************************************************************
* Included Files
@@ -846,4 +846,4 @@ extern "C" {
}
#endif
#endif /* __GRAPHICS_NXFONTS_NXFONTS_SERIF38X49B_H */
#endif /* __LIBNX_NXFONTS_NXFONTS_SERIF38X49B_H */