From a3279514d0e59cc0b27989329e4d2b50d074ce09 Mon Sep 17 00:00:00 2001 From: Leonard Gies Date: Fri, 1 Aug 2025 02:00:27 +0200 Subject: [PATCH] add wheelspeeds to system overview --- TouchGFX/assets/texts/texts.xml | 3 + .../SystemOverviewViewBase.hpp | 9 ++- .../SystemOverviewViewBase.cpp | 44 ++++++++++---- .../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 | 1 + TouchGFX/generated/texts/src/LanguageGb.cpp | 5 +- TouchGFX/generated/texts/src/Texts.cpp | 5 +- .../generated/texts/src/TypedTextDatabase.cpp | 2 + .../gui/containers/DriverViewStatusItem.hpp | 4 ++ .../src/containers/DriverViewStatusItem.cpp | 32 ++++++++++ .../SystemOverviewView.cpp | 4 ++ TouchGFX/steering-wheel.touchgfx | 60 +++++++++++++++++-- 15 files changed, 152 insertions(+), 25 deletions(-) diff --git a/TouchGFX/assets/texts/texts.xml b/TouchGFX/assets/texts/texts.xml index 5ba053b..d80cde0 100644 --- a/TouchGFX/assets/texts/texts.xml +++ b/TouchGFX/assets/texts/texts.xml @@ -189,6 +189,9 @@ + + WSS + APPS diff --git a/TouchGFX/generated/gui_generated/include/gui_generated/systemoverview_screen/SystemOverviewViewBase.hpp b/TouchGFX/generated/gui_generated/include/gui_generated/systemoverview_screen/SystemOverviewViewBase.hpp index 9914398..def0e62 100644 --- a/TouchGFX/generated/gui_generated/include/gui_generated/systemoverview_screen/SystemOverviewViewBase.hpp +++ b/TouchGFX/generated/gui_generated/include/gui_generated/systemoverview_screen/SystemOverviewViewBase.hpp @@ -47,9 +47,14 @@ protected: DriverViewStatusItem statusSNF; DriverViewStatusItem statusBPR; DriverViewStatusItem statusAPPS; + DriverViewStatusItem statusWSS_RR; + DriverViewStatusItem statusWSS_FR; + DriverViewStatusItem statusWSS_FL; + DriverViewStatusItem statusWSS_RL; DriverViewStatusItem statusBPF; - touchgfx::TextArea textArea1; - touchgfx::TextArea textArea1_1; + touchgfx::TextArea text_BRAKES; + touchgfx::TextArea text_APPS; + touchgfx::TextArea text_WSS; private: diff --git a/TouchGFX/generated/gui_generated/src/systemoverview_screen/SystemOverviewViewBase.cpp b/TouchGFX/generated/gui_generated/src/systemoverview_screen/SystemOverviewViewBase.cpp index 1c418cb..b799e11 100644 --- a/TouchGFX/generated/gui_generated/src/systemoverview_screen/SystemOverviewViewBase.cpp +++ b/TouchGFX/generated/gui_generated/src/systemoverview_screen/SystemOverviewViewBase.cpp @@ -63,25 +63,43 @@ SystemOverviewViewBase::SystemOverviewViewBase() statusBPR.setXY(12, 63); statusItems.add(statusBPR); - statusAPPS.setXY(12, 133); + statusAPPS.setXY(12, 128); statusItems.add(statusAPPS); + statusWSS_RR.setXY(77, 226); + statusItems.add(statusWSS_RR); + + statusWSS_FR.setXY(77, 193); + statusItems.add(statusWSS_FR); + + statusWSS_FL.setXY(12, 193); + statusItems.add(statusWSS_FL); + + statusWSS_RL.setXY(12, 226); + statusItems.add(statusWSS_RL); + statusBPF.setXY(12, 30); statusItems.add(statusBPF); add(statusItems); - textArea1.setXY(12, 5); - textArea1.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - textArea1.setLinespacing(0); - textArea1.setTypedText(touchgfx::TypedText(T___SINGLEUSE_HTV5)); - add(textArea1); + text_BRAKES.setXY(12, 5); + text_BRAKES.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); + text_BRAKES.setLinespacing(0); + text_BRAKES.setTypedText(touchgfx::TypedText(T___SINGLEUSE_HTV5)); + add(text_BRAKES); - textArea1_1.setXY(12, 108); - textArea1_1.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); - textArea1_1.setLinespacing(0); - textArea1_1.setTypedText(touchgfx::TypedText(T___SINGLEUSE_XKTG)); - add(textArea1_1); + text_APPS.setXY(12, 103); + text_APPS.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); + text_APPS.setLinespacing(0); + text_APPS.setTypedText(touchgfx::TypedText(T___SINGLEUSE_XKTG)); + add(text_APPS); + + text_WSS.setXY(12, 168); + text_WSS.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); + text_WSS.setLinespacing(0); + text_WSS.setTypedText(touchgfx::TypedText(T___SINGLEUSE_4J84)); + add(text_WSS); } SystemOverviewViewBase::~SystemOverviewViewBase() @@ -109,5 +127,9 @@ void SystemOverviewViewBase::setupScreen() statusSNF.initialize(); statusBPR.initialize(); statusAPPS.initialize(); + statusWSS_RR.initialize(); + statusWSS_FR.initialize(); + statusWSS_FL.initialize(); + statusWSS_RL.initialize(); statusBPF.initialize(); } diff --git a/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache b/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache index 4510156..63baa92 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,"copy_translations":"no","indices":[["410","T_SHUNT"],["175","T_STATUSWILDCARD"],["514","T_DB"],["432","T_FTCU"],["510","T_SNR"],["506","T_SNF"],["517","T_LV"],["376","T_PDU"],["498","T_SCS"],["502","T_SDC"],["494","T_R2D"],["491","T_TS"],["486","T_INV"],["364","T_AMS"],["210","T_ERROR_AMS"],["175","T_DEBUGVIEWFIELD_TITLE"],["175","T_DRIVERVIEWFIELD_TITLE"],["175","T_NUMBERSMALLWILDCARD"],["427","T_FIELD_BBAL"],["355","T_FIELD_TSVOLTVEH"],["348","T_FIELD_TSVOLTBAT"],["392","T_FIELD_LVSOC"],["416","T_FIELD_TSSOC"],["447","T_FIELD_MAXCELLTEMP"],["457","T_FIELD_TIREFL"],["462","T_FIELD_TIREFR"],["467","T_FIELD_TIRERL"],["472","T_FIELD_TIRERR"],["442","T_FIELD_LAPCOUNT"],["277","T_FIELD_INICHKSTATE"],["386","T_FIELD_ERR"],["502","T_FIELD_SDC"],["293","T_FIELD_INVRREADY"],["285","T_FIELD_INVLREADY"],["317","T_FIELD_R2DPROGRESS"],["301","T_FIELD_ACTIVEMISSION"],["261","T_FIELD_ASSTATE"],["333","T_FIELD_TSSTATE"],["175","T_NUMBERWILDCARD"],["175","T_DEFAULTWILDCARD_CENTERED"],["175","T_DEFAULTWILDCARD_RIGHTALIGNED"],["490","T_FIELD_TSCURRENT"],["477","T_FIELD_MINCELLVOLT"],["404","T_FIELD_SPEED"],["177","T_INSPECTION_HUGE"],["252","T_EBS_HUGE"],["199","T_TRACKDRIVE_HUGE"],["220","T_AUTOX_HUGE"],["325","T_SKIDPAD_HUGE"],["146","T_ACCEL_HUGE"],["35","T_INVALID_HUGE"],["116","T_MANUAL"],["177","T_INSPECTION"],["252","T_EBS"],["199","T_TRACKDRIVE"],["220","T_AUTOX"],["325","T_SKIDPAD"],["146","T_ACCEL"],["422","T___SINGLEUSE_XKTG"],["341","T___SINGLEUSE_HTV5"],["175","T___SINGLEUSE_N52Q"],["175","T___SINGLEUSE_SCTC"],["175","T___SINGLEUSE_OEMA"],["175","T___SINGLEUSE_VKTM"],["175","T___SINGLEUSE_Z106"],["175","T___SINGLEUSE_YZ9T"],["175","T___SINGLEUSE_SNQD"],["172","T___SINGLEUSE_C17G"],["362","T___SINGLEUSE_XFW7"],["368","T___SINGLEUSE_N50J"],["482","T___SINGLEUSE_V38H"],["452","T___SINGLEUSE_XC1X"],["243","T___SINGLEUSE_KI1B"],["159","T___SINGLEUSE_QNHI"],["0","T___SINGLEUSE_43KA"],["374","T___SINGLEUSE_YRU7"],["437","T___SINGLEUSE_E6D7"],["175","T___SINGLEUSE_ZEKA"],["131","T___SINGLEUSE_0L75"],["100","T___SINGLEUSE_GA13"],["175","T___SINGLEUSE_THUG"],["175","T___SINGLEUSE_CO7A"],["175","T___SINGLEUSE_A0LF"],["175","T___SINGLEUSE_166C"],["84","T___SINGLEUSE_OOU3"],["68","T___SINGLEUSE_2FPP"],["175","T___SINGLEUSE_2S21"],["175","T___SINGLEUSE_OQ6P"],["309","T___SINGLEUSE_590R"],["269","T___SINGLEUSE_Z78U"],["175","T___SINGLEUSE_LLOZ"],["175","T___SINGLEUSE_232C"],["398","T___SINGLEUSE_JFR7"],["380","T___SINGLEUSE_3MDX"],["175","T___SINGLEUSE_F9I5"],["175","T___SINGLEUSE_9L8R"],["17","T___SINGLEUSE_1NKF"],["175","T___SINGLEUSE_J5UH"],["494","T___SINGLEUSE_NGUK"],["175","T___SINGLEUSE_4E84"],["175","T___SINGLEUSE_YTAB"],["188","T___SINGLEUSE_RWCE"],["230","T___SINGLEUSE_HMH2"],["240","T___SINGLEUSE_PHFD"],["341","T___SINGLEUSE_H6UX"],["175","T___SINGLEUSE_20H3"],["52","T___SINGLEUSE_M5X7"],["18","T___SINGLEUSE_6GPV"]]} \ No newline at end of file +{"remap":"yes","language":"GB","language_index":0,"copy_translations":"no","indices":[["410","T_SHUNT"],["175","T_STATUSWILDCARD"],["518","T_DB"],["432","T_FTCU"],["510","T_SNR"],["506","T_SNF"],["521","T_LV"],["376","T_PDU"],["498","T_SCS"],["502","T_SDC"],["494","T_R2D"],["491","T_TS"],["486","T_INV"],["364","T_AMS"],["210","T_ERROR_AMS"],["175","T_DEBUGVIEWFIELD_TITLE"],["175","T_DRIVERVIEWFIELD_TITLE"],["175","T_NUMBERSMALLWILDCARD"],["427","T_FIELD_BBAL"],["355","T_FIELD_TSVOLTVEH"],["348","T_FIELD_TSVOLTBAT"],["392","T_FIELD_LVSOC"],["416","T_FIELD_TSSOC"],["447","T_FIELD_MAXCELLTEMP"],["457","T_FIELD_TIREFL"],["462","T_FIELD_TIREFR"],["467","T_FIELD_TIRERL"],["472","T_FIELD_TIRERR"],["442","T_FIELD_LAPCOUNT"],["277","T_FIELD_INICHKSTATE"],["386","T_FIELD_ERR"],["502","T_FIELD_SDC"],["293","T_FIELD_INVRREADY"],["285","T_FIELD_INVLREADY"],["317","T_FIELD_R2DPROGRESS"],["301","T_FIELD_ACTIVEMISSION"],["261","T_FIELD_ASSTATE"],["333","T_FIELD_TSSTATE"],["175","T_NUMBERWILDCARD"],["175","T_DEFAULTWILDCARD_CENTERED"],["175","T_DEFAULTWILDCARD_RIGHTALIGNED"],["490","T_FIELD_TSCURRENT"],["477","T_FIELD_MINCELLVOLT"],["404","T_FIELD_SPEED"],["177","T_INSPECTION_HUGE"],["252","T_EBS_HUGE"],["199","T_TRACKDRIVE_HUGE"],["220","T_AUTOX_HUGE"],["325","T_SKIDPAD_HUGE"],["146","T_ACCEL_HUGE"],["35","T_INVALID_HUGE"],["116","T_MANUAL"],["177","T_INSPECTION"],["252","T_EBS"],["199","T_TRACKDRIVE"],["220","T_AUTOX"],["325","T_SKIDPAD"],["146","T_ACCEL"],["514","T___SINGLEUSE_4J84"],["422","T___SINGLEUSE_XKTG"],["341","T___SINGLEUSE_HTV5"],["175","T___SINGLEUSE_N52Q"],["175","T___SINGLEUSE_SCTC"],["175","T___SINGLEUSE_OEMA"],["175","T___SINGLEUSE_VKTM"],["175","T___SINGLEUSE_Z106"],["175","T___SINGLEUSE_YZ9T"],["175","T___SINGLEUSE_SNQD"],["172","T___SINGLEUSE_C17G"],["362","T___SINGLEUSE_XFW7"],["368","T___SINGLEUSE_N50J"],["482","T___SINGLEUSE_V38H"],["452","T___SINGLEUSE_XC1X"],["243","T___SINGLEUSE_KI1B"],["159","T___SINGLEUSE_QNHI"],["0","T___SINGLEUSE_43KA"],["374","T___SINGLEUSE_YRU7"],["437","T___SINGLEUSE_E6D7"],["175","T___SINGLEUSE_ZEKA"],["131","T___SINGLEUSE_0L75"],["100","T___SINGLEUSE_GA13"],["175","T___SINGLEUSE_THUG"],["175","T___SINGLEUSE_CO7A"],["175","T___SINGLEUSE_A0LF"],["175","T___SINGLEUSE_166C"],["84","T___SINGLEUSE_OOU3"],["68","T___SINGLEUSE_2FPP"],["175","T___SINGLEUSE_2S21"],["175","T___SINGLEUSE_OQ6P"],["309","T___SINGLEUSE_590R"],["269","T___SINGLEUSE_Z78U"],["175","T___SINGLEUSE_LLOZ"],["175","T___SINGLEUSE_232C"],["398","T___SINGLEUSE_JFR7"],["380","T___SINGLEUSE_3MDX"],["175","T___SINGLEUSE_F9I5"],["175","T___SINGLEUSE_9L8R"],["17","T___SINGLEUSE_1NKF"],["175","T___SINGLEUSE_J5UH"],["494","T___SINGLEUSE_NGUK"],["175","T___SINGLEUSE_4E84"],["175","T___SINGLEUSE_YTAB"],["188","T___SINGLEUSE_RWCE"],["230","T___SINGLEUSE_HMH2"],["240","T___SINGLEUSE_PHFD"],["341","T___SINGLEUSE_H6UX"],["175","T___SINGLEUSE_20H3"],["52","T___SINGLEUSE_M5X7"],["18","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 96c1b8b..b3d9d23 100644 --- a/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache +++ b/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache @@ -1 +1 @@ -{"languages":["GB"],"textids":["T_SHUNT","T_STATUSWILDCARD","T_DB","T_FTCU","T_SNR","T_SNF","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_XKTG","T___SINGLEUSE_HTV5","T___SINGLEUSE_N52Q","T___SINGLEUSE_SCTC","T___SINGLEUSE_OEMA","T___SINGLEUSE_VKTM","T___SINGLEUSE_Z106","T___SINGLEUSE_YZ9T","T___SINGLEUSE_SNQD","T___SINGLEUSE_C17G","T___SINGLEUSE_XFW7","T___SINGLEUSE_N50J","T___SINGLEUSE_V38H","T___SINGLEUSE_XC1X","T___SINGLEUSE_KI1B","T___SINGLEUSE_QNHI","T___SINGLEUSE_43KA","T___SINGLEUSE_YRU7","T___SINGLEUSE_E6D7","T___SINGLEUSE_ZEKA","T___SINGLEUSE_0L75","T___SINGLEUSE_GA13","T___SINGLEUSE_THUG","T___SINGLEUSE_CO7A","T___SINGLEUSE_A0LF","T___SINGLEUSE_166C","T___SINGLEUSE_OOU3","T___SINGLEUSE_2FPP","T___SINGLEUSE_2S21","T___SINGLEUSE_OQ6P","T___SINGLEUSE_590R","T___SINGLEUSE_Z78U","T___SINGLEUSE_LLOZ","T___SINGLEUSE_232C","T___SINGLEUSE_JFR7","T___SINGLEUSE_3MDX","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_M5X7","T___SINGLEUSE_6GPV"]} \ No newline at end of file +{"languages":["GB"],"textids":["T_SHUNT","T_STATUSWILDCARD","T_DB","T_FTCU","T_SNR","T_SNF","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_4J84","T___SINGLEUSE_XKTG","T___SINGLEUSE_HTV5","T___SINGLEUSE_N52Q","T___SINGLEUSE_SCTC","T___SINGLEUSE_OEMA","T___SINGLEUSE_VKTM","T___SINGLEUSE_Z106","T___SINGLEUSE_YZ9T","T___SINGLEUSE_SNQD","T___SINGLEUSE_C17G","T___SINGLEUSE_XFW7","T___SINGLEUSE_N50J","T___SINGLEUSE_V38H","T___SINGLEUSE_XC1X","T___SINGLEUSE_KI1B","T___SINGLEUSE_QNHI","T___SINGLEUSE_43KA","T___SINGLEUSE_YRU7","T___SINGLEUSE_E6D7","T___SINGLEUSE_ZEKA","T___SINGLEUSE_0L75","T___SINGLEUSE_GA13","T___SINGLEUSE_THUG","T___SINGLEUSE_CO7A","T___SINGLEUSE_A0LF","T___SINGLEUSE_166C","T___SINGLEUSE_OOU3","T___SINGLEUSE_2FPP","T___SINGLEUSE_2S21","T___SINGLEUSE_OQ6P","T___SINGLEUSE_590R","T___SINGLEUSE_Z78U","T___SINGLEUSE_LLOZ","T___SINGLEUSE_232C","T___SINGLEUSE_JFR7","T___SINGLEUSE_3MDX","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_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 dbc8726..3604b33 100644 --- a/TouchGFX/generated/texts/cache/TextsCpp.cache +++ b/TouchGFX/generated/texts/cache/TextsCpp.cache @@ -1 +1 @@ -{"remap":"yes","languages":["Gb"],"characters":[68,65,83,72,10,66,79,84,83,10,73,78,69,82,84,73,65,0,67,104,111,111,115,101,32,97,32,109,105,115,115,105,111,110,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,80,114,101,115,115,117,114,101,32,65,99,99,32,49,58,0,80,114,101,115,115,117,114,101,32,65,99,99,32,50,58,0,80,114,101,115,115,117,114,101,32,70,114,111,110,116,58,0,77,97,110,117,97,108,32,68,114,105,118,105,110,103,0,80,114,101,115,115,117,114,101,32,82,101,97,114,58,0,65,99,99,101,108,101,114,97,116,105,111,110,0,83,68,66,10,82,69,83,10,83,68,67,76,0,65,83,32,2,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,66,83,80,68,10,72,86,68,0,69,66,83,32,84,101,115,116,0,65,83,83,84,65,84,69,0,68,83,80,69,69,68,58,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,77,83,80,69,69,68,58,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,10,10,65,77,83,0,10,10,73,77,68,0,10,10,80,68,85,0,68,65,78,71,58,0,69,82,82,79,82,0,76,86,83,79,67,0,77,65,78,71,58,0,83,80,69,69,68,0,83,104,117,110,116,0,84,83,83,79,67,0,65,80,80,83,0,66,66,65,76,0,70,84,67,85,0,73,78,73,84,0,76,65,80,83,0,84,77,65,88,0,84,83,77,83,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,67,67,0,73,78,86,0,73,84,83,0,82,50,68,0,83,67,83,0,83,68,67,0,83,78,70,0,83,78,82,0,68,66,0,76,86,0],"copy_translations_to_ram":"no"} \ No newline at end of file +{"remap":"yes","languages":["Gb"],"characters":[68,65,83,72,10,66,79,84,83,10,73,78,69,82,84,73,65,0,67,104,111,111,115,101,32,97,32,109,105,115,115,105,111,110,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,80,114,101,115,115,117,114,101,32,65,99,99,32,49,58,0,80,114,101,115,115,117,114,101,32,65,99,99,32,50,58,0,80,114,101,115,115,117,114,101,32,70,114,111,110,116,58,0,77,97,110,117,97,108,32,68,114,105,118,105,110,103,0,80,114,101,115,115,117,114,101,32,82,101,97,114,58,0,65,99,99,101,108,101,114,97,116,105,111,110,0,83,68,66,10,82,69,83,10,83,68,67,76,0,65,83,32,2,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,66,83,80,68,10,72,86,68,0,69,66,83,32,84,101,115,116,0,65,83,83,84,65,84,69,0,68,83,80,69,69,68,58,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,77,83,80,69,69,68,58,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,10,10,65,77,83,0,10,10,73,77,68,0,10,10,80,68,85,0,68,65,78,71,58,0,69,82,82,79,82,0,76,86,83,79,67,0,77,65,78,71,58,0,83,80,69,69,68,0,83,104,117,110,116,0,84,83,83,79,67,0,65,80,80,83,0,66,66,65,76,0,70,84,67,85,0,73,78,73,84,0,76,65,80,83,0,84,77,65,88,0,84,83,77,83,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,67,67,0,73,78,86,0,73,84,83,0,82,50,68,0,83,67,83,0,83,68,67,0,83,78,70,0,83,78,82,0,87,83,83,0,68,66,0,76,86,0],"copy_translations_to_ram":"no"} \ No newline at end of file diff --git a/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache b/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache index 6ee91eb..5041e91 100644 --- a/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache +++ b/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache @@ -1 +1 @@ -{"databases":{"GB":[[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"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"],[5,"LEFT","LTR"],[5,"LEFT","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"RIGHT","LTR"],[2,"CENTER","LTR"],[2,"LEFT","LTR"],[1,"LEFT","LTR"],[1,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[5,"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"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]],"DEFAULT":[[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"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"],[5,"LEFT","LTR"],[5,"LEFT","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"RIGHT","LTR"],[2,"CENTER","LTR"],[2,"LEFT","LTR"],[1,"LEFT","LTR"],[1,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[5,"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"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]]},"database_list":["GB"],"fonts":{"getFont_inter_20_4bpp":0,"getFont_CHINN____30_4bpp":1,"getFont_CHINN____20_4bpp":2,"getFont_CHINN____40_4bpp":3,"getFont_intersb_50_4bpp":4,"getFont_interb_20_4bpp":5,"getFont_inter_33_4bpp":6},"generate_font_format":"0","copy_translations_to_ram":"no"} \ No newline at end of file +{"databases":{"GB":[[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"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"],[5,"LEFT","LTR"],[5,"LEFT","LTR"],[5,"LEFT","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"RIGHT","LTR"],[2,"CENTER","LTR"],[2,"LEFT","LTR"],[1,"LEFT","LTR"],[1,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[5,"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"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]],"DEFAULT":[[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"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"],[5,"LEFT","LTR"],[5,"LEFT","LTR"],[5,"LEFT","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[5,"CENTER","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"CENTER","LTR"],[2,"RIGHT","LTR"],[2,"CENTER","LTR"],[2,"LEFT","LTR"],[1,"LEFT","LTR"],[1,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[0,"RIGHT","LTR"],[0,"RIGHT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[5,"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"],[2,"CENTER","LTR"],[1,"LEFT","LTR"]]},"database_list":["GB"],"fonts":{"getFont_inter_20_4bpp":0,"getFont_CHINN____30_4bpp":1,"getFont_CHINN____20_4bpp":2,"getFont_CHINN____40_4bpp":3,"getFont_intersb_50_4bpp":4,"getFont_interb_20_4bpp":5,"getFont_inter_33_4bpp":6},"generate_font_format":"0","copy_translations_to_ram":"no"} \ 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 40024ea..100b74b 100644 --- a/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp +++ b/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp @@ -70,6 +70,7 @@ enum TEXTS T_AUTOX, T_SKIDPAD, T_ACCEL, + T___SINGLEUSE_4J84, T___SINGLEUSE_XKTG, T___SINGLEUSE_HTV5, T___SINGLEUSE_N52Q, diff --git a/TouchGFX/generated/texts/src/LanguageGb.cpp b/TouchGFX/generated/texts/src/LanguageGb.cpp index 0515415..11376fc 100644 --- a/TouchGFX/generated/texts/src/LanguageGb.cpp +++ b/TouchGFX/generated/texts/src/LanguageGb.cpp @@ -12,11 +12,11 @@ TEXT_LOCATION_FLASH_PRAGMA KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = { 410, // T_SHUNT: "Shunt" 175, // T_STATUSWILDCARD: "<>" - 514, // T_DB: "DB" + 518, // T_DB: "DB" 432, // T_FTCU: "FTCU" 510, // T_SNR: "SNR" 506, // T_SNF: "SNF" - 517, // T_LV: "LV" + 521, // T_LV: "LV" 376, // T_PDU: "PDU" 498, // T_SCS: "SCS" 502, // T_SDC: "SDC" @@ -68,6 +68,7 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = { 220, // T_AUTOX: "Autocross" 325, // T_SKIDPAD: "Skidpad" 146, // T_ACCEL: "Acceleration" + 514, // T___SINGLEUSE_4J84: "WSS" 422, // T___SINGLEUSE_XKTG: "APPS" 341, // T___SINGLEUSE_HTV5: "BRAKES" 175, // T___SINGLEUSE_N52Q: "<>" diff --git a/TouchGFX/generated/texts/src/Texts.cpp b/TouchGFX/generated/texts/src/Texts.cpp index da641e3..da7bb4b 100644 --- a/TouchGFX/generated/texts/src/Texts.cpp +++ b/TouchGFX/generated/texts/src/Texts.cpp @@ -124,8 +124,9 @@ KEEP extern const touchgfx::Unicode::UnicodeChar texts_all_languages[] TEXT_LOCA 0x53, 0x44, 0x43, 0x0, // @502 "SDC" 0x53, 0x4e, 0x46, 0x0, // @506 "SNF" 0x53, 0x4e, 0x52, 0x0, // @510 "SNR" - 0x44, 0x42, 0x0, // @514 "DB" - 0x4c, 0x56, 0x0 // @517 "LV" + 0x57, 0x53, 0x53, 0x0, // @514 "WSS" + 0x44, 0x42, 0x0, // @518 "DB" + 0x4c, 0x56, 0x0 // @521 "LV" }; TEXT_LOCATION_FLASH_PRAGMA diff --git a/TouchGFX/generated/texts/src/TypedTextDatabase.cpp b/TouchGFX/generated/texts/src/TypedTextDatabase.cpp index a810716..84df282 100644 --- a/TouchGFX/generated/texts/src/TypedTextDatabase.cpp +++ b/TouchGFX/generated/texts/src/TypedTextDatabase.cpp @@ -88,6 +88,7 @@ const touchgfx::TypedText::TypedTextData typedText_database_GB[] TEXT_LOCATION_F { 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, + { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, @@ -199,6 +200,7 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT { 2, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, + { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 5, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, diff --git a/TouchGFX/gui/include/gui/containers/DriverViewStatusItem.hpp b/TouchGFX/gui/include/gui/containers/DriverViewStatusItem.hpp index 6434761..4ee3572 100644 --- a/TouchGFX/gui/include/gui/containers/DriverViewStatusItem.hpp +++ b/TouchGFX/gui/include/gui/containers/DriverViewStatusItem.hpp @@ -21,6 +21,10 @@ enum class DriverViewStatusType { BPR, BPF, APPS, + WSS_FL, + WSS_FR, + WSS_RL, + WSS_RR, }; class DriverViewStatusItem : public DriverViewStatusItemBase { diff --git a/TouchGFX/gui/src/containers/DriverViewStatusItem.cpp b/TouchGFX/gui/src/containers/DriverViewStatusItem.cpp index 6e20306..0bc4471 100644 --- a/TouchGFX/gui/src/containers/DriverViewStatusItem.cpp +++ b/TouchGFX/gui/src/containers/DriverViewStatusItem.cpp @@ -125,6 +125,38 @@ void DriverViewStatusItem::update() { bg.setColor(COLOR_OFF); break; + case DriverViewStatusType::WSS_FL: { + float params[3] = {3, 1, vehicle_state.wheel_speeds.wss_fl}; + Unicode::snprintfFloats(valueBuffer, 10, "%*.*f", params); + text.setWildcard(valueBuffer); + bg.setColor(COLOR_OFF); + break; + } + + case DriverViewStatusType::WSS_FR: { + float params[3] = {3, 1, vehicle_state.wheel_speeds.wss_fr}; + Unicode::snprintfFloats(valueBuffer, 10, "%*.*f", params); + text.setWildcard(valueBuffer); + bg.setColor(COLOR_OFF); + break; + } + + case DriverViewStatusType::WSS_RL: { + float params[3] = {3, 1, vehicle_state.wheel_speeds.wss_rl}; + Unicode::snprintfFloats(valueBuffer, 10, "%*.*f", params); + text.setWildcard(valueBuffer); + bg.setColor(COLOR_OFF); + break; + } + + case DriverViewStatusType::WSS_RR: { + float params[3] = {3, 1, vehicle_state.wheel_speeds.wss_rr}; + Unicode::snprintfFloats(valueBuffer, 10, "%*.*f", params); + text.setWildcard(valueBuffer); + bg.setColor(COLOR_OFF); + break; + } + default: break; } diff --git a/TouchGFX/gui/src/systemoverview_screen/SystemOverviewView.cpp b/TouchGFX/gui/src/systemoverview_screen/SystemOverviewView.cpp index 1971a38..0d74bfc 100644 --- a/TouchGFX/gui/src/systemoverview_screen/SystemOverviewView.cpp +++ b/TouchGFX/gui/src/systemoverview_screen/SystemOverviewView.cpp @@ -20,6 +20,10 @@ void SystemOverviewView::setupScreen() { statusBPF.setType(DriverViewStatusType::BPF); statusBPR.setType(DriverViewStatusType::BPR); statusAPPS.setType(DriverViewStatusType::APPS); + statusWSS_FL.setType(DriverViewStatusType::WSS_FL); + statusWSS_FR.setType(DriverViewStatusType::WSS_FR); + statusWSS_RL.setType(DriverViewStatusType::WSS_RL); + statusWSS_RR.setType(DriverViewStatusType::WSS_RR); status1.setVisible(false); status2.setVisible(false); status3.setVisible(false); diff --git a/TouchGFX/steering-wheel.touchgfx b/TouchGFX/steering-wheel.touchgfx index ffa0be3..aad4800 100644 --- a/TouchGFX/steering-wheel.touchgfx +++ b/TouchGFX/steering-wheel.touchgfx @@ -1547,7 +1547,43 @@ "Type": "CustomContainerInstance", "Name": "statusAPPS", "X": 12, - "Y": 133, + "Y": 128, + "Width": 65, + "Height": 33, + "CustomContainerDefinitionName": "DriverViewStatusItem" + }, + { + "Type": "CustomContainerInstance", + "Name": "statusWSS_RR", + "X": 77, + "Y": 226, + "Width": 65, + "Height": 33, + "CustomContainerDefinitionName": "DriverViewStatusItem" + }, + { + "Type": "CustomContainerInstance", + "Name": "statusWSS_FR", + "X": 77, + "Y": 193, + "Width": 65, + "Height": 33, + "CustomContainerDefinitionName": "DriverViewStatusItem" + }, + { + "Type": "CustomContainerInstance", + "Name": "statusWSS_FL", + "X": 12, + "Y": 193, + "Width": 65, + "Height": 33, + "CustomContainerDefinitionName": "DriverViewStatusItem" + }, + { + "Type": "CustomContainerInstance", + "Name": "statusWSS_RL", + "X": 12, + "Y": 226, "Width": 65, "Height": 33, "CustomContainerDefinitionName": "DriverViewStatusItem" @@ -1565,7 +1601,7 @@ }, { "Type": "TextArea", - "Name": "textArea1", + "Name": "text_BRAKES", "X": 12, "Y": 5, "Width": 80, @@ -1581,9 +1617,9 @@ }, { "Type": "TextArea", - "Name": "textArea1_1", + "Name": "text_APPS", "X": 12, - "Y": 108, + "Y": 103, "Width": 54, "Height": 25, "TextId": "__SingleUse_XKTG", @@ -1594,6 +1630,22 @@ "Blue": 255 }, "AutoSize": true + }, + { + "Type": "TextArea", + "Name": "text_WSS", + "X": 12, + "Y": 168, + "Width": 47, + "Height": 25, + "TextId": "__SingleUse_4J84", + "TextRotation": "0", + "Color": { + "Red": 255, + "Green": 255, + "Blue": 255 + }, + "AutoSize": true } ], "Interactions": []