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

Add LV SoC field

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-07-24 18:15:24 +02:00
parent 0736955fd9
commit 990e176b71
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TouchGFX/gui/src/common/NamedField.cpp
View File

@ -264,8 +264,8 @@ NamedFieldDescription dataFieldDescs[] = {
VEH_FIELD(min_cell_volt)},
[DF_MaxCellTemp] = {NamedFieldKind::Float, "TBAT", 2, 1,
VEH_FIELD(max_cell_temp)},
[DF_TSSoC] = {NamedFieldKind::Int, "TSSOC", 3, 0, VEH_FIELD(soc)},
[DF_LVSoC] = {NamedFieldKind::Float, "LVSOC", 3, 0, get_zero},
[DF_TSSoC] = {NamedFieldKind::Int, "TSSOC", 3, 0, VEH_FIELD(soc_ts)},
[DF_LVSoC] = {NamedFieldKind::Int, "LVSOC", 3, 0, VEH_FIELD(soc_lv)},
[DF_TSCurrent] = {NamedFieldKind::Float, "ITS", 3, 0,
VEH_FIELD(ts_current)},
[DF_TSVoltageBat] = {NamedFieldKind::Float, "TSVBAT", 3, 1,

9
TouchGFX/gui/src/containers/DriverViewStatusItem.cpp
View File

@ -60,8 +60,13 @@ void DriverViewStatusItem::update() {
break;
case DriverViewStatusType::LV:
text.setTypedText(T_LV);
// TODO: Set color based on LV SoC
bg.setColor(COLOR_OFF);
if (vehicle_state.soc_lv < 10) {
bg.setColor(COLOR_ERROR);
} else if (vehicle_state.soc_lv < 30) {
bg.setColor(COLOR_WARNING);
} else {
bg.setColor(COLOR_OK);
}
break;
}
text.invalidate();

2
TouchGFX/gui/src/driverview_screen/DriverViewPresenter.cpp
View File

@ -23,7 +23,7 @@ void DriverViewPresenter::deactivate() {}
void DriverViewPresenter::vehicleStateUpdated() {
view.setTemps(vehicle_state.temps);
view.setTSSoC(vehicle_state.soc);
view.setTSSoC(vehicle_state.soc_ts);
updateProgress();
updateErrorPopup();