Add Inter Fonts

This commit is contained in:
2024-06-12 13:27:38 +02:00
parent b0ef96e390
commit 51f6fa6014
631 changed files with 117874 additions and 2514 deletions

View File

@ -5,24 +5,22 @@
#include <fonts/GeneratedFont.hpp>
#include <texts/TypedTextDatabase.hpp>
extern touchgfx::GeneratedFont& getFont_verdana_20_4bpp();
extern touchgfx::GeneratedFont& getFont_inter_20_4bpp();
extern touchgfx::GeneratedFont& getFont_CHINN____30_4bpp();
extern touchgfx::GeneratedFont& getFont_CHINN____20_4bpp();
extern touchgfx::GeneratedFont& getFont_CHINN____40_4bpp();
extern touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp();
extern touchgfx::GeneratedFont& getFont_verdanab_20_4bpp();
extern touchgfx::GeneratedFont& getFont_lucon_TTF_33_4bpp();
extern touchgfx::GeneratedFont& getFont_lucon_TTF_20_4bpp();
extern touchgfx::GeneratedFont& getFont_intersb_50_4bpp();
extern touchgfx::GeneratedFont& getFont_interb_20_4bpp();
extern touchgfx::GeneratedFont& getFont_inter_33_4bpp();
const touchgfx::Font* touchgfx_fonts[] = {
&(getFont_verdana_20_4bpp()),
&(getFont_inter_20_4bpp()),
&(getFont_CHINN____30_4bpp()),
&(getFont_CHINN____20_4bpp()),
&(getFont_CHINN____40_4bpp()),
&(getFont_lucon_TTF_50_4bpp()),
&(getFont_verdanab_20_4bpp()),
&(getFont_lucon_TTF_33_4bpp()),
&(getFont_lucon_TTF_20_4bpp())
&(getFont_intersb_50_4bpp()),
&(getFont_interb_20_4bpp()),
&(getFont_inter_33_4bpp())
};
extern const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[];
@ -30,14 +28,14 @@ extern const touchgfx::TypedText::TypedTextData* const typedTextDatabaseArray[];
TEXT_LOCATION_FLASH_PRAGMA
const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
@ -95,21 +93,21 @@ const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_F
{ 1, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 1, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
@ -126,14 +124,14 @@ const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_F
};
TEXT_LOCATION_FLASH_PRAGMA
const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
@ -191,21 +189,21 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT
{ 1, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 7, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 1, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
@ -255,7 +253,7 @@ void resetFont(touchgfx::FontId fontId)
switch (fontId)
{
case 0:
touchgfx_fonts[0] = &(getFont_verdana_20_4bpp());
touchgfx_fonts[0] = &(getFont_inter_20_4bpp());
break;
case 1:
touchgfx_fonts[1] = &(getFont_CHINN____30_4bpp());
@ -267,16 +265,13 @@ void resetFont(touchgfx::FontId fontId)
touchgfx_fonts[3] = &(getFont_CHINN____40_4bpp());
break;
case 4:
touchgfx_fonts[4] = &(getFont_lucon_TTF_50_4bpp());
touchgfx_fonts[4] = &(getFont_intersb_50_4bpp());
break;
case 5:
touchgfx_fonts[5] = &(getFont_verdanab_20_4bpp());
touchgfx_fonts[5] = &(getFont_interb_20_4bpp());
break;
case 6:
touchgfx_fonts[6] = &(getFont_lucon_TTF_33_4bpp());
break;
case 7:
touchgfx_fonts[7] = &(getFont_lucon_TTF_20_4bpp());
touchgfx_fonts[6] = &(getFont_inter_33_4bpp());
break;
}
}