Browse Source

Removed Kanji.

AnHardt 10 years ago
parent
commit
2f374f1465

+ 1
- 1
Marlin/Configuration.h View File

@@ -565,7 +565,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
565 565
 //==============================LCD and SD support=============================
566 566
 
567 567
 // Define your display language below. Replace (en) with your language code and uncomment.
568
-// en, pl, fr, de, es, ru, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, kanji, test
568
+// en, pl, fr, de, es, ru, it, pt, pt-br, fi, an, nl, ca, eu, kana, kana_utf8, test
569 569
 // See also language.h
570 570
 #define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
571 571
 

+ 0
- 192
Marlin/dogm_font_data_6x10_marlin_Kanji.h View File

@@ -1,192 +0,0 @@
1
-/*
2
-  Fontname : Japanese Original font, Version 0.1
3
-  Author   : http://www.thingiverse.com/ichibey
4
-  License  : Creative Commons BY-NC
5
-
6
-  営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
7
-  http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode
8
-*/
9
-#include <utility/u8g.h>
10
-const u8g_fntpgm_uint8_t u8g_font_6x10_marlin[2911] U8G_SECTION(".progmem.u8g_font_6x10_marlin") = {
11
-  0,6,10,0,254,7,1,153,3,43,32,255,254,8,254,7,
12
-  254,0,0,0,6,0,8,1,7,7,6,2,0,128,128,128,
13
-  128,128,0,128,3,3,3,6,1,4,160,160,160,5,7,7,
14
-  6,0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,
15
-  32,112,160,112,40,112,32,5,7,7,6,0,0,72,168,80,
16
-  32,80,168,144,5,7,7,6,0,0,64,160,160,64,168,144,
17
-  104,1,3,3,6,2,4,128,128,128,3,7,7,6,1,0,
18
-  32,64,128,128,128,64,32,3,7,7,6,1,0,128,64,32,
19
-  32,32,64,128,5,5,5,6,0,1,136,80,248,80,136,5,
20
-  5,5,6,0,1,32,32,248,32,32,3,3,3,6,1,255,
21
-  96,64,128,5,1,1,6,0,3,248,3,3,3,6,1,255,
22
-  64,224,64,5,7,7,6,0,0,8,8,16,32,64,128,128,
23
-  5,7,7,6,0,0,112,152,168,168,168,200,112,5,7,7,
24
-  6,0,0,32,96,32,32,32,32,248,5,7,7,6,0,0,
25
-  112,136,8,112,128,128,248,5,7,7,6,0,0,112,136,8,
26
-  48,8,136,112,5,7,7,6,0,0,112,144,144,144,248,16,
27
-  16,5,7,7,6,0,0,248,128,240,8,8,136,112,5,7,
28
-  7,6,0,0,112,136,128,240,136,136,112,5,7,7,6,0,
29
-  0,248,8,8,16,32,32,32,5,7,7,6,0,0,112,136,
30
-  136,112,136,136,112,5,7,7,6,0,0,112,136,136,120,8,
31
-  136,112,3,7,7,6,1,0,64,224,64,0,64,224,64,3,
32
-  7,7,6,1,0,64,224,64,0,96,64,128,4,7,7,6,
33
-  1,0,16,32,64,128,64,32,16,5,3,3,6,0,2,248,
34
-  0,248,4,7,7,6,1,0,128,64,32,16,32,64,128,5,
35
-  7,7,6,0,0,112,136,16,32,32,0,32,5,7,7,6,
36
-  0,0,112,136,152,168,176,128,112,5,7,7,6,0,0,112,
37
-  136,136,136,248,136,136,5,7,7,6,0,0,240,136,136,240,
38
-  136,136,240,5,7,7,6,0,0,112,136,128,128,128,136,112,
39
-  5,7,7,6,0,0,240,136,136,136,136,136,240,5,7,7,
40
-  6,0,0,248,128,128,240,128,128,248,5,7,7,6,0,0,
41
-  248,128,128,240,128,128,128,5,7,7,6,0,0,112,136,128,
42
-  152,136,136,112,5,7,7,6,0,0,136,136,136,248,136,136,
43
-  136,3,7,7,6,1,0,224,64,64,64,64,64,224,5,7,
44
-  7,6,0,0,56,16,16,16,16,144,96,5,7,7,6,0,
45
-  0,136,144,160,192,160,144,136,5,7,7,6,0,0,128,128,
46
-  128,128,128,128,248,5,7,7,6,0,0,136,136,216,168,136,
47
-  136,136,5,7,7,6,0,0,136,136,200,168,152,136,136,5,
48
-  7,7,6,0,0,112,136,136,136,136,136,112,5,7,7,6,
49
-  0,0,240,136,136,240,128,128,128,5,8,8,6,0,255,112,
50
-  136,136,136,136,168,112,8,5,7,7,6,0,0,240,136,136,
51
-  240,136,136,136,5,7,7,6,0,0,112,136,128,112,8,136,
52
-  112,5,7,7,6,0,0,248,32,32,32,32,32,32,5,7,
53
-  7,6,0,0,136,136,136,136,136,136,112,5,7,7,6,0,
54
-  0,136,136,136,80,80,80,32,5,7,7,6,0,0,136,136,
55
-  136,168,168,216,136,5,7,7,6,0,0,136,136,80,32,80,
56
-  136,136,5,7,7,6,0,0,136,136,80,32,32,32,32,5,
57
-  7,7,6,0,0,248,8,80,32,80,128,248,3,7,7,6,
58
-  1,0,224,128,128,128,128,128,224,5,7,7,6,0,0,128,
59
-  128,64,32,16,8,8,3,7,7,6,1,0,224,32,32,32,
60
-  32,32,224,5,3,3,6,0,4,32,80,136,5,1,1,6,
61
-  0,255,248,2,2,2,6,2,6,128,64,5,5,5,6,0,
62
-  0,112,8,120,136,120,5,7,7,6,0,0,128,128,240,136,
63
-  136,136,240,5,5,5,6,0,0,112,136,128,136,112,5,7,
64
-  7,6,0,0,8,8,120,136,136,136,120,5,5,5,6,0,
65
-  0,112,136,248,128,120,4,7,7,6,0,0,48,64,64,240,
66
-  64,64,64,5,7,7,6,0,254,120,136,136,120,8,8,112,
67
-  5,7,7,6,0,0,128,128,240,136,136,136,136,3,7,7,
68
-  6,1,0,64,0,192,64,64,64,224,4,9,9,6,1,254,
69
-  16,0,48,16,16,16,16,16,224,5,7,7,6,0,0,128,
70
-  128,136,144,224,144,136,3,7,7,6,1,0,192,64,64,64,
71
-  64,64,224,5,5,5,6,0,0,240,168,168,168,168,5,5,
72
-  5,6,0,0,240,136,136,136,136,5,5,5,6,0,0,112,
73
-  136,136,136,112,5,7,7,6,0,254,240,136,136,136,240,128,
74
-  128,5,7,7,6,0,254,120,136,136,136,120,8,8,5,5,
75
-  5,6,0,0,176,200,128,128,128,5,5,5,6,0,0,112,
76
-  128,112,8,240,4,7,7,6,0,0,64,64,240,64,64,64,
77
-  48,5,5,5,6,0,0,136,136,136,136,120,5,5,5,6,
78
-  0,0,136,136,80,80,32,5,5,5,6,0,0,136,136,168,
79
-  168,80,5,5,5,6,0,0,136,80,32,80,136,5,7,7,
80
-  6,0,254,136,136,136,120,8,136,112,5,5,5,6,0,0,
81
-  248,16,32,64,248,6,9,9,6,0,255,240,240,240,128,156,
82
-  136,156,136,136,4,9,9,6,0,255,240,240,240,16,208,144,
83
-  208,144,144,5,9,9,6,0,255,112,112,0,248,0,112,112,
84
-  32,248,5,3,3,6,0,4,72,168,144,4,9,9,6,1,
85
-  255,240,16,32,64,32,32,32,32,64,6,9,9,6,0,255,
86
-  4,228,4,228,0,20,36,36,204,5,9,9,6,0,255,224,
87
-  32,224,224,0,240,208,208,248,6,8,8,6,0,255,60,40,
88
-  60,44,32,76,68,156,4,9,9,6,0,255,128,240,32,240,
89
-  224,0,240,64,176,5,9,9,6,0,255,32,32,248,32,48,
90
-  96,160,160,32,5,9,9,6,0,255,248,168,248,168,248,32,
91
-  32,32,32,6,9,9,6,0,255,112,32,252,112,168,160,32,
92
-  32,32,5,9,9,6,0,255,112,144,80,32,120,136,40,16,
93
-  96,6,9,9,6,0,255,112,0,252,120,120,120,32,120,240,
94
-  5,9,9,6,0,255,32,32,248,168,168,248,32,32,32,6,
95
-  9,9,6,0,255,16,220,40,204,8,236,4,124,4,4,7,
96
-  7,6,0,0,224,128,192,128,224,0,240,6,9,9,6,0,
97
-  255,16,124,16,28,16,252,36,76,28,4,9,9,6,0,255,
98
-  128,224,128,128,128,240,64,32,128,5,9,9,6,0,255,32,
99
-  248,32,248,248,248,32,248,32,5,9,9,6,0,255,32,32,
100
-  32,248,168,248,168,168,248,6,9,9,6,0,255,36,44,36,
101
-  76,228,168,44,44,36,4,9,9,6,0,255,32,240,32,240,
102
-  0,240,80,240,80,5,9,9,6,0,255,112,16,32,248,40,
103
-  48,32,32,96,5,9,9,6,0,255,32,64,248,136,248,136,
104
-  248,136,248,6,9,9,6,0,255,32,116,112,116,112,120,128,
105
-  40,72,4,9,9,6,0,255,128,224,160,160,224,176,0,160,
106
-  144,6,9,9,6,0,255,4,8,16,32,92,132,28,4,60,
107
-  4,8,8,6,0,255,128,64,32,208,0,128,0,224,6,9,
108
-  9,6,0,255,60,32,44,40,44,76,64,136,136,5,9,9,
109
-  6,0,255,248,128,240,16,240,240,128,144,144,5,9,9,6,
110
-  1,255,8,8,8,120,64,120,0,80,144,4,8,8,6,0,
111
-  255,192,0,224,32,224,0,160,144,6,9,9,6,0,255,36,
112
-  252,120,120,172,60,4,20,124,4,8,8,6,0,255,240,160,
113
-  192,48,192,128,0,224,5,9,9,6,0,255,32,248,112,112,
114
-  112,248,168,32,96,5,9,9,6,0,255,248,200,232,200,232,
115
-  136,232,232,152,6,9,9,6,0,255,60,4,60,36,44,36,
116
-  252,32,32,4,9,9,6,0,255,224,0,224,32,160,32,240,
117
-  32,96,5,9,9,6,0,255,112,32,248,32,248,248,248,32,
118
-  32,6,9,9,6,0,255,96,32,32,80,80,144,136,8,4,
119
-  5,9,9,6,1,255,8,248,128,152,0,56,16,16,32,4,
120
-  8,8,6,0,255,240,16,128,0,192,128,144,224,5,7,7,
121
-  6,0,0,248,8,248,8,8,48,192,4,5,5,6,1,0,
122
-  240,16,80,64,128,4,5,5,6,1,0,48,64,160,32,32,
123
-  5,5,5,6,0,0,32,248,136,16,96,5,4,4,6,0,
124
-  0,112,32,32,248,4,5,5,6,1,0,32,240,96,160,160,
125
-  4,5,5,6,1,0,64,240,80,64,64,4,4,4,6,1,
126
-  0,224,32,32,240,4,5,5,6,1,0,240,16,112,16,240,
127
-  5,4,4,6,0,0,168,168,8,112,5,1,1,6,0,3,
128
-  248,5,7,7,6,0,0,248,8,40,48,32,64,128,4,7,
129
-  7,6,0,0,16,48,96,160,32,32,32,5,7,7,6,0,
130
-  0,32,248,136,8,16,16,96,5,6,6,6,0,0,112,32,
131
-  32,32,32,248,5,7,7,6,0,0,16,248,48,80,80,144,
132
-  16,5,7,7,6,0,0,64,248,72,72,72,136,152,5,7,
133
-  7,6,0,0,32,240,32,32,248,32,32,5,7,7,6,0,
134
-  0,120,136,136,8,16,16,96,5,7,7,6,0,0,128,248,
135
-  144,16,16,16,96,4,7,7,6,1,0,240,16,16,16,16,
136
-  16,240,5,7,7,6,0,0,80,248,80,16,16,16,96,5,
137
-  7,7,6,0,0,232,8,232,8,8,16,96,5,7,7,6,
138
-  0,0,248,8,16,32,80,136,136,5,8,8,6,0,0,64,
139
-  64,248,72,72,64,64,56,5,7,7,6,0,0,136,136,72,
140
-  8,16,16,96,5,8,8,6,0,0,128,248,136,136,104,24,
141
-  16,224,5,7,7,6,0,0,120,16,16,248,16,16,224,5,
142
-  7,7,6,0,0,168,168,168,8,16,16,224,5,7,7,6,
143
-  0,0,112,0,248,16,16,16,96,4,7,7,6,1,0,128,
144
-  128,192,160,144,128,128,5,7,7,6,0,0,16,248,16,16,
145
-  32,32,192,5,6,6,6,0,0,112,0,0,0,0,248,5,
146
-  7,7,6,0,0,120,8,8,80,32,80,136,5,8,8,6,
147
-  0,0,32,120,8,48,112,168,168,32,4,6,6,6,1,1,
148
-  16,16,32,32,64,128,5,6,6,6,0,1,32,16,136,136,
149
-  136,8,5,7,7,6,0,0,128,152,224,128,128,128,120,5,
150
-  7,7,6,0,0,248,8,8,8,16,16,96,5,7,7,6,
151
-  0,0,32,32,80,144,136,8,8,5,7,7,6,0,0,32,
152
-  248,32,32,168,168,168,5,7,7,6,0,0,248,8,8,80,
153
-  32,16,8,5,7,7,6,0,0,112,0,96,0,0,240,8,
154
-  5,7,7,6,0,0,32,64,64,128,136,248,8,5,7,7,
155
-  6,0,0,8,8,80,48,40,72,128,5,7,7,6,0,0,
156
-  240,64,64,248,64,64,56,5,7,7,6,0,0,64,248,72,
157
-  72,80,64,64,5,6,6,6,0,0,112,16,16,16,16,248,
158
-  5,7,7,6,0,0,248,8,8,120,8,8,248,5,7,7,
159
-  6,0,0,112,0,248,8,8,16,96,4,7,7,6,1,0,
160
-  144,144,144,16,16,16,96,5,7,7,6,0,0,32,160,160,
161
-  160,168,168,48,5,7,7,6,0,0,128,128,128,136,136,144,
162
-  224,5,7,7,6,0,0,248,136,136,136,136,136,248,5,7,
163
-  7,6,0,0,248,136,136,8,16,16,96,5,6,6,6,0,
164
-  0,200,8,8,8,48,192,5,2,2,6,0,5,144,72,4,
165
-  4,4,6,0,4,96,144,144,96,6,9,9,6,0,254,56,
166
-  68,64,132,136,252,8,8,4,6,7,7,6,0,255,112,136,
167
-  136,148,252,148,136,3,3,3,6,0,1,192,32,224,5,9,
168
-  9,6,0,255,64,248,64,120,72,168,144,168,72,6,9,9,
169
-  6,0,255,56,72,16,248,216,136,252,80,136,4,7,7,6,
170
-  0,255,240,144,144,144,144,240,16,5,9,9,6,0,255,64,
171
-  240,64,240,240,224,80,72,248,5,9,9,6,1,255,120,8,
172
-  248,168,168,56,56,56,8,5,10,10,6,0,254,240,0,248,
173
-  72,72,224,224,224,0,240,6,9,9,6,0,255,28,208,20,
174
-  20,212,20,16,84,212,5,9,9,6,0,255,248,64,240,240,
175
-  240,240,64,80,80,5,9,9,6,1,255,8,8,120,32,192,
176
-  56,8,48,192,4,7,7,6,0,255,224,64,48,192,0,192,
177
-  48,5,9,9,6,1,255,64,72,0,224,32,32,72,64,184,
178
-  4,9,9,6,0,255,160,240,64,240,64,160,16,0,240,5,
179
-  9,9,6,0,255,64,248,32,248,16,112,128,128,120,0,0,
180
-  0,6,0,8,4,9,9,6,1,255,96,0,240,96,96,96,
181
-  240,144,240,5,9,9,6,0,255,240,144,152,0,248,80,32,
182
-  80,136,5,9,9,6,1,255,8,248,128,56,8,8,72,120,
183
-  128,4,8,8,6,0,255,240,16,192,0,192,0,0,240,6,
184
-  6,6,6,0,1,4,224,172,228,160,228,4,9,9,6,0,
185
-  255,128,192,128,240,224,32,160,32,96,6,8,8,6,0,255,
186
-  16,16,16,28,80,80,80,252,5,9,9,6,0,255,64,240,
187
-  200,136,136,136,152,120,16,5,8,8,6,0,0,224,248,136,
188
-  136,136,136,136,248,6,7,7,6,0,0,32,48,56,252,56,
189
-  48,32,6,7,7,6,0,1,16,56,124,16,16,16,240,5,
190
-  9,9,6,0,255,32,112,168,168,184,136,136,112,32,5,10,
191
-  10,6,0,254,224,128,192,128,176,40,40,48,40,40,5,10,
192
-  10,6,0,254,248,168,136,136,136,136,136,136,168,248,255};

