new ihm
This commit is contained in:
thomas committed
1 parent
2b9e574ba9
commit
b119a6abd7
583 files changed
+224175
-218466
No files matched your search
@@ -1,4 +1,6 @@
|
||||
32
|
||||
37
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
@@ -34,5 +36,26 @@
|
||||
86
|
||||
88
|
||||
97
|
||||
98
|
||||
99
|
||||
100
|
||||
101
|
||||
103
|
||||
104
|
||||
105
|
||||
106
|
||||
108
|
||||
109
|
||||
110
|
||||
111
|
||||
112
|
||||
114
|
||||
115
|
||||
116
|
||||
117
|
||||
118
|
||||
120
|
||||
122
|
||||
122
|
||||
201
|
||||
224
|
||||
233
|
||||
@@ -1,3 +1,4 @@
|
||||
32
|
||||
43
|
||||
45
|
||||
48
|
||||
@@ -9,11 +10,13 @@
|
||||
67
|
||||
68
|
||||
69
|
||||
70
|
||||
72
|
||||
73
|
||||
76
|
||||
78
|
||||
79
|
||||
80
|
||||
81
|
||||
82
|
||||
83
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4]],"generate_font_format":"0"}
|
||||
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Medium","arial.ttf",28,4],["Small","arial.ttf",10,4]],"generate_font_format":"0"}
|
||||
@@ -1 +1 @@
|
||||
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4]],"generate_font_format":"0"}
|
||||
{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Medium","arial.ttf",28,4],["Small","arial.ttf",10,4]],"generate_font_format":"0"}
|
||||
@@ -1,5 +1,7 @@
|
||||
AH:0 BA:1 FC:63 EC:0 FF:0 CF:0 FU:0 ZB:0
|
||||
32
|
||||
37
|
||||
43
|
||||
44
|
||||
45
|
||||
46
|
||||
@@ -35,5 +37,26 @@ AH:0 BA:1 FC:63 EC:0 FF:0 CF:0 FU:0 ZB:0
|
||||
86
|
||||
88
|
||||
97
|
||||
98
|
||||
99
|
||||
100
|
||||
101
|
||||
103
|
||||
104
|
||||
105
|
||||
106
|
||||
108
|
||||
109
|
||||
110
|
||||
111
|
||||
112
|
||||
114
|
||||
115
|
||||
116
|
||||
117
|
||||
118
|
||||
120
|
||||
122
|
||||
201
|
||||
224
|
||||
233
|
||||
@@ -1,4 +1,5 @@
|
||||
AH:0 BA:1 FC:63 EC:0 FF:0 CF:0 FU:0 ZB:0
|
||||
32
|
||||
43
|
||||
45
|
||||
48
|
||||
@@ -10,11 +11,13 @@ AH:0 BA:1 FC:63 EC:0 FF:0 CF:0 FU:0 ZB:0
|
||||
67
|
||||
68
|
||||
69
|
||||
70
|
||||
72
|
||||
73
|
||||
76
|
||||
78
|
||||
79
|
||||
80
|
||||
81
|
||||
82
|
||||
83
|
||||
|
||||
@@ -15,15 +15,17 @@ struct Typography
|
||||
{
|
||||
static const touchgfx::FontId DEFAULT = 0;
|
||||
static const touchgfx::FontId LARGE = 1;
|
||||
static const touchgfx::FontId SMALL = 2;
|
||||
static const touchgfx::FontId MEDIUM = 2;
|
||||
static const touchgfx::FontId SMALL = 3;
|
||||
};
|
||||
|
||||
struct TypographyFontIndex
|
||||
{
|
||||
static const touchgfx::FontId DEFAULT = 0; // arial_20_4bpp
|
||||
static const touchgfx::FontId LARGE = 1; // arial_40_4bpp
|
||||
static const touchgfx::FontId SMALL = 2; // arial_10_4bpp
|
||||
static const uint16_t NUMBER_OF_FONTS = 3;
|
||||
static const touchgfx::FontId MEDIUM = 2; // arial_28_4bpp
|
||||
static const touchgfx::FontId SMALL = 3; // arial_10_4bpp
|
||||
static const uint16_t NUMBER_OF_FONTS = 4;
|
||||
};
|
||||
|
||||
class ApplicationFontProvider : public touchgfx::FontProvider
|
||||
|
||||
@@ -15,9 +15,12 @@ touchgfx::Font* ApplicationFontProvider::getFont(touchgfx::FontId typography)
|
||||
case Typography::LARGE:
|
||||
// arial_40_4bpp
|
||||
return const_cast<touchgfx::Font*>(TypedTextDatabase::getFonts()[1]);
|
||||
case Typography::MEDIUM:
|
||||
// arial_28_4bpp
|
||||
return const_cast<touchgfx::Font*>(TypedTextDatabase::getFonts()[2]);
|
||||
case Typography::SMALL:
|
||||
// arial_10_4bpp
|
||||
return const_cast<touchgfx::Font*>(TypedTextDatabase::getFonts()[2]);
|
||||
return const_cast<touchgfx::Font*>(TypedTextDatabase::getFonts()[3]);
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -4,6 +4,20 @@ FONT_GLYPH_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const uint8_t unicodes_arial_20_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = {
|
||||
// Unicode: [0x0020, space]
|
||||
// (Has no glyph data)
|
||||
// Unicode: [0x0025, percent]
|
||||
0x70, 0xEE, 0x1A, 0x00, 0x00, 0xF3, 0x03, 0x00, 0xF5, 0x58, 0xBD, 0x00, 0x00, 0xBB, 0x00, 0x00,
|
||||
0xDA, 0x00, 0xF6, 0x02, 0x40, 0x3F, 0x00, 0x00, 0xBC, 0x00, 0xF4, 0x04, 0xB0, 0x0A, 0x00, 0x00,
|
||||
0xCB, 0x00, 0xF5, 0x02, 0xF4, 0x02, 0x00, 0x00, 0xF6, 0x25, 0xDC, 0x00, 0x9C, 0x00, 0x00, 0x00,
|
||||
0xA0, 0xFF, 0x3D, 0x50, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x21, 0x00, 0xD0, 0x09, 0xD4, 0xCF, 0x03,
|
||||
0x00, 0x00, 0x00, 0xE6, 0x12, 0xBE, 0xB4, 0x1D, 0x00, 0x00, 0x00, 0x8D, 0x60, 0x2F, 0x30, 0x5F,
|
||||
0x00, 0x00, 0x60, 0x1E, 0x80, 0x0F, 0x00, 0x7F, 0x00, 0x00, 0xE1, 0x08, 0x80, 0x0F, 0x00, 0x7F,
|
||||
0x00, 0x00, 0xE7, 0x01, 0x60, 0x2F, 0x30, 0x5F, 0x00, 0x10, 0x7E, 0x00, 0x10, 0xBE, 0xB5, 0x0D,
|
||||
0x00, 0x80, 0x1E, 0x00, 0x00, 0xC3, 0xCF, 0x03,
|
||||
// Unicode: [0x002B, plus]
|
||||
0x00, 0x00, 0x8C, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00,
|
||||
0x00, 0xAF, 0x00, 0x00, 0xB9, 0xBB, 0xEF, 0xBB, 0x6B, 0xFD, 0xFF, 0xFF, 0xFF, 0x8F, 0x00, 0x00,
|
||||
0xAF, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x00, 0xAF, 0x00, 0x00, 0x00, 0x00, 0xAF,
|
||||
0x00, 0x00,
|
||||
// Unicode: [0x002C, comma]
|
||||
0x10, 0x01, 0xF3, 0x0C, 0xF3, 0x0C, 0x40, 0x0B, 0x90, 0x08, 0xA2, 0x01,
|
||||
// Unicode: [0x002D, hyphen]
|
||||
@@ -230,6 +244,98 @@ KEEP extern const uint8_t unicodes_arial_20_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A
|
||||
0xFF, 0xAD, 0xBF, 0x00, 0xD0, 0x9F, 0x14, 0x10, 0xBF, 0x00, 0xF3, 0x0B, 0x00, 0x40, 0xBF, 0x00,
|
||||
0xF3, 0x0B, 0x00, 0xC1, 0xBF, 0x00, 0xC0, 0xBF, 0x87, 0xED, 0xCE, 0x00, 0x20, 0xD9, 0xDE, 0x2A,
|
||||
0xFA, 0x02,
|
||||
// Unicode: [0x0062, b]
|
||||
0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA,
|
||||
0x01, 0x00, 0x00, 0x00, 0xFA, 0xA3, 0xEE, 0x2A, 0x00, 0xFA, 0xDE, 0xA8, 0xEF, 0x02, 0xFA, 0x1C,
|
||||
0x00, 0xF6, 0x0A, 0xFA, 0x04, 0x00, 0xC0, 0x1F, 0xFA, 0x01, 0x00, 0x90, 0x3F, 0xEA, 0x00, 0x00,
|
||||
0x80, 0x4F, 0xFA, 0x00, 0x00, 0x80, 0x3F, 0xFA, 0x02, 0x00, 0xB0, 0x1F, 0xFA, 0x08, 0x00, 0xF3,
|
||||
0x09, 0xFA, 0x9E, 0x64, 0xDE, 0x01, 0xEA, 0xB3, 0xEF, 0x19, 0x00,
|
||||
// Unicode: [0x0063, c]
|
||||
0x00, 0x81, 0xFD, 0x8D, 0x01, 0x10, 0xFD, 0x8B, 0xFB, 0x0B, 0x90, 0x7F, 0x00, 0x90, 0x5F, 0xE0,
|
||||
0x0D, 0x00, 0x20, 0x48, 0xF2, 0x0A, 0x00, 0x00, 0x00, 0xF3, 0x09, 0x00, 0x00, 0x00, 0xF2, 0x0A,
|
||||
0x00, 0x00, 0x01, 0xE0, 0x0D, 0x00, 0x10, 0xAF, 0x90, 0x6F, 0x00, 0x80, 0x6F, 0x10, 0xFD, 0x8B,
|
||||
0xFB, 0x0B, 0x00, 0x91, 0xFD, 0x8D, 0x01,
|
||||
// Unicode: [0x0064, d]
|
||||
0x00, 0x00, 0x00, 0x10, 0xAF, 0x00, 0x00, 0x00, 0x10, 0xAF, 0x00, 0x00, 0x00, 0x10, 0xAF, 0x00,
|
||||
0x00, 0x00, 0x10, 0xAF, 0x00, 0xA2, 0xEE, 0x3A, 0xAF, 0x20, 0xFE, 0x9A, 0xDD, 0xAF, 0xA0, 0x5F,
|
||||
0x00, 0xC1, 0xAF, 0xF1, 0x0B, 0x00, 0x40, 0xAF, 0xF3, 0x08, 0x00, 0x00, 0xAF, 0xF4, 0x08, 0x00,
|
||||
0x00, 0xAE, 0xF3, 0x09, 0x00, 0x00, 0xAF, 0xF1, 0x0C, 0x00, 0x30, 0xAF, 0xA0, 0x6F, 0x00, 0xB0,
|
||||
0xAF, 0x10, 0xFD, 0x8B, 0xDD, 0xAF, 0x00, 0x92, 0xEE, 0x2B, 0xAE,
|
||||
// Unicode: [0x0065, e]
|
||||
0x00, 0x81, 0xFD, 0x9D, 0x01, 0x00, 0x10, 0xFD, 0x8B, 0xFA, 0x1D, 0x00, 0x90, 0x7F, 0x00, 0x50,
|
||||
0xAF, 0x00, 0xE0, 0x0D, 0x00, 0x00, 0xFC, 0x01, 0xF3, 0x8D, 0x88, 0x88, 0xFC, 0x03, 0xF4, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0x04, 0xF3, 0x0A, 0x00, 0x00, 0x00, 0x00, 0xF1, 0x0D, 0x00, 0x00, 0x77, 0x01,
|
||||
0xA0, 0x8F, 0x00, 0x40, 0xDF, 0x00, 0x10, 0xFD, 0x8C, 0xFA, 0x4E, 0x00, 0x00, 0x81, 0xFD, 0xAD,
|
||||
0x03, 0x00,
|
||||
// Unicode: [0x0067, g]
|
||||
0x00, 0xA2, 0xEE, 0x3B, 0xCC, 0x20, 0xFE, 0x9B, 0xED, 0xCE, 0xA0, 0x5F, 0x00, 0xB1, 0xCF, 0xF1,
|
||||
0x0C, 0x00, 0x30, 0xCF, 0xF4, 0x08, 0x00, 0x00, 0xCF, 0xF5, 0x07, 0x00, 0x00, 0xCD, 0xF4, 0x08,
|
||||
0x00, 0x00, 0xCE, 0xF1, 0x0B, 0x00, 0x20, 0xCF, 0xB0, 0x5F, 0x00, 0xB0, 0xCF, 0x20, 0xFE, 0x9A,
|
||||
0xED, 0xCF, 0x00, 0xA2, 0xEE, 0x2B, 0xBF, 0x20, 0x00, 0x00, 0x10, 0x9F, 0xE0, 0x0D, 0x00, 0x80,
|
||||
0x5F, 0x80, 0xDF, 0x88, 0xFC, 0x0B, 0x00, 0xC6, 0xEE, 0x7C, 0x00,
|
||||
// Unicode: [0x0068, h]
|
||||
0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA,
|
||||
0x01, 0x00, 0x00, 0x00, 0xFA, 0x92, 0xEE, 0x4C, 0x00, 0xFA, 0xED, 0xB9, 0xFF, 0x03, 0xFA, 0x1C,
|
||||
0x00, 0xF6, 0x09, 0xFA, 0x04, 0x00, 0xF1, 0x0B, 0xFA, 0x02, 0x00, 0xF0, 0x0B, 0xFA, 0x01, 0x00,
|
||||
0xF0, 0x0C, 0xFA, 0x01, 0x00, 0xF0, 0x0C, 0xFA, 0x01, 0x00, 0xF0, 0x0C, 0xFA, 0x01, 0x00, 0xF0,
|
||||
0x0C, 0xFA, 0x01, 0x00, 0xF0, 0x0C, 0xFA, 0x01, 0x00, 0xF0, 0x0C,
|
||||
// Unicode: [0x0069, i]
|
||||
0xFA, 0x01, 0xFA, 0x01, 0x11, 0x00, 0x00, 0x00, 0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01,
|
||||
0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01, 0xFA, 0x01,
|
||||
// Unicode: [0x006A, j]
|
||||
0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00,
|
||||
0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA,
|
||||
0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01, 0x00, 0xFA, 0x01,
|
||||
0x00, 0xFC, 0x00, 0xA7, 0xBF, 0x00, 0xFB, 0x3C, 0x00,
|
||||
// Unicode: [0x006C, l]
|
||||
0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB,
|
||||
// Unicode: [0x006D, m]
|
||||
0xDA, 0xA2, 0xEE, 0x2B, 0x91, 0xEE, 0x2B, 0x00, 0xEA, 0xAE, 0x96, 0xDF, 0xBC, 0x86, 0xDF, 0x00,
|
||||
0xFA, 0x09, 0x00, 0xFB, 0x0B, 0x00, 0xF9, 0x03, 0xFA, 0x04, 0x00, 0xF8, 0x06, 0x00, 0xF6, 0x05,
|
||||
0xFA, 0x02, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06, 0xFA, 0x01, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06,
|
||||
0xFA, 0x01, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06, 0xFA, 0x01, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06,
|
||||
0xFA, 0x01, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06, 0xFA, 0x01, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06,
|
||||
0xFA, 0x01, 0x00, 0xF8, 0x04, 0x00, 0xF6, 0x06,
|
||||
// Unicode: [0x006E, n]
|
||||
0xEA, 0xA2, 0xEE, 0x4C, 0x00, 0xEA, 0xBE, 0x76, 0xFE, 0x03, 0xFA, 0x09, 0x00, 0xF4, 0x09, 0xFA,
|
||||
0x03, 0x00, 0xF1, 0x0B, 0xFA, 0x01, 0x00, 0xF0, 0x0B, 0xFA, 0x01, 0x00, 0xF0, 0x0B, 0xFA, 0x01,
|
||||
0x00, 0xF0, 0x0B, 0xFA, 0x01, 0x00, 0xF0, 0x0B, 0xFA, 0x01, 0x00, 0xF0, 0x0B, 0xFA, 0x01, 0x00,
|
||||
0xF0, 0x0B, 0xFA, 0x01, 0x00, 0xF0, 0x0B,
|
||||
// Unicode: [0x006F, o]
|
||||
0x00, 0x91, 0xFD, 0x9D, 0x02, 0x00, 0x20, 0xFD, 0x9B, 0xFB, 0x2E, 0x00, 0xB0, 0x6F, 0x00, 0x60,
|
||||
0xBF, 0x00, 0xF1, 0x0C, 0x00, 0x00, 0xFC, 0x02, 0xF4, 0x08, 0x00, 0x00, 0xF8, 0x05, 0xF5, 0x07,
|
||||
0x00, 0x00, 0xF7, 0x05, 0xF4, 0x09, 0x00, 0x00, 0xF8, 0x04, 0xF1, 0x0C, 0x00, 0x00, 0xFB, 0x02,
|
||||
0xB0, 0x6F, 0x00, 0x60, 0xBF, 0x00, 0x20, 0xFD, 0x8B, 0xFB, 0x2E, 0x00, 0x00, 0x91, 0xFD, 0x9D,
|
||||
0x01, 0x00,
|
||||
// Unicode: [0x0070, p]
|
||||
0xEA, 0xB3, 0xEE, 0x2A, 0x00, 0xFA, 0x9E, 0x54, 0xED, 0x02, 0xFA, 0x0A, 0x00, 0xF2, 0x0A, 0xFA,
|
||||
0x03, 0x00, 0xA0, 0x1F, 0xFA, 0x00, 0x00, 0x80, 0x4F, 0xEA, 0x00, 0x00, 0x70, 0x5F, 0xFA, 0x00,
|
||||
0x00, 0x90, 0x3F, 0xFA, 0x03, 0x00, 0xC0, 0x1F, 0xFA, 0x1B, 0x00, 0xF6, 0x09, 0xFA, 0xDE, 0xA8,
|
||||
0xDF, 0x01, 0xFA, 0xB3, 0xDE, 0x19, 0x00, 0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00, 0x00,
|
||||
0x00, 0xFA, 0x01, 0x00, 0x00, 0x00, 0xFA, 0x01, 0x00, 0x00, 0x00,
|
||||
// Unicode: [0x0072, r]
|
||||
0xDB, 0xD4, 0xAE, 0xEB, 0xCE, 0x8B, 0xFB, 0x09, 0x00, 0xFB, 0x04, 0x00, 0xFB, 0x02, 0x00, 0xFB,
|
||||
0x01, 0x00, 0xFB, 0x01, 0x00, 0xFB, 0x01, 0x00, 0xFB, 0x01, 0x00, 0xFB, 0x01, 0x00, 0xFB, 0x01,
|
||||
0x00,
|
||||
// Unicode: [0x0073, s]
|
||||
0x00, 0xC7, 0xEE, 0x4B, 0x00, 0x80, 0xBF, 0x98, 0xFE, 0x04, 0xF1, 0x0B, 0x00, 0xF3, 0x0B, 0xF1,
|
||||
0x1D, 0x00, 0x20, 0x00, 0x90, 0xFF, 0x7B, 0x03, 0x00, 0x00, 0xC6, 0xFF, 0xCF, 0x03, 0x00, 0x00,
|
||||
0x62, 0xFB, 0x1E, 0x82, 0x04, 0x00, 0xA0, 0x3F, 0xF2, 0x0C, 0x00, 0xC0, 0x1F, 0x80, 0xDF, 0x89,
|
||||
0xFC, 0x08, 0x00, 0xC6, 0xEE, 0x6C, 0x00,
|
||||
// Unicode: [0x0074, t]
|
||||
0x00, 0x43, 0x00, 0x40, 0x6F, 0x00, 0x50, 0x6F, 0x00, 0x50, 0x6F, 0x00, 0xFA, 0xFF, 0x2F, 0x94,
|
||||
0xAF, 0x16, 0x50, 0x6F, 0x00, 0x50, 0x6F, 0x00, 0x50, 0x6F, 0x00, 0x50, 0x6F, 0x00, 0x50, 0x6F,
|
||||
0x00, 0x50, 0x6F, 0x00, 0x50, 0x7F, 0x00, 0x30, 0xEF, 0x2B, 0x00, 0xE8, 0x4E,
|
||||
// Unicode: [0x0075, u]
|
||||
0xFB, 0x00, 0x00, 0xF1, 0x0A, 0xFB, 0x00, 0x00, 0xF1, 0x0A, 0xFB, 0x00, 0x00, 0xF1, 0x0A, 0xFB,
|
||||
0x00, 0x00, 0xF1, 0x0A, 0xFB, 0x00, 0x00, 0xF1, 0x0A, 0xFB, 0x00, 0x00, 0xF1, 0x0A, 0xFB, 0x01,
|
||||
0x00, 0xF2, 0x0A, 0xFA, 0x01, 0x00, 0xF4, 0x0A, 0xF8, 0x07, 0x10, 0xFC, 0x0A, 0xF2, 0xBF, 0xE9,
|
||||
0xEC, 0x0A, 0x40, 0xEC, 0x9E, 0xD1, 0x0A,
|
||||
// Unicode: [0x0076, v]
|
||||
0xF9, 0x04, 0x00, 0x30, 0x9F, 0xF3, 0x09, 0x00, 0x80, 0x3F, 0xD0, 0x0E, 0x00, 0xD0, 0x0D, 0x70,
|
||||
0x4F, 0x00, 0xF4, 0x08, 0x20, 0xAF, 0x00, 0xF9, 0x02, 0x00, 0xEC, 0x00, 0xCE, 0x00, 0x00, 0xF6,
|
||||
0x45, 0x7F, 0x00, 0x00, 0xF1, 0x99, 0x2F, 0x00, 0x00, 0xB0, 0xEE, 0x0B, 0x00, 0x00, 0x50, 0xFF,
|
||||
0x06, 0x00, 0x00, 0x00, 0xFE, 0x01, 0x00,
|
||||
// Unicode: [0x0078, x]
|
||||
0xF4, 0x1D, 0x00, 0xC0, 0x4F, 0x90, 0x8F, 0x00, 0xF8, 0x08, 0x10, 0xFD, 0x33, 0xCF, 0x00, 0x00,
|
||||
0xF4, 0xDB, 0x3F, 0x00, 0x00, 0x90, 0xFF, 0x07, 0x00, 0x00, 0x40, 0xFF, 0x04, 0x00, 0x00, 0xD0,
|
||||
@@ -239,5 +345,28 @@ KEEP extern const uint8_t unicodes_arial_20_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A
|
||||
0xF3, 0xFF, 0xFF, 0xFF, 0x4F, 0x71, 0x77, 0x77, 0xF8, 0x1E, 0x00, 0x00, 0x10, 0xFC, 0x04, 0x00,
|
||||
0x00, 0xA0, 0x6F, 0x00, 0x00, 0x00, 0xF8, 0x0A, 0x00, 0x00, 0x50, 0xCF, 0x00, 0x00, 0x00, 0xE3,
|
||||
0x2E, 0x00, 0x00, 0x10, 0xFD, 0x04, 0x00, 0x00, 0xB0, 0x6F, 0x00, 0x00, 0x00, 0xF7, 0x8D, 0x88,
|
||||
0x88, 0x58, 0xF9, 0xFF, 0xFF, 0xFF, 0x9F
|
||||
0x88, 0x58, 0xF9, 0xFF, 0xFF, 0xFF, 0x9F,
|
||||
// Unicode: [0x00C9, Eacute]
|
||||
0x00, 0x00, 0x50, 0xAD, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x2E, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x05,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF6, 0xFF, 0xFF, 0xFF, 0xFF, 0x0E, 0xF6, 0xBD,
|
||||
0xBB, 0xBB, 0xBB, 0x0B, 0xF6, 0x07, 0x00, 0x00, 0x00, 0x00, 0xF6, 0x07, 0x00, 0x00, 0x00, 0x00,
|
||||
0xF6, 0x07, 0x00, 0x00, 0x00, 0x00, 0xF6, 0x07, 0x00, 0x00, 0x00, 0x00, 0xF6, 0xBD, 0xBB, 0xBB,
|
||||
0xBB, 0x04, 0xF6, 0xFF, 0xFF, 0xFF, 0xFF, 0x06, 0xF6, 0x07, 0x00, 0x00, 0x00, 0x00, 0xF6, 0x07,
|
||||
0x00, 0x00, 0x00, 0x00, 0xF6, 0x07, 0x00, 0x00, 0x00, 0x00, 0xF6, 0x07, 0x00, 0x00, 0x00, 0x00,
|
||||
0xF6, 0x07, 0x00, 0x00, 0x00, 0x00, 0xF6, 0xBD, 0xBB, 0xBB, 0xBB, 0x3B, 0xF6, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0x4F,
|
||||
// Unicode: [0x00E0, agrave]
|
||||
0x00, 0x40, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0x05, 0x00, 0x00, 0x00, 0x00, 0x90, 0x0A,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA3, 0xFD, 0xBE, 0x05, 0x00, 0x30, 0xEE,
|
||||
0x8A, 0xFA, 0x4F, 0x00, 0xB0, 0x3F, 0x00, 0x50, 0x9F, 0x00, 0x50, 0x06, 0x00, 0x10, 0xBF, 0x00,
|
||||
0x00, 0x10, 0x64, 0xC8, 0xBF, 0x00, 0x20, 0xFA, 0xFF, 0xAD, 0xBF, 0x00, 0xD0, 0x9F, 0x14, 0x10,
|
||||
0xBF, 0x00, 0xF3, 0x0B, 0x00, 0x40, 0xBF, 0x00, 0xF3, 0x0B, 0x00, 0xC1, 0xBF, 0x00, 0xC0, 0xBF,
|
||||
0x87, 0xED, 0xCE, 0x00, 0x20, 0xD9, 0xDE, 0x2A, 0xFA, 0x02,
|
||||
// Unicode: [0x00E9, eacute]
|
||||
0x00, 0x00, 0x60, 0xBF, 0x00, 0x00, 0x00, 0x00, 0xD0, 0x1E, 0x00, 0x00, 0x00, 0x00, 0xC3, 0x04,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x81, 0xFD, 0x9D, 0x01, 0x00, 0x10, 0xFD,
|
||||
0x8B, 0xFA, 0x1D, 0x00, 0x90, 0x7F, 0x00, 0x50, 0xAF, 0x00, 0xE0, 0x0D, 0x00, 0x00, 0xFC, 0x01,
|
||||
0xF3, 0x8D, 0x88, 0x88, 0xFC, 0x03, 0xF4, 0xFF, 0xFF, 0xFF, 0xFF, 0x04, 0xF3, 0x0A, 0x00, 0x00,
|
||||
0x00, 0x00, 0xF1, 0x0D, 0x00, 0x00, 0x77, 0x01, 0xA0, 0x8F, 0x00, 0x40, 0xDF, 0x00, 0x10, 0xFD,
|
||||
0x8C, 0xFA, 0x4E, 0x00, 0x00, 0x81, 0xFD, 0xAD, 0x03, 0x00
|
||||
};
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
FONT_GLYPH_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const uint8_t unicodes_arial_40_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = {
|
||||
// Unicode: [0x0020, space]
|
||||
// (Has no glyph data)
|
||||
// Unicode: [0x002B, plus]
|
||||
0x00, 0x00, 0x00, 0x00, 0xBB, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x5F,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -202,6 +204,25 @@ KEEP extern const uint8_t unicodes_arial_40_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A
|
||||
0x55, 0x55, 0x35, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x8F, 0xFC, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x8F, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0x8F,
|
||||
// Unicode: [0x0046, F]
|
||||
0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0x9F, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x9F, 0xFB, 0xFF,
|
||||
0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x35, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF,
|
||||
0x56, 0x55, 0x55, 0x55, 0x55, 0x55, 0x35, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0x8F, 0x00, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x8F, 0x00, 0xFB, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0x8F, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF,
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFB, 0xFF,
|
||||
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
// Unicode: [0x0048, H]
|
||||
0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0xFF, 0x0A, 0xFC, 0xFF, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0xF2, 0xFF, 0x0A, 0xFC, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
@@ -300,6 +321,27 @@ KEEP extern const uint8_t unicodes_arial_40_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A
|
||||
0xFF, 0xFF, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xFB, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0x5C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xA7, 0xED, 0xEF, 0xBD, 0x37, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
// Unicode: [0x0050, P]
|
||||
0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0xAC, 0x26, 0x00, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0x09, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xCF,
|
||||
0x01, 0xFE, 0xEF, 0x55, 0x55, 0x55, 0x55, 0x66, 0xE8, 0xFF, 0xFF, 0x09, 0xFE, 0xDF, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0xF9, 0xFF, 0x2F, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB0,
|
||||
0xFF, 0x8F, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xFF, 0xCF, 0xFE, 0xDF, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xFF, 0xDF, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0xFF, 0xDF, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xFF, 0xCF, 0xFE, 0xDF,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x8F, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0xF5, 0xFF, 0x3F, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x21, 0xB5, 0xFF, 0xFF, 0x0A, 0xFE,
|
||||
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF, 0x01, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
|
||||
0xFF, 0xFF, 0xFF, 0x1B, 0x00, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x4A, 0x00, 0x00,
|
||||
0xFE, 0xEF, 0x55, 0x55, 0x55, 0x55, 0x34, 0x01, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00,
|
||||
// Unicode: [0x0051, Q]
|
||||
0x00, 0x00, 0x00, 0x00, 0x30, 0xB8, 0xED, 0xEF, 0xAD, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x50, 0xFC, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
|
||||
@@ -8,12 +8,16 @@ KEEP extern const touchgfx::KerningNode kerning_arial_20_4bpp[] FONT_KERNING_LOC
|
||||
{ 0x0050, -2 }, // (First char = [0x0050, P], Second char = [0x002C, comma], Kerning dist = -2)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x002C, comma], Kerning dist = -2)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x002C, comma], Kerning dist = -1)
|
||||
{ 0x0072, -1 }, // (First char = [0x0072, r], Second char = [0x002C, comma], Kerning dist = -1)
|
||||
{ 0x0076, -1 }, // (First char = [0x0076, v], Second char = [0x002C, comma], Kerning dist = -1)
|
||||
{ 0x0054, -1 }, // (First char = [0x0054, T], Second char = [0x002D, hyphen], Kerning dist = -1)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x002D, hyphen], Kerning dist = -1)
|
||||
{ 0x0046, -2 }, // (First char = [0x0046, F], Second char = [0x002E, period], Kerning dist = -2)
|
||||
{ 0x0050, -2 }, // (First char = [0x0050, P], Second char = [0x002E, period], Kerning dist = -2)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x002E, period], Kerning dist = -2)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x002E, period], Kerning dist = -1)
|
||||
{ 0x0072, -1 }, // (First char = [0x0072, r], Second char = [0x002E, period], Kerning dist = -1)
|
||||
{ 0x0076, -1 }, // (First char = [0x0076, v], Second char = [0x002E, period], Kerning dist = -1)
|
||||
{ 0x0031, -1 }, // (First char = [0x0031, one], Second char = [0x0031, one], Kerning dist = -1)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x003A, colon], Kerning dist = -2)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x003A, colon], Kerning dist = -1)
|
||||
@@ -28,4 +32,15 @@ KEEP extern const touchgfx::KerningNode kerning_arial_20_4bpp[] FONT_KERNING_LOC
|
||||
{ 0x004C, -1 }, // (First char = [0x004C, L], Second char = [0x0056, V], Kerning dist = -1)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x0061, a], Kerning dist = -2)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x0061, a], Kerning dist = -1)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x0063, c], Kerning dist = -2)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x0065, e], Kerning dist = -2)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x0065, e], Kerning dist = -1)
|
||||
{ 0x0054, -1 }, // (First char = [0x0054, T], Second char = [0x0069, i], Kerning dist = -1)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x006F, o], Kerning dist = -2)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x006F, o], Kerning dist = -1)
|
||||
{ 0x0054, -1 }, // (First char = [0x0054, T], Second char = [0x0072, r], Kerning dist = -1)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x0072, r], Kerning dist = -1)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x0073, s], Kerning dist = -2)
|
||||
{ 0x0054, -1 }, // (First char = [0x0054, T], Second char = [0x0075, u], Kerning dist = -1)
|
||||
{ 0x0056, -1 }, // (First char = [0x0056, V], Second char = [0x0075, u], Kerning dist = -1)
|
||||
};
|
||||
@@ -2,12 +2,20 @@
|
||||
|
||||
FONT_KERNING_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const touchgfx::KerningNode kerning_arial_40_4bpp[] FONT_KERNING_LOCATION_FLASH_ATTRIBUTE = {
|
||||
{ 0x0041, -2 }, // (First char = [0x0041, A], Second char = [0x0020, space], Kerning dist = -2)
|
||||
{ 0x004C, -1 }, // (First char = [0x004C, L], Second char = [0x0020, space], Kerning dist = -1)
|
||||
{ 0x0050, -1 }, // (First char = [0x0050, P], Second char = [0x0020, space], Kerning dist = -1)
|
||||
{ 0x0054, -1 }, // (First char = [0x0054, T], Second char = [0x0020, space], Kerning dist = -1)
|
||||
{ 0x0054, -2 }, // (First char = [0x0054, T], Second char = [0x002D, hyphen], Kerning dist = -2)
|
||||
{ 0x0056, -2 }, // (First char = [0x0056, V], Second char = [0x002D, hyphen], Kerning dist = -2)
|
||||
{ 0x0031, -3 }, // (First char = [0x0031, one], Second char = [0x0031, one], Kerning dist = -3)
|
||||
{ 0x0020, -2 }, // (First char = [0x0020, space], Second char = [0x0041, A], Kerning dist = -2)
|
||||
{ 0x0046, -2 }, // (First char = [0x0046, F], Second char = [0x0041, A], Kerning dist = -2)
|
||||
{ 0x0050, -3 }, // (First char = [0x0050, P], Second char = [0x0041, A], Kerning dist = -3)
|
||||
{ 0x0054, -3 }, // (First char = [0x0054, T], Second char = [0x0041, A], Kerning dist = -3)
|
||||
{ 0x0056, -3 }, // (First char = [0x0056, V], Second char = [0x0041, A], Kerning dist = -3)
|
||||
{ 0x0054, -1 }, // (First char = [0x0054, T], Second char = [0x004F, O], Kerning dist = -1)
|
||||
{ 0x0020, -1 }, // (First char = [0x0020, space], Second char = [0x0054, T], Kerning dist = -1)
|
||||
{ 0x0041, -3 }, // (First char = [0x0041, A], Second char = [0x0054, T], Kerning dist = -3)
|
||||
{ 0x004C, -3 }, // (First char = [0x004C, L], Second char = [0x0054, T], Kerning dist = -3)
|
||||
{ 0x0052, -1 }, // (First char = [0x0052, R], Second char = [0x0054, T], Kerning dist = -1)
|
||||
|
||||
@@ -5,43 +5,66 @@
|
||||
FONT_TABLE_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const touchgfx::GlyphNode glyphs_arial_20_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
|
||||
{ 0, 0x0020, 0, 0, 0, 0, 6, 0, 2, 0x00 }, // space
|
||||
{ 0, 0x002C, 3, 6, 3, 1, 6, 2, 4, 0x00 }, // comma
|
||||
{ 12, 0x002D, 6, 2, 6, 0, 7, 6, 2, 0x00 }, // hyphen
|
||||
{ 18, 0x002E, 3, 3, 3, 1, 6, 8, 4, 0x00 }, // period
|
||||
{ 24, 0x0030, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // zero
|
||||
{ 114, 0x0031, 6, 15, 15, 2, 11, 12, 1, 0x00 }, // one
|
||||
{ 159, 0x0032, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // two
|
||||
{ 249, 0x0033, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // three
|
||||
{ 339, 0x0034, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // four
|
||||
{ 429, 0x0035, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // five
|
||||
{ 519, 0x0036, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // six
|
||||
{ 609, 0x0037, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // seven
|
||||
{ 699, 0x0038, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // eight
|
||||
{ 789, 0x0039, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // nine
|
||||
{ 879, 0x003A, 3, 11, 11, 1, 6, 13, 2, 0x00 }, // colon
|
||||
{ 901, 0x003F, 10, 15, 15, 1, 11, 0, 0, 0x00 }, // question
|
||||
{ 976, 0x0041, 14, 15, 15, 0, 13, 15, 5, 0x00 }, // A
|
||||
{ 1081, 0x0042, 12, 15, 15, 1, 13, 0, 0, 0x00 }, // B
|
||||
{ 1171, 0x0043, 13, 15, 15, 1, 14, 0, 0, 0x00 }, // C
|
||||
{ 1276, 0x0044, 13, 15, 15, 1, 14, 0, 0, 0x00 }, // D
|
||||
{ 1381, 0x0045, 12, 15, 15, 1, 13, 0, 0, 0x00 }, // E
|
||||
{ 1471, 0x0046, 11, 15, 15, 1, 12, 0, 0, 0x00 }, // F
|
||||
{ 1561, 0x0048, 12, 15, 15, 1, 14, 0, 0, 0x00 }, // H
|
||||
{ 1651, 0x0049, 3, 15, 15, 1, 6, 0, 0, 0x00 }, // I
|
||||
{ 1681, 0x004B, 13, 15, 15, 1, 13, 0, 0, 0x00 }, // K
|
||||
{ 1786, 0x004C, 10, 15, 15, 1, 11, 0, 0, 0x00 }, // L
|
||||
{ 1861, 0x004D, 15, 15, 15, 1, 17, 0, 0, 0x00 }, // M
|
||||
{ 1981, 0x004E, 12, 15, 15, 1, 14, 0, 0, 0x00 }, // N
|
||||
{ 2071, 0x004F, 14, 15, 15, 1, 16, 0, 0, 0x00 }, // O
|
||||
{ 2176, 0x0050, 12, 15, 15, 1, 13, 0, 0, 0x00 }, // P
|
||||
{ 2266, 0x0052, 13, 15, 15, 1, 14, 0, 0, 0x00 }, // R
|
||||
{ 2371, 0x0054, 12, 15, 15, 0, 12, 20, 2, 0x00 }, // T
|
||||
{ 2461, 0x0055, 12, 15, 15, 1, 14, 0, 0, 0x00 }, // U
|
||||
{ 2551, 0x0056, 14, 15, 15, 0, 13, 22, 2, 0x00 }, // V
|
||||
{ 2656, 0x0058, 13, 15, 15, 0, 13, 0, 0, 0x00 }, // X
|
||||
{ 2761, 0x0061, 11, 11, 11, 0, 11, 24, 2, 0x00 }, // a
|
||||
{ 2827, 0x0078, 10, 11, 11, 0, 10, 0, 0, 0x00 }, // x
|
||||
{ 2882, 0x007A, 10, 11, 11, 0, 10, 0, 0, 0x00 } // z
|
||||
{ 0, 0x0025, 16, 15, 15, 1, 18, 0, 0, 0x00 }, // percent
|
||||
{ 120, 0x002B, 10, 10, 12, 1, 12, 0, 0, 0x00 }, // plus
|
||||
{ 170, 0x002C, 3, 6, 3, 1, 6, 2, 6, 0x00 }, // comma
|
||||
{ 182, 0x002D, 6, 2, 6, 0, 7, 8, 2, 0x00 }, // hyphen
|
||||
{ 188, 0x002E, 3, 3, 3, 1, 6, 10, 6, 0x00 }, // period
|
||||
{ 194, 0x0030, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // zero
|
||||
{ 284, 0x0031, 6, 15, 15, 2, 11, 16, 1, 0x00 }, // one
|
||||
{ 329, 0x0032, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // two
|
||||
{ 419, 0x0033, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // three
|
||||
{ 509, 0x0034, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // four
|
||||
{ 599, 0x0035, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // five
|
||||
{ 689, 0x0036, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // six
|
||||
{ 779, 0x0037, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // seven
|
||||
{ 869, 0x0038, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // eight
|
||||
{ 959, 0x0039, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // nine
|
||||
{ 1049, 0x003A, 3, 11, 11, 1, 6, 17, 2, 0x00 }, // colon
|
||||
{ 1071, 0x003F, 10, 15, 15, 1, 11, 0, 0, 0x00 }, // question
|
||||
{ 1146, 0x0041, 14, 15, 15, 0, 13, 19, 5, 0x00 }, // A
|
||||
{ 1251, 0x0042, 12, 15, 15, 1, 13, 0, 0, 0x00 }, // B
|
||||
{ 1341, 0x0043, 13, 15, 15, 1, 14, 0, 0, 0x00 }, // C
|
||||
{ 1446, 0x0044, 13, 15, 15, 1, 14, 0, 0, 0x00 }, // D
|
||||
{ 1551, 0x0045, 12, 15, 15, 1, 13, 0, 0, 0x00 }, // E
|
||||
{ 1641, 0x0046, 11, 15, 15, 1, 12, 0, 0, 0x00 }, // F
|
||||
{ 1731, 0x0048, 12, 15, 15, 1, 14, 0, 0, 0x00 }, // H
|
||||
{ 1821, 0x0049, 3, 15, 15, 1, 6, 0, 0, 0x00 }, // I
|
||||
{ 1851, 0x004B, 13, 15, 15, 1, 13, 0, 0, 0x00 }, // K
|
||||
{ 1956, 0x004C, 10, 15, 15, 1, 11, 0, 0, 0x00 }, // L
|
||||
{ 2031, 0x004D, 15, 15, 15, 1, 17, 0, 0, 0x00 }, // M
|
||||
{ 2151, 0x004E, 12, 15, 15, 1, 14, 0, 0, 0x00 }, // N
|
||||
{ 2241, 0x004F, 14, 15, 15, 1, 16, 0, 0, 0x00 }, // O
|
||||
{ 2346, 0x0050, 12, 15, 15, 1, 13, 0, 0, 0x00 }, // P
|
||||
{ 2436, 0x0052, 13, 15, 15, 1, 14, 0, 0, 0x00 }, // R
|
||||
{ 2541, 0x0054, 12, 15, 15, 0, 12, 24, 2, 0x00 }, // T
|
||||
{ 2631, 0x0055, 12, 15, 15, 1, 14, 0, 0, 0x00 }, // U
|
||||
{ 2721, 0x0056, 14, 15, 15, 0, 13, 26, 2, 0x00 }, // V
|
||||
{ 2826, 0x0058, 13, 15, 15, 0, 13, 0, 0, 0x00 }, // X
|
||||
{ 2931, 0x0061, 11, 11, 11, 0, 11, 28, 2, 0x00 }, // a
|
||||
{ 2997, 0x0062, 10, 15, 15, 1, 11, 0, 0, 0x00 }, // b
|
||||
{ 3072, 0x0063, 10, 11, 11, 0, 10, 30, 1, 0x00 }, // c
|
||||
{ 3127, 0x0064, 10, 15, 15, 0, 11, 0, 0, 0x00 }, // d
|
||||
{ 3202, 0x0065, 11, 11, 11, 0, 11, 31, 2, 0x00 }, // e
|
||||
{ 3268, 0x0067, 10, 15, 11, 0, 11, 0, 0, 0x00 }, // g
|
||||
{ 3343, 0x0068, 9, 15, 15, 1, 11, 0, 0, 0x00 }, // h
|
||||
{ 3418, 0x0069, 3, 15, 15, 1, 4, 33, 1, 0x00 }, // i
|
||||
{ 3448, 0x006A, 5, 19, 15, -1, 4, 0, 0, 0x00 }, // j
|
||||
{ 3505, 0x006C, 2, 15, 15, 1, 4, 0, 0, 0x00 }, // l
|
||||
{ 3520, 0x006D, 15, 11, 11, 1, 17, 0, 0, 0x00 }, // m
|
||||
{ 3608, 0x006E, 9, 11, 11, 1, 11, 0, 0, 0x00 }, // n
|
||||
{ 3663, 0x006F, 11, 11, 11, 0, 11, 34, 2, 0x00 }, // o
|
||||
{ 3729, 0x0070, 10, 15, 11, 1, 11, 0, 0, 0x00 }, // p
|
||||
{ 3804, 0x0072, 6, 11, 11, 1, 7, 36, 2, 0x00 }, // r
|
||||
{ 3837, 0x0073, 10, 11, 11, 0, 10, 38, 1, 0x00 }, // s
|
||||
{ 3892, 0x0074, 6, 15, 15, 0, 6, 0, 0, 0x00 }, // t
|
||||
{ 3937, 0x0075, 9, 11, 11, 1, 11, 39, 2, 0x00 }, // u
|
||||
{ 3992, 0x0076, 10, 11, 11, 0, 10, 0, 0, 0x00 }, // v
|
||||
{ 4047, 0x0078, 10, 11, 11, 0, 10, 0, 0, 0x00 }, // x
|
||||
{ 4102, 0x007A, 10, 11, 11, 0, 10, 0, 0, 0x00 }, // z
|
||||
{ 4157, 0x00C9, 12, 19, 19, 1, 13, 0, 0, 0x00 }, // Eacute
|
||||
{ 4271, 0x00E0, 11, 15, 15, 0, 11, 0, 0, 0x00 }, // agrave
|
||||
{ 4361, 0x00E9, 11, 15, 15, 0, 11, 0, 0, 0x00 } // eacute
|
||||
};
|
||||
|
||||
// arial_20_4bpp
|
||||
@@ -60,6 +83,6 @@ touchgfx::GeneratedFont& getFont_arial_20_4bpp();
|
||||
|
||||
touchgfx::GeneratedFont& getFont_arial_20_4bpp()
|
||||
{
|
||||
static touchgfx::GeneratedFont arial_20_4bpp(glyphs_arial_20_4bpp, 38, 23, 20, 0, 0, 4, 1, 0, 1, unicodes_arial_20_4bpp, kerning_arial_20_4bpp, 63, 0, 0, &arial_contextualFormsTable);
|
||||
static touchgfx::GeneratedFont arial_20_4bpp(glyphs_arial_20_4bpp, 61, 24, 20, 0, 0, 4, 1, 1, 1, unicodes_arial_20_4bpp, kerning_arial_20_4bpp, 63, 0, 0, &arial_contextualFormsTable);
|
||||
return arial_20_4bpp;
|
||||
}
|
||||
@@ -4,29 +4,32 @@
|
||||
|
||||
FONT_TABLE_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const touchgfx::GlyphNode glyphs_arial_40_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
|
||||
{ 0, 0x0020, 0, 0, 0, 0, 11, 0, 4, 0x00 }, // space
|
||||
{ 0, 0x002B, 20, 19, 24, 2, 23, 0, 0, 0x00 }, // plus
|
||||
{ 190, 0x002D, 12, 4, 13, 1, 13, 0, 2, 0x00 }, // hyphen
|
||||
{ 190, 0x002D, 12, 4, 13, 1, 13, 4, 2, 0x00 }, // hyphen
|
||||
{ 214, 0x0030, 20, 28, 28, 1, 22, 0, 0, 0x00 }, // zero
|
||||
{ 494, 0x0031, 11, 28, 28, 4, 22, 2, 1, 0x00 }, // one
|
||||
{ 494, 0x0031, 11, 28, 28, 4, 22, 6, 1, 0x00 }, // one
|
||||
{ 662, 0x0032, 20, 28, 28, 1, 22, 0, 0, 0x00 }, // two
|
||||
{ 942, 0x003F, 20, 28, 28, 1, 22, 0, 0, 0x00 }, // question
|
||||
{ 1222, 0x0041, 27, 28, 28, 0, 27, 3, 2, 0x00 }, // A
|
||||
{ 1222, 0x0041, 27, 28, 28, 0, 27, 7, 5, 0x00 }, // A
|
||||
{ 1614, 0x0042, 23, 28, 28, 2, 27, 0, 0, 0x00 }, // B
|
||||
{ 1950, 0x0043, 26, 28, 28, 2, 29, 0, 0, 0x00 }, // C
|
||||
{ 2314, 0x0044, 24, 28, 28, 3, 29, 0, 0, 0x00 }, // D
|
||||
{ 2650, 0x0045, 22, 28, 28, 3, 27, 0, 0, 0x00 }, // E
|
||||
{ 2958, 0x0048, 23, 28, 28, 3, 29, 0, 0, 0x00 }, // H
|
||||
{ 3294, 0x0049, 5, 28, 28, 3, 11, 0, 0, 0x00 }, // I
|
||||
{ 3378, 0x004C, 19, 28, 28, 2, 22, 0, 0, 0x00 }, // L
|
||||
{ 3658, 0x004E, 23, 28, 28, 3, 29, 0, 0, 0x00 }, // N
|
||||
{ 3994, 0x004F, 29, 28, 28, 1, 31, 5, 1, 0x00 }, // O
|
||||
{ 4414, 0x0051, 29, 30, 28, 1, 31, 0, 0, 0x00 }, // Q
|
||||
{ 4864, 0x0052, 26, 28, 28, 3, 29, 0, 0, 0x00 }, // R
|
||||
{ 5228, 0x0053, 24, 28, 28, 1, 27, 0, 0, 0x00 }, // S
|
||||
{ 5564, 0x0054, 24, 28, 28, 0, 24, 6, 3, 0x00 }, // T
|
||||
{ 5900, 0x0055, 23, 28, 28, 3, 29, 0, 0, 0x00 }, // U
|
||||
{ 6236, 0x0056, 27, 28, 28, 0, 27, 9, 3, 0x00 }, // V
|
||||
{ 6628, 0x005A, 24, 28, 28, 0, 24, 0, 0, 0x00 } // Z
|
||||
{ 2958, 0x0046, 20, 28, 28, 3, 24, 0, 0, 0x00 }, // F
|
||||
{ 3238, 0x0048, 23, 28, 28, 3, 29, 0, 0, 0x00 }, // H
|
||||
{ 3574, 0x0049, 5, 28, 28, 3, 11, 0, 0, 0x00 }, // I
|
||||
{ 3658, 0x004C, 19, 28, 28, 2, 22, 0, 0, 0x00 }, // L
|
||||
{ 3938, 0x004E, 23, 28, 28, 3, 29, 0, 0, 0x00 }, // N
|
||||
{ 4274, 0x004F, 29, 28, 28, 1, 31, 12, 1, 0x00 }, // O
|
||||
{ 4694, 0x0050, 22, 28, 28, 3, 27, 0, 0, 0x00 }, // P
|
||||
{ 5002, 0x0051, 29, 30, 28, 1, 31, 0, 0, 0x00 }, // Q
|
||||
{ 5452, 0x0052, 26, 28, 28, 3, 29, 0, 0, 0x00 }, // R
|
||||
{ 5816, 0x0053, 24, 28, 28, 1, 27, 0, 0, 0x00 }, // S
|
||||
{ 6152, 0x0054, 24, 28, 28, 0, 24, 13, 4, 0x00 }, // T
|
||||
{ 6488, 0x0055, 23, 28, 28, 3, 29, 0, 0, 0x00 }, // U
|
||||
{ 6824, 0x0056, 27, 28, 28, 0, 27, 17, 3, 0x00 }, // V
|
||||
{ 7216, 0x005A, 24, 28, 28, 0, 24, 0, 0, 0x00 } // Z
|
||||
};
|
||||
|
||||
// arial_40_4bpp
|
||||
@@ -45,6 +48,6 @@ touchgfx::GeneratedFont& getFont_arial_40_4bpp();
|
||||
|
||||
touchgfx::GeneratedFont& getFont_arial_40_4bpp()
|
||||
{
|
||||
static touchgfx::GeneratedFont arial_40_4bpp(glyphs_arial_40_4bpp, 23, 42, 40, 0, 0, 4, 1, 0, 0, unicodes_arial_40_4bpp, kerning_arial_40_4bpp, 63, 0, 0, &arial_contextualFormsTable);
|
||||
static touchgfx::GeneratedFont arial_40_4bpp(glyphs_arial_40_4bpp, 26, 42, 40, 0, 0, 4, 1, 0, 0, unicodes_arial_40_4bpp, kerning_arial_40_4bpp, 63, 0, 0, &arial_contextualFormsTable);
|
||||
return arial_40_4bpp;
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
{"remap":"yes","language":"GB","language_index":0,"copy_translations":"no","indices":[["11","T_PEDALBOARD"],["33","T_EQUALIZER"],["62","T_OCTAVER"],["70","T_OSCILLO"],["43","T_OVERDRIVE"],["22","T_SATURATION"],["118","T_ECHO"],["92","T_REVERB"],["85","T_BACK"],["30","T_ON"],["152","T_OFF"],["47","T_DRIVE"],["123","T_TONE"],["112","T_LEVEL"],["106","T_DELAY"],["53","T_FEEDBACK"],["148","T_MIX"],["99","T_ROOMSIZE"],["78","T_DAMPING"],["174","T_EQ_31"],["180","T_EQ_62"],["132","T_EQ_125"],["140","T_EQ_250"],["144","T_EQ_500"],["168","T_EQ_1K"],["171","T_EQ_2K"],["177","T_EQ_4K"],["183","T_EQ_8K"],["136","T_EQ_16K"],["165","T_OCT_M2"],["162","T_OCT_M1"],["130","T_OCT_0"],["156","T_OCT_P1"],["159","T_OCT_P2"],["128","T___SINGLEUSE_U5V0"],["0","T_TEXTAREAMAX"],["186","T___SINGLEUSE_2C9Q"]],"generate_binary_translations":"no"}
|
||||
{"remap":"yes","language":"GB","language_index":0,"copy_translations":"no","indices":[["222","T_PEDALBOARD"],["244","T_EQUALIZER"],["273","T_OCTAVER"],["281","T_OSCILLO"],["254","T_OVERDRIVE"],["233","T_SATURATION"],["344","T_ECHO"],["318","T_REVERB"],["311","T_BACK"],["241","T_ON"],["378","T_OFF"],["258","T_DRIVE"],["349","T_TONE"],["338","T_LEVEL"],["332","T_DELAY"],["264","T_FEEDBACK"],["374","T_MIX"],["325","T_ROOMSIZE"],["297","T_DAMPING"],["397","T_EQ_31"],["403","T_EQ_62"],["358","T_EQ_125"],["366","T_EQ_250"],["370","T_EQ_500"],["391","T_EQ_1K"],["394","T_EQ_2K"],["400","T_EQ_4K"],["406","T_EQ_8K"],["362","T_EQ_16K"],["388","T_OCT_M2"],["385","T_OCT_M1"],["356","T_OCT_0"],["382","T_OCT_P1"],["169","T_OCT_P2"],["172","T_APP_TITLE"],["75","T_TAP_TO_START"],["289","T_SPECTRUM"],["304","T_LOOPER"],["0","T_LOOPER_HINT"],["138","T_LOOPER_REC"],["211","T_LOOPER_PLAY"],["273","T_CARD_OCTAVER"],["244","T_CARD_EQUALIZER"],["254","T_CARD_OVERDRIVE"],["233","T_CARD_SATURATION"],["344","T_CARD_ECHO"],["318","T_CARD_REVERB"],["156","T_DESC_OCTAVER"],["118","T_DESC_EQUALIZER"],["27","T_DESC_OVERDRIVE"],["186","T_DESC_SATURATION"],["51","T_DESC_ECHO"],["98","T_DESC_REVERB"],["409","T_VALUE_M_LEFT"],["409","T_VALUE_S_CENTER"],["354","T___SINGLEUSE_U5V0"],["200","T_TEXTAREAMAX"],["409","T___SINGLEUSE_2C9Q"]],"generate_binary_translations":"no"}
|
||||
@@ -1 +1 @@
|
||||
{"languages":["GB"],"textids":["T_PEDALBOARD","T_EQUALIZER","T_OCTAVER","T_OSCILLO","T_OVERDRIVE","T_SATURATION","T_ECHO","T_REVERB","T_BACK","T_ON","T_OFF","T_DRIVE","T_TONE","T_LEVEL","T_DELAY","T_FEEDBACK","T_MIX","T_ROOMSIZE","T_DAMPING","T_EQ_31","T_EQ_62","T_EQ_125","T_EQ_250","T_EQ_500","T_EQ_1K","T_EQ_2K","T_EQ_4K","T_EQ_8K","T_EQ_16K","T_OCT_M2","T_OCT_M1","T_OCT_0","T_OCT_P1","T_OCT_P2","T___SINGLEUSE_U5V0","T_TEXTAREAMAX","T___SINGLEUSE_2C9Q"]}
|
||||
{"languages":["GB"],"textids":["T_PEDALBOARD","T_EQUALIZER","T_OCTAVER","T_OSCILLO","T_OVERDRIVE","T_SATURATION","T_ECHO","T_REVERB","T_BACK","T_ON","T_OFF","T_DRIVE","T_TONE","T_LEVEL","T_DELAY","T_FEEDBACK","T_MIX","T_ROOMSIZE","T_DAMPING","T_EQ_31","T_EQ_62","T_EQ_125","T_EQ_250","T_EQ_500","T_EQ_1K","T_EQ_2K","T_EQ_4K","T_EQ_8K","T_EQ_16K","T_OCT_M2","T_OCT_M1","T_OCT_0","T_OCT_P1","T_OCT_P2","T_APP_TITLE","T_TAP_TO_START","T_SPECTRUM","T_LOOPER","T_LOOPER_HINT","T_LOOPER_REC","T_LOOPER_PLAY","T_CARD_OCTAVER","T_CARD_EQUALIZER","T_CARD_OVERDRIVE","T_CARD_SATURATION","T_CARD_ECHO","T_CARD_REVERB","T_DESC_OCTAVER","T_DESC_EQUALIZER","T_DESC_OVERDRIVE","T_DESC_SATURATION","T_DESC_ECHO","T_DESC_REVERB","T_VALUE_M_LEFT","T_VALUE_S_CENTER","T___SINGLEUSE_U5V0","T_TEXTAREAMAX","T___SINGLEUSE_2C9Q"]}
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{"remap":"yes","languages":["Gb"],"characters":[77,97,120,32,58,32,2,32,72,122,0,80,69,68,65,76,66,79,65,82,68,0,83,65,84,85,82,65,84,73,79,78,0,69,81,85,65,76,73,90,69,82,0,79,86,69,82,68,82,73,86,69,0,70,69,69,68,66,65,67,75,0,79,67,84,65,86,69,82,0,79,83,67,73,76,76,79,0,65,77,79,82,84,73,0,82,69,84,79,85,82,0,82,69,86,69,82,66,0,84,65,73,76,76,69,0,68,69,76,65,73,0,76,69,86,69,76,0,69,67,72,79,0,84,79,78,69,0,49,48,48,0,49,50,53,0,49,54,75,0,50,53,48,0,53,48,48,0,77,73,88,0,79,70,70,0,43,49,0,43,50,0,45,49,0,45,50,0,49,75,0,50,75,0,51,49,0,52,75,0,54,50,0,56,75,0,2,0],"copy_translations_to_ram":"no","generate_binary_translations":"no"}
|
||||
{"remap":"yes","languages":["Gb"],"characters":[77,97,105,110,116,101,110,105,114,32,112,111,117,114,32,101,110,114,101,103,105,115,116,114,101,114,0,68,114,105,118,101,44,32,116,111,110,97,108,105,116,233,44,32,110,105,118,101,97,117,0,68,233,108,97,105,44,32,114,233,105,110,106,101,99,116,105,111,110,44,32,109,105,120,0,84,111,117,99,104,101,122,32,112,111,117,114,32,99,111,109,109,101,110,99,101,114,0,84,97,105,108,108,101,44,32,97,109,111,114,116,105,44,32,109,105,120,0,201,103,97,108,105,115,101,117,114,32,49,48,32,98,97,110,100,101,115,0,69,110,114,101,103,105,115,116,114,101,109,101,110,116,46,46,46,0,79,99,116,97,118,101,115,32,45,50,32,224,32,43,50,0,67,69,76,76,79,32,69,70,70,69,67,84,83,0,68,114,105,118,101,44,32,110,105,118,101,97,117,0,77,97,120,32,58,32,2,32,72,122,0,76,101,99,116,117,114,101,32,120,50,0,80,69,68,65,76,66,79,65,82,68,0,83,65,84,85,82,65,84,73,79,78,0,69,81,85,65,76,73,90,69,82,0,79,86,69,82,68,82,73,86,69,0,70,69,69,68,66,65,67,75,0,79,67,84,65,86,69,82,0,79,83,67,73,76,76,79,0,83,80,69,67,84,82,69,0,65,77,79,82,84,73,0,76,79,79,80,69,82,0,82,69,84,79,85,82,0,82,69,86,69,82,66,0,84,65,73,76,76,69,0,68,69,76,65,73,0,76,69,86,69,76,0,69,67,72,79,0,84,79,78,69,0,49,48,48,0,49,50,53,0,49,54,75,0,50,53,48,0,53,48,48,0,77,73,88,0,79,70,70,0,43,49,0,45,49,0,45,50,0,49,75,0,50,75,0,51,49,0,52,75,0,54,50,0,56,75,0,2,0],"copy_translations_to_ram":"no","generate_binary_translations":"no"}
|
||||
@@ -1 +1 @@
|
||||
{"databases":{"DEFAULT":[[0,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"]]},"database_list":["DEFAULT"],"fonts":{"getFont_arial_20_4bpp":0,"getFont_arial_40_4bpp":1,"getFont_arial_10_4bpp":2},"generate_font_format":"0","generate_binary_translations":"no","copy_translations_to_ram":"no"}
|
||||
{"databases":{"DEFAULT":[[0,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[1,"CENTER","LTR"],[0,"CENTER","LTR"],[1,"CENTER","LTR"],[2,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"]]},"database_list":["DEFAULT"],"fonts":{"getFont_arial_20_4bpp":0,"getFont_arial_40_4bpp":1,"getFont_arial_28_4bpp":2,"getFont_arial_10_4bpp":3},"generate_font_format":"0","generate_binary_translations":"no","copy_translations_to_ram":"no"}
|
||||
@@ -46,6 +46,27 @@ enum TEXTS
|
||||
T_OCT_0,
|
||||
T_OCT_P1,
|
||||
T_OCT_P2,
|
||||
T_APP_TITLE,
|
||||
T_TAP_TO_START,
|
||||
T_SPECTRUM,
|
||||
T_LOOPER,
|
||||
T_LOOPER_HINT,
|
||||
T_LOOPER_REC,
|
||||
T_LOOPER_PLAY,
|
||||
T_CARD_OCTAVER,
|
||||
T_CARD_EQUALIZER,
|
||||
T_CARD_OVERDRIVE,
|
||||
T_CARD_SATURATION,
|
||||
T_CARD_ECHO,
|
||||
T_CARD_REVERB,
|
||||
T_DESC_OCTAVER,
|
||||
T_DESC_EQUALIZER,
|
||||
T_DESC_OVERDRIVE,
|
||||
T_DESC_SATURATION,
|
||||
T_DESC_ECHO,
|
||||
T_DESC_REVERB,
|
||||
T_VALUE_M_LEFT,
|
||||
T_VALUE_S_CENTER,
|
||||
T___SINGLEUSE_U5V0,
|
||||
T_TEXTAREAMAX,
|
||||
T___SINGLEUSE_2C9Q,
|
||||
|
||||
@@ -10,41 +10,62 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE;
|
||||
// Remap all strings
|
||||
TEXT_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
|
||||
11, // T_PEDALBOARD: "PEDALBOARD"
|
||||
33, // T_EQUALIZER: "EQUALIZER"
|
||||
62, // T_OCTAVER: "OCTAVER"
|
||||
70, // T_OSCILLO: "OSCILLO"
|
||||
43, // T_OVERDRIVE: "OVERDRIVE"
|
||||
22, // T_SATURATION: "SATURATION"
|
||||
118, // T_ECHO: "ECHO"
|
||||
92, // T_REVERB: "REVERB"
|
||||
85, // T_BACK: "RETOUR"
|
||||
30, // T_ON: "ON"
|
||||
152, // T_OFF: "OFF"
|
||||
47, // T_DRIVE: "DRIVE"
|
||||
123, // T_TONE: "TONE"
|
||||
112, // T_LEVEL: "LEVEL"
|
||||
106, // T_DELAY: "DELAI"
|
||||
53, // T_FEEDBACK: "FEEDBACK"
|
||||
148, // T_MIX: "MIX"
|
||||
99, // T_ROOMSIZE: "TAILLE"
|
||||
78, // T_DAMPING: "AMORTI"
|
||||
174, // T_EQ_31: "31"
|
||||
180, // T_EQ_62: "62"
|
||||
132, // T_EQ_125: "125"
|
||||
140, // T_EQ_250: "250"
|
||||
144, // T_EQ_500: "500"
|
||||
168, // T_EQ_1K: "1K"
|
||||
171, // T_EQ_2K: "2K"
|
||||
177, // T_EQ_4K: "4K"
|
||||
183, // T_EQ_8K: "8K"
|
||||
136, // T_EQ_16K: "16K"
|
||||
165, // T_OCT_M2: "-2"
|
||||
162, // T_OCT_M1: "-1"
|
||||
130, // T_OCT_0: "0"
|
||||
156, // T_OCT_P1: "+1"
|
||||
159, // T_OCT_P2: "+2"
|
||||
128, // T___SINGLEUSE_U5V0: "100"
|
||||
0, // T_TEXTAREAMAX: "Max : <> Hz"
|
||||
186 // T___SINGLEUSE_2C9Q: "<>"
|
||||
222, // T_PEDALBOARD: "PEDALBOARD"
|
||||
244, // T_EQUALIZER: "EQUALIZER"
|
||||
273, // T_OCTAVER: "OCTAVER"
|
||||
281, // T_OSCILLO: "OSCILLO"
|
||||
254, // T_OVERDRIVE: "OVERDRIVE"
|
||||
233, // T_SATURATION: "SATURATION"
|
||||
344, // T_ECHO: "ECHO"
|
||||
318, // T_REVERB: "REVERB"
|
||||
311, // T_BACK: "RETOUR"
|
||||
241, // T_ON: "ON"
|
||||
378, // T_OFF: "OFF"
|
||||
258, // T_DRIVE: "DRIVE"
|
||||
349, // T_TONE: "TONE"
|
||||
338, // T_LEVEL: "LEVEL"
|
||||
332, // T_DELAY: "DELAI"
|
||||
264, // T_FEEDBACK: "FEEDBACK"
|
||||
374, // T_MIX: "MIX"
|
||||
325, // T_ROOMSIZE: "TAILLE"
|
||||
297, // T_DAMPING: "AMORTI"
|
||||
397, // T_EQ_31: "31"
|
||||
403, // T_EQ_62: "62"
|
||||
358, // T_EQ_125: "125"
|
||||
366, // T_EQ_250: "250"
|
||||
370, // T_EQ_500: "500"
|
||||
391, // T_EQ_1K: "1K"
|
||||
394, // T_EQ_2K: "2K"
|
||||
400, // T_EQ_4K: "4K"
|
||||
406, // T_EQ_8K: "8K"
|
||||
362, // T_EQ_16K: "16K"
|
||||
388, // T_OCT_M2: "-2"
|
||||
385, // T_OCT_M1: "-1"
|
||||
356, // T_OCT_0: "0"
|
||||
382, // T_OCT_P1: "+1"
|
||||
169, // T_OCT_P2: "+2"
|
||||
172, // T_APP_TITLE: "CELLO EFFECTS"
|
||||
75, // T_TAP_TO_START: "Touchez pour commencer"
|
||||
289, // T_SPECTRUM: "SPECTRE"
|
||||
304, // T_LOOPER: "LOOPER"
|
||||
0, // T_LOOPER_HINT: "Maintenir pour enregistrer"
|
||||
138, // T_LOOPER_REC: "Enregistrement..."
|
||||
211, // T_LOOPER_PLAY: "Lecture x2"
|
||||
273, // T_CARD_OCTAVER: "OCTAVER"
|
||||
244, // T_CARD_EQUALIZER: "EQUALIZER"
|
||||
254, // T_CARD_OVERDRIVE: "OVERDRIVE"
|
||||
233, // T_CARD_SATURATION: "SATURATION"
|
||||
344, // T_CARD_ECHO: "ECHO"
|
||||
318, // T_CARD_REVERB: "REVERB"
|
||||
156, // T_DESC_OCTAVER: "Octaves -2 ? +2"
|
||||
118, // T_DESC_EQUALIZER: "?galiseur 10 bandes"
|
||||
27, // T_DESC_OVERDRIVE: "Drive, tonalit?, niveau"
|
||||
186, // T_DESC_SATURATION: "Drive, niveau"
|
||||
51, // T_DESC_ECHO: "D?lai, r?injection, mix"
|
||||
98, // T_DESC_REVERB: "Taille, amorti, mix"
|
||||
409, // T_VALUE_M_LEFT: "<>"
|
||||
409, // T_VALUE_S_CENTER: "<>"
|
||||
354, // T___SINGLEUSE_U5V0: "100"
|
||||
200, // T_TEXTAREAMAX: "Max : <> Hz"
|
||||
409 // T___SINGLEUSE_2C9Q: "<>"
|
||||
};
|
||||
@@ -60,40 +60,52 @@ extern const touchgfx::TypedText::TypedTextData* const typedTextDatabaseArray[];
|
||||
|
||||
TEXT_LOCATION_FLASH_PRAGMA
|
||||
KEEP extern const touchgfx::Unicode::UnicodeChar texts_all_languages[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
|
||||
0x4d, 0x61, 0x78, 0x20, 0x3a, 0x20, 0x2, 0x20, 0x48, 0x7a, 0x0, // @0 "Max : <> Hz"
|
||||
0x50, 0x45, 0x44, 0x41, 0x4c, 0x42, 0x4f, 0x41, 0x52, 0x44, 0x0, // @11 "PEDALBOARD"
|
||||
0x53, 0x41, 0x54, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x0, // @22 "SATURATION"
|
||||
0x45, 0x51, 0x55, 0x41, 0x4c, 0x49, 0x5a, 0x45, 0x52, 0x0, // @33 "EQUALIZER"
|
||||
0x4f, 0x56, 0x45, 0x52, 0x44, 0x52, 0x49, 0x56, 0x45, 0x0, // @43 "OVERDRIVE"
|
||||
0x46, 0x45, 0x45, 0x44, 0x42, 0x41, 0x43, 0x4b, 0x0, // @53 "FEEDBACK"
|
||||
0x4f, 0x43, 0x54, 0x41, 0x56, 0x45, 0x52, 0x0, // @62 "OCTAVER"
|
||||
0x4f, 0x53, 0x43, 0x49, 0x4c, 0x4c, 0x4f, 0x0, // @70 "OSCILLO"
|
||||
0x41, 0x4d, 0x4f, 0x52, 0x54, 0x49, 0x0, // @78 "AMORTI"
|
||||
0x52, 0x45, 0x54, 0x4f, 0x55, 0x52, 0x0, // @85 "RETOUR"
|
||||
0x52, 0x45, 0x56, 0x45, 0x52, 0x42, 0x0, // @92 "REVERB"
|
||||
0x54, 0x41, 0x49, 0x4c, 0x4c, 0x45, 0x0, // @99 "TAILLE"
|
||||
0x44, 0x45, 0x4c, 0x41, 0x49, 0x0, // @106 "DELAI"
|
||||
0x4c, 0x45, 0x56, 0x45, 0x4c, 0x0, // @112 "LEVEL"
|
||||
0x45, 0x43, 0x48, 0x4f, 0x0, // @118 "ECHO"
|
||||
0x54, 0x4f, 0x4e, 0x45, 0x0, // @123 "TONE"
|
||||
0x31, 0x30, 0x30, 0x0, // @128 "100"
|
||||
0x31, 0x32, 0x35, 0x0, // @132 "125"
|
||||
0x31, 0x36, 0x4b, 0x0, // @136 "16K"
|
||||
0x32, 0x35, 0x30, 0x0, // @140 "250"
|
||||
0x35, 0x30, 0x30, 0x0, // @144 "500"
|
||||
0x4d, 0x49, 0x58, 0x0, // @148 "MIX"
|
||||
0x4f, 0x46, 0x46, 0x0, // @152 "OFF"
|
||||
0x2b, 0x31, 0x0, // @156 "+1"
|
||||
0x2b, 0x32, 0x0, // @159 "+2"
|
||||
0x2d, 0x31, 0x0, // @162 "-1"
|
||||
0x2d, 0x32, 0x0, // @165 "-2"
|
||||
0x31, 0x4b, 0x0, // @168 "1K"
|
||||
0x32, 0x4b, 0x0, // @171 "2K"
|
||||
0x33, 0x31, 0x0, // @174 "31"
|
||||
0x34, 0x4b, 0x0, // @177 "4K"
|
||||
0x36, 0x32, 0x0, // @180 "62"
|
||||
0x38, 0x4b, 0x0, // @183 "8K"
|
||||
0x2, 0x0 // @186 "<>"
|
||||
0x4d, 0x61, 0x69, 0x6e, 0x74, 0x65, 0x6e, 0x69, 0x72, 0x20, 0x70, 0x6f, 0x75, 0x72, 0x20, 0x65, 0x6e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x65, 0x72, 0x0, // @0 "Maintenir pour enregistrer"
|
||||
0x44, 0x72, 0x69, 0x76, 0x65, 0x2c, 0x20, 0x74, 0x6f, 0x6e, 0x61, 0x6c, 0x69, 0x74, 0xe9, 0x2c, 0x20, 0x6e, 0x69, 0x76, 0x65, 0x61, 0x75, 0x0, // @27 "Drive, tonalit?, niveau"
|
||||
0x44, 0xe9, 0x6c, 0x61, 0x69, 0x2c, 0x20, 0x72, 0xe9, 0x69, 0x6e, 0x6a, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x6d, 0x69, 0x78, 0x0, // @51 "D?lai, r?injection, mix"
|
||||
0x54, 0x6f, 0x75, 0x63, 0x68, 0x65, 0x7a, 0x20, 0x70, 0x6f, 0x75, 0x72, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x63, 0x65, 0x72, 0x0, // @75 "Touchez pour commencer"
|
||||
0x54, 0x61, 0x69, 0x6c, 0x6c, 0x65, 0x2c, 0x20, 0x61, 0x6d, 0x6f, 0x72, 0x74, 0x69, 0x2c, 0x20, 0x6d, 0x69, 0x78, 0x0, // @98 "Taille, amorti, mix"
|
||||
0xc9, 0x67, 0x61, 0x6c, 0x69, 0x73, 0x65, 0x75, 0x72, 0x20, 0x31, 0x30, 0x20, 0x62, 0x61, 0x6e, 0x64, 0x65, 0x73, 0x0, // @118 "?galiseur 10 bandes"
|
||||
0x45, 0x6e, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x2e, 0x2e, 0x0, // @138 "Enregistrement..."
|
||||
0x4f, 0x63, 0x74, 0x61, 0x76, 0x65, 0x73, 0x20, 0x2d, 0x32, 0x20, 0xe0, 0x20, 0x2b, 0x32, 0x0, // @156 "Octaves -2 ? +2"
|
||||
0x43, 0x45, 0x4c, 0x4c, 0x4f, 0x20, 0x45, 0x46, 0x46, 0x45, 0x43, 0x54, 0x53, 0x0, // @172 "CELLO EFFECTS"
|
||||
0x44, 0x72, 0x69, 0x76, 0x65, 0x2c, 0x20, 0x6e, 0x69, 0x76, 0x65, 0x61, 0x75, 0x0, // @186 "Drive, niveau"
|
||||
0x4d, 0x61, 0x78, 0x20, 0x3a, 0x20, 0x2, 0x20, 0x48, 0x7a, 0x0, // @200 "Max : <> Hz"
|
||||
0x4c, 0x65, 0x63, 0x74, 0x75, 0x72, 0x65, 0x20, 0x78, 0x32, 0x0, // @211 "Lecture x2"
|
||||
0x50, 0x45, 0x44, 0x41, 0x4c, 0x42, 0x4f, 0x41, 0x52, 0x44, 0x0, // @222 "PEDALBOARD"
|
||||
0x53, 0x41, 0x54, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x0, // @233 "SATURATION"
|
||||
0x45, 0x51, 0x55, 0x41, 0x4c, 0x49, 0x5a, 0x45, 0x52, 0x0, // @244 "EQUALIZER"
|
||||
0x4f, 0x56, 0x45, 0x52, 0x44, 0x52, 0x49, 0x56, 0x45, 0x0, // @254 "OVERDRIVE"
|
||||
0x46, 0x45, 0x45, 0x44, 0x42, 0x41, 0x43, 0x4b, 0x0, // @264 "FEEDBACK"
|
||||
0x4f, 0x43, 0x54, 0x41, 0x56, 0x45, 0x52, 0x0, // @273 "OCTAVER"
|
||||
0x4f, 0x53, 0x43, 0x49, 0x4c, 0x4c, 0x4f, 0x0, // @281 "OSCILLO"
|
||||
0x53, 0x50, 0x45, 0x43, 0x54, 0x52, 0x45, 0x0, // @289 "SPECTRE"
|
||||
0x41, 0x4d, 0x4f, 0x52, 0x54, 0x49, 0x0, // @297 "AMORTI"
|
||||
0x4c, 0x4f, 0x4f, 0x50, 0x45, 0x52, 0x0, // @304 "LOOPER"
|
||||
0x52, 0x45, 0x54, 0x4f, 0x55, 0x52, 0x0, // @311 "RETOUR"
|
||||
0x52, 0x45, 0x56, 0x45, 0x52, 0x42, 0x0, // @318 "REVERB"
|
||||
0x54, 0x41, 0x49, 0x4c, 0x4c, 0x45, 0x0, // @325 "TAILLE"
|
||||
0x44, 0x45, 0x4c, 0x41, 0x49, 0x0, // @332 "DELAI"
|
||||
0x4c, 0x45, 0x56, 0x45, 0x4c, 0x0, // @338 "LEVEL"
|
||||
0x45, 0x43, 0x48, 0x4f, 0x0, // @344 "ECHO"
|
||||
0x54, 0x4f, 0x4e, 0x45, 0x0, // @349 "TONE"
|
||||
0x31, 0x30, 0x30, 0x0, // @354 "100"
|
||||
0x31, 0x32, 0x35, 0x0, // @358 "125"
|
||||
0x31, 0x36, 0x4b, 0x0, // @362 "16K"
|
||||
0x32, 0x35, 0x30, 0x0, // @366 "250"
|
||||
0x35, 0x30, 0x30, 0x0, // @370 "500"
|
||||
0x4d, 0x49, 0x58, 0x0, // @374 "MIX"
|
||||
0x4f, 0x46, 0x46, 0x0, // @378 "OFF"
|
||||
0x2b, 0x31, 0x0, // @382 "+1"
|
||||
0x2d, 0x31, 0x0, // @385 "-1"
|
||||
0x2d, 0x32, 0x0, // @388 "-2"
|
||||
0x31, 0x4b, 0x0, // @391 "1K"
|
||||
0x32, 0x4b, 0x0, // @394 "2K"
|
||||
0x33, 0x31, 0x0, // @397 "31"
|
||||
0x34, 0x4b, 0x0, // @400 "4K"
|
||||
0x36, 0x32, 0x0, // @403 "62"
|
||||
0x38, 0x4b, 0x0, // @406 "8K"
|
||||
0x2, 0x0 // @409 "<>"
|
||||
};
|
||||
|
||||
TEXT_LOCATION_FLASH_PRAGMA
|
||||
|
||||
@@ -7,11 +7,13 @@
|
||||
|
||||
extern touchgfx::GeneratedFont& getFont_arial_20_4bpp();
|
||||
extern touchgfx::GeneratedFont& getFont_arial_40_4bpp();
|
||||
extern touchgfx::GeneratedFont& getFont_arial_28_4bpp();
|
||||
extern touchgfx::GeneratedFont& getFont_arial_10_4bpp();
|
||||
|
||||
const touchgfx::Font* touchgfx_fonts[] = {
|
||||
&(getFont_arial_20_4bpp()),
|
||||
&(getFont_arial_40_4bpp()),
|
||||
&(getFont_arial_28_4bpp()),
|
||||
&(getFont_arial_10_4bpp())
|
||||
};
|
||||
|
||||
@@ -54,6 +56,27 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT
|
||||
{ 1, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 1, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 1, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 1, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 1, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
|
||||
{ 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }
|
||||
@@ -98,7 +121,10 @@ void resetFont(touchgfx::FontId fontId)
|
||||
touchgfx_fonts[1] = &(getFont_arial_40_4bpp());
|
||||
break;
|
||||
case 2:
|
||||
touchgfx_fonts[2] = &(getFont_arial_10_4bpp());
|
||||
touchgfx_fonts[2] = &(getFont_arial_28_4bpp());
|
||||
break;
|
||||
case 3:
|
||||
touchgfx_fonts[3] = &(getFont_arial_10_4bpp());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user