wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

font prototype

This commit is contained in:
olikraus 2015-11-12 23:06:01 +01:00
parent 04fb081057
commit d8a1a2c418
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
csrc/u8g2.h
View File

@ -310,7 +310,16 @@ void u8g2_Setup_TGA_LCD(u8g2_t *u8g2, const u8g2_cb_t *u8g2_cb);
/*==========================================*/
/* start font list */
xxxxx
extern const uint8_t u8g2_6x10_tf [] U8G2_FONT_SECTION("u8g2_6x10_tf");
extern const uint8_t u8g2_6x10_tr [] U8G2_FONT_SECTION("u8g2_6x10_tr");
extern const uint8_t u8g2_6x10_tn [] U8G2_FONT_SECTION("u8g2_6x10_tn");
extern const uint8_t u8g2_6x10_mf [] U8G2_FONT_SECTION("u8g2_6x10_mf");
extern const uint8_t u8g2_6x10_mr [] U8G2_FONT_SECTION("u8g2_6x10_mr");
extern const uint8_t u8g2_6x10_mn [] U8G2_FONT_SECTION("u8g2_6x10_mn");
extern const uint8_t u8g2_amstrad_cpc_8f [] U8G2_FONT_SECTION("u8g2_amstrad_cpc_8f");
extern const uint8_t u8g2_amstrad_cpc_8r [] U8G2_FONT_SECTION("u8g2_amstrad_cpc_8r");
extern const uint8_t u8g2_amstrad_cpc_8n [] U8G2_FONT_SECTION("u8g2_amstrad_cpc_8n");
/* end font list */

5
csrc/u8x8.h
View File

@ -460,7 +460,10 @@ void u8x8_Draw8x8String(u8x8_t *u8x8, uint8_t x, uint8_t y, const char *s);
/*==========================================*/
/* start font list */
xxxxx
extern const uint8_t u8x8_amstrad_cpc_8f [] U8X8_FONT_SECTION("u8x8_amstrad_cpc_8f");
extern const uint8_t u8x8_amstrad_cpc_8r [] U8X8_FONT_SECTION("u8x8_amstrad_cpc_8r");
extern const uint8_t u8x8_amstrad_cpc_8n [] U8X8_FONT_SECTION("u8x8_amstrad_cpc_8n");
/* end font list */

2
tools/font/build/build.c
View File

@ -198,7 +198,7 @@ void bdfconv(int i, int fm, char *fms, int bm, char *bms, int mm, char *mms)
fprintf(out_fp, "const uint8_t %s[%d] U8G2_FONT_SECTION(\"%s\") \n", fontname, bf->target_cnt, fontname);
*/
strcpy(font_prototype, "const uint8_t ");
strcpy(font_prototype, "extern const uint8_t ");
strcat(font_prototype, target_font_identifier);
strcat(font_prototype, " []");