Brake temps & pressures, total distance

This commit is contained in:
2023-05-19 15:36:23 +02:00
parent 243577fdcc
commit c159d9bda9
27 changed files with 461 additions and 71 deletions

View File

@ -13,20 +13,21 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
128, // T_ERROR_AMS: "AMS ErrOr"
176, // T_DEBUGVIEWFIELD_TITLE: "<>"
176, // T_DRIVERVIEWFIELD_TITLE: "<>"
292, // T_FIELD_BBAL: "BBAL"
249, // T_FIELD_TSVOLTVEH: "TSVVEH"
242, // T_FIELD_TSVOLTBAT: "TSVBAT"
262, // T_FIELD_LVSOC: "LVSOC"
286, // T_FIELD_TSSOC: "TSSOC"
302, // T_FIELD_MAXCELLTEMP: "TMAX"
307, // T_FIELD_TIREFL: "TTFL"
312, // T_FIELD_TIREFR: "TTFR"
317, // T_FIELD_TIRERL: "TTRL"
322, // T_FIELD_TIRERR: "TTRR"
297, // T_FIELD_LAPCOUNT: "LAPS"
176, // T_NUMBERSMALLWILDCARD: "<>"
293, // T_FIELD_BBAL: "BBAL"
256, // T_FIELD_TSVOLTVEH: "TSVVEH"
249, // T_FIELD_TSVOLTBAT: "TSVBAT"
269, // T_FIELD_LVSOC: "LVSOC"
287, // T_FIELD_TSSOC: "TSSOC"
303, // T_FIELD_MAXCELLTEMP: "TMAX"
308, // T_FIELD_TIREFL: "TTFL"
313, // T_FIELD_TIREFR: "TTFR"
318, // T_FIELD_TIRERL: "TTRL"
323, // T_FIELD_TIRERR: "TTRR"
298, // T_FIELD_LAPCOUNT: "LAPS"
186, // T_FIELD_INICHKSTATE: "ICSTATE"
256, // T_FIELD_ERR: "ERROR"
340, // T_FIELD_SDC: "SDC"
263, // T_FIELD_ERR: "ERROR"
341, // T_FIELD_SDC: "SDC"
202, // T_FIELD_INVRREADY: "INVRRDY"
194, // T_FIELD_INVLREADY: "INVLRDY"
218, // T_FIELD_R2DPROGRESS: "R2DPROG"
@ -36,9 +37,9 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
176, // T_NUMBERWILDCARD: "<>"
176, // T_DEFAULTWILDCARD_CENTERED: "<>"
176, // T_DEFAULTWILDCARD_RIGHTALIGNED: "<>"
332, // T_FIELD_TSCURRENT: "ITS"
327, // T_FIELD_MINCELLVOLT: "VMIN"
274, // T_FIELD_SPEED: "SPEED"
333, // T_FIELD_TSCURRENT: "ITS"
328, // T_FIELD_MINCELLVOLT: "VMIN"
281, // T_FIELD_SPEED: "SPEED"
95, // T_INSPECTION_HUGE: "Inspection"
158, // T_EBS_HUGE: "EBS Test"
117, // T_TRACKDRIVE_HUGE: "Trackdrive"
@ -53,19 +54,19 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
138, // T_AUTOX: "Autocross"
226, // T_SKIDPAD: "Skidpad"
82, // T_ACCEL: "Acceleration"
268, // T___SINGLEUSE_JN2J: "MOTOR"
275, // T___SINGLEUSE_JN2J: "MOTOR"
167, // T___SINGLEUSE_ZP7N: "INVERTER"
176, // T___SINGLEUSE_9L8R: "<>"
16, // T___SINGLEUSE_1NKF: ""
176, // T___SINGLEUSE_J5UH: "<>"
336, // T___SINGLEUSE_NGUK: "R2D"
337, // T___SINGLEUSE_NGUK: "R2D"
176, // T___SINGLEUSE_4E84: "<>"
176, // T___SINGLEUSE_YTAB: "<>"
106, // T___SINGLEUSE_RWCE: "PARAMETERS"
148, // T___SINGLEUSE_HMH2: "PRECHARGE"
344, // T___SINGLEUSE_4OBM: "LV"
333, // T___SINGLEUSE_PHFD: "TS"
280, // T___SINGLEUSE_H6UX: "TIRES"
345, // T___SINGLEUSE_4OBM: "LV"
334, // T___SINGLEUSE_PHFD: "TS"
242, // T___SINGLEUSE_H6UX: "BRAKES"
176, // T___SINGLEUSE_20H3: "<>"
17, // T___SINGLEUSE_SDGP: "Current Mission:"
51, // T___SINGLEUSE_M5X7: "Invalid Mission"

View File

