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

Add progress bar to endurance view

Browse Source
This commit is contained in:
Jasper Blanckenburg
2024-06-11 22:34:36 +02:00
parent cb2f55be1b
commit f0db650c30
10 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
TouchGFX/gui/src/containers/ProgressBar.cpp
View File

@ -5,6 +5,22 @@ ProgressBar::ProgressBar() {}
void ProgressBar::initialize() { ProgressBarBase::initialize(); }
void ProgressBar::update() {
if (vehicle_state.ts_state == TS_PRECHARGE) {
float progress = 0;
if (vehicle_state.ts_voltage_bat != 0) {
progress =
vehicle_state.ts_voltage_veh / vehicle_state.ts_voltage_bat * 100;
}
setProgress(true, ProgressType::PRECHARGE, progress);
} else if (vehicle_state.r2d_progress > R2D_TSACTIVE &&
vehicle_state.r2d_progress < R2D_INIT_SUCCESS) {
setProgress(true, ProgressType::R2D, vehicle_state.r2d_progress);
} else {
setProgress(false, ProgressType::PRECHARGE, 0);
}
}
void ProgressBar::setProgress(bool active, ProgressType type, float progress) {
if (active) {
switch (type) {

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

@ -25,7 +25,7 @@ void DriverViewPresenter::deactivate() {}
void DriverViewPresenter::vehicleStateUpdated() {
view.setTemps(vehicle_state.temps);
view.setTSSoC(vehicle_state.soc_ts);
updateProgress();
view.updateProgress();
updateErrorPopup();
view.updateFieldValues();
@ -42,22 +42,6 @@ void DriverViewPresenter::setFieldType(size_t i, DataFieldType type) {
view.setFieldType(i, type);
}
void DriverViewPresenter::updateProgress() {
if (vehicle_state.ts_state == TS_PRECHARGE) {
float progress = 0;
if (vehicle_state.ts_voltage_bat != 0) {
progress =
vehicle_state.ts_voltage_veh / vehicle_state.ts_voltage_bat * 100;
}
view.setProgress(true, ProgressType::PRECHARGE, progress);
} else if (vehicle_state.r2d_progress > R2D_TSACTIVE &&
vehicle_state.r2d_progress < R2D_INIT_SUCCESS) {
view.setProgress(true, ProgressType::R2D, vehicle_state.r2d_progress);
} else {
view.setProgress(false, ProgressType::PRECHARGE, 0);
}
}
void DriverViewPresenter::updateErrorPopup() {
static uint32_t last_error = 0;
if (vehicle_state.ts_state == TS_ERROR) {

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

@ -3,7 +3,6 @@
#include "gui/containers/DriverViewStatusItem.hpp"
#include "gui/containers/ProgressBar.hpp"
#include "gui/driverview_screen/DriverViewPresenter.hpp"
#include "texts/TextKeysAndLanguages.hpp"
#include "touchgfx/Callback.hpp"
#include "touchgfx/Drawable.hpp"
#include "touchgfx/Unicode.hpp"
@ -97,10 +96,7 @@ void DriverViewView::setTSSoC(uint8_t value) {
socLabel.invalidate();
}
void DriverViewView::setProgress(bool active, ProgressType type,
float progress) {
progressBar.setProgress(active, type, progress);
}
void DriverViewView::updateProgress() { progressBar.update(); }
void DriverViewView::showAMSError() {
errorPopup.setVisible(true);

2
TouchGFX/gui/src/endurance_screen/EnduranceView.cpp
View File

@ -37,6 +37,8 @@ void EnduranceView::updateDetails() {
tbatBuffer.setFloatValue(vehicle_state.max_cell_temp);
}
void EnduranceView::updateProgress() { progressBar.update(); }
BatDelta::BatDelta(touchgfx::BoxWithBorder &box,
touchgfx::TextAreaWithOneWildcard &field)
: box(box), field(field), value(INT_MIN) {}