Merge pull request #8294 from thinkyhead/bf2_fix_fallback_font

[2.0] Patch non-extended font option
7 years ago · 6718579ccf
parent 6324b09934 e9b1944a67
commit 6718579ccf
11 changed files with 17 additions and 12 deletions
--- a/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
+++ b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
@ -33,18 +33,7 @@
 */
 #include <U8glib.h>

-#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 sysmbols 32 - 127) - saves about 1400 bytes of FLASH
  const u8g_fntpgm_uint8_t ISO10646_1_5x7[] U8G_SECTION(".progmem.ISO10646_1_5x7") = {
--- a/Marlin/src/lcd/language/language_an.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/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
--- a/Marlin/src/lcd/language/language_es.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_eu.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_fr.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_gl.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_nl.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_pl-HD44780.h
+++ b/Marlin/src/lcd/language/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")
--- a/Marlin/src/lcd/language/language_pt-br.h
+++ b/Marlin/src/lcd/language/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"
--- a/Marlin/src/lcd/language/language_pt.h
+++ b/Marlin/src/lcd/language/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"