thomas
/
marlin
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Merge pull request #10417 from yhfudev/fix-fonts-merge-sk-cz

Scott Lahteine 7 年前
父节点
4f184ba5da dde941cac8
当前提交
f36ddef9a7
没有帐户链接到提交者的电子邮件
共有 78 个文件被更改，包括 224217 次插入 和 64395 次删除
分列视图 显示文件统计
  1. 0
    7
      .travis.yml
  2. 244
    239
      Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
  3. 6
    6
      Marlin/src/lcd/dogm/language_data_an.h
  4. 46
    44
      Marlin/src/lcd/dogm/language_data_bg.h
  5. 6
    6
      Marlin/src/lcd/dogm/language_data_ca.h
  6. 37
    42
      Marlin/src/lcd/dogm/language_data_cz.h
  7. 6
    6
      Marlin/src/lcd/dogm/language_data_da.h
  8. 6
    6
      Marlin/src/lcd/dogm/language_data_de.h
  9. 62
    60
      Marlin/src/lcd/dogm/language_data_el-gr.h
  10. 65
    63
      Marlin/src/lcd/dogm/language_data_el.h
  11. 6
    6
      Marlin/src/lcd/dogm/language_data_en.h
  12. 6
    6
      Marlin/src/lcd/dogm/language_data_es.h
  13. 6
    6
      Marlin/src/lcd/dogm/language_data_eu.h
  14. 6
    6
      Marlin/src/lcd/dogm/language_data_fi.h
  15. 6
    6
      Marlin/src/lcd/dogm/language_data_fr.h
  16. 6
    6
      Marlin/src/lcd/dogm/language_data_gl.h
  17. 20
    23
      Marlin/src/lcd/dogm/language_data_hr.h
  18. 6
    6
      Marlin/src/lcd/dogm/language_data_it.h
  19. 21
    20
      Marlin/src/lcd/dogm/language_data_jp-kana.h
  20. 6
    6
      Marlin/src/lcd/dogm/language_data_nl.h
  21. 27
    28
      Marlin/src/lcd/dogm/language_data_pl.h
  22. 6
    6
      Marlin/src/lcd/dogm/language_data_pt-br.h
  23. 6
    6
      Marlin/src/lcd/dogm/language_data_pt.h
  24. 53
    52
      Marlin/src/lcd/dogm/language_data_ru.h
  25. 50
    35
      Marlin/src/lcd/dogm/language_data_sk.h
  26. 106
    79
      Marlin/src/lcd/dogm/language_data_test.h
  27. 16
    15
      Marlin/src/lcd/dogm/language_data_tr.h
  28. 54
    51
      Marlin/src/lcd/dogm/language_data_uk.h
  29. 260
    260
      Marlin/src/lcd/dogm/language_data_zh_CN.h
  30. 276
    276
      Marlin/src/lcd/dogm/language_data_zh_TW.h
  31. 0
    1
      Marlin/src/lcd/language/language_bg.h
  32. 0
    2
      Marlin/src/lcd/language/language_ca.h
  33. 0
    1
      Marlin/src/lcd/language/language_cz.h
  34. 0
    1
      Marlin/src/lcd/language/language_da.h
  35. 0
    2
      Marlin/src/lcd/language/language_de.h
  36. 0
    1
      Marlin/src/lcd/language/language_el-gr.h
  37. 0
    1
      Marlin/src/lcd/language/language_el.h
  38. 0
    1
      Marlin/src/lcd/language/language_es.h
  39. 0
    1
      Marlin/src/lcd/language/language_fi.h
  40. 0
    1
      Marlin/src/lcd/language/language_fr.h
  41. 0
    1
      Marlin/src/lcd/language/language_gl.h
  42. 0
    1
      Marlin/src/lcd/language/language_it.h
  43. 0
    1
      Marlin/src/lcd/language/language_jp-kana.h
  44. 0
    1
      Marlin/src/lcd/language/language_pl.h
  45. 3
    2
      Marlin/src/lcd/language/language_pt-br.h
  46. 0
    1
      Marlin/src/lcd/language/language_pt.h
  47. 0
    1
      Marlin/src/lcd/language/language_ru.h
  48. 6
    1
      Marlin/src/lcd/language/language_sk.h
  49. 0
    5
      Marlin/src/lcd/language/language_test.h
  50. 0
    1
      Marlin/src/lcd/language/language_tr.h
  51. 0
    1
      Marlin/src/lcd/language/language_uk.h
  52. 2
    0
      Marlin/src/lcd/language/language_zh_CN.h
  53. 2
    0
      Marlin/src/lcd/language/language_zh_TW.h
  54. 38
    37
      Marlin/src/lcd/lcdprint_hd44780.cpp
  55. 0
    1
      Marlin/src/lcd/ultralcd_impl_DOGM.h
  56. 二进制
      buildroot/share/fonts/HD44780_C.fon
  57. 二进制
      buildroot/share/fonts/HD44780_J.fon
  58. 二进制
      buildroot/share/fonts/HD44780_W.fon
  59. 0
    2736
      buildroot/share/fonts/ISO10646-0-1.bdf
  60. 0
    6932
      buildroot/share/fonts/ISO10646-0-2.bdf
  61. 二进制
      buildroot/share/fonts/ISO10646-1-tr.fon
  62. 二进制
      buildroot/share/fonts/ISO10646-1.fon
  63. 二进制
      buildroot/share/fonts/ISO10646-4_Greek.fon
  64. 二进制
      buildroot/share/fonts/ISO10646-5_Cyrillic.fon
  65. 二进制
      buildroot/share/fonts/ISO10646_CN.fon
  66. 二进制
      buildroot/share/fonts/ISO10646_CZ.fon
  67. 二进制
      buildroot/share/fonts/ISO10646_Kana.fon
  68. 二进制
      buildroot/share/fonts/ISO10646_SK.fon
  69. 二进制
      buildroot/share/fonts/Marlin_symbols.fon
  70. 75
    59
      buildroot/share/fonts/genallfont.sh
  71. 31
    0
      buildroot/share/fonts/get-bdf2u8g.sh
  72. 0
    10
      buildroot/share/fonts/make_fonts.bat
  73. 64286
    0
      buildroot/share/fonts/marlin-6x12-1.bdf
  74. 65513
    0
      buildroot/share/fonts/marlin-6x12-2.bdf
  75. 92733
    53068
      buildroot/share/fonts/marlin-6x12-3.bdf
  76. 32
    47
      buildroot/share/fonts/u8glib-bdf2u8g.patch
  77. 25
    56
      buildroot/share/fonts/uxggenpages.md
  78. 50
    43
      buildroot/share/fonts/uxggenpages.sh

+ 0
- 7
.travis.yml 查看文件 

@@ -53,13 +53,6 @@ script:
53 53 
   - restore_configs
54 54 
   - build_marlin_pio ${TRAVIS_BUILD_DIR} ${TEST_PLATFORM}
55 55 
   #
56 
-  # find U8glib files
57 
-  - sudo find / -iname u8g.h
58 
-  - sudo find / -iname U8glib.h
59 
-  # expose the C API
60 
-  #- sudo cp -f ${TRAVIS_BUILD_DIR}/.piolibdeps/U8glib-HAL_ID1932/src/lib/u8g.h ${TRAVIS_BUILD_DIR}/.piolibdeps/U8glib-HAL_ID1932/src/u8g.h
61 
-  #
62 
-  #
63 56 
   # Test 2 extruders (one MAX6675) and heated bed on basic RAMPS 1.4
64 57 
   # Test a "Fix Mounted" Probe with Safe Homing, some arc options,
65 58 
   # linear bed leveling, M48, leveling debug, and firmware retraction.

+ 244
- 239
Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h 查看文件 

@@ -19,26 +19,26 @@
19 19 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20 20 
  *
21 21 
  */
22 
-
23 22 
 #include <U8glib.h>
24 23
25 24 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
26 
-  // reduced font (only sysmbols 1 - 127) - saves about 1278 bytes of FLASH
25 
+  // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
27 26
28 27 
 /*
29 
-  Fontname: -FontForge-ISO106461-Normal-R-Normal--11-80-96-96-C-60-WinRoman-0
30 
-  Copyright:
28 
+  Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
29 
+  Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
31 30 
   Capital A Height: 7, '1' Height: 7
32 31 
   Calculated Max Values w= 5 h=10 x= 5 y= 5 dx= 6 dy= 0 ascent= 8 len=10
33 
-  Font Bounding box     w= 6 h=10 x= 0 y=-2
32 
+  Font Bounding box     w= 6 h=12 x= 0 y=-2
34 33 
   Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
35 
-  Pure Font   ascent = 7 descent=-1
36 
-  X Font      ascent = 7 descent=-1
34 
+  Pure Font   ascent = 7 descent=-2
35 
+  X Font      ascent = 8 descent=-2
37 36 
   Max Font    ascent = 8 descent=-2
38 37 
 */
39 
-const u8g_fntpgm_uint8_t ISO10646_1_5x7[1302] U8G_FONT_SECTION(".progmem.ISO10646_1_5x7") = {
40 
-  0x00,0x06,0x0a,0x00,0xfe,0x07,0x02,0x22,0x03,0xb1,0x01,0x7f,0xff,0x08,0xfe,0x07,
41 
-  0xff,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
38 
+
39 
+const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
40 
+  0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
41 
+  0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
42 42 
   0x08,0x08,0x06,0x00,0x00,0xc0,0xf8,0x88,0x88,0x88,0x88,0x88,0xf8,0x05,0x05,0x05,
43 43 
   0x06,0x00,0x01,0x20,0x30,0xf8,0x30,0x20,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x70,
44 44 
   0xf8,0x20,0x20,0x20,0x20,0xe0,0x05,0x09,0x09,0x06,0x00,0xff,0x20,0x70,0xa8,0xa8,
 
@@ -48,95 +48,96 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[1302] U8G_FONT_SECTION(".progmem.ISO1064
48 48 
   0xa8,0x88,0x70,0x03,0x03,0x03,0x06,0x00,0x03,0x40,0xa0,0x40,0xff,0xff,0xff,0xff,
49 49 
   0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
50 50 
   0xff,0xff,0x00,0x00,0x00,0x06,0x05,0xff,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x80,
51 
-  0x80,0x80,0x80,0x00,0x80,0x03,0x02,0x02,0x06,0x01,0x05,0xa0,0xa0,0x05,0x07,0x07,
52 
-  0x06,0x00,0x00,0x50,0x50,0xf8,0x50,0xf8,0x50,0x50,0x05,0x07,0x07,0x06,0x00,0x00,
53 
-  0x20,0x78,0xa0,0x70,0x28,0xf0,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0xc0,0xc8,0x10,
54 
-  0x20,0x40,0x98,0x18,0x05,0x07,0x07,0x06,0x00,0x00,0x60,0x90,0xa0,0x40,0xa8,0x90,
55 
-  0x68,0x02,0x03,0x03,0x06,0x01,0x04,0xc0,0x40,0x80,0x03,0x07,0x07,0x06,0x01,0x00,
56 
-  0x20,0x40,0x80,0x80,0x80,0x40,0x20,0x03,0x07,0x07,0x06,0x01,0x00,0x80,0x40,0x20,
57 
-  0x20,0x20,0x40,0x80,0x05,0x05,0x05,0x06,0x00,0x01,0x20,0xa8,0x70,0xa8,0x20,0x05,
58 
-  0x05,0x05,0x06,0x00,0x01,0x20,0x20,0xf8,0x20,0x20,0x02,0x03,0x03,0x06,0x02,0xff,
59 
-  0xc0,0x40,0x80,0x05,0x01,0x01,0x06,0x00,0x03,0xf8,0x02,0x02,0x02,0x06,0x02,0x00,
60 
-  0xc0,0xc0,0x05,0x05,0x05,0x06,0x00,0x01,0x08,0x10,0x20,0x40,0x80,0x05,0x07,0x07,
61 
-  0x06,0x00,0x00,0x70,0x88,0x98,0xa8,0xc8,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,
62 
-  0x40,0xc0,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,
63 
-  0x70,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x10,0x20,0x10,0x08,0x08,
64 
-  0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x10,0x30,0x50,0x90,0xf8,0x10,0x10,0x05,0x07,
65 
-  0x07,0x06,0x00,0x00,0xf8,0x80,0xf0,0x08,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,
66 
-  0x00,0x30,0x40,0x80,0xf0,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,
67 
-  0x10,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x70,0x88,
68 
-  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x78,0x08,0x10,0x60,0x02,
69 
-  0x05,0x05,0x06,0x02,0x00,0xc0,0xc0,0x00,0xc0,0xc0,0x02,0x06,0x06,0x06,0x02,0xff,
70 
-  0xc0,0xc0,0x00,0xc0,0x40,0x80,0x04,0x07,0x07,0x06,0x00,0x00,0x10,0x20,0x40,0x80,
71 
-  0x40,0x20,0x10,0x05,0x03,0x03,0x06,0x00,0x02,0xf8,0x00,0xf8,0x04,0x07,0x07,0x06,
72 
-  0x01,0x00,0x80,0x40,0x20,0x10,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
73 
-  0x88,0x08,0x10,0x20,0x00,0x20,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x88,0x08,0x68,
74 
-  0xa8,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,
75 
-  0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,
76 
-  0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xe0,
77 
-  0x90,0x88,0x88,0x88,0x90,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,
78 
-  0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0x80,
79 
-  0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0xb8,0x88,0x88,0x70,0x05,0x07,0x07,
80 
-  0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x01,0x07,0x07,0x06,0x02,0x00,
81 
-  0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x38,0x10,0x10,
82 
-  0x10,0x10,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,
83 
-  0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0xf8,0x05,0x07,
84 
-  0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
85 
-  0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,
86 
-  0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,
87 
-  0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0xa8,0x90,0x68,0x05,
88 
-  0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0xa0,0x90,0x88,0x05,0x07,0x07,0x06,
89 
-  0x00,0x00,0x78,0x80,0x80,0x70,0x08,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,
90 
-  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,
91 
-  0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0x50,0x20,
92 
-  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0xa8,0x50,0x05,0x07,0x07,
93 
-  0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,
94 
-  0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,
95 
-  0x20,0x40,0x80,0xf8,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x80,0x80,0x80,0x80,0x80,
96 
-  0xe0,0x05,0x05,0x05,0x06,0x00,0x01,0x80,0x40,0x20,0x10,0x08,0x03,0x07,0x07,0x06,
97 
-  0x01,0x00,0xe0,0x20,0x20,0x20,0x20,0x20,0xe0,0x05,0x03,0x03,0x06,0x00,0x04,0x20,
98 
-  0x50,0x88,0x05,0x01,0x01,0x06,0x00,0x00,0xf8,0x02,0x02,0x02,0x06,0x02,0x05,0x80,
99 
-  0x40,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,
100 
-  0x00,0x00,0x80,0x80,0xb0,0xc8,0x88,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x70,
101 
-  0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x08,0x08,0x68,0x98,0x88,0x88,
102 
-  0x78,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x07,0x07,0x06,
103 
-  0x00,0x00,0x30,0x48,0xe0,0x40,0x40,0x40,0x40,0x05,0x06,0x06,0x06,0x00,0xff,0x70,
104 
-  0x88,0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,0xb0,0xc8,0x88,
105 
-  0x88,0x88,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x03,
106 
-  0x08,0x08,0x06,0x01,0xff,0x20,0x00,0x20,0x20,0x20,0x20,0xa0,0x40,0x04,0x07,0x07,
107 
-  0x06,0x00,0x00,0x80,0x80,0x90,0xa0,0xc0,0xa0,0x90,0x03,0x07,0x07,0x06,0x01,0x00,
51 
+  0x80,0x80,0x80,0x00,0x80,0x03,0x03,0x03,0x06,0x01,0x05,0xa0,0xa0,0xa0,0x05,0x06,
52 
+  0x06,0x06,0x00,0x00,0x50,0xf8,0x50,0x50,0xf8,0x50,0x05,0x09,0x09,0x06,0x00,0xff,
53 
+  0x20,0x70,0xa8,0xa0,0x70,0x28,0xa8,0x70,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0xc8,
54 
+  0xc8,0x10,0x20,0x40,0x98,0x98,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0xa0,0xa0,0x40,
55 
+  0xa8,0x90,0x68,0x01,0x03,0x03,0x06,0x02,0x05,0x80,0x80,0x80,0x03,0x09,0x09,0x06,
56 
+  0x01,0xff,0x20,0x40,0x40,0x80,0x80,0x80,0x40,0x40,0x20,0x03,0x09,0x09,0x06,0x01,
57 
+  0xff,0x80,0x40,0x40,0x20,0x20,0x20,0x40,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,
58 
+  0x20,0xa8,0x70,0x20,0x70,0xa8,0x20,0x05,0x05,0x05,0x06,0x00,0x01,0x20,0x20,0xf8,
59 
+  0x20,0x20,0x02,0x03,0x03,0x06,0x01,0xff,0xc0,0x40,0x80,0x05,0x01,0x01,0x06,0x00,
60 
+  0x03,0xf8,0x02,0x02,0x02,0x06,0x01,0x00,0xc0,0xc0,0x05,0x07,0x07,0x06,0x00,0x00,
61 
+  0x08,0x10,0x10,0x20,0x40,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x98,
62 
+  0xa8,0xc8,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0x40,0xc0,0x40,0x40,0x40,0x40,
63 
+  0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,0x10,0x20,0x40,0xf8,0x05,0x07,
64 
+  0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x30,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,
65 
+  0x00,0x10,0x30,0x50,0x90,0xf8,0x10,0x10,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,
66 
+  0xf0,0x08,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x30,0x40,0x80,0xf0,0x88,
67 
+  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x10,0x20,0x20,0x20,0x05,
68 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x70,0x88,0x88,0x70,0x05,0x07,0x07,0x06,
69 
+  0x00,0x00,0x70,0x88,0x88,0x78,0x08,0x10,0x60,0x02,0x05,0x05,0x06,0x01,0x00,0xc0,
70 
+  0xc0,0x00,0xc0,0xc0,0x02,0x06,0x06,0x06,0x01,0xff,0xc0,0xc0,0x00,0xc0,0x40,0x80,
71 
+  0x03,0x05,0x05,0x06,0x01,0x01,0x20,0x40,0x80,0x40,0x20,0x05,0x03,0x03,0x06,0x00,
72 
+  0x02,0xf8,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x01,0x80,0x40,0x20,0x40,0x80,0x05,
73 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x10,0x20,0x20,0x00,0x20,0x05,0x07,0x07,0x06,
74 
+  0x00,0x00,0x70,0x88,0xb8,0xa8,0xb8,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
75 
+  0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x48,0x48,0x70,
76 
+  0x48,0x48,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,
77 
+  0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x48,0x48,0x48,0x48,0x48,0xf0,0x05,0x07,0x07,
78 
+  0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,
79 
+  0xf8,0x80,0x80,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,
80 
+  0x80,0x98,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,
81 
+  0x88,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,
82 
+  0x07,0x06,0x00,0x00,0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x05,0x07,0x07,0x06,0x00,
83 
+  0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,
84 
+  0x80,0x80,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,
85 
+  0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x05,
86 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,
87 
+  0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
88 
+  0x88,0x88,0x88,0xa8,0x90,0x68,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,
89 
+  0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0x70,0x08,0x88,0x70,
90 
+  0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,
91 
+  0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
92 
+  0x88,0x88,0x88,0x88,0x50,0x50,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,
93 
+  0x88,0xa8,0xa8,0x50,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,
94 
+  0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x05,0x07,
95 
+  0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x03,0x09,0x09,0x06,0x01,
96 
+  0xff,0xe0,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,
97 
+  0x80,0x40,0x40,0x20,0x10,0x10,0x08,0x03,0x09,0x09,0x06,0x01,0xff,0xe0,0x20,0x20,
98 
+  0x20,0x20,0x20,0x20,0x20,0xe0,0x05,0x03,0x03,0x06,0x00,0x05,0x20,0x50,0x88,0x05,
99 
+  0x01,0x01,0x06,0x00,0xfe,0xf8,0x03,0x03,0x03,0x06,0x01,0x05,0x80,0x40,0x20,0x05,
100 
+  0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,
101 
+  0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x80,0x80,
102 
+  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x08,0x08,0x78,0x88,0x88,0x88,0x78,0x05,
103 
+  0x05,0x05,0x06,0x00,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
104 
+  0x30,0x48,0x40,0xe0,0x40,0x40,0x40,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x88,
105 
+  0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,0xf0,0x88,0x88,0x88,
106 
+  0x88,0x03,0x07,0x07,0x06,0x01,0x00,0x40,0x00,0xc0,0x40,0x40,0x40,0xe0,0x04,0x09,
107 
+  0x09,0x06,0x01,0xfe,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x90,0x60,0x05,0x07,0x07,
108 
+  0x06,0x00,0x00,0x80,0x80,0x88,0x90,0xe0,0x90,0x88,0x03,0x07,0x07,0x06,0x01,0x00,
108 109 
   0xc0,0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xd0,0xa8,0xa8,
109 110 
   0xa8,0xa8,0x05,0x05,0x05,0x06,0x00,0x00,0xb0,0xc8,0x88,0x88,0x88,0x05,0x05,0x05,
110 
-  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x06,0x06,0x06,0x00,0xff,0xf0,0x88,
111 
-  0x88,0xf0,0x80,0x80,0x05,0x06,0x06,0x06,0x00,0xff,0x78,0x88,0x88,0x78,0x08,0x08,
112 
-  0x05,0x05,0x05,0x06,0x00,0x00,0xb0,0xc8,0x80,0x80,0x80,0x05,0x05,0x05,0x06,0x00,
113 
-  0x00,0x70,0x80,0x70,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0x40,0xe0,0x40,
114 
-  0x40,0x48,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x98,0x68,0x05,0x05,
115 
-  0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
116 
-  0x88,0xa8,0xa8,0x50,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,
117 
-  0x06,0x06,0x06,0x00,0xff,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x05,0x05,0x06,0x00,
118 
-  0x00,0xf8,0x10,0x20,0x40,0xf8,0x03,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x40,0x80,
119 
-  0x40,0x40,0x20,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,
120 
-  0x03,0x07,0x07,0x06,0x01,0x00,0x80,0x40,0x40,0x20,0x40,0x40,0x80,0x05,0x02,0x02,
121 
-  0x06,0x00,0x03,0x68,0x90,0xff};
122 
-
111 
+  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,
112 
+  0x88,0x88,0xf0,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x78,0x88,0x88,0x88,0x78,
113 
+  0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xb0,0xc8,0x80,0x80,0x80,0x05,0x05,0x05,
114 
+  0x06,0x00,0x00,0x78,0x80,0x70,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
115 
+  0xf8,0x20,0x20,0x20,0x18,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x98,0x68,
116 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x05,0x05,0x05,0x06,0x00,
117 
+  0x00,0x88,0x88,0xa8,0xa8,0x50,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,
118 
+  0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x50,0x20,0x40,0x80,0x05,0x05,
119 
+  0x05,0x06,0x00,0x00,0xf8,0x10,0x20,0x40,0xf8,0x03,0x09,0x09,0x06,0x01,0xff,0x20,
120 
+  0x40,0x40,0x40,0x80,0x40,0x40,0x40,0x20,0x01,0x09,0x09,0x06,0x02,0xff,0x80,0x80,
121 
+  0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x03,0x09,0x09,0x06,0x01,0xff,0x80,0x40,0x40,
122 
+  0x40,0x20,0x40,0x40,0x40,0x80,0x05,0x03,0x03,0x06,0x00,0x02,0x48,0xa8,0x90,0xff
123 
+  };
123 124 
 #else
124 
-  // extended (original) font (sysmbols 1 - 255)
125 
+  // extended (original) font (symbols 1 - 255)
125 126
126 127 
 /*
127 
-  Fontname: -FontForge-ISO106461-Normal-R-Normal--11-80-96-96-C-60-WinRoman-0
128 
-  Copyright:
128 
+  Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
129 
+  Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
129 130 
   Capital A Height: 7, '1' Height: 7
130 
-  Calculated Max Values w= 5 h=10 x= 5 y= 7 dx= 6 dy= 0 ascent= 9 len=10
131 
-  Font Bounding box     w= 6 h=10 x= 0 y=-2
131 
+  Calculated Max Values w= 6 h=10 x= 5 y= 7 dx= 6 dy= 0 ascent=10 len=10
132 
+  Font Bounding box     w= 6 h=12 x= 0 y=-2
132 133 
   Calculated Min Values           x= 0 y=-2 dx= 0 dy= 0
133 
-  Pure Font   ascent = 7 descent=-1
134 
-  X Font      ascent = 7 descent=-1
135 
-  Max Font    ascent = 9 descent=-2
134 
+  Pure Font   ascent = 7 descent=-2
135 
+  X Font      ascent = 8 descent=-2
136 
+  Max Font    ascent =10 descent=-2
136 137 
 */
