Browse Source

Merge pull request #1449 from AnHardt/LostInTranslation3

Solid improvements. Merging.
Scott Lahteine 10 years ago
parent
commit
137ba7b590

+ 3
- 4
Marlin/Configuration.h View File

534
 
534
 
535
 //LCD and SD support
535
 //LCD and SD support
536
 
536
 
537
-// Character based displays can have different extended charsets. If you see strange or missing characters on yours - try an other definition below.
538
-#define DISPLAY_CHARSET_HD44870_JAPAN  //  "ääööüüß°"
539
-//#define DISPLAY_CHARSET_HD44870_WESTERN // with better support for European languages. "ÄäÖöÜüß°"
540
-//#define DISPLAY_CHARSET_DOGM // for full graphics display "ÄäÖÖÜÜß°"
537
+// Character based displays can have different extended charsets.
538
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
539
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
541
 
540
 
542
 //#define ULTRA_LCD  //general LCD support, also 16x2
541
 //#define ULTRA_LCD  //general LCD support, also 16x2
543
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
542
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)

+ 3
- 4
Marlin/example_configurations/Hephestos/Configuration.h View File

540
 
540
 
541
 //LCD and SD support
541
 //LCD and SD support
542
 
542
 
543
-// Character based displays can have different extended charsets. If you see strange or missing characters on yours - try an other definition below.
544
-#define DISPLAY_CHARSET_HD44870_JAPAN  //  "ääööüüß°"
545
-//#define DISPLAY_CHARSET_HD44870_WESTERN // with better support for European languages. "ÄäÖöÜüß°"
546
-//#define DISPLAY_CHARSET_DOGM // for full graphics display "ÄäÖÖÜÜß°"
543
+// Character based displays can have different extended charsets.
544
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
545
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
547
 
546
 
548
 #define ULTRA_LCD  //general LCD support, also 16x2
547
 #define ULTRA_LCD  //general LCD support, also 16x2
549
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
548
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)

+ 5
- 0
Marlin/example_configurations/K8200/Configuration.h View File

544
 #define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
544
 #define ABS_PREHEAT_FAN_SPEED 0   // Insert Value between 0 and 255
545
 
545
 
546
 //LCD and SD support
546
 //LCD and SD support
547
+
548
+// Character based displays can have different extended charsets.
549
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
550
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
551
+
547
 //#define ULTRA_LCD  //general LCD support, also 16x2
552
 //#define ULTRA_LCD  //general LCD support, also 16x2
548
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
553
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
549
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
554
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console

+ 5
- 0
Marlin/example_configurations/SCARA/Configuration.h View File

537
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
537
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
538
 
538
 
539
 //LCD and SD support
539
 //LCD and SD support
540
+
541
+// Character based displays can have different extended charsets.
542
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
543
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
544
+
540
 //#define ULTRA_LCD  //general LCD support, also 16x2
545
 //#define ULTRA_LCD  //general LCD support, also 16x2
541
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
546
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
542
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
547
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console

+ 5
- 0
Marlin/example_configurations/WITBOX/Configuration.h View File

538
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
538
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
539
 
539
 
540
 //LCD and SD support
540
 //LCD and SD support
541
+
542
+// Character based displays can have different extended charsets.
543
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
544
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
545
+
541
 #define ULTRA_LCD  //general LCD support, also 16x2
546
 #define ULTRA_LCD  //general LCD support, also 16x2
542
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
547
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
543
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
548
 #define SDSUPPORT // Enable SD Card Support in Hardware Console

+ 5
- 0
Marlin/example_configurations/delta/Configuration.h View File

441
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
441
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
442
 
442
 
443
 //LCD and SD support
443
 //LCD and SD support
444
+
445
+// Character based displays can have different extended charsets.
446
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
447
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
448
+
444
 //#define ULTRA_LCD  //general LCD support, also 16x2
449
 //#define ULTRA_LCD  //general LCD support, also 16x2
445
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
450
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
446
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
451
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console

+ 5
- 0
Marlin/example_configurations/makibox/Configuration.h View File