+ 2
- 5
Marlin/dogm_lcd_implementation.h View File

@@ -41,11 +41,11 @@
41 41
 #include "dogm_font_data_6x9_marlin.h"       // Height of 'A' is only 6 pixel.
42 42
 #include "dogm_font_data_Marlin_symbols.h"   // The Marlin special symbols
43 43
 
44
-#define FONT_STATUSMENU_NAME u8g_font_6x9    // we don't have a small font for Cyrillic, Kana or Kanji
44
+#define FONT_STATUSMENU_NAME u8g_font_6x9    // we don't have a small font for Cyrillic, Kana
45 45
 #define FONT_SPECIAL_NAME Marlin_symbols
46 46
 
47 47
 // save 3120 bytes of PROGMEM by commenting out the next #define
48
-// we don't have a big font for Cyrillic, Kana or Kanji
48
+// we don't have a big font for Cyrillic, Kana
49 49
 #if defined( MAPPER_C2C3 ) || defined( MAPPER_NON )
50 50
   #define USE_BIG_EDIT_FONT
51 51
 #endif
@@ -60,9 +60,6 @@
60 60
   #elif defined( DISPLAY_CHARSET_ISO10646_KANA )
61 61
     #include "dogm_font_data_ISO10646_Kana.h"
62 62
     #define FONT_MENU_NAME ISO10646_Kana_5x7
