Merge pull request #8295 from thinkyhead/bf1_fix_fallback_font

[1.1] Fix non-extended font option

Marlin/dogm_font_data_ISO10646_1.h

@@ -33,18 +33,7 @@
 */
 #include <U8glib.h>
 
-#define not_extended_ISO10646_1_5x7 (defined(LANGUAGE_AN_H) \
+#if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
-                                  || 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)
 
   //
   // Reduced font (only symbols 32 - 127) - About 1400 bytes smaller

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")

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

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")

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")

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")

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")

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")

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")

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"

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"