509
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
509
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
510
 
510
 
511
 //LCD and SD support
511
 //LCD and SD support
512
+
513
+// Character based displays can have different extended charsets.
514
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
515
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
516
+
512
 //#define ULTRA_LCD  //general LCD support, also 16x2
517
 //#define ULTRA_LCD  //general LCD support, also 16x2
513
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
518
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
514
 #define SDSUPPORT // Enable SD Card Support in Hardware Console
519
 #define SDSUPPORT // Enable SD Card Support in Hardware Console

+ 5
- 0
Marlin/example_configurations/tvrrug/Round2/Configuration.h View File

523
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
523
 #define ABS_PREHEAT_FAN_SPEED 255   // Insert Value between 0 and 255
524
 
524
 
525
 //LCD and SD support
525
 //LCD and SD support
526
+
527
+// Character based displays can have different extended charsets.
528
+#define DISPLAY_CHARSET_HD44870_JAPAN     // "ääööüüß23°"
529
+//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
530
+
526
 //#define ULTRA_LCD  //general LCD support, also 16x2
531
 //#define ULTRA_LCD  //general LCD support, also 16x2
527
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
532
 //#define DOGLCD  // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
528
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
533
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console

+ 40
- 42
Marlin/language.h View File

161
 
161
 
162
 // LCD Menu Messages
162
 // LCD Menu Messages
163
 
163
 
164
-#define STR_Ae "Ae" // No charset known now. Default will be overruled when we know.
165
-#define STR_ae "ae"
166
-#define STR_Oe "Oe"
167
-#define STR_oe "oe"
168
-#define STR_Ue "Ue"
169
-#define STR_ue "ue"
170
-#define STR_sz "ss"
171
-#define STR_Deg ""
172
-#define STR_THERMOMETER "\302"
173
-
174
-#ifdef DISPLAY_CHARSET_DOGM
175
-  #define STR_Ae "\304" // U8glib
176
-  #define STR_ae "\344"
177
-  #define STR_Oe "\326"
178
-  #define STR_oe STR_Oe
179
-  #define STR_Ue "\334"
180
-  #define STR_ue STR_Ue
181
-  #define STR_sz "\337"
182
-  #define STR_Deg "\260"
164
+// Add your own character. Reference: https://github.com/MarlinFirmware/Marlin/pull/1434 photos
165
+//                                and https://www.sparkfun.com/datasheets/LCD/HD44780.pdf page 17-18
166
+#ifdef DOGLCD
167
+  #define STR_Ae "\304"               // 'Ä' U8glib
168
+  #define STR_ae "\344"               // 'ä'
169
+  #define STR_Oe "\326"               // 'Ö'
170
+  #define STR_oe STR_Oe               // 'ö'
171
+  #define STR_Ue "\334"               // 'Ü'
172
+  #define STR_ue STR_Ue               // 'ü'
173
+  #define STR_sz "\337"               // 'ß'
174
+  #define STR_h2 "\262"               // '²'
175
+  #define STR_h3 "\263"               // '³'
176
+  #define STR_Deg "\260"              // '°'
183
   #define STR_THERMOMETER "\377"
177
   #define STR_THERMOMETER "\377"
178
+#else
179
+  #ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
180
+    #define STR_ae "\xe1"
181
+    #define STR_Ae STR_ae
182
+    #define STR_oe "\357"
183
+    #define STR_Oe STR_oe
184
+    #define STR_ue "\365"
185
+    #define STR_Ue STR_ue
186
+    #define STR_sz "\342"
187
+    #define STR_h2 "2"
188
+    #define STR_h3 "3"
189
+    #define STR_Deg "\271"
190
+    #define STR_THERMOMETER "\002"
191
+  #endif
192
+  #ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
193
+    #define STR_Ae "\216"
194
+    #define STR_ae "\204"
195
+    #define STR_Oe "\211"
196
+    #define STR_oe "\204"
197
+    #define STR_Ue "\212"
198
+    #define STR_ue "\201"
199
+    #define STR_sz "\160"
200
+    #define STR_h2 "\262"
201
+    #define STR_h3 "\263"
202
+    #define STR_Deg "\337"
203
+    #define STR_THERMOMETER "\002"
204
+  #endif
184
 #endif
