|
|
|
|
@ -5,71 +5,72 @@
|
|
|
|
|
FONT_TABLE_LOCATION_FLASH_PRAGMA
|
|
|
|
|
KEEP extern const touchgfx::GlyphNode glyphs_CHINN____20_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
|
|
|
|
|
{ 0, 0x0020, 0, 0, 0, 0, 5, 0, 0, 0x00 }, // space
|
|
|
|
|
{ 0, 0x002E, 5, 4, 4, 0, 5, 0, 0, 0x00 }, // period
|
|
|
|
|
{ 12, 0x0030, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // zero
|
|
|
|
|
{ 142, 0x0031, 10, 13, 13, 3, 20, 0, 0, 0x00 }, // one
|
|
|
|
|
{ 207, 0x0032, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // two
|
|
|
|
|
{ 337, 0x0033, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // three
|
|
|
|
|
{ 467, 0x0034, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // four
|
|
|
|
|
{ 597, 0x0035, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // five
|
|
|
|
|
{ 727, 0x0036, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // six
|
|
|
|
|
{ 857, 0x0037, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // seven
|
|
|
|
|
{ 987, 0x0038, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // eight
|
|
|
|
|
{ 1117, 0x0039, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // nine
|
|
|
|
|
{ 1247, 0x003F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // question
|
|
|
|
|
{ 1377, 0x0041, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // A
|
|
|
|
|
{ 1507, 0x0042, 20, 13, 13, 0, 21, 0, 0, 0x00 }, // B
|
|
|
|
|
{ 1637, 0x0043, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // C
|
|
|
|
|
{ 1767, 0x0044, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // D
|
|
|
|
|
{ 1897, 0x0045, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // E
|
|
|
|
|
{ 2027, 0x0046, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // F
|
|
|
|
|
{ 2157, 0x0047, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // G
|
|
|
|
|
{ 2287, 0x0048, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // H
|
|
|
|
|
{ 2417, 0x0049, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // I
|
|
|
|
|
{ 2443, 0x004A, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // J
|
|
|
|
|
{ 2573, 0x004B, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // K
|
|
|
|
|
{ 2703, 0x004C, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // L
|
|
|
|
|
{ 2833, 0x004D, 21, 13, 13, 0, 21, 0, 0, 0x00 }, // M
|
|
|
|
|
{ 2976, 0x004E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // N
|
|
|
|
|
{ 3106, 0x004F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // O
|
|
|
|
|
{ 3236, 0x0050, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // P
|
|
|
|
|
{ 3379, 0x0051, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // Q
|
|
|
|
|
{ 3522, 0x0052, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // R
|
|
|
|
|
{ 3652, 0x0053, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // S
|
|
|
|
|
{ 3795, 0x0054, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // T
|
|
|
|
|
{ 3925, 0x0055, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // U
|
|
|
|
|
{ 4055, 0x0056, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // V
|
|
|
|
|
{ 4185, 0x0057, 19, 13, 13, 0, 19, 0, 0, 0x00 }, // W
|
|
|
|
|
{ 4315, 0x0058, 19, 13, 13, 0, 19, 0, 0, 0x00 }, // X
|
|
|
|
|
{ 4445, 0x0059, 19, 13, 13, -1, 18, 0, 0, 0x00 }, // Y
|
|
|
|
|
{ 4575, 0x005A, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // Z
|
|
|
|
|
{ 4718, 0x005F, 10, 3, 255, 0, 10, 0, 0, 0x60 }, // underscore
|
|
|
|
|
{ 4733, 0x0061, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // a
|
|
|
|
|
{ 4863, 0x0062, 20, 13, 13, 0, 21, 0, 0, 0x00 }, // b
|
|
|
|
|
{ 4993, 0x0063, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // c
|
|
|
|
|
{ 5123, 0x0064, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // d
|
|
|
|
|
{ 5253, 0x0065, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // e
|
|
|
|
|
{ 5383, 0x0066, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // f
|
|
|
|
|
{ 5513, 0x0067, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // g
|
|
|
|
|
{ 5643, 0x0068, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // h
|
|
|
|
|
{ 5773, 0x0069, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // i
|
|
|
|
|
{ 5799, 0x006A, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // j
|
|
|
|
|
{ 5929, 0x006B, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // k
|
|
|
|
|
{ 6059, 0x006C, 15, 13, 13, 0, 14, 0, 0, 0x00 }, // l
|
|
|
|
|
{ 6163, 0x006D, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // m
|
|
|
|
|
{ 6293, 0x006E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // n
|
|
|
|
|
{ 6423, 0x006F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // o
|
|
|
|
|
{ 6553, 0x0070, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // p
|
|
|
|
|
{ 6683, 0x0071, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // q
|
|
|
|
|
{ 6826, 0x0072, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // r
|
|
|
|
|
{ 6956, 0x0073, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // s
|
|
|
|
|
{ 7099, 0x0074, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // t
|
|
|
|
|
{ 7229, 0x0075, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // u
|
|
|
|
|
{ 7359, 0x0076, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // v
|
|
|
|
|
{ 7489, 0x0077, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // w
|
|
|
|
|
{ 7632, 0x0078, 19, 13, 13, 0, 19, 0, 0, 0x00 }, // x
|
|
|
|
|
{ 7762, 0x0079, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // y
|
|
|
|
|
{ 7892, 0x007A, 22, 13, 13, 0, 22, 0, 0, 0x00 } // z
|
|
|
|
|
{ 0, 0x0025, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // percent
|
|
|
|
|
{ 143, 0x002E, 5, 4, 4, 0, 5, 0, 0, 0x00 }, // period
|
|
|
|
|
{ 155, 0x0030, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // zero
|
|
|
|
|
{ 285, 0x0031, 10, 13, 13, 3, 20, 0, 0, 0x00 }, // one
|
|
|
|
|
{ 350, 0x0032, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // two
|
|
|
|
|
{ 480, 0x0033, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // three
|
|
|
|
|
{ 610, 0x0034, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // four
|
|
|
|
|
{ 740, 0x0035, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // five
|
|
|
|
|
{ 870, 0x0036, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // six
|
|
|
|
|
{ 1000, 0x0037, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // seven
|
|
|
|
|
{ 1130, 0x0038, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // eight
|
|
|
|
|
{ 1260, 0x0039, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // nine
|
|
|
|
|
{ 1390, 0x003F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // question
|
|
|
|
|
{ 1520, 0x0041, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // A
|
|
|
|
|
{ 1650, 0x0042, 20, 13, 13, 0, 21, 0, 0, 0x00 }, // B
|
|
|
|
|
{ 1780, 0x0043, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // C
|
|
|
|
|
{ 1910, 0x0044, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // D
|
|
|
|
|
{ 2040, 0x0045, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // E
|
|
|
|
|
{ 2170, 0x0046, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // F
|
|
|
|
|
{ 2300, 0x0047, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // G
|
|
|
|
|
{ 2430, 0x0048, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // H
|
|
|
|
|
{ 2560, 0x0049, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // I
|
|
|
|
|
{ 2586, 0x004A, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // J
|
|
|
|
|
{ 2716, 0x004B, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // K
|
|
|
|
|
{ 2846, 0x004C, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // L
|
|
|
|
|
{ 2976, 0x004D, 21, 13, 13, 0, 21, 0, 0, 0x00 }, // M
|
|
|
|
|
{ 3119, 0x004E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // N
|
|
|
|
|
{ 3249, 0x004F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // O
|
|
|
|
|
{ 3379, 0x0050, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // P
|
|
|
|
|
{ 3522, 0x0051, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // Q
|
|
|
|
|
{ 3665, 0x0052, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // R
|
|
|
|
|
{ 3795, 0x0053, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // S
|
|
|
|
|
{ 3938, 0x0054, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // T
|
|
|
|
|
{ 4068, 0x0055, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // U
|
|
|
|
|
{ 4198, 0x0056, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // V
|
|
|
|
|
{ 4328, 0x0057, 19, 13, 13, 0, 19, 0, 0, 0x00 }, // W
|
|
|
|
|
{ 4458, 0x0058, 19, 13, 13, 0, 19, 0, 0, 0x00 }, // X
|
|
|
|
|
{ 4588, 0x0059, 19, 13, 13, -1, 18, 0, 0, 0x00 }, // Y
|
|
|
|
|
{ 4718, 0x005A, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // Z
|
|
|
|
|
{ 4861, 0x005F, 10, 3, 255, 0, 10, 0, 0, 0x60 }, // underscore
|
|
|
|
|
{ 4876, 0x0061, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // a
|
|
|
|
|
{ 5006, 0x0062, 20, 13, 13, 0, 21, 0, 0, 0x00 }, // b
|
|
|
|
|
{ 5136, 0x0063, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // c
|
|
|
|
|
{ 5266, 0x0064, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // d
|
|
|
|
|
{ 5396, 0x0065, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // e
|
|
|
|
|
{ 5526, 0x0066, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // f
|
|
|
|
|
{ 5656, 0x0067, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // g
|
|
|
|
|
{ 5786, 0x0068, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // h
|
|
|
|
|
{ 5916, 0x0069, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // i
|
|
|
|
|
{ 5942, 0x006A, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // j
|
|
|
|
|
{ 6072, 0x006B, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // k
|
|
|
|
|
{ 6202, 0x006C, 15, 13, 13, 0, 14, 0, 0, 0x00 }, // l
|
|
|
|
|
{ 6306, 0x006D, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // m
|
|
|
|
|
{ 6436, 0x006E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // n
|
|
|
|
|
{ 6566, 0x006F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // o
|
|
|
|
|
{ 6696, 0x0070, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // p
|
|
|
|
|
{ 6826, 0x0071, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // q
|
|
|
|
|
{ 6969, 0x0072, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // r
|
|
|
|
|
{ 7099, 0x0073, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // s
|
|
|
|
|
{ 7242, 0x0074, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // t
|
|
|
|
|
{ 7372, 0x0075, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // u
|
|
|
|
|
{ 7502, 0x0076, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // v
|
|
|
|
|
{ 7632, 0x0077, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // w
|
|
|
|
|
{ 7775, 0x0078, 19, 13, 13, 0, 19, 0, 0, 0x00 }, // x
|
|
|
|
|
{ 7905, 0x0079, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // y
|
|
|
|
|
{ 8035, 0x007A, 22, 13, 13, 0, 22, 0, 0, 0x00 } // z
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// CHINN____20_4bpp
|
|
|
|
|
@ -87,6 +88,6 @@ touchgfx::GeneratedFont& getFont_CHINN____20_4bpp();
|
|
|
|
|
|
|
|
|
|
touchgfx::GeneratedFont& getFont_CHINN____20_4bpp()
|
|
|
|
|
{
|
|
|
|
|
static touchgfx::GeneratedFont CHINN____20_4bpp(glyphs_CHINN____20_4bpp, 66, 24, 20, 0, 0, 4, 1, 1, 1, unicodes_CHINN____20_4bpp, kerning_CHINN____20_4bpp, 63, 0, 0, 0);
|
|
|
|
|
static touchgfx::GeneratedFont CHINN____20_4bpp(glyphs_CHINN____20_4bpp, 67, 24, 20, 0, 0, 4, 1, 1, 1, unicodes_CHINN____20_4bpp, kerning_CHINN____20_4bpp, 63, 0, 0, 0);
|
|
|
|
|
return CHINN____20_4bpp;
|
|
|
|
|
}
|
|
|
|
|
|