andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Removed Kanji.

pull/1/head
AnHardt 10 years ago
parent
25c4f17e5d
commit
2f374f1465
8 changed files with 9 additions and 363 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/Configuration.h
  2. 192
      Marlin/dogm_font_data_6x10_marlin_Kanji.h
  3. 7
      Marlin/dogm_lcd_implementation.h
  4. 1
      Marlin/language.h
  5. 2
      Marlin/language_en.h
  6. 152
      Marlin/language_kanji.h
  7. 14
      Marlin/language_test.h
  8. 2
      Marlin/utf_mapper.h

2
Marlin/Configuration.h
View File

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

192
Marlin/dogm_font_data_6x10_marlin_Kanji.h
View File

@ -1,192 +0,0 @@
/*
Fontname : Japanese Original font, Version 0.1
Author : http://www.thingiverse.com/ichibey
License : Creative Commons BY-NC
営利目的で利用する際は、かならず許可を得てください。非営利の場合は、CCライセンスに従い使用ください。
http://creativecommons.org/licenses/by-nc/2.1/jp/legalcode
*/
#include <utility/u8g.h>
const u8g_fntpgm_uint8_t u8g_font_6x10_marlin[2911] U8G_SECTION(".progmem.u8g_font_6x10_marlin") = {
0,6,10,0,254,7,1,153,3,43,32,255,254,8,254,7,
254,0,0,0,6,0,8,1,7,7,6,2,0,128,128,128,
128,128,0,128,3,3,3,6,1,4,160,160,160,5,7,7,
6,0,0,80,80,248,80,248,80,80,5,7,7,6,0,0,
32,112,160,112,40,112,32,5,7,7,6,0,0,72,168,80,
32,80,168,144,5,7,7,6,0,0,64,160,160,64,168,144,
104,1,3,3,6,2,4,128,128,128,3,7,7,6,1,0,
32,64,128,128,128,64,32,3,7,7,6,1,0,128,64,32,
32,32,64,128,5,5,5,6,0,1,136,80,248,80,136,5,
5,5,6,0,1,32,32,248,32,32,3,3,3,6,1,255,
96,64,128,5,1,1,6,0,3,248,3,3,3,6,1,255,
64,224,64,5,7,7,6,0,0,8,8,16,32,64,128,128,
5,7,7,6,0,0,112,152,168,168,168,200,112,5,7,7,
6,0,0,32,96,32,32,32,32,248,5,7,7,6,0,0,
112,136,8,112,128,128,248,5,7,7,6,0,0,112,136,8,
48,8,136,112,5,7,7,6,0,0,112,144,144,144,248,16,
16,5,7,7,6,0,0,248,128,240,8,8,136,112,5,7,
7,6,0,0,112,136,128,240,136,136,112,5,7,7,6,0,
0,248,8,8,16,32,32,32,5,7,7,6,0,0,112,136,
136,112,136,136,112,5,7,7,6,0,0,112,136,136,120,8,
136,112,3,7,7,6,1,0,64,224,64,0,64,224,64,3,
7,7,6,1,0,64,224,64,0,96,64,128,4,7,7,6,
1,0,16,32,64,128,64,32,16,5,3,3,6,0,2,248,
0,248,4,7,7,6,1,0,128,64,32,16,32,64,128,5,
7,7,6,0,0,112,136,16,32,32,0,32,5,7,7,6,
0,0,112,136,152,168,176,128,112,5,7,7,6,0,0,112,
136,136,136,248,136,136,5,7,7,6,0,0,240,136,136,240,
136,136,240,5,7,7,6,0,0,112,136,128,128,128,136,112,
5,7,7,6,0,0,240,136,136,136,136,136,240,5,7,7,
6,0,0,248,128,128,240,128,128,248,5,7,7,6,0,0,
248,128,128,240,128,128,128,5,7,7,6,0,0,112,136,128,
152,136,136,112,5,7,7,6,0,0,136,136,136,248,136,136,
136,3,7,7,6,1,0,224,64,64,64,64,64,224,5,7,
7,6,0,0,56,16,16,16,16,144,96,5,7,7,6,0,
0,136,144,160,192,160,144,136,5,7,7,6,0,0,128,128,
128,128,128,128,248,5,7,7,6,0,0,136,136,216,168,136,
136,136,5,7,7,6,0,0,136,136,200,168,152,136,136,5,
7,7,6,0,0,112,136,136,136,136,136,112,5,7,7,6,
0,0,240,136,136,240,128,128,128,5,8,8,6,0,255,112,
136,136,136,136,168,112,8,5,7,7,6,0,0,240,136,136,
240,136,136,136,5,7,7,6,0,0,112,136,128,112,8,136,
112,5,7,7,6,0,0,248,32,32,32,32,32,32,5,7,
7,6,0,0,136,136,136,136,136,136,112,5,7,7,6,0,
0,136,136,136,80,80,80,32,5,7,7,6,0,0,136,136,
136,168,168,216,136,5,7,7,6,0,0,136,136,80,32,80,
136,136,5,7,7,6,0,0,136,136,80,32,32,32,32,5,
7,7,6,0,0,248,8,80,32,80,128,248,3,7,7,6,
1,0,224,128,128,128,128,128,224,5,7,7,6,0,0,128,
128,64,32,16,8,8,3,7,7,6,1,0,224,32,32,32,
32,32,224,5,3,3,6,0,4,32,80,136,5,1,1,6,
0,255,248,2,2,2,6,2,6,128,64,5,5,5,6,0,
0,112,8,120,136,120,5,7,7,6,0,0,128,128,240,136,
136,136,240,5,5,5,6,0,0,112,136,128,136,112,5,7,
7,6,0,0,8,8,120,136,136,136,120,5,5,5,6,0,
0,112,136,248,128,120,4,7,7,6,0,0,48,64,64,240,
64,64,64,5,7,7,6,0,254,120,136,136,120,8,8,112,
5,7,7,6,0,0,128,128,240,136,136,136,136,3,7,7,
6,1,0,64,0,192,64,64,64,224,4,9,9,6,1,254,
16,0,48,16,16,16,16,16,224,5,7,7,6,0,0,128,
128,136,144,224,144,136,3,7,7,6,1,0,192,64,64,64,
64,64,224,5,5,5,6,0,0,240,168,168,168,168,5,5,
5,6,0,0,240,136,136,136,136,5,5,5,6,0,0,112,
136,136,136,112,5,7,7,6,0,254,240,136,136,136,240,128,
128,5,7,7,6,0,254,120,136,136,136,120,8,8,5,5,
5,6,0,0,176,200,128,128,128,5,5,5,6,0,0,112,
128,112,8,240,4,7,7,6,0,0,64,64,240,64,64,64,
48,5,5,5,6,0,0,136,136,136,136,120,5,5,5,6,
0,0,136,136,80,80,32,5,5,5,6,0,0,136,136,168,
168,80,5,5,5,6,0,0,136,80,32,80,136,5,7,7,
6,0,254,136,136,136,120,8,136,112,5,5,5,6,0,0,
248,16,32,64,248,6,9,9,6,0,255,240,240,240,128,156,
136,156,136,136,4,9,9,6,0,255,240,240,240,16,208,144,
208,144,144,5,9,9,6,0,255,112,112,0,248,0,112,112,
32,248,5,3,3,6,0,4,72,168,144,4,9,9,6,1,
255,240,16,32,64,32,32,32,32,64,6,9,9,6,0,255,
4,228,4,228,0,20,36,36,204,5,9,9,6,0,255,224,
32,224,224,0,240,208,208,248,6,8,8,6,0,255,60,40,
60,44,32,76,68,156,4,9,9,6,0,255,128,240,32,240,
224,0,240,64,176,5,9,9,6,0,255,32,32,248,32,48,
96,160,160,32,5,9,9,6,0,255,248,168,248,168,248,32,
32,32,32,6,9,9,6,0,255,112,32,252,112,168,160,32,
32,32,5,9,9,6,0,255,112,144,80,32,120,136,40,16,
96,6,9,9,6,0,255,112,0,252,120,120,120,32,120,240,
5,9,9,6,0,255,32,32,248,168,168,248,32,32,32,6,
9,9,6,0,255,16,220,40,204,8,236,4,124,4,4,7,
7,6,0,0,224,128,192,128,224,0,240,6,9,9,6,0,
255,16,124,16,28,16,252,36,76,28,4,9,9,6,0,255,
128,224,128,128,128,240,64,32,128,5,9,9,6,0,255,32,
248,32,248,248,248,32,248,32,5,9,9,6,0,255,32,32,
32,248,168,248,168,168,248,6,9,9,6,0,255,36,44,36,
76,228,168,44,44,36,4,9,9,6,0,255,32,240,32,240,
0,240,80,240,80,5,9,9,6,0,255,112,16,32,248,40,
48,32,32,96,5,9,9,6,0,255,32,64,248,136,248,136,
248,136,248,6,9,9,6,0,255,32,116,112,116,112,120,128,
40,72,4,9,9,6,0,255,128,224,160,160,224,176,0,160,
144,6,9,9,6,0,255,4,8,16,32,92,132,28,4,60,
4,8,8,6,0,255,128,64,32,208,0,128,0,224,6,9,
9,6,0,255,60,32,44,40,44,76,64,136,136,5,9,9,
6,0,255,248,128,240,16,240,240,128,144,144,5,9,9,6,
1,255,8,8,8,120,64,120,0,80,144,4,8,8,6,0,
255,192,0,224,32,224,0,160,144,6,9,9,6,0,255,36,
252,120,120,172,60,4,20,124,4,8,8,6,0,255,240,160,
192,48,192,128,0,224,5,9,9,6,0,255,32,248,112,112,
112,248,168,32,96,5,9,9,6,0,255,248,200,232,200,232,
136,232,232,152,6,9,9,6,0,255,60,4,60,36,44,36,
252,32,32,4,9,9,6,0,255,224,0,224,32,160,32,240,
32,96,5,9,9,6,0,255,112,32,248,32,248,248,248,32,
32,6,9,9,6,0,255,96,32,32,80,80,144,136,8,4,
5,9,9,6,1,255,8,248,128,152,0,56,16,16,32,4,
8,8,6,0,255,240,16,128,0,192,128,144,224,5,7,7,
6,0,0,248,8,248,8,8,48,192,4,5,5,6,1,0,
240,16,80,64,128,4,5,5,6,1,0,48,64,160,32,32,
5,5,5,6,0,0,32,248,136,16,96,5,4,4,6,0,
0,112,32,32,248,4,5,5,6,1,0,32,240,96,160,160,
4,5,5,6,1,0,64,240,80,64,64,4,4,4,6,1,
0,224,32,32,240,4,5,5,6,1,0,240,16,112,16,240,
5,4,4,6,0,0,168,168,8,112,5,1,1,6,0,3,
248,5,7,7,6,0,0,248,8,40,48,32,64,128,4,7,
7,6,0,0,16,48,96,160,32,32,32,5,7,7,6,0,
0,32,248,136,8,16,16,96,5,6,6,6,0,0,112,32,
32,32,32,248,5,7,7,6,0,0,16,248,48,80,80,144,
16,5,7,7,6,0,0,64,248,72,72,72,136,152,5,7,
7,6,0,0,32,240,32,32,248,32,32,5,7,7,6,0,
0,120,136,136,8,16,16,96,5,7,7,6,0,0,128,248,
144,16,16,16,96,4,7,7,6,1,0,240,16,16,16,16,
16,240,5,7,7,6,0,0,80,248,80,16,16,16,96,5,
7,7,6,0,0,232,8,232,8,8,16,96,5,7,7,6,
0,0,248,8,16,32,80,136,136,5,8,8,6,0,0,64,
64,248,72,72,64,64,56,5,7,7,6,0,0,136,136,72,
8,16,16,96,5,8,8,6,0,0,128,248,136,136,104,24,
16,224,5,7,7,6,0,0,120,16,16,248,16,16,224,5,
7,7,6,0,0,168,168,168,8,16,16,224,5,7,7,6,
0,0,112,0,248,16,16,16,96,4,7,7,6,1,0,128,
128,192,160,144,128,128,5,7,7,6,0,0,16,248,16,16,
32,32,192,5,6,6,6,0,0,112,0,0,0,0,248,5,
7,7,6,0,0,120,8,8,80,32,80,136,5,8,8,6,
0,0,32,120,8,48,112,168,168,32,4,6,6,6,1,1,
16,16,32,32,64,128,5,6,6,6,0,1,32,16,136,136,
136,8,5,7,7,6,0,0,128,152,224,128,128,128,120,5,
7,7,6,0,0,248,8,8,8,16,16,96,5,7,7,6,
0,0,32,32,80,144,136,8,8,5,7,7,6,0,0,32,
248,32,32,168,168,168,5,7,7,6,0,0,248,8,8,80,
32,16,8,5,7,7,6,0,0,112,0,96,0,0,240,8,
5,7,7,6,0,0,32,64,64,128,136,248,8,5,7,7,
6,0,0,8,8,80,48,40,72,128,5,7,7,6,0,0,
240,64,64,248,64,64,56,5,7,7,6,0,0,64,248,72,
72,80,64,64,5,6,6,6,0,0,112,16,16,16,16,248,
5,7,7,6,0,0,248,8,8,120,8,8,248,5,7,7,
6,0,0,112,0,248,8,8,16,96,4,7,7,6,1,0,
144,144,144,16,16,16,96,5,7,7,6,0,0,32,160,160,
160,168,168,48,5,7,7,6,0,0,128,128,128,136,136,144,
224,5,7,7,6,0,0,248,136,136,136,136,136,248,5,7,
7,6,0,0,248,136,136,8,16,16,96,5,6,6,6,0,
0,200,8,8,8,48,192,5,2,2,6,0,5,144,72,4,
4,4,6,0,4,96,144,144,96,6,9,9,6,0,254,56,
68,64,132,136,252,8,8,4,6,7,7,6,0,255,112,136,
136,148,252,148,136,3,3,3,6,0,1,192,32,224,5,9,
9,6,0,255,64,248,64,120,72,168,144,168,72,6,9,9,
6,0,255,56,72,16,248,216,136,252,80,136,4,7,7,6,
0,255,240,144,144,144,144,240,16,5,9,9,6,0,255,64,
240,64,240,240,224,80,72,248,5,9,9,6,1,255,120,8,
248,168,168,56,56,56,8,5,10,10,6,0,254,240,0,248,
72,72,224,224,224,0,240,6,9,9,6,0,255,28,208,20,
20,212,20,16,84,212,5,9,9,6,0,255,248,64,240,240,
240,240,64,80,80,5,9,9,6,1,255,8,8,120,32,192,
56,8,48,192,4,7,7,6,0,255,224,64,48,192,0,192,
48,5,9,9,6,1,255,64,72,0,224,32,32,72,64,184,
4,9,9,6,0,255,160,240,64,240,64,160,16,0,240,5,
9,9,6,0,255,64,248,32,248,16,112,128,128,120,0,0,
0,6,0,8,4,9,9,6,1,255,96,0,240,96,96,96,
240,144,240,5,9,9,6,0,255,240,144,152,0,248,80,32,
80,136,5,9,9,6,1,255,8,248,128,56,8,8,72,120,
128,4,8,8,6,0,255,240,16,192,0,192,0,0,240,6,
6,6,6,0,1,4,224,172,228,160,228,4,9,9,6,0,
255,128,192,128,240,224,32,160,32,96,6,8,8,6,0,255,
16,16,16,28,80,80,80,252,5,9,9,6,0,255,64,240,
200,136,136,136,152,120,16,5,8,8,6,0,0,224,248,136,
136,136,136,136,248,6,7,7,6,0,0,32,48,56,252,56,
48,32,6,7,7,6,0,1,16,56,124,16,16,16,240,5,
9,9,6,0,255,32,112,168,168,184,136,136,112,32,5,10,
10,6,0,254,224,128,192,128,176,40,40,48,40,40,5,10,
10,6,0,254,248,168,136,136,136,136,136,136,168,248,255};

