thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fix non-extended font option

Scott Lahteine 6 years ago
parent
298863c2d0
commit
ddf5d68815
11 changed files with 17 additions and 12 deletions
Unified View Show Diff Stats
  1. 1
    12
      Marlin/dogm_font_data_ISO10646_1.h
  2. 1
    0
      Marlin/language_an.h
  3. 6
    0
      Marlin/language_en.h
  4. 1
    0
      Marlin/language_es.h
  5. 1
    0
      Marlin/language_eu.h
  6. 1
    0
      Marlin/language_fr.h
  7. 1
    0
      Marlin/language_gl.h
  8. 1
    0
      Marlin/language_nl.h
  9. 2
    0
      Marlin/language_pl-HD44780.h
  10. 1
    0
      Marlin/language_pt-br.h
  11. 1
    0
      Marlin/language_pt.h

+ 1
- 12
Marlin/dogm_font_data_ISO10646_1.h View File

33 
 */
 33 
 */
34 
 #include <U8glib.h>
 34 
 #include <U8glib.h>
35
35
36 
-#define not_extended_ISO10646_1_5x7 (defined(LANGUAGE_AN_H) \
37 
-                                  || defined(LANGUAGE_EN_H) \
38 
-                                  || defined(LANGUAGE_ES_H) \
39 
-                                  || defined(LANGUAGE_EU_H) \
40 
-                                  || defined(LANGUAGE_FR_H) \
41 
-                                  || defined(LANGUAGE_GL_H) \
42 
-                                  || defined(LANGUAGE_NL_H) \
43 
-                                  || defined(LANGUAGE_PL_HD44780_H) \
44 
-                                  || defined(LANGUAGE_PT_H) \
45 
-                                  || defined(LANGUAGE_PT_BR_H))
46 
-
47 
-#if (defined(__AVR__) && not_extended_ISO10646_1_5x7)
36 
+#if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
48
37
49 
   //
 38 
   //
50 
   // Reduced font (only symbols 32 - 127) - About 1400 bytes smaller
 39 
   // Reduced font (only symbols 32 - 127) - About 1400 bytes smaller

+ 1
- 0
Marlin/language_an.h View File

31 
 #define LANGUAGE_AN_H
 31 
 #define LANGUAGE_AN_H
32
32
33 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" parada.")
 36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" parada.")
36 
 #define MSG_SD_INSERTED                     _UxGT("Tarcheta mesa")
 37 
 #define MSG_SD_INSERTED                     _UxGT("Tarcheta mesa")

+ 6
- 0
Marlin/language_en.h View File

30 
 #ifndef LANGUAGE_EN_H
 30 
 #ifndef LANGUAGE_EN_H
31 
 #define LANGUAGE_EN_H
 31 
 #define LANGUAGE_EN_H
32
32
33 
+#define en 1234
34 
+#if LCD_LANGUAGE == en
35 
+  #define NOT_EXTENDED_ISO10646_1_5X7
36 
+#endif
37 
+#undef en
38 
+
33 
 #ifndef WELCOME_MSG
 39 
 #ifndef WELCOME_MSG
34 
   #define WELCOME_MSG                         MACHINE_NAME _UxGT(" ready.")
 40 
   #define WELCOME_MSG                         MACHINE_NAME _UxGT(" ready.")
35 
 #endif
 41 
 #endif

+ 1
- 0
Marlin/language_es.h View File

31 
 #define LANGUAGE_ES_H
 31 
 #define LANGUAGE_ES_H
32
32
33 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
 36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
36 
 #define MSG_BACK                            _UxGT("Atras")
 37 
 #define MSG_BACK                            _UxGT("Atras")

+ 1
- 0
Marlin/language_eu.h View File

31 
 #define LANGUAGE_EU_H
 31 
 #define LANGUAGE_EU_H
32
32
33 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prest.")
 36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prest.")
36 
 #define MSG_BACK                            _UxGT("Atzera")
 37 
 #define MSG_BACK                            _UxGT("Atzera")

+ 1
- 0
Marlin/language_fr.h View File

31 
 #define LANGUAGE_FR_H
 31 
 #define LANGUAGE_FR_H
32
32
33 
 #define MAPPER_NON
 33 
 #define MAPPER_NON
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prete.")
 36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" prete.")
36 
 #define MSG_BACK                            _UxGT("Retour")
 37 
 #define MSG_BACK                            _UxGT("Retour")

+ 1
- 0
Marlin/language_gl.h View File

32
32
33 
 #define MAPPER_C2C3
 33 
 #define MAPPER_C2C3
34 
 #define DISPLAY_CHARSET_ISO10646_1
 34 
 #define DISPLAY_CHARSET_ISO10646_1
35 
+#define NOT_EXTENDED_ISO10646_1_5X7
35
36
36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
 37 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" lista.")
37 
 #define MSG_SD_INSERTED                     _UxGT("Tarxeta inserida")
 38 
 #define MSG_SD_INSERTED                     _UxGT("Tarxeta inserida")

+ 1
- 0
Marlin/language_nl.h View File

31 
 #define LANGUAGE_NL_H
 31 
 #define LANGUAGE_NL_H
32
32
33 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gereed.")
 36 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gereed.")
36 
 #define MSG_BACK                            _UxGT("Terug")
 37 
 #define MSG_BACK                            _UxGT("Terug")

+ 2
- 0
Marlin/language_pl-HD44780.h View File

27 
 #ifndef LANGUAGE_PL_HD44780_H
 27 
 #ifndef LANGUAGE_PL_HD44780_H
28 
 #define LANGUAGE_PL_HD44780_H
 28 
 #define LANGUAGE_PL_HD44780_H
29
29
30 
+#define NOT_EXTENDED_ISO10646_1_5X7
31 
+
30 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gotowy.")
 32 
 #define WELCOME_MSG                         MACHINE_NAME _UxGT(" gotowy.")
31 
 #define MSG_SD_INSERTED                     _UxGT("Karta wlozona")
 33 
 #define MSG_SD_INSERTED                     _UxGT("Karta wlozona")
32 
 #define MSG_SD_REMOVED                      _UxGT("Karta usunieta")
 34 
 #define MSG_SD_REMOVED                      _UxGT("Karta usunieta")

+ 1
- 0
Marlin/language_pt-br.h View File

31 
 #define LANGUAGE_PT_BR_H
 31 
 #define LANGUAGE_PT_BR_H
32
32
33 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
36 
 #define MSG_SD_INSERTED                     "Cartao inserido"
 37 
 #define MSG_SD_INSERTED                     "Cartao inserido"

+ 1
- 0
Marlin/language_pt.h View File

31 
 #define LANGUAGE_PT_H
 31 
 #define LANGUAGE_PT_H
32
32
33 
 #define DISPLAY_CHARSET_ISO10646_1
 33 
 #define DISPLAY_CHARSET_ISO10646_1
34 
+#define NOT_EXTENDED_ISO10646_1_5X7
34
35
35 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
 36 
 #define WELCOME_MSG                         MACHINE_NAME " pronto."
36 
 #define MSG_SD_INSERTED                     "Cartao inserido"
 37 
 #define MSG_SD_INSERTED                     "Cartao inserido"

Write Preview
Loading…
Cancel
Save