63
-  #elif defined( DISPLAY_CHARSET_KANJI )
64
-    #include "dogm_font_data_6x10_marlin_Kanji.h"
65
-    #define FONT_MENU_NAME u8g_font_6x10_marlin
66 63
   #else // fall-back
67 64
     #include <utility/u8g.h> // system font
68 65
     #define FONT_MENU_NAME u8g_font_6x10

+ 0
- 1
Marlin/language.h View File

@@ -30,7 +30,6 @@
30 30
 // eu       Basque-Euskera
31 31
 // kana     Japanese
32 32
 // kana_utf Japanese
33
-// kanji    Japanese
34 33
 
35 34
 #ifndef LANGUAGE_INCLUDE
36 35
   // pick your language from the list above

+ 1
- 1
Marlin/language_en.h View File

@@ -13,7 +13,7 @@
13 13
 #endif
14 14
 
15 15
 //#define SIMULATE_ROMFONT //Comment in to see what is seen on the character based displays
16
-#if !( defined(SIMULATE_ROMFONT)|| defined(DISPLAY_CHARSET_ISO10646_1)|| defined(DISPLAY_CHARSET_ISO10646_5)|| defined(DISPLAY_CHARSET_ISO10646_KANA)|| defined(DISPLAY_CHARSET_KANJI) )
16
+#if !( defined(SIMULATE_ROMFONT)|| defined(DISPLAY_CHARSET_ISO10646_1)|| defined(DISPLAY_CHARSET_ISO10646_5)|| defined(DISPLAY_CHARSET_ISO10646_KANA) )
17 17
   #define DISPLAY_CHARSET_ISO10646_1 // use the better font on full graphic displays.
