From 8dce5a664409365ad6216766083a2163980dda9f Mon Sep 17 00:00:00 2001 From: AnHardt Date: Sun, 1 Feb 2015 13:09:59 +0100 Subject: [PATCH] Improve new charset featur. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Select DOGM-displays automaticly. Give hint where to find charsets. Add '²' and '³' characters. --- Marlin/language.h | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index dcaddede51..ef6bf2e254 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -161,25 +161,19 @@ // 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 #ifdef DISPLAY_CHARSET_HD44870_JAPAN // HD44870 ROM Code: A00 (Japan) @@ -190,6 +184,8 @@ #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" #endif @@ -201,6 +197,8 @@ #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" #endif