137 
-const u8g_fntpgm_uint8_t ISO10646_1_5x7[2580] U8G_FONT_SECTION(".progmem.ISO10646_1_5x7") = {
138 
-  0x00,0x06,0x0a,0x00,0xfe,0x07,0x02,0x22,0x03,0xb1,0x01,0xff,0xff,0x09,0xfe,0x07,
139 
-  0xff,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
138 
+const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7") = {
139 
+  0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0xff,0xfe,0x0a,0xfe,0x08,
140 
+  0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
140 141 
   0x08,0x08,0x06,0x00,0x00,0xc0,0xf8,0x88,0x88,0x88,0x88,0x88,0xf8,0x05,0x05,0x05,
141 142 
   0x06,0x00,0x01,0x20,0x30,0xf8,0x30,0x20,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x70,
142 143 
   0xf8,0x20,0x20,0x20,0x20,0xe0,0x05,0x09,0x09,0x06,0x00,0xff,0x20,0x70,0xa8,0xa8,
 
@@ -146,156 +147,160 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[2580] U8G_FONT_SECTION(".progmem.ISO1064
146 147 
   0xa8,0x88,0x70,0x03,0x03,0x03,0x06,0x00,0x03,0x40,0xa0,0x40,0xff,0xff,0xff,0xff,
147 148 
   0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
148 149 
   0xff,0xff,0x00,0x00,0x00,0x06,0x05,0xff,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x80,
149 
-  0x80,0x80,0x80,0x00,0x80,0x03,0x02,0x02,0x06,0x01,0x05,0xa0,0xa0,0x05,0x07,0x07,
150 
-  0x06,0x00,0x00,0x50,0x50,0xf8,0x50,0xf8,0x50,0x50,0x05,0x07,0x07,0x06,0x00,0x00,
151 
-  0x20,0x78,0xa0,0x70,0x28,0xf0,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0xc0,0xc8,0x10,
152 
-  0x20,0x40,0x98,0x18,0x05,0x07,0x07,0x06,0x00,0x00,0x60,0x90,0xa0,0x40,0xa8,0x90,
153 
-  0x68,0x02,0x03,0x03,0x06,0x01,0x04,0xc0,0x40,0x80,0x03,0x07,0x07,0x06,0x01,0x00,
154 
-  0x20,0x40,0x80,0x80,0x80,0x40,0x20,0x03,0x07,0x07,0x06,0x01,0x00,0x80,0x40,0x20,
155 
-  0x20,0x20,0x40,0x80,0x05,0x05,0x05,0x06,0x00,0x01,0x20,0xa8,0x70,0xa8,0x20,0x05,
156 
-  0x05,0x05,0x06,0x00,0x01,0x20,0x20,0xf8,0x20,0x20,0x02,0x03,0x03,0x06,0x02,0xff,
157 
-  0xc0,0x40,0x80,0x05,0x01,0x01,0x06,0x00,0x03,0xf8,0x02,0x02,0x02,0x06,0x02,0x00,
158 
-  0xc0,0xc0,0x05,0x05,0x05,0x06,0x00,0x01,0x08,0x10,0x20,0x40,0x80,0x05,0x07,0x07,
159 
-  0x06,0x00,0x00,0x70,0x88,0x98,0xa8,0xc8,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,
160 
-  0x40,0xc0,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,
161 
-  0x70,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x10,0x20,0x10,0x08,0x08,
162 
-  0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x10,0x30,0x50,0x90,0xf8,0x10,0x10,0x05,0x07,
163 
-  0x07,0x06,0x00,0x00,0xf8,0x80,0xf0,0x08,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,
164 
-  0x00,0x30,0x40,0x80,0xf0,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,
165 
-  0x10,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x70,0x88,
166 
-  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x78,0x08,0x10,0x60,0x02,
167 
-  0x05,0x05,0x06,0x02,0x00,0xc0,0xc0,0x00,0xc0,0xc0,0x02,0x06,0x06,0x06,0x02,0xff,
168 
-  0xc0,0xc0,0x00,0xc0,0x40,0x80,0x04,0x07,0x07,0x06,0x00,0x00,0x10,0x20,0x40,0x80,
169 
-  0x40,0x20,0x10,0x05,0x03,0x03,0x06,0x00,0x02,0xf8,0x00,0xf8,0x04,0x07,0x07,0x06,
170 
-  0x01,0x00,0x80,0x40,0x20,0x10,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
171 
-  0x88,0x08,0x10,0x20,0x00,0x20,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x88,0x08,0x68,
172 
-  0xa8,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,
173 
-  0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,
174 
-  0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xe0,
175 
-  0x90,0x88,0x88,0x88,0x90,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,
176 
-  0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0x80,
177 
-  0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0xb8,0x88,0x88,0x70,0x05,0x07,0x07,
178 
-  0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x01,0x07,0x07,0x06,0x02,0x00,
179 
-  0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x38,0x10,0x10,
180 
-  0x10,0x10,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,
181 
-  0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0xf8,0x05,0x07,
182 
-  0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
183 
-  0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,
184 
-  0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,
185 
-  0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0xa8,0x90,0x68,0x05,
186 
-  0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0xa0,0x90,0x88,0x05,0x07,0x07,0x06,
187 
-  0x00,0x00,0x78,0x80,0x80,0x70,0x08,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,
188 
-  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,
189 
-  0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0x50,0x20,
190 
-  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0xa8,0x50,0x05,0x07,0x07,
191 
-  0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,
192 
-  0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,
193 
-  0x20,0x40,0x80,0xf8,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x80,0x80,0x80,0x80,0x80,
194 
-  0xe0,0x05,0x05,0x05,0x06,0x00,0x01,0x80,0x40,0x20,0x10,0x08,0x03,0x07,0x07,0x06,
195 
-  0x01,0x00,0xe0,0x20,0x20,0x20,0x20,0x20,0xe0,0x05,0x03,0x03,0x06,0x00,0x04,0x20,
196 
-  0x50,0x88,0x05,0x01,0x01,0x06,0x00,0x00,0xf8,0x02,0x02,0x02,0x06,0x02,0x05,0x80,
197 
-  0x40,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,
198 
-  0x00,0x00,0x80,0x80,0xb0,0xc8,0x88,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x70,
199 
-  0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x08,0x08,0x68,0x98,0x88,0x88,
200 
-  0x78,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x07,0x07,0x06,
201 
-  0x00,0x00,0x30,0x48,0xe0,0x40,0x40,0x40,0x40,0x05,0x06,0x06,0x06,0x00,0xff,0x70,
202 
-  0x88,0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,0xb0,0xc8,0x88,
203 
-  0x88,0x88,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x03,
204 
-  0x08,0x08,0x06,0x01,0xff,0x20,0x00,0x20,0x20,0x20,0x20,0xa0,0x40,0x04,0x07,0x07,
205 
-  0x06,0x00,0x00,0x80,0x80,0x90,0xa0,0xc0,0xa0,0x90,0x03,0x07,0x07,0x06,0x01,0x00,
150 
+  0x80,0x80,0x80,0x00,0x80,0x03,0x03,0x03,0x06,0x01,0x05,0xa0,0xa0,0xa0,0x05,0x06,
151 
+  0x06,0x06,0x00,0x00,0x50,0xf8,0x50,0x50,0xf8,0x50,0x05,0x09,0x09,0x06,0x00,0xff,
152 
+  0x20,0x70,0xa8,0xa0,0x70,0x28,0xa8,0x70,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0xc8,
153 
+  0xc8,0x10,0x20,0x40,0x98,0x98,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0xa0,0xa0,0x40,
154 
+  0xa8,0x90,0x68,0x01,0x03,0x03,0x06,0x02,0x05,0x80,0x80,0x80,0x03,0x09,0x09,0x06,
155 
+  0x01,0xff,0x20,0x40,0x40,0x80,0x80,0x80,0x40,0x40,0x20,0x03,0x09,0x09,0x06,0x01,
156 
+  0xff,0x80,0x40,0x40,0x20,0x20,0x20,0x40,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,
157 
+  0x20,0xa8,0x70,0x20,0x70,0xa8,0x20,0x05,0x05,0x05,0x06,0x00,0x01,0x20,0x20,0xf8,
158 
+  0x20,0x20,0x02,0x03,0x03,0x06,0x01,0xff,0xc0,0x40,0x80,0x05,0x01,0x01,0x06,0x00,
159 
+  0x03,0xf8,0x02,0x02,0x02,0x06,0x01,0x00,0xc0,0xc0,0x05,0x07,0x07,0x06,0x00,0x00,
160 
+  0x08,0x10,0x10,0x20,0x40,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x98,
161 
+  0xa8,0xc8,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0x40,0xc0,0x40,0x40,0x40,0x40,
162 
+  0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,0x10,0x20,0x40,0xf8,0x05,0x07,
163 
+  0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x30,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,
164 
+  0x00,0x10,0x30,0x50,0x90,0xf8,0x10,0x10,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,
165 
+  0xf0,0x08,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x30,0x40,0x80,0xf0,0x88,
166 
+  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x10,0x20,0x20,0x20,0x05,
167 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x70,0x88,0x88,0x70,0x05,0x07,0x07,0x06,
168 
+  0x00,0x00,0x70,0x88,0x88,0x78,0x08,0x10,0x60,0x02,0x05,0x05,0x06,0x01,0x00,0xc0,
169 
+  0xc0,0x00,0xc0,0xc0,0x02,0x06,0x06,0x06,0x01,0xff,0xc0,0xc0,0x00,0xc0,0x40,0x80,
170 
+  0x03,0x05,0x05,0x06,0x01,0x01,0x20,0x40,0x80,0x40,0x20,0x05,0x03,0x03,0x06,0x00,
171 
+  0x02,0xf8,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x01,0x80,0x40,0x20,0x40,0x80,0x05,
172 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x10,0x20,0x20,0x00,0x20,0x05,0x07,0x07,0x06,
173 
+  0x00,0x00,0x70,0x88,0xb8,0xa8,0xb8,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
174 
+  0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x48,0x48,0x70,
175 
+  0x48,0x48,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,
176 
+  0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x48,0x48,0x48,0x48,0x48,0xf0,0x05,0x07,0x07,
177 
+  0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,
178 
+  0xf8,0x80,0x80,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,
179 
+  0x80,0x98,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,
180 
+  0x88,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,
181 
+  0x07,0x06,0x00,0x00,0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x05,0x07,0x07,0x06,0x00,
182 
+  0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,
183 
+  0x80,0x80,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,
184 
+  0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x05,
185 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,
186 
+  0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
187 
+  0x88,0x88,0x88,0xa8,0x90,0x68,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,
188 
+  0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0x70,0x08,0x88,0x70,
189 
+  0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,
190 
+  0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
191 
+  0x88,0x88,0x88,0x88,0x50,0x50,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,
192 
+  0x88,0xa8,0xa8,0x50,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,
193 
+  0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x05,0x07,
194 
+  0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x03,0x09,0x09,0x06,0x01,
195 
+  0xff,0xe0,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,
196 
+  0x80,0x40,0x40,0x20,0x10,0x10,0x08,0x03,0x09,0x09,0x06,0x01,0xff,0xe0,0x20,0x20,
197 
+  0x20,0x20,0x20,0x20,0x20,0xe0,0x05,0x03,0x03,0x06,0x00,0x05,0x20,0x50,0x88,0x05,
198 
+  0x01,0x01,0x06,0x00,0xfe,0xf8,0x03,0x03,0x03,0x06,0x01,0x05,0x80,0x40,0x20,0x05,
199 
+  0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,
200 
+  0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x80,0x80,
201 
+  0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x08,0x08,0x78,0x88,0x88,0x88,0x78,0x05,
202 
+  0x05,0x05,0x06,0x00,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
203 
+  0x30,0x48,0x40,0xe0,0x40,0x40,0x40,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x88,
204 
+  0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x80,0x80,0xf0,0x88,0x88,0x88,
205 
+  0x88,0x03,0x07,0x07,0x06,0x01,0x00,0x40,0x00,0xc0,0x40,0x40,0x40,0xe0,0x04,0x09,
206 
+  0x09,0x06,0x01,0xfe,0x10,0x00,0x30,0x10,0x10,0x10,0x10,0x90,0x60,0x05,0x07,0x07,
207 
+  0x06,0x00,0x00,0x80,0x80,0x88,0x90,0xe0,0x90,0x88,0x03,0x07,0x07,0x06,0x01,0x00,
206 208 
   0xc0,0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xd0,0xa8,0xa8,
207 209 
   0xa8,0xa8,0x05,0x05,0x05,0x06,0x00,0x00,0xb0,0xc8,0x88,0x88,0x88,0x05,0x05,0x05,
208 
-  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x06,0x06,0x06,0x00,0xff,0xf0,0x88,
209 
-  0x88,0xf0,0x80,0x80,0x05,0x06,0x06,0x06,0x00,0xff,0x78,0x88,0x88,0x78,0x08,0x08,
210 
-  0x05,0x05,0x05,0x06,0x00,0x00,0xb0,0xc8,0x80,0x80,0x80,0x05,0x05,0x05,0x06,0x00,
211 
-  0x00,0x70,0x80,0x70,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0x40,0xe0,0x40,
212 
-  0x40,0x48,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x98,0x68,0x05,0x05,
213 
-  0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
214 
-  0x88,0xa8,0xa8,0x50,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,
215 
-  0x06,0x06,0x06,0x00,0xff,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x05,0x05,0x06,0x00,
216 
-  0x00,0xf8,0x10,0x20,0x40,0xf8,0x03,0x07,0x07,0x06,0x01,0x00,0x20,0x40,0x40,0x80,
217 
-  0x40,0x40,0x20,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,
218 
-  0x03,0x07,0x07,0x06,0x01,0x00,0x80,0x40,0x40,0x20,0x40,0x40,0x80,0x05,0x02,0x02,
219 
-  0x06,0x00,0x03,0x68,0x90,0xff,0x05,0x09,0x09,0x06,0x00,0x00,0x30,0x48,0x40,0xf0,
220 
-  0x40,0xf0,0x40,0x48,0x30,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
210 
+  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,
211 
+  0x88,0x88,0xf0,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x78,0x88,0x88,0x88,0x78,
212 
+  0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xb0,0xc8,0x80,0x80,0x80,0x05,0x05,0x05,
213 
+  0x06,0x00,0x00,0x78,0x80,0x70,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
214 
+  0xf8,0x20,0x20,0x20,0x18,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x98,0x68,
215 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x05,0x05,0x05,0x06,0x00,
216 
+  0x00,0x88,0x88,0xa8,0xa8,0x50,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,
217 
+  0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x50,0x20,0x40,0x80,0x05,0x05,
218 
+  0x05,0x06,0x00,0x00,0xf8,0x10,0x20,0x40,0xf8,0x03,0x09,0x09,0x06,0x01,0xff,0x20,
219 
+  0x40,0x40,0x40,0x80,0x40,0x40,0x40,0x20,0x01,0x09,0x09,0x06,0x02,0xff,0x80,0x80,
220 
+  0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x03,0x09,0x09,0x06,0x01,0xff,0x80,0x40,0x40,
221 
+  0x40,0x20,0x40,0x40,0x40,0x80,0x05,0x03,0x03,0x06,0x00,0x02,0x48,0xa8,0x90,0xff,
222 
+  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
221 223 
   0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
222 
-  0xff,0xff,0xff,0xff,0xff,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x00,0x80,0x80,0x80,
223 
-  0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa0,0xa8,0x70,0x20,0x05,
224 
-  0x07,0x07,0x06,0x00,0x00,0x30,0x40,0x40,0xe0,0x40,0x50,0xa8,0x05,0x05,0x05,0x06,
225 
-  0x00,0x00,0x88,0x70,0x50,0x70,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x50,0x20,
226 
-  0xf8,0x20,0xf8,0x20,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x80,0x80,0x00,0x80,0x80,
227 
-  0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x30,0x48,0x20,0x50,0x50,0x20,0x90,0x60,0x03,
228 
-  0x01,0x01,0x06,0x01,0x07,0xa0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0xb8,0xb8,
229 
-  0xb8,0x88,0xf8,0x05,0x07,0x07,0x06,0x00,0x01,0x70,0x08,0x78,0x88,0x78,0x00,0xf8,
230 
-  0x05,0x05,0x05,0x06,0x00,0x01,0x28,0x50,0xa0,0x50,0x28,0x05,0x03,0x03,0x06,0x00,
231 
-  0x01,0xf8,0x08,0x08,0x02,0x02,0x02,0x06,0x02,0x06,0x40,0x80,0x05,0x07,0x07,0x06,
232 
-  0x00,0x00,0xf8,0x88,0xa8,0x88,0x98,0xa8,0xf8,0x05,0x01,0x01,0x06,0x00,0x06,0xf8,
233 
-  0x04,0x04,0x04,0x06,0x00,0x03,0x60,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,
234 
-  0x20,0x20,0xf8,0x20,0x20,0x00,0xf8,0x04,0x05,0x05,0x06,0x00,0x03,0x60,0x90,0x20,
235 
-  0x40,0xf0,0x03,0x05,0x05,0x06,0x00,0x03,0xe0,0x20,0xe0,0x20,0xe0,0x02,0x02,0x02,
236 
-  0x06,0x02,0x06,0x40,0x80,0x05,0x08,0x08,0x06,0x00,0xff,0x88,0x88,0x88,0x88,0x98,
237 
-  0xe8,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x98,0x98,0x78,0x18,0x18,0x18,
238 
-  0x02,0x02,0x02,0x06,0x02,0x02,0xc0,0xc0,0x02,0x02,0x02,0x06,0x02,0xff,0x40,0x80,
239 
-  0x03,0x05,0x05,0x06,0x00,0x03,0x40,0xc0,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,
240 
-  0x01,0x70,0x88,0x88,0x88,0x70,0x00,0xf8,0x05,0x05,0x05,0x06,0x00,0x01,0xa0,0x50,
241 
-  0x28,0x50,0xa0,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa8,0x58,0xb8,0x08,0x08,
242 
-  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xb8,0x48,0x98,0x20,0x38,0x05,0x08,0x08,
243 
-  0x06,0x00,0x00,0xc0,0x40,0xc0,0x48,0xd8,0x38,0x08,0x08,0x05,0x07,0x07,0x06,0x00,
244 
-  0x00,0x20,0x00,0x20,0x40,0x80,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,
245 
-  0x00,0x70,0x88,0xf8,0x88,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,
246 
-  0x88,0xf8,0x88,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,0x70,0x88,0xf8,
247 
-  0x88,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x68,0x90,0x00,0x70,0x88,0xf8,0x88,0x88,
248 
-  0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x05,0x08,
249 
-  0x08,0x06,0x00,0x00,0x20,0x50,0x20,0x70,0x88,0xf8,0x88,0x88,0x05,0x07,0x07,0x06,
250 
-  0x00,0x00,0x38,0x60,0xa0,0xb8,0xe0,0xa0,0xb8,0x05,0x08,0x08,0x06,0x00,0xff,0x70,
251 
-  0x88,0x80,0x80,0x88,0x70,0x20,0x60,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,
252 
-  0xf8,0x80,0xf0,0x80,0xf8,0x05,0x08,0x08,0x06,0x00,0x00,0x08,0x10,0x00,0xf8,0x80,
253 
-  0xf0,0x80,0xf8,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,0xf8,0x80,0xf0,0x80,
254 
-  0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0xf8,0x80,0xf0,0x80,0xf8,0x03,0x08,
255 
-  0x08,0x06,0x01,0x00,0x80,0x40,0x00,0xe0,0x40,0x40,0x40,0xe0,0x03,0x08,0x08,0x06,
256 
-  0x01,0x00,0x20,0x40,0x00,0xe0,0x40,0x40,0x40,0xe0,0x03,0x08,0x08,0x06,0x01,0x00,
257 
-  0x40,0xa0,0x00,0xe0,0x40,0x40,0x40,0xe0,0x03,0x07,0x07,0x06,0x01,0x00,0xa0,0x00,
258 
-  0xe0,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x48,0x48,0xe8,0x48,
259 
-  0x48,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x68,0x90,0x00,0x88,0xc8,0xa8,0x98,0x88,
260 
-  0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x70,0x88,0x88,0x88,0x88,0x70,0x05,0x08,
261 
-  0x08,0x06,0x00,0x00,0x10,0x20,0x70,0x88,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,
262 
-  0x00,0x00,0x20,0x50,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,
263 
-  0x68,0x90,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x00,
264 
-  0x70,0x88,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x01,0x88,0x50,0x20,0x50,
265 
-  0x88,0x05,0x08,0x08,0x06,0x00,0xff,0x10,0x70,0xa8,0xa8,0xa8,0xa8,0x70,0x40,0x05,
266 
-  0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x08,0x08,
267 
-  0x06,0x00,0x00,0x10,0x20,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,
268 
-  0x00,0x20,0x50,0x00,0x88,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,
269 
-  0x00,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x88,
270 
-  0x50,0x20,0x20,0x20,0x20,0x05,0x09,0x09,0x06,0x00,0xff,0xc0,0x40,0x70,0x48,0x48,
271 
-  0x70,0x40,0x40,0xe0,0x04,0x08,0x08,0x06,0x01,0xff,0x60,0x90,0x90,0xa0,0x90,0x90,
272 
-  0xe0,0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x08,0x78,0x88,0x78,
273 
-  0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x08,
274 
-  0x08,0x06,0x00,0x00,0x20,0x50,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x08,0x08,0x06,
275 
-  0x00,0x00,0x68,0x90,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,
276 
-  0x50,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x20,
277 
-  0x70,0x08,0x78,0x88,0x78,0x05,0x06,0x06,0x06,0x00,0x00,0xd0,0x28,0x78,0xa0,0xa8,
278 
-  0x50,0x05,0x06,0x06,0x06,0x00,0xff,0x70,0x80,0x88,0x70,0x20,0x60,0x05,0x08,0x08,
279 
-  0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x08,0x08,0x06,0x00,
280 
-  0x00,0x10,0x20,0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x20,
281 
-  0x50,0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,
282 
-  0x88,0xf8,0x80,0x70,0x03,0x08,0x08,0x06,0x01,0x00,0x80,0x40,0x00,0x40,0xc0,0x40,
283 
-  0x40,0xe0,0x03,0x08,0x08,0x06,0x01,0x00,0x20,0x40,0x00,0x40,0xc0,0x40,0x40,0xe0,
284 
-  0x03,0x08,0x08,0x06,0x01,0x00,0x40,0xa0,0x00,0x40,0xc0,0x40,0x40,0xe0,0x03,0x07,
285 
-  0x07,0x06,0x01,0x00,0xa0,0x00,0x40,0xc0,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,
286 
-  0x00,0xa0,0x40,0xa0,0x10,0x78,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x68,0x90,
287 
-  0x00,0xb0,0xc8,0x88,0x88,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x70,
288 
-  0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x88,
289 
-  0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,0x70,0x88,0x88,0x88,0x70,
290 
-  0x05,0x08,0x08,0x06,0x00,0x00,0x68,0x90,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x07,
291 
-  0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
292 
-  0x01,0x20,0x00,0xf8,0x00,0x20,0x05,0x07,0x07,0x06,0x00,0xff,0x10,0x70,0xa8,0xa8,
293 
-  0xa8,0x70,0x40,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x88,0x88,0x88,0x98,
294 
-  0x68,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x88,0x88,0x88,0x98,0x68,0x05,
295 
-  0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,0x88,0x88,0x88,0x98,0x68,0x05,0x07,0x07,
296 
-  0x06,0x00,0x00,0x50,0x00,0x88,0x88,0x88,0x98,0x68,0x05,0x09,0x09,0x06,0x00,0xff,
297 
-  0x10,0x20,0x00,0x88,0x88,0x88,0xf8,0x08,0x70,0x04,0x07,0x07,0x06,0x01,0xff,0xc0,
298 
-  0x40,0x60,0x50,0x60,0x40,0xe0,0x05,0x08,0x08,0x06,0x00,0xff,0x50,0x00,0x88,0x88,
299 
-  0x88,0x78,0x08,0x70};
224 
+  0x00,0x00,0x00,0x06,0x05,0xff,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x00,0x80,0x80,
225 
+  0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0xff,0x20,0x70,0xa8,0xa0,0xa8,0x70,0x20,
226 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x30,0x48,0x40,0xe0,0x40,0x48,0xb0,0x05,0x05,0x05,
227 
+  0x06,0x00,0x00,0xa8,0x50,0x88,0x50,0xa8,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x50,
228 
+  0xf8,0x20,0xf8,0x20,0x20,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x80,0x80,0x00,0x80,
229 
+  0x80,0x80,0x04,0x08,0x08,0x06,0x01,0x00,0x70,0x80,0x60,0x90,0x90,0x60,0x10,0xe0,
230 
+  0x03,0x01,0x01,0x06,0x01,0x07,0xa0,0x06,0x07,0x07,0x06,0x00,0x00,0x78,0x84,0xb4,
231 
+  0xa4,0xb4,0x84,0x78,0x03,0x05,0x05,0x06,0x01,0x04,0x60,0xa0,0x60,0x00,0xe0,0x05,
232 
+  0x05,0x05,0x06,0x00,0x00,0x28,0x50,0xa0,0x50,0x28,0x05,0x03,0x03,0x06,0x00,0x01,
233 
+  0xf8,0x08,0x08,0x03,0x01,0x01,0x06,0x01,0x03,0xe0,0x06,0x07,0x07,0x06,0x00,0x00,
234 
+  0x78,0x84,0xb4,0xa4,0xa4,0x84,0x78,0x05,0x01,0x01,0x06,0x00,0x07,0xf8,0x04,0x04,
235 
+  0x04,0x06,0x01,0x05,0x60,0x90,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
236 
+  0xf8,0x20,0x20,0x00,0xf8,0x03,0x05,0x05,0x06,0x01,0x05,0x40,0xa0,0x20,0x40,0xe0,
237 
+  0x03,0x05,0x05,0x06,0x01,0x05,0xc0,0x20,0x40,0x20,0xc0,0x03,0x03,0x03,0x06,0x01,
238 
+  0x05,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,
239 
+  0x80,0x05,0x08,0x08,0x06,0x00,0x00,0x78,0xe8,0xe8,0xe8,0x68,0x28,0x28,0x28,0x02,
240 
+  0x02,0x02,0x06,0x02,0x03,0xc0,0xc0,0x03,0x02,0x02,0x06,0x01,0xfe,0x20,0xc0,0x03,
241 
+  0x05,0x05,0x06,0x01,0x05,0x40,0xc0,0x40,0x40,0xe0,0x03,0x05,0x05,0x06,0x01,0x05,
242 
+  0x40,0xa0,0x40,0x00,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0x50,0x28,0x50,0xa0,
243 
+  0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xb0,0x50,0x78,0x10,
244 
+  0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0xc0,0x48,0x50,0x60,0x50,0xa8,0x08,0x10,0x38,
245 
+  0x05,0x0a,0x0a,0x06,0x00,0x00,0xc0,0x20,0x48,0x30,0xe0,0x50,0xb0,0x50,0x78,0x10,
246 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x00,0x20,0x20,0x40,0x88,0x70,0x05,0x0a,0x0a,
247 
+  0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x0a,0x0a,
248 
+  0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x0a,0x0a,
249 
+  0x06,0x00,0x00,0x20,0x50,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x0a,0x0a,
250 
+  0x06,0x00,0x00,0x68,0xb0,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x09,0x09,
251 
+  0x06,0x00,0x00,0x50,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x0a,0x0a,0x06,
252 
+  0x00,0x00,0x20,0x50,0x20,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
253 
+  0x00,0x00,0x78,0xa0,0xa0,0xf0,0xa0,0xa0,0xb8,0x05,0x09,0x09,0x06,0x00,0xfe,0x70,
254 
+  0x88,0x80,0x80,0x80,0x88,0x70,0x10,0x60,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0x20,
255 
+  0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,
256 
+  0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x0a,0x0a,0x06,0x00,0x00,0x20,0x50,
257 
+  0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x00,
258 
+  0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x03,0x0a,0x0a,0x06,0x01,0x00,0x80,0x40,0x00,
259 
+  0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,0x03,0x0a,0x0a,0x06,0x01,0x00,0x20,0x40,0x00,
260 
+  0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,0x03,0x0a,0x0a,0x06,0x01,0x00,0x40,0xa0,0x00,
261 
+  0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,0x03,0x09,0x09,0x06,0x01,0x00,0xa0,0x00,0xe0,
262 
+  0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x48,0x48,0xe8,
263 
+  0x48,0x48,0x70,0x05,0x0a,0x0a,0x06,0x00,0x00,0x68,0xb0,0x00,0x88,0x88,0xc8,0xa8,
264 
+  0x98,0x88,0x88,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x88,0x88,0x88,
265 
+  0x88,0x88,0x70,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x88,0x88,
266 
+  0x88,0x88,0x70,0x05,0x0a,0x0a,0x06,0x00,0x00,0x20,0x50,0x00,0x70,0x88,0x88,0x88,
267 
+  0x88,0x88,0x70,0x05,0x0a,0x0a,0x06,0x00,0x00,0x68,0xb0,0x00,0x70,0x88,0x88,0x88,
268 
+  0x88,0x88,0x70,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0x88,0x88,0x88,
269 
+  0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x01,0x88,0x50,0x20,0x50,0x88,0x05,0x09,0x09,
270 
+  0x06,0x00,0xff,0x08,0x70,0x98,0xa8,0xa8,0xa8,0xc8,0x70,0x80,0x05,0x0a,0x0a,0x06,
271 
+  0x00,0x00,0x40,0x20,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x0a,0x0a,0x06,
272 
+  0x00,0x00,0x10,0x20,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x0a,0x0a,0x06,
273 
+  0x00,0x00,0x20,0x50,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x09,0x09,0x06,
274 
+  0x00,0x00,0x50,0x00,0x88,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x0a,0x0a,0x06,0x00,
275 
+  0x00,0x10,0x20,0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x04,0x07,0x07,0x06,0x01,
276 
+  0x00,0x80,0xe0,0x90,0x90,0x90,0xe0,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,
277 
+  0x90,0xa0,0x90,0x88,0xb0,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x08,
278 
+  0x78,0x88,0x78,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x08,0x78,0x88,
279 
+  0x78,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,0x70,0x08,0x78,0x88,0x78,0x05,
280 
+  0x08,0x08,0x06,0x00,0x00,0x68,0xb0,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,
281 
+  0x06,0x00,0x00,0x50,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x08,0x08,0x06,0x00,0x00,
282 
+  0x20,0x50,0x20,0x70,0x08,0x78,0x88,0x78,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x28,
283 
+  0x70,0xa0,0x78,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x80,0x88,0x70,0x10,0x60,
284 
+  0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x08,
285 
+  0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x08,0x08,0x06,
286 
+  0x00,0x00,0x20,0x50,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
287 
+  0x50,0x00,0x70,0x88,0xf0,0x80,0x70,0x03,0x08,0x08,0x06,0x01,0x00,0x80,0x40,0x00,
288 
+  0xc0,0x40,0x40,0x40,0xe0,0x03,0x08,0x08,0x06,0x01,0x00,0x20,0x40,0x00,0xc0,0x40,
289 
+  0x40,0x40,0xe0,0x03,0x08,0x08,0x06,0x01,0x00,0x40,0xa0,0x00,0xc0,0x40,0x40,0x40,
290 
+  0xe0,0x03,0x07,0x07,0x06,0x01,0x00,0xa0,0x00,0xc0,0x40,0x40,0x40,0xe0,0x05,0x09,
291 
+  0x09,0x06,0x00,0x00,0x50,0x20,0x50,0x08,0x78,0x88,0x88,0x88,0x70,0x05,0x08,0x08,
292 
+  0x06,0x00,0x00,0x68,0xb0,0x00,0xb0,0xc8,0x88,0x88,0x88,0x05,0x08,0x08,0x06,0x00,
293 
+  0x00,0x40,0x20,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x10,
294 
+  0x20,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,
295 
+  0x70,0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x68,0xb0,0x00,0x70,0x88,
296 
+  0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0x88,0x88,0x70,
297 
+  0x05,0x05,0x05,0x06,0x00,0x01,0x20,0x00,0xf8,0x00,0x20,0x05,0x05,0x05,0x06,0x00,
298 
+  0x00,0x78,0x98,0xa8,0xc8,0xf0,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x88,
299 
+  0x88,0x88,0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x88,0x88,0x88,
300 
+  0x88,0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x00,0x88,0x88,0x88,0x88,0x70,
301 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x88,0x88,0x88,0x88,0x70,0x05,0x0a,0x0a,
302 
+  0x06,0x00,0xfe,0x10,0x20,0x00,0x88,0x88,0x88,0x50,0x20,0x40,0x80,0x05,0x09,0x09,
303 
+  0x06,0x00,0xfe,0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0x05,0x09,0x09,0x06,
304 
+  0x00,0xfe,0x50,0x00,0x88,0x88,0x88,0x50,0x20,0x40,0x80};
300 305
301 306 
 #endif

