Michel2/u8g2
1
0
Fork 0
mirror of https://github.com/olikraus/u8g2.git synced 2026-07-28 04:16:07 +00:00
Code Issues Releases Activity

compile speed up (new font array init)

Browse Source
This commit is contained in:
olikraus
2015-11-27 20:23:32 +01:00
parent 53f39416dd
commit accb927670
5 changed files with 21777 additions and 42497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
csrc/u8g2_fonts.c
+21053 -41254
View File
File diff suppressed because it is too large Load Diff
csrc/u8x8_fonts.c
+658 -1240
View File
File diff suppressed because it is too large Load Diff
doc/u8g2.txt
+11 -1
View File
@@ -12,4 +12,14 @@ U8glib V2: Features and Limitations
2 and 3 byte sequences are detected and handled.
Limitation:
Behavior for sequences with more than 3 bytes is unknown.
- Compilation speed improved (font file)
- "Text only" sub library
- less RAM/ROM usage
- Hardware supported display flip
- Better hardware support
tools/font/bdfconv/bdf_font.c
+54 -1
View File
@@ -587,7 +587,7 @@ int bf_WriteUCGCByFP(bf_t *bf, FILE *out_fp, const char *fontname, const char *i
return 1;
}
int bf_WriteU8G2CByFP(bf_t *bf, FILE *out_fp, const char *fontname, const char *indent)
int OLD___bf_WriteU8G2CByFP(bf_t *bf, FILE *out_fp, const char *fontname, const char *indent)
{
int i;
int bytes_per_line = 16;
@@ -623,6 +623,59 @@ int bf_WriteU8G2CByFP(bf_t *bf, FILE *out_fp, const char *fontname, const char *
return 1;
}
int bf_WriteU8G2CByFP(bf_t *bf, FILE *out_fp, const char *fontname, const char *indent)
{
int i;
int bytes_per_line = 32;
int extra1;
fprintf(out_fp, "/*\n");
fprintf(out_fp, " Fontname: %s\n", bf->str_font);
fprintf(out_fp, " Copyright: %s\n", bf->str_copyright);
fprintf(out_fp, " Glyphs: %d/%d\n", (int)bf->selected_glyphs, (int)bf->glyph_cnt );
fprintf(out_fp, " BBX Build Mode: %d\n", (int)bf->bbx_mode);
fprintf(out_fp, "*/\n");
if ( bf->target_data[bf->target_cnt-1] == 0 )
extra1 = 0;
else
extra1 = 1;
if ( bf->bbx_mode == 3 )
{
//fprintf(out_fp, "#include \"u8x8.h\"\n");
fprintf(out_fp, "const uint8_t %s[%d] U8X8_FONT_SECTION(\"%s\") = \n", fontname, bf->target_cnt+extra1, fontname);
}
else
{
//fprintf(out_fp, "#include \"u8g2.h\"\n");
fprintf(out_fp, "const uint8_t %s[%d] U8G2_FONT_SECTION(\"%s\") = \n", fontname, bf->target_cnt+extra1, fontname);
}
fprintf(out_fp, "%s\"", indent);
for( i = 0; i < bf->target_cnt-1+extra1; i++ )
{
if ( bf->target_data[i] < 32 || bf->target_data[i] == '\"' || bf->target_data[i] == '\\' || ( bf->target_data[i] >= '0' && bf->target_data[i] <= '9' ))
{
fprintf(out_fp, "\\%o", bf->target_data[i]);
//fprintf(out_fp, "\\x%02x", bf->target_data[i]);
}
else if ( bf->target_data[i] < 128 )
{
fprintf(out_fp, "%c", bf->target_data[i]);
}
else
{
fprintf(out_fp, "\\%o", bf->target_data[i]);
}
if ( (i+1) % bytes_per_line == 0 )
fprintf(out_fp, "\"\n%s\"", indent);
}
fprintf(out_fp, "\";\n");
return 1;
}
int bf_WriteUCGCByFilename(bf_t *bf, const char *filename, const char *fontname, const char *indent)
{
FILE *fp;
tools/font/bdfconv/bdf_parser.c
+1 -1
View File
@@ -100,7 +100,7 @@ static const char *bf_get_eol_string(bf_t *bf)
if ( bf_curr(bf) == '\"' )
return bf_get_string(bf);
bf_next(bf);
//bf_next(bf);
for(;;)
{