7
Marlin/dogm_lcd_implementation.h
View File

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

1
Marlin/language.h
View File

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

2
Marlin/language_en.h
View File

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

152
Marlin/language_kanji.h
View File

@ -1,152 +0,0 @@
/**
* Japanese (Kanji)
*
* LCD Menu Messages
* Se also documentation/LCDLanguageFont.md
*
*/
#include "Configuration.h"
#ifndef DOGLCD
#include "language_kana.h" // fallback to kana
#define LANGUAGE_KANJI_H
#endif
#ifndef LANGUAGE_KANJI_H
#define LANGUAGE_KANJI_H
#define MAPPER_NON
#define DISPLAY_CHARSET_KANJI
// 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:
// 漢字混じり表示
#define WELCOME_MSG MACHINE_NAME "\x8a\x8b\x90\x91\xa4\xa5\x7f" // "ready."
#define MSG_SD_INSERTED "SD\xb6\xb0\xc4\xde\x20\x84\xa2\xa3\xbb\xda\xcf\xbc\xc0" // "Card inserted"
#define MSG_SD_REMOVED "SD\xb6\xb0\xc4\xde\x20\x84\xe3\xb6\xda\xcf\xbc\xc0" // "Card removed"
#define MSG_MAIN "\xd2\xb2\xdd" // "Main"
#define MSG_AUTOSTART "\x93\x88\xb6\xb6\xb2\xbc" // "Autostart"
#define MSG_DISABLE_STEPPERS "\xd3\xb0\xc0\xb0\xe7\xe8\xe9\xea\x20\xb5\xcc" // "Disable steppers"
#define MSG_AUTO_HOME "\x98\x99\x9a\x9b\xcd \x86\x87\x88\xb6" // "Auto home"
#define MSG_SET_HOME_OFFSETS "\x8c\x8d\x8a\x8b\xb5\xcc\xbe\xaf\xc4\xf1\xf2\xf3\xf4" // "Set home offsets"
#define MSG_SET_ORIGIN "\x8c\x8d\x8a\x8b\xbe\xaf\xc4" // "Set origin"
#define MSG_PREHEAT_PLA "PLA \x92\x94\x95" // "Preheat PLA"
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
#define MSG_PREHEAT_PLA_ALL MSG_PREHEAT_PLA " \x96\x97\xc3" // " All"
#define MSG_PREHEAT_PLA_BEDONLY MSG_PREHEAT_PLA " \xcd\xde\xaf\xc4\xde" // "Bed"
#define MSG_PREHEAT_PLA_SETTINGS MSG_PREHEAT_PLA " \xbe\xaf\xc3\xb2" // "conf"
#define MSG_PREHEAT_ABS "ABS \x92\x94\x95" // "Preheat ABS"
#define MSG_PREHEAT_ABS_N MSG_PREHEAT_ABS " "
#define MSG_PREHEAT_ABS_ALL MSG_PREHEAT_ABS " \xbd\xcd\xde\xc3" // " All"
#define MSG_PREHEAT_ABS_BEDONLY MSG_PREHEAT_ABS " \xcd\xde\xaf\xc4\xde" // "Bed"
#define MSG_PREHEAT_ABS_SETTINGS MSG_PREHEAT_ABS " \xbe\xaf\xc3\xb2" // "conf"
#define MSG_COOLDOWN "\xb6\xe5\x94\x95\xb2\x9e\xf7" // "Cooldown"
#define MSG_SWITCH_PS_ON "\xe7\xe8\xe9\xea\x20\xb5\xdd" // "Switch power on"
#define MSG_SWITCH_PS_OFF "\xe7\xe8\xe9\xea\x20\xb5\xcc" // "Switch power off"
#define MSG_EXTRUDE "\x84\x85\xbc\xc0\xde\xbc" // "Extrude"
#define MSG_RETRACT "\xd8\xc4\xd7\xb8\xc4" // "Retract"
#define MSG_MOVE_AXIS "\x8e\x8f\x86\x87\x88\xb6" // "Move axis"
#define MSG_MOVE_X "X\x8e\x8f\x86\x87\x88\xb6" // "Move X"
#define MSG_MOVE_Y "Y\x8e\x8f\x86\x87\x88\xb6" // "Move Y"
#define MSG_MOVE_Z "Z\x8e\x8f\x86\x87\x88\xb6" // "Move Z"
#define MSG_MOVE_E "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0" // "Extruder"
#define MSG_MOVE_01MM "0.1mm \x86\x87\x88\xb6" // "Move 0.1mm"
#define MSG_MOVE_1MM " 1mm \x86\x87\x88\xb6" // "Move 1mm"
#define MSG_MOVE_10MM " 10mm \x86\x87\x88\xb6" // "Move 10mm"
#define MSG_SPEED "\xbd\xcb\xdf\xb0\xc4\xde" // "Speed"
#define MSG_NOZZLE "\xc9\xbd\xde\xd9" // "Nozzle"
#define MSG_BED "\xcd\xde\xaf\xc4\xde" // "Bed"
#define MSG_FAN_SPEED "\xcc\xa7\xdd\xed\xe6\x82\x83" // "Fan speed"
#define MSG_FLOW "\xed\xee\xd8\x7d" // "Flow"
#define MSG_CONTROL "\xba\xdd\xc4\xdb\xb0\xd9" // "Control"
#define MSG_MIN LCD_STR_THERMOMETER " Min"
#define MSG_MAX LCD_STR_THERMOMETER " Max"
#define MSG_FACTOR LCD_STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP "\x93\x88\xb6\x80\x81\x82\x83" // "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
#define MSG_PID_P "PID-P"
#define MSG_PID_I "PID-I"
#define MSG_PID_D "PID-D"
#define MSG_PID_C "PID-C"
#define MSG_ACC "\xb6\xe5\xed\xe6\x82\x83" // "Accel"
#define MSG_VXY_JERK "Vxy-jerk"
#define MSG_VZ_JERK "Vz-jerk"
#define MSG_VE_JERK "Ve-jerk"
#define MSG_VMAX "Vmax "
#define MSG_X "x"
#define MSG_Y "y"
#define MSG_Z "z"
#define MSG_E "e"
#define MSG_VMIN "Vmin"
#define MSG_VTRAV_MIN "VTrav min"
#define MSG_AMAX "Amax "
#define MSG_A_RETRACT "A-retract"
#define MSG_XSTEPS "Xsteps/mm"
#define MSG_YSTEPS "Ysteps/mm"
#define MSG_ZSTEPS "Zsteps/mm"
#define MSG_ESTEPS "Esteps/mm"
#define MSG_TEMPERATURE "\x80\x81\x82\x83" // "Temperature"
#define MSG_MOTION "\x88\xb6\xef\xf1\xf2\xf3\xf4" // "Motion"
#define MSG_VOLUMETRIC "\xcc\xa8\xd7\xd2\xdd\xc4" // "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Fil. Dia. 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Fil. Dia. 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Fil. Dia. 3"
#define MSG_FILAMENT_SIZE_EXTRUDER_3 "Fil. Dia. 4"
#define MSG_CONTRAST "LCD\xba\xdd\xc4\xd7\xbd\xc4" // "LCD contrast"
#define MSG_STORE_EPROM "\xd2\xd3\xd8\xcd\xb6\xb8\xc9\xb3" // "Store memory"
#define MSG_LOAD_EPROM "\xd2\xd3\xd8\xb6\xd7\xd6\xd0\ba\xd0" // "Load memory"
#define MSG_RESTORE_FAILSAFE "\xf1\xf2\xf3\xf4\xd8\xbe\xaf\xc4" // "Restore failsafe"
#define MSG_REFRESH "\xd8\xcc\xda\xaf\xbc\xad" // "Refresh"
#define MSG_WATCH "\xb2\xdd\xcc\xab" // "Info screen"
#define MSG_PREPARE "\x8a\x8b\x90\x91\xf1\xf2\xf3\xf4" // "Prepare"
#define MSG_TUNE "\xf1\x9f\x9c\x9d" // "Tune"
#define MSG_PAUSE_PRINT "\xb0\xf5\xf6\xb2\x9e\xf7" // "Pause print"
#define MSG_RESUME_PRINT "\xcc\xdf\xd8\xdd\xc4 \xa0\xa1\x7b\x7c" // "Resume print"
#define MSG_STOP_PRINT "\xcc\xdf\xd8\xdd\xc4 \xb2\x9e\xf7" // "Stop print"
#define MSG_CARD_MENU "SD\xb6\xb0\xc4\xde\xb6\xd7\xcc\xdf\xd8\xdd\xc4" // "Print from SD"
#define MSG_NO_CARD "SD\xb6\xb0\xc4\xde\xb6\xde\xb1\xd8\xcf\xbe\xdd" // "No SD card"
#define MSG_DWELL "\xbd\xd8\xb0\xcc\xdf" // "Sleep..."
#define MSG_USERWAIT "\xbc\xca\xde\xd7\xb9\xb5\xcf\xc1\xb8\xc0\xde\xbb\xb2" // "Wait for user..."
#define MSG_RESUMING "\xcc\xdf\xd8\xdd\xc4 \xa0\xa1\x7b\x7c" // "Resuming print"
#define MSG_PRINT_ABORTED "\xcc\xdf\xd8\xdd\xc4\xc1\xad\xb3\xbc\xbb\xda\xcf\xbc\xc0" // "Print aborted"
#define MSG_NO_MOVE "\x88\xb6\xb7\xcf\xbe\xdd" // "No move."
#define MSG_KILLED "\xbc\xae\xb3\xb7\xae" // "KILLED. "
#define MSG_STOPPED "\xb2\x9e\xf7\xbc\xcf\xbc\xc0" // "STOPPED. "
#define MSG_CONTROL_RETRACT "Retract mm"
#define MSG_CONTROL_RETRACT_SWAP "Swap Re.mm"
#define MSG_CONTROL_RETRACTF "Retract V"
#define MSG_CONTROL_RETRACT_ZLIFT "Hop mm"
#define MSG_CONTROL_RETRACT_RECOVER "UnRet +mm"
#define MSG_CONTROL_RETRACT_RECOVER_SWAP "S UnRet+mm"
#define MSG_CONTROL_RETRACT_RECOVERF "UnRet V"
#define MSG_AUTORETRACT "AutoRetr."
#define MSG_FILAMENTCHANGE "\xcc\xa8\xd7\xd2\xdd\xc4\xeb\xec\x84\xe4" // "Change filament"
#define MSG_INIT_SDCARD "SD\xb6\xb0\xc4\xde\\xa0\xa1\xd6\xd0\xba\xd0" // "Init. SD card"
#define MSG_CNG_SDCARD "SD\xb6\xb0\xc4\xde\xeb\xec\x84\xe4" // "Change SD card"
#define MSG_ZPROBE_OUT "Z\xcc\xdf\xdb\xb0\xcc\xde \xcd\xde\xaf\xc4\xee\xb6\xde\xb2" // "Z probe out. bed"
#define MSG_POSITION_UNKNOWN "\xb9\xde\xdd\xc3\xdd\xcaXY\xb2\xc4\xde\xb3\xba\xdeZ" // "Home X/Y before Z"
#define MSG_ZPROBE_ZOFFSET "Z\xb5\xcc\xbe\xaf\xc4" // "Z Offset"
#define MSG_BABYSTEP_X "\xcb\xde\xc4\xde\xb3 X" // "Babystep X"
#define MSG_BABYSTEP_Y "\xcb\xde\xc4\xde\xb3 Y" // "Babystep Y"
#define MSG_BABYSTEP_Z "\xcb\xde\xc4\xde\xb3 Z" // "Babystep Z"
#define MSG_ENDSTOP_ABORT "Endstop abort"
/* These are from language.h. PLEASE DON'T TRANSLATE! All translatable messages can be found in language_en.h
#define MSG_HEATING "\xb6\xe5\x94\x95\x89..." // "Heating..."
#define MSG_HEATING_COMPLETE "\xb6\xe5\x94\x95\xa4\xa5\x7f" // "Heating done."
#define MSG_BED_HEATING "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\x89" // "Bed Heating."
#define MSG_BED_DONE "\xcd\xde\xaf\xc4\xde\xb6\xe5\x94\x95\xa4\xa5\x7f" // "Bed done."
#define MSG_ENDSTOPS_HIT "endstops hit: "
^ typho
*/
#ifdef DELTA_CALIBRATION_MENU
#define MSG_DELTA_CALIBRATE "Delta Calibration"
#define MSG_DELTA_CALIBRATE_X "Calibrate X"
#define MSG_DELTA_CALIBRATE_Y "Calibrate Y"
#define MSG_DELTA_CALIBRATE_Z "Calibrate Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif // DELTA_CALIBRATION_MENU
#endif // LANGUAGE_JP2_H