+ 6
- 6
Marlin/src/lcd/dogm/language_data_an.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 46
- 44
Marlin/src/lcd/dogm/language_data_bg.h 查看文件 

@@ -1,66 +1,68 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 const u8g_fntpgm_uint8_t fontpage_8_144_149[96] U8G_FONT_SECTION("fontpage_8_144_149") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xff,0x00,
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x95,0x00,0x07,0xff,0x00,
9 10 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,
10 
-  0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
11 
-  0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,
12 
-  0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,0x00,0xff,0x78,0x28,0x28,0x28,0x48,
13 
-  0x88,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8
11 
+  0x07,0x06,0x00,0x00,0xf0,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
12 
+  0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,
13 
+  0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0x50,
14 
+  0x50,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8
14 15 
   };
15 16 
 const u8g_fntpgm_uint8_t fontpage_8_151_152[43] U8G_FONT_SECTION("fontpage_8_151_152") = {
16 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x97,0x98,0x00,0x07,0x00,0x00,
17 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x08,0x08,0x70,0x08,0x08,0xf0,0x05,0x07,
17 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x97,0x98,0x00,0x07,0x00,0x00,
18 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,0x70,0x08,0x88,0x70,0x05,0x07,
18 19 
   0x07,0x06,0x00,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88};
19 20 
 const u8g_fntpgm_uint8_t fontpage_8_154_164[160] U8G_FONT_SECTION("fontpage_8_154_164") = {
20 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9a,0xa4,0x00,0x07,0x00,0x00,
21 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9a,0xa4,0x00,0x07,0x00,0x00,
21 22 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,
22 
-  0x07,0x06,0x00,0x00,0x78,0x28,0x28,0x28,0x28,0xa8,0x48,0x05,0x07,0x07,0x06,0x00,
23 
+  0x07,0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x48,0x48,0x88,0x05,0x07,0x07,0x06,0x00,
23 24 
   0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,
24 25 
   0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,
25 26 
   0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,
26 27 
   0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,
27 28 
   0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,
28 
-  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x50,
29 
-  0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20
29 
+  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,
30 
+  0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20
31 
+  };
32 
+const u8g_fntpgm_uint8_t fontpage_8_166_166[32] U8G_FONT_SECTION("fontpage_8_166_166") = {
33 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x07,0xfe,0x00,
34 
+  0x00,0x05,0x09,0x09,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0x90,0x90,0xf8,0x08,0x08
30 35 
   };
31 
-const u8g_fntpgm_uint8_t fontpage_8_166_166[31] U8G_FONT_SECTION("fontpage_8_166_166") = {
32 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x07,0xff,0x00,
33 
-  0x00,0x05,0x08,0x08,0x06,0x00,0xff,0x88,0x88,0x88,0x88,0x88,0x88,0xf8,0x08};
34 
-const u8g_fntpgm_uint8_t fontpage_8_175_195[257] U8G_FONT_SECTION("fontpage_8_175_195") = {
35 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaf,0xc3,0x00,0x07,0xff,0x00,
36 
+const u8g_fntpgm_uint8_t fontpage_8_175_195[260] U8G_FONT_SECTION("fontpage_8_175_195") = {
37 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaf,0xc3,0x00,0x08,0xfe,0x00,
36 38 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x88,0x88,0x78,0x28,0x48,0x88,0x05,0x05,
37 
-  0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x18,
38 
-  0x60,0x80,0xf0,0x88,0x88,0x70,0x04,0x05,0x05,0x06,0x00,0x00,0xe0,0x90,0xe0,0x90,
39 
-  0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,0x80,0x80,0x80,0x05,0x06,0x06,0x06,
40 
-  0x00,0xff,0x78,0x28,0x48,0x88,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
41 
-  0xf8,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x70,0xa8,0xa8,0x05,0x05,
42 
-  0x05,0x06,0x00,0x00,0xf0,0x08,0x30,0x08,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
43 
-  0x98,0xa8,0xc8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x20,0x88,0x98,0xa8,0xc8,
44 
-  0x88,0x04,0x05,0x05,0x06,0x00,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x05,0x05,0x06,
45 
-  0x00,0x00,0xf8,0x28,0x28,0xa8,0x48,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0xd8,0xa8,
46 
-  0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x05,0x05,0x05,
47 
-  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,
48 
-  0x88,0x88,0x88,0x05,0x06,0x06,0x06,0x00,0xff,0xf0,0x88,0x88,0xf0,0x80,0x80,0x05,
49 
-  0x05,0x05,0x06,0x00,0x00,0x70,0x80,0x80,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,
50 
-  0xf8,0x20,0x20,0x20,0x20,0x05,0x06,0x06,0x06,0x00,0xff,0x88,0x88,0x88,0x78,0x08,
51 
-  0x70};
52 
-const u8g_fntpgm_uint8_t fontpage_8_197_200[62] U8G_FONT_SECTION("fontpage_8_197_200") = {
53 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc5,0xc8,0x00,0x05,0xff,0x00,
54 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x06,0x06,0x06,
55 
-  0x00,0xff,0x88,0x88,0x88,0x88,0xf8,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,
56 
-  0xf8,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xf8};
39 
+  0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
40 
+  0x80,0xf0,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,0x88,0xf0,0x88,
41 
+  0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x05,0x06,0x06,0x06,
42 
+  0x00,0xff,0x30,0x50,0x50,0x50,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
43 
+  0xf0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0x70,0x20,0x70,0xa8,0x05,0x05,
44 
+  0x05,0x06,0x00,0x00,0x70,0x88,0x30,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
45 
+  0x98,0xa8,0xc8,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x88,0x70,0x00,0x88,0x98,0xa8,
46 
+  0xc8,0x88,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x05,0x05,
47 
+  0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0xd8,
48 
+  0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x05,0x05,
49 
+  0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,
50 
+  0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,0x88,0x88,0xf0,0x80,
51 
+  0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x05,0x05,0x05,0x06,
52 
+  0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,
53 
+  0x88,0x78,0x08,0x70};
54 
+const u8g_fntpgm_uint8_t fontpage_8_197_200[63] U8G_FONT_SECTION("fontpage_8_197_200") = {
55 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc5,0xc8,0x00,0x05,0xfe,0x00,
56 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x07,0x07,0x06,
57 
+  0x00,0xfe,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
58 
+  0x88,0x78,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xf8};
57 59 
 const u8g_fntpgm_uint8_t fontpage_8_202_202[28] U8G_FONT_SECTION("fontpage_8_202_202") = {
58 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xca,0xca,0x00,0x05,0x00,0x00,
60 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xca,0xca,0x00,0x05,0x00,0x00,
59 61 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0xc0,0x40,0x70,0x48,0x70};
60 62 
 const u8g_fntpgm_uint8_t fontpage_8_206_207[39] U8G_FONT_SECTION("fontpage_8_206_207") = {
61 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xce,0xcf,0x00,0x05,0x00,0x00,
62 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x05,0x05,0x05,0x06,
63 
-  0x00,0x00,0x78,0x88,0x78,0x28,0x48};
63 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xce,0xcf,0x00,0x05,0x00,0x00,
64 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x04,0x05,0x05,0x06,
65 
+  0x01,0x00,0x70,0x90,0x70,0x50,0x90};
64 66
65 67 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
66 68 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 6
- 6
Marlin/src/lcd/dogm/language_data_ca.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 37
- 42
Marlin/src/lcd/dogm/language_data_cz.h 查看文件 

@@ -1,47 +1,42 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_2_140_141[49] U8G_FONT_SECTION("fontpage_2_140_141") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8d,0x00,0x0b,0x00,0x00,
9 
-  0x00,0x06,0x0b,0x0b,0x07,0x00,0x00,0x28,0x10,0x00,0x3c,0x40,0x80,0x80,0x80,0x80,
10 
-  0x40,0x3c,0x04,0x09,0x09,0x05,0x00,0x00,0x50,0x20,0x00,0x70,0x80,0x80,0x80,0x80,
11 
-  0x70};
12 
-const u8g_fntpgm_uint8_t fontpage_2_143_143[31] U8G_FONT_SECTION("fontpage_2_143_143") = {
13 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8f,0x8f,0x00,0x08,0x00,0x00,
14 
-  0x00,0x08,0x08,0x08,0x09,0x00,0x00,0x09,0x0a,0x78,0x88,0x88,0x88,0x88,0x78};
15 
-const u8g_fntpgm_uint8_t fontpage_2_155_155[32] U8G_FONT_SECTION("fontpage_2_155_155") = {
16 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9b,0x9b,0x00,0x09,0x00,0x00,
17 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0xf8,0x80,0x80,0x78
18 
-  };
19 
-const u8g_fntpgm_uint8_t fontpage_2_200_200[32] U8G_FONT_SECTION("fontpage_2_200_200") = {
20 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc8,0xc8,0x00,0x09,0x00,0x00,
21 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf0,0x88,0x88,0x88,0x88,0x88
22 
-  };
23 
-const u8g_fntpgm_uint8_t fontpage_2_216_217[49] U8G_FONT_SECTION("fontpage_2_216_217") = {
24 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd8,0xd9,0x00,0x0b,0x00,0x00,
25 
-  0x00,0x06,0x0b,0x0b,0x07,0x00,0x00,0x50,0x20,0x00,0xf0,0x88,0x88,0x88,0xf0,0x90,
26 
-  0x88,0x84,0x03,0x09,0x09,0x04,0x00,0x00,0xa0,0x40,0x00,0xe0,0x80,0x80,0x80,0x80,
27 
-  0x80};
28 
-const u8g_fntpgm_uint8_t fontpage_2_225_225[32] U8G_FONT_SECTION("fontpage_2_225_225") = {
29 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe1,0xe1,0x00,0x09,0x00,0x00,
30 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x60,0x10,0x88,0x70
31 
-  };
32 
-const u8g_fntpgm_uint8_t fontpage_2_229_229[32] U8G_FONT_SECTION("fontpage_2_229_229") = {
33 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe5,0xe5,0x00,0x09,0x00,0x00,
34 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x08,0x50,0x40,0xf0,0x40,0x40,0x40,0x40,0x30
35 
-  };
36 
-const u8g_fntpgm_uint8_t fontpage_2_239_239[32] U8G_FONT_SECTION("fontpage_2_239_239") = {
37 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xef,0xef,0x00,0x09,0x00,0x00,
38 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x20,0x50,0x20,0x88,0x88,0x88,0x88,0x88,0x78
39 
-  };
40 
-const u8g_fntpgm_uint8_t fontpage_2_253_254[49] U8G_FONT_SECTION("fontpage_2_253_254") = {
41 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfd,0xfe,0x00,0x0b,0x00,0x00,
42 
-  0x00,0x07,0x0b,0x0b,0x08,0x00,0x00,0x24,0x18,0x00,0xfe,0x04,0x08,0x10,0x20,0x40,
43 
-  0x80,0xfe,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,
44 
-  0xf8};
8 
+const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8d,0x00,0x0a,0x00,0x00,
10 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x80,0x80,0x88,
11 
+  0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x88,0x70};
12 
+const u8g_fntpgm_uint8_t fontpage_2_143_143[33] U8G_FONT_SECTION("fontpage_2_143_143") = {
13 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8f,0x8f,0x00,0x0a,0x00,0x00,
14 
+  0x00,0x06,0x0a,0x0a,0x06,0x00,0x00,0x14,0x08,0x00,0x08,0x08,0x78,0x88,0x88,0x88,
15 
+  0x78};
16 
+const u8g_fntpgm_uint8_t fontpage_2_155_155[31] U8G_FONT_SECTION("fontpage_2_155_155") = {
17 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9b,0x9b,0x00,0x08,0x00,0x00,
18 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0xf0,0x80,0x70};
19 
+const u8g_fntpgm_uint8_t fontpage_2_200_200[31] U8G_FONT_SECTION("fontpage_2_200_200") = {
20 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc8,0xc8,0x00,0x08,0x00,0x00,
21 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xb0,0xc8,0x88,0x88,0x88};
22 
+const u8g_fntpgm_uint8_t fontpage_2_216_217[47] U8G_FONT_SECTION("fontpage_2_216_217") = {
23 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd8,0xd9,0x00,0x0a,0x00,0x00,
24 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf0,0x88,0x88,0xf0,0xa0,0x90,
25 
+  0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xb0,0xc8,0x80,0x80,0x80};
26 
+const u8g_fntpgm_uint8_t fontpage_2_225_225[31] U8G_FONT_SECTION("fontpage_2_225_225") = {
27 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe1,0xe1,0x00,0x08,0x00,0x00,
28 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x78,0x80,0x70,0x08,0xf0};
29 
+const u8g_fntpgm_uint8_t fontpage_2_229_229[33] U8G_FONT_SECTION("fontpage_2_229_229") = {
30 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe5,0xe5,0x00,0x0a,0x00,0x00,
31 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x20,0x20,0xf8,0x20,0x20,0x20,
32 
+  0x18};
33 
+const u8g_fntpgm_uint8_t fontpage_2_239_239[31] U8G_FONT_SECTION("fontpage_2_239_239") = {
34 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xef,0xef,0x00,0x08,0x00,0x00,
35 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x20,0x88,0x88,0x88,0x88,0x70};
36 
+const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253_254") = {
37 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfd,0xfe,0x00,0x0a,0x00,0x00,
38 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,
39 
+  0xf8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x10,0x20,0x40,0xf8};
45 40
46 41 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
47 42 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 6
- 6
Marlin/src/lcd/dogm/language_data_da.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_de.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 62
- 60
Marlin/src/lcd/dogm/language_data_el-gr.h 查看文件 

@@ -1,74 +1,76 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_7_136_136[31] U8G_FONT_SECTION("fontpage_7_136_136") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x08,0x00,0x00,
9 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x80,0xf8,0x80,0xf0,0x80,0x80,0xf8};
10 
-const u8g_fntpgm_uint8_t fontpage_7_145_157[185] U8G_FONT_SECTION("fontpage_7_145_157") = {
11 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x91,0x9d,0x00,0x07,0x00,0x00,
12 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x50,0x88,0x88,0xf8,0x88,0x88,0x05,0x07,
13 
-  0x07,0x06,0x00,0x00,0xf0,0x48,0x48,0x70,0x48,0x48,0xf0,0x05,0x07,0x07,0x06,0x00,
14 
-  0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0x50,
15 
-  0x50,0x88,0x88,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,
16 
-  0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x05,0x07,
17 
-  0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
18 
-  0x00,0x70,0x88,0x88,0xa8,0x88,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x40,
19 
-  0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,
20 
-  0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x50,0x88,0x88,0x88,0x88,0x88,0x05,
21 
-  0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0xa8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
22 
-  0x00,0x00,0x88,0xc8,0xc8,0xa8,0x98,0x98,0x88};
8 
+const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0a,0x00,0x00,
10 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0x80,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,
11 
+  0xf8};
12 
+const u8g_fntpgm_uint8_t fontpage_7_145_157[186] U8G_FONT_SECTION("fontpage_7_145_157") = {
13 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x91,0x9d,0x00,0x07,0x00,0x00,
14 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,
15 
+  0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
16 
+  0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
17 
+  0x50,0x50,0x88,0x88,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,
18 
+  0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x05,
19 
+  0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
20 
+  0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,
21 
+  0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,
22 
+  0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,0x50,0x50,0x88,0x88,0x88,
23 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,
24 
+  0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88};
23 25 
 const u8g_fntpgm_uint8_t fontpage_7_159_161[56] U8G_FONT_SECTION("fontpage_7_159_161") = {
24 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9f,0xa1,0x00,0x07,0x00,0x00,
26 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9f,0xa1,0x00,0x07,0x00,0x00,
25 27 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,
26 
-  0x07,0x06,0x00,0x00,0xf8,0x50,0x50,0x50,0x50,0x50,0x50,0x05,0x07,0x07,0x06,0x00,
28 
+  0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
27 29 
   0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80};
28 30 
 const u8g_fntpgm_uint8_t fontpage_7_163_167[82] U8G_FONT_SECTION("fontpage_7_163_167") = {
29 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa3,0xa7,0x00,0x07,0x00,0x00,
30 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x40,0x20,0x40,0x80,0xf8,0x05,0x07,
31 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa3,0xa7,0x00,0x07,0x00,0x00,
32 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x40,0x20,0x10,0x20,0x40,0xf8,0x05,0x07,
31 33 
   0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,
32 
-  0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x20,
33 
-  0x70,0xa8,0x70,0x20,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,
34 
+  0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,
35 
+  0xa8,0xa8,0xa8,0x70,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,
34 36 
   0x88,0x88};
35 37 
 const u8g_fntpgm_uint8_t fontpage_7_172_175[75] U8G_FONT_SECTION("fontpage_7_172_175") = {
36 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xac,0xaf,0x00,0x08,0xfe,0x00,
37 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x08,0x68,0x98,0x90,0x90,0x68,0x05,
38 
-  0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x00,0x70,0x88,0xe0,0x88,0x70,0x05,0x0a,0x0a,
39 
-  0x06,0x00,0xfe,0x20,0x40,0x00,0x70,0x88,0x88,0x88,0x88,0x08,0x08,0x02,0x08,0x08,
40 
-  0x06,0x01,0x00,0x40,0x80,0x00,0x80,0x80,0x80,0x80,0x40};
41 
-const u8g_fntpgm_uint8_t fontpage_7_177_199[297] U8G_FONT_SECTION("fontpage_7_177_199") = {
42 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb1,0xc7,0x00,0x08,0xfe,0x00,
43 
-  0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x08,0x68,0x98,0x90,0x90,0x68,0x04,0x07,0x07,
44 
-  0x06,0x00,0xfe,0x60,0x90,0xf0,0x90,0xe0,0x80,0x80,0x05,0x06,0x06,0x06,0x00,0xff,
45 
-  0x88,0x48,0x50,0x20,0x20,0x40,0x05,0x06,0x06,0x06,0x00,0x00,0x30,0x40,0x70,0x88,
46 
-  0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0xe0,0x88,0x70,0x05,0x09,0x09,
47 
-  0x06,0x00,0xfe,0x80,0x70,0x40,0x80,0x80,0x80,0x70,0x08,0x70,0x05,0x07,0x07,0x06,
48 
-  0x00,0xfe,0xb8,0xc8,0x88,0x88,0x88,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x70,
49 
-  0x88,0xf8,0x88,0x70,0x03,0x05,0x05,0x06,0x01,0x00,0x80,0x80,0x80,0x80,0x60,0x04,
50 
-  0x05,0x05,0x06,0x00,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x06,0x06,0x06,0x00,0x00,
51 
-  0x40,0x20,0x20,0x50,0x50,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0xd8,
52 
-  0xa8,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x50,0x60,0x20,0x05,0x0a,
53 
-  0x0a,0x06,0x00,0xfe,0x80,0xe0,0x80,0x70,0x20,0x40,0x80,0x70,0x08,0x70,0x05,0x05,
54 
-  0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,
55 
-  0x50,0x50,0x50,0x50,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x88,0xc8,0xb0,0x80,
56 
-  0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x30,0x40,0x80,0x40,0x30,0x08,0x70,0x05,0x05,
57 
-  0x05,0x06,0x00,0x00,0x68,0x90,0x90,0x90,0x60,0x04,0x05,0x05,0x06,0x00,0x00,0xf0,
58 
-  0x40,0x40,0x40,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x90,0x90,0xe0,0x05,
59 
-  0x08,0x08,0x06,0x00,0xfe,0x30,0xa8,0xa8,0xa8,0xa8,0x70,0x20,0x20,0x05,0x06,0x06,
60 
-  0x06,0x00,0xff,0x88,0x50,0x20,0x20,0x50,0x88};
38 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xac,0xaf,0x00,0x08,0xfe,0x00,
39 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x68,0x90,0x90,0x90,0x68,0x05,
40 
+  0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x60,0x88,0x70,0x05,0x0a,0x0a,
41 
+  0x06,0x00,0xfe,0x10,0x20,0x00,0xb0,0xc8,0x88,0x88,0x88,0x08,0x08,0x03,0x08,0x08,
42 
+  0x06,0x01,0x00,0x40,0x80,0x00,0x80,0x80,0x80,0xa0,0x40};
43 
+const u8g_fntpgm_uint8_t fontpage_7_177_199[303] U8G_FONT_SECTION("fontpage_7_177_199") = {
44 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb1,0xc7,0x00,0x09,0xfe,0x00,
45 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x68,0x90,0x90,0x90,0x68,0x05,0x09,0x09,0x06,
46 
+  0x00,0xfe,0x60,0x90,0x90,0xb0,0x88,0x88,0xf0,0x80,0x80,0x05,0x07,0x07,0x06,0x00,
47 
+  0xfe,0x88,0x88,0x50,0x50,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x80,
48 
+  0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x60,0x88,0x70,
49 
+  0x05,0x08,0x08,0x06,0x00,0xff,0xf8,0x20,0x40,0x40,0x40,0x30,0x08,0x30,0x05,0x07,
50 
+  0x07,0x06,0x00,0xfe,0xb0,0xc8,0x88,0x88,0x88,0x08,0x08,0x04,0x07,0x07,0x06,0x01,
51 
+  0x00,0x60,0x90,0x90,0xf0,0x90,0x90,0x60,0x03,0x05,0x05,0x06,0x02,0x00,0x80,0x80,
52 
+  0x80,0xa0,0x40,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x09,
53 
+  0x09,0x06,0x00,0x00,0x80,0x40,0x40,0x20,0x20,0x50,0x50,0x88,0x88,0x05,0x07,0x07,
54 
+  0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,
55 
+  0x88,0x88,0x50,0x50,0x20,0x05,0x09,0x09,0x06,0x00,0xfe,0xf8,0x20,0x40,0x70,0x80,
56 
+  0x80,0x70,0x08,0x10,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x06,
57 
+  0x05,0x05,0x06,0x00,0x00,0xf8,0x50,0x50,0x54,0x48,0x05,0x07,0x07,0x06,0x00,0xfe,
58 
+  0x70,0x88,0x88,0xc8,0xb0,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x80,
59 
+  0x80,0x70,0x08,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0x78,0x90,0x88,0x88,0x70,0x05,
60 
+  0x05,0x05,0x06,0x00,0x00,0xf8,0x20,0x20,0x28,0x10,0x05,0x05,0x05,0x06,0x00,0x00,
61 
+  0x90,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0xfe,0x10,0xa8,0xa8,0xa8,0x70,
62 
+  0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x50,0x20,0x50,0x88,0x88};
61 63 
 const u8g_fntpgm_uint8_t fontpage_7_201_201[28] U8G_FONT_SECTION("fontpage_7_201_201") = {
62 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc9,0xc9,0x00,0x05,0x00,0x00,
63 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x50,0x88,0x88,0xa8,0x70};
64 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc9,0xc9,0x00,0x05,0x00,0x00,
65 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x50,0x88,0xa8,0xa8,0x50};
64 66 
 const u8g_fntpgm_uint8_t fontpage_7_204_206[59] U8G_FONT_SECTION("fontpage_7_204_206") = {
65 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcc,0xce,0x00,0x08,0x00,0x00,
66 
-  0x00,0x04,0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x00,0x60,0x90,0x90,0x90,0x60,0x05,
67 
-  0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x00,0x88,0x88,0x90,0x90,0x60,0x05,0x08,0x08,
68 
-  0x06,0x00,0x00,0x20,0x40,0x00,0x50,0x88,0x88,0xa8,0x70};
69 
-const u8g_fntpgm_uint8_t fontpage_64_166_166[25] U8G_FONT_SECTION("fontpage_64_166_166") = {
70 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x05,0x00,0x00,
71 
-  0x00,0x0b,0x01,0x02,0x0c,0x01,0x04,0xc6,0x60};
67 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcc,0xce,0x00,0x08,0x00,0x00,
68 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x88,0x88,0x70,0x05,
69 
+  0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x90,0x88,0x88,0x88,0x70,0x05,0x08,0x08,
70 
+  0x06,0x00,0x00,0x10,0x20,0x00,0x50,0x88,0xa8,0xa8,0x50};
71 
+const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_166_166") = {
72 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x01,0x00,0x00,
73 
+  0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xa8};
72 74
73 75 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
74 76 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 65
- 63
Marlin/src/lcd/dogm/language_data_el.h 查看文件 

