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

Use an event flag group for GUI updates

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-03-20 15:36:59 +01:00
parent 41dbfa73ee
commit f0254b92ee
12 changed files with 28 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TouchGFX/gui/include/gui/ami_screen/AMIPresenter.hpp
View File

@ -27,7 +27,7 @@ public:
virtual ~AMIPresenter(){};
void missionUpdated() override;
void vehicleStateUpdated() override;
private:
AMIPresenter();

2
TouchGFX/gui/include/gui/driverview_screen/DriverViewPresenter.hpp
View File

@ -27,7 +27,7 @@ public:
virtual ~DriverViewPresenter(){};
void amsUpdated() override;
void vehicleStateUpdated() override;
private:
DriverViewPresenter();

2
TouchGFX/gui/include/gui/missionselect_screen/MissionSelectPresenter.hpp
View File

@ -28,7 +28,7 @@ public:
virtual ~MissionSelectPresenter(){};
void missionUpdated() override;
void vehicleStateUpdated() override;
private:
MissionSelectPresenter();

7
TouchGFX/gui/include/gui/model/ModelListener.hpp
View File

@ -13,12 +13,7 @@ public:
void bind(Model *m) { model = m; }
virtual void amsUpdated(){};
virtual void missionUpdated(){};
virtual void statusUpdated(){};
virtual void tsCurrentUpdated(){};
virtual void tsVoltageVehicleUpdated(){};
virtual void tsVoltageBatteryUpdated(){};
virtual void vehicleStateUpdated(){};
protected:
Model *model;

4
TouchGFX/gui/src/ami_screen/AMIPresenter.cpp
View File

@ -6,10 +6,10 @@
AMIPresenter::AMIPresenter(AMIView &v) : view(v) {}
void AMIPresenter::activate() { missionUpdated(); }
void AMIPresenter::activate() { vehicleStateUpdated(); }
void AMIPresenter::deactivate() {}
void AMIPresenter::missionUpdated() {
void AMIPresenter::vehicleStateUpdated() {
view.setMission(vehicle_state.active_mission);
}

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

@ -9,7 +9,7 @@ void DriverViewPresenter::activate() {}
void DriverViewPresenter::deactivate() {}
void DriverViewPresenter::amsUpdated() {
void DriverViewPresenter::vehicleStateUpdated() {
view.setTSSoC(vehicle_state.soc);
view.setMinCellVolt(vehicle_state.min_cell_volt);
}

11
TouchGFX/gui/src/missionselect_screen/MissionSelectPresenter.cpp
View File

@ -12,12 +12,17 @@ void MissionSelectPresenter::activate() {}
void MissionSelectPresenter::deactivate() {}
void MissionSelectPresenter::missionUpdated() {
void MissionSelectPresenter::vehicleStateUpdated() {
FrontendApplication *app =
static_cast<FrontendApplication *>(FrontendApplication::getInstance());
if (vehicle_state.active_mission == MISSION_MANUAL) {
switch (vehicle_state.active_mission) {
case MISSION_NONE:
// Do nothing
break;
case MISSION_MANUAL:
app->gotoDriverViewScreenNoTransition();
} else {
break;
default:
app->gotoAMIScreenNoTransition();
}
}

30
TouchGFX/gui/src/model/Model.cpp
View File

@ -12,28 +12,12 @@
Model::Model() : modelListener(0) {}
void Model::tick() {
VehicleUpdate msg;
while (tx_queue_receive(&vehicle_update_queue, &msg, TX_NO_WAIT) ==
TX_SUCCESS) {
switch (msg) {
case VEH_UPD_AMS:
modelListener->amsUpdated();
break;
case VEH_UPD_MISSION:
modelListener->missionUpdated();
break;
case VEH_UPD_STATUS:
modelListener->statusUpdated();
break;
case VEH_UPD_TS_CURRENT:
modelListener->tsCurrentUpdated();
break;
case VEH_UPD_TS_VOLTAGE_VEH:
modelListener->tsVoltageVehicleUpdated();
break;
case VEH_UPD_TS_VOLTAGE_BAT:
modelListener->tsVoltageBatteryUpdated();
break;
}
ULONG events;
if (tx_event_flags_get(&gui_update_events, GUI_UPDATE_VEHICLE_STATE,
TX_OR_CLEAR, &events, TX_NO_WAIT) != TX_SUCCESS) {
return;
}
if (events & GUI_UPDATE_VEHICLE_STATE) {
modelListener->vehicleStateUpdated();
}
}