Skip to content
Snippets Groups Projects
Verified Commit bedbbd1c authored by rahix's avatar rahix
Browse files

Merge 'Font Cleanup' 

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