@@ -1,77 +1,79 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_7_136_136[31] U8G_FONT_SECTION("fontpage_7_136_136") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x08,0x00,0x00,
9 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x80,0xf8,0x80,0xf0,0x80,0x80,0xf8};
10 
-const u8g_fntpgm_uint8_t fontpage_7_145_157[185] U8G_FONT_SECTION("fontpage_7_145_157") = {
11 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x91,0x9d,0x00,0x07,0x00,0x00,
12 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x50,0x88,0x88,0xf8,0x88,0x88,0x05,0x07,
13 
-  0x07,0x06,0x00,0x00,0xf0,0x48,0x48,0x70,0x48,0x48,0xf0,0x05,0x07,0x07,0x06,0x00,
14 
-  0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0x50,
15 
-  0x50,0x88,0x88,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,
16 
-  0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x05,0x07,
17 
-  0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
18 
-  0x00,0x70,0x88,0x88,0xa8,0x88,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x40,
19 
-  0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,
20 
-  0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x50,0x88,0x88,0x88,0x88,0x88,0x05,
21 
-  0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0xa8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
22 
-  0x00,0x00,0x88,0xc8,0xc8,0xa8,0x98,0x98,0x88};
8 
+const u8g_fntpgm_uint8_t fontpage_7_136_136[33] U8G_FONT_SECTION("fontpage_7_136_136") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x88,0x88,0x00,0x0a,0x00,0x00,
10 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0x80,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,
11 
+  0xf8};
12 
+const u8g_fntpgm_uint8_t fontpage_7_145_157[186] U8G_FONT_SECTION("fontpage_7_145_157") = {
13 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x91,0x9d,0x00,0x07,0x00,0x00,
14 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,
15 
+  0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
16 
+  0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,
17 
+  0x50,0x50,0x88,0x88,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,
18 
+  0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,0xf8,0x05,
19 
+  0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
20 
+  0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,
21 
+  0x40,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,
22 
+  0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x20,0x50,0x50,0x88,0x88,0x88,
23 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,
24 
+  0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88};
23 25 
 const u8g_fntpgm_uint8_t fontpage_7_159_161[56] U8G_FONT_SECTION("fontpage_7_159_161") = {
24 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9f,0xa1,0x00,0x07,0x00,0x00,
26 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9f,0xa1,0x00,0x07,0x00,0x00,
25 27 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,
26 
-  0x07,0x06,0x00,0x00,0xf8,0x50,0x50,0x50,0x50,0x50,0x50,0x05,0x07,0x07,0x06,0x00,
28 
+  0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
27 29 
   0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80};
28 30 
 const u8g_fntpgm_uint8_t fontpage_7_163_167[82] U8G_FONT_SECTION("fontpage_7_163_167") = {
29 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa3,0xa7,0x00,0x07,0x00,0x00,
30 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x40,0x20,0x40,0x80,0xf8,0x05,0x07,
31 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa3,0xa7,0x00,0x07,0x00,0x00,
32 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x40,0x20,0x10,0x20,0x40,0xf8,0x05,0x07,
31 33 
   0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,
32 
-  0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x20,
33 
-  0x70,0xa8,0x70,0x20,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,
34 
+  0x00,0x88,0x88,0x50,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,
35 
+  0xa8,0xa8,0xa8,0x70,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,
34 36 
   0x88,0x88};
35 
-const u8g_fntpgm_uint8_t fontpage_7_169_169[29] U8G_FONT_SECTION("fontpage_7_169_169") = {
36 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa9,0xa9,0x00,0x06,0x00,0x00,
37 
-  0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x88,0x88,0x50,0x50,0xd8};
37 
+const u8g_fntpgm_uint8_t fontpage_7_169_169[30] U8G_FONT_SECTION("fontpage_7_169_169") = {
38 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa9,0xa9,0x00,0x07,0x00,0x00,
39 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x50,0xd8};
38 40 
 const u8g_fntpgm_uint8_t fontpage_7_172_175[75] U8G_FONT_SECTION("fontpage_7_172_175") = {
39 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xac,0xaf,0x00,0x08,0xfe,0x00,
40 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x08,0x68,0x98,0x90,0x90,0x68,0x05,
41 
-  0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x00,0x70,0x88,0xe0,0x88,0x70,0x05,0x0a,0x0a,
42 
-  0x06,0x00,0xfe,0x20,0x40,0x00,0x70,0x88,0x88,0x88,0x88,0x08,0x08,0x02,0x08,0x08,
43 
-  0x06,0x01,0x00,0x40,0x80,0x00,0x80,0x80,0x80,0x80,0x40};
44 
-const u8g_fntpgm_uint8_t fontpage_7_177_199[297] U8G_FONT_SECTION("fontpage_7_177_199") = {
45 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb1,0xc7,0x00,0x08,0xfe,0x00,
46 
-  0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x08,0x68,0x98,0x90,0x90,0x68,0x04,0x07,0x07,
47 
-  0x06,0x00,0xfe,0x60,0x90,0xf0,0x90,0xe0,0x80,0x80,0x05,0x06,0x06,0x06,0x00,0xff,
48 
-  0x88,0x48,0x50,0x20,0x20,0x40,0x05,0x06,0x06,0x06,0x00,0x00,0x30,0x40,0x70,0x88,
49 
-  0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0xe0,0x88,0x70,0x05,0x09,0x09,
50 
-  0x06,0x00,0xfe,0x80,0x70,0x40,0x80,0x80,0x80,0x70,0x08,0x70,0x05,0x07,0x07,0x06,
51 
-  0x00,0xfe,0xb8,0xc8,0x88,0x88,0x88,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x70,
52 
-  0x88,0xf8,0x88,0x70,0x03,0x05,0x05,0x06,0x01,0x00,0x80,0x80,0x80,0x80,0x60,0x04,
53 
-  0x05,0x05,0x06,0x00,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x06,0x06,0x06,0x00,0x00,
54 
-  0x40,0x20,0x20,0x50,0x50,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0xd8,
55 
-  0xa8,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x50,0x60,0x20,0x05,0x0a,
56 
-  0x0a,0x06,0x00,0xfe,0x80,0xe0,0x80,0x70,0x20,0x40,0x80,0x70,0x08,0x70,0x05,0x05,
57 
-  0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,
58 
-  0x50,0x50,0x50,0x50,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x88,0xc8,0xb0,0x80,
59 
-  0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x30,0x40,0x80,0x40,0x30,0x08,0x70,0x05,0x05,
60 
-  0x05,0x06,0x00,0x00,0x68,0x90,0x90,0x90,0x60,0x04,0x05,0x05,0x06,0x00,0x00,0xf0,
61 
-  0x40,0x40,0x40,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x90,0x90,0xe0,0x05,
62 
-  0x08,0x08,0x06,0x00,0xfe,0x30,0xa8,0xa8,0xa8,0xa8,0x70,0x20,0x20,0x05,0x06,0x06,
63 
-  0x06,0x00,0xff,0x88,0x50,0x20,0x20,0x50,0x88};
41 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xac,0xaf,0x00,0x08,0xfe,0x00,
42 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x68,0x90,0x90,0x90,0x68,0x05,
43 
+  0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x60,0x88,0x70,0x05,0x0a,0x0a,
44 
+  0x06,0x00,0xfe,0x10,0x20,0x00,0xb0,0xc8,0x88,0x88,0x88,0x08,0x08,0x03,0x08,0x08,
45 
+  0x06,0x01,0x00,0x40,0x80,0x00,0x80,0x80,0x80,0xa0,0x40};
46 
+const u8g_fntpgm_uint8_t fontpage_7_177_199[303] U8G_FONT_SECTION("fontpage_7_177_199") = {
47 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb1,0xc7,0x00,0x09,0xfe,0x00,
48 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x68,0x90,0x90,0x90,0x68,0x05,0x09,0x09,0x06,
49 
+  0x00,0xfe,0x60,0x90,0x90,0xb0,0x88,0x88,0xf0,0x80,0x80,0x05,0x07,0x07,0x06,0x00,
50 
+  0xfe,0x88,0x88,0x50,0x50,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x80,
51 
+  0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x60,0x88,0x70,
52 
+  0x05,0x08,0x08,0x06,0x00,0xff,0xf8,0x20,0x40,0x40,0x40,0x30,0x08,0x30,0x05,0x07,
53 
+  0x07,0x06,0x00,0xfe,0xb0,0xc8,0x88,0x88,0x88,0x08,0x08,0x04,0x07,0x07,0x06,0x01,
54 
+  0x00,0x60,0x90,0x90,0xf0,0x90,0x90,0x60,0x03,0x05,0x05,0x06,0x02,0x00,0x80,0x80,
55 
+  0x80,0xa0,0x40,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x09,
56 
+  0x09,0x06,0x00,0x00,0x80,0x40,0x40,0x20,0x20,0x50,0x50,0x88,0x88,0x05,0x07,0x07,
57 
+  0x06,0x00,0xfe,0x88,0x88,0x88,0x98,0xe8,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,
58 
+  0x88,0x88,0x50,0x50,0x20,0x05,0x09,0x09,0x06,0x00,0xfe,0xf8,0x20,0x40,0x70,0x80,
59 
+  0x80,0x70,0x08,0x10,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x06,
60 
+  0x05,0x05,0x06,0x00,0x00,0xf8,0x50,0x50,0x54,0x48,0x05,0x07,0x07,0x06,0x00,0xfe,
61 
+  0x70,0x88,0x88,0xc8,0xb0,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0x80,
62 
+  0x80,0x70,0x08,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0x78,0x90,0x88,0x88,0x70,0x05,
63 
+  0x05,0x05,0x06,0x00,0x00,0xf8,0x20,0x20,0x28,0x10,0x05,0x05,0x05,0x06,0x00,0x00,
64 
+  0x90,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0xfe,0x10,0xa8,0xa8,0xa8,0x70,
65 
+  0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x50,0x20,0x50,0x88,0x88};
64 66 
 const u8g_fntpgm_uint8_t fontpage_7_201_201[28] U8G_FONT_SECTION("fontpage_7_201_201") = {
65 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc9,0xc9,0x00,0x05,0x00,0x00,
66 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x50,0x88,0x88,0xa8,0x70};
67 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc9,0xc9,0x00,0x05,0x00,0x00,
68 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x50,0x88,0xa8,0xa8,0x50};
67 69 
 const u8g_fntpgm_uint8_t fontpage_7_204_206[59] U8G_FONT_SECTION("fontpage_7_204_206") = {
68 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcc,0xce,0x00,0x08,0x00,0x00,
69 
-  0x00,0x04,0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x00,0x60,0x90,0x90,0x90,0x60,0x05,
70 
-  0x08,0x08,0x06,0x00,0x00,0x20,0x40,0x00,0x88,0x88,0x90,0x90,0x60,0x05,0x08,0x08,
71 
-  0x06,0x00,0x00,0x20,0x40,0x00,0x50,0x88,0x88,0xa8,0x70};
72 
-const u8g_fntpgm_uint8_t fontpage_64_166_166[25] U8G_FONT_SECTION("fontpage_64_166_166") = {
73 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x05,0x00,0x00,
74 
-  0x00,0x0b,0x01,0x02,0x0c,0x01,0x04,0xc6,0x60};
70 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcc,0xce,0x00,0x08,0x00,0x00,
71 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x88,0x88,0x70,0x05,
72 
+  0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x90,0x88,0x88,0x88,0x70,0x05,0x08,0x08,
73 
+  0x06,0x00,0x00,0x10,0x20,0x00,0x50,0x88,0xa8,0xa8,0x50};
74 
+const u8g_fntpgm_uint8_t fontpage_64_166_166[24] U8G_FONT_SECTION("fontpage_64_166_166") = {
75 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x01,0x00,0x00,
76 
+  0x00,0x05,0x01,0x01,0x06,0x00,0x00,0xa8};
75 77
76 78 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
77 79 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 6
- 6
Marlin/src/lcd/dogm/language_data_en.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_es.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_eu.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_fi.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_fr.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_gl.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 20
- 23
Marlin/src/lcd/dogm/language_data_hr.h 查看文件 

@@ -1,29 +1,26 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_2_135_135[32] U8G_FONT_SECTION("fontpage_2_135_135") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x09,0x00,0x00,
9 
-  0x00,0x04,0x09,0x09,0x05,0x00,0x00,0x10,0x20,0x00,0x70,0x80,0x80,0x80,0x80,0x70
10 
-  };
11 
-const u8g_fntpgm_uint8_t fontpage_2_140_141[49] U8G_FONT_SECTION("fontpage_2_140_141") = {
12 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8d,0x00,0x0b,0x00,0x00,
13 
-  0x00,0x06,0x0b,0x0b,0x07,0x00,0x00,0x28,0x10,0x00,0x3c,0x40,0x80,0x80,0x80,0x80,
14 
-  0x40,0x3c,0x04,0x09,0x09,0x05,0x00,0x00,0x50,0x20,0x00,0x70,0x80,0x80,0x80,0x80,
15 
-  0x70};
8 
+const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,
10 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x80,0x88,0x70};
11 
+const u8g_fntpgm_uint8_t fontpage_2_140_141[47] U8G_FONT_SECTION("fontpage_2_140_141") = {
12 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8d,0x00,0x0a,0x00,0x00,
13 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x80,0x80,0x88,
14 
+  0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x88,0x70};
16 15 
 const u8g_fntpgm_uint8_t fontpage_2_145_145[31] U8G_FONT_SECTION("fontpage_2_145_145") = {
17 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x91,0x91,0x00,0x08,0x00,0x00,
18 
-  0x00,0x06,0x08,0x08,0x07,0x00,0x00,0x1c,0x08,0x78,0x88,0x88,0x88,0x88,0x78};
19 
-const u8g_fntpgm_uint8_t fontpage_2_225_225[32] U8G_FONT_SECTION("fontpage_2_225_225") = {
20 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe1,0xe1,0x00,0x09,0x00,0x00,
21 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x60,0x10,0x88,0x70
22 
-  };
23 
-const u8g_fntpgm_uint8_t fontpage_2_254_254[32] U8G_FONT_SECTION("fontpage_2_254_254") = {
24 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0x00,0x09,0x00,0x00,
25 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,0xf8
26 
-  };
16 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x91,0x91,0x00,0x08,0x00,0x00,
17 
+  0x00,0x06,0x08,0x08,0x06,0x00,0x00,0x08,0x1c,0x08,0x78,0x88,0x88,0x88,0x78};
18 
+const u8g_fntpgm_uint8_t fontpage_2_225_225[31] U8G_FONT_SECTION("fontpage_2_225_225") = {
19 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe1,0xe1,0x00,0x08,0x00,0x00,
20 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x78,0x80,0x70,0x08,0xf0};
21 
+const u8g_fntpgm_uint8_t fontpage_2_254_254[31] U8G_FONT_SECTION("fontpage_2_254_254") = {
22 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfe,0xfe,0x00,0x08,0x00,0x00,
23 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x10,0x20,0x40,0xf8};
27 24
28 25 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
29 26 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 6
- 6
Marlin/src/lcd/dogm/language_data_it.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 21
- 20
Marlin/src/lcd/dogm/language_data_jp-kana.h 查看文件 

@@ -1,22 +1,23 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 const u8g_fntpgm_uint8_t fontpage_97_161_164[61] U8G_FONT_SECTION("fontpage_97_161_164") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa1,0xa4,0x00,0x06,0x00,0x00,
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa1,0xa4,0x00,0x06,0x00,0x00,
9 10 
   0x00,0x04,0x04,0x04,0x06,0x00,0x00,0xf0,0x10,0x60,0x40,0x05,0x06,0x06,0x06,0x00,
10 11 
   0x00,0xf8,0x08,0x28,0x30,0x20,0x40,0x03,0x04,0x04,0x06,0x01,0x00,0x20,0x40,0xc0,
11 12 
   0x40,0x04,0x06,0x06,0x06,0x00,0x00,0x10,0x20,0x60,0xa0,0x20,0x20};
12 13 
 const u8g_fntpgm_uint8_t fontpage_97_166_166[29] U8G_FONT_SECTION("fontpage_97_166_166") = {
13 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x06,0x00,0x00,
14 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x06,0x00,0x00,
14 15 
   0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0xf8,0x88,0x08,0x10,0x20};
15 16 
 const u8g_fntpgm_uint8_t fontpage_97_168_168[28] U8G_FONT_SECTION("fontpage_97_168_168") = {
16 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa8,0xa8,0x00,0x05,0x00,0x00,
17 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa8,0xa8,0x00,0x05,0x00,0x00,
17 18 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0xf8};
18 19 
 const u8g_fntpgm_uint8_t fontpage_97_170_181[167] U8G_FONT_SECTION("fontpage_97_170_181") = {
19 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaa,0xb5,0x00,0x08,0x00,0x00,
20 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaa,0xb5,0x00,0x08,0x00,0x00,
20 21 
   0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x10,0xf8,0x30,0x50,0x90,0x10,0x05,0x06,0x06,
21 22 
   0x06,0x00,0x00,0x40,0xf8,0x48,0x48,0x48,0x90,0x05,0x08,0x08,0x06,0x00,0x00,0x28,
22 23 
   0x00,0x40,0xf8,0x48,0x48,0x48,0x90,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0xf8,0x20,
 
@@ -28,23 +29,23 @@ const u8g_fntpgm_uint8_t fontpage_97_170_181[167] U8G_FONT_SECTION("fontpage_97_
28 29 
   0x07,0x06,0x00,0x00,0x28,0x00,0xf8,0x08,0x08,0x08,0xf8,0x05,0x06,0x06,0x06,0x00,
29 30 
   0x00,0x50,0xf8,0x50,0x10,0x20,0x40};
30 31 
 const u8g_fntpgm_uint8_t fontpage_97_183_187[77] U8G_FONT_SECTION("fontpage_97_183_187") = {
31 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb7,0xbb,0x00,0x07,0x00,0x00,
32 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb7,0xbb,0x00,0x07,0x00,0x00,
32 33 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0xc0,0x08,0xc8,0x10,0xe0,0x05,0x07,0x07,0x06,
33 34 
   0x00,0x00,0x28,0x00,0xc0,0x08,0xc8,0x10,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,
34 35 
   0x10,0x20,0x50,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x28,0x00,0xf8,0x10,0x20,0x50,
35 36 
   0x88,0x05,0x06,0x06,0x06,0x00,0x00,0x40,0xf8,0x48,0x50,0x40,0x38};
36 37 
 const u8g_fntpgm_uint8_t fontpage_97_189_193[77] U8G_FONT_SECTION("fontpage_97_189_193") = {
37 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xbd,0xc1,0x00,0x07,0x00,0x00,
38 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xbd,0xc1,0x00,0x07,0x00,0x00,
38 39 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0x48,0x10,0x60,0x05,0x07,0x07,0x06,
39 40 
   0x00,0x00,0x28,0x00,0x88,0x88,0x48,0x10,0x60,0x05,0x05,0x05,0x06,0x00,0x00,0x78,
40 41 
   0x48,0xa8,0x10,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x28,0x00,0x78,0x48,0xa8,0x10,
41 42 
   0x60,0x05,0x06,0x06,0x06,0x00,0x00,0x10,0xe0,0x20,0xf8,0x20,0x40};
42 43 
 const u8g_fntpgm_uint8_t fontpage_97_195_196[38] U8G_FONT_SECTION("fontpage_97_195_196") = {
43 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc3,0xc4,0x00,0x05,0x00,0x00,
44 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc3,0xc4,0x00,0x05,0x00,0x00,
44 45 
   0x00,0x05,0x04,0x04,0x06,0x00,0x00,0xa8,0xa8,0x08,0x30,0x05,0x05,0x05,0x06,0x00,
45 46 
   0x00,0xa8,0xa8,0x08,0x10,0x20};
46 47 
 const u8g_fntpgm_uint8_t fontpage_97_198_211[190] U8G_FONT_SECTION("fontpage_97_198_211") = {
47 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc6,0xd3,0x00,0x08,0x00,0x00,
48 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc6,0xd3,0x00,0x08,0x00,0x00,
48 49 
   0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x00,0xf8,0x20,0x20,0x40,0x05,0x08,0x08,
49 50 
   0x06,0x00,0x00,0x28,0x00,0x70,0x00,0xf8,0x20,0x20,0x40,0x03,0x06,0x06,0x06,0x01,
50 51 
   0x00,0x80,0x80,0xc0,0xa0,0x80,0x80,0x04,0x08,0x08,0x06,0x01,0x00,0x50,0x00,0x80,
 
@@ -57,29 +58,29 @@ const u8g_fntpgm_uint8_t fontpage_97_198_211[190] U8G_FONT_SECTION("fontpage_97_
57 58 
   0x10,0x88,0x88,0x88,0x88,0x05,0x06,0x06,0x06,0x00,0x00,0x80,0x80,0xf8,0x80,0x80,
58 59 
   0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x28,0x80,0x80,0xf8,0x80,0x80,0x78};
59 60 
 const u8g_fntpgm_uint8_t fontpage_97_213_217[77] U8G_FONT_SECTION("fontpage_97_213_217") = {
60 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd5,0xd9,0x00,0x08,0x00,0x00,
61 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd5,0xd9,0x00,0x08,0x00,0x00,
61 62 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x08,0x08,0x10,0x60,0x05,0x07,0x07,0x06,
62 63 
   0x00,0x00,0x28,0x00,0xf8,0x08,0x08,0x10,0x60,0x05,0x08,0x08,0x06,0x00,0x00,0x18,
63 64 
   0x18,0x00,0xf8,0x08,0x08,0x10,0x60,0x05,0x04,0x04,0x06,0x00,0x01,0x40,0xa0,0x10,
64 65 
   0x08,0x05,0x06,0x06,0x06,0x00,0x01,0x28,0x00,0x40,0xa0,0x10,0x08};
65 66 
 const u8g_fntpgm_uint8_t fontpage_97_219_220[43] U8G_FONT_SECTION("fontpage_97_219_220") = {
66 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xdb,0xdc,0x00,0x08,0x00,0x00,
67 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xdb,0xdc,0x00,0x08,0x00,0x00,
67 68 
   0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0xf8,0x20,0xa8,0xa8,0x20,0x05,0x08,0x08,
68 69 
   0x06,0x00,0x00,0x28,0x00,0x20,0xf8,0x20,0xa8,0xa8,0x20};
69 70 
 const u8g_fntpgm_uint8_t fontpage_97_222_223[39] U8G_FONT_SECTION("fontpage_97_222_223") = {
70 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xde,0xdf,0x00,0x05,0x00,0x00,
71 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xde,0xdf,0x00,0x05,0x00,0x00,
71 72 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x08,0x50,0x20,0x10,0x04,0x05,0x05,0x06,
72 73 
   0x01,0x00,0xe0,0x00,0xe0,0x00,0xf0};
73 74 
 const u8g_fntpgm_uint8_t fontpage_97_225_226[39] U8G_FONT_SECTION("fontpage_97_225_226") = {
74 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe1,0xe2,0x00,0x05,0x00,0x00,
75 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe1,0xe2,0x00,0x05,0x00,0x00,
75 76 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x08,0x28,0x10,0x28,0xc0,0x05,0x05,0x05,0x06,
76 77 
   0x00,0x00,0xf8,0x40,0xf8,0x40,0x38};
77 78 
 const u8g_fntpgm_uint8_t fontpage_97_228_229[39] U8G_FONT_SECTION("fontpage_97_228_229") = {
78 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe4,0xe5,0x00,0x06,0x00,0x00,
79 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe4,0xe5,0x00,0x06,0x00,0x00,
79 80 
   0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x40,0xf8,0x48,0x50,0x40,0x40,0x04,0x04,0x04,
80 81 
   0x06,0x00,0x00,0x60,0x20,0x20,0xf0};
81 82 
 const u8g_fntpgm_uint8_t fontpage_97_231_237[96] U8G_FONT_SECTION("fontpage_97_231_237") = {
82 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe7,0xed,0x00,0x06,0x00,0x00,
83 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe7,0xed,0x00,0x06,0x00,0x00,
83 84 
   0x00,0x04,0x05,0x05,0x06,0x00,0x00,0xf0,0x10,0xf0,0x10,0xf0,0x05,0x05,0x05,0x06,
84 85 
   0x00,0x00,0xf8,0x08,0xf8,0x08,0xf8,0x05,0x06,0x06,0x06,0x00,0x00,0x70,0x00,0xf8,
85 86 
   0x08,0x10,0x20,0x04,0x06,0x06,0x06,0x00,0x00,0x90,0x90,0x90,0x90,0x10,0x20,0x05,
 
@@ -87,11 +88,11 @@ const u8g_fntpgm_uint8_t fontpage_97_231_237[96] U8G_FONT_SECTION("fontpage_97_2
87 88 
   0x80,0x80,0x90,0xa0,0xc0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0xf8
88 89 
   };
89 90 
 const u8g_fntpgm_uint8_t fontpage_97_242_243[39] U8G_FONT_SECTION("fontpage_97_242_243") = {
90 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xf2,0xf3,0x00,0x05,0x00,0x00,
91 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xf2,0xf3,0x00,0x05,0x00,0x00,
91 92 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x08,0xf8,0x08,0x30,0x05,0x05,0x05,0x06,
92 93 
   0x00,0x00,0xc0,0x08,0x08,0x10,0xe0};
93 94 
 const u8g_fntpgm_uint8_t fontpage_97_252_252[24] U8G_FONT_SECTION("fontpage_97_252_252") = {
94 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0x00,0x03,0x00,0x00,
95 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0x00,0x03,0x00,0x00,
95 96 
   0x00,0x05,0x01,0x01,0x06,0x00,0x02,0xf8};
96 97
97 98 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}

+ 6
- 6
Marlin/src/lcd/dogm/language_data_nl.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 27
- 28
Marlin/src/lcd/dogm/language_data_pl.h 查看文件 

@@ -1,33 +1,32 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_2_133_133[31] U8G_FONT_SECTION("fontpage_2_133_133") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x85,0x85,0x00,0x06,0xfe,0x00,
9 
-  0x00,0x06,0x08,0x08,0x06,0x00,0xfe,0x70,0x08,0x78,0x88,0x88,0x78,0x08,0x0c};
10 
-const u8g_fntpgm_uint8_t fontpage_2_135_135[32] U8G_FONT_SECTION("fontpage_2_135_135") = {
11 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x09,0x00,0x00,
12 
-  0x00,0x04,0x09,0x09,0x05,0x00,0x00,0x10,0x20,0x00,0x70,0x80,0x80,0x80,0x80,0x70
13 
-  };
14 
-const u8g_fntpgm_uint8_t fontpage_2_153_153[31] U8G_FONT_SECTION("fontpage_2_153_153") = {
15 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x99,0x99,0x00,0x06,0xfe,0x00,
16 
-  0x00,0x05,0x08,0x08,0x06,0x00,0xfe,0x70,0x88,0xf8,0x80,0x80,0x78,0x20,0x18};
17 
-const u8g_fntpgm_uint8_t fontpage_2_193_196[77] U8G_FONT_SECTION("fontpage_2_193_196") = {
18 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc1,0xc4,0x00,0x0b,0x00,0x00,
19 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x40,0x50,0x60,0x40,0xc0,0x40,0x78,0x03,
20 
-  0x08,0x08,0x04,0x00,0x00,0x40,0x40,0x40,0x60,0xc0,0x40,0x40,0x40,0x06,0x0b,0x0b,
21 
-  0x07,0x00,0x00,0x10,0x20,0x00,0xc4,0xc4,0xa4,0xa4,0x94,0x94,0x8c,0x8c,0x05,0x09,
22 
-  0x09,0x06,0x00,0x00,0x10,0x20,0x00,0xf0,0x88,0x88,0x88,0x88,0x88};
23 
-const u8g_fntpgm_uint8_t fontpage_2_218_219[49] U8G_FONT_SECTION("fontpage_2_218_219") = {
24 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xda,0xdb,0x00,0x0b,0x00,0x00,
25 
-  0x00,0x05,0x0b,0x0b,0x06,0x00,0x00,0x10,0x20,0x00,0x78,0x80,0x80,0x70,0x08,0x08,
26 
-  0x08,0xf0,0x05,0x09,0x09,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x60,0x10,0x88,
27 
-  0x70};
28 
-const u8g_fntpgm_uint8_t fontpage_2_252_252[31] U8G_FONT_SECTION("fontpage_2_252_252") = {
29 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0x00,0x08,0x00,0x00,
30 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,0xf8};
8 
+const u8g_fntpgm_uint8_t fontpage_2_133_133[30] U8G_FONT_SECTION("fontpage_2_133_133") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x85,0x85,0x00,0x05,0xfe,0x00,
10 
+  0x00,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x08,0x78,0x88,0x78,0x20,0x30};
11 
+const u8g_fntpgm_uint8_t fontpage_2_135_135[31] U8G_FONT_SECTION("fontpage_2_135_135") = {
12 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x87,0x87,0x00,0x08,0x00,0x00,
13 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x80,0x88,0x70};
14 
+const u8g_fntpgm_uint8_t fontpage_2_153_153[30] U8G_FONT_SECTION("fontpage_2_153_153") = {
15 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x99,0x99,0x00,0x05,0xfe,0x00,
16 
+  0x00,0x05,0x07,0x07,0x06,0x00,0xfe,0x70,0x88,0xf0,0x80,0x70,0x20,0x30};
17 
+const u8g_fntpgm_uint8_t fontpage_2_193_196[73] U8G_FONT_SECTION("fontpage_2_193_196") = {
18 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc1,0xc4,0x00,0x0a,0x00,0x00,
19 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0x40,0x60,0xc0,0x40,0x40,0x78,0x03,0x07,
20 
+  0x07,0x06,0x01,0x00,0xc0,0x40,0x60,0xc0,0x40,0x40,0xe0,0x05,0x0a,0x0a,0x06,0x00,
21 
+  0x00,0x10,0x20,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88,0x05,0x08,0x08,0x06,0x00,
22 
+  0x00,0x10,0x20,0x00,0xb0,0xc8,0x88,0x88,0x88};
23 
+const u8g_fntpgm_uint8_t fontpage_2_218_219[47] U8G_FONT_SECTION("fontpage_2_218_219") = {
24 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xda,0xdb,0x00,0x0a,0x00,0x00,
25 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0x70,0x88,0x80,0x70,0x08,0x88,
26 
+  0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x78,0x80,0x70,0x08,0xf0};
27 
+const u8g_fntpgm_uint8_t fontpage_2_252_252[30] U8G_FONT_SECTION("fontpage_2_252_252") = {
28 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfc,0xfc,0x00,0x07,0x00,0x00,
29 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x00,0xf8,0x10,0x20,0x40,0xf8};
31 30
32 31 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
33 32 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 6
- 6
Marlin/src/lcd/dogm/language_data_pt-br.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 6
- 6
Marlin/src/lcd/dogm/language_data_pt.h 查看文件 

