forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8295 from thinkyhead/bf1_fix_fallback_font

Browse Source 
[1.1] Fix non-extended font option
master
Scott Lahteine 7 years ago committed by GitHub
parent 298863c2d0 ddf5d68815
commit 20b57f9d38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File

13
Marlin/dogm_font_data_ISO10646_1.h
Unescape View File

@ -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 symbols 32 - 127) - About 1400 bytes smaller

1
Marlin/language_an.h
Unescape View File

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

6
Marlin/language_en.h
Unescape View File

@ -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

1
Marlin/language_es.h
Unescape View File

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

1
Marlin/language_eu.h
Unescape View File

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

1
Marlin/language_fr.h
Unescape View File

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

1
Marlin/language_gl.h
Unescape View File

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

1
Marlin/language_nl.h
Unescape View File

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

2
Marlin/language_pl-HD44780.h
Unescape View File

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

1
Marlin/language_pt-br.h
Unescape View File

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

1
Marlin/language_pt.h
Unescape View File

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

Write Preview
Loading…
Cancel
Save