18 18
 #endif
19 19
 

+ 0
- 152
Marlin/language_kanji.h View File

@@ -1,152 +0,0 @@
1
-/**
2
- * Japanese (Kanji)
3
- *
4
- * LCD Menu Messages
5
- * Se also documentation/LCDLanguageFont.md
6
- *
7
- */
8
-#include "Configuration.h" 
9
-#ifndef DOGLCD
10
-  #include "language_kana.h" // fallback to kana
11
-  #define LANGUAGE_KANJI_H
12
-#endif 
13
- 
14
-#ifndef LANGUAGE_KANJI_H
15
-#define LANGUAGE_KANJI_H
16
-
17
-#define MAPPER_NON
18
-#define DISPLAY_CHARSET_KANJI
19
-
20
-// HINT FOR ichibey; YOU CAN NOW MAKE USE OF THE LAST 8 SYMBOLS FOR YOUT PURPOSE, SINCE THE MARLIN_SYMBOLS NOW HAVE THEIR OWN FONT:
21
-
22
-// 漢字混じり表示
23
-#define WELCOME_MSG                         MACHINE_NAME "\x8a\x8b\x90\x91\xa4\xa5\x7f"                    // "ready."
24
-#define MSG_SD_INSERTED                     "SD\xb6\xb0\xc4\xde\x20\x84\xa2\xa3\xbb\xda\xcf\xbc\xc0"       // "Card inserted"
25
-#define MSG_SD_REMOVED                      "SD\xb6\xb0\xc4\xde\x20\x84\xe3\xb6\xda\xcf\xbc\xc0"           // "Card removed"
26
-#define MSG_MAIN                            "\xd2\xb2\xdd"                                                 // "Main"
27
-#define MSG_AUTOSTART                       "\x93\x88\xb6\xb6\xb2\xbc"                                     // "Autostart"
28
-#define MSG_DISABLE_STEPPERS                "\xd3\xb0\xc0\xb0\xe7\xe8\xe9\xea\x20\xb5\xcc"                 // "Disable steppers"
29
-#define MSG_AUTO_HOME                       "\x98\x99\x9a\x9b\xcd \x86\x87\x88\xb6"                        // "Auto home"
30
-#define MSG_SET_HOME_OFFSETS                "\x8c\x8d\x8a\x8b\xb5\xcc\xbe\xaf\xc4\xf1\xf2\xf3\xf4"         // "Set home offsets"
31
-#define MSG_SET_ORIGIN                      "\x8c\x8d\x8a\x8b\xbe\xaf\xc4"                                 // "Set origin"
32
-#define MSG_PREHEAT_PLA                     "PLA \x92\x94\x95"                                             // "Preheat PLA"
33
-#define MSG_PREHEAT_PLA_N                   MSG_PREHEAT_PLA " "
34
-#define MSG_PREHEAT_PLA_ALL                 MSG_PREHEAT_PLA " \x96\x97\xc3"                                // " All"
35
-#define MSG_PREHEAT_PLA_BEDONLY             MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde"                        // "Bed"
36
-#define MSG_PREHEAT_PLA_SETTINGS            MSG_PREHEAT_PLA " \xbe\xaf\xc3\xb2"                            // "conf"
37
-#define MSG_PREHEAT_ABS                     "ABS \x92\x94\x95"                                             // "Preheat ABS"
38
-#define MSG_PREHEAT_ABS_N                   MSG_PREHEAT_ABS " "
39
-#define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " \xbd\xcd\xde\xc3"                            // " All"
40
-#define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " \xcd\xde\xaf\xc4\xde"                        // "Bed"
41
-#define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " \xbe\xaf\xc3\xb2"                            // "conf"
42
-#define MSG_COOLDOWN                        "\xb6\xe5\x94\x95\xb2\x9e\xf7"                                 // "Cooldown"
43
-#define MSG_SWITCH_PS_ON                    "\xe7\xe8\xe9\xea\x20\xb5\xdd"                                 // "Switch power on"
44
-#define MSG_SWITCH_PS_OFF                   "\xe7\xe8\xe9\xea\x20\xb5\xcc"                                 // "Switch power off"
45
-#define MSG_EXTRUDE                         "\x84\x85\xbc\xc0\xde\xbc"                                     // "Extrude"
46
-#define MSG_RETRACT                         "\xd8\xc4\xd7\xb8\xc4"                                         // "Retract"
47
-#define MSG_MOVE_AXIS                       "\x8e\x8f\x86\x87\x88\xb6"                                     // "Move axis"
48
-#define MSG_MOVE_X                          "X\x8e\x8f\x86\x87\x88\xb6"                                    // "Move X"
49
-#define MSG_MOVE_Y                          "Y\x8e\x8f\x86\x87\x88\xb6"                                    // "Move Y"
50
-#define MSG_MOVE_Z                          "Z\x8e\x8f\x86\x87\x88\xb6"                                    // "Move Z"
51
-#define MSG_MOVE_E                          "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0"                         // "Extruder"
52
-#define MSG_MOVE_01MM                       "0.1mm \x86\x87\x88\xb6"                                       // "Move 0.1mm"
53
-#define MSG_MOVE_1MM                        "  1mm \x86\x87\x88\xb6"                                       // "Move 1mm"
54
-#define MSG_MOVE_10MM                       " 10mm \x86\x87\x88\xb6"                                       // "Move 10mm"
55
-#define MSG_SPEED                           "\xbd\xcb\xdf\xb0\xc4\xde"                                     // "Speed"
56
-#define MSG_NOZZLE                          "\xc9\xbd\xde\xd9"                                             // "Nozzle"
57
-#define MSG_BED                             "\xcd\xde\xaf\xc4\xde"                                         // "Bed"
58
-#define MSG_FAN_SPEED                       "\xcc\xa7\xdd\xed\xe6\x82\x83"                                 // "Fan speed"
59
-#define MSG_FLOW                            "\xed\xee\xd8\x7d"                                             // "Flow"
60
-#define MSG_CONTROL                         "\xba\xdd\xc4\xdb\xb0\xd9"                                     // "Control"
61
-#define MSG_MIN                             LCD_STR_THERMOMETER " Min"
62
-#define MSG_MAX                             LCD_STR_THERMOMETER " Max"
63
-#define MSG_FACTOR                          LCD_STR_THERMOMETER " Fact"
64
-#define MSG_AUTOTEMP                        "\x93\x88\xb6\x80\x81\x82\x83"                                 // "Autotemp"
65
-#define MSG_ON                              "On "
66
-#define MSG_OFF                             "Off"
67
-#define MSG_PID_P                           "PID-P"
68
-#define MSG_PID_I                           "PID-I"
69
-#define MSG_PID_D                           "PID-D"
70
-#define MSG_PID_C                           "PID-C"
71
-#define MSG_ACC                             "\xb6\xe5\xed\xe6\x82\x83"                                     // "Accel"
72
-#define MSG_VXY_JERK                        "Vxy-jerk"
73
-#define MSG_VZ_JERK                         "Vz-jerk"
74
-#define MSG_VE_JERK                         "Ve-jerk"
75
-#define MSG_VMAX                            "Vmax "
76
-#define MSG_X                               "x"
77
-#define MSG_Y                               "y"
78
-#define MSG_Z                               "z"
79
-#define MSG_E                               "e"
80
-#define MSG_VMIN                            "Vmin"
81
-#define MSG_VTRAV_MIN                       "VTrav min"
82
-#define MSG_AMAX                            "Amax "
83
-#define MSG_A_RETRACT                       "A-retract"
84
-#define MSG_XSTEPS                          "Xsteps/mm"
85
-#define MSG_YSTEPS                          "Ysteps/mm"
86
-#define MSG_ZSTEPS                          "Zsteps/mm"
87
-#define MSG_ESTEPS                          "Esteps/mm"
88
-#define MSG_TEMPERATURE                     "\x80\x81\x82\x83"                                             // "Temperature"
89
-#define MSG_MOTION                          "\x88\xb6\xef\xf1\xf2\xf3\xf4"                                 // "Motion"
90
-#define MSG_VOLUMETRIC                      "\xcc\xa8\xd7\xd2\xdd\xc4"                                     // "Filament"
91
-#define MSG_VOLUMETRIC_ENABLED              "E in mm3"
92
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
93
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
94
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
95
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Dia. 4"
96
-#define MSG_CONTRAST                        "LCD\xba\xdd\xc4\xd7\xbd\xc4"                                  // "LCD contrast"
97
-#define MSG_STORE_EPROM                     "\xd2\xd3\xd8\xcd\xb6\xb8\xc9\xb3"                             // "Store memory"
98
-#define MSG_LOAD_EPROM                      "\xd2\xd3\xd8\xb6\xd7\xd6\xd0\ba\xd0"                          // "Load memory"
99
-#define MSG_RESTORE_FAILSAFE                "\xf1\xf2\xf3\xf4\xd8\xbe\xaf\xc4"                             // "Restore failsafe"
100
-#define MSG_REFRESH                         "\xd8\xcc\xda\xaf\xbc\xad"                                     // "Refresh"
101
-#define MSG_WATCH                           "\xb2\xdd\xcc\xab"                                             // "Info screen"
102
-#define MSG_PREPARE                         "\x8a\x8b\x90\x91\xf1\xf2\xf3\xf4"                             // "Prepare"
103
-#define MSG_TUNE                            "\xf1\x9f\x9c\x9d"                                             // "Tune"
104
-#define MSG_PAUSE_PRINT                     "\xb0\xf5\xf6\xb2\x9e\xf7"                                     // "Pause print"
105
-#define MSG_RESUME_PRINT                    "\xcc\xdf\xd8\xdd\xc4 \xa0\xa1\x7b\x7c"                        // "Resume print"
106
-#define MSG_STOP_PRINT                      "\xcc\xdf\xd8\xdd\xc4 \xb2\x9e\xf7"                            // "Stop print"
107
-#define MSG_CARD_MENU                       "SD\xb6\xb0\xc4\xde\xb6\xd7\xcc\xdf\xd8\xdd\xc4"               // "Print from SD"
108
-#define MSG_NO_CARD                         "SD\xb6\xb0\xc4\xde\xb6\xde\xb1\xd8\xcf\xbe\xdd"               // "No SD card"
109
-#define MSG_DWELL                           "\xbd\xd8\xb0\xcc\xdf"                                         // "Sleep..."
110
-#define MSG_USERWAIT                        "\xbc\xca\xde\xd7\xb9\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2"         // "Wait for user..."
111
-#define MSG_RESUMING                        "\xcc\xdf\xd8\xdd\xc4 \xa0\xa1\x7b\x7c"                        // "Resuming print"
112
-#define MSG_PRINT_ABORTED                   "\xcc\xdf\xd8\xdd\xc4\xc1\xad\xb3\xbc\xbb\xda\xcf\xbc\xc0"     // "Print aborted"
113
-#define MSG_NO_MOVE                         "\x88\xb6\xb7\xcf\xbe\xdd"                                     // "No move."
114
-#define MSG_KILLED                          "\xbc\xae\xb3\xb7\xae"                                         // "KILLED. "
115
-#define MSG_STOPPED                         "\xb2\x9e\xf7\xbc\xcf\xbc\xc0"                                 // "STOPPED. "
116
-#define MSG_CONTROL_RETRACT                 "Retract mm"
117
-#define MSG_CONTROL_RETRACT_SWAP            "Swap Re.mm"
118
-#define MSG_CONTROL_RETRACTF                "Retract  V"
119
-#define MSG_CONTROL_RETRACT_ZLIFT           "Hop mm"
120
-#define MSG_CONTROL_RETRACT_RECOVER         "UnRet +mm"
121
-#define MSG_CONTROL_RETRACT_RECOVER_SWAP    "S UnRet+mm"
122
-#define MSG_CONTROL_RETRACT_RECOVERF        "UnRet  V"
123
-#define MSG_AUTORETRACT                     "AutoRetr."
124
-#define MSG_FILAMENTCHANGE                  "\xcc\xa8\xd7\xd2\xdd\xc4\xeb\xec\x84\xe4"                     // "Change filament"
125
-#define MSG_INIT_SDCARD                     "SD\xb6\xb0\xc4\xde\\xa0\xa1\xd6\xd0\xba\xd0"                  // "Init. SD card"
126
-#define MSG_CNG_SDCARD                      "SD\xb6\xb0\xc4\xde\xeb\xec\x84\xe4"                           // "Change SD card"
127
-#define MSG_ZPROBE_OUT                      "Z\xcc\xdf\xdb\xb0\xcc\xde \xcd\xde\xaf\xc4\xee\xb6\xde\xb2"   // "Z probe out. bed"
128
-#define MSG_POSITION_UNKNOWN                "\xb9\xde\xdd\xc3\xdd\xcaXY\xb2\xc4\xde\xb3\xba\xdeZ"           // "Home X/Y before Z"
129
-#define MSG_ZPROBE_ZOFFSET                  "Z\xb5\xcc\xbe\xaf\xc4"                                        // "Z Offset"
130
-#define MSG_BABYSTEP_X                      "\xcb\xde\xc4\xde\xb3 X"                                       // "Babystep X"
131
-#define MSG_BABYSTEP_Y                      "\xcb\xde\xc4\xde\xb3 Y"                                       // "Babystep Y"
132
-#define MSG_BABYSTEP_Z                      "\xcb\xde\xc4\xde\xb3 Z"                                       // "Babystep Z"
133
-#define MSG_ENDSTOP_ABORT                   "Endstop abort"
134
-
135
-/* These are from language.h. PLEASE DON'T TRANSLATE!  All translatable messages can be found in language_en.h
136
-#define MSG_HEATING                         "\xb6\xe5\x94\x95\x89..."                                      // "Heating..."
137
-#define MSG_HEATING_COMPLETE                "\xb6\xe5\x94\x95\xa4\xa5\x7f"                                 // "Heating done."
138
-#define MSG_BED_HEATING                     "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\x89"                     // "Bed Heating."
139
-#define MSG_BED_DONE                        "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\xa4\xa5\x7f"             // "Bed done."
140
-#define MSG_ENDSTOPS_HIT                    "endstops hit: "
141
-                   ^ typho
142
-*/
143
-
144
-#ifdef DELTA_CALIBRATION_MENU
145
-    #define MSG_DELTA_CALIBRATE             "Delta Calibration"
146
-    #define MSG_DELTA_CALIBRATE_X           "Calibrate X"
147
-    #define MSG_DELTA_CALIBRATE_Y           "Calibrate Y"
148
-    #define MSG_DELTA_CALIBRATE_Z           "Calibrate Z"
149
-    #define MSG_DELTA_CALIBRATE_CENTER      "Calibrate Center"
150
-#endif // DELTA_CALIBRATION_MENU
151
-
152
-#endif // LANGUAGE_JP2_H