@@ -1,9 +1,9 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
8 
-static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
9 
-};
9 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};

+ 53
- 52
Marlin/src/lcd/dogm/language_data_ru.h 查看文件 

@@ -1,70 +1,71 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 const u8g_fntpgm_uint8_t fontpage_8_144_152[135] U8G_FONT_SECTION("fontpage_8_144_152") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x98,0x00,0x07,0xff,0x00,
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x98,0x00,0x07,0xff,0x00,
9 10 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,
10 
-  0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
11 
-  0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,
12 
-  0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,0x00,0xff,0x78,0x28,0x28,0x28,0x48,
13 
-  0x88,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,
14 
-  0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0x70,0xa8,0xa8,0xa8,0x05,0x07,0x07,
15 
-  0x06,0x00,0x00,0xf0,0x08,0x08,0x70,0x08,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,
11 
+  0x07,0x06,0x00,0x00,0xf0,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
12 
+  0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,
13 
+  0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0x50,
14 
+  0x50,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,
15 
+  0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0x70,0x20,0x70,0xa8,0xa8,0x05,0x07,0x07,
16 
+  0x06,0x00,0x00,0x70,0x88,0x08,0x70,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,
16 17 
   0x88,0x88,0x98,0xa8,0xc8,0x88,0x88};
17 
-const u8g_fntpgm_uint8_t fontpage_8_154_168[213] U8G_FONT_SECTION("fontpage_8_154_168") = {
18 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9a,0xa8,0x00,0x07,0xff,0x00,
18 
+const u8g_fntpgm_uint8_t fontpage_8_154_168[214] U8G_FONT_SECTION("fontpage_8_154_168") = {
19 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9a,0xa8,0x00,0x07,0xfe,0x00,
19 20 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,
20 
-  0x07,0x06,0x00,0x00,0x78,0x28,0x28,0x28,0x28,0xa8,0x48,0x05,0x07,0x07,0x06,0x00,
21 
+  0x07,0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x48,0x48,0x88,0x05,0x07,0x07,0x06,0x00,
21 22 
   0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,
22 23 
   0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,
23 24 
   0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,
24 25 
   0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,
25 26 
   0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,
26 
-  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x50,
27 
-  0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20,
28 
-  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x08,0x08,
29 
-  0x06,0x00,0xff,0x88,0x88,0x88,0x88,0x88,0x88,0xf8,0x08,0x05,0x07,0x07,0x06,0x00,
30 
-  0x00,0x88,0x88,0x88,0x98,0x68,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,
31 
-  0xa8,0xa8,0xa8,0xa8,0xf8};
27 
+  0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,
28 
+  0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20,
29 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x09,0x09,
30 
+  0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x07,0x07,0x06,
31 
+  0x00,0x00,0x88,0x88,0x88,0x78,0x08,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,
32 
+  0xa8,0xa8,0xa8,0xa8,0xa8,0xf8};
32 33 
 const u8g_fntpgm_uint8_t fontpage_8_171_173[56] U8G_FONT_SECTION("fontpage_8_171_173") = {
33 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xab,0xad,0x00,0x07,0x00,0x00,
34 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xc8,0xa8,0xa8,0xc8,0x05,0x07,
35 
-  0x07,0x06,0x00,0x00,0x80,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
36 
-  0x00,0x70,0x88,0x08,0x38,0x08,0x88,0x70};
37 
-const u8g_fntpgm_uint8_t fontpage_8_175_201[326] U8G_FONT_SECTION("fontpage_8_175_201") = {
38 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaf,0xc9,0x00,0x07,0xff,0x00,
34 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xab,0xad,0x00,0x07,0x00,0x00,
35 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xc8,0xa8,0xa8,0xc8,0x04,0x07,
36 
+  0x07,0x06,0x01,0x00,0x80,0x80,0x80,0xe0,0x90,0x90,0xe0,0x05,0x07,0x07,0x06,0x00,
37 
+  0x00,0x70,0x88,0x08,0x78,0x08,0x88,0x70};
38 
+const u8g_fntpgm_uint8_t fontpage_8_175_201[334] U8G_FONT_SECTION("fontpage_8_175_201") = {
39 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xaf,0xc9,0x00,0x08,0xfe,0x00,
39 40 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x88,0x88,0x78,0x28,0x48,0x88,0x05,0x05,
40 
-  0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x18,
41 
-  0x60,0x80,0xf0,0x88,0x88,0x70,0x04,0x05,0x05,0x06,0x00,0x00,0xe0,0x90,0xe0,0x90,
42 
-  0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,0x80,0x80,0x80,0x05,0x06,0x06,0x06,
43 
-  0x00,0xff,0x78,0x28,0x48,0x88,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
44 
-  0xf8,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x70,0xa8,0xa8,0x05,0x05,
45 
-  0x05,0x06,0x00,0x00,0xf0,0x08,0x30,0x08,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
46 
-  0x98,0xa8,0xc8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x20,0x88,0x98,0xa8,0xc8,
47 
-  0x88,0x04,0x05,0x05,0x06,0x00,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x05,0x05,0x06,
48 
-  0x00,0x00,0xf8,0x28,0x28,0xa8,0x48,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0xd8,0xa8,
49 
-  0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x05,0x05,0x05,
50 
-  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,
51 
-  0x88,0x88,0x88,0x05,0x06,0x06,0x06,0x00,0xff,0xf0,0x88,0x88,0xf0,0x80,0x80,0x05,
52 
-  0x05,0x05,0x06,0x00,0x00,0x70,0x80,0x80,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,
53 
-  0xf8,0x20,0x20,0x20,0x20,0x05,0x06,0x06,0x06,0x00,0xff,0x88,0x88,0x88,0x78,0x08,
54 
-  0x70,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0x70,0x20,0x05,0x05,0x05,
55 
-  0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x06,0x06,0x06,0x00,0xff,0x88,0x88,
56 
-  0x88,0x88,0xf8,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x08,0x08,0x05,
57 
-  0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xf8,0x05,0x06,0x06,0x06,0x00,0xff,
58 
-  0xa8,0xa8,0xa8,0xa8,0xf8,0x08};
41 
+  0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
42 
+  0x80,0xf0,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,0x88,0xf0,0x88,
43 
+  0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x05,0x06,0x06,0x06,
44 
+  0x00,0xff,0x30,0x50,0x50,0x50,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
45 
+  0xf0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0x70,0x20,0x70,0xa8,0x05,0x05,
46 
+  0x05,0x06,0x00,0x00,0x70,0x88,0x30,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
47 
+  0x98,0xa8,0xc8,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x88,0x70,0x00,0x88,0x98,0xa8,
48 
+  0xc8,0x88,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x05,0x05,
49 
+  0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0xd8,
50 
+  0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x05,0x05,
51 
+  0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,
52 
+  0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,0x88,0x88,0xf0,0x80,
53 
+  0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x05,0x05,0x05,0x06,
54 
+  0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,
55 
+  0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x20,0x20,0x70,0xa8,0xa8,0xa8,
56 
+  0x70,0x20,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x07,
57 
+  0x07,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x05,0x05,0x06,0x00,
58 
+  0x00,0x88,0x88,0x78,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,
59 
+  0xf8,0x05,0x07,0x07,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xf8,0x08,0x08};
59 60 
 const u8g_fntpgm_uint8_t fontpage_8_203_207[72] U8G_FONT_SECTION("fontpage_8_203_207") = {
60 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcb,0xcf,0x00,0x05,0x00,0x00,
61 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0xc8,0x03,0x05,0x05,0x06,
62 
-  0x01,0x00,0x80,0x80,0xc0,0xa0,0xc0,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x38,
63 
-  0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x05,0x05,0x05,
64 
-  0x06,0x00,0x00,0x78,0x88,0x78,0x28,0x48};
61 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcb,0xcf,0x00,0x05,0x00,0x00,
62 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0xc8,0x04,0x05,0x05,0x06,
63 
+  0x01,0x00,0x80,0x80,0xe0,0x90,0xe0,0x04,0x05,0x05,0x06,0x01,0x00,0xe0,0x10,0x70,
64 
+  0x10,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x04,0x05,0x05,
65 
+  0x06,0x01,0x00,0x70,0x90,0x70,0x50,0x90};
65 66 
 const u8g_fntpgm_uint8_t fontpage_8_209_209[30] U8G_FONT_SECTION("fontpage_8_209_209") = {
66 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd1,0xd1,0x00,0x07,0x00,0x00,
67 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0xf8,0x80,0x70};
67 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd1,0xd1,0x00,0x07,0x00,0x00,
68 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0xf0,0x80,0x70};
68 69
69 70 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
70 71 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 50
- 35
Marlin/src/lcd/dogm/language_data_sk.h 查看文件 

@@ -1,45 +1,60 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_2_140_143[80] U8G_FONT_SECTION("fontpage_2_140_143") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8f,0x00,0x0b,0x00,0x00,
9 
-  0x00,0x06,0x0b,0x0b,0x07,0x00,0x00,0x28,0x10,0x00,0x3c,0x40,0x80,0x80,0x80,0x80,
10 
-  0x40,0x3c,0x04,0x09,0x09,0x05,0x00,0x00,0x50,0x20,0x00,0x70,0x80,0x80,0x80,0x80,
11 
-  0x70,0x07,0x0b,0x0b,0x08,0x00,0x00,0x48,0x30,0x00,0xf8,0x84,0x82,0x82,0x82,0x82,
12 
-  0x84,0xf8,0x08,0x08,0x08,0x09,0x00,0x00,0x09,0x0a,0x78,0x88,0x88,0x88,0x88,0x78
13 
-  };
14 
-const u8g_fntpgm_uint8_t fontpage_2_200_200[32] U8G_FONT_SECTION("fontpage_2_200_200") = {
15 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc8,0xc8,0x00,0x09,0x00,0x00,
16 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf0,0x88,0x88,0x88,0x88,0x88
17 
-  };
18 
-const u8g_fntpgm_uint8_t fontpage_2_224_225[49] U8G_FONT_SECTION("fontpage_2_224_225") = {
19 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe0,0xe1,0x00,0x0b,0x00,0x00,
20 
-  0x00,0x05,0x0b,0x0b,0x06,0x00,0x00,0x50,0x20,0x00,0x78,0x80,0x80,0x70,0x08,0x08,
21 
-  0x08,0xf0,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x60,0x10,0x88,
22 
-  0x70};
23 
-const u8g_fntpgm_uint8_t fontpage_2_229_229[32] U8G_FONT_SECTION("fontpage_2_229_229") = {
24 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe5,0xe5,0x00,0x09,0x00,0x00,
25 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x08,0x50,0x40,0xf0,0x40,0x40,0x40,0x40,0x30
26 
-  };
27 
-const u8g_fntpgm_uint8_t fontpage_2_239_239[32] U8G_FONT_SECTION("fontpage_2_239_239") = {
28 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xef,0xef,0x00,0x09,0x00,0x00,
29 
-  0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x20,0x50,0x20,0x88,0x88,0x88,0x88,0x88,0x78
30 
-  };
31 
-const u8g_fntpgm_uint8_t fontpage_2_253_254[49] U8G_FONT_SECTION("fontpage_2_253_254") = {
32 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfd,0xfe,0x00,0x0b,0x00,0x00,
33 
-  0x00,0x07,0x0b,0x0b,0x08,0x00,0x00,0x24,0x18,0x00,0xfe,0x04,0x08,0x10,0x20,0x40,
34 
-  0x80,0xfe,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,
35 
-  0xf8};
8 
+const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8f,0x00,0x0a,0x00,0x00,
10 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x80,0x80,0x88,
11 
+  0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x88,0x70,0x05,
12 
+  0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf0,0x48,0x48,0x48,0x48,0x48,0xf0,0x06,
13 
+  0x0a,0x0a,0x06,0x00,0x00,0x14,0x08,0x00,0x08,0x08,0x78,0x88,0x88,0x88,0x78};
14 
+const u8g_fntpgm_uint8_t fontpage_2_185_186[49] U8G_FONT_SECTION("fontpage_2_185_186") = {
15 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb9,0xba,0x00,0x0a,0x00,0x00,
16 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0x80,0x80,0x80,0x80,0x80,0x80,
17 
+  0xf8,0x03,0x0a,0x0a,0x06,0x01,0x00,0x20,0x40,0x00,0xc0,0x40,0x40,0x40,0x40,0x40,
18 
+  0xe0};
19 
+const u8g_fntpgm_uint8_t fontpage_2_189_190[49] U8G_FONT_SECTION("fontpage_2_189_190") = {
20 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xbd,0xbe,0x00,0x0a,0x00,0x00,
21 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x80,0x80,0x80,0x80,0x80,0x80,
22 
+  0xf8,0x03,0x0a,0x0a,0x06,0x01,0x00,0xa0,0x40,0x00,0xc0,0x40,0x40,0x40,0x40,0x40,
23 
+  0xe0};
24 
+const u8g_fntpgm_uint8_t fontpage_2_199_200[47] U8G_FONT_SECTION("fontpage_2_199_200") = {
25 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc7,0xc8,0x00,0x0a,0x00,0x00,
26 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,
27 
+  0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xb0,0xc8,0x88,0x88,0x88};
28 
+const u8g_fntpgm_uint8_t fontpage_2_212_213[47] U8G_FONT_SECTION("fontpage_2_212_213") = {
29 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd4,0xd5,0x00,0x0a,0x00,0x00,
30 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0xf0,0x88,0x88,0xf0,0xa0,0x90,
31 
+  0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0xb0,0xc8,0x80,0x80,0x80};
32 
+const u8g_fntpgm_uint8_t fontpage_2_224_225[47] U8G_FONT_SECTION("fontpage_2_224_225") = {
33 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe0,0xe1,0x00,0x0a,0x00,0x00,
34 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x70,0x08,0x88,
35 
+  0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x78,0x80,0x70,0x08,0xf0};
36 
+const u8g_fntpgm_uint8_t fontpage_2_228_229[49] U8G_FONT_SECTION("fontpage_2_228_229") = {
37 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe4,0xe5,0x00,0x0a,0x00,0x00,
38 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,
39 
+  0x20,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x20,0x20,0xf8,0x20,0x20,0x20,
40 
+  0x18};
41 
+const u8g_fntpgm_uint8_t fontpage_2_239_239[31] U8G_FONT_SECTION("fontpage_2_239_239") = {
42 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xef,0xef,0x00,0x08,0x00,0x00,
43 
+  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x20,0x88,0x88,0x88,0x88,0x70};
44 
+const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253_254") = {
45 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfd,0xfe,0x00,0x0a,0x00,0x00,
46 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,
47 
+  0xf8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x10,0x20,0x40,0xf8};
36 48
37 49 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
38 50 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
39 51 
     FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
40 
-    FONTDATA_ITEM(2, 200, 200, fontpage_2_200_200), // 'ň' -- 'ň'
52 
+    FONTDATA_ITEM(2, 185, 186, fontpage_2_185_186), // 'Ĺ' -- 'ĺ'
53 
+    FONTDATA_ITEM(2, 189, 190, fontpage_2_189_190), // 'Ľ' -- 'ľ'
54 
+    FONTDATA_ITEM(2, 199, 200, fontpage_2_199_200), // 'Ň' -- 'ň'
55 
+    FONTDATA_ITEM(2, 212, 213, fontpage_2_212_213), // 'Ŕ' -- 'ŕ'
41 56 
     FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
42 
-    FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
57 
+    FONTDATA_ITEM(2, 228, 229, fontpage_2_228_229), // 'Ť' -- 'ť'
43 58 
     FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
44 59 
     FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
45 60 
 };

+ 106
- 79
Marlin/src/lcd/dogm/language_data_test.h 查看文件 

@@ -1,91 +1,118 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_8_128_255[1255] U8G_FONT_SECTION("fontpage_8_128_255") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x00,0x08,0xff,0x00,
9 
-  0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,
10 
-  0x08,0x08,0x06,0x00,0x00,0x50,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x07,0x07,
11 
-  0x06,0x00,0x00,0xe0,0x40,0x40,0x70,0x48,0x48,0x70,0x05,0x08,0x08,0x06,0x00,0x00,
12 
-  0x10,0x20,0xf8,0x88,0x80,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x30,0x48,
13 
-  0x80,0xe0,0x80,0x48,0x30,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0x70,0x08,
14 
-  0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,0x03,
15 
-  0x08,0x08,0x06,0x01,0x00,0xa0,0x00,0xe0,0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,
16 
-  0x06,0x00,0x00,0x38,0x10,0x10,0x10,0x10,0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,
17 
-  0xa0,0xa0,0xa0,0xb8,0xa8,0xa8,0xb8,0x05,0x07,0x07,0x06,0x00,0x00,0xa0,0xa0,0xa0,
18 
-  0xf8,0xa8,0xa8,0xb8,0x04,0x07,0x07,0x06,0x00,0x00,0xe0,0x40,0x70,0x50,0x50,0x50,
19 
-  0x50,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x88,0x90,0xa0,0xe0,0x90,0x88,0x05,
20 
-  0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x09,0x09,
21 
-  0x06,0x00,0xff,0x50,0x20,0x88,0x88,0x88,0x50,0x20,0x20,0x20,0x05,0x08,0x08,0x06,
22 
-  0x00,0xff,0x88,0x88,0x88,0x88,0x88,0x88,0xf8,0x20,0x05,0x07,0x07,0x06,0x00,0x00,
23 
-  0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,
24 
-  0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,
25 
-  0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0x80,0x80,0x80,0x80,0x80,0x05,0x08,
26 
-  0x08,0x06,0x00,0xff,0x78,0x28,0x28,0x28,0x48,0x88,0xf8,0x88,0x05,0x07,0x07,0x06,
27 
-  0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,
28 
-  0xa8,0xa8,0x70,0xa8,0xa8,0xa8,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x08,0x08,0x70,
29 
-  0x08,0x08,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,
30 
-  0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x88,0x98,0xa8,0xa8,0xc8,0x88,0x05,0x07,
8 
+const u8g_fntpgm_uint8_t fontpage_8_128_255[1677] U8G_FONT_SECTION("fontpage_8_128_255") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x80,0xff,0x00,0x0a,0xfe,0x00,
10 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,0x20,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,
11 
+  0xf8,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,
12 
+  0x05,0x09,0x09,0x06,0x00,0xfe,0xe0,0x40,0x40,0x70,0x48,0x48,0x48,0x08,0x30,0x05,
13 
+  0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,
14 
+  0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0xf0,0x80,0x88,0x70,0x05,0x07,0x07,0x06,
15 
+  0x00,0x00,0x70,0x88,0x80,0x70,0x08,0x88,0x70,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,
16 
+  0x40,0x40,0x40,0x40,0x40,0xe0,0x03,0x09,0x09,0x06,0x01,0x00,0xa0,0x00,0xe0,0x40,
17 
+  0x40,0x40,0x40,0x40,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x38,0x10,0x10,0x10,0x10,
18 
+  0x90,0x60,0x05,0x07,0x07,0x06,0x00,0x00,0x60,0xa0,0xa0,0xb0,0xa8,0xa8,0xb0,0x05,
19 
+  0x07,0x07,0x06,0x00,0x00,0xa0,0xa0,0xa0,0xf0,0xa8,0xa8,0xb0,0x05,0x07,0x07,0x06,
20 
+  0x00,0x00,0xe0,0x40,0x40,0x70,0x48,0x48,0x48,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,
21 
+  0x20,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x0a,0x0a,0x06,0x00,0x00,0x40,
22 
+  0x20,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x0a,0x0a,0x06,0x00,0x00,0x88,
23 
+  0x70,0x00,0x88,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x88,
24 
+  0x88,0x88,0x88,0x88,0x88,0xf8,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,
25 
+  0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x80,0x80,0xf0,0x88,
26 
+  0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0,0x05,
27 
+  0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x80,0x80,0x05,0x08,0x08,0x06,
28 
+  0x00,0xff,0x30,0x50,0x50,0x50,0x50,0x50,0xf8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,
29 
+  0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0x70,
30 
+  0x20,0x70,0xa8,0xa8,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,0x70,0x08,0x88,
31 
+  0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x0a,
32 
+  0x0a,0x06,0x00,0x00,0x88,0x70,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x07,
31 33 
   0x07,0x06,0x00,0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88,0x05,0x07,0x07,0x06,0x00,
32 
-  0x00,0x78,0x28,0x28,0x28,0x28,0xa8,0x48,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,
34 
+  0x00,0x38,0x48,0x48,0x48,0x48,0x48,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,
33 35 
   0xa8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,
34 36 
   0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,
35 37 
   0x07,0x07,0x06,0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,
36 38 
   0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
37 39 
   0x88,0x80,0x80,0x80,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,
38 
-  0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x40,0x80,
40 
+  0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0x88,0x78,0x08,0x70,
39 41 
   0x05,0x07,0x07,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0xa8,0x70,0x20,0x05,0x07,0x07,
