Skip to content
Snippets Groups Projects

WIP: font cleanup

Closed WIP: font cleanup
fleur/firmware:fontcleanup into master
Closed fleur requested to merge fleur/firmware:fontcleanup into master
Compare
and
3 files
+ 4854
− 8283
Compare changes
  • Side-by-side
  • Inline
Files
3
lib/gfx/Fonts/font12.c
+ 1238
− 1241
#include "fonts.h"
const uint8_t Font12_Table[] = {
// ' '
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
// '!'
0,
16,
16,
16,
16,
16,
16,
16,
16,
16,
0,
0,
// '"'
0,
48,
56,
56,
0,
0,
0,
0,
0,
0,
0,
0,
// '#'
0,
24,
24,
56,
124,
56,
120,
120,
48,
112,
0,
0,
// '$'
0,
24,
56,
56,
48,
56,
24,
92,
120,
56,
16,
0,
// '%'
0,
104,
120,
120,
112,
16,
56,
60,
60,
60,
0,
0,
// '&'
0,
48,
48,
56,
48,
48,
120,
88,
120,
60,
0,
0,
// '''
0,
16,
16,
16,
0,
0,
0,
0,
0,
0,
0,
0,
// '('
24,
16,
16,
48,
32,
32,
32,
48,
48,
16,
24,
0,
// ')'
32,
48,
16,
24,
24,
24,
24,
24,
16,
16,
48,
0,
// '*'
0,
16,
56,
48,
16,
0,
0,
0,
0,
0,
0,
0,
// '+'
0,
0,
0,
0,
0,
16,
56,
56,
16,
0,
0,
0,
// ','
0,
0,
0,
0,
0,
0,
0,
0,
0,
16,
16,
0,
// '-'
0,
0,
0,
0,
0,
0,
56,
56,
0,
0,
0,
0,
// '.'
0,
0,
0,
0,
0,
0,
0,
0,
16,
16,
0,
0,
// '/'
0,
8,
8,
24,
24,
16,
48,
48,
32,
32,
0,
0,
// '0'
0,
16,
56,
40,
104,
108,
104,
104,
40,
56,
0,
0,
// '1'
0,
16,
16,
48,
16,
16,
16,
16,
16,
56,
0,
0,
// '2'
0,
16,
56,
40,
8,
24,
48,
32,
32,
56,
0,
0,
// '3'
0,
16,
56,
8,
24,
24,
8,
8,
40,
56,
0,
0,
// '4'
0,
8,
24,
24,
24,
56,
56,
56,
24,
8,
0,
0,
// '5'
0,
56,
56,
32,
56,
40,
8,
8,
40,
56,
0,
0,
// '6'
0,
16,
16,
48,
48,
56,
104,
104,
40,
56,
0,
0,
// '7'
0,
56,
56,
8,
8,
24,
16,
16,
48,
32,
0,
0,
// '8'
0,
16,
56,
40,
56,
56,
56,
40,
40,
56,
0,
0,
// '9'
0,
16,
56,
40,
104,
40,
56,
24,
16,
48,
0,
0,
// ':'
0,
0,
0,
0,
16,
16,
0,
0,
16,
16,
0,
0,
// ';'
0,
0,
0,
0,
16,
16,
0,
0,
0,
16,
16,
0,
// '<'
0,
0,
0,
0,
24,
48,
48,
48,
24,
8,
0,
0,
// '='
0,
0,
0,
0,
0,
56,
16,
56,
56,
0,
0,
0,
// '>'
0,
0,
0,
0,
32,
48,
24,
24,
48,
32,
0,
0,
// '?'
0,
56,
56,
8,
8,
24,
16,
48,
32,
32,
0,
0,
// '@'
0,
0,
56,
124,
116,
116,
252,
252,
124,
104,
56,
0,
// 'A'
0,
16,
16,
56,
56,
56,
56,
104,
108,
76,
0,
0,
// 'B'
0,
112,
120,
104,
104,
120,
108,
108,
120,
120,
0,
0,
// 'C'
0,
24,
60,
96,
96,
64,
64,
96,
108,
56,
0,
0,
// 'D'
0,
112,
120,
72,
76,
76,
76,
76,
72,
120,
32,
0,
// 'E'
0,
124,
120,
96,
96,
120,
96,
96,
96,
124,
0,
0,
// 'F'
0,
60,
124,
96,
96,
120,
96,
96,
96,
96,
0,
0,
// 'G'
0,
56,
120,
76,
64,
64,
92,
76,
120,
56,
0,
0,
// 'H'
0,
68,
68,
68,
76,
124,
100,
68,
68,
68,
0,
0,
// 'I'
0,
56,
56,
16,
16,
16,
16,
16,
16,
56,
0,
0,
// 'J'
0,
24,
24,
8,
8,
8,
8,
40,
56,
56,
0,
0,
// 'K'
0,
40,
104,
120,
112,
96,
112,
112,
120,
108,
0,
0,
// 'L'
0,
32,
32,
32,
32,
32,
32,
32,
56,
56,
0,
0,
// 'M'
0,
72,
108,
108,
108,
124,
124,
244,
244,
150,
0,
0,
// 'N'
0,
68,
108,
108,
124,
124,
92,
92,
76,
76,
0,
0,
// 'O'
0,
24,
56,
108,
68,
68,
76,
76,
104,
56,
0,
0,
// 'P'
0,
48,
120,
108,
108,
120,
120,
96,
96,
32,
0,
0,
// 'Q'
0,
56,
56,
108,
68,
68,
68,
92,
124,
60,
0,
0,
// 'R'
0,
112,
120,
104,
104,
120,
120,
120,
104,
108,
0,
0,
// 'S'
0,
56,
60,
40,
48,
56,
8,
76,
104,
56,
0,
0,
// 'T'
0,
124,
120,
16,
16,
16,
16,
16,
16,
16,
0,
0,
// 'U'
0,
68,
68,
68,
68,
68,
68,
108,
104,
56,
0,
0,
// 'V'
0,
68,
108,
104,
40,
40,
56,
48,
48,
16,
0,
0,
// 'W'
0,
146,
150,
182,
244,
124,
124,
108,
108,
104,
0,
0,
// 'X'
0,
68,
108,
40,
56,
16,
56,
40,
108,
68,
0,
0,
// 'Y'
0,
68,
108,
108,
40,
56,
16,
16,
48,
32,
0,
0,
// 'Z'
0,
124,
124,
8,
24,
16,
48,
32,
96,
124,
0,
0,
// '['
56,
48,
48,
48,
48,
48,
48,
48,
48,
48,
48,
16,
// '\'
0,
32,
32,
32,
48,
16,
16,
24,
8,
8,
0,
0,
// ']'
24,
24,
24,
24,
24,
24,
24,
24,
24,
24,
24,
16,
// '^'
0,
0,
16,
56,
40,
0,
0,
0,
0,
0,
0,
0,
// '_'
0,
0,
0,
0,
0,
0,
0,
0,
0,
120,
124,
0,
// '`'
0,
48,
16,
0,
0,
0,
0,
0,
0,
0,
0,
0,
// 'a'
0,
0,
0,
24,
56,
40,
40,
40,
56,
56,
0,
0,
// 'b'
0,
32,
32,
48,
56,
40,
40,
40,
40,
56,
0,
0,
// 'c'
0,
0,
0,
16,
56,
40,
32,
32,
40,
56,
0,
0,
// 'd'
0,
8,
8,
24,
56,
40,
104,
104,
40,
56,
0,
0,
// 'e'
0,
0,
0,
16,
56,
40,
56,
48,
40,
56,
0,
0,
// 'f'
0,
24,
24,
56,
56,
16,
16,
16,
16,
16,
0,
0,
// 'g'
0,
0,
0,
24,
56,
40,
40,
40,
56,
56,
8,
56,
// 'h'
0,
32,
32,
48,
56,
40,
40,
40,
40,
40,
0,
0,
// 'i'
0,
16,
16,
0,
16,
16,
16,
16,
16,
16,
0,
0,
// 'j'
0,
16,
24,
0,
24,
24,
24,
24,
24,
56,
56,
48,
// 'k'
0,
32,
32,
40,
40,
48,
48,
56,
40,
40,
0,
0,
// 'l'
0,
16,
16,
16,
16,
16,
16,
16,
16,
16,
0,
0,
// 'm'
0,
0,
0,
40,
252,
212,
212,
212,
212,
84,
0,
0,
// 'n'
0,
0,
0,
16,
56,
40,
40,
40,
40,
40,
0,
0,
// 'o'
0,
0,
0,
16,
56,
40,
104,
104,
40,
56,
0,
0,
// 'p'
0,
0,
0,
16,
56,
40,
40,
40,
56,
56,
32,
32,
// 'q'
0,
0,
0,
8,
56,
40,
40,
40,
40,
56,
8,
8,
// 'r'
0,
0,
0,
8,
56,
56,
32,
32,
32,
32,
0,
0,
// 's'
0,
0,
0,
16,
56,
40,
56,
24,
40,
56,
0,
0,
// 't'
0,
0,
16,
56,
56,
16,
16,
16,
16,
16,
0,
0,
// 'u'
0,
0,
0,
0,
40,
40,
40,
40,
40,
56,
0,
0,
// 'v'
0,
0,
0,
0,
40,
40,
56,
56,
16,
16,
0,
0,
// 'w'
0,
0,
0,
0,
84,
124,
120,
120,
120,
40,
0,
0,
// 'x'
0,
0,
0,
0,
44,
56,
16,
56,
40,
104,
0,
0,
// 'y'
0,
0,
0,
0,
104,
40,
56,
56,
16,
16,
48,
32,
// 'z'
0,
0,
0,
56,
56,
24,
16,
48,
48,
56,
0,
0,
// '{'
24,
16,
16,
16,
16,
48,
48,
16,
16,
16,
24,
8,
// '|'
16,
16,
16,
16,
16,
16,
16,
16,
16,
16,
16,
16,
// '}'
48,
16,
16,
16,
16,
24,
16,
16,
16,
16,
48,
32,
// '~'
0,
0,
0,
0,
0,
32,
124,
88,
0,
0,
0,
0,
const uint8_t Font12_Table[] =
{
// ' '
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
// '!'
16,
16,
16,
16,
16,
16,
16,
0,
0,
16,
16,
0,
// '"'
0,
40,
40,
40,
0,
0,
0,
0,
0,
0,
0,
0,
// '#'
0,
20,
28,
24,
124,
40,
124,
124,
48,
112,
0,
0,
// '$'
0,
24,
60,
52,
48,
56,
28,
20,
124,
56,
16,
0,
// '%'
0,
104,
120,
120,
120,
16,
24,
60,
60,
44,
0,
0,
// '&'
0,
48,
56,
40,
48,
48,
120,
72,
76,
52,
0,
0,
// '''
0,
16,
16,
16,
0,
0,
0,
0,
0,
0,
0,
0,
// '('
8,
16,
16,
48,
32,
32,
32,
48,
16,
16,
24,
0,
// ')'
48,
16,
16,
24,
8,
8,
8,
8,
24,
16,
16,
0,
// '*'
0,
16,
56,
16,
40,
0,
0,
0,
0,
0,
0,
0,
// '+'
0,
0,
0,
0,
16,
16,
56,
16,
16,
0,
0,
0,
// ','
0,
0,
0,
0,
0,
0,
0,
0,
0,
16,
16,
16,
// '-'
0,
0,
0,
0,
0,
0,
56,
0,
0,
0,
0,
0,
// '.'
0,
0,
0,
0,
0,
0,
0,
0,
0,
16,
0,
0,
// '/'
0,
8,
8,
8,
24,
16,
16,
32,
32,
32,
0,
0,
// '0'
0,
24,
56,
44,
100,
68,
68,
108,
40,
56,
0,
0,
// '1'
0,
0,
16,
48,
16,
16,
16,
16,
16,
56,
0,
0,
// '2'
0,
16,
56,
8,
8,
24,
48,
32,
32,
56,
0,
0,
// '3'
0,
48,
56,
8,
24,
24,
8,
12,
40,
56,
0,
0,
// '4'
0,
0,
8,
24,
24,
56,
40,
56,
8,
8,
0,
0,
// '5'
0,
56,
56,
32,
56,
40,
12,
12,
40,
56,
0,
0,
// '6'
0,
28,
48,
48,
112,
120,
108,
108,
40,
56,
0,
0,
// '7'
0,
60,
60,
8,
8,
24,
16,
16,
48,
32,
0,
0,
// '8'
0,
24,
56,
36,
56,
56,
40,
108,
108,
56,
0,
0,
// '9'
0,
16,
56,
40,
108,
40,
56,
8,
24,
48,
0,
0,
// ':'
0,
0,
0,
0,
16,
16,
0,
0,
0,
16,
0,
0,
// ';'
0,
0,
0,
0,
16,
16,
0,
0,
0,
16,
16,
16,
// '<'
0,
0,
0,
0,
8,
16,
32,
48,
24,
8,
0,
0,
// '='
0,
0,
0,
0,
0,
56,
0,
56,
0,
0,
0,
0,
// '>'
0,
0,
0,
0,
32,
16,
8,
24,
48,
32,
0,
0,
// '?'
0,
56,
40,
12,
8,
8,
16,
48,
0,
0,
32,
0,
// '@'
0,
0,
56,
108,
84,
246,
234,
254,
124,
64,
60,
0,
// 'A'
0,
16,
16,
24,
56,
40,
56,
108,
100,
68,
0,
0,
// 'B'
0,
112,
120,
72,
72,
120,
76,
68,
76,
120,
0,
0,
// 'C'
0,
24,
60,
32,
64,
64,
64,
64,
100,
56,
0,
0,
// 'D'
0,
96,
120,
72,
76,
68,
68,
68,
72,
120,
0,
0,
// 'E'
0,
124,
120,
64,
64,
120,
64,
64,
64,
124,
0,
0,
// 'F'
0,
60,
56,
32,
32,
56,
32,
32,
32,
32,
0,
0,
// 'G'
0,
56,
60,
68,
64,
64,
76,
68,
108,
56,
0,
0,
// 'H'
0,
68,
68,
68,
68,
124,
100,
68,
68,
68,
0,
0,
// 'I'
0,
56,
56,
16,
16,
16,
16,
16,
16,
56,
0,
0,
// 'J'
0,
24,
24,
8,
8,
8,
8,
40,
40,
56,
0,
0,
// 'K'
0,
0,
104,
120,
112,
96,
96,
112,
120,
108,
0,
0,
// 'L'
0,
32,
32,
32,
32,
32,
32,
32,
32,
60,
0,
0,
// 'M'
0,
68,
108,
108,
108,
108,
108,
254,
178,
146,
0,
0,
// 'N'
0,
68,
100,
100,
116,
84,
84,
76,
76,
76,
0,
0,
// 'O'
0,
24,
56,
100,
68,
68,
68,
68,
104,
56,
0,
0,
// 'P'
0,
48,
120,
100,
100,
104,
120,
96,
96,
96,
0,
0,
// 'Q'
0,
24,
60,
100,
68,
68,
68,
84,
124,
60,
0,
0,
// 'R'
0,
112,
120,
76,
76,
72,
120,
88,
72,
68,
0,
0,
// 'S'
0,
24,
60,
36,
32,
56,
12,
4,
108,
56,
0,
0,
// 'T'
0,
124,
56,
16,
16,
16,
16,
16,
16,
16,
0,
0,
// 'U'
0,
68,
68,
68,
68,
68,
68,
68,
108,
56,
0,
0,
// 'V'
0,
68,
68,
108,
40,
40,
40,
56,
48,
16,
0,
0,
// 'W'
0,
146,
146,
146,
190,
236,
108,
108,
108,
108,
0,
0,
// 'X'
0,
68,
108,
40,
56,
16,
48,
40,
104,
68,
0,
0,
// 'Y'
0,
68,
68,
44,
40,
56,
24,
16,
48,
32,
0,
0,
// 'Z'
0,
124,
60,
8,
24,
16,
48,
32,
96,
124,
0,
0,
// '['
56,
32,
32,
32,
32,
32,
32,
32,
32,
32,
32,
56,
// '\'
0,
32,
32,
32,
48,
16,
16,
8,
8,
8,
0,
0,
// ']'
56,
8,
8,
8,
8,
8,
8,
8,
8,
8,
8,
56,
// '^'
16,
40,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
// '_'
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
124,
0,
// '`'
16,
16,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
// 'a'
0,
0,
0,
48,
56,
8,
56,
40,
40,
56,
0,
0,
// 'b'
0,
32,
32,
32,
56,
40,
44,
44,
40,
56,
0,
0,
// 'c'
0,
0,
0,
16,
56,
32,
32,
32,
40,
56,
0,
0,
// 'd'
0,
8,
8,
8,
56,
40,
104,
104,
40,
56,
0,
0,
// 'e'
0,
0,
0,
16,
56,
40,
120,
96,
32,
56,
0,
0,
// 'f'
0,
24,
16,
48,
56,
16,
16,
16,
16,
16,
0,
0,
// 'g'
0,
0,
0,
24,
56,
40,
104,
104,
40,
56,
8,
56,
// 'h'
0,
32,
32,
40,
56,
40,
40,
40,
40,
40,
0,
0,
// 'i'
0,
16,
16,
0,
16,
16,
16,
16,
16,
16,
0,
0,
// 'j'
0,
24,
0,
0,
24,
24,
24,
24,
24,
24,
56,
48,
// 'k'
0,
32,
32,
40,
40,
56,
48,
56,
40,
40,
0,
0,
// 'l'
0,
16,
16,
16,
16,
16,
16,
16,
16,
16,
0,
0,
// 'm'
0,
0,
0,
36,
252,
214,
214,
214,
214,
214,
0,
0,
// 'n'
0,
0,
0,
0,
56,
40,
40,
40,
44,
40,
0,
0,
// 'o'
0,
0,
0,
16,
56,
44,
108,
108,
40,
56,
0,
0,
// 'p'
0,
0,
0,
16,
56,
40,
44,
44,
40,
56,
32,
32,
// 'q'
0,
0,
0,
8,
56,
40,
104,
104,
40,
56,
8,
8,
// 'r'
0,
0,
0,
8,
56,
48,
32,
32,
32,
32,
0,
0,
// 's'
0,
0,
0,
16,
56,
32,
56,
8,
40,
56,
0,
0,
// 't'
0,
16,
16,
56,
56,
16,
16,
16,
16,
16,
0,
0,
// 'u'
0,
0,
0,
0,
40,
40,
40,
40,
40,
56,
0,
0,
// 'v'
0,
0,
0,
0,
40,
40,
40,
56,
16,
16,
0,
0,
// 'w'
0,
0,
0,
0,
84,
84,
124,
108,
104,
40,
0,
0,
// 'x'
0,
0,
0,
0,
40,
56,
16,
56,
40,
104,
0,
0,
// 'y'
0,
0,
0,
0,
108,
40,
40,
56,
16,
16,
16,
32,
// 'z'
0,
0,
0,
56,
56,
8,
16,
16,
32,
56,
0,
0,
// '{'
24,
16,
16,
16,
16,
48,
16,
16,
16,
16,
16,
8,
// '|'
16,
16,
16,
16,
16,
16,
16,
16,
16,
16,
16,
0,
// '}'
48,
16,
16,
16,
16,
24,
24,
16,
16,
16,
16,
32,
// '~'
0,
0,
0,
0,
0,
32,
116,
88,
0,
0,
0,
0,
};
sFONT Font12 = {
Font12_Table,
7,
12,
};
sFONT Font12 = {Font12_Table, 7, 12, };