Make R2D progress display prettier

This commit is contained in:
2023-04-29 23:37:53 +02:00
parent b2f5d48b73
commit cb2d707bd9
19 changed files with 209 additions and 213 deletions

View File

@ -6,73 +6,70 @@ FONT_TABLE_LOCATION_FLASH_PRAGMA
KEEP extern const touchgfx::GlyphNode glyphs_CHINN____30_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
{ 0, 0x0020, 0, 0, 0, 0, 8, 0, 0, 0x00 }, // space
{ 0, 0x002D, 13, 5, 12, 0, 13, 0, 0, 0x00 }, // hyphen
{ 35, 0x002F, 22, 20, 20, 0, 22, 0, 0, 0x00 }, // slash
{ 255, 0x0030, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // zero
{ 555, 0x0031, 14, 20, 20, 5, 30, 0, 0, 0x00 }, // one
{ 695, 0x0032, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // two
{ 995, 0x0033, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // three
{ 1295, 0x0034, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // four
{ 1595, 0x0035, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // five
{ 1895, 0x0036, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // six
{ 2195, 0x0037, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // seven
{ 2495, 0x0038, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // eight
{ 2795, 0x0039, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // nine
{ 3095, 0x003A, 7, 14, 14, 1, 8, 0, 0, 0x00 }, // colon
{ 3151, 0x003F, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // question
{ 3451, 0x0041, 29, 20, 20, -1, 27, 0, 0, 0x00 }, // A
{ 3751, 0x0042, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // B
{ 4051, 0x0043, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // C
{ 4351, 0x0044, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // D
{ 4651, 0x0045, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // E
{ 4951, 0x0046, 29, 20, 20, 0, 29, 0, 0, 0x00 }, // F
{ 5251, 0x0047, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // G
{ 5551, 0x0048, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // H
{ 5851, 0x0049, 6, 20, 20, 0, 7, 0, 0, 0x00 }, // I
{ 5911, 0x004A, 30, 20, 20, -1, 29, 0, 0, 0x00 }, // J
{ 6211, 0x004B, 30, 20, 20, 0, 29, 0, 0, 0x00 }, // K
{ 6511, 0x004C, 30, 20, 20, 0, 29, 0, 0, 0x00 }, // L
{ 6811, 0x004D, 32, 20, 20, 0, 32, 0, 0, 0x00 }, // M
{ 7131, 0x004E, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // N
{ 7431, 0x004F, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // O
{ 7731, 0x0050, 31, 20, 20, 0, 31, 0, 0, 0x00 }, // P
{ 8051, 0x0051, 31, 20, 20, 0, 31, 0, 0, 0x00 }, // Q
{ 8371, 0x0052, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // R
{ 8671, 0x0053, 32, 20, 20, 0, 32, 0, 0, 0x00 }, // S
{ 8991, 0x0054, 30, 20, 20, -1, 28, 0, 0, 0x00 }, // T
{ 9291, 0x0055, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // U
{ 9591, 0x0056, 29, 20, 20, -1, 27, 0, 0, 0x00 }, // V
{ 9891, 0x0057, 28, 20, 20, 0, 28, 0, 0, 0x00 }, // W
{ 10171, 0x0058, 29, 20, 20, 0, 28, 0, 0, 0x00 }, // X
{ 10471, 0x0059, 28, 20, 20, -1, 27, 0, 0, 0x00 }, // Y
{ 10751, 0x005A, 33, 20, 20, 0, 32, 0, 0, 0x00 }, // Z
{ 11091, 0x005B, 11, 25, 20, 1, 11, 0, 0, 0x00 }, // bracketleft
{ 11241, 0x005D, 10, 25, 20, 0, 11, 0, 0, 0x00 }, // bracketright
{ 11366, 0x0061, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // a
{ 11666, 0x0062, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // b
{ 11966, 0x0063, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // c
{ 12266, 0x0064, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // d
{ 12566, 0x0065, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // e
{ 12866, 0x0066, 29, 20, 20, 0, 29, 0, 0, 0x00 }, // f
{ 13166, 0x0067, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // g
{ 13466, 0x0068, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // h
{ 13766, 0x0069, 6, 20, 20, 0, 7, 0, 0, 0x00 }, // i
{ 13826, 0x006A, 30, 20, 20, -1, 29, 0, 0, 0x00 }, // j
{ 14126, 0x006B, 30, 20, 20, 0, 29, 0, 0, 0x00 }, // k
{ 14426, 0x006C, 22, 20, 20, 0, 21, 0, 0, 0x00 }, // l
{ 14646, 0x006D, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // m
{ 14946, 0x006E, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // n
{ 15246, 0x006F, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // o
{ 15546, 0x0070, 29, 20, 20, 0, 29, 0, 0, 0x00 }, // p
{ 15846, 0x0071, 31, 20, 20, 0, 31, 0, 0, 0x00 }, // q
{ 16166, 0x0072, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // r
{ 16466, 0x0073, 32, 20, 20, 0, 32, 0, 0, 0x00 }, // s
{ 16786, 0x0074, 30, 20, 20, -1, 28, 0, 0, 0x00 }, // t
{ 17086, 0x0075, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // u
{ 17386, 0x0076, 29, 20, 20, -1, 27, 0, 0, 0x00 }, // v
{ 17686, 0x0077, 33, 20, 20, 0, 33, 0, 0, 0x00 }, // w
{ 18026, 0x0078, 29, 20, 20, 0, 28, 0, 0, 0x00 }, // x
{ 18326, 0x0079, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // y
{ 18626, 0x007A, 33, 20, 20, 0, 32, 0, 0, 0x00 } // z
{ 35, 0x0030, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // zero
{ 335, 0x0031, 14, 20, 20, 5, 30, 0, 0, 0x00 }, // one
{ 475, 0x0032, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // two
{ 775, 0x0033, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // three
{ 1075, 0x0034, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // four
{ 1375, 0x0035, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // five
{ 1675, 0x0036, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // six
{ 1975, 0x0037, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // seven
{ 2275, 0x0038, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // eight
{ 2575, 0x0039, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // nine
{ 2875, 0x003A, 7, 14, 14, 1, 8, 0, 0, 0x00 }, // colon
{ 2931, 0x003F, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // question
{ 3231, 0x0041, 29, 20, 20, -1, 27, 0, 0, 0x00 }, // A
{ 3531, 0x0042, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // B
{ 3831, 0x0043, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // C
{ 4131, 0x0044, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // D
{ 4431, 0x0045, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // E
{ 4731, 0x0046, 29, 20, 20, 0, 29, 0, 0, 0x00 }, // F
{ 5031, 0x0047, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // G
{ 5331, 0x0048, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // H
{ 5631, 0x0049, 6, 20, 20, 0, 7, 0, 0, 0x00 }, // I
{ 5691, 0x004A, 30, 20, 20, -1, 29, 0, 0, 0x00 }, // J
{ 5991, 0x004B, 30, 20, 20, 0, 29, 0, 0, 0x00 }, // K
{ 6291, 0x004C, 30, 20, 20, 0, 29, 0, 0, 0x00 }, // L
{ 6591, 0x004D, 32, 20, 20, 0, 32, 0, 0, 0x00 }, // M
{ 6911, 0x004E, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // N
{ 7211, 0x004F, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // O
{ 7511, 0x0050, 31, 20, 20, 0, 31, 0, 0, 0x00 }, // P
{ 7831, 0x0051, 31, 20, 20, 0, 31, 0, 0, 0x00 }, // Q
{ 8151, 0x0052, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // R
{ 8451, 0x0053, 32, 20, 20, 0, 32, 0, 0, 0x00 }, // S
{ 8771, 0x0054, 30, 20, 20, -1, 28, 0, 0, 0x00 }, // T
{ 9071, 0x0055, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // U
{ 9371, 0x0056, 29, 20, 20, -1, 27, 0, 0, 0x00 }, // V
{ 9671, 0x0057, 28, 20, 20, 0, 28, 0, 0, 0x00 }, // W
{ 9951, 0x0058, 29, 20, 20, 0, 28, 0, 0, 0x00 }, // X
{ 10251, 0x0059, 28, 20, 20, -1, 27, 0, 0, 0x00 }, // Y
{ 10531, 0x005A, 33, 20, 20, 0, 32, 0, 0, 0x00 }, // Z
{ 10871, 0x0061, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // a
{ 11171, 0x0062, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // b
{ 11471, 0x0063, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // c
{ 11771, 0x0064, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // d
{ 12071, 0x0065, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // e
{ 12371, 0x0066, 29, 20, 20, 0, 29, 0, 0, 0x00 }, // f
{ 12671, 0x0067, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // g
{ 12971, 0x0068, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // h
{ 13271, 0x0069, 6, 20, 20, 0, 7, 0, 0, 0x00 }, // i
{ 13331, 0x006A, 30, 20, 20, -1, 29, 0, 0, 0x00 }, // j
{ 13631, 0x006B, 30, 20, 20, 0, 29, 0, 0, 0x00 }, // k
{ 13931, 0x006C, 22, 20, 20, 0, 21, 0, 0, 0x00 }, // l
{ 14151, 0x006D, 29, 20, 20, 0, 30, 0, 0, 0x00 }, // m
{ 14451, 0x006E, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // n
{ 14751, 0x006F, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // o
{ 15051, 0x0070, 29, 20, 20, 0, 29, 0, 0, 0x00 }, // p
{ 15351, 0x0071, 31, 20, 20, 0, 31, 0, 0, 0x00 }, // q
{ 15671, 0x0072, 30, 20, 20, 0, 30, 0, 0, 0x00 }, // r
{ 15971, 0x0073, 32, 20, 20, 0, 32, 0, 0, 0x00 }, // s
{ 16291, 0x0074, 30, 20, 20, -1, 28, 0, 0, 0x00 }, // t
{ 16591, 0x0075, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // u
{ 16891, 0x0076, 29, 20, 20, -1, 27, 0, 0, 0x00 }, // v
{ 17191, 0x0077, 33, 20, 20, 0, 33, 0, 0, 0x00 }, // w
{ 17531, 0x0078, 29, 20, 20, 0, 28, 0, 0, 0x00 }, // x
{ 17831, 0x0079, 30, 20, 20, 0, 31, 0, 0, 0x00 }, // y
{ 18131, 0x007A, 33, 20, 20, 0, 32, 0, 0, 0x00 } // z
};
// CHINN____30_4bpp
@ -90,6 +87,6 @@ touchgfx::GeneratedFont& getFont_CHINN____30_4bpp();
touchgfx::GeneratedFont& getFont_CHINN____30_4bpp()
{
static touchgfx::GeneratedFont CHINN____30_4bpp(glyphs_CHINN____30_4bpp, 69, 35, 30, 0, 0, 4, 1, 1, 1, unicodes_CHINN____30_4bpp, kerning_CHINN____30_4bpp, 63, 0, 0, 0);
static touchgfx::GeneratedFont CHINN____30_4bpp(glyphs_CHINN____30_4bpp, 66, 30, 30, 0, 0, 4, 1, 1, 1, unicodes_CHINN____30_4bpp, kerning_CHINN____30_4bpp, 63, 0, 0, 0);
return CHINN____30_4bpp;
}