diff --git a/Marlin/dogm_font_data_ISO10646_1.h b/Marlin/dogm_font_data_ISO10646_1.h index 10b7c93ad..5e12ea86f 100644 --- a/Marlin/dogm_font_data_ISO10646_1.h +++ b/Marlin/dogm_font_data_ISO10646_1.h @@ -33,18 +33,7 @@ */ #include -#define not_extended_ISO10646_1_5x7 (defined(LANGUAGE_AN_H) \ - || defined(LANGUAGE_EN_H) \ - || defined(LANGUAGE_ES_H) \ - || defined(LANGUAGE_EU_H) \ - || defined(LANGUAGE_FR_H) \ - || defined(LANGUAGE_GL_H) \ - || defined(LANGUAGE_NL_H) \ - || defined(LANGUAGE_PL_HD44780_H) \ - || defined(LANGUAGE_PT_H) \ - || defined(LANGUAGE_PT_BR_H)) - -#if (defined(__AVR__) && not_extended_ISO10646_1_5x7) +#if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7) // // Reduced font (only symbols 32 - 127) - About 1400 bytes smaller diff --git a/Marlin/language_an.h b/Marlin/language_an.h index be3b04b3b..3ab4d1d25 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -31,6 +31,7 @@ #define LANGUAGE_AN_H #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME _UxGT(" parada.") #define MSG_SD_INSERTED _UxGT("Tarcheta mesa") diff --git a/Marlin/language_en.h b/Marlin/language_en.h index 9c3b0b771..3b4027ba3 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -30,6 +30,12 @@ #ifndef LANGUAGE_EN_H #define LANGUAGE_EN_H +#define en 1234 +#if LCD_LANGUAGE == en + #define NOT_EXTENDED_ISO10646_1_5X7 +#endif +#undef en + #ifndef WELCOME_MSG #define WELCOME_MSG MACHINE_NAME _UxGT(" ready.") #endif diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 2983cf249..248ecb193 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -31,6 +31,7 @@ #define LANGUAGE_ES_H #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME _UxGT(" lista.") #define MSG_BACK _UxGT("Atras") diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index c4fe4ba49..5be54c546 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -31,6 +31,7 @@ #define LANGUAGE_EU_H #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME _UxGT(" prest.") #define MSG_BACK _UxGT("Atzera") diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index f96426bd2..e89abcd5d 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -31,6 +31,7 @@ #define LANGUAGE_FR_H #define MAPPER_NON +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME _UxGT(" prete.") #define MSG_BACK _UxGT("Retour") diff --git a/Marlin/language_gl.h b/Marlin/language_gl.h index 4797297f0..f8d50035e 100644 --- a/Marlin/language_gl.h +++ b/Marlin/language_gl.h @@ -32,6 +32,7 @@ #define MAPPER_C2C3 #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME _UxGT(" lista.") #define MSG_SD_INSERTED _UxGT("Tarxeta inserida") diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index 7a6050187..11f612de8 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -31,6 +31,7 @@ #define LANGUAGE_NL_H #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME _UxGT(" gereed.") #define MSG_BACK _UxGT("Terug") diff --git a/Marlin/language_pl-HD44780.h b/Marlin/language_pl-HD44780.h index 67ecaac6c..d14cf9d77 100644 --- a/Marlin/language_pl-HD44780.h +++ b/Marlin/language_pl-HD44780.h @@ -27,6 +27,8 @@ #ifndef LANGUAGE_PL_HD44780_H #define LANGUAGE_PL_HD44780_H +#define NOT_EXTENDED_ISO10646_1_5X7 + #define WELCOME_MSG MACHINE_NAME _UxGT(" gotowy.") #define MSG_SD_INSERTED _UxGT("Karta wlozona") #define MSG_SD_REMOVED _UxGT("Karta usunieta") diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index fa92224f3..5ba295602 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -31,6 +31,7 @@ #define LANGUAGE_PT_BR_H #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME " pronto." #define MSG_SD_INSERTED "Cartao inserido" diff --git a/Marlin/language_pt.h b/Marlin/language_pt.h index 06c468489..9896005b9 100644 --- a/Marlin/language_pt.h +++ b/Marlin/language_pt.h @@ -31,6 +31,7 @@ #define LANGUAGE_PT_H #define DISPLAY_CHARSET_ISO10646_1 +#define NOT_EXTENDED_ISO10646_1_5X7 #define WELCOME_MSG MACHINE_NAME " pronto." #define MSG_SD_INSERTED "Cartao inserido"