From 67b19368b0c749498a47ad44c952cdbf0793f449 Mon Sep 17 00:00:00 2001 From: "Jasper v. Blanckenburg" Date: Wed, 24 May 2023 01:28:41 +0200 Subject: [PATCH] Declutter driver view --- TouchGFX/assets/texts/texts.xml | 14 +- .../fonts/UnicodeListCHINN____20_4.txt | 1 + .../cache/Font_CHINN____20_4bppCpp.cache | 1 + .../fonts/src/Font_CHINN____20_4bpp_0.cpp | 10 + .../fonts/src/Table_CHINN____20_4bpp.cpp | 133 +++++----- .../driverview_screen/DriverViewViewBase.hpp | 33 +-- .../driverview_screen/DriverViewViewBase.cpp | 148 ++--------- .../texts/cache/LanguageCpp_Gb.cache | 2 +- .../texts/cache/TextKeysAndLanguages.cache | 2 +- TouchGFX/generated/texts/cache/TextsCpp.cache | 2 +- .../texts/cache/TypedTextDatabaseCpp.cache | 2 +- .../include/texts/TextKeysAndLanguages.hpp | 4 - TouchGFX/generated/texts/src/LanguageGb.cpp | 102 ++++---- TouchGFX/generated/texts/src/Texts.cpp | 68 ++--- .../generated/texts/src/TypedTextDatabase.cpp | 8 - .../gui/driverview_screen/DriverViewView.hpp | 1 + .../src/driverview_screen/DriverViewView.cpp | 25 +- TouchGFX/steering-wheel.touchgfx | 242 ++---------------- 18 files changed, 213 insertions(+), 585 deletions(-) diff --git a/TouchGFX/assets/texts/texts.xml b/TouchGFX/assets/texts/texts.xml index bc68b2c..1f5df5f 100644 --- a/TouchGFX/assets/texts/texts.xml +++ b/TouchGFX/assets/texts/texts.xml @@ -171,18 +171,9 @@ - - BAT - - - MOT - - - INV - <value> @@ -207,11 +198,8 @@ PRECHARGE - - LV - - TS + <value>% BRAKES diff --git a/TouchGFX/generated/fonts/UnicodeListCHINN____20_4.txt b/TouchGFX/generated/fonts/UnicodeListCHINN____20_4.txt index 1212a0c..6170c5a 100644 --- a/TouchGFX/generated/fonts/UnicodeListCHINN____20_4.txt +++ b/TouchGFX/generated/fonts/UnicodeListCHINN____20_4.txt @@ -1,4 +1,5 @@ 32 +37 46 48 49 diff --git a/TouchGFX/generated/fonts/cache/Font_CHINN____20_4bppCpp.cache b/TouchGFX/generated/fonts/cache/Font_CHINN____20_4bppCpp.cache index 9e6846d..b9cfe5d 100644 --- a/TouchGFX/generated/fonts/cache/Font_CHINN____20_4bppCpp.cache +++ b/TouchGFX/generated/fonts/cache/Font_CHINN____20_4bppCpp.cache @@ -1,5 +1,6 @@ AH:0 BA:1 FC:63 EC:0 FF:0 CF:1 32 +37 46 48 49 diff --git a/TouchGFX/generated/fonts/src/Font_CHINN____20_4bpp_0.cpp b/TouchGFX/generated/fonts/src/Font_CHINN____20_4bpp_0.cpp index 2b96c92..1ce3ed8 100644 --- a/TouchGFX/generated/fonts/src/Font_CHINN____20_4bpp_0.cpp +++ b/TouchGFX/generated/fonts/src/Font_CHINN____20_4bpp_0.cpp @@ -4,6 +4,16 @@ FONT_GLYPH_LOCATION_FLASH_PRAGMA KEEP extern const uint8_t unicodes_CHINN____20_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = { // Unicode: [0x0020, space] // (Has no glyph data) + // Unicode: [0x0025, percent] + 0x00, 0xC6, 0xEF, 0x2A, 0x00, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0xFF, 0xFF, 0xEF, 0x03, + 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0xFF, 0xFF, 0xFF, 0x0C, 0xAA, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xF8, 0xFF, 0x95, 0xFF, 0x1F, 0xAA, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xB8, 0xFF, + 0x1F, 0xAA, 0x00, 0x30, 0x77, 0x04, 0x00, 0xF4, 0xFF, 0xFF, 0xFF, 0x0C, 0xAA, 0x00, 0xF9, 0xFF, + 0xBF, 0x01, 0x90, 0xFF, 0xFF, 0xEF, 0x03, 0xAA, 0x80, 0xFF, 0xFF, 0xFF, 0x0B, 0x00, 0xC6, 0xEF, + 0x2A, 0x00, 0xAA, 0xE1, 0xFF, 0xFF, 0xFF, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xF3, 0xFF, + 0x25, 0xFF, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0xF2, 0xFF, 0x79, 0xFF, 0x5F, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xAA, 0xC0, 0xFF, 0xFF, 0xFF, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x30, + 0xFE, 0xFF, 0xFF, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x00, 0xA2, 0xFE, 0x4C, 0x00, // Unicode: [0x002E, period] 0xD6, 0xDD, 0x07, 0xF7, 0xFF, 0x08, 0xF7, 0xFF, 0x08, 0xF7, 0xFF, 0x08, // Unicode: [0x0030, zero] diff --git a/TouchGFX/generated/fonts/src/Table_CHINN____20_4bpp.cpp b/TouchGFX/generated/fonts/src/Table_CHINN____20_4bpp.cpp index aa8b8f7..990be34 100644 --- a/TouchGFX/generated/fonts/src/Table_CHINN____20_4bpp.cpp +++ b/TouchGFX/generated/fonts/src/Table_CHINN____20_4bpp.cpp @@ -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; } diff --git a/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp b/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp index 0d7c331..2ce025b 100644 --- a/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp +++ b/TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp @@ -11,16 +11,16 @@ #include #include #include -#include +#include #include #include +#include #include #include #include #include #include #include -#include #include class DriverViewViewBase : public touchgfx::View @@ -70,32 +70,9 @@ protected: */ touchgfx::Box __background; touchgfx::Container SoC; - touchgfx::LineProgress tsSoC; - touchgfx::PainterRGB565 tsSoCPainter; - touchgfx::LineProgress lvSoC; - touchgfx::PainterRGB565 lvSoCPainter; - touchgfx::TextArea tsSoCLabel; - touchgfx::TextArea lvSoCLabel; - touchgfx::Container drivetrainTemps; - touchgfx::Line batTempDiv; - touchgfx::PainterRGB565 batTempDivPainter; - Temperature batTempR; - Temperature batTempL; - touchgfx::TextArea batTempLabel; - touchgfx::Line dtDiv2; - touchgfx::PainterRGB565 dtDiv2Painter; - touchgfx::Line motorTempDiv; - touchgfx::PainterRGB565 motorTempDivPainter; - Temperature motorTempR; - Temperature motorTempL; - touchgfx::TextArea motorTempLabel; - touchgfx::Line dtDiv1; - touchgfx::PainterRGB565 dtDiv1Painter; - touchgfx::Line invTempDiv; - touchgfx::PainterRGB565 invTempDivPainter; - Temperature invTempR; - Temperature invTempL; - touchgfx::TextArea invTempLabel; + touchgfx::LineProgress soc; + touchgfx::PainterRGB565 socPainter; + touchgfx::TextAreaWithOneWildcard socLabel; touchgfx::Container brakeTemps; touchgfx::Line btDivVert; touchgfx::PainterRGB565 btDivVertPainter; diff --git a/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp b/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp index 0ced355..d73c606 100644 --- a/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp +++ b/TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp @@ -16,134 +16,28 @@ DriverViewViewBase::DriverViewViewBase() : __background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0)); add(__background); - SoC.setPosition(12, 125, 152, 180); - tsSoC.setXY(0, 25); - tsSoC.setProgressIndicatorPosition(0, 0, 40, 150); - tsSoC.setRange(0, 100); - tsSoC.setBackground(touchgfx::Bitmap(BITMAP_BAT_BAR_BG_ID)); - tsSoCPainter.setColor(touchgfx::Color::getColorFromRGB(136, 255, 0)); - tsSoC.setPainter(tsSoCPainter); - tsSoC.setStart(9, 150); - tsSoC.setEnd(9, 0); - tsSoC.setLineWidth(100); - tsSoC.setLineEndingStyle(touchgfx::Line::BUTT_CAP_ENDING); - tsSoC.setValue(60); - SoC.add(tsSoC); + SoC.setPosition(12, 277, 456, 33); + soc.setXY(0, 0); + soc.setProgressIndicatorPosition(0, 0, 456, 33); + soc.setRange(0, 100); + soc.setBackground(touchgfx::Bitmap(BITMAP_PROG_HORIZ_BG_ID)); + socPainter.setColor(touchgfx::Color::getColorFromRGB(136, 255, 0)); + soc.setPainter(socPainter); + soc.setStart(0, 16); + soc.setEnd(456, 16); + soc.setLineWidth(100); + soc.setLineEndingStyle(touchgfx::Line::BUTT_CAP_ENDING); + soc.setValue(60); + SoC.add(soc); - lvSoC.setXY(95, 25); - lvSoC.setProgressIndicatorPosition(0, 0, 40, 150); - lvSoC.setRange(0, 100); - lvSoC.setBackground(touchgfx::Bitmap(BITMAP_BAT_BAR_BG_ID)); - lvSoCPainter.setColor(touchgfx::Color::getColorFromRGB(136, 255, 0)); - lvSoC.setPainter(lvSoCPainter); - lvSoC.setStart(9, 150); - lvSoC.setEnd(9, 0); - lvSoC.setLineWidth(100); - lvSoC.setLineEndingStyle(touchgfx::Line::BUTT_CAP_ENDING); - lvSoC.setValue(80); - SoC.add(lvSoC); - - tsSoCLabel.setPosition(0, 0, 40, 25); - tsSoCLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - tsSoCLabel.setLinespacing(0); - tsSoCLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_PHFD)); - SoC.add(tsSoCLabel); - - lvSoCLabel.setPosition(95, 0, 40, 25); - lvSoCLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - lvSoCLabel.setLinespacing(0); - lvSoCLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_4OBM)); - SoC.add(lvSoCLabel); + socLabel.setPosition(188, 4, 81, 25); + socLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); + socLabel.setLinespacing(0); + socLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_PHFD)); + SoC.add(socLabel); add(SoC); - drivetrainTemps.setPosition(316, 125, 152, 185); - batTempDiv.setPosition(60, 124, 3, 60); - batTempDivPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - batTempDiv.setPainter(batTempDivPainter); - batTempDiv.setStart(0, 0); - batTempDiv.setEnd(0, 320); - batTempDiv.setLineWidth(10); - batTempDiv.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING); - drivetrainTemps.add(batTempDiv); - - batTempR.setXY(63, 124); - drivetrainTemps.add(batTempR); - - batTempL.setXY(0, 124); - drivetrainTemps.add(batTempL); - - batTempLabel.setPosition(123, 124, 25, 60); - batTempLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - batTempLabel.setLinespacing(0); - batTempLabel.setRotation(touchgfx::TEXT_ROTATE_90); - batTempLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_L1J7)); - drivetrainTemps.add(batTempLabel); - - dtDiv2.setPosition(0, 122, 123, 2); - dtDiv2Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - dtDiv2.setPainter(dtDiv2Painter); - dtDiv2.setStart(0, 0); - dtDiv2.setEnd(123, 0); - dtDiv2.setLineWidth(10); - dtDiv2.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING); - drivetrainTemps.add(dtDiv2); - - motorTempDiv.setPosition(60, 62, 3, 60); - motorTempDivPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - motorTempDiv.setPainter(motorTempDivPainter); - motorTempDiv.setStart(0, 0); - motorTempDiv.setEnd(0, 320); - motorTempDiv.setLineWidth(10); - motorTempDiv.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING); - drivetrainTemps.add(motorTempDiv); - - motorTempR.setXY(63, 62); - drivetrainTemps.add(motorTempR); - - motorTempL.setXY(0, 62); - drivetrainTemps.add(motorTempL); - - motorTempLabel.setPosition(123, 62, 25, 60); - motorTempLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - motorTempLabel.setLinespacing(0); - motorTempLabel.setRotation(touchgfx::TEXT_ROTATE_90); - motorTempLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_JN2J)); - drivetrainTemps.add(motorTempLabel); - - dtDiv1.setPosition(0, 60, 123, 2); - dtDiv1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - dtDiv1.setPainter(dtDiv1Painter); - dtDiv1.setStart(0, 0); - dtDiv1.setEnd(123, 0); - dtDiv1.setLineWidth(10); - dtDiv1.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING); - drivetrainTemps.add(dtDiv1); - - invTempDiv.setPosition(60, 0, 3, 60); - invTempDivPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - invTempDiv.setPainter(invTempDivPainter); - invTempDiv.setStart(0, 0); - invTempDiv.setEnd(0, 320); - invTempDiv.setLineWidth(10); - invTempDiv.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING); - drivetrainTemps.add(invTempDiv); - - invTempR.setXY(63, 0); - drivetrainTemps.add(invTempR); - - invTempL.setXY(0, 0); - drivetrainTemps.add(invTempL); - - invTempLabel.setPosition(123, 0, 25, 60); - invTempLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - invTempLabel.setLinespacing(0); - invTempLabel.setRotation(touchgfx::TEXT_ROTATE_90); - invTempLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_ZP7N)); - drivetrainTemps.add(invTempLabel); - - add(drivetrainTemps); - brakeTemps.setPosition(164, 125, 152, 150); btDivVert.setPosition(74, 25, 3, 123); btDivVertPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); @@ -274,12 +168,6 @@ DriverViewViewBase::~DriverViewViewBase() void DriverViewViewBase::setupScreen() { - batTempR.initialize(); - batTempL.initialize(); - motorTempR.initialize(); - motorTempL.initialize(); - invTempR.initialize(); - invTempL.initialize(); brakeTempRR.initialize(); brakeTempFR.initialize(); brakeTempRL.initialize(); diff --git a/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache b/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache index 2add969..7285b0b 100644 --- a/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache +++ b/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache @@ -1 +1 @@ -{"remap":"yes","language":"GB","language_index":0,"indices":[["350","T_LV"],["334","T_PDU"],["342","T_SCS"],["346","T_SDC"],["338","T_R2D"],["327","T_TS"],["322","T_INV"],["318","T_AMS"],["128","T_ERROR_AMS"],["167","T_DEBUGVIEWFIELD_TITLE"],["167","T_DRIVERVIEWFIELD_TITLE"],["167","T_NUMBERSMALLWILDCARD"],["278","T_FIELD_BBAL"],["247","T_FIELD_TSVOLTVEH"],["240","T_FIELD_TSVOLTBAT"],["260","T_FIELD_LVSOC"],["272","T_FIELD_TSSOC"],["288","T_FIELD_MAXCELLTEMP"],["293","T_FIELD_TIREFL"],["298","T_FIELD_TIREFR"],["303","T_FIELD_TIRERL"],["308","T_FIELD_TIRERR"],["283","T_FIELD_LAPCOUNT"],["177","T_FIELD_INICHKSTATE"],["254","T_FIELD_ERR"],["346","T_FIELD_SDC"],["193","T_FIELD_INVRREADY"],["185","T_FIELD_INVLREADY"],["209","T_FIELD_R2DPROGRESS"],["201","T_FIELD_ACTIVEMISSION"],["169","T_FIELD_ASSTATE"],["225","T_FIELD_TSSTATE"],["167","T_NUMBERWILDCARD"],["167","T_DEFAULTWILDCARD_CENTERED"],["167","T_DEFAULTWILDCARD_RIGHTALIGNED"],["326","T_FIELD_TSCURRENT"],["313","T_FIELD_MINCELLVOLT"],["266","T_FIELD_SPEED"],["95","T_INSPECTION_HUGE"],["158","T_EBS_HUGE"],["117","T_TRACKDRIVE_HUGE"],["138","T_AUTOX_HUGE"],["217","T_SKIDPAD_HUGE"],["82","T_ACCEL_HUGE"],["34","T_INVALID_HUGE"],["67","T_MANUAL"],["95","T_INSPECTION"],["158","T_EBS"],["117","T_TRACKDRIVE"],["138","T_AUTOX"],["217","T_SKIDPAD"],["82","T_ACCEL"],["243","T___SINGLEUSE_L1J7"],["16","T___SINGLEUSE_F9I5"],["330","T___SINGLEUSE_JN2J"],["322","T___SINGLEUSE_ZP7N"],["167","T___SINGLEUSE_9L8R"],["16","T___SINGLEUSE_1NKF"],["167","T___SINGLEUSE_J5UH"],["338","T___SINGLEUSE_NGUK"],["167","T___SINGLEUSE_4E84"],["167","T___SINGLEUSE_YTAB"],["106","T___SINGLEUSE_RWCE"],["148","T___SINGLEUSE_HMH2"],["350","T___SINGLEUSE_4OBM"],["327","T___SINGLEUSE_PHFD"],["233","T___SINGLEUSE_H6UX"],["167","T___SINGLEUSE_20H3"],["17","T___SINGLEUSE_SDGP"],["51","T___SINGLEUSE_M5X7"],["0","T___SINGLEUSE_6GPV"]]} \ No newline at end of file +{"remap":"yes","language":"GB","language_index":0,"indices":[["349","T_LV"],["333","T_PDU"],["341","T_SCS"],["345","T_SDC"],["337","T_R2D"],["330","T_TS"],["325","T_INV"],["321","T_AMS"],["128","T_ERROR_AMS"],["170","T_DEBUGVIEWFIELD_TITLE"],["170","T_DRIVERVIEWFIELD_TITLE"],["170","T_NUMBERSMALLWILDCARD"],["281","T_FIELD_BBAL"],["250","T_FIELD_TSVOLTVEH"],["243","T_FIELD_TSVOLTBAT"],["263","T_FIELD_LVSOC"],["275","T_FIELD_TSSOC"],["291","T_FIELD_MAXCELLTEMP"],["296","T_FIELD_TIREFL"],["301","T_FIELD_TIREFR"],["306","T_FIELD_TIRERL"],["311","T_FIELD_TIRERR"],["286","T_FIELD_LAPCOUNT"],["180","T_FIELD_INICHKSTATE"],["257","T_FIELD_ERR"],["345","T_FIELD_SDC"],["196","T_FIELD_INVRREADY"],["188","T_FIELD_INVLREADY"],["212","T_FIELD_R2DPROGRESS"],["204","T_FIELD_ACTIVEMISSION"],["172","T_FIELD_ASSTATE"],["228","T_FIELD_TSSTATE"],["170","T_NUMBERWILDCARD"],["170","T_DEFAULTWILDCARD_CENTERED"],["170","T_DEFAULTWILDCARD_RIGHTALIGNED"],["329","T_FIELD_TSCURRENT"],["316","T_FIELD_MINCELLVOLT"],["269","T_FIELD_SPEED"],["95","T_INSPECTION_HUGE"],["161","T_EBS_HUGE"],["117","T_TRACKDRIVE_HUGE"],["138","T_AUTOX_HUGE"],["220","T_SKIDPAD_HUGE"],["82","T_ACCEL_HUGE"],["34","T_INVALID_HUGE"],["67","T_MANUAL"],["95","T_INSPECTION"],["161","T_EBS"],["117","T_TRACKDRIVE"],["138","T_AUTOX"],["220","T_SKIDPAD"],["82","T_ACCEL"],["16","T___SINGLEUSE_F9I5"],["170","T___SINGLEUSE_9L8R"],["16","T___SINGLEUSE_1NKF"],["170","T___SINGLEUSE_J5UH"],["337","T___SINGLEUSE_NGUK"],["170","T___SINGLEUSE_4E84"],["170","T___SINGLEUSE_YTAB"],["106","T___SINGLEUSE_RWCE"],["148","T___SINGLEUSE_HMH2"],["158","T___SINGLEUSE_PHFD"],["236","T___SINGLEUSE_H6UX"],["170","T___SINGLEUSE_20H3"],["17","T___SINGLEUSE_SDGP"],["51","T___SINGLEUSE_M5X7"],["0","T___SINGLEUSE_6GPV"]]} \ No newline at end of file diff --git a/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache b/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache index 594fffd..221471c 100644 --- a/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache +++ b/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache @@ -1 +1 @@ -{"languages":["GB"],"textids":["T_LV","T_PDU","T_SCS","T_SDC","T_R2D","T_TS","T_INV","T_AMS","T_ERROR_AMS","T_DEBUGVIEWFIELD_TITLE","T_DRIVERVIEWFIELD_TITLE","T_NUMBERSMALLWILDCARD","T_FIELD_BBAL","T_FIELD_TSVOLTVEH","T_FIELD_TSVOLTBAT","T_FIELD_LVSOC","T_FIELD_TSSOC","T_FIELD_MAXCELLTEMP","T_FIELD_TIREFL","T_FIELD_TIREFR","T_FIELD_TIRERL","T_FIELD_TIRERR","T_FIELD_LAPCOUNT","T_FIELD_INICHKSTATE","T_FIELD_ERR","T_FIELD_SDC","T_FIELD_INVRREADY","T_FIELD_INVLREADY","T_FIELD_R2DPROGRESS","T_FIELD_ACTIVEMISSION","T_FIELD_ASSTATE","T_FIELD_TSSTATE","T_NUMBERWILDCARD","T_DEFAULTWILDCARD_CENTERED","T_DEFAULTWILDCARD_RIGHTALIGNED","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_L1J7","T___SINGLEUSE_F9I5","T___SINGLEUSE_JN2J","T___SINGLEUSE_ZP7N","T___SINGLEUSE_9L8R","T___SINGLEUSE_1NKF","T___SINGLEUSE_J5UH","T___SINGLEUSE_NGUK","T___SINGLEUSE_4E84","T___SINGLEUSE_YTAB","T___SINGLEUSE_RWCE","T___SINGLEUSE_HMH2","T___SINGLEUSE_4OBM","T___SINGLEUSE_PHFD","T___SINGLEUSE_H6UX","T___SINGLEUSE_20H3","T___SINGLEUSE_SDGP","T___SINGLEUSE_M5X7","T___SINGLEUSE_6GPV"]} \ No newline at end of file +{"languages":["GB"],"textids":["T_LV","T_PDU","T_SCS","T_SDC","T_R2D","T_TS","T_INV","T_AMS","T_ERROR_AMS","T_DEBUGVIEWFIELD_TITLE","T_DRIVERVIEWFIELD_TITLE","T_NUMBERSMALLWILDCARD","T_FIELD_BBAL","T_FIELD_TSVOLTVEH","T_FIELD_TSVOLTBAT","T_FIELD_LVSOC","T_FIELD_TSSOC","T_FIELD_MAXCELLTEMP","T_FIELD_TIREFL","T_FIELD_TIREFR","T_FIELD_TIRERL","T_FIELD_TIRERR","T_FIELD_LAPCOUNT","T_FIELD_INICHKSTATE","T_FIELD_ERR","T_FIELD_SDC","T_FIELD_INVRREADY","T_FIELD_INVLREADY","T_FIELD_R2DPROGRESS","T_FIELD_ACTIVEMISSION","T_FIELD_ASSTATE","T_FIELD_TSSTATE","T_NUMBERWILDCARD","T_DEFAULTWILDCARD_CENTERED","T_DEFAULTWILDCARD_RIGHTALIGNED","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_F9I5","T___SINGLEUSE_9L8R","T___SINGLEUSE_1NKF","T___SINGLEUSE_J5UH","T___SINGLEUSE_NGUK","T___SINGLEUSE_4E84","T___SINGLEUSE_YTAB","T___SINGLEUSE_RWCE","T___SINGLEUSE_HMH2","T___SINGLEUSE_PHFD","T___SINGLEUSE_H6UX","T___SINGLEUSE_20H3","T___SINGLEUSE_SDGP","T___SINGLEUSE_M5X7","T___SINGLEUSE_6GPV"]} \ No newline at end of file diff --git a/TouchGFX/generated/texts/cache/TextsCpp.cache b/TouchGFX/generated/texts/cache/TextsCpp.cache index 7bcbf5b..711ebc3 100644 --- a/TouchGFX/generated/texts/cache/TextsCpp.cache +++ b/TouchGFX/generated/texts/cache/TextsCpp.cache @@ -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,80,65,82,65,77,69,84,69,82,83,0,84,114,97,99,107,100,114,105,118,101,0,65,77,83,32,69,114,114,79,114,0,65,117,116,111,99,114,111,115,115,0,80,82,69,67,72,65,82,71,69,0,69,66,83,32,84,101,115,116,0,2,0,65,83,83,84,65,84,69,0,73,67,83,84,65,84,69,0,73,78,86,76,82,68,89,0,73,78,86,82,82,68,89,0,77,73,83,83,73,79,78,0,82,50,68,80,82,79,71,0,83,107,105,100,112,97,100,0,84,83,83,84,65,84,69,0,66,82,65,75,69,83,0,84,83,86,66,65,84,0,84,83,86,86,69,72,0,69,82,82,79,82,0,76,86,83,79,67,0,83,80,69,69,68,0,84,83,83,79,67,0,66,66,65,76,0,76,65,80,83,0,84,77,65,88,0,84,84,70,76,0,84,84,70,82,0,84,84,82,76,0,84,84,82,82,0,86,77,73,78,0,65,77,83,0,73,78,86,0,73,84,83,0,77,79,84,0,80,68,85,0,82,50,68,0,83,67,83,0,83,68,67,0,76,86,0]} \ No newline at end of file +{"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,80,65,82,65,77,69,84,69,82,83,0,84,114,97,99,107,100,114,105,118,101,0,65,77,83,32,69,114,114,79,114,0,65,117,116,111,99,114,111,115,115,0,80,82,69,67,72,65,82,71,69,0,2,37,0,69,66,83,32,84,101,115,116,0,2,0,65,83,83,84,65,84,69,0,73,67,83,84,65,84,69,0,73,78,86,76,82,68,89,0,73,78,86,82,82,68,89,0,77,73,83,83,73,79,78,0,82,50,68,80,82,79,71,0,83,107,105,100,112,97,100,0,84,83,83,84,65,84,69,0,66,82,65,75,69,83,0,84,83,86,66,65,84,0,84,83,86,86,69,72,0,69,82,82,79,82,0,76,86,83,79,67,0,83,80,69,69,68,0,84,83,83,79,67,0,66,66,65,76,0,76,65,80,83,0,84,77,65,88,0,84,84,70,76,0,84,84,70,82,0,84,84,82,76,0,84,84,82,82,0,86,77,73,78,0,65,77,83,0,73,78,86,0,73,84,83,0,80,68,85,0,82,50,68,0,83,67,83,0,83,68,67,0,76,86,0]} \ No newline at end of file diff --git a/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache b/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache index 96bd884..0d59665 100644 --- a/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache +++ b/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache @@ -1 +1 @@ -{"databases":{"GB":[[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[3,"CENTER","LTR"],[5,"LEFT","LTR"],[2,"CENTER","LTR"],[6,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"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"],[0,"CENTER","LTR"],[0,"RIGHT","LTR"],[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"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"CENTER","LTR"],[1,"RIGHT","LTR"],[1,"LEFT","LTR"],[4,"RIGHT","LTR"],[1,"LEFT","LTR"],[1,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]],"DEFAULT":[[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[3,"CENTER","LTR"],[5,"LEFT","LTR"],[2,"CENTER","LTR"],[6,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"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"],[0,"CENTER","LTR"],[0,"RIGHT","LTR"],[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"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"CENTER","LTR"],[1,"RIGHT","LTR"],[1,"LEFT","LTR"],[4,"RIGHT","LTR"],[1,"LEFT","LTR"],[1,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]]},"database_list":["GB"],"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,"getFont_verdanab_20_4bpp":5,"getFont_lucon_TTF_33_4bpp":6},"generate_font_format":"0"} \ No newline at end of file +{"databases":{"GB":[[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[3,"CENTER","LTR"],[5,"LEFT","LTR"],[2,"CENTER","LTR"],[6,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"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"],[0,"CENTER","LTR"],[0,"RIGHT","LTR"],[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"],[2,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"CENTER","LTR"],[1,"RIGHT","LTR"],[1,"LEFT","LTR"],[4,"RIGHT","LTR"],[1,"LEFT","LTR"],[1,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]],"DEFAULT":[[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[3,"CENTER","LTR"],[5,"LEFT","LTR"],[2,"CENTER","LTR"],[6,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[2,"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"],[0,"CENTER","LTR"],[0,"RIGHT","LTR"],[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"],[2,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"CENTER","LTR"],[1,"RIGHT","LTR"],[1,"LEFT","LTR"],[4,"RIGHT","LTR"],[1,"LEFT","LTR"],[1,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"CENTER","LTR"],[4,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]]},"database_list":["GB"],"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,"getFont_verdanab_20_4bpp":5,"getFont_lucon_TTF_33_4bpp":6},"generate_font_format":"0"} \ No newline at end of file diff --git a/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp b/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp index 364b47a..29fd102 100644 --- a/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp +++ b/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp @@ -64,10 +64,7 @@ enum TEXTS T_AUTOX, T_SKIDPAD, T_ACCEL, - T___SINGLEUSE_L1J7, T___SINGLEUSE_F9I5, - T___SINGLEUSE_JN2J, - T___SINGLEUSE_ZP7N, T___SINGLEUSE_9L8R, T___SINGLEUSE_1NKF, T___SINGLEUSE_J5UH, @@ -76,7 +73,6 @@ enum TEXTS T___SINGLEUSE_YTAB, T___SINGLEUSE_RWCE, T___SINGLEUSE_HMH2, - T___SINGLEUSE_4OBM, T___SINGLEUSE_PHFD, T___SINGLEUSE_H6UX, T___SINGLEUSE_20H3, diff --git a/TouchGFX/generated/texts/src/LanguageGb.cpp b/TouchGFX/generated/texts/src/LanguageGb.cpp index 19de628..42ba6d7 100644 --- a/TouchGFX/generated/texts/src/LanguageGb.cpp +++ b/TouchGFX/generated/texts/src/LanguageGb.cpp @@ -10,74 +10,70 @@ 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 = { - 350, // T_LV: "LV" - 334, // T_PDU: "PDU" - 342, // T_SCS: "SCS" - 346, // T_SDC: "SDC" - 338, // T_R2D: "R2D" - 327, // T_TS: "TS" - 322, // T_INV: "INV" - 318, // T_AMS: "AMS" + 349, // T_LV: "LV" + 333, // T_PDU: "PDU" + 341, // T_SCS: "SCS" + 345, // T_SDC: "SDC" + 337, // T_R2D: "R2D" + 330, // T_TS: "TS" + 325, // T_INV: "INV" + 321, // T_AMS: "AMS" 128, // T_ERROR_AMS: "AMS ErrOr" - 167, // T_DEBUGVIEWFIELD_TITLE: "<>" - 167, // T_DRIVERVIEWFIELD_TITLE: "<>" - 167, // T_NUMBERSMALLWILDCARD: "<>" - 278, // T_FIELD_BBAL: "BBAL" - 247, // T_FIELD_TSVOLTVEH: "TSVVEH" - 240, // T_FIELD_TSVOLTBAT: "TSVBAT" - 260, // T_FIELD_LVSOC: "LVSOC" - 272, // T_FIELD_TSSOC: "TSSOC" - 288, // T_FIELD_MAXCELLTEMP: "TMAX" - 293, // T_FIELD_TIREFL: "TTFL" - 298, // T_FIELD_TIREFR: "TTFR" - 303, // T_FIELD_TIRERL: "TTRL" - 308, // T_FIELD_TIRERR: "TTRR" - 283, // T_FIELD_LAPCOUNT: "LAPS" - 177, // T_FIELD_INICHKSTATE: "ICSTATE" - 254, // T_FIELD_ERR: "ERROR" - 346, // T_FIELD_SDC: "SDC" - 193, // T_FIELD_INVRREADY: "INVRRDY" - 185, // T_FIELD_INVLREADY: "INVLRDY" - 209, // T_FIELD_R2DPROGRESS: "R2DPROG" - 201, // T_FIELD_ACTIVEMISSION: "MISSION" - 169, // T_FIELD_ASSTATE: "ASSTATE" - 225, // T_FIELD_TSSTATE: "TSSTATE" - 167, // T_NUMBERWILDCARD: "<>" - 167, // T_DEFAULTWILDCARD_CENTERED: "<>" - 167, // T_DEFAULTWILDCARD_RIGHTALIGNED: "<>" - 326, // T_FIELD_TSCURRENT: "ITS" - 313, // T_FIELD_MINCELLVOLT: "VMIN" - 266, // T_FIELD_SPEED: "SPEED" + 170, // T_DEBUGVIEWFIELD_TITLE: "<>" + 170, // T_DRIVERVIEWFIELD_TITLE: "<>" + 170, // T_NUMBERSMALLWILDCARD: "<>" + 281, // T_FIELD_BBAL: "BBAL" + 250, // T_FIELD_TSVOLTVEH: "TSVVEH" + 243, // T_FIELD_TSVOLTBAT: "TSVBAT" + 263, // T_FIELD_LVSOC: "LVSOC" + 275, // T_FIELD_TSSOC: "TSSOC" + 291, // T_FIELD_MAXCELLTEMP: "TMAX" + 296, // T_FIELD_TIREFL: "TTFL" + 301, // T_FIELD_TIREFR: "TTFR" + 306, // T_FIELD_TIRERL: "TTRL" + 311, // T_FIELD_TIRERR: "TTRR" + 286, // T_FIELD_LAPCOUNT: "LAPS" + 180, // T_FIELD_INICHKSTATE: "ICSTATE" + 257, // T_FIELD_ERR: "ERROR" + 345, // T_FIELD_SDC: "SDC" + 196, // T_FIELD_INVRREADY: "INVRRDY" + 188, // T_FIELD_INVLREADY: "INVLRDY" + 212, // T_FIELD_R2DPROGRESS: "R2DPROG" + 204, // T_FIELD_ACTIVEMISSION: "MISSION" + 172, // T_FIELD_ASSTATE: "ASSTATE" + 228, // T_FIELD_TSSTATE: "TSSTATE" + 170, // T_NUMBERWILDCARD: "<>" + 170, // T_DEFAULTWILDCARD_CENTERED: "<>" + 170, // T_DEFAULTWILDCARD_RIGHTALIGNED: "<>" + 329, // T_FIELD_TSCURRENT: "ITS" + 316, // T_FIELD_MINCELLVOLT: "VMIN" + 269, // T_FIELD_SPEED: "SPEED" 95, // T_INSPECTION_HUGE: "Inspection" - 158, // T_EBS_HUGE: "EBS Test" + 161, // T_EBS_HUGE: "EBS Test" 117, // T_TRACKDRIVE_HUGE: "Trackdrive" 138, // T_AUTOX_HUGE: "Autocross" - 217, // T_SKIDPAD_HUGE: "Skidpad" + 220, // T_SKIDPAD_HUGE: "Skidpad" 82, // T_ACCEL_HUGE: "Acceleration" 34, // T_INVALID_HUGE: "Invalid Mission!" 67, // T_MANUAL: "Manual Driving" 95, // T_INSPECTION: "Inspection" - 158, // T_EBS: "EBS Test" + 161, // T_EBS: "EBS Test" 117, // T_TRACKDRIVE: "Trackdrive" 138, // T_AUTOX: "Autocross" - 217, // T_SKIDPAD: "Skidpad" + 220, // T_SKIDPAD: "Skidpad" 82, // T_ACCEL: "Acceleration" - 243, // T___SINGLEUSE_L1J7: "BAT" 16, // T___SINGLEUSE_F9I5: "" - 330, // T___SINGLEUSE_JN2J: "MOT" - 322, // T___SINGLEUSE_ZP7N: "INV" - 167, // T___SINGLEUSE_9L8R: "<>" + 170, // T___SINGLEUSE_9L8R: "<>" 16, // T___SINGLEUSE_1NKF: "" - 167, // T___SINGLEUSE_J5UH: "<>" - 338, // T___SINGLEUSE_NGUK: "R2D" - 167, // T___SINGLEUSE_4E84: "<>" - 167, // T___SINGLEUSE_YTAB: "<>" + 170, // T___SINGLEUSE_J5UH: "<>" + 337, // T___SINGLEUSE_NGUK: "R2D" + 170, // T___SINGLEUSE_4E84: "<>" + 170, // T___SINGLEUSE_YTAB: "<>" 106, // T___SINGLEUSE_RWCE: "PARAMETERS" 148, // T___SINGLEUSE_HMH2: "PRECHARGE" - 350, // T___SINGLEUSE_4OBM: "LV" - 327, // T___SINGLEUSE_PHFD: "TS" - 233, // T___SINGLEUSE_H6UX: "BRAKES" - 167, // T___SINGLEUSE_20H3: "<>" + 158, // T___SINGLEUSE_PHFD: "<>%" + 236, // T___SINGLEUSE_H6UX: "BRAKES" + 170, // T___SINGLEUSE_20H3: "<>" 17, // T___SINGLEUSE_SDGP: "Current Mission:" 51, // T___SINGLEUSE_M5X7: "Invalid Mission" 0 // T___SINGLEUSE_6GPV: "Choose a mission" diff --git a/TouchGFX/generated/texts/src/Texts.cpp b/TouchGFX/generated/texts/src/Texts.cpp index 621e078..692fa1a 100644 --- a/TouchGFX/generated/texts/src/Texts.cpp +++ b/TouchGFX/generated/texts/src/Texts.cpp @@ -72,40 +72,40 @@ KEEP extern const touchgfx::Unicode::UnicodeChar texts_all_languages[] TEXT_LOCA 0x41, 0x4d, 0x53, 0x20, 0x45, 0x72, 0x72, 0x4f, 0x72, 0x0, // @128 "AMS ErrOr" 0x41, 0x75, 0x74, 0x6f, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x0, // @138 "Autocross" 0x50, 0x52, 0x45, 0x43, 0x48, 0x41, 0x52, 0x47, 0x45, 0x0, // @148 "PRECHARGE" - 0x45, 0x42, 0x53, 0x20, 0x54, 0x65, 0x73, 0x74, 0x0, // @158 "EBS Test" - 0x2, 0x0, // @167 "<>" - 0x41, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @169 "ASSTATE" - 0x49, 0x43, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @177 "ICSTATE" - 0x49, 0x4e, 0x56, 0x4c, 0x52, 0x44, 0x59, 0x0, // @185 "INVLRDY" - 0x49, 0x4e, 0x56, 0x52, 0x52, 0x44, 0x59, 0x0, // @193 "INVRRDY" - 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x0, // @201 "MISSION" - 0x52, 0x32, 0x44, 0x50, 0x52, 0x4f, 0x47, 0x0, // @209 "R2DPROG" - 0x53, 0x6b, 0x69, 0x64, 0x70, 0x61, 0x64, 0x0, // @217 "Skidpad" - 0x54, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @225 "TSSTATE" - 0x42, 0x52, 0x41, 0x4b, 0x45, 0x53, 0x0, // @233 "BRAKES" - 0x54, 0x53, 0x56, 0x42, 0x41, 0x54, 0x0, // @240 "TSVBAT" - 0x54, 0x53, 0x56, 0x56, 0x45, 0x48, 0x0, // @247 "TSVVEH" - 0x45, 0x52, 0x52, 0x4f, 0x52, 0x0, // @254 "ERROR" - 0x4c, 0x56, 0x53, 0x4f, 0x43, 0x0, // @260 "LVSOC" - 0x53, 0x50, 0x45, 0x45, 0x44, 0x0, // @266 "SPEED" - 0x54, 0x53, 0x53, 0x4f, 0x43, 0x0, // @272 "TSSOC" - 0x42, 0x42, 0x41, 0x4c, 0x0, // @278 "BBAL" - 0x4c, 0x41, 0x50, 0x53, 0x0, // @283 "LAPS" - 0x54, 0x4d, 0x41, 0x58, 0x0, // @288 "TMAX" - 0x54, 0x54, 0x46, 0x4c, 0x0, // @293 "TTFL" - 0x54, 0x54, 0x46, 0x52, 0x0, // @298 "TTFR" - 0x54, 0x54, 0x52, 0x4c, 0x0, // @303 "TTRL" - 0x54, 0x54, 0x52, 0x52, 0x0, // @308 "TTRR" - 0x56, 0x4d, 0x49, 0x4e, 0x0, // @313 "VMIN" - 0x41, 0x4d, 0x53, 0x0, // @318 "AMS" - 0x49, 0x4e, 0x56, 0x0, // @322 "INV" - 0x49, 0x54, 0x53, 0x0, // @326 "ITS" - 0x4d, 0x4f, 0x54, 0x0, // @330 "MOT" - 0x50, 0x44, 0x55, 0x0, // @334 "PDU" - 0x52, 0x32, 0x44, 0x0, // @338 "R2D" - 0x53, 0x43, 0x53, 0x0, // @342 "SCS" - 0x53, 0x44, 0x43, 0x0, // @346 "SDC" - 0x4c, 0x56, 0x0 // @350 "LV" + 0x2, 0x25, 0x0, // @158 "<>%" + 0x45, 0x42, 0x53, 0x20, 0x54, 0x65, 0x73, 0x74, 0x0, // @161 "EBS Test" + 0x2, 0x0, // @170 "<>" + 0x41, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @172 "ASSTATE" + 0x49, 0x43, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @180 "ICSTATE" + 0x49, 0x4e, 0x56, 0x4c, 0x52, 0x44, 0x59, 0x0, // @188 "INVLRDY" + 0x49, 0x4e, 0x56, 0x52, 0x52, 0x44, 0x59, 0x0, // @196 "INVRRDY" + 0x4d, 0x49, 0x53, 0x53, 0x49, 0x4f, 0x4e, 0x0, // @204 "MISSION" + 0x52, 0x32, 0x44, 0x50, 0x52, 0x4f, 0x47, 0x0, // @212 "R2DPROG" + 0x53, 0x6b, 0x69, 0x64, 0x70, 0x61, 0x64, 0x0, // @220 "Skidpad" + 0x54, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @228 "TSSTATE" + 0x42, 0x52, 0x41, 0x4b, 0x45, 0x53, 0x0, // @236 "BRAKES" + 0x54, 0x53, 0x56, 0x42, 0x41, 0x54, 0x0, // @243 "TSVBAT" + 0x54, 0x53, 0x56, 0x56, 0x45, 0x48, 0x0, // @250 "TSVVEH" + 0x45, 0x52, 0x52, 0x4f, 0x52, 0x0, // @257 "ERROR" + 0x4c, 0x56, 0x53, 0x4f, 0x43, 0x0, // @263 "LVSOC" + 0x53, 0x50, 0x45, 0x45, 0x44, 0x0, // @269 "SPEED" + 0x54, 0x53, 0x53, 0x4f, 0x43, 0x0, // @275 "TSSOC" + 0x42, 0x42, 0x41, 0x4c, 0x0, // @281 "BBAL" + 0x4c, 0x41, 0x50, 0x53, 0x0, // @286 "LAPS" + 0x54, 0x4d, 0x41, 0x58, 0x0, // @291 "TMAX" + 0x54, 0x54, 0x46, 0x4c, 0x0, // @296 "TTFL" + 0x54, 0x54, 0x46, 0x52, 0x0, // @301 "TTFR" + 0x54, 0x54, 0x52, 0x4c, 0x0, // @306 "TTRL" + 0x54, 0x54, 0x52, 0x52, 0x0, // @311 "TTRR" + 0x56, 0x4d, 0x49, 0x4e, 0x0, // @316 "VMIN" + 0x41, 0x4d, 0x53, 0x0, // @321 "AMS" + 0x49, 0x4e, 0x56, 0x0, // @325 "INV" + 0x49, 0x54, 0x53, 0x0, // @329 "ITS" + 0x50, 0x44, 0x55, 0x0, // @333 "PDU" + 0x52, 0x32, 0x44, 0x0, // @337 "R2D" + 0x53, 0x43, 0x53, 0x0, // @341 "SCS" + 0x53, 0x44, 0x43, 0x0, // @345 "SDC" + 0x4c, 0x56, 0x0 // @349 "LV" }; TEXT_LOCATION_FLASH_PRAGMA diff --git a/TouchGFX/generated/texts/src/TypedTextDatabase.cpp b/TouchGFX/generated/texts/src/TypedTextDatabase.cpp index cdd9558..3c08d80 100644 --- a/TouchGFX/generated/texts/src/TypedTextDatabase.cpp +++ b/TouchGFX/generated/texts/src/TypedTextDatabase.cpp @@ -81,9 +81,6 @@ const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_F { 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 }, - { 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, - { 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 1, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR }, @@ -94,7 +91,6 @@ const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_F { 1, touchgfx::LEFT, 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 }, @@ -155,9 +151,6 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT { 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 }, - { 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, - { 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 1, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR }, @@ -168,7 +161,6 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT { 1, touchgfx::LEFT, 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 }, diff --git a/TouchGFX/gui/include/gui/driverview_screen/DriverViewView.hpp b/TouchGFX/gui/include/gui/driverview_screen/DriverViewView.hpp index d4f3136..0cea870 100644 --- a/TouchGFX/gui/include/gui/driverview_screen/DriverViewView.hpp +++ b/TouchGFX/gui/include/gui/driverview_screen/DriverViewView.hpp @@ -54,6 +54,7 @@ private: DataFieldType fieldTypes[NUM_FIELDS]; touchgfx::Unicode::UnicodeChar r2dProgBuffer[16]; + touchgfx::Unicode::UnicodeChar socBuffer[4]; }; #endif // DRIVERVIEWVIEW_HPP diff --git a/TouchGFX/gui/src/driverview_screen/DriverViewView.cpp b/TouchGFX/gui/src/driverview_screen/DriverViewView.cpp index 7ddc4c1..a92a715 100644 --- a/TouchGFX/gui/src/driverview_screen/DriverViewView.cpp +++ b/TouchGFX/gui/src/driverview_screen/DriverViewView.cpp @@ -43,15 +43,6 @@ void DriverViewView::setupScreen() { brakeTempRL.setTempThresholds(brakeThresholds); brakeTempRR.setSmallText(true); brakeTempRR.setTempThresholds(brakeThresholds); - int invThresholds[4] = {30, 40, 50, 60}; - invTempL.setTempThresholds(invThresholds); - invTempR.setTempThresholds(invThresholds); - int motorThresholds[4] = {30, 45, 60, 80}; - motorTempL.setTempThresholds(motorThresholds); - motorTempR.setTempThresholds(motorThresholds); - int batThresholds[4] = {30, 40, 50, 55}; - batTempL.setTempThresholds(batThresholds); - batTempR.setTempThresholds(batThresholds); } void DriverViewView::tearDownScreen() { DriverViewViewBase::tearDownScreen(); } @@ -94,17 +85,15 @@ void DriverViewView::setTemps(const Temperatures &temps) { brakeTempFR.setTemp(std::round(temps.brake_fr)); brakeTempRL.setTemp(std::round(temps.brake_rl)); brakeTempRR.setTemp(std::round(temps.brake_rr)); - invTempL.setTemp(std::round(temps.inv_l)); - invTempR.setTemp(std::round(temps.inv_r)); - motorTempL.setTemp(std::round(temps.mot_l)); - motorTempR.setTemp(std::round(temps.mot_r)); - batTempL.setTemp(std::round(temps.bat_l)); - batTempR.setTemp(std::round(temps.bat_r)); } -void DriverViewView::setTSSoC(uint8_t soc) { - tsSoC.setValue(soc); - tsSoC.invalidate(); +void DriverViewView::setTSSoC(uint8_t value) { + soc.setValue(value); + soc.invalidate(); + touchgfx::Unicode::itoa(value, socBuffer, + sizeof(socBuffer) / sizeof(*socBuffer), 10); + socLabel.setWildcard(socBuffer); + socLabel.invalidate(); } void DriverViewView::setProgress(bool active, DriverViewProgressType type, diff --git a/TouchGFX/steering-wheel.touchgfx b/TouchGFX/steering-wheel.touchgfx index abfb160..8e4f488 100644 --- a/TouchGFX/steering-wheel.touchgfx +++ b/TouchGFX/steering-wheel.touchgfx @@ -248,255 +248,43 @@ "Type": "Container", "Name": "SoC", "X": 12, - "Y": 125, - "Width": 152, - "Height": 180, + "Y": 277, + "Width": 456, + "Height": 33, "Components": [ { "Type": "LineProgress", - "Name": "tsSoC", - "Y": 25, - "Width": 40, - "Height": 150, + "Name": "soc", + "Width": 456, + "Height": 33, "Color": { "Red": 136, "Green": 255 }, - "StartX": 9.0, - "StartY": 150.0, - "EndX": 9.0, + "StartY": 16.0, + "EndY": 16.0, + "EndX": 456.0, "LineWidth": 100.0, "LineEndingStyle": "Butt", - "FileNameBackground": "bat_bar_bg.png", + "FileNameBackground": "prog_horiz_bg.png", "ProgressRangeMax": 100, "ProgressInitialValue": 60 }, - { - "Type": "LineProgress", - "Name": "lvSoC", - "X": 95, - "Y": 25, - "Width": 40, - "Height": 150, - "Color": { - "Red": 136, - "Green": 255 - }, - "StartX": 9.0, - "StartY": 150.0, - "EndX": 9.0, - "LineWidth": 100.0, - "LineEndingStyle": "Butt", - "FileNameBackground": "bat_bar_bg.png", - "ProgressRangeMax": 100, - "ProgressInitialValue": 80 - }, { "Type": "TextArea", - "Name": "tsSoCLabel", - "Width": 40, + "Name": "socLabel", + "X": 188, + "Y": 4, + "Width": 81, "Height": 25, "TextId": "__SingleUse_PHFD", "TextRotation": "0", - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - } - }, - { - "Type": "TextArea", - "Name": "lvSoCLabel", - "X": 95, - "Width": 40, - "Height": 25, - "TextId": "__SingleUse_4OBM", - "TextRotation": "0", - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - } - } - ] - }, - { - "Type": "Container", - "Name": "drivetrainTemps", - "X": 316, - "Y": 125, - "Width": 152, - "Height": 185, - "Components": [ - { - "Type": "Line", - "Name": "batTempDiv", - "X": 60, - "Y": 124, - "Width": 3, - "Height": 60, "Color": { "Red": 255, "Green": 255, "Blue": 255 }, - "EndY": 320.0, - "LineWidth": 10.0, - "LineEndingStyle": "Round" - }, - { - "Type": "CustomContainerInstance", - "Name": "batTempR", - "X": 63, - "Y": 124, - "Width": 60, - "Height": 60, - "CustomContainerDefinitionName": "Temperature" - }, - { - "Type": "CustomContainerInstance", - "Name": "batTempL", - "Y": 124, - "Width": 60, - "Height": 60, - "CustomContainerDefinitionName": "Temperature" - }, - { - "Type": "TextArea", - "Name": "batTempLabel", - "X": 123, - "Y": 124, - "Width": 25, - "Height": 60, - "TextId": "__SingleUse_L1J7", - "TextRotation": "90", - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - } - }, - { - "Type": "Line", - "Name": "dtDiv2", - "Y": 122, - "Width": 123, - "Height": 2, - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - }, - "EndX": 123.0, - "LineWidth": 10.0, - "LineEndingStyle": "Round" - }, - { - "Type": "Line", - "Name": "motorTempDiv", - "X": 60, - "Y": 62, - "Width": 3, - "Height": 60, - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - }, - "EndY": 320.0, - "LineWidth": 10.0, - "LineEndingStyle": "Round" - }, - { - "Type": "CustomContainerInstance", - "Name": "motorTempR", - "X": 63, - "Y": 62, - "Width": 60, - "Height": 60, - "CustomContainerDefinitionName": "Temperature" - }, - { - "Type": "CustomContainerInstance", - "Name": "motorTempL", - "Y": 62, - "Width": 60, - "Height": 60, - "CustomContainerDefinitionName": "Temperature" - }, - { - "Type": "TextArea", - "Name": "motorTempLabel", - "X": 123, - "Y": 62, - "Width": 25, - "Height": 60, - "TextId": "__SingleUse_JN2J", - "TextRotation": "90", - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - } - }, - { - "Type": "Line", - "Name": "dtDiv1", - "Y": 60, - "Width": 123, - "Height": 2, - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - }, - "EndX": 123.0, - "LineWidth": 10.0, - "LineEndingStyle": "Round" - }, - { - "Type": "Line", - "Name": "invTempDiv", - "X": 60, - "Width": 3, - "Height": 60, - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - }, - "EndY": 320.0, - "LineWidth": 10.0, - "LineEndingStyle": "Round" - }, - { - "Type": "CustomContainerInstance", - "Name": "invTempR", - "X": 63, - "Width": 60, - "Height": 60, - "CustomContainerDefinitionName": "Temperature" - }, - { - "Type": "CustomContainerInstance", - "Name": "invTempL", - "Width": 60, - "Height": 60, - "CustomContainerDefinitionName": "Temperature" - }, - { - "Type": "TextArea", - "Name": "invTempLabel", - "X": 123, - "Width": 25, - "Height": 60, - "TextId": "__SingleUse_ZP7N", - "TextRotation": "90", - "Color": { - "Red": 255, - "Green": 255, - "Blue": 255 - } + "Wildcard1": {} } ] },