TireTemp -> BrakeTemp
This commit is contained in:
		@ -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;
 | 
			
		||||
 | 
			
		||||
@ -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++)
 | 
			
		||||
    {
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user