j.marmier/stw24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display minus sign for negative numbers

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-04-25 14:06:34 +02:00
parent 2e1ec5f467
commit 78048052ca
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TouchGFX/assets/texts/texts.xml
View File

@ -177,7 +177,7 @@
<Typography Id="Chinat_Large" Font="CHINN___.ttf" Size="30" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="8 9-" WildcardCharacterRanges="a-z,A-Z,0-7" /> <Typography Id="Chinat_Large" Font="CHINN___.ttf" Size="30" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="8 9-" WildcardCharacterRanges="a-z,A-Z,0-7" />
<Typography Id="Chinat_Small" Font="CHINN___.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="_ ." WildcardCharacterRanges="0-9,a-z,A-Z" /> <Typography Id="Chinat_Small" Font="CHINN___.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="_ ." WildcardCharacterRanges="0-9,a-z,A-Z" />
<Typography Id="Chinat_Huge" Font="CHINN___.ttf" Size="40" Bpp="4" Direction="LTR" FallbackCharacter="?" /> <Typography Id="Chinat_Huge" Font="CHINN___.ttf" Size="40" Bpp="4" Direction="LTR" FallbackCharacter="?" />
<Typography Id="Numbers" Font="lucon.TTF" Size="50" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters=". ," WildcardCharacterRanges="0-9" /> <Typography Id="Numbers" Font="lucon.TTF" Size="50" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters=". ,-" WildcardCharacterRanges="0-9" />
<Typography Id="Default_Bold" Font="verdanab.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="! &quot;" WildcardCharacterRanges="#-~" /> <Typography Id="Default_Bold" Font="verdanab.ttf" Size="20" Bpp="4" Direction="LTR" FallbackCharacter="?" WildcardCharacters="! &quot;" WildcardCharacterRanges="#-~" />
</Typographies> </Typographies>
</TextDatabase> </TextDatabase>

1
TouchGFX/generated/fonts/UnicodeListlucon_TTF_50_4.txt
View File

@ -1,5 +1,6 @@
32 32
44 44
45
46 46
48 48
49 49

1
TouchGFX/generated/fonts/cache/Font_lucon_TTF_50_4bppCpp.cache vendored
View File

@ -1,6 +1,7 @@
AH:0 BA:1 FC:63 EC:0 FF:0 CF:1 AH:0 BA:1 FC:63 EC:0 FF:0 CF:1
32 32
44 44
45
46 46
48 48
49 49

4
TouchGFX/generated/fonts/src/Font_lucon_TTF_50_4bpp_0.cpp
View File

@ -9,6 +9,10 @@ KEEP extern const uint8_t unicodes_lucon_TTF_50_4bpp_0[] FONT_GLYPH_LOCATION_FLA
0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0x9F, 0xF8, 0xFF, 0xFF, 0x8F, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0x9F, 0xF8, 0xFF, 0xFF, 0x8F,
0x00, 0x90, 0xFF, 0x6F, 0x00, 0xB0, 0xFF, 0x4F, 0x00, 0xE0, 0xFF, 0x0E, 0x00, 0xF5, 0xFF, 0x09, 0x00, 0x90, 0xFF, 0x6F, 0x00, 0xB0, 0xFF, 0x4F, 0x00, 0xE0, 0xFF, 0x0E, 0x00, 0xF5, 0xFF, 0x09,
0x20, 0xFD, 0xFF, 0x02, 0xF6, 0xFF, 0x5F, 0x00, 0xF8, 0xDF, 0x04, 0x00, 0x64, 0x03, 0x00, 0x00, 0x20, 0xFD, 0xFF, 0x02, 0xF6, 0xFF, 0x5F, 0x00, 0xF8, 0xDF, 0x04, 0x00, 0x64, 0x03, 0x00, 0x00,
// Unicode: [0x002D]
0x98, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0x99, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFD, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
// Unicode: [0x002E] // Unicode: [0x002E]
0x32, 0x33, 0x33, 0x23, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0x32, 0x33, 0x33, 0x23, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF,
0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF,

27
TouchGFX/generated/fonts/src/Table_lucon_TTF_50_4bpp.cpp
View File