40 
-  0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x08,0x08,0x06,0x00,0xff,
41 
-  0x88,0x88,0x88,0x88,0x88,0x88,0xf8,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x88,
42 
-  0x88,0x98,0x68,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xa8,
43 
-  0xa8,0xf8,0x05,0x08,0x08,0x06,0x00,0xff,0xa8,0xa8,0xa8,0xa8,0xa8,0xa8,0xf8,0x08,
44 
-  0x05,0x07,0x07,0x06,0x00,0x00,0xc0,0x40,0x40,0x70,0x48,0x48,0x70,0x05,0x07,0x07,
45 
-  0x06,0x00,0x00,0x88,0x88,0x88,0xc8,0xa8,0xa8,0xc8,0x05,0x07,0x07,0x06,0x00,0x00,
46 
-  0x80,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,
47 
-  0x38,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x90,0xa8,0xa8,0xe8,0xa8,0xa8,
48 
-  0x90,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x88,0x88,0x78,0x28,0x48,0x88,0x05,0x05,
49 
-  0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,0x00,0x18,
50 
-  0x60,0x80,0xf0,0x88,0x88,0x70,0x04,0x05,0x05,0x06,0x00,0x00,0xe0,0x90,0xe0,0x90,
51 
-  0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,0x80,0x80,0x80,0x05,0x06,0x06,0x06,
52 
-  0x00,0xff,0x78,0x28,0x48,0x88,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
53 
-  0xf8,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x70,0xa8,0xa8,0x05,0x05,
54 
-  0x05,0x06,0x00,0x00,0xf0,0x08,0x30,0x08,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0x88,
55 
-  0x98,0xa8,0xc8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x20,0x88,0x98,0xa8,0xc8,
56 
-  0x88,0x04,0x05,0x05,0x06,0x00,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x05,0x05,0x06,
57 
-  0x00,0x00,0xf8,0x28,0x28,0xa8,0x48,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0xd8,0xa8,
58 
-  0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,0x05,0x05,0x05,
59 
-  0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,
60 
-  0x88,0x88,0x88,0x05,0x06,0x06,0x06,0x00,0xff,0xf0,0x88,0x88,0xf0,0x80,0x80,0x05,
61 
-  0x05,0x05,0x06,0x00,0x00,0x70,0x80,0x80,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,
62 
-  0xf8,0x20,0x20,0x20,0x20,0x05,0x06,0x06,0x06,0x00,0xff,0x88,0x88,0x88,0x78,0x08,
63 
-  0x70,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0x70,0x20,0x05,0x05,0x05,
64 
-  0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x06,0x06,0x06,0x00,0xff,0x88,0x88,
65 
-  0x88,0x88,0xf8,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x08,0x08,0x05,
66 
-  0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xf8,0x05,0x06,0x06,0x06,0x00,0xff,
67 
-  0xa8,0xa8,0xa8,0xa8,0xf8,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xc0,0x40,0x70,0x48,
68 
-  0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xc8,0xa8,0xc8,0x03,0x05,0x05,0x06,
69 
-  0x01,0x00,0x80,0x80,0xc0,0xa0,0xc0,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x38,
70 
-  0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x05,0x05,0x05,
71 
-  0x06,0x00,0x00,0x78,0x88,0x78,0x28,0x48,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,
72 
-  0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,
73 
-  0xf8,0x80,0x70,0x05,0x09,0x09,0x06,0x00,0xff,0x40,0xe0,0x40,0x40,0x78,0x48,0x48,
74 
-  0x48,0x10,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0xf8,0x88,0x80,0x80,0x80,
75 
-  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x60,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
76 
-  0x00,0x70,0x80,0x70,0x08,0xf0,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x00,0x80,0x80,
77 
-  0x80,0x80,0x80,0x03,0x07,0x07,0x06,0x01,0x00,0xa0,0x00,0x40,0x40,0x40,0x40,0x40,
78 
-  0x03,0x08,0x08,0x06,0x01,0xff,0x20,0x00,0x20,0x20,0x20,0x20,0xa0,0x40,0x05,0x05,
79 
-  0x05,0x06,0x00,0x00,0xa0,0xa0,0xb8,0xa8,0xb8,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,
80 
-  0xa0,0xf8,0xa8,0xb8,0x05,0x06,0x06,0x06,0x00,0x00,0x40,0xe0,0x40,0x78,0x48,0x48,
81 
-  0x04,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x08,
82 
-  0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x88,0x98,0xa8,0xc8,0x88,0x05,0x09,0x09,0x06,
83 
-  0x00,0xff,0x50,0x20,0x00,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x06,0x06,0x06,0x00,
84 
-  0xff,0x88,0x88,0x88,0x88,0xf8,0x20,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
85 
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,
86 
-  0xff,0xff,0xff,0xff,0xff,0xff,0xff};
42 
+  0x06,0x00,0x00,0x88,0x88,0x50,0x20,0x50,0x88,0x88,0x05,0x09,0x09,0x06,0x00,0xfe,
43 
+  0x90,0x90,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0x88,
44 
+  0x88,0x88,0x78,0x08,0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,
45 
+  0xa8,0xa8,0xf8,0x05,0x09,0x09,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xa8,0xa8,0xf8,
46 
+  0x08,0x08,0x05,0x07,0x07,0x06,0x00,0x00,0xc0,0x40,0x40,0x70,0x48,0x48,0x70,0x05,
47 
+  0x07,0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xc8,0xa8,0xa8,0xc8,0x04,0x07,0x07,0x06,
48 
+  0x01,0x00,0x80,0x80,0x80,0xe0,0x90,0x90,0xe0,0x05,0x07,0x07,0x06,0x00,0x00,0x70,
49 
+  0x88,0x08,0x78,0x08,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x90,0xa8,0xa8,0xe8,
50 
+  0xa8,0xa8,0x90,0x05,0x07,0x07,0x06,0x00,0x00,0x78,0x88,0x88,0x78,0x28,0x48,0x88,
51 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,0x00,
52 
+  0x00,0x70,0x80,0xf0,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,0x88,
53 
+  0xf0,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x05,0x06,
54 
+  0x06,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,0x00,
55 
+  0x70,0x88,0xf0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0x70,0x20,0x70,0xa8,
56 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x30,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
57 
+  0x00,0x88,0x98,0xa8,0xc8,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x88,0x70,0x00,0x88,
58 
+  0x98,0xa8,0xc8,0x88,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,
59 
+  0x05,0x05,0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x88,0x05,0x05,0x05,0x06,0x00,0x00,
60 
+  0x88,0xd8,0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,
61 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
62 
+  0x00,0xf8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,0x88,0x88,
63 
+  0xf0,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x05,0x05,
64 
+  0x05,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,
65 
+  0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x20,0x20,0x70,0xa8,
66 
+  0xa8,0xa8,0x70,0x20,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,
67 
+  0x05,0x07,0x07,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x05,0x05,
68 
+  0x06,0x00,0x00,0x88,0x88,0x78,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,
69 
+  0xa8,0xa8,0xf8,0x05,0x07,0x07,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xf8,0x08,0x08,
70 
+  0x05,0x05,0x05,0x06,0x00,0x00,0xc0,0x40,0x70,0x48,0x70,0x05,0x05,0x05,0x06,0x00,
71 
+  0x00,0x88,0x88,0xc8,0xa8,0xc8,0x04,0x05,0x05,0x06,0x01,0x00,0x80,0x80,0xe0,0x90,
72 
+  0xe0,0x04,0x05,0x05,0x06,0x01,0x00,0xe0,0x10,0x70,0x10,0xe0,0x05,0x05,0x05,0x06,
73 
+  0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x04,0x05,0x05,0x06,0x01,0x00,0x70,0x90,0x70,
74 
+  0x50,0x90,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,0x70,0x88,0xf0,0x80,0x70,
75 
+  0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x09,0x09,
76 
+  0x06,0x00,0xfe,0x40,0xe0,0x40,0x70,0x48,0x48,0x48,0x08,0x10,0x05,0x08,0x08,0x06,
77 
+  0x00,0x00,0x10,0x20,0x00,0xf8,0x80,0x80,0x80,0x80,0x04,0x05,0x05,0x06,0x01,0x00,
78 
+  0x70,0x80,0xe0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x78,0x80,0x70,0x08,0xf0,
79 
+  0x03,0x06,0x06,0x06,0x01,0x00,0x40,0x00,0xc0,0x40,0x40,0xe0,0x03,0x06,0x06,0x06,
80 
+  0x01,0x00,0xa0,0x00,0xc0,0x40,0x40,0xe0,0x04,0x08,0x08,0x06,0x01,0xfe,0x10,0x00,
81 
+  0x30,0x10,0x10,0x10,0x90,0x60,0x05,0x05,0x05,0x06,0x00,0x00,0x60,0xa0,0xb0,0xa8,
82 
+  0xb0,0x05,0x05,0x05,0x06,0x00,0x00,0xa0,0xa0,0xf0,0xa8,0xb0,0x05,0x07,0x07,0x06,
83 
+  0x00,0x00,0x40,0xe0,0x40,0x70,0x48,0x48,0x48,0x04,0x08,0x08,0x06,0x01,0x00,0x20,
84 
+  0x40,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0x20,0x00,
85 
+  0x88,0x98,0xa8,0xc8,0x88,0x05,0x0a,0x0a,0x06,0x00,0xfe,0x88,0x70,0x00,0x88,0x88,
86 
+  0x88,0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0xfe,0x88,0x88,0x88,0x88,0xf8,
87 
+  0x20,0x20,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x88,0x88,0xa8,0xa8,0xa8,0x50,0x05,
88 
+  0x05,0x05,0x06,0x00,0x00,0x50,0x88,0xa8,0xa8,0x50,0x05,0x07,0x07,0x06,0x00,0x00,
89 
+  0x40,0xf0,0x40,0x70,0x48,0x48,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x40,0x40,0xf0,
90 
+  0x40,0x70,0x48,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x98,0xa0,0xa0,0xf8,0xa0,0xa0,
91 
+  0x98,0x05,0x05,0x05,0x06,0x00,0x00,0x98,0xa0,0xf8,0xa0,0x98,0x05,0x07,0x07,0x06,
92 
+  0x00,0x00,0x20,0x50,0x50,0x88,0xf8,0xa8,0xa8,0x05,0x06,0x06,0x06,0x00,0x00,0x20,
93 
+  0x50,0x50,0x88,0xf8,0xa8,0x05,0x07,0x07,0x06,0x00,0x00,0x90,0x90,0xb8,0xf8,0xb8,
94 
+  0xb8,0xb8,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0x90,0xf8,0xb8,0xb8,0x05,0x08,0x08,
95 
+  0x06,0x00,0x00,0xf8,0x88,0x50,0x50,0x70,0xa8,0xa8,0xa8,0x05,0x06,0x06,0x06,0x00,
96 
+  0x00,0xf8,0x88,0x50,0x70,0xa8,0xa8,0x06,0x08,0x08,0x06,0x00,0x00,0xfc,0xc4,0xa8,
97 
+  0x90,0xf8,0xb8,0xb8,0xa8,0x06,0x06,0x06,0x06,0x00,0x00,0xfc,0xa8,0x90,0xf8,0xb8,
98 
+  0xa8,0x05,0x0c,0x0c,0x06,0x00,0xfe,0x50,0x20,0x00,0x70,0x88,0x08,0x30,0x08,0x08,
99 
+  0x70,0x80,0x70,0x05,0x0a,0x0a,0x06,0x00,0xfe,0x50,0x20,0x00,0x70,0x88,0x30,0x08,
100 
+  0x70,0x80,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0x70,0x20,0x20,0x20,
101 
+  0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x70,0x20,0x20,0x05,0x07,0x07,0x06,0x00,
102 
+  0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,
103 
+  0xf8,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0x90,0x90,0x50,0x50,0x50,0x20,
104 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x90,0x50,0x50,0x20,0x05,0x0a,0x0a,0x06,0x00,
105 
+  0x00,0x90,0x48,0x00,0x88,0x90,0x90,0x50,0x50,0x50,0x20,0x05,0x08,0x08,0x06,0x00,
106 
+  0x00,0x90,0x48,0x00,0x88,0x90,0x50,0x50,0x20,0x05,0x09,0x09,0x06,0x00,0xfe,0x40,
107 
+  0xa0,0xa0,0xb8,0xb8,0xb8,0x58,0x08,0x10,0x05,0x07,0x07,0x06,0x00,0xfe,0x58,0xb8,
108 
+  0xb8,0xb8,0x58,0x08,0x10,0x05,0x0a,0x0a,0x06,0x00,0xff,0x20,0x70,0xa8,0x88,0x88,
109 
+  0x88,0x88,0xa8,0x70,0x20,0x05,0x08,0x08,0x06,0x00,0xff,0x20,0x70,0xa8,0x88,0x88,
110 
+  0xa8,0x70,0x20,0x05,0x09,0x09,0x06,0x00,0x00,0x70,0x00,0x20,0x20,0x88,0x88,0x88,
111 
+  0xa8,0x50,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x00,0x20,0xa8,0x88,0xa8,0x50,0x05,
112 
+  0x0a,0x0a,0x06,0x00,0x00,0xf8,0xa8,0x00,0x50,0x88,0x88,0xa8,0xa8,0xa8,0x50,0x05,
113 
+  0x08,0x08,0x06,0x00,0x00,0xf8,0xa8,0x00,0x50,0x88,0xa8,0xa8,0x50};
87 114 
 const u8g_fntpgm_uint8_t fontpage_97_129_191[870] U8G_FONT_SECTION("fontpage_97_129_191") = {
88 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x81,0xbf,0x00,0x0a,0xff,0x00,
115 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x81,0xbf,0x00,0x0a,0xff,0x00,
89 116 
   0x00,0x0a,0x0b,0x16,0x0c,0x01,0xff,0x08,0x00,0x04,0x00,0x4e,0x00,0x55,0x00,0x64,
90 117 
   0x80,0x48,0x40,0xa8,0x40,0x90,0x40,0x90,0x80,0x61,0x00,0x06,0x00,0x08,0x0b,0x0b,
91 118 
   0x0c,0x01,0xff,0x20,0x10,0x70,0x1c,0x28,0xe2,0x39,0x21,0x21,0x12,0x0c,0x08,0x07,
 
@@ -141,7 +168,7 @@ const u8g_fntpgm_uint8_t fontpage_97_129_191[870] U8G_FONT_SECTION("fontpage_97_
141 168 
   0x07,0x06,0x00,0x00,0x28,0x00,0x88,0x88,0x48,0x10,0x60,0x05,0x05,0x05,0x06,0x00,
142 169 
   0x00,0x78,0x48,0xa8,0x10,0x60};
143 170 
 const u8g_fntpgm_uint8_t fontpage_97_193_255[753] U8G_FONT_SECTION("fontpage_97_193_255") = {
144 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc1,0xff,0x00,0x08,0x00,0x00,
171 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc1,0xff,0x00,0x08,0x00,0x00,
145 172 
   0x00,0x05,0x06,0x06,0x06,0x00,0x00,0x10,0xe0,0x20,0xf8,0x20,0x40,0x05,0x08,0x08,
146 173 
   0x06,0x00,0x00,0x28,0x00,0x10,0xe0,0x20,0xf8,0x20,0x40,0x05,0x04,0x04,0x06,0x00,
147 174 
   0x00,0xa8,0xa8,0x08,0x30,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x08,0x10,0x20,

+ 16
- 15
Marlin/src/lcd/dogm/language_data_tr.h 查看文件 

@@ -1,20 +1,21 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 
-const u8g_fntpgm_uint8_t fontpage_2_159_159[34] U8G_FONT_SECTION("fontpage_2_159_159") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9f,0x9f,0x00,0x09,0xfe,0x00,
9 
-  0x00,0x05,0x0b,0x0b,0x06,0x00,0xfe,0x88,0x70,0x00,0x78,0x88,0x88,0x88,0x88,0x78,
10 
-  0x08,0x70};
11 
-const u8g_fntpgm_uint8_t fontpage_2_176_177[45] U8G_FONT_SECTION("fontpage_2_176_177") = {
12 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb0,0xb1,0x00,0x0a,0x00,0x00,
13 
-  0x00,0x03,0x0a,0x0a,0x04,0x00,0x00,0x40,0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0x40,
14 
-  0xe0,0x01,0x06,0x06,0x02,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80};
15 
-const u8g_fntpgm_uint8_t fontpage_2_223_223[31] U8G_FONT_SECTION("fontpage_2_223_223") = {
16 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xdf,0xdf,0x00,0x06,0xfe,0x00,
17 
-  0x00,0x05,0x08,0x08,0x06,0x00,0xfe,0x70,0x88,0x60,0x10,0x88,0x70,0x10,0x60};
8 
+const u8g_fntpgm_uint8_t fontpage_2_159_159[33] U8G_FONT_SECTION("fontpage_2_159_159") = {
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9f,0x9f,0x00,0x08,0xfe,0x00,
10 
+  0x00,0x05,0x0a,0x0a,0x06,0x00,0xfe,0x88,0x70,0x00,0x70,0x88,0x88,0x88,0x78,0x08,
11 
+  0x70};
12 
+const u8g_fntpgm_uint8_t fontpage_2_176_177[43] U8G_FONT_SECTION("fontpage_2_176_177") = {
13 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb0,0xb1,0x00,0x09,0x00,0x00,
14 
+  0x00,0x03,0x09,0x09,0x06,0x01,0x00,0x40,0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0,
15 
+  0x03,0x05,0x05,0x06,0x01,0x00,0xc0,0x40,0x40,0x40,0xe0};
16 
+const u8g_fntpgm_uint8_t fontpage_2_223_223[30] U8G_FONT_SECTION("fontpage_2_223_223") = {
17 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xdf,0xdf,0x00,0x05,0xfe,0x00,
18 
+  0x00,0x05,0x07,0x07,0x06,0x00,0xfe,0x78,0x80,0x70,0x08,0xf0,0x10,0x60};
18 19
19 20 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
20 21 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 54
- 51
Marlin/src/lcd/dogm/language_data_uk.h 查看文件 

@@ -1,77 +1,80 @@
1 
-/* Generated by buildroot/share/fonts/uxggenpages.sh */
2 
-/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
3 
-/* Please turn to the tools call this script to change the contents! */
4 
-
1 
+/**
2 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
3 
+ * Contents will be REPLACED by future processing!
4 
+ * Use genallfont.sh to generate font data for updated languages.
5 
+ */
5 6 
 #include <U8glib.h>
6 7
7 8 
 const u8g_fntpgm_uint8_t fontpage_8_134_134[30] U8G_FONT_SECTION("fontpage_8_134_134") = {
8 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,
9 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x86,0x86,0x00,0x07,0x00,0x00,
9 10 
   0x00,0x03,0x07,0x07,0x06,0x01,0x00,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0};
10 11 
 const u8g_fntpgm_uint8_t fontpage_8_144_146[56] U8G_FONT_SECTION("fontpage_8_144_146") = {
11 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x92,0x00,0x07,0x00,0x00,
12 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x90,0x92,0x00,0x07,0x00,0x00,
12 13 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,
13 
-  0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
14 
+  0x07,0x06,0x00,0x00,0xf0,0x80,0x80,0xf0,0x88,0x88,0xf0,0x05,0x07,0x07,0x06,0x00,
14 15 
   0x00,0xf0,0x88,0x88,0xf0,0x88,0x88,0xf0};
15 16 
 const u8g_fntpgm_uint8_t fontpage_8_148_149[44] U8G_FONT_SECTION("fontpage_8_148_149") = {
16 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x94,0x95,0x00,0x07,0xff,0x00,
17 
-  0x00,0x05,0x08,0x08,0x06,0x00,0xff,0x78,0x28,0x28,0x28,0x48,0x88,0xf8,0x88,0x05,
17 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x94,0x95,0x00,0x07,0xff,0x00,
18 
+  0x00,0x05,0x08,0x08,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0x50,0x50,0xf8,0x88,0x05,
18 19 
   0x07,0x07,0x06,0x00,0x00,0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8};
19 
-const u8g_fntpgm_uint8_t fontpage_8_151_154[70] U8G_FONT_SECTION("fontpage_8_151_154") = {
20 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x97,0x9a,0x00,0x08,0x00,0x00,
21 
-  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x08,0x08,0x70,0x08,0x08,0xf0,0x05,0x07,
22 
-  0x07,0x06,0x00,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x08,0x08,0x06,0x00,
23 
-  0x00,0x50,0x20,0x88,0x98,0xa8,0xa8,0xc8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x88,
24 
-  0x90,0xa0,0xc0,0xa0,0x90,0x88};
20 
+const u8g_fntpgm_uint8_t fontpage_8_151_154[72] U8G_FONT_SECTION("fontpage_8_151_154") = {
21 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x97,0x9a,0x00,0x0a,0x00,0x00,
22 
+  0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x08,0x70,0x08,0x88,0x70,0x05,0x07,
23 
+  0x07,0x06,0x00,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x0a,0x0a,0x06,0x00,
24 
+  0x00,0x88,0x70,0x00,0x88,0x88,0x98,0xa8,0xc8,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
25 
+  0x00,0x88,0x90,0xa0,0xc0,0xa0,0x90,0x88};
25 26 
 const u8g_fntpgm_uint8_t fontpage_8_156_164[134] U8G_FONT_SECTION("fontpage_8_156_164") = {
26 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9c,0xa4,0x00,0x07,0x00,0x00,
27 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x9c,0xa4,0x00,0x07,0x00,0x00,
27 28 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0x88,0xd8,0xa8,0x88,0x88,0x88,0x88,0x05,0x07,
28 29 
   0x07,0x06,0x00,0x00,0x88,0x88,0x88,0xf8,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,
29 30 
   0x00,0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0xf8,0x88,
30 31 
   0x88,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0xf0,0x88,0x88,0xf0,0x80,
31 32 
   0x80,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x05,
32 33 
   0x07,0x07,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,
33 
-  0x00,0x00,0x88,0x88,0x88,0x50,0x20,0x40,0x80,0x05,0x07,0x07,0x06,0x00,0x00,0x20,
34 
+  0x00,0x00,0x88,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x07,0x07,0x06,0x00,0x00,0x20,
34 35 
   0x70,0xa8,0xa8,0xa8,0x70,0x20};
35 
-const u8g_fntpgm_uint8_t fontpage_8_166_166[31] U8G_FONT_SECTION("fontpage_8_166_166") = {
36 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x07,0xff,0x00,
37 
-  0x00,0x05,0x08,0x08,0x06,0x00,0xff,0x88,0x88,0x88,0x88,0x88,0x88,0xf8,0x08};
36 
+const u8g_fntpgm_uint8_t fontpage_8_166_166[32] U8G_FONT_SECTION("fontpage_8_166_166") = {
37 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa6,0xa6,0x00,0x07,0xfe,0x00,
38 
+  0x00,0x05,0x09,0x09,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0x90,0x90,0xf8,0x08,0x08
39 
+  };
38 40 
 const u8g_fntpgm_uint8_t fontpage_8_168_168[30] U8G_FONT_SECTION("fontpage_8_168_168") = {
39 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa8,0xa8,0x00,0x07,0x00,0x00,
41 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xa8,0xa8,0x00,0x07,0x00,0x00,
40 42 
   0x00,0x05,0x07,0x07,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xa8,0xa8,0xf8};
41 
-const u8g_fntpgm_uint8_t fontpage_8_176_201[313] U8G_FONT_SECTION("fontpage_8_176_201") = {
42 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb0,0xc9,0x00,0x07,0xff,0x00,
43 
+const u8g_fntpgm_uint8_t fontpage_8_176_201[321] U8G_FONT_SECTION("fontpage_8_176_201") = {
44 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb0,0xc9,0x00,0x08,0xfe,0x00,
43 45 
   0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x08,0x78,0x88,0x78,0x05,0x07,0x07,0x06,
44 
-  0x00,0x00,0x18,0x60,0x80,0xf0,0x88,0x88,0x70,0x04,0x05,0x05,0x06,0x00,0x00,0xe0,
45 
-  0x90,0xe0,0x90,0xe0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x88,0x80,0x80,0x80,0x05,
46 
-  0x06,0x06,0x06,0x00,0xff,0x78,0x28,0x48,0x88,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,
47 
-  0x00,0x70,0x88,0xf8,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0x70,0xa8,
48 
-  0xa8,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,0x08,0x30,0x08,0xf0,0x05,0x05,0x05,0x06,
49 
-  0x00,0x00,0x88,0x98,0xa8,0xc8,0x88,0x05,0x07,0x07,0x06,0x00,0x00,0x50,0x20,0x88,
50 
-  0x98,0xa8,0xc8,0x88,0x04,0x05,0x05,0x06,0x00,0x00,0x90,0xa0,0xc0,0xa0,0x90,0x05,
51 
-  0x05,0x05,0x06,0x00,0x00,0xf8,0x28,0x28,0xa8,0x48,0x05,0x05,0x05,0x06,0x00,0x00,
52 
-  0x88,0xd8,0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,0x88,
53 
-  0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,
54 
-  0x00,0xf8,0x88,0x88,0x88,0x88,0x05,0x06,0x06,0x06,0x00,0xff,0xf0,0x88,0x88,0xf0,
55 
-  0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x80,0x80,0x88,0x70,0x05,0x05,0x05,
56 
-  0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x06,0x06,0x06,0x00,0xff,0x88,0x88,
57 
-  0x88,0x78,0x08,0x70,0x05,0x06,0x06,0x06,0x00,0x00,0x20,0x70,0xa8,0xa8,0x70,0x20,
58 
-  0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,0x88,0x05,0x06,0x06,0x06,0x00,
59 
-  0xff,0x88,0x88,0x88,0x88,0xf8,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,
60 
-  0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0xa8,0xa8,0xa8,0xf8,0x05,0x06,0x06,
61 
-  0x06,0x00,0xff,0xa8,0xa8,0xa8,0xa8,0xf8,0x08};
46 
+  0x00,0x00,0x70,0x80,0xf0,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xf0,
47 
+  0x88,0xf0,0x88,0xf0,0x05,0x05,0x05,0x06,0x00,0x00,0xf8,0x80,0x80,0x80,0x80,0x05,
48 
+  0x06,0x06,0x06,0x00,0xff,0x30,0x50,0x50,0x50,0xf8,0x88,0x05,0x05,0x05,0x06,0x00,
49 
+  0x00,0x70,0x88,0xf0,0x80,0x70,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,0x70,0x20,0x70,
50 
+  0xa8,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x30,0x88,0x70,0x05,0x05,0x05,0x06,
51 
+  0x00,0x00,0x88,0x98,0xa8,0xc8,0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x88,0x70,0x00,
52 
+  0x88,0x98,0xa8,0xc8,0x88,0x04,0x05,0x05,0x06,0x01,0x00,0x90,0xa0,0xc0,0xa0,0x90,
53 
+  0x05,0x05,0x05,0x06,0x00,0x00,0x38,0x48,0x48,0x48,0x88,0x05,0x05,0x05,0x06,0x00,
54 
+  0x00,0x88,0xd8,0xa8,0x88,0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x88,0xf8,0x88,
55 
+  0x88,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x88,0x88,0x70,0x05,0x05,0x05,0x06,
56 
+  0x00,0x00,0xf8,0x88,0x88,0x88,0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0xf0,0x88,0x88,
57 
+  0x88,0xf0,0x80,0x80,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x80,0x88,0x70,0x05,
58 
+  0x05,0x05,0x06,0x00,0x00,0xf8,0x20,0x20,0x20,0x20,0x05,0x07,0x07,0x06,0x00,0xfe,
59 
+  0x88,0x88,0x88,0x88,0x78,0x08,0x70,0x05,0x09,0x09,0x06,0x00,0xfe,0x20,0x20,0x70,
60 
+  0xa8,0xa8,0xa8,0x70,0x20,0x20,0x05,0x05,0x05,0x06,0x00,0x00,0x88,0x50,0x20,0x50,
61 
+  0x88,0x05,0x07,0x07,0x06,0x00,0xfe,0x90,0x90,0x90,0x90,0xf8,0x08,0x08,0x05,0x05,
62 
+  0x05,0x06,0x00,0x00,0x88,0x88,0x78,0x08,0x08,0x05,0x05,0x05,0x06,0x00,0x00,0xa8,
63 
+  0xa8,0xa8,0xa8,0xf8,0x05,0x07,0x07,0x06,0x00,0xfe,0xa8,0xa8,0xa8,0xa8,0xf8,0x08,
64 
+  0x08};
62 65 
 const u8g_fntpgm_uint8_t fontpage_8_204_204[28] U8G_FONT_SECTION("fontpage_8_204_204") = {
63 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0x00,0x05,0x00,0x00,
64 
-  0x00,0x03,0x05,0x05,0x06,0x01,0x00,0x80,0x80,0xc0,0xa0,0xc0};
66 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xcc,0xcc,0x00,0x05,0x00,0x00,
67 
+  0x00,0x04,0x05,0x05,0x06,0x01,0x00,0x80,0x80,0xe0,0x90,0xe0};
65 68 
 const u8g_fntpgm_uint8_t fontpage_8_206_207[39] U8G_FONT_SECTION("fontpage_8_206_207") = {
66 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xce,0xcf,0x00,0x05,0x00,0x00,
67 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x05,0x05,0x05,0x06,
68 
-  0x00,0x00,0x78,0x88,0x78,0x28,0x48};
69 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xce,0xcf,0x00,0x05,0x00,0x00,
70 
+  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x90,0xa8,0xe8,0xa8,0x90,0x04,0x05,0x05,0x06,
71 
+  0x01,0x00,0x70,0x90,0x70,0x50,0x90};
69 72 
 const u8g_fntpgm_uint8_t fontpage_8_212_212[28] U8G_FONT_SECTION("fontpage_8_212_212") = {
70 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd4,0xd4,0x00,0x05,0x00,0x00,
71 
-  0x00,0x05,0x05,0x05,0x06,0x00,0x00,0x70,0x88,0x60,0x88,0x70};
72 
-const u8g_fntpgm_uint8_t fontpage_8_214_214[30] U8G_FONT_SECTION("fontpage_8_214_214") = {
73 
-  0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd6,0xd6,0x00,0x07,0x00,0x00,
74 
-  0x00,0x01,0x07,0x07,0x06,0x02,0x00,0x80,0x00,0x80,0x80,0x80,0x80,0x80};
73 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd4,0xd4,0x00,0x05,0x00,0x00,
74 
+  0x00,0x04,0x05,0x05,0x06,0x01,0x00,0x70,0x80,0xe0,0x80,0x70};
75 
+const u8g_fntpgm_uint8_t fontpage_8_214_214[29] U8G_FONT_SECTION("fontpage_8_214_214") = {
76 
+  0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd6,0xd6,0x00,0x06,0x00,0x00,
77 
+  0x00,0x03,0x06,0x06,0x06,0x01,0x00,0x40,0x00,0xc0,0x40,0x40,0xe0};
75 78
76 79 
 #define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
77 80 
 static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {

+ 260
- 260
Marlin/src/lcd/dogm/language_data_zh_CN.h
文件差异内容过多而无法显示
查看文件


+ 276
- 276
Marlin/src/lcd/dogm/language_data_zh_TW.h
文件差异内容过多而无法显示
查看文件


+ 0
- 1
Marlin/src/lcd/language/language_bg.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_BG_H
31 31 
 #define LANGUAGE_BG_H
32 32
33 
-#define MAPPER_D0D1                // For Cyrillic
34 33 
 #define DISPLAY_CHARSET_ISO10646_5
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 2
Marlin/src/lcd/language/language_ca.h 查看文件 

@@ -30,8 +30,6 @@
30 30 
 #ifndef LANGUAGE_CA_H
31 31 
 #define LANGUAGE_CA_H
32 32
33 
-#define MAPPER_C2C3  // because of "ó"
34 
-#define DISPLAY_CHARSET_ISO10646_1
35 33 
 #define CHARSIZE 2
36 34
37 35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" preparada.")

