Browse Source

Add user test to language_test.h and make it default.

Improve description in Configuration.h
AnHardt 10 years ago
parent
commit
5bafb1fe1f
2 changed files with 16 additions and 5 deletions
  1. 1
    1
      Marlin/Configuration.h
  2. 15
    4
      Marlin/language_test.h

+ 1
- 1
Marlin/Configuration.h View File

@@ -570,7 +570,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
570 570
 //#define LANGUAGE_INCLUDE GENERATE_LANGUAGE_INCLUDE(en)
571 571
 
572 572
 // Chose ONE of the next three charsets. This has to match your hardware. In case of a full graphic display chose that one best fitting to your language.
573
-// to find out what type you have - compile with language_test.h - upload - click to get the menu.
573
+// to find out what type you have - compile with language_test.h - upload - click to get the menu. You'll see two typical lines from the upper half of the charset.
574 574
   #define DISPLAY_CHARSET_HD44780_JAPAN        // this is the most common hardware
575 575
   //#define DISPLAY_CHARSET_HD44780_WESTERN
576 576
   //#define DISPLAY_CHARSET_HD44780_CYRILIC

+ 15
- 4
Marlin/language_test.h View File

@@ -25,16 +25,17 @@
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 26
 // d.) So for Kanji we use a very special and selected subset of symbols and the direct mapping like in a).
27 27
 
28
-//#define MAPPER_NON         // For direct asci codes ( until now all languages except ru, de, ... )
29
-#define MAPPER_C2C3        // For most European languages when language file is in utf8
28
+#define MAPPER_NON         // For direct asci codes ( until now all languages except ru, de, ... )
29
+//#define MAPPER_C2C3        // For most European languages when language file is in utf8
30 30
 //#define MAPPER_D0D1        // For Cyrillic
31
-//#define MAPPER_D0D1_MOD    // For Cyrillic on HD44780_CYRILIC (will save 32 byte in the mapper but adds some more decisions)
31
+////#define MAPPER_D0D1_MOD    // For Cyrillic on HD44780_CYRILIC (will save 32 byte in the mapper but adds some more decisions)
32 32
 //#define MAPPER_E382E383    // For Katakana
33 33
 
34 34
 
35 35
 // next 4 lines select variants in this file only
36
+#define DISPLAYTEST
36 37
 //#define WEST
37
-#define CYRIL
38
+//#define CYRIL
38 39
 //#define KANA
39 40
 //#define KANJI
40 41
 
@@ -47,6 +48,8 @@
47 48
 #define STRG_ASCII_6 "`abcdefghijklmno"
48 49
 #define STRG_ASCII_7 "pqrstuvwxyz{|}~"
49 50
 
51
+#define STRG_C2_8 ""
52
+#define STRG_C2_9 ""
50 53
 #define STRG_C2_a " ¡¢£¤¥¦§¨©ª«¬­®¯"
51 54
 #define STRG_C2_b "°±²³´µ¶·¸¹º»¼½¾¿"
52 55
 #define STRG_C3_8 "ÈÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
@@ -89,6 +92,14 @@
89 92
 #define STRG_OKTAL_e "\340\341\342\343\344\345\346\347\350\351\352\353\354\355\356\357"
90 93
 #define STRG_OKTAL_f "\360\361\362\363\364\365\366\367\370\371\372\373\374\375\376\377"
91 94
 
95
+#ifdef DISPLAYTEST
96
+  #define WELCOME_MSG                         "Language TEST"
97
+
98
+  #define MSG_WATCH                           "Display test"
99
+  #define MSG_PREPARE                         STRG_OKTAL_c
100
+  #define MSG_CONTROL                         STRG_OKTAL_d
101
+#endif
102
+
92 103
 #ifdef WEST
93 104
   #define WELCOME_MSG                         "Language TEST"
94 105
 

Loading…
Cancel
Save