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

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
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 */