Browse Source
Merge pull request #8294 from thinkyhead/bf2_fix_fallback_font
[2.0] Patch non-extended font option
pull/1/head
Scott Lahteine
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with
17 additions and
12 deletions
-
Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h
-
Marlin/src/lcd/language/language_an.h
-
Marlin/src/lcd/language/language_en.h
-
Marlin/src/lcd/language/language_es.h
-
Marlin/src/lcd/language/language_eu.h
-
Marlin/src/lcd/language/language_fr.h
-
Marlin/src/lcd/language/language_gl.h
-
Marlin/src/lcd/language/language_nl.h
-
Marlin/src/lcd/language/language_pl-HD44780.h
-
Marlin/src/lcd/language/language_pt-br.h
-
Marlin/src/lcd/language/language_pt.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") = { |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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 |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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") |
|
|
|
|
|
@ -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" |
|
|
|
|
|
@ -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" |
|
|
|