@ -6,18 +6,19 @@ FONT_TABLE_LOCATION_FLASH_PRAGMA
KEEP extern const touchgfx::GlyphNode glyphs_lucon_TTF_50_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = { KEEP extern const touchgfx::GlyphNode glyphs_lucon_TTF_50_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
{ 0, 0x0020, 0, 0, 0, 0, 30, 0, 0, 0x00 }, { 0, 0x0020, 0, 0, 0, 0, 30, 0, 0, 0x00 },
{ 0, 0x002C, 8, 16, 8, 11, 30, 0, 0, 0x00 }, { 0, 0x002C, 8, 16, 8, 11, 30, 0, 0, 0x00 },
{ 64, 0x002E, 8, 8, 8, 11, 30, 0, 0, 0x00 }, { 64, 0x002D, 20, 4, 17, 5, 30, 0, 0, 0x00 },
{ 96, 0x0030, 26, 38, 37, 2, 30, 0, 0, 0x00 }, { 104, 0x002E, 8, 8, 8, 11, 30, 0, 0, 0x00 },
{ 590, 0x0031, 25, 37, 37, 4, 30, 0, 0, 0x00 }, { 136, 0x0030, 26, 38, 37, 2, 30, 0, 0, 0x00 },
{ 1071, 0x0032, 21, 37, 37, 4, 30, 0, 0, 0x00 }, { 630, 0x0031, 25, 37, 37, 4, 30, 0, 0, 0x00 },
{ 1478, 0x0033, 21, 38, 37, 5, 30, 0, 0, 0x00 }, { 1111, 0x0032, 21, 37, 37, 4, 30, 0, 0, 0x00 },
{ 1896, 0x0034, 26, 36, 36, 2, 30, 0, 0, 0x00 }, { 1518, 0x0033, 21, 38, 37, 5, 30, 0, 0, 0x00 },
{ 2364, 0x0035, 20, 37, 36, 6, 30, 0, 0, 0x00 }, { 1936, 0x0034, 26, 36, 36, 2, 30, 0, 0, 0x00 },
{ 2734, 0x0036, 24, 38, 37, 4, 30, 0, 0, 0x00 }, { 2404, 0x0035, 20, 37, 36, 6, 30, 0, 0, 0x00 },
{ 3190, 0x0037, 23, 36, 36, 4, 30, 0, 0, 0x00 }, { 2774, 0x0036, 24, 38, 37, 4, 30, 0, 0, 0x00 },
{ 3622, 0x0038, 24, 38, 37, 3, 30, 0, 0, 0x00 }, { 3230, 0x0037, 23, 36, 36, 4, 30, 0, 0, 0x00 },
{ 4078, 0x0039, 25, 38, 37, 3, 30, 0, 0, 0x00 }, { 3662, 0x0038, 24, 38, 37, 3, 30, 0, 0, 0x00 },
{ 4572, 0x003F, 23, 37, 37, 4, 30, 0, 0, 0x00 } { 4118, 0x0039, 25, 38, 37, 3, 30, 0, 0, 0x00 },
{ 4612, 0x003F, 23, 37, 37, 4, 30, 0, 0, 0x00 }
}; };
// lucon_TTF_50_4bpp // lucon_TTF_50_4bpp
@ -35,6 +36,6 @@ touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp();
touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp() touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp()
{ {
static touchgfx::GeneratedFont lucon_TTF_50_4bpp(glyphs_lucon_TTF_50_4bpp, 14, 58, 50, 0, 0, 4, 1, 0, 0, unicodes_lucon_TTF_50_4bpp, kerning_lucon_TTF_50_4bpp, 63, 0, 0, 0); static touchgfx::GeneratedFont lucon_TTF_50_4bpp(glyphs_lucon_TTF_50_4bpp, 15, 58, 50, 0, 0, 4, 1, 0, 0, unicodes_lucon_TTF_50_4bpp, kerning_lucon_TTF_50_4bpp, 63, 0, 0, 0);
return lucon_TTF_50_4bpp; return lucon_TTF_50_4bpp;
} }