Bladeren bron

Add new (cleaner) Marlin font

with sources in /fonts
AnHardt 9 jaren geleden
bovenliggende
commit
be79235ef2

+ 176
- 0
Marlin/dogm_font_data_ISO10646_1_Marlin.h Bestand weergeven

@@ -0,0 +1,176 @@
1
+/*
2
+  Fontname: ISO10646-1-Marlin
3
+  Copyright: A.Hardtung, public domain
4
+  Capital A Height: 7, '1' Height: 7
5
+  Calculated Max Values w= 5 h=10 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len= 9
6
+  Font Bounding box     w= 6 h= 9 x= 0 y=-2
7
+  Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
8
+  Pure Font   ascent = 7 descent=-1
9
+  X Font      ascent = 7 descent=-1
10
+  Max Font    ascent = 8 descent=-2
11
+*/
12
+#include <utility/u8g.h>
13
+const u8g_fntpgm_uint8_t ISO10646_1_Marlin_5x7[2596] U8G_SECTION(".progmem.ISO10646_1_Marlin_5x7") = {
14
+  0,6,9,0,254,7,1,146,3,33,32,255,255,8,254,7,
15
+  255,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
16
+  128,128,0,128,3,2,2,6,1,5,160,160,5,7,7,6,
17
+  0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,32,
18
+  120,160,112,40,240,32,5,7,7,6,0,0,192,200,16,32,
19
+  64,152,24,5,7,7,6,0,0,96,144,160,64,168,144,104,
20
+  2,3,3,6,1,4,192,64,128,3,7,7,6,1,0,32,
21
+  64,128,128,128,64,32,3,7,7,6,1,0,128,64,32,32,
22
+  32,64,128,5,5,5,6,0,1,32,168,112,168,32,5,5,
23
+  5,6,0,1,32,32,248,32,32,2,3,3,6,2,255,192,
24
+  64,128,5,1,1,6,0,3,248,2,2,2,6,2,0,192,
25
+  192,5,5,5,6,0,1,8,16,32,64,128,5,7,7,6,
26
+  0,0,112,136,136,136,136,136,112,3,7,7,6,1,0,64,
27
+  192,64,64,64,64,224,5,7,7,6,0,0,112,136,8,112,
28
+  128,128,248,5,7,7,6,0,0,248,16,32,16,8,8,240,
29
+  5,7,7,6,0,0,16,48,80,144,248,16,16,5,7,7,
30
+  6,0,0,248,128,240,8,8,136,112,5,7,7,6,0,0,
31
+  112,128,128,240,136,136,112,5,7,7,6,0,0,248,8,16,
32
+  32,32,32,32,5,7,7,6,0,0,112,136,136,112,136,136,
33
+  112,5,7,7,6,0,0,112,136,136,120,8,8,112,2,5,
34
+  5,6,2,0,192,192,0,192,192,2,6,6,6,2,255,192,
35
+  192,0,192,64,128,4,7,7,6,0,0,16,32,64,128,64,
36
+  32,16,5,3,3,6,0,2,248,0,248,4,7,7,6,1,
37
+  0,128,64,32,16,32,64,128,5,7,7,6,0,0,112,136,
38
+  8,16,32,0,32,5,7,7,6,0,0,112,136,8,104,168,
39
+  168,112,5,7,7,6,0,0,112,136,136,248,136,136,136,5,
40
+  7,7,6,0,0,240,136,136,240,136,136,240,5,7,7,6,
41
+  0,0,112,136,128,128,128,136,112,5,7,7,6,0,0,240,
42
+  136,136,136,136,136,240,5,7,7,6,0,0,248,128,128,240,
43
+  128,128,248,5,7,7,6,0,0,248,128,128,240,128,128,128,
44
+  5,7,7,6,0,0,112,136,128,184,136,136,112,5,7,7,
45
+  6,0,0,136,136,136,248,136,136,136,1,7,7,6,2,0,
46
+  128,128,128,128,128,128,128,5,7,7,6,0,0,56,16,16,
47
+  16,16,144,96,5,7,7,6,0,0,136,144,160,192,160,144,
48
+  136,5,7,7,6,0,0,128,128,128,128,128,128,248,5,7,
49
+  7,6,0,0,136,216,168,136,136,136,136,5,7,7,6,0,
50
+  0,136,136,200,168,152,136,136,5,7,7,6,0,0,112,136,
51
+  136,136,136,136,112,5,7,7,6,0,0,240,136,136,240,128,
52
+  128,128,5,7,7,6,0,0,112,136,136,136,168,144,104,5,
53
+  7,7,6,0,0,240,136,136,240,160,144,136,5,7,7,6,
54
+  0,0,120,128,128,112,8,8,240,5,7,7,6,0,0,248,
55
+  32,32,32,32,32,32,5,7,7,6,0,0,136,136,136,136,
56
+  136,136,112,5,7,7,6,0,0,136,136,136,136,136,80,32,
57
+  5,7,7,6,0,0,136,136,136,136,136,168,80,5,7,7,
58
+  6,0,0,136,136,80,32,80,136,136,5,7,7,6,0,0,
59
+  136,136,136,80,32,32,32,5,7,7,6,0,0,248,8,16,
60
+  32,64,128,248,3,7,7,6,1,0,224,128,128,128,128,128,
61
+  224,5,5,5,6,0,1,128,64,32,16,8,3,7,7,6,
62
+  1,0,224,32,32,32,32,32,224,5,3,3,6,0,4,32,
63
+  80,136,5,1,1,6,0,0,248,2,2,2,6,2,5,128,
64
+  64,5,5,5,6,0,0,112,8,120,136,120,5,7,7,6,
65
+  0,0,128,128,176,200,136,136,240,5,5,5,6,0,0,112,
66
+  128,128,136,112,5,7,7,6,0,0,8,8,104,152,136,136,
67
+  120,5,5,5,6,0,0,112,136,248,128,112,5,7,7,6,
68
+  0,0,48,72,224,64,64,64,64,5,6,6,6,0,255,112,
69
+  136,136,120,8,112,5,7,7,6,0,0,128,128,176,200,136,
70
+  136,136,1,7,7,6,2,0,128,0,128,128,128,128,128,3,
71
+  8,8,6,1,255,32,0,32,32,32,32,160,64,4,7,7,
72
+  6,0,0,128,128,144,160,192,160,144,3,7,7,6,1,0,
73
+  192,64,64,64,64,64,224,5,5,5,6,0,0,208,168,168,
74
+  168,168,5,5,5,6,0,0,176,200,136,136,136,5,5,5,
75
+  6,0,0,112,136,136,136,112,5,6,6,6,0,255,240,136,
76
+  136,240,128,128,5,6,6,6,0,255,120,136,136,120,8,8,
77
+  5,5,5,6,0,0,176,200,128,128,128,5,5,5,6,0,
78
+  0,112,128,112,8,240,4,7,7,6,0,0,64,64,224,64,
79
+  64,64,48,5,5,5,6,0,0,136,136,136,152,104,5,5,
80
+  5,6,0,0,136,136,136,80,32,5,5,5,6,0,0,136,
81
+  136,168,168,80,5,5,5,6,0,0,136,80,32,80,136,5,
82
+  6,6,6,0,255,136,136,136,120,8,112,5,5,5,6,0,
83
+  0,248,16,32,64,248,3,7,7,6,1,0,32,64,64,128,
84
+  64,64,32,1,7,7,6,2,0,128,128,128,128,128,128,128,
85
+  3,7,7,6,1,0,128,64,64,32,64,64,128,5,2,2,
86
+  6,0,2,104,144,0,0,0,6,0,0,0,0,0,6,0,
87
+  0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
88
+  6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
89
+  0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
90
+  0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
91
+  6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
92
+  0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
93
+  0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
94
+  6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
95
+  0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
96
+  0,0,0,0,6,0,0,0,0,0,6,0,0,0,0,0,
97
+  6,0,0,0,0,0,6,0,0,0,0,0,6,0,0,0,
98
+  0,0,6,0,0,0,0,0,6,0,0,0,0,0,6,0,
99
+  0,1,7,7,6,2,0,128,0,128,128,128,128,128,5,7,
100
+  7,6,0,0,32,112,168,160,168,112,32,5,7,7,6,0,
101
+  0,48,64,64,224,64,80,168,5,5,5,6,0,0,136,112,
102
+  80,112,136,5,7,7,6,0,0,136,80,32,248,32,248,32,
103
+  1,7,7,6,2,0,128,128,128,0,128,128,128,5,8,8,
104
+  6,0,0,48,72,32,80,80,32,144,96,3,1,1,6,1,
105
+  7,160,5,7,7,6,0,0,248,136,184,184,184,136,248,5,
106
+  7,7,6,0,1,112,8,120,136,120,0,248,5,5,5,6,
107
+  0,1,40,80,160,80,40,5,3,3,6,0,1,248,8,8,
108
+  2,2,2,6,2,6,64,128,5,7,7,6,0,0,248,136,
109
+  168,136,152,168,248,5,1,1,6,0,6,248,4,4,4,6,
110
+  0,3,96,144,144,96,5,7,7,6,0,0,32,32,248,32,
111
+  32,0,248,4,5,5,6,0,3,96,144,32,64,240,3,5,
112
+  5,6,0,3,224,32,224,32,224,2,2,2,6,2,6,64,
113
+  128,5,8,8,6,0,255,136,136,136,136,152,232,128,128,5,
114
+  7,7,6,0,0,120,152,152,120,24,24,24,2,2,2,6,
115
+  2,2,192,192,2,2,2,6,2,255,64,128,3,5,5,6,
116
+  0,3,64,192,64,64,224,5,7,7,6,0,1,112,136,136,
117
+  136,112,0,248,5,5,5,6,0,1,160,80,40,80,160,5,
118
+  7,7,6,0,0,136,144,168,88,184,8,8,5,7,7,6,
119
+  0,0,136,144,184,72,152,32,56,5,8,8,6,0,0,192,
120
+  64,192,72,216,56,8,8,5,7,7,6,0,0,32,0,32,
121
+  64,128,136,112,5,8,8,6,0,0,64,32,0,112,136,248,
122
+  136,136,5,8,8,6,0,0,16,32,0,112,136,248,136,136,
123
+  5,8,8,6,0,0,32,80,0,112,136,248,136,136,5,8,
124
+  8,6,0,0,104,144,0,112,136,248,136,136,5,8,8,6,
125
+  0,0,80,0,112,136,136,248,136,136,5,8,8,6,0,0,
126
+  32,80,32,112,136,248,136,136,5,7,7,6,0,0,56,96,
127
+  160,184,224,160,184,5,8,8,6,0,255,112,136,128,128,136,
128
+  112,32,96,5,8,8,6,0,0,64,32,0,248,128,240,128,
129
+  248,5,8,8,6,0,0,8,16,0,248,128,240,128,248,5,
130
+  8,8,6,0,0,32,80,0,248,128,240,128,248,5,7,7,
131
+  6,0,0,80,0,248,128,240,128,248,3,8,8,6,1,0,
132
+  128,64,0,224,64,64,64,224,3,8,8,6,1,0,32,64,
133
+  0,224,64,64,64,224,3,8,8,6,1,0,64,160,0,224,
134
+  64,64,64,224,3,7,7,6,1,0,160,0,224,64,64,64,
135
+  224,5,7,7,6,0,0,112,72,72,232,72,72,112,5,8,
136
+  8,6,0,0,104,144,0,136,200,168,152,136,5,8,8,6,
137
+  0,0,64,32,112,136,136,136,136,112,5,8,8,6,0,0,
138
+  16,32,112,136,136,136,136,112,5,8,8,6,0,0,32,80,
139
+  0,112,136,136,136,112,5,8,8,6,0,0,104,144,0,112,
140
+  136,136,136,112,5,8,8,6,0,0,80,0,112,136,136,136,
141
+  136,112,5,5,5,6,0,1,136,80,32,80,136,5,8,8,
142
+  6,0,255,16,112,168,168,168,168,112,64,5,8,8,6,0,
143
+  0,64,32,136,136,136,136,136,112,5,8,8,6,0,0,16,
144
+  32,136,136,136,136,136,112,5,8,8,6,0,0,32,80,0,
145
+  136,136,136,136,112,5,8,8,6,0,0,80,0,136,136,136,
146
+  136,136,112,5,8,8,6,0,0,16,32,136,80,32,32,32,
147
+  32,5,9,9,6,0,255,192,64,112,72,72,112,64,64,224,
148
+  4,8,8,6,1,255,96,144,144,160,144,144,224,128,5,8,
149
+  8,6,0,0,64,32,0,112,8,120,136,120,5,8,8,6,
150
+  0,0,16,32,0,112,8,120,136,120,5,8,8,6,0,0,
151
+  32,80,0,112,8,120,136,120,5,8,8,6,0,0,104,144,
152
+  0,112,8,120,136,120,5,7,7,6,0,0,80,0,112,8,
153
+  120,136,120,5,8,8,6,0,0,32,80,32,112,8,120,136,
154
+  120,5,6,6,6,0,0,208,40,120,160,168,80,5,6,6,
155
+  6,0,255,112,128,136,112,32,96,5,8,8,6,0,0,64,
156
+  32,0,112,136,248,128,112,5,8,8,6,0,0,16,32,0,
157
+  112,136,248,128,112,5,8,8,6,0,0,32,80,0,112,136,
158
+  248,128,112,5,7,7,6,0,0,80,0,112,136,248,128,112,
159
+  3,8,8,6,1,0,128,64,0,64,192,64,64,224,3,8,
160
+  8,6,1,0,32,64,0,64,192,64,64,224,3,8,8,6,
161
+  1,0,64,160,0,64,192,64,64,224,3,7,7,6,1,0,
162
+  160,0,64,192,64,64,224,5,7,7,6,0,0,160,64,160,
163
+  16,120,136,112,5,8,8,6,0,0,104,144,0,176,200,136,
164
+  136,136,5,8,8,6,0,0,64,32,0,112,136,136,136,112,
165
+  5,8,8,6,0,0,16,32,0,112,136,136,136,112,5,8,
166
+  8,6,0,0,32,80,0,112,136,136,136,112,5,8,8,6,
167
+  0,0,104,144,0,112,136,136,136,112,5,7,7,6,0,0,
168
+  80,0,112,136,136,136,112,5,5,5,6,0,1,32,0,248,
169
+  0,32,5,8,8,6,0,0,64,240,200,136,136,152,120,16,
170
+  5,8,8,6,0,0,192,248,136,136,136,136,136,248,5,5,
171
+  5,6,0,1,32,48,248,48,32,5,8,8,6,0,0,32,
172
+  112,248,32,32,32,32,224,5,9,9,6,0,255,32,112,168,
173
+  168,184,136,136,112,32,5,9,9,6,0,255,224,128,192,176,
174
+  168,40,48,40,40,5,9,9,6,0,255,248,168,136,136,136,
175
+  136,136,168,248,5,10,10,6,0,254,32,80,80,80,80,136,
176
+  168,168,136,112};

