Skip to content
Snippets Groups Projects
Commit 3010d8eb authored by rahix's avatar rahix
Browse files

Revert "feat(gfx): Cleanup fonts" 

This reverts commit be820c07.
parent bedbbd1c
Branches
Tags
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
lib/gfx/Fonts/font12.c
+ 1241
− 1238
View file @ 3010d8eb
#include "fonts.h"
const uint8_t Font12_Table[] =
{
const uint8_t Font12_Table[] = {
// ' '
0,
0,
......@@ -16,6 +15,7 @@ const uint8_t Font12_Table[] =
0,
0,
// '!'
0,
16,
16,
16,
......@@ -23,16 +23,15 @@ const uint8_t Font12_Table[] =
16,
16,
16,
0,
0,
16,
16,
0,
0,
// '"'
0,
40,
40,
40,
48,
56,
56,
0,
0,
0,
......@@ -43,13 +42,13 @@ const uint8_t Font12_Table[] =
0,
// '#'
0,
20,
28,
24,
24,
56,
124,
40,
124,
124,
56,
120,
120,
48,
112,
0,
......@@ -57,13 +56,13 @@ const uint8_t Font12_Table[] =
// '$'
0,
24,
60,
52,
56,
56,
48,
56,
28,
20,
124,
24,
92,
120,
56,
16,
0,
......@@ -72,25 +71,25 @@ const uint8_t Font12_Table[] =
104,
120,
120,
120,
112,
16,
24,
56,
60,
60,
60,
44,
0,
0,
// '&'
0,
48,
48,
56,
40,
48,
48,
120,
72,
76,
52,
88,
120,
60,
0,
0,
// '''
......@@ -107,7 +106,7 @@ const uint8_t Font12_Table[] =
0,
0,
// '('
8,
24,
16,
16,
48,
......@@ -115,29 +114,29 @@ const uint8_t Font12_Table[] =
32,
32,
48,
16,
48,
16,
24,
0,
// ')'
32,
48,
16,
16,
24,
8,
8,
8,
8,
24,
24,
24,
24,
16,
16,
48,
0,
// '*'
0,
16,
56,
48,
16,
40,
0,
0,
0,
......@@ -150,10 +149,10 @@ const uint8_t Font12_Table[] =
0,
0,
0,
16,
0,
16,
56,
16,
56,
16,
0,
0,
......@@ -170,7 +169,7 @@ const uint8_t Font12_Table[] =
0,
16,
16,
16,
0,
// '-'
0,
0,
......@@ -179,7 +178,7 @@ const uint8_t Font12_Table[] =
0,
0,
56,
0,
56,
0,
0,
0,
......@@ -193,7 +192,7 @@ const uint8_t Font12_Table[] =
0,
0,
0,
0,
16,
16,
0,
0,
......@@ -201,31 +200,31 @@ const uint8_t Font12_Table[] =
0,
8,
8,
8,
24,
24,
16,
16,
32,
48,
48,
32,
32,
0,
0,
// '0'
0,
24,
16,
56,
44,
100,
68,
68,
40,
104,
108,
104,
104,
40,
56,
0,
0,
// '1'
0,
0,
16,
16,
48,
16,
......@@ -240,7 +239,7 @@ const uint8_t Font12_Table[] =
0,
16,
56,
8,
40,
8,
24,
48,
......@@ -251,27 +250,27 @@ const uint8_t Font12_Table[] =
0,
// '3'
0,
48,
16,
56,
8,
24,
24,
8,
12,
8,
40,
56,
0,
0,
// '4'
0,
0,
8,
24,
24,
24,
56,
40,
56,
8,
56,
24,
8,
0,
0,
......@@ -282,29 +281,29 @@ const uint8_t Font12_Table[] =
32,
56,
40,
12,
12,
8,
8,
40,
56,
0,
0,
// '6'
0,
28,
16,
16,
48,
48,
112,
120,
108,
108,
56,
104,
104,
40,
56,
0,
0,
// '7'
0,
60,
60,
56,
56,
8,
8,
24,
......@@ -316,14 +315,14 @@ const uint8_t Font12_Table[] =
0,
// '8'
0,
24,
16,
56,
40,
56,
36,
56,
56,
40,
108,
108,
40,
56,
0,
0,
......@@ -332,11 +331,11 @@ const uint8_t Font12_Table[] =
16,
56,
40,
108,
104,
40,
56,
8,
24,
16,
48,
0,
0,
......@@ -349,7 +348,7 @@ const uint8_t Font12_Table[] =
16,
0,
0,
0,
16,
16,
0,
0,
......@@ -365,15 +364,15 @@ const uint8_t Font12_Table[] =
0,
16,
16,
16,
0,
// '<'
0,
0,
0,
0,
8,
16,
32,
24,
48,
48,
48,
24,
8,
......@@ -386,9 +385,9 @@ const uint8_t Font12_Table[] =
0,
0,
56,
0,
16,
56,
56,
0,
0,
0,
0,
......@@ -398,8 +397,8 @@ const uint8_t Font12_Table[] =
0,
0,
32,
16,
8,
48,
24,
24,
48,
32,
......@@ -408,52 +407,52 @@ const uint8_t Font12_Table[] =
// '?'
0,
56,
40,
12,
56,
8,
8,
24,
16,
48,
0,
0,
32,
32,
0,
0,
// '@'
0,
0,
56,
108,
84,
246,
234,
254,
124,
64,
60,
116,
116,
252,
252,
124,
104,
56,
0,
// 'A'
0,
16,
16,
24,
56,
40,
56,
56,
56,
104,
108,
100,
68,
76,
0,
0,
// 'B'
0,
112,
120,
72,
72,
104,
104,
120,
108,
108,
120,
76,
68,
76,
120,
0,
0,
......@@ -461,64 +460,64 @@ const uint8_t Font12_Table[] =
0,
24,
60,
32,
64,
64,
96,
96,
64,
64,
100,
96,
108,
56,
0,
0,
// 'D'
0,
96,
112,
120,
72,
76,
68,
68,
68,
76,
76,
76,
72,
120,
0,
32,
0,
// 'E'
0,
124,
120,
64,
64,
96,
96,
120,
64,
64,
64,
96,
96,
96,
124,
0,
0,
// 'F'
0,
60,
56,
32,
32,
56,
32,
32,
32,
32,
124,
96,
96,
120,
96,
96,
96,
96,
0,
0,
// 'G'
0,
56,
60,
68,
120,
76,
64,
64,
92,
76,
68,
108,
120,
56,
0,
0,
......@@ -527,7 +526,7 @@ const uint8_t Font12_Table[] =
68,
68,
68,
68,
76,
124,
100,
68,
......@@ -557,18 +556,18 @@ const uint8_t Font12_Table[] =
8,
8,
40,
40,
56,
56,
0,
0,
// 'K'
0,
0,
40,
104,
120,
112,
96,
96,
112,
112,
120,
108,
......@@ -583,32 +582,32 @@ const uint8_t Font12_Table[] =
32,
32,
32,
32,
60,
56,
56,
0,
0,
// 'M'
0,
68,
108,
108,
72,
108,
108,
108,
254,
178,
146,
124,
124,
244,
244,
150,
0,
0,
// 'N'
0,
68,
100,
100,
116,
84,
84,
76,
108,
108,
124,
124,
92,
92,
76,
76,
0,
......@@ -617,11 +616,11 @@ const uint8_t Font12_Table[] =
0,
24,
56,
100,
68,
68,
108,
68,
68,
76,
76,
104,
56,
0,
......@@ -630,24 +629,24 @@ const uint8_t Font12_Table[] =
0,
48,
120,
100,
100,
104,
108,
108,
120,
120,
96,
96,
96,
32,
0,
0,
// 'Q'
0,
24,
60,
100,
56,
56,
108,
68,
68,
68,
84,
92,
124,
60,
0,
......@@ -656,32 +655,32 @@ const uint8_t Font12_Table[] =
0,
112,
120,
76,
76,
72,
104,
104,
120,
88,
72,
68,
120,
120,
104,
108,
0,
0,
// 'S'
0,
24,
56,
60,
36,
32,
40,
48,
56,
12,
4,
108,
8,
76,
104,
56,
0,
0,
// 'T'
0,
124,
56,
120,
16,
16,
16,
......@@ -699,35 +698,35 @@ const uint8_t Font12_Table[] =
68,
68,
68,
68,
108,
104,
56,
0,
0,
// 'V'
0,
68,
68,
108,
40,
104,
40,
40,
56,
48,
48,
16,
0,
0,
// 'W'
0,
146,
146,
146,
190,
236,
108,
108,
150,
182,
244,
124,
124,
108,
108,
104,
0,
0,
// 'X'
......@@ -737,20 +736,20 @@ const uint8_t Font12_Table[] =
40,
56,
16,
48,
56,
40,
104,
108,
68,
0,
0,
// 'Y'
0,
68,
68,
44,
108,
108,
40,
56,
24,
16,
16,
48,
32,
......@@ -759,7 +758,7 @@ const uint8_t Font12_Table[] =
// 'Z'
0,
124,
60,
124,
8,
24,
16,
......@@ -771,17 +770,17 @@ const uint8_t Font12_Table[] =
0,
// '['
56,
32,
32,
32,
32,
32,
32,
32,
32,
32,
32,
56,
48,
48,
48,
48,
48,
48,
48,
48,
48,
48,
16,
// '\'
0,
32,
......@@ -790,30 +789,30 @@ const uint8_t Font12_Table[] =
48,
16,
16,
8,
24,
8,
8,
0,
0,
// ']'
56,
8,
8,
8,
8,
8,
8,
8,
8,
8,
8,
56,
// '^'
24,
24,
24,
24,
24,
24,
24,
24,
24,
24,
24,
16,
40,
0,
// '^'
0,
0,
16,
56,
40,
0,
0,
0,
......@@ -831,13 +830,13 @@ const uint8_t Font12_Table[] =
0,
0,
0,
0,
120,
124,
0,
// '`'
16,
16,
0,
48,
16,
0,
0,
0,
......@@ -851,12 +850,12 @@ const uint8_t Font12_Table[] =
0,
0,
0,
48,
56,
8,
24,
56,
40,
40,
40,
56,
56,
0,
0,
......@@ -864,11 +863,11 @@ const uint8_t Font12_Table[] =
0,
32,
32,
32,
48,
56,
40,
44,
44,
40,
40,
40,
56,
0,
......@@ -879,7 +878,7 @@ const uint8_t Font12_Table[] =
0,
16,
56,
32,
40,
32,
32,
40,
......@@ -890,7 +889,7 @@ const uint8_t Font12_Table[] =
0,
8,
8,
8,
24,
56,
40,
104,
......@@ -906,17 +905,17 @@ const uint8_t Font12_Table[] =
16,
56,
40,
120,
96,
32,
56,
48,
40,
56,
0,
0,
// 'f'
0,
24,
16,
48,
24,
56,
56,
16,
16,
......@@ -932,17 +931,17 @@ const uint8_t Font12_Table[] =
24,
56,
40,
104,
104,
40,
40,
56,
56,
8,
56,
// 'h'
0,
32,
32,
40,
48,
56,
40,
40,
......@@ -966,16 +965,16 @@ const uint8_t Font12_Table[] =
0,
// 'j'
0,
16,
24,
0,
0,
24,
24,
24,
24,
24,
24,
56,
56,
48,
// 'k'
0,
......@@ -983,7 +982,7 @@ const uint8_t Font12_Table[] =
32,
40,
40,
56,
48,
48,
56,
40,
......@@ -1007,25 +1006,25 @@ const uint8_t Font12_Table[] =
0,
0,
0,
36,
40,
252,
214,
214,
214,
214,
214,
212,
212,
212,
212,
84,
0,
0,
// 'n'
0,
0,
0,
0,
16,
56,
40,
40,
40,
44,
40,
40,
0,
0,
......@@ -1035,9 +1034,9 @@ const uint8_t Font12_Table[] =
0,
16,
56,
44,
108,
108,
40,
104,
104,
40,
56,
0,
......@@ -1049,9 +1048,9 @@ const uint8_t Font12_Table[] =
16,
56,
40,
44,
44,
40,
40,
56,
56,
32,
32,
......@@ -1062,8 +1061,8 @@ const uint8_t Font12_Table[] =
8,
56,
40,
104,
104,
40,
40,
40,
56,
8,
......@@ -1074,7 +1073,7 @@ const uint8_t Font12_Table[] =
0,
8,
56,
48,
56,
32,
32,
32,
......@@ -1087,16 +1086,16 @@ const uint8_t Font12_Table[] =
0,
16,
56,
32,
40,
56,
8,
24,
40,
56,
0,
0,
// 't'
0,
16,
0,
16,
56,
56,
......@@ -1127,7 +1126,7 @@ const uint8_t Font12_Table[] =
0,
40,
40,
40,
56,
56,
16,
16,
......@@ -1139,10 +1138,10 @@ const uint8_t Font12_Table[] =
0,
0,
84,
84,
124,
108,
104,
120,
120,
120,
40,
0,
0,
......@@ -1151,7 +1150,7 @@ const uint8_t Font12_Table[] =
0,
0,
0,
40,
44,
56,
16,
56,
......@@ -1164,13 +1163,13 @@ const uint8_t Font12_Table[] =
0,
0,
0,
108,
40,
104,
40,
56,
56,
16,
16,
16,
48,
32,
// 'z'
0,
......@@ -1178,10 +1177,10 @@ const uint8_t Font12_Table[] =
0,
56,
56,
8,
16,
24,
16,
32,
48,
48,
56,
0,
0,
......@@ -1192,11 +1191,11 @@ const uint8_t Font12_Table[] =
16,
16,
48,
48,
16,
16,
16,
16,
16,
24,
8,
// '|'
16,
......@@ -1210,7 +1209,7 @@ const uint8_t Font12_Table[] =
16,
16,
16,
0,
16,
// '}'
48,
16,
......@@ -1218,11 +1217,11 @@ const uint8_t Font12_Table[] =
16,
16,
24,
24,
16,
16,
16,
16,
48,
32,
// '~'
0,
......@@ -1231,7 +1230,7 @@ const uint8_t Font12_Table[] =
0,
0,
32,
116,
124,
88,
0,
0,
......@@ -1239,4 +1238,8 @@ const uint8_t Font12_Table[] =
0,
};
sFONT Font12 = {Font12_Table, 7, 12, };
sFONT Font12 = {
Font12_Table,
7,
12,
};
lib/gfx/Fonts/font16.c
+ 3141
− 1618
View file @ 3010d8eb
This diff is collapsed.
lib/gfx/Fonts/font20.c
+ 3901
− 1998
View file @ 3010d8eb
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment