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;
|
||||
}
|
||||
Reference in new issue
Block a user