FaSTTUBe
/
steering-wheel
50
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more temperatures as data fields

This commit is contained in:
Jasper Blanckenburg 2023-05-24 01:12:16 +02:00
parent 80caf298db
commit 36ef42acb2
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TouchGFX/gui/include/gui/common/NamedField.hpp
View File

@ -14,7 +14,9 @@ CountedEnum(DataFieldType, size_t, DF_TSState, DF_ASState, DF_ActiveMission,
DF_IniChkState, DF_LapCount, DF_TireTempFL, DF_TireTempFR,
DF_TireTempRL, DF_TireTempRR, DF_MinCellVolt, DF_MaxCellTemp,
DF_TSSoC, DF_LVSoC, DF_TSCurrent, DF_TSVoltageBat, DF_TSVoltageVeh,
DF_Speed, DF_BBal, DF_BPF, DF_BPR, DF_DistanceTotal);
DF_Speed, DF_BBal, DF_BPF, DF_BPR, DF_DistanceTotal, DF_TempMotL,
DF_TempMotR, DF_TempInvL, DF_TempInvR, DF_TempBrakeFL,
DF_TempBrakeFR, DF_TempBrakeRL, DF_TempBrakeRR);
enum class NamedFieldKind { Float, Bool, Text, Int };

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

@ -262,7 +262,7 @@ NamedFieldDescription dataFieldDescs[] = {
VEH_FIELD(temps.tire_rr)},
[DF_MinCellVolt] = {NamedFieldKind::Float, "VMIN", 1, 2,
VEH_FIELD(min_cell_volt)},
[DF_MaxCellTemp] = {NamedFieldKind::Float, "TMAX", 2, 1,
[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},
@ -278,6 +278,22 @@ NamedFieldDescription dataFieldDescs[] = {
[DF_BPR] = {NamedFieldKind::Float, "BPR", 3, 1, VEH_FIELD(brake_press_r)},
[DF_DistanceTotal] = {NamedFieldKind::Float, "DIST", 3, 1,
VEH_FIELD(distance_total)},
[DF_TempMotL] = {NamedFieldKind::Float, "TMOTL", 2, 1,
VEH_FIELD(temps.mot_l)},
[DF_TempMotR] = {NamedFieldKind::Float, "TMOTR", 2, 1,
VEH_FIELD(temps.mot_r)},
[DF_TempInvL] = {NamedFieldKind::Float, "TINVL", 2, 1,
VEH_FIELD(temps.inv_l)},
[DF_TempInvR] = {NamedFieldKind::Float, "TINVR", 2, 1,
VEH_FIELD(temps.inv_r)},
[DF_TempBrakeFL] = {NamedFieldKind::Float, "TBFL", 3, 0,
VEH_FIELD(temps.brake_fl)},
[DF_TempBrakeFR] = {NamedFieldKind::Float, "TBFR", 3, 0,
VEH_FIELD(temps.brake_fr)},
[DF_TempBrakeRL] = {NamedFieldKind::Float, "TBRL", 3, 0,
VEH_FIELD(temps.brake_rl)},
[DF_TempBrakeRR] = {NamedFieldKind::Float, "TBRR", 3, 0,
VEH_FIELD(temps.brake_rr)},
};
static_assert(sizeof(dataFieldDescs) / sizeof(dataFieldDescs[0]) ==