+ 0
- 337
Marlin/dogm_font_data_marlin.h Bestand weergeven

@@ -1,337 +0,0 @@
1
-/*
2
-  Fontname: -Misc-Fixed-Medium-R-Normal--9-90-75-75-C-60-ISO10646-1
3
-  Copyright: Public domain font.  Share and enjoy.
4
-  Capital A Height: 6, '1' Height: 6
5
-  Calculated Max Values w= 6 h= 9 x= 2 y= 7 dx= 6 dy= 0 ascent= 7 len= 9
6
-  Font Bounding box     w= 6 h= 9 x= 0 y=-2
7
-  Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
8
-  Pure Font   ascent = 6 descent=-2
9
-  X Font      ascent = 6 descent=-2
10
-  Max Font    ascent = 7 descent=-2
11
-*/
12
-#include <utility/u8g.h>
13
-const u8g_fntpgm_uint8_t u8g_font_6x9[2300] U8G_SECTION(".progmem.u8g_font_6x9") = {
14
-  0,6,9,0,254,6,1,137,2,254,32,255,254,7,254,6,
15
-  254,0,0,0,6,0,7,1,6,6,6,2,0,128,128,128,
16
-  128,0,128,3,3,3,6,1,3,160,160,160,5,7,7,6,
17
-  0,255,80,80,248,80,248,80,80,5,9,9,6,0,254,32,
18
-  112,168,160,112,40,168,112,32,6,8,8,6,0,255,64,168,
19
-  72,16,32,72,84,8,5,7,7,6,0,255,96,144,144,96,
20
-  152,144,104,1,3,3,6,2,3,128,128,128,2,7,7,6,
21
-  2,255,64,128,128,128,128,128,64,2,7,7,6,2,255,128,
22
-  64,64,64,64,64,128,5,5,5,6,0,0,136,80,248,80,
23
-  136,5,5,5,6,0,0,32,32,248,32,32,2,4,4,6,
24
-  2,254,192,64,64,128,5,1,1,6,0,2,248,2,2,2,
25
-  6,2,0,192,192,4,6,6,6,1,0,16,16,32,64,128,
26
-  128,4,6,6,6,1,0,96,144,144,144,144,96,3,6,6,
27
-  6,1,0,64,192,64,64,64,224,4,6,6,6,1,0,96,
28
-  144,16,32,64,240,4,6,6,6,1,0,240,32,96,16,16,
29
-  224,5,6,6,6,0,0,16,48,80,144,248,16,4,6,6,
30
-  6,1,0,240,128,224,16,16,224,4,6,6,6,1,0,96,
31
-  128,224,144,144,96,4,6,6,6,1,0,240,16,16,32,64,
32
-  64,4,6,6,6,1,0,96,144,96,144,144,96,4,6,6,
33
-  6,1,0,96,144,144,112,16,96,2,5,5,6,2,0,192,
34
-  192,0,192,192,2,7,7,6,2,254,192,192,0,192,64,64,
35
-  128,5,5,5,6,0,0,24,96,128,96,24,5,3,3,6,
36
-  0,1,248,0,248,5,5,5,6,0,0,192,48,8,48,192,
37
-  4,7,7,6,1,0,96,144,16,96,64,0,64,5,6,6,
38
-  6,0,0,112,144,168,176,128,112,5,6,6,6,0,0,32,
39
-  80,136,248,136,136,5,6,6,6,0,0,240,136,240,136,136,
40
-  240,4,6,6,6,1,0,96,144,128,128,144,96,4,6,6,
41
-  6,1,0,224,144,144,144,144,224,4,6,6,6,1,0,240,
42
-  128,224,128,128,240,4,6,6,6,1,0,240,128,224,128,128,
43
-  128,4,6,6,6,1,0,96,144,128,176,144,96,4,6,6,
44
-  6,1,0,144,144,240,144,144,144,3,6,6,6,1,0,224,
45
-  64,64,64,64,224,5,6,6,6,0,0,56,16,16,16,144,
46
-  96,4,6,6,6,1,0,144,160,192,160,144,144,4,6,6,
47
-  6,1,0,128,128,128,128,128,240,5,6,6,6,0,0,136,
48
-  216,168,168,136,136,4,6,6,6,1,0,144,208,176,144,144,
49
-  144,5,6,6,6,0,0,112,136,136,136,136,112,4,6,6,
50
-  6,1,0,224,144,144,224,128,128,4,7,7,6,1,255,96,
51
-  144,144,208,176,96,16,4,6,6,6,1,0,224,144,144,224,
52
-  144,144,4,6,6,6,1,0,96,144,64,32,144,96,5,6,
53
-  6,6,0,0,248,32,32,32,32,32,4,6,6,6,1,0,
54
-  144,144,144,144,144,96,4,6,6,6,1,0,144,144,144,240,
55
-  96,96,5,6,6,6,0,0,136,136,168,168,216,136,5,6,
56
-  6,6,0,0,136,80,32,32,80,136,5,6,6,6,0,0,
57
-  136,136,80,32,32,32,4,6,6,6,1,0,240,16,32,64,
58
-  128,240,3,6,6,6,1,0,224,128,128,128,128,224,4,6,
59
-  6,6,1,0,128,128,64,32,16,16,3,6,6,6,1,0,
60
-  224,32,32,32,32,224,5,3,3,6,0,3,32,80,136,5,
61
-  1,1,6,0,254,248,2,2,2,6,2,4,128,64,4,4,
62
-  4,6,1,0,112,144,144,112,4,6,6,6,1,0,128,128,
63
-  224,144,144,224,4,4,4,6,1,0,112,128,128,112,4,6,
64
-  6,6,1,0,16,16,112,144,144,112,4,4,4,6,1,0,
65
-  96,176,192,112,4,6,6,6,1,0,32,80,64,224,64,64,
66
-  4,6,6,6,1,254,96,144,144,112,16,96,4,6,6,6,
67
-  1,0,128,128,224,144,144,144,3,6,6,6,1,0,64,0,
68
-  192,64,64,224,3,8,8,6,1,254,32,0,96,32,32,32,
69
-  160,64,4,6,6,6,1,0,128,128,160,192,160,144,3,6,
70
-  6,6,1,0,192,64,64,64,64,224,5,4,4,6,0,0,
71
-  208,168,168,136,4,4,4,6,1,0,224,144,144,144,4,4,
72
-  4,6,1,0,96,144,144,96,4,6,6,6,1,254,224,144,
73
-  144,224,128,128,4,6,6,6,1,254,112,144,144,112,16,16,
74
-  4,4,4,6,1,0,160,208,128,128,4,4,4,6,1,0,
75
-  112,192,48,224,4,6,6,6,1,0,64,64,224,64,80,32,
76
-  4,4,4,6,1,0,144,144,144,112,4,4,4,6,1,0,
77
-  144,144,96,96,5,4,4,6,0,0,136,168,168,80,4,4,
78
-  4,6,1,0,144,96,96,144,4,6,6,6,1,254,144,144,
79
-  144,112,144,96,4,4,4,6,1,0,240,32,64,240,3,7,
80
-  7,6,1,0,32,64,64,128,64,64,32,1,7,7,6,2,
81
-  255,128,128,128,128,128,128,128,3,7,7,6,1,0,128,64,
82
-  64,32,64,64,128,4,2,2,6,1,3,80,160,255,255,255,
83
-  255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
84
-  255,255,255,255,255,255,255,255,255,255,255,255,255,255,0,0,
85
-  0,6,0,7,1,6,6,6,2,0,128,0,128,128,128,128,
86
-  4,6,6,6,1,255,32,112,160,160,112,32,5,7,7,6,
87
-  0,255,48,72,64,240,64,64,248,5,5,5,6,0,0,168,
88
-  80,136,80,168,5,6,6,6,0,0,136,80,248,32,248,32,
89
-  1,7,7,6,2,255,128,128,128,0,128,128,128,4,7,7,
90
-  6,1,255,112,128,96,144,96,16,224,3,1,1,6,1,5,
91
-  160,6,7,7,6,0,0,120,132,148,164,148,132,120,3,5,
92
-  5,6,1,1,96,160,96,0,224,5,5,5,6,0,0,40,
93
-  80,160,80,40,4,3,3,6,1,0,240,16,16,4,1,1,
94
-  6,1,2,240,6,7,7,6,0,0,120,132,180,164,164,132,
95
-  120,4,1,1,6,1,5,240,4,3,3,6,1,2,96,144,
96
-  96,5,7,7,6,0,255,32,32,248,32,32,0,248,3,5,
97
-  5,6,1,1,64,160,32,64,224,3,5,5,6,1,1,192,
98
-  32,64,32,192,2,2,2,6,2,4,64,128,4,5,5,6,
99
-  1,255,144,144,176,208,128,5,6,6,6,0,0,120,232,232,
100
-  104,40,40,1,1,1,6,2,2,128,2,2,2,6,2,254,
101
-  64,128,3,5,5,6,1,1,64,192,64,64,224,3,5,5,
102
-  6,1,1,64,160,64,0,224,5,5,5,6,0,0,160,80,
103
-  40,80,160,5,8,8,6,0,255,64,192,64,80,112,48,120,
104
-  16,5,8,8,6,0,255,64,192,64,80,104,8,16,56,5,
105
-  8,8,6,0,255,192,32,64,48,240,48,120,16,4,7,7,
106
-  6,1,0,32,0,32,96,128,144,96,5,7,7,6,0,0,
107
-  64,32,32,80,112,136,136,5,7,7,6,0,0,16,32,32,
108
-  80,112,136,136,5,7,7,6,0,0,32,80,32,80,112,136,
109
-  136,5,7,7,6,0,0,40,80,32,80,112,136,136,5,7,
110
-  7,6,0,0,80,0,32,80,112,136,136,5,7,7,6,0,
111
-  0,32,80,32,80,112,136,136,5,6,6,6,0,0,120,160,
112
-  240,160,160,184,4,8,8,6,1,254,96,144,128,128,144,96,
113
-  32,64,4,7,7,6,1,0,64,32,240,128,224,128,240,4,
114
-  7,7,6,1,0,32,64,240,128,224,128,240,4,7,7,6,
115
-  1,0,32,80,240,128,224,128,240,4,7,7,6,1,0,80,
116
-  0,240,128,224,128,240,3,7,7,6,1,0,128,64,224,64,
117
-  64,64,224,3,7,7,6,1,0,32,64,224,64,64,64,224,
118
-  3,7,7,6,1,0,64,160,224,64,64,64,224,3,7,7,
119
-  6,1,0,160,0,224,64,64,64,224,5,6,6,6,0,0,
120
-  112,72,232,72,72,112,4,7,7,6,1,0,80,160,144,208,
121
-  176,144,144,4,7,7,6,1,0,64,32,96,144,144,144,96,
122
-  4,7,7,6,1,0,32,64,96,144,144,144,96,4,7,7,
123
-  6,1,0,32,80,96,144,144,144,96,4,7,7,6,1,0,
124
-  80,160,96,144,144,144,96,4,7,7,6,1,0,80,0,96,
125
-  144,144,144,96,5,5,5,6,0,0,136,80,32,80,136,4,
126
-  8,8,6,1,255,16,112,176,176,208,208,224,128,4,7,7,
127
-  6,1,0,64,32,144,144,144,144,96,4,7,7,6,1,0,
128
-  32,64,144,144,144,144,96,4,7,7,6,1,0,32,80,144,
129
-  144,144,144,96,4,7,7,6,1,0,80,0,144,144,144,144,
130
-  96,5,7,7,6,0,0,16,32,136,80,32,32,32,4,6,
131
-  6,6,1,0,128,224,144,144,224,128,4,6,6,6,1,0,
132
-  96,144,160,160,144,160,4,7,7,6,1,0,64,32,0,112,
133
-  144,144,112,4,7,7,6,1,0,32,64,0,112,144,144,112,
134
-  4,7,7,6,1,0,32,80,0,112,144,144,112,4,7,7,
135
-  6,1,0,80,160,0,112,144,144,112,4,6,6,6,1,0,
136
-  80,0,112,144,144,112,4,7,7,6,1,0,32,80,32,112,
137
-  144,144,112,5,4,4,6,0,0,112,168,176,120,4,6,6,
138
-  6,1,254,112,128,128,112,32,64,4,7,7,6,1,0,64,
139
-  32,0,96,176,192,112,4,7,7,6,1,0,32,64,0,96,
140
-  176,192,112,4,7,7,6,1,0,32,80,0,96,176,192,112,
141
-  4,6,6,6,1,0,80,0,96,176,192,112,3,7,7,6,
142
-  1,0,128,64,0,192,64,64,224,3,7,7,6,1,0,32,
143
-  64,0,192,64,64,224,3,7,7,6,1,0,64,160,0,192,
144
-  64,64,224,3,6,6,6,1,0,160,0,192,64,64,224,4,
145
-  7,7,6,1,0,48,96,16,112,144,144,96,4,7,7,6,
146
-  1,0,80,160,0,224,144,144,144,4,7,7,6,1,0,64,
147
-  32,0,96,144,144,96,4,7,7,6,1,0,32,64,0,96,
148
-  144,144,96,4,7,7,6,1,0,32,80,0,96,144,144,96,
149
-  4,7,7,6,1,0,80,160,0,96,144,144,96,4,6,6,
150
-  6,1,0,80,0,96,144,144,96,5,5,5,6,0,0,32,
151
-  0,248,0,32,4,4,4,6,1,0,112,176,208,224,4,7,
152
-  7,6,1,0,64,32,0,144,144,144,112,4,7,7,6,1,
153
-  0,32,64,0,144,144,144,112,4,7,7,6,1,0,32,80,
154
-  0,144,144,144,112,4,6,6,6,1,0,80,0,144,144,144,
155
-  112,4,9,9,6,1,254,32,64,0,144,144,144,112,144,96,
156
-  4,8,8,6,1,254,128,128,224,144,144,224,128,128,4,8,
157
-  8,6,1,254,80,0,144,144,144,112,144,96};
158
-
159
-// STB Marlin
160
-/*
161
-  Fontname: u8g_font_6x10_marlin
162
-  Copyright: Public domain terminal emulator font.  Share and enjoy.
163
-  Capital A Height: 7, '1' Height: 7
164
-  Calculated Max Values w= 6 h=10 x= 2 y= 7 dx= 6 dy= 0 ascent= 8 len=10
165
-  Font Bounding box     w= 6 h= 9 x= 0 y=-2
166
-  Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
167
-  Pure Font   ascent = 7 descent=-2
168
-  X Font      ascent = 7 descent=-2
169
-  Max Font    ascent = 8 descent=-2
170
-*/
171
-#include <utility/u8g.h>
172
-const u8g_fntpgm_uint8_t u8g_font_6x10_marlin[2617] U8G_SECTION(".progmem.u8g_font_6x10_marlin") = {
173
-  0,6,9,0,254,7,1,153,3,43,32,255,254,8,254,7,
174
-  254,0,0,0,6,0,0,1,7,7,6,2,0,128,128,128,
175
-  128,128,0,128,3,3,3,6,1,4,160,160,160,5,7,7,
176
-  6,0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,
177
-  32,112,160,112,40,112,32,5,7,7,6,0,0,72,168,80,
178
-  32,80,168,144,5,7,7,6,0,0,64,160,160,64,168,144,
179
-  104,1,3,3,6,2,4,128,128,128,3,7,7,6,1,0,
180
-  32,64,128,128,128,64,32,3,7,7,6,1,0,128,64,32,
181
-  32,32,64,128,5,5,5,6,0,1,136,80,248,80,136,5,
182
-  5,5,6,0,1,32,32,248,32,32,3,3,3,6,1,255,
183
-  96,64,128,5,1,1,6,0,3,248,3,3,3,6,1,255,
184
-  64,224,64,5,7,7,6,0,0,8,8,16,32,64,128,128,
185
-  5,7,7,6,0,0,32,80,136,136,136,80,32,5,7,7,
186
-  6,0,0,32,96,160,32,32,32,248,5,7,7,6,0,0,
187
-  112,136,8,48,64,128,248,5,7,7,6,0,0,248,8,16,
188
-  48,8,136,112,5,7,7,6,0,0,16,48,80,144,248,16,
189
-  16,5,7,7,6,0,0,248,128,176,200,8,136,112,5,7,
190
-  7,6,0,0,48,64,128,176,200,136,112,5,7,7,6,0,
191
-  0,248,8,16,16,32,64,64,5,7,7,6,0,0,112,136,
192
-  136,112,136,136,112,5,7,7,6,0,0,112,136,152,104,8,
193
-  16,96,3,7,7,6,1,255,64,224,64,0,64,224,64,3,
194
-  7,7,6,1,255,64,224,64,0,96,64,128,4,7,7,6,
195
-  1,0,16,32,64,128,64,32,16,5,3,3,6,0,2,248,
196
-  0,248,4,7,7,6,1,0,128,64,32,16,32,64,128,5,
197
-  7,7,6,0,0,112,136,16,32,32,0,32,5,7,7,6,
198
-  0,0,112,136,152,168,176,128,112,5,7,7,6,0,0,32,
199
-  80,136,136,248,136,136,5,7,7,6,0,0,240,72,72,112,
200
-  72,72,240,5,7,7,6,0,0,112,136,128,128,128,136,112,
201
-  5,7,7,6,0,0,240,72,72,72,72,72,240,5,7,7,
202
-  6,0,0,248,128,128,240,128,128,248,5,7,7,6,0,0,
203
-  248,128,128,240,128,128,128,5,7,7,6,0,0,112,136,128,
204
-  128,152,136,112,5,7,7,6,0,0,136,136,136,248,136,136,
205
-  136,3,7,7,6,1,0,224,64,64,64,64,64,224,5,7,
206
-  7,6,0,0,56,16,16,16,16,144,96,5,7,7,6,0,
207
-  0,136,144,160,192,160,144,136,5,7,7,6,0,0,128,128,
208
-  128,128,128,128,248,5,7,7,6,0,0,136,136,216,168,136,
209
-  136,136,5,7,7,6,0,0,136,136,200,168,152,136,136,5,
210
-  7,7,6,0,0,112,136,136,136,136,136,112,5,7,7,6,
211
-  0,0,240,136,136,240,128,128,128,5,8,8,6,0,255,112,
212
-  136,136,136,136,168,112,8,5,7,7,6,0,0,240,136,136,
213
-  240,160,144,136,5,7,7,6,0,0,112,136,128,112,8,136,
214
-  112,5,7,7,6,0,0,248,32,32,32,32,32,32,5,7,
215
-  7,6,0,0,136,136,136,136,136,136,112,5,7,7,6,0,
216
-  0,136,136,136,80,80,80,32,5,7,7,6,0,0,136,136,
217
-  136,168,168,216,136,5,7,7,6,0,0,136,136,80,32,80,
218
-  136,136,5,7,7,6,0,0,136,136,80,32,32,32,32,5,
219
-  7,7,6,0,0,248,8,16,32,64,128,248,3,7,7,6,
220
-  1,0,224,128,128,128,128,128,224,5,7,7,6,0,0,128,
221
-  128,64,32,16,8,8,3,7,7,6,1,0,224,32,32,32,
222
-  32,32,224,5,3,3,6,0,4,32,80,136,5,1,1,6,
223
-  0,255,248,2,2,2,6,2,6,128,64,5,5,5,6,0,
224
-  0,112,8,120,136,120,5,7,7,6,0,0,128,128,176,200,
225
-  136,200,176,5,5,5,6,0,0,112,136,128,136,112,5,7,
226
-  7,6,0,0,8,8,104,152,136,152,104,5,5,5,6,0,
227
-  0,112,136,248,128,112,5,7,7,6,0,0,48,72,64,240,
228
-  64,64,64,5,7,7,6,0,254,120,136,136,120,8,136,112,
229
-  5,7,7,6,0,0,128,128,176,200,136,136,136,3,7,7,
230
-  6,1,0,64,0,192,64,64,64,224,4,9,9,6,1,254,
231
-  16,0,48,16,16,16,144,144,96,5,7,7,6,0,0,128,
232
-  128,136,144,224,144,136,3,7,7,6,1,0,192,64,64,64,
233
-  64,64,224,5,5,5,6,0,0,208,168,168,168,136,5,5,
234
-  5,6,0,0,176,200,136,136,136,5,5,5,6,0,0,112,
235
-  136,136,136,112,5,7,7,6,0,254,176,200,136,200,176,128,
236
-  128,5,7,7,6,0,254,104,152,136,152,104,8,8,5,5,
237
-  5,6,0,0,176,200,128,128,128,5,5,5,6,0,0,112,
238
-  128,112,8,240,5,7,7,6,0,0,64,64,240,64,64,72,
239
-  48,5,5,5,6,0,0,136,136,136,152,104,5,5,5,6,
240
-  0,0,136,136,80,80,32,5,5,5,6,0,0,136,136,168,
241
-  168,80,5,5,5,6,0,0,136,80,32,80,136,5,7,7,
242
-  6,0,254,136,136,152,104,8,136,112,5,5,5,6,0,0,
243
-  248,16,32,64,248,4,7,7,6,1,0,48,64,32,192,32,
244
-  64,48,1,7,7,6,2,0,128,128,128,128,128,128,128,4,
245
-  7,7,6,1,0,192,32,64,48,64,32,192,5,3,3,6,
246
-  0,4,72,168,144,0,0,0,1,0,0,0,0,0,1,0,
247
-  0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
248
-  1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
249
-  0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,
250
-  0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
251
-  1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
252
-  0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,
253
-  0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
254
-  1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
255
-  0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,
256
-  0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,
257
-  1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,
258
-  0,0,1,0,0,0,0,0,1,0,0,0,0,0,6,0,
259
-  0,1,7,7,6,2,0,128,0,128,128,128,128,128,5,7,
260
-  7,6,0,255,32,120,160,160,160,120,32,5,7,7,6,0,
261
-  0,48,72,64,224,64,72,176,5,5,5,6,0,0,136,112,
262
-  80,112,136,5,8,8,6,0,255,136,136,80,32,248,32,32,
263
-  32,1,7,7,6,2,0,128,128,128,0,128,128,128,5,8,
264
-  8,6,0,255,112,128,224,144,72,56,8,112,3,1,1,6,
265
-  1,7,160,5,7,7,6,0,0,112,136,168,200,168,136,112,
266
-  4,6,6,6,1,1,112,144,176,80,0,240,6,5,5,6,
267
-  0,0,36,72,144,72,36,4,2,2,6,1,2,240,16,4,
268
-  1,1,6,1,3,240,5,7,7,6,0,0,112,136,232,200,
269
-  200,136,112,5,1,1,6,0,7,248,3,3,3,6,1,4,
270
-  64,160,64,5,6,6,6,0,0,32,32,248,32,32,248,4,
271
-  5,5,6,1,3,96,144,32,64,240,4,5,5,6,1,3,
272
-  224,16,96,16,224,2,2,2,6,2,6,64,128,5,6,6,
273
-  6,0,255,136,136,136,200,176,128,5,7,7,6,0,0,120,
274
-  232,232,104,40,40,40,1,1,1,6,2,3,128,2,2,2,
275
-  6,2,254,64,128,3,5,5,6,1,3,64,192,64,64,224,
276
-  4,6,6,6,1,1,96,144,144,96,0,240,6,5,5,6,
277
-  0,0,144,72,36,72,144,6,9,9,6,0,255,64,192,64,
278
-  64,228,12,20,60,4,6,9,9,6,0,255,64,192,64,64,
279
-  232,20,4,8,28,5,9,9,6,0,255,192,32,64,32,200,
280
-  24,40,120,8,5,7,7,6,0,0,32,0,32,32,64,136,
281
-  112,5,8,8,6,0,0,64,32,112,136,136,248,136,136,5,
282
-  8,8,6,0,0,16,32,112,136,136,248,136,136,5,8,8,
283
-  6,0,0,32,80,112,136,136,248,136,136,5,8,8,6,0,
284
-  0,72,176,112,136,136,248,136,136,5,8,8,6,0,0,80,
285
-  0,112,136,136,248,136,136,5,8,8,6,0,0,32,80,112,
286
-  136,136,248,136,136,6,7,7,6,0,0,60,80,144,156,240,
287
-  144,156,5,9,9,6,0,254,112,136,128,128,128,136,112,32,
288
-  64,5,8,8,6,0,0,64,248,128,128,240,128,128,248,5,
289
-  8,8,6,0,0,16,248,128,128,240,128,128,248,5,8,8,
290
-  6,0,0,32,248,128,128,240,128,128,248,5,8,8,6,0,
291
-  0,80,248,128,128,240,128,128,248,3,8,8,6,1,0,128,
292
-  64,224,64,64,64,64,224,3,8,8,6,1,0,32,64,224,
293
-  64,64,64,64,224,3,8,8,6,1,0,64,160,224,64,64,
294
-  64,64,224,3,8,8,6,1,0,160,0,224,64,64,64,64,
295
-  224,5,7,7,6,0,0,240,72,72,232,72,72,240,5,8,
296
-  8,6,0,0,40,80,136,200,168,152,136,136,5,8,8,6,
297
-  0,0,64,32,112,136,136,136,136,112,5,8,8,6,0,0,
298
-  16,32,112,136,136,136,136,112,5,8,8,6,0,0,32,80,
299
-  112,136,136,136,136,112,5,8,8,6,0,0,40,80,112,136,
300
-  136,136,136,112,5,8,8,6,0,0,80,0,112,136,136,136,
301
-  136,112,5,5,5,6,0,0,136,80,32,80,136,5,7,7,
302
-  6,0,0,112,152,152,168,200,200,112,5,8,8,6,0,0,
303
-  64,32,136,136,136,136,136,112,5,8,8,6,0,0,16,32,
304
-  136,136,136,136,136,112,5,8,8,6,0,0,32,80,0,136,
305
-  136,136,136,112,5,8,8,6,0,0,80,0,136,136,136,136,
306
-  136,112,5,8,8,6,0,0,16,32,136,136,80,32,32,32,
307
-  5,7,7,6,0,0,128,240,136,240,128,128,128,5,7,7,
308
-  6,0,0,112,136,144,160,144,136,176,5,8,8,6,0,0,
309
-  64,32,0,112,8,120,136,120,5,8,8,6,0,0,16,32,
310
-  0,112,8,120,136,120,5,8,8,6,0,0,32,80,0,112,
311
-  8,120,136,120,5,8,8,6,0,0,40,80,0,112,8,120,
312
-  136,120,5,7,7,6,0,0,80,0,112,8,120,136,120,5,
313
-  8,8,6,0,0,32,80,32,112,8,120,136,120,6,5,5,
314
-  6,0,0,120,20,124,144,124,5,7,7,6,0,254,112,136,
315
-  128,136,112,32,64,5,8,8,6,0,0,64,32,0,112,136,
316
-  248,128,112,5,8,8,6,0,0,16,32,0,112,136,248,128,
317
-  112,5,8,8,6,0,0,32,80,0,112,136,248,128,112,5,
318
-  7,7,6,0,0,80,0,112,136,248,128,112,3,8,8,6,
319
-  1,0,128,64,0,192,64,64,64,224,3,8,8,6,1,0,
320
-  64,128,0,192,64,64,64,224,3,8,8,6,1,0,64,160,
321
-  0,192,64,64,64,224,6,10,10,6,0,254,164,168,0,252,
322
-  132,128,128,128,132,252,6,10,10,6,0,254,84,148,0,252,
323
-  132,4,4,4,132,252,5,8,8,6,0,0,40,80,0,176,
324
-  200,136,136,136,5,8,8,6,0,0,64,32,0,112,136,136,
325
-  136,112,4,10,10,6,2,254,48,64,128,144,144,144,144,144,
326
-  144,144,4,10,10,6,0,254,192,32,16,144,144,144,144,144,
327
-  144,144,6,7,7,6,0,1,68,140,140,132,128,64,60,6,
328
-  7,7,6,0,1,136,196,196,132,4,8,240,5,5,5,6,
329
-  0,1,32,0,248,0,32,5,8,8,6,0,0,64,240,200,
330
-  136,136,152,120,16,5,8,8,6,0,0,224,248,136,136,136,
331
-  136,136,248,5,5,5,6,0,1,32,48,248,48,32,5,8,
332
-  8,6,0,0,32,112,248,32,32,32,32,224,5,9,9,6,
333
-  0,255,32,112,168,168,184,136,136,80,32,5,9,9,6,0,
334
-  255,224,128,192,176,168,168,48,40,40,5,9,9,6,0,255,
335
-  248,168,136,136,136,136,136,168,248,5,10,10,6,0,254,32,
336
-  80,80,80,80,136,168,168,136,112};
337
-  