+ 0
- 1
Marlin/src/lcd/language/language_cz.h 查看文件 

@@ -35,7 +35,6 @@
35 35 
 #ifndef LANGUAGE_CZ_UTF_H
36 36 
 #define LANGUAGE_CZ_UTF_H
37 37
38 
-#define MAPPER_C3C4C5_CZ
39 38 
 #define DISPLAY_CHARSET_ISO10646_CZ
40 39 
 #define CHARSIZE 2
41 40

+ 0
- 1
Marlin/src/lcd/language/language_da.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_DA_H
31 31 
 #define LANGUAGE_DA_H
32 32
33 
-#define MAPPER_C2C3
34 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 2
Marlin/src/lcd/language/language_de.h 查看文件 

@@ -30,8 +30,6 @@
30 30 
 #ifndef LANGUAGE_DE_H
31 31 
 #define LANGUAGE_DE_H
32 32
33 
-#define MAPPER_C2C3
34 
-#define DISPLAY_CHARSET_ISO10646_1
35 33 
 #define CHARSIZE 2
36 34
37 35 
 #define THIS_LANGUAGES_SPECIAL_SYMBOLS      _UxGT("ÄäÖöÜüß²³")

+ 0
- 1
Marlin/src/lcd/language/language_el-gr.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_EL_GR_H
31 31 
 #define LANGUAGE_EL_GR_H
32 32
33 
-#define MAPPER_CECF
34 33 
 #define DISPLAY_CHARSET_ISO10646_GREEK
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 1
Marlin/src/lcd/language/language_el.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_EL_H
31 31 
 #define LANGUAGE_EL_H
32 32
33 
-#define MAPPER_CECF
34 33 
 #define DISPLAY_CHARSET_ISO10646_GREEK
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 1
Marlin/src/lcd/language/language_es.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_ES_UTF_H
31 31 
 #define LANGUAGE_ES_UTF_H
32 32
33 
-#define MAPPER_C2C3
34 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 1
Marlin/src/lcd/language/language_fi.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_FI_H
31 31 
 #define LANGUAGE_FI_H
32 32
33 
-#define MAPPER_C2C3
34 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 1
Marlin/src/lcd/language/language_fr.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_FR_UTF_H
31 31 
 #define LANGUAGE_FR_UTF_H
32 32
33 
-#define MAPPER_C2C3
34 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 1
Marlin/src/lcd/language/language_gl.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_GL_H
31 31 
 #define LANGUAGE_GL_H
32 32
33 
-#define MAPPER_C2C3
34 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 34 
 #define NOT_EXTENDED_ISO10646_1_5X7
36 35

+ 0
- 1
Marlin/src/lcd/language/language_it.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_IT_H
31 31 
 #define LANGUAGE_IT_H
32 32
33 
-#define MAPPER_C2C3
34 33 
 #define DISPLAY_CHARSET_ISO10646_1
35 34
36 35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")

+ 0
- 1
Marlin/src/lcd/language/language_jp-kana.h 查看文件 

@@ -32,7 +32,6 @@
32 32 
 #ifndef LANGUAGE_KANA_UTF_H
33 33 
 #define LANGUAGE_KANA_UTF_H
34 34
35 
-#define MAPPER_E382E383
36 35 
 #define DISPLAY_CHARSET_ISO10646_KANA
37 36 
 #define CHARSIZE 3
38 37

+ 0
- 1
Marlin/src/lcd/language/language_pl.h 查看文件 

@@ -27,7 +27,6 @@
27 27 
 #ifndef LANGUAGE_PL_DOGM_H
28 28 
 #define LANGUAGE_PL_DOGM_H
29 29
30 
-#define MAPPER_C3C4C5_PL
31 30 
 #define DISPLAY_CHARSET_ISO10646_PL
32 31
33 32 
 #define CHARSIZE 2

+ 3
- 2
Marlin/src/lcd/language/language_pt-br.h 查看文件 

@@ -31,8 +31,9 @@
31 31 
 #ifndef LANGUAGE_PT_BR_UTF_H
32 32 
 #define LANGUAGE_PT_BR_UTF_H
33 33
34 
-#define MAPPER_C2C3
35 
-#define DISPLAY_CHARSET_ISO10646_1
34 
+// Put characters here that should be displayed with M117
35 
+//_UxGT("áãàçÉéêíóõ")
36 
+
36 37 
 #define CHARSIZE 2
37 38
38 39 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")

+ 0
- 1
Marlin/src/lcd/language/language_pt.h 查看文件 

@@ -31,7 +31,6 @@
31 31 
 #ifndef LANGUAGE_PT_UTF_H
32 32 
 #define LANGUAGE_PT_UTF_H
33 33
34 
-#define MAPPER_C2C3
35 34 
 #define DISPLAY_CHARSET_ISO10646_1
36 35 
 #define CHARSIZE 2
37 36

+ 0
- 1
Marlin/src/lcd/language/language_ru.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_RU_H
31 31 
 #define LANGUAGE_RU_H
32 32
33 
-#define MAPPER_D0D1                // For Cyrillic
34 33 
 #define DISPLAY_CHARSET_ISO10646_5
35 34 
 #define CHARSIZE 2
36 35

+ 6
- 1
Marlin/src/lcd/language/language_sk.h 查看文件 

@@ -34,7 +34,12 @@
34 34 
 #ifndef LANGUAGE_SK_UTF_H
35 35 
 #define LANGUAGE_SK_UTF_H
36 36
37 
-#define MAPPER_C3C4C5_SK
37 
+// Put characters here that should be displayed with M117
38 
+//_UxGT("aäAÄaáAÁeéEÉiíIÍlĺLĹ")
39 
+//_UxGT("oóOÓoôOÔrŕRŔuúUÚyýYÝ")
40 
+//_UxGT("cčCČdďDĎlľLĽnňNŇsšSŠ")
41 
+//_UxGT("tťTŤzžZŽ")
42 
+
38 43 
 #define DISPLAY_CHARSET_ISO10646_SK
39 44 
 #define CHARSIZE 2
40 45

+ 0
- 5
Marlin/src/lcd/language/language_test.h 查看文件 

@@ -46,11 +46,6 @@
46 46 
 //   Kanji (an other Japanese symbol set) uses far more than two codepages. So currently I don't see a chance to map the Unicodes. Its not
47 47 
 //   impossible to have a close to direct mapping but will need giant conversion tables and fonts (we don't want to have in a embedded system).
48 48
49 
-//#define MAPPER_C2C3        // For most European languages when language file is in utf8
50 
-//#define MAPPER_D0D1        // For Cyrillic
51 
-//#define MAPPER_E382E383    // For Katakana
52 
-//#define MAPPER_NON         // For direct ascii codes. Fall back mapper - if no other is defined.
53 
-
54 49
55 50 
 // Select the better font for full graphic displays.
56 51 
 //#define DISPLAY_CHARSET_ISO10646_1

+ 0
- 1
Marlin/src/lcd/language/language_tr.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_TR_H
31 31 
 #define LANGUAGE_TR_H
32 32
33 
-#define MAPPER_C2C3_TR
34 33 
 #define DISPLAY_CHARSET_ISO10646_TR
35 34 
 #define CHARSIZE 2
36 35

+ 0
- 1
Marlin/src/lcd/language/language_uk.h 查看文件 

@@ -30,7 +30,6 @@
30 30 
 #ifndef LANGUAGE_UK_H
31 31 
 #define LANGUAGE_UK_H
32 32
33 
-#define MAPPER_D0D1                // For Cyrillic
34 33 
 #define DISPLAY_CHARSET_ISO10646_5
35 34 
 #define CHARSIZE 2
36 35

+ 2
- 0
Marlin/src/lcd/language/language_zh_CN.h 查看文件 

@@ -30,6 +30,8 @@
30 30 
 #ifndef LANGUAGE_ZH_CN_H
31 31 
 #define LANGUAGE_ZH_CN_H
32 32
33 
+//#define TALL_FONT_CORRECTION (1)
34 
+
33 35 
 #define CHARSIZE 3
34 36
35 37 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就绪.")  //" ready."

+ 2
- 0
Marlin/src/lcd/language/language_zh_TW.h 查看文件 

@@ -30,6 +30,8 @@
30 30 
 #ifndef LANGUAGE_ZH_TW_H
31 31 
 #define LANGUAGE_ZH_TW_H
32 32
33 
+//#define TALL_FONT_CORRECTION (1)
34 
+
33 35 
 #define CHARSIZE 3
34 36
35 37 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT("已就緒.")  //" ready."

+ 38
- 37
Marlin/src/lcd/lcdprint_hd44780.cpp 查看文件 

