浏览代码

Restore ° to 6x9 small info font (#19645)

ellensp 4 年前
父节点
当前提交
c12f41ec6f
没有帐户链接到提交者的电子邮件
共有 3 个文件被更改,包括 16762 次插入148 次删除
  1. 1
    1
      Marlin/Configuration_adv.h
  2. 155
    147
      Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
  3. 16606
    0
      buildroot/share/fonts/marlin-6x9.bdf

+ 1
- 1
Marlin/Configuration_adv.h 查看文件

@@ -1377,7 +1377,7 @@
1377 1377
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
1378 1378
   //#define USE_BIG_EDIT_FONT
1379 1379
 
1380
-  // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM.
1380
+  // A smaller font may be used on the Info Screen. Costs 2434 bytes of PROGMEM.
1381 1381
   // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese.
1382 1382
   //#define USE_SMALL_INFOFONT
1383 1383
 

+ 155
- 147
Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h 查看文件

@@ -25,7 +25,7 @@
25 25
   Fontname: -Misc-Fixed-Medium-R-Normal--9-90-75-75-C-60-ISO10646-1
26 26
   Copyright: Public domain font.  Share and enjoy.
27 27
   Capital A Height: 6, '1' Height: 6
28
-  Calculated Max Values w= 6 h= 9 x= 2 y= 7 dx= 6 dy= 0 ascent= 7 len= 9
28
+  Calculated Max Values w= 6 h= 9 x= 5 y= 5 dx= 6 dy= 0 ascent= 7 len= 9
29 29
   Font Bounding box     w= 6 h= 9 x= 0 y=-2
30 30
   Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
31 31
   Pure Font   ascent = 6 descent=-2
@@ -33,149 +33,157 @@
33 33
   Max Font    ascent = 7 descent=-2
34 34
 */
35 35
 #include <U8glib.h>
36
-const u8g_fntpgm_uint8_t u8g_font_6x9[2300] U8G_FONT_SECTION(".progmem.u8g_font_6x9") = {
37
-  0, 6, 9, 0, 254, 6, 1, 137, 2, 254, 32, 255, 254, 7, 254, 6,
38
-  254, 0, 0, 0, 6, 0, 7, 1, 6, 6, 6, 2, 0, 128, 128, 128,
39
-  128, 0, 128, 3, 3, 3, 6, 1, 3, 160, 160, 160, 5, 7, 7, 6,
40
-  0, 255, 80, 80, 248, 80, 248, 80, 80, 5, 9, 9, 6, 0, 254, 32,
41
-  112, 168, 160, 112, 40, 168, 112, 32, 6, 8, 8, 6, 0, 255, 64, 168,
42
-  72, 16, 32, 72, 84, 8, 5, 7, 7, 6, 0, 255, 96, 144, 144, 96,
43
-  152, 144, 104, 1, 3, 3, 6, 2, 3, 128, 128, 128, 2, 7, 7, 6,
44
-  2, 255, 64, 128, 128, 128, 128, 128, 64, 2, 7, 7, 6, 2, 255, 128,
45
-  64, 64, 64, 64, 64, 128, 5, 5, 5, 6, 0, 0, 136, 80, 248, 80,
46
-  136, 5, 5, 5, 6, 0, 0, 32, 32, 248, 32, 32, 2, 4, 4, 6,
47
-  2, 254, 192, 64, 64, 128, 5, 1, 1, 6, 0, 2, 248, 2, 2, 2,
48
-  6, 2, 0, 192, 192, 4, 6, 6, 6, 1, 0, 16, 16, 32, 64, 128,
49
-  128, 4, 6, 6, 6, 1, 0, 96, 144, 144, 144, 144, 96, 3, 6, 6,
50
-  6, 1, 0, 64, 192, 64, 64, 64, 224, 4, 6, 6, 6, 1, 0, 96,
51
-  144, 16, 32, 64, 240, 4, 6, 6, 6, 1, 0, 240, 32, 96, 16, 16,
52
-  224, 5, 6, 6, 6, 0, 0, 16, 48, 80, 144, 248, 16, 4, 6, 6,
53
-  6, 1, 0, 240, 128, 224, 16, 16, 224, 4, 6, 6, 6, 1, 0, 96,
54
-  128, 224, 144, 144, 96, 4, 6, 6, 6, 1, 0, 240, 16, 16, 32, 64,
55
-  64, 4, 6, 6, 6, 1, 0, 96, 144, 96, 144, 144, 96, 4, 6, 6,
56
-  6, 1, 0, 96, 144, 144, 112, 16, 96, 2, 5, 5, 6, 2, 0, 192,
57
-  192, 0, 192, 192, 2, 7, 7, 6, 2, 254, 192, 192, 0, 192, 64, 64,
58
-  128, 5, 5, 5, 6, 0, 0, 24, 96, 128, 96, 24, 5, 3, 3, 6,
59
-  0, 1, 248, 0, 248, 5, 5, 5, 6, 0, 0, 192, 48, 8, 48, 192,
60
-  4, 7, 7, 6, 1, 0, 96, 144, 16, 96, 64, 0, 64, 5, 6, 6,
61
-  6, 0, 0, 112, 144, 168, 176, 128, 112, 5, 6, 6, 6, 0, 0, 32,
62
-  80, 136, 248, 136, 136, 5, 6, 6, 6, 0, 0, 240, 136, 240, 136, 136,
63
-  240, 4, 6, 6, 6, 1, 0, 96, 144, 128, 128, 144, 96, 4, 6, 6,
64
-  6, 1, 0, 224, 144, 144, 144, 144, 224, 4, 6, 6, 6, 1, 0, 240,
65
-  128, 224, 128, 128, 240, 4, 6, 6, 6, 1, 0, 240, 128, 224, 128, 128,
66
-  128, 4, 6, 6, 6, 1, 0, 96, 144, 128, 176, 144, 96, 4, 6, 6,
67
-  6, 1, 0, 144, 144, 240, 144, 144, 144, 3, 6, 6, 6, 1, 0, 224,
68
-  64, 64, 64, 64, 224, 5, 6, 6, 6, 0, 0, 56, 16, 16, 16, 144,
69
-  96, 4, 6, 6, 6, 1, 0, 144, 160, 192, 160, 144, 144, 4, 6, 6,
70
-  6, 1, 0, 128, 128, 128, 128, 128, 240, 5, 6, 6, 6, 0, 0, 136,
71
-  216, 168, 168, 136, 136, 4, 6, 6, 6, 1, 0, 144, 208, 176, 144, 144,
72
-  144, 5, 6, 6, 6, 0, 0, 112, 136, 136, 136, 136, 112, 4, 6, 6,
73
-  6, 1, 0, 224, 144, 144, 224, 128, 128, 4, 7, 7, 6, 1, 255, 96,
74
-  144, 144, 208, 176, 96, 16, 4, 6, 6, 6, 1, 0, 224, 144, 144, 224,
75
-  144, 144, 4, 6, 6, 6, 1, 0, 96, 144, 64, 32, 144, 96, 5, 6,
76
-  6, 6, 0, 0, 248, 32, 32, 32, 32, 32, 4, 6, 6, 6, 1, 0,
77
-  144, 144, 144, 144, 144, 96, 4, 6, 6, 6, 1, 0, 144, 144, 144, 240,
78
-  96, 96, 5, 6, 6, 6, 0, 0, 136, 136, 168, 168, 216, 136, 5, 6,
79
-  6, 6, 0, 0, 136, 80, 32, 32, 80, 136, 5, 6, 6, 6, 0, 0,
80
-  136, 136, 80, 32, 32, 32, 4, 6, 6, 6, 1, 0, 240, 16, 32, 64,
81
-  128, 240, 3, 6, 6, 6, 1, 0, 224, 128, 128, 128, 128, 224, 4, 6,
82
-  6, 6, 1, 0, 128, 128, 64, 32, 16, 16, 3, 6, 6, 6, 1, 0,
83
-  224, 32, 32, 32, 32, 224, 5, 3, 3, 6, 0, 3, 32, 80, 136, 5,
84
-  1, 1, 6, 0, 254, 248, 2, 2, 2, 6, 2, 4, 128, 64, 4, 4,
85
-  4, 6, 1, 0, 112, 144, 144, 112, 4, 6, 6, 6, 1, 0, 128, 128,
86
-  224, 144, 144, 224, 4, 4, 4, 6, 1, 0, 112, 128, 128, 112, 4, 6,
87
-  6, 6, 1, 0, 16, 16, 112, 144, 144, 112, 4, 4, 4, 6, 1, 0,
88
-  96, 176, 192, 112, 4, 6, 6, 6, 1, 0, 32, 80, 64, 224, 64, 64,
89
-  4, 6, 6, 6, 1, 254, 96, 144, 144, 112, 16, 96, 4, 6, 6, 6,
90
-  1, 0, 128, 128, 224, 144, 144, 144, 3, 6, 6, 6, 1, 0, 64, 0,
91
-  192, 64, 64, 224, 3, 8, 8, 6, 1, 254, 32, 0, 96, 32, 32, 32,
92
-  160, 64, 4, 6, 6, 6, 1, 0, 128, 128, 160, 192, 160, 144, 3, 6,
93
-  6, 6, 1, 0, 192, 64, 64, 64, 64, 224, 5, 4, 4, 6, 0, 0,
94
-  208, 168, 168, 136, 4, 4, 4, 6, 1, 0, 224, 144, 144, 144, 4, 4,
95
-  4, 6, 1, 0, 96, 144, 144, 96, 4, 6, 6, 6, 1, 254, 224, 144,
96
-  144, 224, 128, 128, 4, 6, 6, 6, 1, 254, 112, 144, 144, 112, 16, 16,
97
-  4, 4, 4, 6, 1, 0, 160, 208, 128, 128, 4, 4, 4, 6, 1, 0,
98
-  112, 192, 48, 224, 4, 6, 6, 6, 1, 0, 64, 64, 224, 64, 80, 32,
99
-  4, 4, 4, 6, 1, 0, 144, 144, 144, 112, 4, 4, 4, 6, 1, 0,
100
-  144, 144, 96, 96, 5, 4, 4, 6, 0, 0, 136, 168, 168, 80, 4, 4,
101
-  4, 6, 1, 0, 144, 96, 96, 144, 4, 6, 6, 6, 1, 254, 144, 144,
102
-  144, 112, 144, 96, 4, 4, 4, 6, 1, 0, 240, 32, 64, 240, 3, 7,
103
-  7, 6, 1, 0, 32, 64, 64, 128, 64, 64, 32, 1, 7, 7, 6, 2,
104
-  255, 128, 128, 128, 128, 128, 128, 128, 3, 7, 7, 6, 1, 0, 128, 64,
105
-  64, 32, 64, 64, 128, 4, 2, 2, 6, 1, 3, 80, 160, 255, 255, 255,
106
-  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
107
-  255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0,
108
-  0, 6, 0, 7, 1, 6, 6, 6, 2, 0, 128, 0, 128, 128, 128, 128,
109
-  4, 6, 6, 6, 1, 255, 32, 112, 160, 160, 112, 32, 5, 7, 7, 6,
110
-  0, 255, 48, 72, 64, 240, 64, 64, 248, 5, 5, 5, 6, 0, 0, 168,
111
-  80, 136, 80, 168, 5, 6, 6, 6, 0, 0, 136, 80, 248, 32, 248, 32,
112
-  1, 7, 7, 6, 2, 255, 128, 128, 128, 0, 128, 128, 128, 4, 7, 7,
113
-  6, 1, 255, 112, 128, 96, 144, 96, 16, 224, 3, 1, 1, 6, 1, 5,
114
-  160, 6, 7, 7, 6, 0, 0, 120, 132, 148, 164, 148, 132, 120, 3, 5,
115
-  5, 6, 1, 1, 96, 160, 96, 0, 224, 5, 5, 5, 6, 0, 0, 40,
116
-  80, 160, 80, 40, 4, 3, 3, 6, 1, 0, 240, 16, 16, 4, 1, 1,
117
-  6, 1, 2, 240, 6, 7, 7, 6, 0, 0, 120, 132, 180, 164, 164, 132,
118
-  120, 4, 1, 1, 6, 1, 5, 240, 4, 3, 3, 6, 1, 2, 96, 144,
119
-  96, 5, 7, 7, 6, 0, 255, 32, 32, 248, 32, 32, 0, 248, 3, 5,
120
-  5, 6, 1, 1, 64, 160, 32, 64, 224, 3, 5, 5, 6, 1, 1, 192,
121
-  32, 64, 32, 192, 2, 2, 2, 6, 2, 4, 64, 128, 4, 5, 5, 6,
122
-  1, 255, 144, 144, 176, 208, 128, 5, 6, 6, 6, 0, 0, 120, 232, 232,
123
-  104, 40, 40, 1, 1, 1, 6, 2, 2, 128, 2, 2, 2, 6, 2, 254,
124
-  64, 128, 3, 5, 5, 6, 1, 1, 64, 192, 64, 64, 224, 3, 5, 5,
125
-  6, 1, 1, 64, 160, 64, 0, 224, 5, 5, 5, 6, 0, 0, 160, 80,
126
-  40, 80, 160, 5, 8, 8, 6, 0, 255, 64, 192, 64, 80, 112, 48, 120,
127
-  16, 5, 8, 8, 6, 0, 255, 64, 192, 64, 80, 104, 8, 16, 56, 5,
128
-  8, 8, 6, 0, 255, 192, 32, 64, 48, 240, 48, 120, 16, 4, 7, 7,
129
-  6, 1, 0, 32, 0, 32, 96, 128, 144, 96, 5, 7, 7, 6, 0, 0,
130
-  64, 32, 32, 80, 112, 136, 136, 5, 7, 7, 6, 0, 0, 16, 32, 32,
131
-  80, 112, 136, 136, 5, 7, 7, 6, 0, 0, 32, 80, 32, 80, 112, 136,
132
-  136, 5, 7, 7, 6, 0, 0, 40, 80, 32, 80, 112, 136, 136, 5, 7,
133
-  7, 6, 0, 0, 80, 0, 32, 80, 112, 136, 136, 5, 7, 7, 6, 0,
134
-  0, 32, 80, 32, 80, 112, 136, 136, 5, 6, 6, 6, 0, 0, 120, 160,
135
-  240, 160, 160, 184, 4, 8, 8, 6, 1, 254, 96, 144, 128, 128, 144, 96,
136
-  32, 64, 4, 7, 7, 6, 1, 0, 64, 32, 240, 128, 224, 128, 240, 4,
137
-  7, 7, 6, 1, 0, 32, 64, 240, 128, 224, 128, 240, 4, 7, 7, 6,
138
-  1, 0, 32, 80, 240, 128, 224, 128, 240, 4, 7, 7, 6, 1, 0, 80,
139
-  0, 240, 128, 224, 128, 240, 3, 7, 7, 6, 1, 0, 128, 64, 224, 64,
140
-  64, 64, 224, 3, 7, 7, 6, 1, 0, 32, 64, 224, 64, 64, 64, 224,
141
-  3, 7, 7, 6, 1, 0, 64, 160, 224, 64, 64, 64, 224, 3, 7, 7,
142
-  6, 1, 0, 160, 0, 224, 64, 64, 64, 224, 5, 6, 6, 6, 0, 0,
143
-  112, 72, 232, 72, 72, 112, 4, 7, 7, 6, 1, 0, 80, 160, 144, 208,
144
-  176, 144, 144, 4, 7, 7, 6, 1, 0, 64, 32, 96, 144, 144, 144, 96,
145
-  4, 7, 7, 6, 1, 0, 32, 64, 96, 144, 144, 144, 96, 4, 7, 7,
146
-  6, 1, 0, 32, 80, 96, 144, 144, 144, 96, 4, 7, 7, 6, 1, 0,
147
-  80, 160, 96, 144, 144, 144, 96, 4, 7, 7, 6, 1, 0, 80, 0, 96,
148
-  144, 144, 144, 96, 5, 5, 5, 6, 0, 0, 136, 80, 32, 80, 136, 4,
149
-  8, 8, 6, 1, 255, 16, 112, 176, 176, 208, 208, 224, 128, 4, 7, 7,
150
-  6, 1, 0, 64, 32, 144, 144, 144, 144, 96, 4, 7, 7, 6, 1, 0,
151
-  32, 64, 144, 144, 144, 144, 96, 4, 7, 7, 6, 1, 0, 32, 80, 144,
152
-  144, 144, 144, 96, 4, 7, 7, 6, 1, 0, 80, 0, 144, 144, 144, 144,
153
-  96, 5, 7, 7, 6, 0, 0, 16, 32, 136, 80, 32, 32, 32, 4, 6,
154
-  6, 6, 1, 0, 128, 224, 144, 144, 224, 128, 4, 6, 6, 6, 1, 0,
155
-  96, 144, 160, 160, 144, 160, 4, 7, 7, 6, 1, 0, 64, 32, 0, 112,
156
-  144, 144, 112, 4, 7, 7, 6, 1, 0, 32, 64, 0, 112, 144, 144, 112,
157
-  4, 7, 7, 6, 1, 0, 32, 80, 0, 112, 144, 144, 112, 4, 7, 7,
158
-  6, 1, 0, 80, 160, 0, 112, 144, 144, 112, 4, 6, 6, 6, 1, 0,
159
-  80, 0, 112, 144, 144, 112, 4, 7, 7, 6, 1, 0, 32, 80, 32, 112,
160
-  144, 144, 112, 5, 4, 4, 6, 0, 0, 112, 168, 176, 120, 4, 6, 6,
161
-  6, 1, 254, 112, 128, 128, 112, 32, 64, 4, 7, 7, 6, 1, 0, 64,
162
-  32, 0, 96, 176, 192, 112, 4, 7, 7, 6, 1, 0, 32, 64, 0, 96,
163
-  176, 192, 112, 4, 7, 7, 6, 1, 0, 32, 80, 0, 96, 176, 192, 112,
164
-  4, 6, 6, 6, 1, 0, 80, 0, 96, 176, 192, 112, 3, 7, 7, 6,
165
-  1, 0, 128, 64, 0, 192, 64, 64, 224, 3, 7, 7, 6, 1, 0, 32,
166
-  64, 0, 192, 64, 64, 224, 3, 7, 7, 6, 1, 0, 64, 160, 0, 192,
167
-  64, 64, 224, 3, 6, 6, 6, 1, 0, 160, 0, 192, 64, 64, 224, 4,
168
-  7, 7, 6, 1, 0, 48, 96, 16, 112, 144, 144, 96, 4, 7, 7, 6,
169
-  1, 0, 80, 160, 0, 224, 144, 144, 144, 4, 7, 7, 6, 1, 0, 64,
170
-  32, 0, 96, 144, 144, 96, 4, 7, 7, 6, 1, 0, 32, 64, 0, 96,
171
-  144, 144, 96, 4, 7, 7, 6, 1, 0, 32, 80, 0, 96, 144, 144, 96,
172
-  4, 7, 7, 6, 1, 0, 80, 160, 0, 96, 144, 144, 96, 4, 6, 6,
173
-  6, 1, 0, 80, 0, 96, 144, 144, 96, 5, 5, 5, 6, 0, 0, 32,
174
-  0, 248, 0, 32, 4, 4, 4, 6, 1, 0, 112, 176, 208, 224, 4, 7,
175
-  7, 6, 1, 0, 64, 32, 0, 144, 144, 144, 112, 4, 7, 7, 6, 1,
176
-  0, 32, 64, 0, 144, 144, 144, 112, 4, 7, 7, 6, 1, 0, 32, 80,
177
-  0, 144, 144, 144, 112, 4, 6, 6, 6, 1, 0, 80, 0, 144, 144, 144,
178
-  112, 4, 9, 9, 6, 1, 254, 32, 64, 0, 144, 144, 144, 112, 144, 96,
179
-  4, 8, 8, 6, 1, 254, 128, 128, 224, 144, 144, 224, 128, 128, 4, 8,
180
-  8, 6, 1, 254, 80, 0, 144, 144, 144, 112, 144, 96
181
-};
36
+const u8g_fntpgm_uint8_t u8g_font_6x9[2434] U8G_FONT_SECTION(".progmem.u8g_font_6x9") = {
37
+  0x00,0x06,0x09,0x00,0xfe,0x06,0x02,0x0f,0x03,0x84,0x01,0xff,0xfe,0x07,0xfe,0x06,
38
+  0xfe,0x05,0x07,0x07,0x00,0x00,0x00,0x40,0xf0,0xc8,0x88,0x98,0x78,0x10,0x05,0x07,
39
+  0x07,0x00,0x00,0x00,0xc0,0xf8,0x88,0x88,0x88,0x88,0xf8,0x05,0x05,0x05,0x00,0x00,
40
+  0x01,0x20,0x30,0xf8,0x30,0x20,0x05,0x07,0x07,0x00,0x00,0x00,0x20,0x70,0xf8,0x20,
41
+  0x20,0x20,0xe0,0x05,0x07,0x07,0x00,0x00,0x00,0x20,0x70,0xa8,0xb8,0x88,0x70,0x20,
42
+  0x06,0x05,0x05,0x00,0x00,0x00,0xb0,0xd8,0x6c,0xd8,0xb0,0x05,0x08,0x08,0x00,0x00,
43
+  0xff,0xf8,0xa8,0x88,0x88,0x88,0x88,0xa8,0xf8,0x05,0x09,0x09,0x00,0x00,0xfe,0x20,
44
+  0x50,0x50,0x50,0x50,0x88,0xa8,0x88,0x70,0x03,0x03,0x03,0x00,0x00,0x03,0x40,0xa0,
45
+  0x40,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
46
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x06,0x05,0xff,0x01,0x06,0x06,
47
+  0x06,0x02,0x00,0x80,0x80,0x80,0x80,0x00,0x80,0x03,0x03,0x03,0x06,0x01,0x03,0xa0,
48
+  0xa0,0xa0,0x05,0x07,0x07,0x06,0x00,0xff,0x50,0x50,0xf8,0x50,0xf8,0x50,0x50,0x05,
49
+  0x09,0x09,0x06,0x00,0xfe,0x20,0x70,0xa8,0xa0,0x70,0x28,0xa8,0x70,0x20,0x06,0x08,
50
+  0x08,0x06,0x00,0xff,0x40,0xa8,0x48,0x10,0x20,0x48,0x54,0x08,0x05,0x07,0x07,0x06,
51
+  0x00,0xff,0x60,0x90,0x90,0x60,0x98,0x90,0x68,0x01,0x03,0x03,0x06,0x02,0x03,0x80,
52
+  0x80,0x80,0x02,0x07,0x07,0x06,0x02,0xff,0x40,0x80,0x80,0x80,0x80,0x80,0x40,0x02,
53
+  0x07,0x07,0x06,0x02,0xff,0x80,0x40,0x40,0x40,0x40,0x40,0x80,0x05,0x05,0x05,0x06,
54
+  0x00,0x00,0x88,0x50,0xf8,0x50,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x20,0x20,0xf8,
55
+  0x20,0x20,0x02,0x04,0x04,0x06,0x02,0xfe,0xc0,0x40,0x40,0x80,0x05,0x01,0x01,0x06,
56
+  0x00,0x02,0xf8,0x02,0x02,0x02,0x06,0x02,0x00,0xc0,0xc0,0x04,0x06,0x06,0x06,0x01,
57
+  0x00,0x10,0x10,0x20,0x40,0x80,0x80,0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,0x90,
58
+  0x90,0x90,0x60,0x03,0x06,0x06,0x06,0x01,0x00,0x40,0xc0,0x40,0x40,0x40,0xe0,0x04,
59
+  0x06,0x06,0x06,0x01,0x00,0x60,0x90,0x10,0x20,0x40,0xf0,0x04,0x06,0x06,0x06,0x01,
60
+  0x00,0xf0,0x20,0x60,0x10,0x10,0xe0,0x05,0x06,0x06,0x06,0x00,0x00,0x10,0x30,0x50,
61
+  0x90,0xf8,0x10,0x04,0x06,0x06,0x06,0x01,0x00,0xf0,0x80,0xe0,0x10,0x10,0xe0,0x04,
62
+  0x06,0x06,0x06,0x01,0x00,0x60,0x80,0xe0,0x90,0x90,0x60,0x04,0x06,0x06,0x06,0x01,
63
+  0x00,0xf0,0x10,0x10,0x20,0x40,0x40,0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,0x60,
64
+  0x90,0x90,0x60,0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,0x90,0x70,0x10,0x60,0x02,
65
+  0x05,0x05,0x06,0x02,0x00,0xc0,0xc0,0x00,0xc0,0xc0,0x02,0x07,0x07,0x06,0x02,0xfe,
66
+  0xc0,0xc0,0x00,0xc0,0x40,0x40,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x18,0x60,0x80,
67
+  0x60,0x18,0x05,0x03,0x03,0x06,0x00,0x01,0xf8,0x00,0xf8,0x05,0x05,0x05,0x06,0x00,
68
+  0x00,0xc0,0x30,0x08,0x30,0xc0,0x04,0x07,0x07,0x06,0x01,0x00,0x60,0x90,0x10,0x60,
69
+  0x40,0x00,0x40,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x90,0xa8,0xb0,0x80,0x70,0x05,
70
+  0x06,0x06,0x06,0x00,0x00,0x20,0x50,0x88,0xf8,0x88,0x88,0x05,0x06,0x06,0x06,0x00,
71
+  0x00,0xf0,0x88,0xf0,0x88,0x88,0xf0,0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,0x80,
72
+  0x80,0x90,0x60,0x04,0x06,0x06,0x06,0x01,0x00,0xe0,0x90,0x90,0x90,0x90,0xe0,0x04,
73
+  0x06,0x06,0x06,0x01,0x00,0xf0,0x80,0xe0,0x80,0x80,0xf0,0x04,0x06,0x06,0x06,0x01,
74
+  0x00,0xf0,0x80,0xe0,0x80,0x80,0x80,0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,0x80,
75
+  0xb0,0x90,0x60,0x04,0x06,0x06,0x06,0x01,0x00,0x90,0x90,0xf0,0x90,0x90,0x90,0x03,
76
+  0x06,0x06,0x06,0x01,0x00,0xe0,0x40,0x40,0x40,0x40,0xe0,0x05,0x06,0x06,0x06,0x00,
77
+  0x00,0x38,0x10,0x10,0x10,0x90,0x60,0x04,0x06,0x06,0x06,0x01,0x00,0x90,0xa0,0xc0,
78
+  0xa0,0x90,0x90,0x04,0x06,0x06,0x06,0x01,0x00,0x80,0x80,0x80,0x80,0x80,0xf0,0x05,
79
+  0x06,0x06,0x06,0x00,0x00,0x88,0xd8,0xa8,0xa8,0x88,0x88,0x04,0x06,0x06,0x06,0x01,
80
+  0x00,0x90,0xd0,0xb0,0x90,0x90,0x90,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x88,0x88,
81
+  0x88,0x88,0x70,0x04,0x06,0x06,0x06,0x01,0x00,0xe0,0x90,0x90,0xe0,0x80,0x80,0x04,
82
+  0x07,0x07,0x06,0x01,0xff,0x60,0x90,0x90,0xd0,0xb0,0x60,0x10,0x04,0x06,0x06,0x06,
83
+  0x01,0x00,0xe0,0x90,0x90,0xe0,0x90,0x90,0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,
84
+  0x40,0x20,0x90,0x60,0x05,0x06,0x06,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,
85
+  0x04,0x06,0x06,0x06,0x01,0x00,0x90,0x90,0x90,0x90,0x90,0x60,0x04,0x06,0x06,0x06,
86
+  0x01,0x00,0x90,0x90,0x90,0xf0,0x60,0x60,0x05,0x06,0x06,0x06,0x00,0x00,0x88,0x88,
87
+  0xa8,0xa8,0xd8,0x88,0x05,0x06,0x06,0x06,0x00,0x00,0x88,0x50,0x20,0x20,0x50,0x88,
88
+  0x05,0x06,0x06,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x04,0x06,0x06,0x06,
89
+  0x01,0x00,0xf0,0x10,0x20,0x40,0x80,0xf0,0x03,0x06,0x06,0x06,0x01,0x00,0xe0,0x80,
90
+  0x80,0x80,0x80,0xe0,0x04,0x06,0x06,0x06,0x01,0x00,0x80,0x80,0x40,0x20,0x10,0x10,
91
+  0x03,0x06,0x06,0x06,0x01,0x00,0xe0,0x20,0x20,0x20,0x20,0xe0,0x05,0x03,0x03,0x06,
92
+  0x00,0x03,0x20,0x50,0x88,0x05,0x01,0x01,0x06,0x00,0xfe,0xf8,0x02,0x02,0x02,0x06,
93
+  0x02,0x04,0x80,0x40,0x04,0x04,0x04,0x06,0x01,0x00,0x70,0x90,0x90,0x70,0x04,0x06,
94
+  0x06,0x06,0x01,0x00,0x80,0x80,0xe0,0x90,0x90,0xe0,0x04,0x04,0x04,0x06,0x01,0x00,
95
+  0x70,0x80,0x80,0x70,0x04,0x06,0x06,0x06,0x01,0x00,0x10,0x10,0x70,0x90,0x90,0x70,
96
+  0x04,0x04,0x04,0x06,0x01,0x00,0x60,0xb0,0xc0,0x70,0x04,0x06,0x06,0x06,0x01,0x00,
97
+  0x20,0x50,0x40,0xe0,0x40,0x40,0x04,0x06,0x06,0x06,0x01,0xfe,0x60,0x90,0x90,0x70,
98
+  0x10,0x60,0x04,0x06,0x06,0x06,0x01,0x00,0x80,0x80,0xe0,0x90,0x90,0x90,0x03,0x06,
99
+  0x06,0x06,0x01,0x00,0x40,0x00,0xc0,0x40,0x40,0xe0,0x03,0x08,0x08,0x06,0x01,0xfe,
100
+  0x20,0x00,0x60,0x20,0x20,0x20,0xa0,0x40,0x04,0x06,0x06,0x06,0x01,0x00,0x80,0x80,
101
+  0xa0,0xc0,0xa0,0x90,0x03,0x06,0x06,0x06,0x01,0x00,0xc0,0x40,0x40,0x40,0x40,0xe0,
102
+  0x05,0x04,0x04,0x06,0x00,0x00,0xd0,0xa8,0xa8,0x88,0x04,0x04,0x04,0x06,0x01,0x00,
103
+  0xe0,0x90,0x90,0x90,0x04,0x04,0x04,0x06,0x01,0x00,0x60,0x90,0x90,0x60,0x04,0x06,
104
+  0x06,0x06,0x01,0xfe,0xe0,0x90,0x90,0xe0,0x80,0x80,0x04,0x06,0x06,0x06,0x01,0xfe,
105
+  0x70,0x90,0x90,0x70,0x10,0x10,0x04,0x04,0x04,0x06,0x01,0x00,0xa0,0xd0,0x80,0x80,
106
+  0x04,0x04,0x04,0x06,0x01,0x00,0x70,0xc0,0x30,0xe0,0x04,0x06,0x06,0x06,0x01,0x00,
107
+  0x40,0x40,0xe0,0x40,0x50,0x20,0x04,0x04,0x04,0x06,0x01,0x00,0x90,0x90,0x90,0x70,
108
+  0x04,0x04,0x04,0x06,0x01,0x00,0x90,0x90,0x60,0x60,0x05,0x04,0x04,0x06,0x00,0x00,
109
+  0x88,0xa8,0xa8,0x50,0x04,0x04,0x04,0x06,0x01,0x00,0x90,0x60,0x60,0x90,0x04,0x06,
110
+  0x06,0x06,0x01,0xfe,0x90,0x90,0x90,0x70,0x90,0x60,0x04,0x04,0x04,0x06,0x01,0x00,
111
+  0xf0,0x20,0x40,0xf0,0x03,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x40,0x80,0x40,0x40,
112
+  0x20,0x01,0x07,0x07,0x06,0x02,0xff,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x03,0x07,
113
+  0x07,0x06,0x01,0x00,0x80,0x40,0x40,0x20,0x40,0x40,0x80,0x04,0x02,0x02,0x06,0x01,
114
+  0x03,0x50,0xa0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
115
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
116
+  0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x06,0x05,0xff,0x01,0x06,0x06,0x06,0x02,0x00,
117
+  0x80,0x00,0x80,0x80,0x80,0x80,0x04,0x06,0x06,0x06,0x01,0xff,0x20,0x70,0xa0,0xa0,
118
+  0x70,0x20,0x05,0x07,0x07,0x06,0x00,0xff,0x30,0x48,0x40,0xf0,0x40,0x40,0xf8,0x05,
119
+  0x05,0x05,0x06,0x00,0x00,0xa8,0x50,0x88,0x50,0xa8,0x05,0x06,0x06,0x06,0x00,0x00,
120
+  0x88,0x50,0xf8,0x20,0xf8,0x20,0x01,0x07,0x07,0x06,0x02,0xff,0x80,0x80,0x80,0x00,
121
+  0x80,0x80,0x80,0x04,0x07,0x07,0x06,0x01,0xff,0x70,0x80,0x60,0x90,0x60,0x10,0xe0,
122
+  0x03,0x01,0x01,0x06,0x01,0x05,0xa0,0x06,0x07,0x07,0x06,0x00,0x00,0x78,0x84,0x94,
123
+  0xa4,0x94,0x84,0x78,0x03,0x05,0x05,0x06,0x01,0x01,0x60,0xa0,0x60,0x00,0xe0,0x05,
124
+  0x05,0x05,0x06,0x00,0x00,0x28,0x50,0xa0,0x50,0x28,0x04,0x03,0x03,0x06,0x01,0x00,
125
+  0xf0,0x10,0x10,0x04,0x01,0x01,0x06,0x01,0x02,0xf0,0x06,0x07,0x07,0x06,0x00,0x00,
126
+  0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x04,0x01,0x01,0x06,0x01,0x05,0xf0,0x04,0x03,
127
+  0x03,0x06,0x01,0x02,0x60,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0xff,0x20,0x20,0xf8,
128
+  0x20,0x20,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x01,0x40,0xa0,0x20,0x40,0xe0,0x03,
129
+  0x05,0x05,0x06,0x01,0x01,0xc0,0x20,0x40,0x20,0xc0,0x02,0x02,0x02,0x06,0x02,0x04,
130
+  0x40,0x80,0x04,0x05,0x05,0x06,0x01,0xff,0x90,0x90,0xb0,0xd0,0x80,0x05,0x06,0x06,
131
+  0x06,0x00,0x00,0x78,0xe8,0xe8,0x68,0x28,0x28,0x01,0x01,0x01,0x06,0x02,0x02,0x80,
132
+  0x02,0x02,0x02,0x06,0x02,0xfe,0x40,0x80,0x03,0x05,0x05,0x06,0x01,0x01,0x40,0xc0,
133
+  0x40,0x40,0xe0,0x03,0x05,0x05,0x06,0x01,0x01,0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,
134
+  0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0,0x05,0x08,0x08,0x06,0x00,0xff,0x40,
135
+  0xc0,0x40,0x50,0x70,0x30,0x78,0x10,0x05,0x08,0x08,0x06,0x00,0xff,0x40,0xc0,0x40,
136
+  0x50,0x68,0x08,0x10,0x38,0x05,0x08,0x08,0x06,0x00,0xff,0xc0,0x20,0x40,0x30,0xf0,
137
+  0x30,0x78,0x10,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x00,0x20,0x60,0x80,0x90,0x60,
138
+  0x05,0x07,0x07,0x06,0x00,0x00,0x40,0x20,0x20,0x50,0x70,0x88,0x88,0x05,0x07,0x07,
139
+  0x06,0x00,0x00,0x10,0x20,0x20,0x50,0x70,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,
140
+  0x20,0x50,0x20,0x50,0x70,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x28,0x50,0x20,
141
+  0x50,0x70,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x20,0x50,0x70,0x88,
142
+  0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x50,0x20,0x50,0x70,0x88,0x88,0x05,0x06,
143
+  0x06,0x06,0x00,0x00,0x78,0xa0,0xf0,0xa0,0xa0,0xb8,0x04,0x08,0x08,0x06,0x01,0xfe,
144
+  0x60,0x90,0x80,0x80,0x90,0x60,0x20,0x40,0x04,0x07,0x07,0x06,0x01,0x00,0x40,0x20,
145
+  0xf0,0x80,0xe0,0x80,0xf0,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0xf0,0x80,0xe0,
146
+  0x80,0xf0,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x50,0xf0,0x80,0xe0,0x80,0xf0,0x04,
147
+  0x07,0x07,0x06,0x01,0x00,0x50,0x00,0xf0,0x80,0xe0,0x80,0xf0,0x03,0x07,0x07,0x06,
148
+  0x01,0x00,0x80,0x40,0xe0,0x40,0x40,0x40,0xe0,0x03,0x07,0x07,0x06,0x01,0x00,0x20,
149
+  0x40,0xe0,0x40,0x40,0x40,0xe0,0x03,0x07,0x07,0x06,0x01,0x00,0x40,0xa0,0xe0,0x40,
150
+  0x40,0x40,0xe0,0x03,0x07,0x07,0x06,0x01,0x00,0xa0,0x00,0xe0,0x40,0x40,0x40,0xe0,
151
+  0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x48,0xe8,0x48,0x48,0x70,0x04,0x07,0x07,0x06,
152
+  0x01,0x00,0x50,0xa0,0x90,0xd0,0xb0,0x90,0x90,0x04,0x07,0x07,0x06,0x01,0x00,0x40,
153
+  0x20,0x60,0x90,0x90,0x90,0x60,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x60,0x90,
154
+  0x90,0x90,0x60,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x50,0x60,0x90,0x90,0x90,0x60,
155
+  0x04,0x07,0x07,0x06,0x01,0x00,0x50,0xa0,0x60,0x90,0x90,0x90,0x60,0x04,0x07,0x07,
156
+  0x06,0x01,0x00,0x50,0x00,0x60,0x90,0x90,0x90,0x60,0x05,0x05,0x05,0x06,0x00,0x00,
157
+  0x88,0x50,0x20,0x50,0x88,0x04,0x08,0x08,0x06,0x01,0xff,0x10,0x70,0xb0,0xb0,0xd0,
158
+  0xd0,0xe0,0x80,0x04,0x07,0x07,0x06,0x01,0x00,0x40,0x20,0x90,0x90,0x90,0x90,0x60,
159
+  0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x90,0x90,0x90,0x90,0x60,0x04,0x07,0x07,
160
+  0x06,0x01,0x00,0x20,0x50,0x90,0x90,0x90,0x90,0x60,0x04,0x07,0x07,0x06,0x01,0x00,
161
+  0x50,0x00,0x90,0x90,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x10,0x20,0x88,
162
+  0x50,0x20,0x20,0x20,0x04,0x06,0x06,0x06,0x01,0x00,0x80,0xe0,0x90,0x90,0xe0,0x80,
163
+  0x04,0x06,0x06,0x06,0x01,0x00,0x60,0x90,0xa0,0xa0,0x90,0xa0,0x04,0x07,0x07,0x06,
164
+  0x01,0x00,0x40,0x20,0x00,0x70,0x90,0x90,0x70,0x04,0x07,0x07,0x06,0x01,0x00,0x20,
165
+  0x40,0x00,0x70,0x90,0x90,0x70,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x50,0x00,0x70,
166
+  0x90,0x90,0x70,0x04,0x07,0x07,0x06,0x01,0x00,0x50,0xa0,0x00,0x70,0x90,0x90,0x70,
167
+  0x04,0x06,0x06,0x06,0x01,0x00,0x50,0x00,0x70,0x90,0x90,0x70,0x04,0x07,0x07,0x06,
168
+  0x01,0x00,0x20,0x50,0x20,0x70,0x90,0x90,0x70,0x05,0x04,0x04,0x06,0x00,0x00,0x70,
169
+  0xa8,0xb0,0x78,0x04,0x06,0x06,0x06,0x01,0xfe,0x70,0x80,0x80,0x70,0x20,0x40,0x04,
170
+  0x07,0x07,0x06,0x01,0x00,0x40,0x20,0x00,0x60,0xb0,0xc0,0x70,0x04,0x07,0x07,0x06,
171
+  0x01,0x00,0x20,0x40,0x00,0x60,0xb0,0xc0,0x70,0x04,0x07,0x07,0x06,0x01,0x00,0x20,
172
+  0x50,0x00,0x60,0xb0,0xc0,0x70,0x04,0x06,0x06,0x06,0x01,0x00,0x50,0x00,0x60,0xb0,
173
+  0xc0,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0x80,0x40,0x00,0xc0,0x40,0x40,0xe0,0x03,
174
+  0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x00,0xc0,0x40,0x40,0xe0,0x03,0x07,0x07,0x06,
175
+  0x01,0x00,0x40,0xa0,0x00,0xc0,0x40,0x40,0xe0,0x03,0x06,0x06,0x06,0x01,0x00,0xa0,
176
+  0x00,0xc0,0x40,0x40,0xe0,0x04,0x07,0x07,0x06,0x01,0x00,0x30,0x60,0x10,0x70,0x90,
177
+  0x90,0x60,0x04,0x07,0x07,0x06,0x01,0x00,0x50,0xa0,0x00,0xe0,0x90,0x90,0x90,0x04,
178
+  0x07,0x07,0x06,0x01,0x00,0x40,0x20,0x00,0x60,0x90,0x90,0x60,0x04,0x07,0x07,0x06,
179
+  0x01,0x00,0x20,0x40,0x00,0x60,0x90,0x90,0x60,0x04,0x07,0x07,0x06,0x01,0x00,0x20,
180
+  0x50,0x00,0x60,0x90,0x90,0x60,0x04,0x07,0x07,0x06,0x01,0x00,0x50,0xa0,0x00,0x60,
181
+  0x90,0x90,0x60,0x04,0x06,0x06,0x06,0x01,0x00,0x50,0x00,0x60,0x90,0x90,0x60,0x05,
182
+  0x05,0x05,0x06,0x00,0x00,0x20,0x00,0xf8,0x00,0x20,0x04,0x04,0x04,0x06,0x01,0x00,
183
+  0x70,0xb0,0xd0,0xe0,0x04,0x07,0x07,0x06,0x01,0x00,0x40,0x20,0x00,0x90,0x90,0x90,
184
+  0x70,0x04,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x00,0x90,0x90,0x90,0x70,0x04,0x07,
185
+  0x07,0x06,0x01,0x00,0x20,0x50,0x00,0x90,0x90,0x90,0x70,0x04,0x06,0x06,0x06,0x01,
186
+  0x00,0x50,0x00,0x90,0x90,0x90,0x70,0x04,0x09,0x09,0x06,0x01,0xfe,0x20,0x40,0x00,
187
+  0x90,0x90,0x90,0x70,0x90,0x60,0x04,0x08,0x08,0x06,0x01,0xfe,0x80,0x80,0xe0,0x90,
188
+  0x90,0xe0,0x80,0x80,0x04,0x08,0x08,0x06,0x01,0xfe,0x50,0x00,0x90,0x90,0x90,0x70,
189
+  0x90,0x60};

+ 16606
- 0
buildroot/share/fonts/marlin-6x9.bdf
文件差异内容过多而无法显示
查看文件


正在加载...
取消
保存