+ 3
- 3
Marlin/dogm_lcd_implementation.h Bestand weergeven

@@ -32,7 +32,7 @@
32 32
 
33 33
 #include <U8glib.h>
34 34
 #include "DOGMbitmaps.h"
35
-#include "dogm_font_data_marlin.h"
35
+#include "dogm_font_data_ISO10646_1_Marlin.h"
36 36
 #include "ultralcd.h"
37 37
 #include "ultralcd_st7920_u8glib_rrd.h"
38 38
 
@@ -48,7 +48,7 @@
48 48
 */
49 49
 
50 50
 #define USE_BIG_EDIT_FONT                // save 3120 bytes of PROGMEM by commenting out this line
51
-#define FONT_MENU u8g_font_6x10_marlin
51
+#define FONT_MENU ISO10646_1_Marlin_5x7
52 52
 
53 53
 // DOGM parameters (size in pixels)
54 54
 #define DOG_CHAR_WIDTH         6
@@ -59,7 +59,7 @@
59 59
   #define DOG_CHAR_HEIGHT_EDIT 18
60 60
   #define LCD_WIDTH_EDIT       14
61 61
 #else
62
-  #define FONT_MENU_EDIT u8g_font_6x10_marlin
62
+  #define FONT_MENU_EDIT ISO10646_1_Marlin_5x7
63 63
   #define DOG_CHAR_WIDTH_EDIT  6
