diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index f5c218dc7f70372ab55807597eacc910e0fa9d75..1321559049d72dd16629f49591903b5c7e6f0061 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -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) diff --git a/Marlin/example_configurations/Hephestos/Configuration.h b/Marlin/example_configurations/Hephestos/Configuration.h index 4694afd4530e6a6ec0a6385ffd7143deb619fe43..64e117322acbe0c33683d891c322d4eaf8228eef 100644 --- a/Marlin/example_configurations/Hephestos/Configuration.h +++ b/Marlin/example_configurations/Hephestos/Configuration.h @@ -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) diff --git a/Marlin/example_configurations/K8200/Configuration.h b/Marlin/example_configurations/K8200/Configuration.h index 888835e7b15bd628a08cce8c8369949343ac116a..baa6061d6238aa228f527dab7199e92fb435bcd5 100644 --- a/Marlin/example_configurations/K8200/Configuration.h +++ b/Marlin/example_configurations/K8200/Configuration.h @@ -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 diff --git a/Marlin/example_configurations/SCARA/Configuration.h b/Marlin/example_configurations/SCARA/Configuration.h index 7d52562c44decaa0cdf551446461ff37e7e73216..43b529570901b6bea91b5e4a1f487bd2564bcec8 100644 --- a/Marlin/example_configurations/SCARA/Configuration.h +++ b/Marlin/example_configurations/SCARA/Configuration.h @@ -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 diff --git a/Marlin/example_configurations/WITBOX/Configuration.h b/Marlin/example_configurations/WITBOX/Configuration.h index dea6c72a0132922a33b9151773fc995440d2cb6b..e5b5b6810257e222947d8ac7cc0a6a2487dd04ba 100644 --- a/Marlin/example_configurations/WITBOX/Configuration.h +++ b/Marlin/example_configurations/WITBOX/Configuration.h @@ -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 diff --git a/Marlin/example_configurations/delta/Configuration.h b/Marlin/example_configurations/delta/Configuration.h index 347c3460909054d5afca13788d9ed5a662aeddec..1b19b1ff4d5750c1328e8374d03481228ab3bfc7 100644 --- a/Marlin/example_configurations/delta/Configuration.h +++ b/Marlin/example_configurations/delta/Configuration.h @@ -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 diff --git a/Marlin/example_configurations/makibox/Configuration.h b/Marlin/example_configurations/makibox/Configuration.h index 0781ed60a67cb7805a1b3151031d2f0d8a783f56..f2af1b2107cb561683871e40823d24521a533fb0 100644 --- a/Marlin/example_configurations/makibox/Configuration.h +++ b/Marlin/example_configurations/makibox/Configuration.h @@ -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 diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration.h b/Marlin/example_configurations/tvrrug/Round2/Configuration.h index b362753e81706568a3d9ff8f35db07c50775a4ce..d99d6100c71542401b007de936fe03ffdd53a1d6 100644 --- a/Marlin/example_configurations/tvrrug/Round2/Configuration.h +++ b/Marlin/example_configurations/tvrrug/Round2/Configuration.h @@ -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 diff --git a/Marlin/language.h b/Marlin/language.h index dcaddede514605aec3d51ba06ec3c4387aeca104..97f53b541af551c07f53bff6d39f332e99744926 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -161,50 +161,48 @@ // 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" +#else + #ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan) + #define STR_ae "\xe1" + #define STR_Ae STR_ae + #define STR_oe "\357" + #define STR_Oe STR_oe + #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 "\002" + #endif + #ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western) + #define STR_Ae "\216" + #define STR_ae "\204" + #define STR_Oe "\211" + #define STR_oe "\204" + #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 "\002" + #endif #endif -#ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan) - #define STR_ae "\xe1" - #define STR_Ae STR_ae - #define STR_oe "\357" - #define STR_Oe STR_oe - #define STR_ue "\365" - #define STR_Ue STR_ue - #define STR_sz "\342" - #define STR_Deg "\271" - #define STR_THERMOMETER "\302" -#endif -#ifdef DISPLAY_CHARSET_HD44870_WESTERN // HD44870 ROM Code: A02 (Western) - #define STR_Ae "\216" - #define STR_ae "\204" - #define STR_Oe "\211" - #define STR_oe "\204" - #define STR_Ue "\212" - #define STR_ue "\201" - #define STR_sz "\160" - #define STR_Deg "\337" - #define STR_THERMOMETER "\302" -#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" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index bbad53368e6004cb5b5dfbadf2533a62a9e31041..d41df208dfaeadbce11ce020804905bea14b23f2 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -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" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 55f784e8ac43243fd9ad2945788a89204f712840..49a22337dd58771652c35a820ca562ce43639ac9 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -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"