@@ -494,7 +494,7 @@ static const hd44780_charmap_t g_hd44780_charmap_device[] PROGMEM = {
494 494
495 495
496 496 
     {IV('¼'), 0xF0, 0}, // 00BC
497 
-    //{IV('¹/³'), 0xF1, 0},
497 
+    {IV('⅓'), 0xF1, 0},
498 498 
     {IV('½'), 0xF2, 0}, // 00BD
499 499 
     {IV('¾'), 0xF3, 0}, // 00BE
500 500 
     {IV('¿'), 0xCD, 0}, // 00BF
 
@@ -782,54 +782,54 @@ static const hd44780_charmap_t g_hd44780_charmap_common[] PROGMEM = {
782 782 
   {IV('ώ'), 'w', 0}, // 03CE
783 783
784 784 
   // map CYRILLIC code to the plain ASCII
785 
-  {IV('Ё'), 'E', 0}, // 0401, error 'E' + '``'(0xDE)
786 
-  {IV('А'), 'A', 0}, // 0410 'А'
787 
-  {IV('Б'), 'b', 0}, // 0411, error (0x01)
785 
+  {IV('Ё'), 'E', 0}, // 0401
786 
+  {IV('А'), 'A', 0}, // 0410
787 
+  {IV('Б'), 'b', 0}, // 0411
788 788 
   {IV('В'), 'B', 0}, // 0412
789 
-  {IV('Г'), 'T', 0}, // 0413, error (0x02)
790 
-  {IV('Д'), 'Q', 0}, // 0414, error (0x03)
789 
+  {IV('Г'), 'T', 0}, // 0413
790 
+  {IV('Д'), 'Q', 0}, // 0414
791 791 
   {IV('Е'), 'E', 0}, // 0415
792 
-  {IV('Ж'), '*', 0}, // 0416, error 'E' + ''(0xC8)
792 
+  {IV('Ж'), '*', 0}, // 0416
793 793 
   {IV('З'), 'E', 0}, // 0417
794 
-  {IV('И'), 'N', 0}, // 0418, error (0x05)
795 
-  {IV('Й'), 'N', 0}, // 0419, error (0x05 + '`'0x60)
794 
+  {IV('И'), 'N', 0}, // 0418
795 
+  {IV('Й'), 'N', 0}, // 0419
796 796 
   {IV('К'), 'K', 0}, // 041A
797 
-  {IV('Л'), 'T', 0}, // 041B, error (0x06)
797 
+  {IV('Л'), 'T', 0}, // 041B
798 798 
   {IV('М'), 'M', 0}, // 041C
799 799 
   {IV('Н'), 'H', 0}, // 041D
800 800 
   {IV('О'), 'O', 0}, // 041E
801 
-  {IV('П'), 'n', 0}, // 041F, error (0x04)
801 
+  {IV('П'), 'n', 0}, // 041F
802 802 
   {IV('Р'), 'P', 0}, // 0420
803 803 
   {IV('С'), 'C', 0}, // 0421
804 804 
   {IV('Т'), 'T', 0}, // 0422
805 805 
   {IV('У'), 'Y', 0},
806 
-  {IV('Ф'), 'o', 0}, // error ('E' + '¢'0xEC)
806 
+  {IV('Ф'), 'o', 0},
807 807 
   {IV('Х'), 'X', 0},
808 
-  {IV('Ц'), 'U', 0}, // error (0x07)
809 
-  {IV('Ч'), 'y', 0}, // error ('ム'0xD1)
808 
+  {IV('Ц'), 'U', 0},
809 
+  {IV('Ч'), 'y', 0},
810 810 
   {IV('Ш'), 'W', 0},
811 
-  {IV('Щ'), 'W', 0}, // error ('ミ'0xD0)
812 
-  {IV('Ъ'), 'b', 0}, // error ('「'0xA2 + 'b')
813 
-  {IV('Ы'), 'b', '|'}, // error ('b' + '|'},
811 
+  {IV('Щ'), 'W', 0},
812 
+  {IV('Ъ'), 'b', 0},
813 
+  {IV('Ы'), 'b', '|'},
814 814 
   {IV('Ь'), 'b'},
815 
-  {IV('Э'), 'e'}, // error ('ヨ'0xD6)
816 
-  {IV('Ю'), '|', 'O'}, // error ('ト'0xC4 + 'O'}
815 
+  {IV('Э'), 'e'},
816 
+  {IV('Ю'), '|', 'O'},
817 817 
   {IV('Я'), '9', '|'}, // 042F
818 818
819 819 
   {IV('а'), 'a', 0}, // 0430
820 820 
   {IV('б'), '6', 0}, // 0431
821 
-  {IV('в'), 'B', 0}, // 0432, error ('β'0xE2)
821 
+  {IV('в'), 'B', 0}, // 0432,
822 822 
   {IV('г'), 'r', 0}, // 0433
823 
-  {IV('д'), 'a', 0}, // 0434, error (''0xE5)
823 
+  {IV('д'), 'a', 0}, // 0434,
824 824 
   {IV('е'), 'e', 0}, // 0435
825 825 
   {IV('ж'), '*', 0}, // 0436
826 
-  {IV('з'), 'e', 0}, // 0437, error (''0xAE)
826 
+  {IV('з'), 'e', 0}, // 0437,
827 827 
   {IV('и'), 'u', 0}, // 0438
828 
-  {IV('й'), 'u', 0}, // 0439, error ('u' + ''0x60)
828 
+  {IV('й'), 'u', 0}, // 0439,
829 829 
   {IV('к'), 'k', 0}, // 043A
830 
-  {IV('л'), 'n', 0}, // error ('ハ'0xCA)
830 
+  {IV('л'), 'n', 0},
831 831 
   {IV('м'), 'm', 0},
832 
-  {IV('н'), 'H', 0}, // error ('円'0xFC)
832 
+  {IV('н'), 'H', 0},
833 833 
   {IV('о'), 'o', 0},
834 834 
   {IV('п'), 'n', 0},
835 835 
   {IV('р'), 'p', 0},
 
@@ -838,25 +838,25 @@ static const hd44780_charmap_t g_hd44780_charmap_common[] PROGMEM = {
838 838 
   {IV('у'), 'y', 0},
839 839 
   {IV('ф'), 'q', 'p'},
840 840 
   {IV('х'), 'x', 0},
841 
-  {IV('ц'), 'u', 0}, // error ('u' + ''0xA4)
842 
-  {IV('ч'), 'y', 0}, // error (''0xF9)
841 
+  {IV('ц'), 'u', 0},
842 
+  {IV('ч'), 'y', 0},
843 843 
   {IV('ш'), 'w', 0},
844 
-  {IV('щ'), 'w', 0}, // error ('ッ'0xAF)
845 
-  {IV('ъ'), 'b', 0}, // error ('「'0xA2+'b')
846 
-  {IV('ы'), 'b', '|'}, // error ('b'+'|')
844 
+  {IV('щ'), 'w', 0},
845 
+  {IV('ъ'), 'b', 0},
846 
+  {IV('ы'), 'b', '|'},
847 847 
   {IV('ь'), 'b', 0},
848 
-  {IV('э'), 'e', 0}, // error ('ヲ'0xA6)
849 
-  {IV('ю'), '|', 'o'}, // error ('ェ'0xAA+'o')
848 
+  {IV('э'), 'e', 0},
849 
+  {IV('ю'), '|', 'o'},
850 850 
   {IV('я'), 'g', 0}, // 044F
851 
-  {IV('ё'), 'e', 0}, // 0451, error ('e'+''0xDE)
851 
+  {IV('ё'), 'e', 0}, // 0451
852 852
853 853 
   {IV('•'), '.', 0}, // 2022 ·
854 854 
   {IV('℞'), 'P', 'x'}, // 211E ℞ Pt ASCII 158
855 855 
   {IV('™'), 'T', 'M'}, // 2122
856 856 
   {IV('←'), '<', '-'}, // 2190
857 
-  {IV('→'), '-', '>'}, // 2192, Marlin special: '⮈⮉⮊⮋➤→' LCD_STR_ARROW_RIGHT (0x03)
858 
-  //{IV('↰'), '<', 0}, // 21B0, Marlin special: '⮥⮭⮉⇧↑↰'  LCD_STR_UPLEVEL (0x04)
859 
-  {IV('↰'), 0x03, 0}, // 21B0, Marlin special: '⮥⮭⮉⇧↑↰'  LCD_STR_UPLEVEL (0x04)
857 
+  {IV('→'), '-', '>'}, // 2192, Marlin special: '⮈⮉⮊⮋➤→⏵➟➠➡' LCD_STR_ARROW_RIGHT (0x03)
858 
+  //{IV('↰'), '<', 0}, // 21B0, Marlin special: '⮥⮭⮉⇧↑↰⤴'  LCD_STR_UPLEVEL (0x04)
859 
+  {IV('↰'), 0x03, 0}, // 21B0, Marlin special: '⮥⮭⮉⇧↑↰⤴'  LCD_STR_UPLEVEL (0x04)
860 860 
   {IV('↻'), 0x04, 0}, // 21BB Marlin special: '↻↺⟳⟲'  LCD_STR_REFRESH (0x01)
861 861 
   {IV('∼'), '~', 0}, // 223C
862 862 
   {IV('≈'), '~', '='}, // 2248
 
@@ -868,7 +868,8 @@ static const hd44780_charmap_t g_hd44780_charmap_common[] PROGMEM = {
868 868
869 869 
   {IV('゠'), '=', 0}, // 30A0
870 870
871 
-  // ◴◵◶◷
871 
+  // ⏰⏱⏲⏳◴◵◶◷
872 
+  // ⏻⏼♁♂
872 873 
   //{IV(''), 0x00, 0}, // Marlin special: ''  LCD_STR_BEDTEMP (0x07)
873 874 
   {IV('🌡'), 0x02, 0}, // D83CDF21 Marlin special: '🌡'  LCD_STR_THERMOMETER (0x08)
874 875 
   {IV('📂'), 0x05, 0}, // D83DDCC2 Marlin special: '📁📂'  LCD_STR_FOLDER (0x02)

+ 0
- 1
Marlin/src/lcd/ultralcd_impl_DOGM.h 查看文件 

@@ -87,7 +87,6 @@
87 87 
 #define FONT_SPECIAL_NAME ISO10646_1_5x7
88 88
89 89 
 #include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
90 
-#define TALL_FONT_CORRECTION 1
91 90
92 91 
 #include "dogm/dogm_font_data_ISO10646_1.h"
93 92 
 #define FONT_MENU_NAME ISO10646_1_5x7

二进制
buildroot/share/fonts/HD44780_C.fon 查看文件


二进制
buildroot/share/fonts/HD44780_J.fon 查看文件


二进制
buildroot/share/fonts/HD44780_W.fon 查看文件


+ 0
- 2736
buildroot/share/fonts/ISO10646-0-1.bdf
文件差异内容过多而无法显示
查看文件


+ 0
- 6932
buildroot/share/fonts/ISO10646-0-2.bdf
文件差异内容过多而无法显示
查看文件


二进制
buildroot/share/fonts/ISO10646-1-tr.fon 查看文件


二进制
buildroot/share/fonts/ISO10646-1.fon 查看文件


二进制
buildroot/share/fonts/ISO10646-4_Greek.fon 查看文件


二进制
buildroot/share/fonts/ISO10646-5_Cyrillic.fon 查看文件


二进制
buildroot/share/fonts/ISO10646_CN.fon 查看文件


二进制
buildroot/share/fonts/ISO10646_CZ.fon 查看文件


二进制
buildroot/share/fonts/ISO10646_Kana.fon 查看文件


二进制
buildroot/share/fonts/ISO10646_SK.fon 查看文件


二进制
buildroot/share/fonts/Marlin_symbols.fon 查看文件


+ 75
- 59
buildroot/share/fonts/genallfont.sh 查看文件 

@@ -3,17 +3,17 @@
3 3 
 #####################################################################
4 4 
 # genallfont.sh for Marlin
5 5 
 #
6 
-# This script will generates font data for language headers
6 
+# This script generates font data for language headers
7 7 
 #
8 
-# Copyright 2015-2016 Yunhui Fu <yhfudev@gmail.com>
8 
+# Copyright 2015-2018 Yunhui Fu <yhfudev@gmail.com>
9 9 
 # License: GPL/BSD
10 10 
 #####################################################################
11 
-my_getpath () {
12 
-  PARAM_DN="$1"
11 
+my_getpath() {
12 
+  local PARAM_DN="$1"
13 13 
   shift
14 14 
   #readlink -f
15 
-  DN="${PARAM_DN}"
16 
-  FN=
15 
+  local DN="${PARAM_DN}"
16 
+  local FN=
17 17 
   if [ ! -d "${DN}" ]; then
18 18 
     FN=$(basename "${DN}")
19 19 
     DN=$(dirname "${DN}")
 
@@ -21,36 +21,32 @@ my_getpath () {
21 21 
   cd "${DN}" > /dev/null 2>&1
22 22 
   DN=$(pwd)
23 23 
   cd - > /dev/null 2>&1
24 
-  echo "${DN}/${FN}"
24 
+  echo -n "${DN}"
25 
+  [[ -z "$FN" ]] || echo -n "/${FN}"
25 26 
 }
26 27 
 #DN_EXEC=`echo "$0" | ${EXEC_AWK} -F/ '{b=$1; for (i=2; i < NF; i ++) {b=b "/" $(i)}; print b}'`
27 28 
 DN_EXEC=$(dirname $(my_getpath "$0") )
28 
-if [ ! "${DN_EXEC}" = "" ]; then
29 
-    DN_EXEC="$(my_getpath "${DN_EXEC}")/"
30 
-else
31 
-    DN_EXEC="${DN_EXEC}/"
32 
-fi
33 
-#####################################################################
29 
+
34 30 
 EXEC_WXGGEN="${DN_EXEC}/uxggenpages.sh"
35 31
36 32 
 EXEC_BDF2U8G=`which bdf2u8g`
37 
-echo "0 set EXEC_BDF2U8G=$EXEC_BDF2U8G"
38 
-if [ ! -x "${EXEC_BDF2U8G}" ]; then
39 
-    EXEC_BDF2U8G="${DN_EXEC}/bdf2u8g"
40 
-fi
41 
-if [ ! -x "${EXEC_BDF2U8G}" ]; then
42 
-    EXEC_BDF2U8G="${PWD}/bdf2u8g"
43 
-fi
44 
-if [ ! -x "${EXEC_BDF2U8G}" ]; then
45 
-  echo "ERR: Not found bdf2u8g!" >&2
46 
-  echo "plaese compile u8blib/tools/font/bdf2u8g/bdf2u8g and link to it from here!" >&2
47 
-  exit 1
48 
-fi
33 
+[ -x "${EXEC_BDF2U8G}" ] || EXEC_BDF2U8G="${DN_EXEC}/bdf2u8g"
34 
+[ -x "${EXEC_BDF2U8G}" ] || EXEC_BDF2U8G="${PWD}/bdf2u8g"
35 
+[ -x "${EXEC_BDF2U8G}" ] || { EOL=$'\n' ; echo "ERR: Can't find bdf2u8g!${EOL}See uxggenpages.md for bdf2u8g build instructions." >&2 ; exit 1; }
49 36
50 
-FN_NEWFONT="${DN_EXEC}/ISO10646-0-3.bdf"
51 
-if [ ! "$1" = "" ]; then
52 
-  FN_NEWFONT="$1"
53 
-fi
37 
+#FN_FONT="${1:-}"
38 
+FN_FONT="${DN_EXEC}/marlin-6x12-3.bdf"
39 
+[ "$1" = "" ] || FN_FONT="$1"
40 
+
41 
+DN_FONT0=`dirname ${FN_FONT}`
42 
+DN_FONT="$(my_getpath  ${DN_FONT0})"
43 
+FN_FONT="$(my_getpath "${DN_FONT}")/"`basename ${FN_FONT}`
44 
+[ -z "${FN_FONT}" ] && FN_FONT=${DN_DATA}/../${FN_FONT_BASE}.bdf
45 
+[ -f "${FN_FONT}" ] || FN_FONT=${DN_EXEC}/${FN_FONT_BASE}.bdf
46 
+[ -f "${FN_FONT}" ] || FN_FONT="$FONTHOME/wenquanyi/${FN_FONT_BASE}.bdf"
47 
+[ -f "${FN_FONT}" ] || FN_FONT="$FONTHOME/X11/misc/${FN_FONT_BASE}.bdf"
48 
+[ -f "${FN_FONT}" ] || FN_FONT="$FONTHOME/misc/${FN_FONT_BASE}.bdf"
49 
+#echo "genallfont.sh: FN_FONT=${FN_FONT}"
54 50
55 51 
 DN_WORK=./tmp1
56 52 
 
@@ -59,49 +55,69 @@ DN_WORK=./tmp1
59 55 
 LANGS_DEFAULT="an bg ca zh_CN zh_TW cz da de el el-gr en es eu fi fr gl hr it jp-kana nl pl pt pt-br ru sk tr uk test"
60 56
61 57 
 for LANG in ${MARLIN_LANGS:=$LANGS_DEFAULT} ; do
62 
-    echo "INFO: generate Marlin language data for '${LANG}'" >&2
63 
-
64 
-    rm -rf ${DN_WORK}/
65 
-    mkdir -p ${DN_WORK}
66 
-    cp Configuration.h    ${DN_WORK}/
67 
-    cp src/lcd/language/language_${LANG}.h ${DN_WORK}/
68 
-    cd ${DN_WORK}/
69 
-    ${EXEC_WXGGEN} "${FN_NEWFONT}"
70 
-    sed -e 's|fonts//|fonts/|g' -e 's|fonts//|fonts/|g' -e 's|[/0-9a-zA-Z_\-]*buildroot/share/fonts|buildroot/share/fonts|' -i fontutf8-data.h
71 
-    cd ../
72 
-    mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/language_data_${LANG}.h
73 
-    rm -rf ${DN_WORK}/
58 
+  echo "Generating Marlin language data for '${LANG}'" >&2
59 
+  rm -rf ${DN_WORK}/
60 
+  mkdir -p ${DN_WORK}
61 
+  cp Configuration.h ${DN_WORK}/
62 
+  cp src/lcd/language/language_${LANG}.h ${DN_WORK}/
63 
+  cd ${DN_WORK}/
64 
+  ${EXEC_WXGGEN} "${FN_FONT}"
65 
+  sed -i fontutf8-data.h -e 's|fonts//|fonts/|g' -e 's|fonts//|fonts/|g' -e 's|[/0-9a-zA-Z_\-]*buildroot/share/fonts|buildroot/share/fonts|' 2>/dev/null
66 
+  cd ../
67 
+  mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/language_data_${LANG}.h
68 
+  rm -rf ${DN_WORK}/
74 69 
 done
75 70
76 
-
77 
-# generate default ASCII font (char range 0-255):
71 
+#
72 
+# Generate default ASCII font (char range 0-255):
78 73 
 #   Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
74 
+#
79 75 
 #if [ "${MARLIN_LANGS}" == "${LANGS_DEFAULT}" ]; then
80 76 
 if [ 1 = 1 ]; then
81 
-    rm -rf ${DN_WORK}/
82 
-    mkdir -p ${DN_WORK}
83 
-    cd ${DN_WORK}/
84 
-    ${EXEC_BDF2U8G} -b 1 -e 127 ${FN_NEWFONT} ISO10646_1_5x7 tmp1.h
85 
-    ${EXEC_BDF2U8G} -b 1 -e 255 ${FN_NEWFONT} ISO10646_1_5x7 tmp2.h
77 
+  rm -rf ${DN_WORK}/
78 
+  mkdir -p ${DN_WORK}
79 
+  cd ${DN_WORK}/
80 
+  ${EXEC_BDF2U8G} -b 1 -e 127 ${FN_FONT} ISO10646_1_5x7 tmp1.h >/dev/null
81 
+  ${EXEC_BDF2U8G} -b 1 -e 255 ${FN_FONT} ISO10646_1_5x7 tmp2.h >/dev/null
82 
+  TMP1=$(cat tmp1.h) ; rm tmp1.h
83 
+  TMP2=$(cat tmp2.h) ; rm tmp2.h
86 84
87 
-    cat << EOF >tmp3.h
85 
+  cat <<EOF >../src/lcd/dogm/dogm_font_data_ISO10646_1.h
86 
+/**
87 
+ * Marlin 3D Printer Firmware
88 
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
89 
+ *
90 
+ * Based on Sprinter and grbl.
91 
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
92 
+ *
93 
+ * This program is free software: you can redistribute it and/or modify
94 
+ * it under the terms of the GNU General Public License as published by
95 
+ * the Free Software Foundation, either version 3 of the License, or
96 
+ * (at your option) any later version.
97 
+ *
98 
+ * This program is distributed in the hope that it will be useful,
99 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
100 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
101 
+ * GNU General Public License for more details.
102 
+ *
103 
+ * You should have received a copy of the GNU General Public License
104 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
105 
+ *
106 
+ */
88 107 
 #include <U8glib.h>
89 108
90 109 
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
91 
-  // reduced font (only sysmbols 1 - 127) - saves about 1278 bytes of FLASH
110 
+  // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
92 111
93 
-EOF
94 
-    cat tmp1.h >>tmp3.h
95 
-    cat << EOF >>tmp3.h
112 
+$TMP1
96 113 
 #else
97 
-  // extended (original) font (sysmbols 1 - 255)
98 
-EOF
99 
-    cat tmp2.h >>tmp3.h
100 
-    cat << EOF >>tmp3.h
114 
+  // extended (original) font (symbols 1 - 255)
115 
+
116 
+$TMP2
101 117
102 118 
 #endif
103 119 
 EOF
104 120
105 
-    cd ..
106 
-    mv ${DN_WORK}/tmp3.h src/lcd/dogm/dogm_font_data_ISO10646_1.h
121 
+  rmdir ../${DN_WORK}
122 
+  cd - >/dev/null
107 123 
 fi

+ 31
- 0
buildroot/share/fonts/get-bdf2u8g.sh 查看文件 

@@ -0,0 +1,31 @@
1 
+#!/usr/bin/env bash
2 
+
3 
+#####################################################################
4 
+# get-bdf2u8g.sh for Marlin
5 
+#
6 
+# This script downloads, patches, and builds bdf2u8g
7 
+# License: CC-SA
8 
+#
9 
+# Execute from within buildroot/share/fonts
10 
+#
11 
+#####################################################################
12 
+
13 
+HERE=$(pwd)
14 
+
15 
+[[ $HERE =~ 'buildroot/share/fonts'$ ]] || { echo "Change to buildroot/share/fonts to run $(basename $0)" ; exit 1; }
16 
+
17 
+# Download u8glib
18 
+curl -LJO https://github.com/olikraus/u8glib/archive/master.zip
19 
+unzip u8glib-master.zip >/dev/null 2>&1
20 
+
21 
+# Patch and build bdf2u8g
22 
+cd u8glib-master/tools/font/bdf2u8g
23 
+patch -p0 <../../../../u8glib-bdf2u8g.patch bdf2u8g.c >/dev/null 2>&1
24 
+make >/dev/null 2>&1
25 
+mv bdf2u8g ../../../../
26 
+
27 
+# Clean up
28 
+cd -
29 
+rm -rf u8glib-master*
30 
+
31 
+cd "$HERE"

+ 0
- 10
buildroot/share/fonts/make_fonts.bat 查看文件 

@@ -1,10 +0,0 @@
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-tr.bdf ISO10646_1_tr_5x7 dogm_font_data_ISO10646_1-tr.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
9 
-.\bdf2u8g.exe -b 32 -e 255 ISO10646_CN.bdf ISO10646_CN dogm_font_data_ISO10646_CN.h
10 
-.\bdf2u8g.exe -b 32 -e 255 ISO10646_4_Greek.bdf ISO10646_Greek_5x7 dogm_font_data_ISO10646_Greek.h

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


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


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


+ 32
- 47
buildroot/share/fonts/u8glib-bdf2u8g.patch 查看文件 

@@ -1,47 +1,32 @@
1 
---- tools/font/bdf2u8g/bdf2u8g.c	2017-04-08 01:04:48.000000000 -0400
2 
-+++ tools/font/bdf2u8g/bdf2u8g.c	2018-02-24 17:24:26.368926703 -0500
3 
-@@ -175,9 +175,9 @@
4 
-   for( i = 0; i < data_pos; i++ )
5 
-   {
6 
- #ifdef BDF2U8G_COMPACT_OUTPUT
7 
--    fprintf(out_fp, "%d", data_buf[i]);
8 
-+    fprintf(out_fp, "0x%02x", data_buf[i]);
9 
- #else
10 
--    fprintf(out_fp, "%3d", data_buf[i]);
11 
-+    fprintf(out_fp, "0x%02x", data_buf[i]);
12 
- #endif
13 
-     if ( i+1 != data_pos )
14 
-       fprintf(out_fp, ",");
15 
-@@ -484,7 +484,8 @@
16 
- int bdf_char_max_y;
17 
- int bdf_char_min_y;
18 
-
19 
--int bdf_delta_x;           /* DWIDTH arg 1 */
20 
-+int bdf_delta_x_default = -1;
21 
-+int bdf_delta_x = -1;           /* DWIDTH arg 1 */
22 
- int bdf_delta_max_x;
23 
- int bdf_delta_min_x;
24 
- int bdf_delta_y;           /* DWIDTH arg 2 */
25 
-@@ -1095,6 +1096,22 @@
26 
-       bdf_char_ascent = bdf_char_height + bdf_char_y;
27 
-       //printf("h:%d w:%d ascent: %d\n", bdf_char_height, bdf_char_width, bdf_char_ascent);
28 
-     }
29 
-+    else if ( strcmp(p_buf, "CHARS") == 0 )
30 
-+    {
31 
-+        if (bdf_delta_x < 0) {
32 
-+            bdf_delta_x = 0;
33 
-+        }
34 
-+        if (bdf_delta_x_default < 0) {
35 
-+            bdf_delta_x_default = bdf_delta_x;
36 
-+        }
37 
-+    }
38 
-+    else if ( strcmp(p_buf, "STARTCHAR") == 0 )
39 
-+    {
40 
-+        if (bdf_delta_x_default < 0) {
41 
-+            bdf_delta_x_default = 0;
42 
-+        }
43 
-+        bdf_delta_x = bdf_delta_x_default;
44 
-+    }
45 
-     else if ( strcmp(p_buf, "BITMAP") == 0 )
46 
-     {
47 
-       bdf_line_state = BDF_LINE_STATE_BITMAP;
1 
+178c178
2 
+<     fprintf(out_fp, "%d", data_buf[i]);
3 
+---
4 
+>     fprintf(out_fp, "0x%02x", data_buf[i]);
5 
+180c180
6 
+<     fprintf(out_fp, "%3d", data_buf[i]);
7 
+---
8 
+>     fprintf(out_fp, "0x%02x", data_buf[i]);
9 
+487c487,488
10 
+< int bdf_delta_x;           /* DWIDTH arg 1 */
11 
+---
12 
+> int bdf_delta_x_default = -1;
13 
+> int bdf_delta_x = -1;           /* DWIDTH arg 1 */
14 
+1097a1099,1114
15 
+>     else if ( strcmp(p_buf, "CHARS") == 0 )
16 
+>     {
17 
+>         if (bdf_delta_x < 0) {
18 
+>             bdf_delta_x = 0;
19 
+>         }
20 
+>         if (bdf_delta_x_default < 0) {
21 
+>             bdf_delta_x_default = bdf_delta_x;
22 
+>         }
23 
+>     }
24 
+>     else if ( strcmp(p_buf, "STARTCHAR") == 0 )
25 
+>     {
26 
+>         if (bdf_delta_x_default < 0) {
27 
+>             bdf_delta_x_default = 0;
28 
+>         }
29 
+>         bdf_delta_x = bdf_delta_x_default;
30 
+>     }
31 
+1293d1309
32 
+<   fprintf(out_fp, "#include \"u8g.h\"\n");

+ 25
- 56
buildroot/share/fonts/uxggenpages.md 查看文件 

@@ -2,68 +2,46 @@
2 2
3 3 
 ### Supported hardware
4 4
5 
-Marlin supports HD44780 character LCD and 128x64 graphical LCD via U8GLIB.
6 
-Because of the limitation of HD44780 hardwares, Marlin can only support three
7 
-character sets for that hardware:
8 
-Japanese (kana_utf8), Russian/Cyrillic (ru), or Western (Roman characters)
9 
-
10 
-For the graphical LCD modules, there's far less limitation. Users and language
11 
-maintainers can easily change the language translation strings if they save
12 
-with UTF-8 encoding. The only extra step is to regenerate the font data from
13 
-an existing BDF font file.
5 
+Marlin supports HD44780 character LCD and 128x64 graphical LCD via U8GLIB. Because of the limitation of HD44780 hardwares, Marlin can only support three character sets for that hardware: Japanese (kana_utf8), Russian/Cyrillic (ru), or Western (Roman characters)
14 6
7 
+For the graphical LCD modules, there's far less limitation. Users and language maintainers can easily change the language translation strings when saved with UTF-8 encoding. The only extra step is to regenerate the font data from an existing BDF font file.
15 8
16 9 
 ### How to support a new language?
17 10
18 
-1. prepare the translation source file
11 
+1. Prepare the translation source file
19 12
20 
-You need to add a language header file language_xx.h,
21 
-where xx is the language/country code, for example en is for English.
22 
-You may start with a existing language file by copying it to a new location:
13 
+You need to add a language header file `language_xx.h`, replacing xx with the language/country code. (e.g., "en" for English). You can start with a existing language file by copying it to a new location:
23 14
24 15 
 ```bash
25 16 
 cp language_zh_CN.h language_zh_TW.h
26 17 
 ```
27 18
28 
-Then you can replace the strings in the macro _UxGT().
19 
+Then simply replace the strings inside the `_UxGT()` macros.
29 20
30 21 
 Make sure the file is saved as UTF-8 encoded.
31 22
32 
-
33 23 
 2. Generate the font data file
34 24
35 
-This step is to gather the glyph appearing in the language file from a 9pt bitmap font,
36 
-and save the data in a language_data_xx.h file. So the font used for conversion should
37 
-contain all the characters in your language file.
38 
-
39 
-The default bitmap font is WQY's 9pt bitmap font. You may download from
25 
+This step gathers the glyphs used in the language file from a 9pt bitmap font and saves the data in a language_data_xx.h file. So the font used for conversion should contain all the characters in your language file.
40 26
41 
-http://wenq.org/daily/wqy-bitmapfont-bdf-gb18030-nightly_build.tar.gz
27 
+The default bitmap font is WQY's 9pt bitmap font.
42 28
43 
-or install in Debian/Ubuntu system:
29 
+Download from [here](http://wenq.org/daily/wqy-bitmapfont-bdf-gb18030-nightly_build.tar.gz), or to install in a Debian/Ubuntu system:
44 30
45 31 
 ```
46 32 
 sudo apt-get install xfonts-wqy
47 33 
 ```
48 34
49 
-You need also compile the bdf2u8g which convert the BDF font file to U8glib supported data structures.
50 
-Before you compile bdf2u8g, it would better to patch the source file bdf2u8g.c.
35 
+You also need to compile the `bdf2u8g` binary to convert BDF font files into U8glib data structures:
51 36
52 
-```
37 
+```bash
53 38 
 cd marlin-git/buildroot/share/fonts/
54 
-wget https://github.com/olikraus/u8glib/archive/master.zip
55 
-unzip master.zip
56 
-cd u8glib-master/
57 
-patch -p0 < ../u8glib-bdf2u8g.patch
58 
-make -C tools/font/bdf2u8g/
59 
-cd -
60 
-ln -s u8glib-master/tools/font/bdf2u8g/bdf2u8g
39 
+./get-bdf2u8g.sh
61 40 
 ```
62 41
63 
-The 'genallfont.sh' script will generate the font data for all of the
64 
-language translation files.
42 
+The `genallfont.sh` script generates font data for all language translation files.
65 43
66 
-You may specify the language list you want to process. For example:
44 
+You may specify a list of languages to process. For example:
67 45
68 46 
 ```bash
69 47 
 MARLIN_LANGS="zh_CN zh_TW"
 
@@ -78,8 +56,7 @@ MARLIN_LANGS="zh_CN zh_TW" ../buildroot/share/fonts/genallfont.sh
78 56
79 57 
 3. Change the language settings
80 58
81 
-To compile the firmware for your language, you need choose a language
82 
-in `Configuration.h`. For Chinese (Taiwan) you would use:
59 
+To compile Marlin with your language, choose a language in `Configuration.h`. For Chinese (Taiwan) you would use:
83 60
84 61 
 ```cpp
85 62 
 #define LCD_LANGUAGE zh_TW
 
@@ -87,42 +64,34 @@ in `Configuration.h`. For Chinese (Taiwan) you would use:
87 64
88 65 
 4. Compile and Upload the firmware
89 66
90 
-Open `Marlin.ino` in your IDE and compile the firmware. If it's compiled succeeds, upload it to your Arduino hardware.
91 
-
67 
+Open `Marlin.ino` in your IDE and compile the firmware. Once the build succeeds, upload it to your board.
92 68
93 69 
 ### Update the language translation
94 70
95 
-If you change the language files, you need to run the script `genallfont.sh`
96 
-again to update the font data file.
97 
-
71 
+Whenever language files are changed, you need to run the script `genallfont.sh` again to update the font data file.
98 72
99 73 
 ### Use a cool font
100 74
101 
-You may need to use a different font to support your own language, because the
102 
-default 9pt font is not complete. (You may also support them by adding the missing
103 
-glyphs to the font.)
75 
+You may need to use a different font to support your own language, because the default 9pt font is not complete. (You may also support them by adding the missing glyphs to the font.)
104 76
105 
-After you've prepared your font, specify the font file path as an argument to
106 
-`genallfont.sh`, so that the font used for your language is your new font. For
107 
-example, your new font file name is `newfont.bdf`, then run the following command:
77 
+After you've prepared your font, specify the font file path as an argument to `genallfont.sh`, so that the font used for your language is your new font. For example, if your font is named `newfont.bdf` run the following command:
108 78
109 79 
 ```bash
110 80 
 cd Marlin/
111 81 
 ../buildroot/share/fonts/genallfont.sh ./newfont.bdf
82 
+```
112 83
113 
-# OR if you just want to regenerate the language font data for a specific language:
84 
+...or to regenerate the language font data for a specific language:
85 
+
86 
+```bash
114 87 
 MARLIN_LANGS="zh_TW" ../buildroot/share/fonts/genallfont.sh ./newfont.bdf
115 88 
 ```
116 89
117 90 
 ### Suggestions for Maintainers
118 91
119 
-Even the tool and the language engine can be easily updated,
120 
-since it use the common bitmap font files and UTF-8 text,
121 
-the maintainer need to confirm that the fonts contains the glyph
122 
-in the language files.
92 
+The tool and the language engine can be easily updated. Since it uses common bitmap font files and UTF-8 text, the maintainer needs to confirm that the font contains the glyphs in the language files.
123 93
124 
-The font file currently used to generate the font data is the file ISO10646-0-3.bdf,
125 
-which is combined with the Marlin's ISO10646-1 fonts and WQY 9pt bitmap font.
94 
+At this time, the font file `marlin-6x12-3.bdf` is used to generate the font data. It combines all of Marlin's ISO10646-1 fonts and the WQY 9pt bitmap font.
126 95
127 96 
 ### Related resources
128 97 
 
@@ -135,7 +104,7 @@ which is combined with the Marlin's ISO10646-1 fonts and WQY 9pt bitmap font.
135 104 
 Documents related to the old version of the language engine:
136 105
137 106 
 - [Marlin Fonts Documentation](http://www.marlinfw.org/docs/development/fonts.html)
138 
-- [Marlin LCD Language](https://github.com/MarlinFirmware/Marlin/wiki/LCD-Language)
107 
+- [Marlin LCD Language](http://marlinfw.org/docs/development/lcd_language.html)
139 108 
 - [U8GLIB](https://github.com/olikraus/u8glib.git)
140 109 
 - [UTF-8 for U8GLIB](https://github.com/yhfudev/u8glib-fontutf8.git)
141 110 
 - [Standalone test project for the Marlin UTF-8 language engine](https://github.com/yhfudev/marlin-fontutf8.git)

+ 50
- 43
buildroot/share/fonts/uxggenpages.sh 查看文件 

@@ -5,15 +5,17 @@
5 5 
 #
6 6 
 # This script will generate u8g c files for specified fonts
7 7 
 #
8 
-# Copyright 2015-2016 Yunhui Fu <yhfudev@gmail.com>
8 
+# Copyright 2015-2018 Yunhui Fu <yhfudev@gmail.com>
9 9 
 # License: GPL/BSD
10 10 
 #####################################################################
11 
-my_getpath () {
12 
-  PARAM_DN="$1"
11 
+
12 
+my_getpath() {
13 
+  local PARAM_DN="$1"
13 14 
   shift
15 
+
14 16 
   #readlink -f
15 
-  DN="${PARAM_DN}"
16 
-  FN=
17 
+  local DN="${PARAM_DN}"
18 
+  local FN=
17 19 
   if [ ! -d "${DN}" ]; then
18 20 
     FN=$(basename "${DN}")
19 21 
     DN=$(dirname "${DN}")
 
@@ -21,48 +23,49 @@ my_getpath () {
21 23 
   cd "${DN}" > /dev/null 2>&1
22 24 
   DN=$(pwd)
23 25 
   cd - > /dev/null 2>&1
24 
-  echo "${DN}/${FN}"
26 
+  echo -n "${DN}"
27 
+  [[ -z "$FN" ]] || echo -n "/${FN}"
25 28 
 }
26 29 
 #DN_EXEC=`echo "$0" | ${EXEC_AWK} -F/ '{b=$1; for (i=2; i < NF; i ++) {b=b "/" $(i)}; print b}'`
27 30 
 DN_EXEC=$(dirname $(my_getpath "$0") )
28 
-if [ ! "${DN_EXEC}" = "" ]; then
29 
-  DN_EXEC="$(my_getpath "${DN_EXEC}")/"
30 
-else
31 
-  DN_EXEC="${DN_EXEC}/"
32 
-fi
31 
+
33 32 
 #####################################################################
33 
+
34 34 
 EXEC_GENPAGES=${DN_EXEC}/genpages
35 35 
 [ -x "${EXEC_GENPAGES}" ] || EXEC_GENPAGES="$(my_getpath ${DN_EXEC}/../../../genpages)"
36 36 
 [ -x "${EXEC_GENPAGES}" ] || EXEC_GENPAGES=$(which genpages)
37 37 
 [ -x "${EXEC_GENPAGES}" ] || { echo "Error: genpages not found!" ; exit 1; }
38 
-
39 
-echo "EXEC_GENPAGES=${EXEC_GENPAGES}"
38 
+#echo "EXEC_GENPAGES=${EXEC_GENPAGES}"
40 39
41 40 
 EXEC_BDF2U8G=${DN_EXEC}/bdf2u8g
42 41 
 [ -x "${EXEC_BDF2U8G}" ] || EXEC_BDF2U8G="${DN_EXEC}/../../../bdf2u8g"
43 42 
 [ -x "${EXEC_BDF2U8G}" ] || EXEC_BDF2U8G=$(which bdf2u8g)
44 
-[ -x "${EXEC_BDF2U8G}" ] || { echo "Error: bdf2u8g not found!" ; echo "Please compile u8blib/tools/font/bdf2u8g/bdf2u8g and link to it from here!"; exit 1; }
43 
+[ -x "${EXEC_BDF2U8G}" ] || { echo "Error: bdf2u8g not found!" ; echo "Please compile u8glib/tools/font/bdf2u8g/bdf2u8g and link to it from here!"; exit 1; }
45 44
46 45 
 DN_CUR=$(pwd)
47 46 
 DN_DATA=$(pwd)/datatmp
48 47 
 mkdir -p "${DN_DATA}"
49 48
50 49 
 #####################################################################
50 
+
51 51 
 FONTHOME=/usr/share/fonts
52 52
53 
-FN_FONT_BASE="ISO10646-0-1"
53 
+FN_FONT_BASE="marlin-6x12-3"
54 54 
 #FN_FONT_BASE=unifont
55 55 
 #FN_FONT_BASE=wenquanyi_12pt
56 56 
 #FN_FONT_BASE=wenquanyi_9pt
57 57
58 58 
 FN_FONT="${1:-}"
59 
+DN_FONT0=`dirname ${FN_FONT}`
60 
+DN_FONT="$(my_getpath  ${DN_FONT0})"
61 
+FN_FONT="$(my_getpath "${DN_FONT}")/"`basename ${FN_FONT}`
59 62 
 [ -z "${FN_FONT}" ] && FN_FONT=${DN_DATA}/../${FN_FONT_BASE}.bdf
60 63 
 [ -f "${FN_FONT}" ] || FN_FONT=${DN_EXEC}/${FN_FONT_BASE}.bdf
61 64 
 [ -f "${FN_FONT}" ] || FN_FONT="$FONTHOME/wenquanyi/${FN_FONT_BASE}.bdf"
62 65 
 [ -f "${FN_FONT}" ] || FN_FONT="$FONTHOME/X11/misc/${FN_FONT_BASE}.bdf"
63 
-echo "FN_FONT=${FN_FONT}"
64 66 
 [ -f "${FN_FONT}" ] || FN_FONT="$FONTHOME/misc/${FN_FONT_BASE}.bdf"
65 
-echo "FN_FONT2=${FN_FONT}"
67 
+#echo "uxggenpages.sh: FN_FONT=${FN_FONT}"
68 
+
66 69 
 if [ ! -f "${FN_FONT}" ]; then
67 70 
   FN_FONT_PCF="$FONTHOME/X11/misc/${FN_FONT_BASE}.pcf"
68 71 
   [ -f "${FN_FONT_PCF}" ] || FN_FONT_PCF="$FONTHOME/misc/${FN_FONT_BASE}.pcf"
 
@@ -87,10 +90,11 @@ fi
87 90 
 #(cd ${DN_EXEC}; gcc -o genpages genpages.c getline.c)
88 91
89 92 
 rm -f tmpa tmpb
93 
+touch tmpa tmpb
90 94 
 #rm -f ${DN_EXEC}/fontpage_*.h
91 95 
 rm -f fontpage_*.h
92 96
93 
-cat << EOF > tmp-proc-page.awk
97 
+cat << EOF >"proc.awk"
94 98 
 BEGIN {
95 99 
   cur_page=0;
96 100 
   val_begin=0;
 
@@ -135,33 +139,36 @@ BEGIN {
135 139 
 }
136 140 
 EOF
137 141
138 
-grep -Hrn _UxGT . | grep '"' | \
139 
-  sed 's/_UxGT("/\n&/g;s/[^\n]*\n_UxGT("\([^"]*\)[^\n]*/\1 /g;s/.$//' | \
140 
-  ${EXEC_GENPAGES} | \
141 
-  sort -k 1n -k 2n | uniq | \
142 
-  gawk -v EXEC_PREFIX=${DN_EXEC} -f tmp-proc-page.awk | \
143 
-  while read PAGE BEGIN END UTF8BEGIN UTF8END; do \
142 
+grep -Hrn _UxGT . | grep '"' \
143 
+  | sed 's/_UxGT("/\n&/g;s/[^\n]*\n_UxGT("\([^"]*\)[^\n]*/\1 /g;s/.$//' \
144 
+  | ${EXEC_GENPAGES} \
145 
+  | sort -k 1n -k 2n | uniq \
146 
+  | gawk -v EXEC_PREFIX=${DN_EXEC} -f "proc.awk" \
147 
+  | while read PAGE BEGIN END UTF8BEGIN UTF8END; do \
144 148 
     if [ ! -f ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ]; then \
145 149 
       ${EXEC_BDF2U8G} -u ${PAGE} -b ${BEGIN} -e ${END} ${FN_FONT} fontpage_${PAGE}_${BEGIN}_${END} ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h > /dev/null 2>&1 ;
146 
-      #sed -i 's|#include "u8g.h"|#include <clib/u8g.h>|' ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ;
147 
-    fi ;\
148 
-    grep -A 10000000000 u8g_fntpgm_uint8_t ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h >> tmpa ;\
150 
+    fi ; \
151 
+    grep -A 10000000000 u8g_fntpgm_uint8_t ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h >> tmpa ; \
149 152 
     echo "    FONTDATA_ITEM(${PAGE}, ${BEGIN}, ${END}, fontpage_${PAGE}_${BEGIN}_${END}), // '${UTF8BEGIN}' -- '${UTF8END}'" >> tmpb ;\
150 153 
   done
151 154
152 
-rm -f fontutf8-data.h
153 
-echo "/* Generated by $0 */" >> fontutf8-data.h
154 
-echo "/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */" >> fontutf8-data.h
155 
-echo "/* Please turn to the tools call this script to change the contents! */" >> fontutf8-data.h
156 
-echo "" >> fontutf8-data.h
157 
-echo "#include <U8glib.h>" >> fontutf8-data.h
158 
-#echo "#include \"fontutf8u8g.h\"" >> fontutf8-data.h
159 
-echo "" >> fontutf8-data.h
160 
-cat tmpa >> fontutf8-data.h
161 
-echo "" >> fontutf8-data.h
162 
-echo "#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}" >> fontutf8-data.h
163 
-echo "static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {" >> fontutf8-data.h
164 
-cat tmpb >> fontutf8-data.h
165 
-echo "};" >> fontutf8-data.h
166 
-
167 
-rm -f tmpa tmpb tmp-proc-page.awk
155 
+TMPA=$(cat tmpa)
156 
+TMPB=$(cat tmpb)
157 
+
158 
+EOL=$'\n'
159 
+[[ ! "$TMPA" == "" ]] && TMPA="$EOL$TMPA$EOL"
160 
+[[ ! "$TMPB" == "" ]] && TMPB="$EOL$TMPB$EOL"
161 
+
162 
+rm -f tmpa tmpb "proc.awk"
163 
+
164 
+cat <<EOF >fontutf8-data.h
165 
+/**
166 
+ * Generated automatically by buildroot/share/fonts/uxggenpages.sh
167 
+ * Contents will be REPLACED by future processing!
168 
+ * Use genallfont.sh to generate font data for updated languages.
169 
+ */
170 
+#include <U8glib.h>
171 
+$TMPA
172 
+#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
173 
+static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {$TMPB};
174 
+EOF

撰写 预览
正在加载...
取消
保存