Add three general-purpose fields to DriverView

This commit is contained in:
2023-03-18 22:51:13 +01:00
parent 5fe5d509a4
commit c6f237b87e
28 changed files with 536 additions and 57 deletions

View File

@ -4,10 +4,16 @@
66
68
69
70
73
76
77
78
80
82
83
84
86
97
99
100

View File

@ -1,3 +1,6 @@
32
44
46
48
49
50

View File

@ -5,10 +5,16 @@ AH:0 BA:1 FC:63 EC:0 FF:0 CF:1
66
68
69
70
73
76
77
78
80
82
83
84
86
97
99
100

View File

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

View File

@ -54,9 +54,29 @@ KEEP extern const uint8_t unicodes_CHINN____20_4bpp_0[] FONT_GLYPH_LOCATION_FLAS
0x44, 0x44, 0x44, 0x24, 0xF2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x60, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0xB3, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0x7F,
// Unicode: [0x0046, F]
0x00, 0xA4, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x1F, 0xF2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xF6, 0xFF,
0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x04, 0xF7, 0xFF, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
0x44, 0x04, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xF7, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F,
0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00,
// Unicode: [0x0049, I]
0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF,
0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF, 0xF7, 0xFF,
// Unicode: [0x004C, L]
0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF6, 0xFF, 0x44, 0x44, 0x44, 0x44,
0x44, 0x44, 0x44, 0x24, 0xF2, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x6F, 0x70, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x6F, 0x00, 0xC5, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0x6F,
// Unicode: [0x004D, M]
0x20, 0xEA, 0x9E, 0x01, 0x00, 0x00, 0x00, 0x60, 0xFD, 0x5C, 0x00, 0xD1, 0xFF, 0xFF, 0x1C, 0x00,
0x00, 0x00, 0xF6, 0xFF, 0xFF, 0x04, 0xF5, 0xFF, 0xFF, 0x7F, 0x00, 0x00, 0x10, 0xFE, 0xFF, 0xFF,
@ -67,6 +87,36 @@ KEEP extern const uint8_t unicodes_CHINN____20_4bpp_0[] FONT_GLYPH_LOCATION_FLAS
0x80, 0xFF, 0x0E, 0xF7, 0xFF, 0x00, 0xF2, 0xFF, 0xF8, 0xFF, 0x07, 0x80, 0xFF, 0x0E, 0xF7, 0xFF,
0x00, 0x80, 0xFF, 0xFF, 0xEF, 0x01, 0x80, 0xFF, 0x0E, 0xF7, 0xFF, 0x00, 0x10, 0xFC, 0xFF, 0x6F,
0x00, 0x80, 0xFF, 0x0E, 0xF7, 0xFF, 0x00, 0x00, 0xA1, 0xDE, 0x06, 0x00, 0x80, 0xFF, 0x0E,
// Unicode: [0x004E, N]
0x20, 0xEA, 0x9E, 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x7F, 0xE1, 0xFF, 0xFF, 0x2D, 0x00, 0x00,
0x00, 0x00, 0xFF, 0x7F, 0xF6, 0xFF, 0xFF, 0xEF, 0x03, 0x00, 0x00, 0x00, 0xFF, 0x7F, 0xF7, 0xFF,
0xFB, 0xFF, 0x4E, 0x00, 0x00, 0x00, 0xFF, 0x7F, 0xF7, 0xFF, 0xA0, 0xFF, 0xFF, 0x05, 0x00, 0x00,
0xFF, 0x7F, 0xF7, 0xFF, 0x00, 0xF9, 0xFF, 0x5F, 0x00, 0x00, 0xFF, 0x7F, 0xF7, 0xFF, 0x00, 0x80,
0xFF, 0xFF, 0x06, 0x00, 0xFF, 0x7F, 0xF7, 0xFF, 0x00, 0x00, 0xF7, 0xFF, 0x7F, 0x00, 0xFF, 0x7F,
0xF7, 0xFF, 0x00, 0x00, 0x60, 0xFF, 0xFF, 0x08, 0xFF, 0x7F, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0xF5,
0xFF, 0x9F, 0xFF, 0x6F, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x40, 0xFE, 0xFF, 0xFF, 0x4F, 0xF7, 0xFF,
0x00, 0x00, 0x00, 0x00, 0xE3, 0xFF, 0xFF, 0x0C, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x20, 0xEA,
0xAE, 0x02,
// Unicode: [0x0050, P]
0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x9D, 0x02, 0x00, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0x3E, 0x00, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xDF,
0x00, 0xF7, 0xFF, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0xF7, 0xFF, 0x03, 0xF7, 0xFF, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xF5, 0xFF, 0x04, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xEF, 0x01, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x7F, 0x00, 0xF7, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xEF, 0x06, 0x00, 0xF7, 0xFF, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
0x03, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
// Unicode: [0x0052, R]
0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x4C, 0x00, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x06, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xF7, 0xFF,
0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0xFF, 0x5F, 0xF7, 0xFF, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44,
0xFF, 0x5F, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xF7, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0C, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x5F,
0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x8F, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xFE, 0x8F, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x8F, 0xF7, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x8F, 0xF7, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0xFE, 0x8F,
// Unicode: [0x0053, S]
0x00, 0xA3, 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0x70, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x03, 0xF3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
@ -87,6 +137,16 @@ KEEP extern const uint8_t unicodes_CHINN____20_4bpp_0[] FONT_GLYPH_LOCATION_FLAS
0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF6, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xF6, 0xFF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF6, 0xFF, 0x01, 0x00,
0x00, 0x00,
// Unicode: [0x0056, V]
0xF2, 0xFF, 0x0C, 0x00, 0x00, 0x00, 0x00, 0xD1, 0xFF, 0x1E, 0x90, 0xFF, 0x5F, 0x00, 0x00, 0x00,
0x00, 0xF8, 0xFF, 0x06, 0x10, 0xFE, 0xDF, 0x00, 0x00, 0x00, 0x20, 0xFE, 0xDF, 0x00, 0x00, 0xF7,
0xFF, 0x07, 0x00, 0x00, 0xA0, 0xFF, 0x4F, 0x00, 0x00, 0xD1, 0xFF, 0x1E, 0x00, 0x00, 0xF3, 0xFF,
0x0B, 0x00, 0x00, 0x60, 0xFF, 0x8F, 0x00, 0x00, 0xFB, 0xFF, 0x03, 0x00, 0x00, 0x00, 0xFC, 0xFF,
0x02, 0x50, 0xFF, 0x9F, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xFF, 0x0A, 0xD0, 0xFF, 0x1E, 0x00, 0x00,
0x00, 0x00, 0xB0, 0xFF, 0x3F, 0xF7, 0xFF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x30, 0xFF, 0xCF, 0xFE,
0xDF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x5F, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xC1, 0xFF, 0xFF, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xE9, 0x7D, 0x00, 0x00,
0x00, 0x00,
// Unicode: [0x0061, a]
0xF1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x9E, 0x01, 0xF1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0x0B, 0xF1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x6F, 0x40, 0x44,

