j.marmier/stw24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TireTemp -> BrakeTemp

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-05-22 06:16:52 +02:00
parent b5c457c84a
commit d1d0c3df1d
4 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp
View File

@ -85,16 +85,16 @@ protected:
Temperature invTempR;
Temperature invTempL;
touchgfx::TextArea invTempLabel;
touchgfx::Container tireTemps;
touchgfx::Line ttDivVert;
touchgfx::PainterRGB565 ttDivVertPainter;
touchgfx::Line ttDivHoriz;
touchgfx::PainterRGB565 ttDivHorizPainter;
Temperature tireTempRR;
Temperature tireTempFR;
Temperature tireTempRL;
Temperature tireTempFL;
touchgfx::TextArea tireLabel;
touchgfx::Container brakeTemps;
touchgfx::Line btDivVert;
touchgfx::PainterRGB565 btDivVertPainter;
touchgfx::Line btDivHoriz;
touchgfx::PainterRGB565 btDivHorizPainter;
Temperature brakeTempRR;
Temperature brakeTempFR;
Temperature brakeTempRL;
Temperature brakeTempFL;
touchgfx::TextArea brakeLabel;
touchgfx::Container dataFields;
touchgfx::ScrollWheel fieldTypeSelection;
touchgfx::DrawableListItems<DriverViewFieldSelection, 10> fieldTypeSelectionListItems;

70
TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp
View File

