Skip to content
Snippets Groups Projects
Commit be820c07 authored by fleur's avatar fleur Committed by rahix
Browse files

feat(gfx): Cleanup fonts

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