Another fonts code simplification
This commit is contained in:
@@ -778,6 +778,7 @@ endif
|
|||||||
|
|
||||||
ifneq ($(FONT), STD)
|
ifneq ($(FONT), STD)
|
||||||
CPPDEFS += -DFONT_$(FONT)
|
CPPDEFS += -DFONT_$(FONT)
|
||||||
|
EXTRAINCDIRS += fonts/$(shell sh -c "echo $(FONT) | tr '[:upper:]' '[:lower:]'")
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(THR_TRACE), YES)
|
ifeq ($(THR_TRACE), YES)
|
||||||
@@ -978,6 +979,7 @@ CPPFLAGS += $(CPPDEFS)
|
|||||||
CPPFLAGS += -Wall
|
CPPFLAGS += -Wall
|
||||||
CPPFLAGS += -fno-exceptions
|
CPPFLAGS += -fno-exceptions
|
||||||
CPPFLAGS += -Wno-strict-aliasing
|
CPPFLAGS += -Wno-strict-aliasing
|
||||||
|
EXTRAINCDIRS += fonts/std
|
||||||
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
|
||||||
|
|
||||||
MATH_LIB = -lm
|
MATH_LIB = -lm
|
||||||
|
|||||||
+36
-139
@@ -507,204 +507,101 @@ const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR;
|
|||||||
const pm_char STR_ABOUT_PARENTS_4[] PROGMEM = TR_ABOUT_PARENTS_4;
|
const pm_char STR_ABOUT_PARENTS_4[] PROGMEM = TR_ABOUT_PARENTS_4;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(FONT_SQT5)
|
|
||||||
|
|
||||||
const pm_uchar font_5x7[] PROGMEM = {
|
const pm_uchar font_5x7[] PROGMEM = {
|
||||||
#include "fonts/sqt5/font_05x07.lbm"
|
#include "font_05x07.lbm"
|
||||||
#if defined(TRANSLATIONS_DE)
|
#if defined(TRANSLATIONS_DE)
|
||||||
#include "fonts/std/font_de_05x07.lbm"
|
#include "font_de_05x07.lbm"
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
#elif defined(TRANSLATIONS_CZ)
|
||||||
#include "fonts/sqt5/font_cz_05x07.lbm"
|
#include "font_cz_05x07.lbm"
|
||||||
#elif defined(TRANSLATIONS_ES)
|
#elif defined(TRANSLATIONS_ES)
|
||||||
#include "fonts/std/font_es_05x07.lbm"
|
#include "font_es_05x07.lbm"
|
||||||
#elif defined(TRANSLATIONS_FR)
|
#elif defined(TRANSLATIONS_FR)
|
||||||
#include "fonts/std/font_fr_05x07.lbm"
|
#include "font_fr_05x07.lbm"
|
||||||
#elif defined(TRANSLATIONS_IT)
|
#elif defined(TRANSLATIONS_IT)
|
||||||
#include "fonts/std/font_it_05x07.lbm"
|
#include "font_it_05x07.lbm"
|
||||||
#elif defined(TRANSLATIONS_PT)
|
#elif defined(TRANSLATIONS_PT)
|
||||||
#include "fonts/std/font_pt_05x07.lbm"
|
#include "font_pt_05x07.lbm"
|
||||||
#elif defined(TRANSLATIONS_SE)
|
#elif defined(TRANSLATIONS_SE)
|
||||||
#include "fonts/std/font_se_05x07.lbm"
|
#include "font_se_05x07.lbm"
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
const pm_uchar font_10x14[] PROGMEM = {
|
const pm_uchar font_10x14[] PROGMEM = {
|
||||||
#include "fonts/sqt5/font_10x14_compressed.lbm"
|
#include "font_10x14_compressed.lbm"
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
#if defined(TRANSLATIONS_DE)
|
#if defined(TRANSLATIONS_DE)
|
||||||
#include "fonts/std/font_de_10x14.lbm"
|
#include "font_de_10x14.lbm"
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
#elif defined(TRANSLATIONS_CZ)
|
||||||
#include "fonts/sqt5/font_cz_10x14.lbm"
|
#include "font_cz_10x14.lbm"
|
||||||
#elif defined(TRANSLATIONS_ES)
|
#elif defined(TRANSLATIONS_ES)
|
||||||
#include "fonts/std/font_es_10x14.lbm"
|
#include "font_es_10x14.lbm"
|
||||||
#elif defined(TRANSLATIONS_FR)
|
#elif defined(TRANSLATIONS_FR)
|
||||||
#include "fonts/std/font_fr_10x14.lbm"
|
#include "font_fr_10x14.lbm"
|
||||||
#elif defined(TRANSLATIONS_IT)
|
#elif defined(TRANSLATIONS_IT)
|
||||||
#include "fonts/std/font_it_10x14.lbm"
|
#include "font_it_10x14.lbm"
|
||||||
#elif defined(TRANSLATIONS_PT)
|
#elif defined(TRANSLATIONS_PT)
|
||||||
#include "fonts/std/font_pt_10x14.lbm"
|
#include "font_pt_10x14.lbm"
|
||||||
#elif defined(TRANSLATIONS_SE)
|
#elif defined(TRANSLATIONS_SE)
|
||||||
#include "fonts/std/font_se_10x14.lbm"
|
#include "font_se_10x14.lbm"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
const pm_uchar font_3x5[] PROGMEM = {
|
const pm_uchar font_3x5[] PROGMEM = {
|
||||||
#include "fonts/std/font_03x05.lbm"
|
#include "font_03x05.lbm"
|
||||||
};
|
};
|
||||||
|
|
||||||
const pm_uchar font_4x6[] PROGMEM = {
|
const pm_uchar font_4x6[] PROGMEM = {
|
||||||
#include "fonts/sqt5/font_04x06.lbm"
|
#include "font_04x06.lbm"
|
||||||
#if defined(TRANSLATIONS_DE)
|
#if defined(TRANSLATIONS_DE)
|
||||||
#include "fonts/std/font_de_04x06.lbm"
|
#include "font_de_04x06.lbm"
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
#elif defined(TRANSLATIONS_CZ)
|
||||||
#include "fonts/sqt5/font_cz_04x06.lbm"
|
#include "font_cz_04x06.lbm"
|
||||||
#elif defined(TRANSLATIONS_ES)
|
#elif defined(TRANSLATIONS_ES)
|
||||||
#include "fonts/std/font_es_04x06.lbm"
|
#include "font_es_04x06.lbm"
|
||||||
#elif defined(TRANSLATIONS_FR)
|
#elif defined(TRANSLATIONS_FR)
|
||||||
#include "fonts/std/font_fr_04x06.lbm"
|
#include "font_fr_04x06.lbm"
|
||||||
#elif defined(TRANSLATIONS_IT)
|
#elif defined(TRANSLATIONS_IT)
|
||||||
#include "fonts/std/font_it_04x06.lbm"
|
#include "font_it_04x06.lbm"
|
||||||
#elif defined(TRANSLATIONS_PT)
|
#elif defined(TRANSLATIONS_PT)
|
||||||
#include "fonts/std/font_pt_04x06.lbm"
|
#include "font_pt_04x06.lbm"
|
||||||
#elif defined(TRANSLATIONS_SE)
|
#elif defined(TRANSLATIONS_SE)
|
||||||
#include "fonts/std/font_se_04x06.lbm"
|
#include "font_se_04x06.lbm"
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
const pm_uchar font_8x10[] PROGMEM = {
|
const pm_uchar font_8x10[] PROGMEM = {
|
||||||
#include "fonts/sqt5/font_08x10.lbm"
|
#include "font_08x10.lbm"
|
||||||
#if defined(TRANSLATIONS_DE)
|
#if defined(TRANSLATIONS_DE)
|
||||||
#include "fonts/std/font_de_08x10.lbm"
|
#include "font_de_08x10.lbm"
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
#elif defined(TRANSLATIONS_CZ)
|
||||||
#include "fonts/sqt5/font_cz_08x10.lbm"
|
#include "font_cz_08x10.lbm"
|
||||||
#elif defined(TRANSLATIONS_ES)
|
#elif defined(TRANSLATIONS_ES)
|
||||||
#include "fonts/std/font_es_08x10.lbm"
|
#include "font_es_08x10.lbm"
|
||||||
#elif defined(TRANSLATIONS_FR)
|
#elif defined(TRANSLATIONS_FR)
|
||||||
#include "fonts/std/font_fr_08x10.lbm"
|
#include "font_fr_08x10.lbm"
|
||||||
#elif defined(TRANSLATIONS_IT)
|
#elif defined(TRANSLATIONS_IT)
|
||||||
#include "fonts/std/font_it_08x10.lbm"
|
#include "font_it_08x10.lbm"
|
||||||
#elif defined(TRANSLATIONS_PT)
|
#elif defined(TRANSLATIONS_PT)
|
||||||
#include "fonts/std/font_pt_08x10.lbm"
|
#include "font_pt_08x10.lbm"
|
||||||
#elif defined(TRANSLATIONS_SE)
|
#elif defined(TRANSLATIONS_SE)
|
||||||
#include "fonts/std/font_se_08x10.lbm"
|
#include "font_se_08x10.lbm"
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
const pm_uchar font_4x6_extra[] PROGMEM = {
|
const pm_uchar font_4x6_extra[] PROGMEM = {
|
||||||
#include "fonts/std/font_04x06_extra.lbm"
|
#include "font_04x06_extra.lbm"
|
||||||
};
|
};
|
||||||
|
|
||||||
const pm_uchar font_5x7_extra[] PROGMEM = {
|
const pm_uchar font_5x7_extra[] PROGMEM = {
|
||||||
#include "fonts/std/font_05x07_extra.lbm"
|
#include "font_05x07_extra.lbm"
|
||||||
};
|
};
|
||||||
|
|
||||||
const pm_uchar font_10x14_extra[] PROGMEM = {
|
const pm_uchar font_10x14_extra[] PROGMEM = {
|
||||||
#include "fonts/std/font_10x14_extra.lbm"
|
#include "font_10x14_extra.lbm"
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
const pm_uchar font_5x7[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_05x07.lbm"
|
|
||||||
#if defined(TRANSLATIONS_DE)
|
|
||||||
#include "fonts/std/font_de_05x07.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
|
||||||
#include "fonts/std/font_cz_05x07.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_ES)
|
|
||||||
#include "fonts/std/font_es_05x07.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_FR)
|
|
||||||
#include "fonts/std/font_fr_05x07.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_IT)
|
|
||||||
#include "fonts/std/font_it_05x07.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_PT)
|
|
||||||
#include "fonts/std/font_pt_05x07.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_SE)
|
|
||||||
#include "fonts/std/font_se_05x07.lbm"
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
const pm_uchar font_10x14[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_10x14_compressed.lbm"
|
|
||||||
#if defined(CPUARM)
|
|
||||||
#if defined(TRANSLATIONS_DE)
|
|
||||||
#include "fonts/std/font_de_10x14.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
|
||||||
#include "fonts/std/font_cz_10x14.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_ES)
|
|
||||||
#include "fonts/std/font_es_10x14.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_FR)
|
|
||||||
#include "fonts/std/font_fr_10x14.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_IT)
|
|
||||||
#include "fonts/std/font_it_10x14.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_PT)
|
|
||||||
#include "fonts/std/font_pt_10x14.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_SE)
|
|
||||||
#include "fonts/std/font_se_10x14.lbm"
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
#if defined(CPUARM)
|
|
||||||
const pm_uchar font_3x5[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_03x05.lbm"
|
|
||||||
};
|
|
||||||
|
|
||||||
const pm_uchar font_4x6[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_04x06.lbm"
|
|
||||||
#if defined(TRANSLATIONS_DE)
|
|
||||||
#include "fonts/std/font_de_04x06.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
|
||||||
#include "fonts/std/font_cz_04x06.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_ES)
|
|
||||||
#include "fonts/std/font_es_04x06.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_FR)
|
|
||||||
#include "fonts/std/font_fr_04x06.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_IT)
|
|
||||||
#include "fonts/std/font_it_04x06.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_PT)
|
|
||||||
#include "fonts/std/font_pt_04x06.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_SE)
|
|
||||||
#include "fonts/std/font_se_04x06.lbm"
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
const pm_uchar font_8x10[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_08x10.lbm"
|
|
||||||
#if defined(TRANSLATIONS_DE)
|
|
||||||
#include "fonts/std/font_de_08x10.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_CZ)
|
|
||||||
#include "fonts/std/font_cz_08x10.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_ES)
|
|
||||||
#include "fonts/std/font_es_08x10.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_FR)
|
|
||||||
#include "fonts/std/font_fr_08x10.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_IT)
|
|
||||||
#include "fonts/std/font_it_08x10.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_PT)
|
|
||||||
#include "fonts/std/font_pt_08x10.lbm"
|
|
||||||
#elif defined(TRANSLATIONS_SE)
|
|
||||||
#include "fonts/std/font_se_08x10.lbm"
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
const pm_uchar font_4x6_extra[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_04x06_extra.lbm"
|
|
||||||
};
|
|
||||||
|
|
||||||
const pm_uchar font_5x7_extra[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_05x07_extra.lbm"
|
|
||||||
};
|
|
||||||
|
|
||||||
const pm_uchar font_10x14_extra[] PROGMEM = {
|
|
||||||
#include "fonts/std/font_10x14_extra.lbm"
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user