@ -103,44 +103,44 @@ DriverViewViewBase::DriverViewViewBase() :
add(drivetrainTemps);
tireTemps.setPosition(165, 97, 150, 150);
ttDivVert.setPosition(74, 25, 3, 123);
ttDivVertPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
ttDivVert.setPainter(ttDivVertPainter);
ttDivVert.setStart(0, 0);
ttDivVert.setEnd(0, 320);
ttDivVert.setLineWidth(10);
ttDivVert.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
tireTemps.add(ttDivVert);
brakeTemps.setPosition(165, 97, 150, 150);
btDivVert.setPosition(74, 25, 3, 123);
btDivVertPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
btDivVert.setPainter(btDivVertPainter);
btDivVert.setStart(0, 0);
btDivVert.setEnd(0, 320);
btDivVert.setLineWidth(10);
btDivVert.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
brakeTemps.add(btDivVert);
ttDivHoriz.setPosition(14, 85, 123, 3);
ttDivHorizPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
ttDivHoriz.setPainter(ttDivHorizPainter);
ttDivHoriz.setStart(0, 0);
ttDivHoriz.setEnd(480, 0);
ttDivHoriz.setLineWidth(10);
ttDivHoriz.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
tireTemps.add(ttDivHoriz);
btDivHoriz.setPosition(14, 85, 123, 3);
btDivHorizPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
btDivHoriz.setPainter(btDivHorizPainter);
btDivHoriz.setStart(0, 0);
btDivHoriz.setEnd(480, 0);
btDivHoriz.setLineWidth(10);
btDivHoriz.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
brakeTemps.add(btDivHoriz);
tireTempRR.setXY(77, 88);
tireTemps.add(tireTempRR);
brakeTempRR.setXY(77, 88);
brakeTemps.add(brakeTempRR);
tireTempFR.setXY(77, 25);
tireTemps.add(tireTempFR);
brakeTempFR.setXY(77, 25);
brakeTemps.add(brakeTempFR);
tireTempRL.setXY(14, 88);
tireTemps.add(tireTempRL);
brakeTempRL.setXY(14, 88);
brakeTemps.add(brakeTempRL);
tireTempFL.setXY(14, 25);
tireTemps.add(tireTempFL);
brakeTempFL.setXY(14, 25);
brakeTemps.add(brakeTempFL);
tireLabel.setPosition(0, 0, 150, 25);
tireLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
tireLabel.setLinespacing(0);
tireLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_H6UX));
tireTemps.add(tireLabel);
brakeLabel.setPosition(0, 0, 150, 25);
brakeLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
brakeLabel.setLinespacing(0);
brakeLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_H6UX));
brakeTemps.add(brakeLabel);
add(tireTemps);
add(brakeTemps);
dataFields.setPosition(15, 15, 450, 305);
fieldTypeSelection.setPosition(0, 80, 150, 225);
@ -215,10 +215,10 @@ void DriverViewViewBase::setupScreen()
motorTempR.initialize();
invTempR.initialize();
invTempL.initialize();
tireTempRR.initialize();
tireTempFR.initialize();
tireTempRL.initialize();
tireTempFL.initialize();
brakeTempRR.initialize();
brakeTempFR.initialize();
brakeTempRL.initialize();
brakeTempFL.initialize();
fieldTypeSelection.initialize();
for (int i = 0; i < fieldTypeSelectionListItems.getNumberOfDrawables(); i++)
{

24
TouchGFX/gui/src/driverview_screen/DriverViewView.cpp
View File

@ -23,14 +23,14 @@ void DriverViewView::setupScreen() {
// tireTempRL.setTempThresholds(tireThresholds);
// tireTempRR.setTempThresholds(tireThresholds);
int brakeThresholds[4] = {100, 150, 200, 250};
tireTempFL.setSmallText(true);
tireTempFL.setTempThresholds(brakeThresholds);
tireTempFR.setSmallText(true);
tireTempFR.setTempThresholds(brakeThresholds);
tireTempRL.setSmallText(true);
tireTempRL.setTempThresholds(brakeThresholds);
tireTempRR.setSmallText(true);
tireTempRR.setTempThresholds(brakeThresholds);
brakeTempFL.setSmallText(true);
brakeTempFL.setTempThresholds(brakeThresholds);
brakeTempFR.setSmallText(true);
brakeTempFR.setTempThresholds(brakeThresholds);
brakeTempRL.setSmallText(true);
brakeTempRL.setTempThresholds(brakeThresholds);
brakeTempRR.setSmallText(true);
brakeTempRR.setTempThresholds(brakeThresholds);
int invThresholds[4] = {30, 40, 50, 60};
invTempL.setTempThresholds(invThresholds);
invTempR.setTempThresholds(invThresholds);
@ -58,10 +58,10 @@ void DriverViewView::updateFieldValues() {
}
void DriverViewView::setTemps(const Temperatures &temps) {
tireTempFL.setTemp(roundf(temps.brake_fl));
tireTempFR.setTemp(roundf(temps.brake_fr));
tireTempRL.setTemp(roundf(temps.brake_rl));
tireTempRR.setTemp(roundf(temps.brake_rr));
brakeTempFL.setTemp(roundf(temps.brake_fl));
brakeTempFR.setTemp(roundf(temps.brake_fr));
brakeTempRL.setTemp(roundf(temps.brake_rl));
brakeTempRR.setTemp(roundf(temps.brake_rr));
invTempL.setTemp(roundf(temps.inv_l));
invTempR.setTemp(roundf(temps.inv_r));
motorTempL.setTemp(roundf(temps.mot_l));

16
TouchGFX/steering-wheel.touchgfx
View File

@ -431,7 +431,7 @@
},
{
"Type": "Container",
"Name": "tireTemps",
"Name": "brakeTemps",
"X": 165,
"Y": 97,
"Width": 150,
@ -439,7 +439,7 @@
"Components": [
{
"Type": "Line",
"Name": "ttDivVert",
"Name": "btDivVert",
"X": 74,
"Y": 25,
"Width": 3,
@ -455,7 +455,7 @@
},
{
"Type": "Line",
"Name": "ttDivHoriz",
"Name": "btDivHoriz",
"X": 14,
"Y": 85,
"Width": 123,
@ -471,7 +471,7 @@
},
{
"Type": "CustomContainerInstance",
"Name": "tireTempRR",
"Name": "brakeTempRR",
"X": 77,
"Y": 88,
"Width": 60,
@ -480,7 +480,7 @@
},
{
"Type": "CustomContainerInstance",
"Name": "tireTempFR",
"Name": "brakeTempFR",
"X": 77,
"Y": 25,
"Width": 60,
@ -489,7 +489,7 @@
},
{
"Type": "CustomContainerInstance",
"Name": "tireTempRL",
"Name": "brakeTempRL",
"X": 14,
"Y": 88,
"Width": 60,
@ -498,7 +498,7 @@
},
{
"Type": "CustomContainerInstance",
"Name": "tireTempFL",
"Name": "brakeTempFL",
"X": 14,
"Y": 25,
"Width": 60,
@ -507,7 +507,7 @@
},
{
"Type": "TextArea",
"Name": "tireLabel",
"Name": "brakeLabel",
"Width": 150,
"Height": 25,
"TextId": "__SingleUse_H6UX",