14
Marlin/language_test.h
View File

@ -23,7 +23,7 @@
// I hope the pages E282 and E283 are sufficient to write katakana. // I hope the pages E282 and E283 are sufficient to write katakana.
// 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 // 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
// 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). // 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).
// d.) So for Kanji we use a very special and selected subset of symbols and the direct mapping like in a).
#define MAPPER_NON // For direct asci codes ( until now all languages except ru, de, fi, kana_utf8, ... ) #define MAPPER_NON // For direct asci codes ( until now all languages except ru, de, fi, kana_utf8, ... )
//#define MAPPER_C2C3 // For most European languages when language file is in utf8 //#define MAPPER_C2C3 // For most European languages when language file is in utf8
@ -37,7 +37,7 @@
//#define DISPLAY_CHARSET_ISO10646_1 //#define DISPLAY_CHARSET_ISO10646_1
//#define DISPLAY_CHARSET_ISO10646_5 //#define DISPLAY_CHARSET_ISO10646_5
//#define DISPLAY_CHARSET_ISO10646_KANA //#define DISPLAY_CHARSET_ISO10646_KANA
//#define DISPLAY_CHARSET_KANJI
// next 5 lines select variants in this file only // next 5 lines select variants in this file only
@ -45,7 +45,7 @@
//#define WEST //#define WEST
//#define CYRIL //#define CYRIL
//#define KANA //#define KANA
//#define KANJI
// TESTSTRINGS // TESTSTRINGS
@ -178,15 +178,11 @@
#endif #endif
#if defined( KANA ) || defined (KANJI) #if defined( KANA )
#define WELCOME_MSG "Language TEST" #define WELCOME_MSG "Language TEST"
#define MSG_WATCH "\001\002\003\004\005\006\007\010\011" #define MSG_WATCH "\001\002\003\004\005\006\007\010\011"
#ifdef KANJI #define MSG_PREPARE "UTF8"
#define MSG_PREPARE "No UTF8 for Kanji"
#else
#define MSG_PREPARE "UTF8"
#endif
#define MSG_CONTROL "ASCII" #define MSG_CONTROL "ASCII"
//#define MSG_MAIN ".." //#define MSG_MAIN ".."

2
Marlin/utf_mapper.h
View File

@ -16,8 +16,6 @@
#define MAPPER_ONE_TO_ONE #define MAPPER_ONE_TO_ONE
#elif defined( DISPLAY_CHARSET_ISO10646_KANA ) #elif defined( DISPLAY_CHARSET_ISO10646_KANA )
#define MAPPER_ONE_TO_ONE #define MAPPER_ONE_TO_ONE
#elif defined( DISPLAY_CHARSET_KANJI )
#define MAPPER_NON
#endif #endif
#else // SIMULATE_ROMFONT #else // SIMULATE_ROMFONT
#if defined( DISPLAY_CHARSET_HD44780_JAPAN ) #if defined( DISPLAY_CHARSET_HD44780_JAPAN )

Write Preview
Loading…
Cancel
Save