View File

@ -2,6 +2,16 @@
FONT_GLYPH_LOCATION_FLASH_PRAGMA
KEEP extern const uint8_t unicodes_lucon_TTF_50_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = {
// Unicode: [0x0020]
// (Has no glyph data)
// Unicode: [0x002C]
0x32, 0x33, 0x33, 0x23, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF,
0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0x9F, 0xF8, 0xFF, 0xFF, 0x8F,
0x00, 0x90, 0xFF, 0x6F, 0x00, 0xB0, 0xFF, 0x4F, 0x00, 0xE0, 0xFF, 0x0E, 0x00, 0xF5, 0xFF, 0x09,
0x20, 0xFD, 0xFF, 0x02, 0xF6, 0xFF, 0x5F, 0x00, 0xF8, 0xDF, 0x04, 0x00, 0x64, 0x03, 0x00, 0x00,
// Unicode: [0x002E]
0x32, 0x33, 0x33, 0x23, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF,
0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF, 0xF8, 0xFF, 0xFF, 0xAF,
// Unicode: [0x0030]
0x00, 0x00, 0x00, 0x00, 0x61, 0xDA, 0xFF, 0xBD, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x60, 0xFE, 0xFF, 0xFF, 0xFF, 0xEF, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFA, 0xFF, 0xFF,

View File

@ -10,26 +10,32 @@ KEEP extern const touchgfx::GlyphNode glyphs_CHINN____20_4bpp[] FONT_TABLE_LOCAT
{ 260, 0x0042, 20, 13, 13, 0, 21, 0, 0, 0x00 }, // B
{ 390, 0x0044, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // D
{ 520, 0x0045, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // E
{ 650, 0x0049, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // I
{ 676, 0x004D, 21, 13, 13, 0, 21, 0, 0, 0x00 }, // M
{ 819, 0x0053, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // S
{ 962, 0x0054, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // T
{ 1092, 0x0061, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // a
{ 1222, 0x0063, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // c
{ 1352, 0x0064, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // d
{ 1482, 0x0065, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // e
{ 1612, 0x0067, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // g
{ 1742, 0x0069, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // i
{ 1768, 0x006B, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // k
{ 1898, 0x006C, 15, 13, 13, 0, 14, 0, 0, 0x00 }, // l
{ 2002, 0x006E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // n
{ 2132, 0x006F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // o
{ 2262, 0x0070, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // p
{ 2392, 0x0072, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // r
{ 2522, 0x0073, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // s
{ 2665, 0x0074, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // t
{ 2795, 0x0075, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // u
{ 2925, 0x0076, 20, 13, 13, -1, 18, 0, 0, 0x00 } // v
{ 650, 0x0046, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // F
{ 780, 0x0049, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // I
{ 806, 0x004C, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // L
{ 936, 0x004D, 21, 13, 13, 0, 21, 0, 0, 0x00 }, // M
{ 1079, 0x004E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // N
{ 1209, 0x0050, 21, 13, 13, 0, 20, 0, 0, 0x00 }, // P
{ 1352, 0x0052, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // R
{ 1482, 0x0053, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // S
{ 1625, 0x0054, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // T
{ 1755, 0x0056, 20, 13, 13, -1, 18, 0, 0, 0x00 }, // V
{ 1885, 0x0061, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // a
{ 2015, 0x0063, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // c
{ 2145, 0x0064, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // d
{ 2275, 0x0065, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // e
{ 2405, 0x0067, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // g
{ 2535, 0x0069, 4, 13, 13, 0, 5, 0, 0, 0x00 }, // i
{ 2561, 0x006B, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // k
{ 2691, 0x006C, 15, 13, 13, 0, 14, 0, 0, 0x00 }, // l
{ 2795, 0x006E, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // n
{ 2925, 0x006F, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // o
{ 3055, 0x0070, 20, 13, 13, 0, 19, 0, 0, 0x00 }, // p
{ 3185, 0x0072, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // r
{ 3315, 0x0073, 22, 13, 13, 0, 22, 0, 0, 0x00 }, // s
{ 3458, 0x0074, 20, 13, 13, -1, 19, 0, 0, 0x00 }, // t
{ 3588, 0x0075, 20, 13, 13, 0, 20, 0, 0, 0x00 }, // u
{ 3718, 0x0076, 20, 13, 13, -1, 18, 0, 0, 0x00 } // v
};
// CHINN____20_4bpp
@ -47,6 +53,6 @@ touchgfx::GeneratedFont& getFont_CHINN____20_4bpp();
touchgfx::GeneratedFont& getFont_CHINN____20_4bpp()
{
static touchgfx::GeneratedFont CHINN____20_4bpp(glyphs_CHINN____20_4bpp, 26, 20, 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, 32, 20, 20, 0, 0, 4, 1, 1, 1, unicodes_CHINN____20_4bpp, kerning_CHINN____20_4bpp, 63, 0, 0, 0);
return CHINN____20_4bpp;
}

View File

@ -4,17 +4,20 @@
FONT_TABLE_LOCATION_FLASH_PRAGMA
KEEP extern const touchgfx::GlyphNode glyphs_lucon_TTF_50_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = {
{ 0, 0x0030, 26, 38, 37, 2, 30, 0, 0, 0x00 },
{ 494, 0x0031, 25, 37, 37, 4, 30, 0, 0, 0x00 },
{ 975, 0x0032, 21, 37, 37, 4, 30, 0, 0, 0x00 },
{ 1382, 0x0033, 21, 38, 37, 5, 30, 0, 0, 0x00 },
{ 1800, 0x0034, 26, 36, 36, 2, 30, 0, 0, 0x00 },
{ 2268, 0x0035, 20, 37, 36, 6, 30, 0, 0, 0x00 },
{ 2638, 0x0036, 24, 38, 37, 4, 30, 0, 0, 0x00 },
{ 3094, 0x0037, 23, 36, 36, 4, 30, 0, 0, 0x00 },
{ 3526, 0x0038, 24, 38, 37, 3, 30, 0, 0, 0x00 },
{ 3982, 0x0039, 25, 38, 37, 3, 30, 0, 0, 0x00 },
{ 4476, 0x003F, 23, 37, 37, 4, 30, 0, 0, 0x00 }
{ 0, 0x0020, 0, 0, 0, 0, 30, 0, 0, 0x00 },
{ 0, 0x002C, 8, 16, 8, 11, 30, 0, 0, 0x00 },
{ 64, 0x002E, 8, 8, 8, 11, 30, 0, 0, 0x00 },
{ 96, 0x0030, 26, 38, 37, 2, 30, 0, 0, 0x00 },
{ 590, 0x0031, 25, 37, 37, 4, 30, 0, 0, 0x00 },
{ 1071, 0x0032, 21, 37, 37, 4, 30, 0, 0, 0x00 },
{ 1478, 0x0033, 21, 38, 37, 5, 30, 0, 0, 0x00 },
{ 1896, 0x0034, 26, 36, 36, 2, 30, 0, 0, 0x00 },
{ 2364, 0x0035, 20, 37, 36, 6, 30, 0, 0, 0x00 },
{ 2734, 0x0036, 24, 38, 37, 4, 30, 0, 0, 0x00 },
{ 3190, 0x0037, 23, 36, 36, 4, 30, 0, 0, 0x00 },
{ 3622, 0x0038, 24, 38, 37, 3, 30, 0, 0, 0x00 },
{ 4078, 0x0039, 25, 38, 37, 3, 30, 0, 0, 0x00 },
{ 4572, 0x003F, 23, 37, 37, 4, 30, 0, 0, 0x00 }
};
// lucon_TTF_50_4bpp
@ -32,6 +35,6 @@ touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp();
touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp()
{
static touchgfx::GeneratedFont lucon_TTF_50_4bpp(glyphs_lucon_TTF_50_4bpp, 11, 51, 50, 0, 0, 4, 1, 0, 0, unicodes_lucon_TTF_50_4bpp, kerning_lucon_TTF_50_4bpp, 63, 0, 0, 0);
static touchgfx::GeneratedFont lucon_TTF_50_4bpp(glyphs_lucon_TTF_50_4bpp, 14, 58, 50, 0, 0, 4, 1, 0, 0, unicodes_lucon_TTF_50_4bpp, kerning_lucon_TTF_50_4bpp, 63, 0, 0, 0);
return lucon_TTF_50_4bpp;
}

View File

@ -0,0 +1,36 @@
/*********************************************************************************/
/********** THIS FILE IS GENERATED BY TOUCHGFX DESIGNER, DO NOT MODIFY ***********/
/*********************************************************************************/
#ifndef DRIVERVIEWFIELDBASE_HPP
#define DRIVERVIEWFIELDBASE_HPP
#include <gui/common/FrontendApplication.hpp>
#include <touchgfx/containers/Container.hpp>
#include <touchgfx/widgets/BoxWithBorder.hpp>
#include <touchgfx/widgets/TextArea.hpp>
#include <touchgfx/widgets/TextAreaWithWildcard.hpp>
class DriverViewFieldBase : public touchgfx::Container
{
public:
DriverViewFieldBase();
virtual ~DriverViewFieldBase();
virtual void initialize();
protected:
FrontendApplication& application() {
return *static_cast<FrontendApplication*>(touchgfx::Application::getInstance());
}
/*
* Member Declarations
*/
touchgfx::BoxWithBorder box;
touchgfx::TextArea title;
touchgfx::TextAreaWithOneWildcard value;
private:
};
#endif // DRIVERVIEWFIELDBASE_HPP

View File

@ -13,6 +13,8 @@
#include <touchgfx/widgets/canvas/Line.hpp>
#include <touchgfx/widgets/canvas/PainterRGB565.hpp>
#include <touchgfx/containers/progress_indicators/LineProgress.hpp>
#include <touchgfx/widgets/TextArea.hpp>
#include <gui/containers/DriverViewField.hpp>
class DriverViewViewBase : public touchgfx::View<DriverViewPresenter>
{
@ -43,6 +45,12 @@ protected:
touchgfx::PainterRGB565 tsVoltagePainter;
touchgfx::LineProgress lvVoltage;
touchgfx::PainterRGB565 lvVoltagePainter;
touchgfx::TextArea tireLabel;
touchgfx::TextArea tsVoltLabel;
touchgfx::TextArea lvVoltLabel;
DriverViewField field1;
DriverViewField field2;
DriverViewField field3;
private:

View File

@ -0,0 +1,39 @@
/*********************************************************************************/
/********** THIS FILE IS GENERATED BY TOUCHGFX DESIGNER, DO NOT MODIFY ***********/
/*********************************************************************************/
#include <gui_generated/containers/DriverViewFieldBase.hpp>
#include <touchgfx/Color.hpp>
#include <texts/TextKeysAndLanguages.hpp>
DriverViewFieldBase::DriverViewFieldBase()
{
setWidth(160);
setHeight(80);
box.setPosition(0, 0, 160, 80);
box.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
box.setBorderColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
box.setBorderSize(3);
add(box);
title.setPosition(0, 0, 160, 25);
title.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
title.setLinespacing(0);
title.setTypedText(touchgfx::TypedText(T___SINGLEUSE_0FBJ));
add(title);
value.setPosition(0, 20, 160, 57);
value.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
value.setLinespacing(0);
value.setTypedText(touchgfx::TypedText(T___SINGLEUSE_K26P));
add(value);
}
DriverViewFieldBase::~DriverViewFieldBase()
{
}
void DriverViewFieldBase::initialize()
{
}

View File

@ -5,6 +5,7 @@
#include <touchgfx/canvas_widget_renderer/CanvasWidgetRenderer.hpp>
#include <touchgfx/Color.hpp>
#include <images/BitmapDatabase.hpp>
#include <texts/TextKeysAndLanguages.hpp>
DriverViewViewBase::DriverViewViewBase()
{
@ -18,19 +19,19 @@ DriverViewViewBase::DriverViewViewBase()
logo.setBitmap(touchgfx::Bitmap(BITMAP_FASTTUBE_LOGO_SMALL_WHITE_ID));
add(logo);
tireTempRR.setXY(240, 167);
tireTempRR.setXY(240, 182);
add(tireTempRR);
tireTempFR.setXY(240, 92);
tireTempFR.setXY(240, 107);
add(tireTempFR);
tireTempRL.setXY(165, 167);
tireTempRL.setXY(165, 182);
add(tireTempRL);
tireTempFL.setXY(165, 92);
tireTempFL.setXY(165, 107);
add(tireTempFL);
ttDivVert.setPosition(239, 92, 3, 150);
ttDivVert.setPosition(239, 107, 3, 150);
ttDivVertPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
ttDivVert.setPainter(ttDivVertPainter);
ttDivVert.setStart(0, 0);
@ -39,7 +40,7 @@ DriverViewViewBase::DriverViewViewBase()
ttDivVert.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(ttDivVert);
ttDivHoriz.setPosition(165, 166, 150, 3);
ttDivHoriz.setPosition(165, 181, 150, 3);
ttDivHorizPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
ttDivHoriz.setPainter(ttDivHorizPainter);
ttDivHoriz.setStart(0, 0);
@ -48,7 +49,7 @@ DriverViewViewBase::DriverViewViewBase()
ttDivHoriz.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(ttDivHoriz);
tsVoltage.setXY(10, 92);
tsVoltage.setXY(10, 107);
tsVoltage.setProgressIndicatorPosition(0, 0, 40, 150);
tsVoltage.setRange(0, 100);
tsVoltage.setBackground(touchgfx::Bitmap(BITMAP_BAT_BAR_BG_ID));
@ -61,7 +62,7 @@ DriverViewViewBase::DriverViewViewBase()
tsVoltage.setValue(60);
add(tsVoltage);
lvVoltage.setXY(88, 92);
lvVoltage.setXY(430, 107);
lvVoltage.setProgressIndicatorPosition(0, 0, 40, 150);
lvVoltage.setRange(0, 100);
lvVoltage.setBackground(touchgfx::Bitmap(BITMAP_BAT_BAR_BG_ID));
@ -73,6 +74,33 @@ DriverViewViewBase::DriverViewViewBase()
lvVoltage.setLineEndingStyle(touchgfx::Line::BUTT_CAP_ENDING);
lvVoltage.setValue(80);
add(lvVoltage);
tireLabel.setPosition(165, 82, 150, 25);
tireLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
tireLabel.setLinespacing(0);
tireLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_H6UX));
add(tireLabel);
tsVoltLabel.setPosition(10, 82, 40, 25);
tsVoltLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
tsVoltLabel.setLinespacing(0);
tsVoltLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_PHFD));
add(tsVoltLabel);
lvVoltLabel.setPosition(430, 82, 40, 25);
lvVoltLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
lvVoltLabel.setLinespacing(0);
lvVoltLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_4OBM));
add(lvVoltLabel);
field1.setXY(0, 0);
add(field1);
field2.setXY(160, 0);
add(field2);
field3.setXY(320, 0);
add(field3);
}
DriverViewViewBase::~DriverViewViewBase()
@ -86,4 +114,7 @@ void DriverViewViewBase::setupScreen()
tireTempFR.initialize();
tireTempRL.initialize();
tireTempFL.initialize();
field1.initialize();
field2.initialize();
field3.initialize();
}

View File

@ -1 +1 @@
{"remap":"yes","language":"GB","language_index":0,"indices":[["95","T_INSPECTION_HUGE"],["127","T_EBS_HUGE"],["106","T_TRACKDRIVE_HUGE"],["117","T_AUTOX_HUGE"],["138","T_SKIDPAD_HUGE"],["82","T_ACCEL_HUGE"],["34","T_INVALID_HUGE"],["67","T_MANUAL"],["95","T_INSPECTION"],["127","T_EBS"],["106","T_TRACKDRIVE"],["117","T_AUTOX"],["138","T_SKIDPAD"],["82","T_ACCEL"],["136","T___SINGLEUSE_20H3"],["17","T___SINGLEUSE_SDGP"],["51","T___SINGLEUSE_M5X7"],["0","T___SINGLEUSE_6GPV"]]}
{"remap":"yes","language":"GB","language_index":0,"indices":[["169","T_FIELD_TSCURRENT"],["164","T_FIELD_MINCELLVOLT"],["152","T_FIELD_SPEED"],["95","T_INSPECTION_HUGE"],["127","T_EBS_HUGE"],["106","T_TRACKDRIVE_HUGE"],["117","T_AUTOX_HUGE"],["138","T_SKIDPAD_HUGE"],["82","T_ACCEL_HUGE"],["34","T_INVALID_HUGE"],["67","T_MANUAL"],["95","T_INSPECTION"],["127","T_EBS"],["106","T_TRACKDRIVE"],["117","T_AUTOX"],["138","T_SKIDPAD"],["82","T_ACCEL"],["136","T___SINGLEUSE_K26P"],["146","T___SINGLEUSE_0FBJ"],["173","T___SINGLEUSE_4OBM"],["170","T___SINGLEUSE_PHFD"],["158","T___SINGLEUSE_H6UX"],["136","T___SINGLEUSE_20H3"],["17","T___SINGLEUSE_SDGP"],["51","T___SINGLEUSE_M5X7"],["0","T___SINGLEUSE_6GPV"]]}

View File

@ -1 +1 @@
{"languages":["GB"],"textids":["T_INSPECTION_HUGE","T_EBS_HUGE","T_TRACKDRIVE_HUGE","T_AUTOX_HUGE","T_SKIDPAD_HUGE","T_ACCEL_HUGE","T_INVALID_HUGE","T_MANUAL","T_INSPECTION","T_EBS","T_TRACKDRIVE","T_AUTOX","T_SKIDPAD","T_ACCEL","T___SINGLEUSE_20H3","T___SINGLEUSE_SDGP","T___SINGLEUSE_M5X7","T___SINGLEUSE_6GPV"]}
{"languages":["GB"],"textids":["T_FIELD_TSCURRENT","T_FIELD_MINCELLVOLT","T_FIELD_SPEED","T_INSPECTION_HUGE","T_EBS_HUGE","T_TRACKDRIVE_HUGE","T_AUTOX_HUGE","T_SKIDPAD_HUGE","T_ACCEL_HUGE","T_INVALID_HUGE","T_MANUAL","T_INSPECTION","T_EBS","T_TRACKDRIVE","T_AUTOX","T_SKIDPAD","T_ACCEL","T___SINGLEUSE_K26P","T___SINGLEUSE_0FBJ","T___SINGLEUSE_4OBM","T___SINGLEUSE_PHFD","T___SINGLEUSE_H6UX","T___SINGLEUSE_20H3","T___SINGLEUSE_SDGP","T___SINGLEUSE_M5X7","T___SINGLEUSE_6GPV"]}

View File

@ -1 +1 @@
{"remap":"yes","languages":["Gb"],"characters":[67,104,111,111,115,101,32,97,32,109,105,115,115,105,111,110,0,67,117,114,114,101,110,116,32,77,105,115,115,105,111,110,58,0,73,110,118,97,108,105,100,32,77,105,115,115,105,111,110,33,0,73,110,118,97,108,105,100,32,77,105,115,115,105,111,110,0,77,97,110,117,97,108,32,68,114,105,118,105,110,103,0,65,99,99,101,108,101,114,97,116,105,111,110,0,73,110,115,112,101,99,116,105,111,110,0,84,114,97,99,107,100,114,105,118,101,0,65,117,116,111,99,114,111,115,115,0,69,66,83,32,84,101,115,116,0,2,0,83,107,105,100,112,97,100,0]}
{"remap":"yes","languages":["Gb"],"characters":[67,104,111,111,115,101,32,97,32,109,105,115,115,105,111,110,0,67,117,114,114,101,110,116,32,77,105,115,115,105,111,110,58,0,73,110,118,97,108,105,100,32,77,105,115,115,105,111,110,33,0,73,110,118,97,108,105,100,32,77,105,115,115,105,111,110,0,77,97,110,117,97,108,32,68,114,105,118,105,110,103,0,65,99,99,101,108,101,114,97,116,105,111,110,0,73,110,115,112,101,99,116,105,111,110,0,84,114,97,99,107,100,114,105,118,101,0,65,117,116,111,99,114,111,115,115,0,69,66,83,32,84,101,115,116,0,2,0,83,107,105,100,112,97,100,0,70,73,69,76,68,0,83,80,69,69,68,0,84,73,82,69,83,0,86,77,73,78,0,73,84,83,0,76,86,0]}

View File

@ -1 +1 @@
{"databases":{"DEFAULT":[[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]]},"database_list":["DEFAULT"],"fonts":{"getFont_verdana_20_4bpp":0,"getFont_CHINN____30_4bpp":1,"getFont_CHINN____20_4bpp":2,"getFont_CHINN____40_4bpp":3,"getFont_lucon_TTF_50_4bpp":4},"generate_font_format":"0"}
{"databases":{"DEFAULT":[[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[3,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]]},"database_list":["DEFAULT"],"fonts":{"getFont_verdana_20_4bpp":0,"getFont_CHINN____30_4bpp":1,"getFont_CHINN____20_4bpp":2,"getFont_CHINN____40_4bpp":3,"getFont_lucon_TTF_50_4bpp":4},"generate_font_format":"0"}

View File

@ -12,6 +12,9 @@ enum LANGUAGES
enum TEXTS
{
T_FIELD_TSCURRENT,
T_FIELD_MINCELLVOLT,
T_FIELD_SPEED,
T_INSPECTION_HUGE,
T_EBS_HUGE,
T_TRACKDRIVE_HUGE,
@ -26,6 +29,11 @@ enum TEXTS
T_AUTOX,
T_SKIDPAD,
T_ACCEL,
T___SINGLEUSE_K26P,
T___SINGLEUSE_0FBJ,
T___SINGLEUSE_4OBM,
T___SINGLEUSE_PHFD,
T___SINGLEUSE_H6UX,
T___SINGLEUSE_20H3,
T___SINGLEUSE_SDGP,
T___SINGLEUSE_M5X7,

View File

@ -10,6 +10,9 @@ 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 = {
169, // T_FIELD_TSCURRENT: "ITS"
164, // T_FIELD_MINCELLVOLT: "VMIN"
152, // T_FIELD_SPEED: "SPEED"
95, // T_INSPECTION_HUGE: "Inspection"
127, // T_EBS_HUGE: "EBS Test"
106, // T_TRACKDRIVE_HUGE: "Trackdrive"
@ -24,6 +27,11 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
117, // T_AUTOX: "Autocross"
138, // T_SKIDPAD: "Skidpad"
82, // T_ACCEL: "Acceleration"
136, // T___SINGLEUSE_K26P: "<>"
146, // T___SINGLEUSE_0FBJ: "FIELD"
173, // T___SINGLEUSE_4OBM: "LV"
170, // T___SINGLEUSE_PHFD: "TS"
158, // T___SINGLEUSE_H6UX: "TIRES"
136, // T___SINGLEUSE_20H3: "<>"
17, // T___SINGLEUSE_SDGP: "Current Mission:"
51, // T___SINGLEUSE_M5X7: "Invalid Mission"

View File

@ -71,7 +71,13 @@ KEEP extern const touchgfx::Unicode::UnicodeChar texts_all_languages[] TEXT_LOCA
0x41, 0x75, 0x74, 0x6f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x0, // @117 "Autocross"
0x45, 0x42, 0x53, 0x20, 0x54, 0x65, 0x73, 0x74, 0x0, // @127 "EBS Test"
0x2, 0x0, // @136 "<>"
0x53, 0x6b, 0x69, 0x64, 0x70, 0x61, 0x64, 0x0 // @138 "Skidpad"
0x53, 0x6b, 0x69, 0x64, 0x70, 0x61, 0x64, 0x0, // @138 "Skidpad"
0x46, 0x49, 0x45, 0x4c, 0x44, 0x0, // @146 "FIELD"
0x53, 0x50, 0x45, 0x45, 0x44, 0x0, // @152 "SPEED"
0x54, 0x49, 0x52, 0x45, 0x53, 0x0, // @158 "TIRES"
0x56, 0x4d, 0x49, 0x4e, 0x0, // @164 "VMIN"
0x49, 0x54, 0x53, 0x0, // @169 "ITS"
0x4c, 0x56, 0x0 // @173 "LV"
};
TEXT_LOCATION_FLASH_PRAGMA

View File

@ -24,6 +24,9 @@ extern const touchgfx::TypedText::TypedTextData* const typedTextDatabaseArray[];
TEXT_LOCATION_FLASH_PRAGMA
const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
@ -39,6 +42,11 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 4, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 4, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 1, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 1, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }