Skip to content

Commit

Permalink
Implemented new font file format (file format version 1).
Browse files Browse the repository at this point in the history
Removed 'drawXXX' graphics functions to new MD_MAXPanel library.
Removed font indexing as this never used.
Added getFontHeight() method.
  • Loading branch information
MajicDesigns committed May 24, 2018
1 parent 0857410 commit b45b75a
Show file tree
Hide file tree
Showing 29 changed files with 556 additions and 943 deletions.
260 changes: 0 additions & 260 deletions Font Builder/Cyrillic_by_ton4eff_var_single.h

This file was deleted.

Binary file modified Font Builder/Excel/Parola MD_MAX72xx Font Builder v2.xlsm
Binary file not shown.
1 change: 1 addition & 0 deletions Font Builder/LCD5x7_fixed_single.txt
@@ -1,4 +1,5 @@
.NAME LCD5x7_var_single
.FONT_HEIGHT 8
.HEIGHT 1
.WIDTH 5
.CHAR 16
Expand Down
3 changes: 0 additions & 3 deletions Font Builder/README.txt

This file was deleted.

1 change: 1 addition & 0 deletions Font Builder/greek_var_single.txt
@@ -1,4 +1,5 @@
.NAME greek_var_single
.FONT_HEIGHT 8
.HEIGHT 1
.WIDTH 0
.CHAR 32
Expand Down
1 change: 1 addition & 0 deletions Font Builder/katakana_var_single.txt
@@ -1,4 +1,5 @@
.NAME katakana_var_single
.FONT_HEIGHT 8
.HEIGHT 1
.WIDTH 0
.CHAR 32
Expand Down
1 change: 1 addition & 0 deletions Font Builder/modernArabic_var_single.txt
@@ -1,4 +1,5 @@
.NAME modernArabic_var_single
.FONT_HEIGHT 8
.HEIGHT 1
.WIDTH 0
.CHAR 32
Expand Down
1 change: 1 addition & 0 deletions Font Builder/seg7_fixed_double.txt
@@ -1,4 +1,5 @@
.NAME seg7_fixed_double
.FONT_HEIGHT 8
.HEIGHT 2
.WIDTH 2
.CHAR 32
Expand Down
1 change: 1 addition & 0 deletions Font Builder/seg7_fixed_single.txt
@@ -1,4 +1,5 @@
.NAME seg7_fixed_single
.FONT_HEIGHT 8
.HEIGHT 1
.WIDTH 1
.CHAR 32
Expand Down
10 changes: 7 additions & 3 deletions Font Builder/src/font2txt/font2txt.c
Expand Up @@ -4,8 +4,11 @@
// from an existing font data table. This is considered a one-off task
// followed by some manual editing of the file.
// The file is expected to be in the similar format to the output from
// txt2font. Specifically, it is expected that each character is on one
// data line in order to recognise specific parts, like comments.
// txt2font. Specifically,
// - it is expected that each character is on one data line in order to
// recognise specific parts, like comments.
// - it expects all the ascii codes to be present (ie, it does not respect
// the version information at the start of the table)
//
// The shared header file means that some elements in this
// code are reversed (eg, the IN file extension is used as the OUT file
Expand Down Expand Up @@ -143,6 +146,7 @@ void saveOutputHeader(void)
fprintf(G.fpOut, "%c%s %s\n", DOT, CMD_NAME, G.fileRoot);
fprintf(G.fpOut, "%c%s %d\n", DOT, CMD_HEIGHT, (G.doubleHeight ? 2: 1));
fprintf(G.fpOut, "%c%s %d\n", DOT, CMD_WIDTH, G.fixedWidth);
fprintf(G.fpOut, "%c%s %d %s\n", DOT, CMD_FONTHIGH, G.fontHeight, "<- THIS NEEDS EDITING");

return;
}
Expand Down Expand Up @@ -176,7 +180,7 @@ void saveOutputChar(void)
}

void createFontData(char *cp)
// the font defintions strings are column data columns, so each byte will be a 'vertical'
// the font defintions strings are column data, so each byte will be a 'vertical'
// stripe of the input buffers. Format is the size followed by size bytes of column data,
// separated by commas. The comment is found after the data in a '//' comment and following
// the first '-'.
Expand Down
Binary file removed Font Builder/src/font2txt/font2txt.exe
Binary file not shown.

0 comments on commit b45b75a

Please sign in to comment.