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

Laptimes

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-07-27 01:46:24 +02:00
parent 6da02adae9
commit 638394ac0a
6 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Core/Inc/vehicle_state.h
View File

@ -129,6 +129,9 @@ typedef struct {
IniChkState ini_chk_state; IniChkState ini_chk_state;
unsigned lap_count; unsigned lap_count;
float lap_last;
float lap_best;
Temperatures temps; Temperatures temps;
float min_cell_volt; float min_cell_volt;

6
Core/Src/vehicle.c
View File

@ -16,6 +16,7 @@
#define CAN_ID_AMS_STATUS 0xA #define CAN_ID_AMS_STATUS 0xA
#define CAN_ID_AMS_ERROR 0xC #define CAN_ID_AMS_ERROR 0xC
#define CAN_ID_ABX_DRIVER 0x101 #define CAN_ID_ABX_DRIVER 0x101
#define CAN_ID_ABX_TIMINGS 0x102
#define CAN_ID_ABX_BRAKE_T 0x105 #define CAN_ID_ABX_BRAKE_T 0x105
#define CAN_ID_CS_INTERNAL 0x108 #define CAN_ID_CS_INTERNAL 0x108
#define CAN_ID_ABX_MISC 0x109 #define CAN_ID_ABX_MISC 0x109
@ -40,6 +41,7 @@ void vehicle_thread_entry(ULONG hfdcan_addr) {
ftcan_add_filter(CAN_ID_AMS_STATUS, 0x7FF); ftcan_add_filter(CAN_ID_AMS_STATUS, 0x7FF);
ftcan_add_filter(CAN_ID_AMS_ERROR, 0x7FF); ftcan_add_filter(CAN_ID_AMS_ERROR, 0x7FF);
ftcan_add_filter(CAN_ID_ABX_DRIVER, 0x7FF); ftcan_add_filter(CAN_ID_ABX_DRIVER, 0x7FF);
ftcan_add_filter(CAN_ID_ABX_TIMINGS, 0x7FF);
ftcan_add_filter(CAN_ID_ABX_BRAKE_T, 0x7FF); ftcan_add_filter(CAN_ID_ABX_BRAKE_T, 0x7FF);
ftcan_add_filter(CAN_ID_CS_INTERNAL, 0x7FF); ftcan_add_filter(CAN_ID_CS_INTERNAL, 0x7FF);
ftcan_add_filter(CAN_ID_ABX_MISC, 0x7FF); ftcan_add_filter(CAN_ID_ABX_MISC, 0x7FF);
@ -104,6 +106,10 @@ void ftcan_msg_received_cb(uint16_t id, size_t datalen, const uint8_t *data) {
vehicle_state.brake_press_r = ((data[2] >> 4) | (data[3] << 4)) * 0.1; vehicle_state.brake_press_r = ((data[2] >> 4) | (data[3] << 4)) * 0.1;
vehicle_state.speed = data[5] * CAN_ABX_DRIVER_SPEED_FACTOR; vehicle_state.speed = data[5] * CAN_ABX_DRIVER_SPEED_FACTOR;
break; break;
case CAN_ID_ABX_TIMINGS:
vehicle_state.lap_best = (data[0] | (data[1] << 8)) * 0.01f;
vehicle_state.lap_last = (data[2] | (data[3] << 8)) * 0.01f;
break;
case CAN_ID_ABX_BRAKE_T: case CAN_ID_ABX_BRAKE_T:
vehicle_state.temps.brake_fl = (data[0] | (data[1] << 8)) * 0.01f; vehicle_state.temps.brake_fl = (data[0] | (data[1] << 8)) * 0.01f;
vehicle_state.temps.brake_fr = (data[2] | (data[3] << 8)) * 0.01f; vehicle_state.temps.brake_fr = (data[2] | (data[3] << 8)) * 0.01f;

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

@ -16,7 +16,8 @@ CountedEnum(DataFieldType, size_t, DF_TSState, DF_ASState, DF_ActiveMission,
DF_TSSoC, DF_LVSoC, DF_TSCurrent, DF_TSVoltageBat, DF_TSVoltageVeh, DF_TSSoC, DF_LVSoC, DF_TSCurrent, DF_TSVoltageBat, DF_TSVoltageVeh,
DF_Speed, DF_BBal, DF_BPF, DF_BPR, DF_DistanceTotal, DF_TempMotL, DF_Speed, DF_BBal, DF_BPF, DF_BPR, DF_DistanceTotal, DF_TempMotL,
DF_TempMotR, DF_TempInvL, DF_TempInvR, DF_TempBrakeFL, DF_TempMotR, DF_TempInvL, DF_TempInvR, DF_TempBrakeFL,
DF_TempBrakeFR, DF_TempBrakeRL, DF_TempBrakeRR); DF_TempBrakeFR, DF_TempBrakeRL, DF_TempBrakeRR, DF_LapBest,
DF_LapLast);
enum class NamedFieldKind { Float, Bool, Text, Int }; enum class NamedFieldKind { Float, Bool, Text, Int };

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

@ -294,6 +294,10 @@ NamedFieldDescription dataFieldDescs[] = {
VEH_FIELD(temps.brake_rl)}, VEH_FIELD(temps.brake_rl)},
[DF_TempBrakeRR] = {NamedFieldKind::Float, "TBRR", 3, 0, [DF_TempBrakeRR] = {NamedFieldKind::Float, "TBRR", 3, 0,
VEH_FIELD(temps.brake_rr)}, VEH_FIELD(temps.brake_rr)},
[DF_LapBest] = {NamedFieldKind::Float, "LAPBEST", 3, 1,
VEH_FIELD(lap_best)},
[DF_LapLast] = {NamedFieldKind::Float, "LAPLAST", 3, 1,
VEH_FIELD(lap_last)},
}; };
static_assert(sizeof(dataFieldDescs) / sizeof(dataFieldDescs[0]) == static_assert(sizeof(dataFieldDescs) / sizeof(dataFieldDescs[0]) ==

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

@ -11,7 +11,7 @@ constexpr int32_t SHOW_ERRORS_FOR = 10000; // ms
#include "vehicle_state.h" #include "vehicle_state.h"
DriverViewPresenter::DriverViewPresenter(DriverViewView &v) DriverViewPresenter::DriverViewPresenter(DriverViewView &v)
: view(v), fields{DF_MinCellVolt, DF_Speed, DF_MaxCellTemp} {} : view(v), fields{DF_LapLast, DF_Speed, DF_MaxCellTemp} {}
void DriverViewPresenter::activate() { void DriverViewPresenter::activate() {
for (size_t i = 0; i < 3; i++) { for (size_t i = 0; i < 3; i++) {

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

@ -14,7 +14,7 @@
#include "vehicle_state.h" #include "vehicle_state.h"
DriverViewView::DriverViewView() DriverViewView::DriverViewView()
: fieldTypes{DF_MinCellVolt, DF_Speed, DF_TSCurrent} {} : fieldTypes{DF_LapLast, DF_Speed, DF_MaxCellTemp} {}
void DriverViewView::setupScreen() { void DriverViewView::setupScreen() {
DriverViewViewBase::setupScreen(); DriverViewViewBase::setupScreen();