forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1449 from AnHardt/LostInTranslation3

Browse Source 
Solid improvements. Merging.
master
Scott Lahteine 10 years ago
parent 0cec0b73bc 2dd43a82b1
commit 137ba7b590
11 changed files with 81 additions and 55 deletions
Show Stats Download Patch File Download Diff File

7
Marlin/Configuration.h
Unescape View File

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

7
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

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

5
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -544,6 +544,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define ABS_PREHEAT_FAN_SPEED 0 // Insert Value between 0 and 255
//LCD and SD support
// Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
//#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
//#define SDSUPPORT // Enable SD Card Support in Hardware Console

5
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -537,6 +537,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
//LCD and SD support
// Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
//#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
//#define SDSUPPORT // Enable SD Card Support in Hardware Console

5
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -538,6 +538,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
//LCD and SD support
// Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
#define SDSUPPORT // Enable SD Card Support in Hardware Console

5
Marlin/example_configurations/delta/Configuration.h
Unescape View File

@ -441,6 +441,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
//LCD and SD support
// Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
//#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
//#define SDSUPPORT // Enable SD Card Support in Hardware Console

5
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -509,6 +509,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
//LCD and SD support
// Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
//#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
#define SDSUPPORT // Enable SD Card Support in Hardware Console

5
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -523,6 +523,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = true; // set to true to invert the logic of
#define ABS_PREHEAT_FAN_SPEED 255 // Insert Value between 0 and 255
//LCD and SD support
// Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44870_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44870_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
//#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
//#define SDSUPPORT // Enable SD Card Support in Hardware Console

44
Marlin/language.h
Unescape View File

@ -161,27 +161,21 @@
// LCD Menu Messages
#define STR_Ae "Ae" // No charset known now. Default will be overruled when we know.
#define STR_ae "ae"
#define STR_Oe "Oe"
#define STR_oe "oe"
#define STR_Ue "Ue"
#define STR_ue "ue"
#define STR_sz "ss"
#define STR_Deg ""
#define STR_THERMOMETER "\302"
#ifdef DISPLAY_CHARSET_DOGM
#define STR_Ae "\304" // U8glib
#define STR_ae "\344"
#define STR_Oe "\326"
#define STR_oe STR_Oe
#define STR_Ue "\334"
#define STR_ue STR_Ue
#define STR_sz "\337"
#define STR_Deg "\260"
// Add your own character. Reference: https://github.com/MarlinFirmware/Marlin/pull/1434 photos
// and https://www.sparkfun.com/datasheets/LCD/HD44780.pdf page 17-18
#ifdef DOGLCD
#define STR_Ae "\304" // 'Ä' U8glib
#define STR_ae "\344" // 'ä'
#define STR_Oe "\326" // 'Ö'
#define STR_oe STR_Oe // 'ö'
#define STR_Ue "\334" // 'Ü'
#define STR_ue STR_Ue // 'ü'
#define STR_sz "\337" // 'ß'
#define STR_h2 "\262" // '²'
#define STR_h3 "\263" // '³'
#define STR_Deg "\260" // '°'
#define STR_THERMOMETER "\377"
#endif
#else
#ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan)
#define STR_ae "\xe1"
#define STR_Ae STR_ae
@ -190,8 +184,10 @@
#define STR_ue "\365"
#define STR_Ue STR_ue
#define STR_sz "\342"
#define STR_h2 "2"
#define STR_h3 "3"
#define STR_Deg "\271"
#define STR_THERMOMETER "\302"
#define STR_THERMOMETER "\002"
#endif
#ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western)
#define STR_Ae "\216"
@ -201,10 +197,12 @@
#define STR_Ue "\212"
#define STR_ue "\201"
#define STR_sz "\160"
#define STR_h2 "\262"
#define STR_h3 "\263"
#define STR_Deg "\337"
#define STR_THERMOMETER "\302"
#define STR_THERMOMETER "\002"
#endif
#endif
/*
#define TESTSTRING000 "\000\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017"
#define TESTSTRING020 "\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"

2
Marlin/language_de.h
Unescape View File

@ -75,7 +75,7 @@
#define MSG_TEMPERATURE "Temperatur"
#define MSG_MOTION "Bewegung"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#define MSG_FILAMENT_SIZE_EXTRUDER_0 "Filament D 1"
#define MSG_FILAMENT_SIZE_EXTRUDER_1 "Filament D 2"
#define MSG_FILAMENT_SIZE_EXTRUDER_2 "Filament D 3"

8
Marlin/language_en.h
Unescape View File

@ -46,9 +46,9 @@
#define MSG_FAN_SPEED "Fan speed"
#define MSG_FLOW "Flow"
#define MSG_CONTROL "Control"
#define MSG_MIN " \002 Min"
#define MSG_MAX " \002 Max"
#define MSG_FACTOR " \002 Fact"
#define MSG_MIN " " STR_THERMOMETER " Min"
#define MSG_MAX " " STR_THERMOMETER " Max"
#define MSG_FACTOR " " STR_THERMOMETER " Fact"
#define MSG_AUTOTEMP "Autotemp"
#define MSG_ON "On "
#define MSG_OFF "Off"
@ -76,7 +76,7 @@
#define MSG_TEMPERATURE "Temperature"
#define MSG_MOTION "Motion"
#define MSG_VOLUMETRIC "Filament"
#define MSG_VOLUMETRIC_ENABLED "E in mm3"
#define MSG_VOLUMETRIC_ENABLED "E in mm" STR_h3
#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"

Write Preview
Loading…
Cancel
Save