+ 5
- 9
Marlin/language_test.h View File

@@ -23,7 +23,7 @@
23 23
 //   I hope the pages E282 and E283 are sufficient to write katakana.
24 24
 //   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
25 25
 //   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).
26
-// d.) So for Kanji we use a very special and selected subset of symbols and the direct mapping like in a).
26
+
27 27
 
28 28
 #define MAPPER_NON         // For direct asci codes ( until now all languages except ru, de, fi, kana_utf8, ... )
29 29
 //#define MAPPER_C2C3        // For most European languages when language file is in utf8
@@ -37,7 +37,7 @@
37 37
 //#define DISPLAY_CHARSET_ISO10646_1
38 38
 //#define DISPLAY_CHARSET_ISO10646_5
39 39
 //#define DISPLAY_CHARSET_ISO10646_KANA
40
-//#define DISPLAY_CHARSET_KANJI
40
+
41 41
 
42 42
 
43 43
 // next 5 lines select variants in this file only
@@ -45,7 +45,7 @@
45 45
 //#define WEST
46 46
 //#define CYRIL
47 47
 //#define KANA
48
-//#define KANJI
48
+
49 49
 
50 50
 // TESTSTRINGS
51 51
 
@@ -178,15 +178,11 @@
178 178
 
179 179
 #endif