@ -83,26 +83,26 @@ KEEP extern const touchgfx::Unicode::UnicodeChar texts_all_languages[] TEXT_LOCA
0x52, 0x32, 0x44, 0x50, 0x52, 0x4f, 0x47, 0x0, // @218 "R2DPROG"
0x53, 0x6b, 0x69, 0x64, 0x70, 0x61, 0x64, 0x0, // @226 "Skidpad"
0x54, 0x53, 0x53, 0x54, 0x41, 0x54, 0x45, 0x0, // @234 "TSSTATE"
0x54, 0x53, 0x56, 0x42, 0x41, 0x54, 0x0, // @242 "TSVBAT"
0x54, 0x53, 0x56, 0x56, 0x45, 0x48, 0x0, // @249 "TSVVEH"
0x45, 0x52, 0x52, 0x4f, 0x52, 0x0, // @256 "ERROR"
0x4c, 0x56, 0x53, 0x4f, 0x43, 0x0, // @262 "LVSOC"
0x4d, 0x4f, 0x54, 0x4f, 0x52, 0x0, // @268 "MOTOR"
0x53, 0x50, 0x45, 0x45, 0x44, 0x0, // @274 "SPEED"
0x54, 0x49, 0x52, 0x45, 0x53, 0x0, // @280 "TIRES"
0x54, 0x53, 0x53, 0x4f, 0x43, 0x0, // @286 "TSSOC"
0x42, 0x42, 0x41, 0x4c, 0x0, // @292 "BBAL"
0x4c, 0x41, 0x50, 0x53, 0x0, // @297 "LAPS"
0x54, 0x4d, 0x41, 0x58, 0x0, // @302 "TMAX"
0x54, 0x54, 0x46, 0x4c, 0x0, // @307 "TTFL"
0x54, 0x54, 0x46, 0x52, 0x0, // @312 "TTFR"
0x54, 0x54, 0x52, 0x4c, 0x0, // @317 "TTRL"
0x54, 0x54, 0x52, 0x52, 0x0, // @322 "TTRR"
0x56, 0x4d, 0x49, 0x4e, 0x0, // @327 "VMIN"
0x49, 0x54, 0x53, 0x0, // @332 "ITS"
0x52, 0x32, 0x44, 0x0, // @336 "R2D"
0x53, 0x44, 0x43, 0x0, // @340 "SDC"
0x4c, 0x56, 0x0 // @344 "LV"
0x42, 0x52, 0x41, 0x4b, 0x45, 0x53, 0x0, // @242 "BRAKES"
0x54, 0x53, 0x56, 0x42, 0x41, 0x54, 0x0, // @249 "TSVBAT"
0x54, 0x53, 0x56, 0x56, 0x45, 0x48, 0x0, // @256 "TSVVEH"
0x45, 0x52, 0x52, 0x4f, 0x52, 0x0, // @263 "ERROR"
0x4c, 0x56, 0x53, 0x4f, 0x43, 0x0, // @269 "LVSOC"
0x4d, 0x4f, 0x54, 0x4f, 0x52, 0x0, // @275 "MOTOR"
0x53, 0x50, 0x45, 0x45, 0x44, 0x0, // @281 "SPEED"
0x54, 0x53, 0x53, 0x4f, 0x43, 0x0, // @287 "TSSOC"
0x42, 0x42, 0x41, 0x4c, 0x0, // @293 "BBAL"
0x4c, 0x41, 0x50, 0x53, 0x0, // @298 "LAPS"
0x54, 0x4d, 0x41, 0x58, 0x0, // @303 "TMAX"
0x54, 0x54, 0x46, 0x4c, 0x0, // @308 "TTFL"
0x54, 0x54, 0x46, 0x52, 0x0, // @313 "TTFR"
0x54, 0x54, 0x52, 0x4c, 0x0, // @318 "TTRL"
0x54, 0x54, 0x52, 0x52, 0x0, // @323 "TTRR"
0x56, 0x4d, 0x49, 0x4e, 0x0, // @328 "VMIN"
0x49, 0x54, 0x53, 0x0, // @333 "ITS"
0x52, 0x32, 0x44, 0x0, // @337 "R2D"
0x53, 0x44, 0x43, 0x0, // @341 "SDC"
0x4c, 0x56, 0x0 // @345 "LV"
};
TEXT_LOCATION_FLASH_PRAGMA

View File

@ -11,6 +11,7 @@ extern touchgfx::GeneratedFont& getFont_CHINN____20_4bpp();
extern touchgfx::GeneratedFont& getFont_CHINN____40_4bpp();
extern touchgfx::GeneratedFont& getFont_lucon_TTF_50_4bpp();
extern touchgfx::GeneratedFont& getFont_verdanab_20_4bpp();
extern touchgfx::GeneratedFont& getFont_lucon_TTF_33_4bpp();
const touchgfx::Font* touchgfx_fonts[] = {
&(getFont_verdana_20_4bpp()),
@ -18,17 +19,83 @@ const touchgfx::Font* touchgfx_fonts[] = {
&(getFont_CHINN____20_4bpp()),
&(getFont_CHINN____40_4bpp()),
&(getFont_lucon_TTF_50_4bpp()),
&(getFont_verdanab_20_4bpp())
&(getFont_verdanab_20_4bpp()),
&(getFont_lucon_TTF_33_4bpp())
};
extern const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[];
extern const touchgfx::TypedText::TypedTextData* const typedTextDatabaseArray[];
TEXT_LOCATION_FLASH_PRAGMA
const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 6, 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 },
{ 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 },
{ 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 },
{ 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 },
{ 0, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 0, touchgfx::RIGHT, 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 },
{ 3, 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 },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 3, 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 },
{ 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 },
{ 1, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 4, touchgfx::RIGHT, touchgfx::TEXT_DIRECTION_LTR },
{ 1, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 1, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 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 },
{ 1, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }
};
TEXT_LOCATION_FLASH_PRAGMA
const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
{ 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR },
{ 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR },
{ 6, 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 },
@ -90,7 +157,7 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT
TEXT_LOCATION_FLASH_PRAGMA
const touchgfx::TypedText::TypedTextData* const typedTextDatabaseArray[] TEXT_LOCATION_FLASH_ATTRIBUTE = {
typedText_database_DEFAULT
typedText_database_GB
};
namespace TypedTextDatabase
@ -139,6 +206,9 @@ void resetFont(touchgfx::FontId fontId)
case 5:
touchgfx_fonts[5] = &(getFont_verdanab_20_4bpp());
break;
case 6:
touchgfx_fonts[6] = &(getFont_lucon_TTF_33_4bpp());
break;
}
}
} // namespace TypedTextDatabase