205
 #endif
185
-#ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
186
-  #define STR_ae "\xe1"
187
-  #define STR_Ae STR_ae
188
-  #define STR_oe "\357"
189
-  #define STR_Oe STR_oe
190
-  #define STR_ue "\365"
191
-  #define STR_Ue STR_ue
192
-  #define STR_sz "\342"
193
-  #define STR_Deg "\271"
194
-  #define STR_THERMOMETER "\302"
195
-#endif
196
-#ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
197
-  #define STR_Ae "\216"
198
-  #define STR_ae "\204"
199
-  #define STR_Oe "\211"
200
-  #define STR_oe "\204"
201
-  #define STR_Ue "\212"
202
-  #define STR_ue "\201"
203
-  #define STR_sz "\160"
204
-  #define STR_Deg "\337"
205
-  #define STR_THERMOMETER "\302"
206
-#endif
207
-
208
 /*
206
 /*
209
 #define TESTSTRING000 "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"
207
 #define TESTSTRING000 "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"
210
 #define TESTSTRING020 "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
208
 #define TESTSTRING020 "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

+ 1
- 1
Marlin/language_de.h View File

75
 #define MSG_TEMPERATURE                     "Temperatur"
75
 #define MSG_TEMPERATURE                     "Temperatur"
76
 #define MSG_MOTION                          "Bewegung"
76
 #define MSG_MOTION                          "Bewegung"
77
 #define MSG_VOLUMETRIC                      "Filament"
77
 #define MSG_VOLUMETRIC                      "Filament"
78
-#define MSG_VOLUMETRIC_ENABLED		          "E in mm3"
78
+#define MSG_VOLUMETRIC_ENABLED		          "E in mm" STR_h3
79
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Filament D 1"
79
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Filament D 1"
80
 #define MSG_FILAMENT_SIZE_EXTRUDER_1        "Filament D 2"
80
 #define MSG_FILAMENT_SIZE_EXTRUDER_1        "Filament D 2"
81
 #define MSG_FILAMENT_SIZE_EXTRUDER_2        "Filament D 3"
81
 #define MSG_FILAMENT_SIZE_EXTRUDER_2        "Filament D 3"

+ 4
- 4
Marlin/language_en.h View File

46
 #define MSG_FAN_SPEED                       "Fan speed"
46
 #define MSG_FAN_SPEED                       "Fan speed"
47
 #define MSG_FLOW                            "Flow"
47
 #define MSG_FLOW                            "Flow"
48
 #define MSG_CONTROL                         "Control"
48
 #define MSG_CONTROL                         "Control"
49
-#define MSG_MIN                             " \002 Min"
50
-#define MSG_MAX                             " \002 Max"
51
-#define MSG_FACTOR                          " \002 Fact"
49
+#define MSG_MIN                             " " STR_THERMOMETER " Min"
50
+#define MSG_MAX                             " " STR_THERMOMETER " Max"
51
+#define MSG_FACTOR                          " " STR_THERMOMETER " Fact"
52
 #define MSG_AUTOTEMP                        "Autotemp"
52
 #define MSG_AUTOTEMP                        "Autotemp"
53
 #define MSG_ON                              "On "
53
 #define MSG_ON                              "On "
54
 #define MSG_OFF                             "Off"
54
 #define MSG_OFF                             "Off"
76
 #define MSG_TEMPERATURE                     "Temperature"
76
 #define MSG_TEMPERATURE                     "Temperature"
77
 #define MSG_MOTION                          "Motion"
77
 #define MSG_MOTION                          "Motion"
78
 #define MSG_VOLUMETRIC                      "Filament"
78
 #define MSG_VOLUMETRIC                      "Filament"
79
-#define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
79
+#define MSG_VOLUMETRIC_ENABLED		          "E in mm" STR_h3
80
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
80
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
81
 #define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
81
 #define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
82
 #define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
82
 #define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"

Loading…
Cancel
Save