180 180
 
181
-#if defined( KANA ) || defined (KANJI) 
181
+#if defined( KANA )
182 182
   #define WELCOME_MSG                         "Language TEST"
183 183
 
184 184
   #define MSG_WATCH                           "\001\002\003\004\005\006\007\010\011"
185
-  #ifdef KANJI
186
-    #define MSG_PREPARE                       "No UTF8 for Kanji"
187
-  #else
188
-    #define MSG_PREPARE                       "UTF8"
189
-  #endif
185
+  #define MSG_PREPARE                         "UTF8"
190 186
   #define MSG_CONTROL                         "ASCII"
191 187
 
192 188
   //#define MSG_MAIN                            ".."

+ 0
- 2
Marlin/utf_mapper.h View File

@@ -16,8 +16,6 @@
16 16
     #define MAPPER_ONE_TO_ONE
17 17
   #elif defined( DISPLAY_CHARSET_ISO10646_KANA )
18 18
     #define MAPPER_ONE_TO_ONE
19
-  #elif defined( DISPLAY_CHARSET_KANJI )
20
-    #define MAPPER_NON
21 19
   #endif
22 20
 #else // SIMULATE_ROMFONT
23 21
   #if defined( DISPLAY_CHARSET_HD44780_JAPAN )

Loading…
Cancel
Save