64 64
   #define DOG_CHAR_HEIGHT_EDIT 12
65 65
   #define LCD_WIDTH_EDIT       22

BIN
Marlin/fonts/ISO10646-1-Marlin.fon Bestand weergeven


BIN
Marlin/fonts/ISO10646-1.fon Bestand weergeven


BIN
Marlin/fonts/Marlin_symbols.fon Bestand weergeven


+ 8
- 0
Marlin/fonts/make_fonts.bat Bestand weergeven

@@ -0,0 +1,8 @@
1
+.\bdf2u8g.exe -b 1 -e 9 Marlin_symbols.bdf Marlin_symbols dogm_font_data_Marlin_symbols.h
2
+.\bdf2u8g.exe -b 16 -e 255 HD44780_W.bdf HD44780_W_5x7 dogm_font_data_HD44780_W.h
3
+.\bdf2u8g.exe -b 32 -e 255 HD44780_C.bdf HD44780_C_5x7 dogm_font_data_HD44780_C.h
4
+.\bdf2u8g.exe -b 32 -e 255 HD44780_J.bdf HD44780_J_5x7 dogm_font_data_HD44780_J.h
5
+.\bdf2u8g.exe -b 32 -e 255 ISO10646-1.bdf ISO10646_1_5x7 dogm_font_data_ISO10646_1.h
6
+.\bdf2u8g.exe -b 32 -e 255 ISO10646-1-Marlin.bdf ISO10646_1_Marlin_5x7 dogm_font_data_ISO10646_1_Marlin.h
7
+.\bdf2u8g.exe -b 32 -e 255 ISO10646_5_Cyrillic.bdf ISO10646_5_Cyrillic_5x7 dogm_font_data_ISO10646_5_Cyrillic.h
8
+.\bdf2u8g.exe -b 32 -e 255 ISO10646_Kana.bdf ISO10646_Kana_5x7 dogm_font_data_ISO10646_Kana.h

Laden…
Annuleren
Opslaan