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

Modify & transmit params via CAN

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-04-04 22:05:50 +02:00
parent a5f10be4fd
commit 253b10ba15
10 changed files with 199 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,6 +278,35 @@ static_assert(sizeof(dataFieldDescs) / sizeof(dataFieldDescs[0]) ==
#define PARAM_FIELD(FIELD) []() { return (void *)&params.FIELD; }
void inc_bbal(void *valPtr) {
// float *val = (float *)valPtr;
// *val += 0.1f;
// if (*val > 100.0f) {
// *val = 100.0f;
// }
}
void dec_bbal(void *valPtr) {
// float *val = (float *)valPtr;
// *val -= 0.1f;
// if (*val < 0.0f) {
// *val = 0.0f;
// }
}
void inc_int(void *valPtr) {
// int *val = (int *)valPtr;
// *val += 1;
}
void dec_int(void *valPtr) {
// int *val = (int *)valPtr;
// *val -= 1;
// if (*val < 0) {
// *val = 0;
// }
}
NamedFieldDescription paramFieldDescs[] = {
[PF_BBAL] = {NamedFieldKind::Float, "BBAL", 2, 1, PARAM_FIELD(bbal)},
[PF_TC1] = {NamedFieldKind::Int, "TC1", 2, 0, PARAM_FIELD(tc1)},
@ -291,7 +320,7 @@ NamedFieldDescription paramFieldDescs[] = {
};
static_assert(sizeof(paramFieldDescs) / sizeof(paramFieldDescs[0]) ==
ParamFieldType_COUNT,
ParamType_COUNT,
"Incorrect number of param field descriptions");
template <class T>
@ -383,4 +412,4 @@ template <class T> void NamedField<T>::updateValueBuffer() {
}
template class NamedField<DataFieldType>;
template class NamedField<ParamFieldType>;
template class NamedField<ParamType>;

23
TouchGFX/gui/src/vehicleconfig_screen/VehicleConfigView.cpp
View File

@ -1,6 +1,7 @@
#include "gui/common/NamedField.hpp"
#include "gui/containers/ConfigItem.hpp"
#include "main.h"
#include "params.h"
#include <cstdint>
#include <gui/vehicleconfig_screen/VehicleConfigView.hpp>
@ -8,7 +9,7 @@ VehicleConfigView::VehicleConfigView() : selectedParam{0} {}
void VehicleConfigView::setupScreen() {
VehicleConfigViewBase::setupScreen();
params.setNumberOfItems(ParamFieldType_COUNT);
params.setNumberOfItems(ParamType_COUNT);
}
void VehicleConfigView::tearDownScreen() {
@ -16,31 +17,33 @@ void VehicleConfigView::tearDownScreen() {
}
void VehicleConfigView::paramsUpdateItem(ConfigItem &item, int16_t itemIndex) {
item.setType(static_cast<ParamFieldType>(itemIndex));
item.setType(static_cast<ParamType>(itemIndex));
item.setSelected(itemIndex == selectedParam);
}
void VehicleConfigView::selectPrevParam() {
if (selectedParam == 0) {
updateSelectedParam(ParamFieldType_COUNT - 1);
updateSelectedParam(ParamType_COUNT - 1);
} else {
updateSelectedParam(selectedParam - 1);
}
}
void VehicleConfigView::selectNextParam() {
updateSelectedParam((selectedParam + 1) % ParamFieldType_COUNT);
updateSelectedParam((selectedParam + 1) % ParamType_COUNT);
}
void VehicleConfigView::decParam() {
// TODO: How to handle this for different parameter types?
params_dec(static_cast<ParamType>(selectedParam));
params.itemChanged(selectedParam);
}
void VehicleConfigView::incParam() {
// TODO: How to handle this for different parameter types?
params_inc(static_cast<ParamType>(selectedParam));
params.itemChanged(selectedParam);
}
void VehicleConfigView::confirmParam() {
// TODO: How to handle this for different parameter types?
params_broadcast(static_cast<ParamType>(selectedParam));
}
void VehicleConfigView::updateSelectedParam(int select) {
@ -81,7 +84,7 @@ void VehicleConfigView::updateSelectedParam(int select) {
}
int16_t firstWanted;
if (selectedParam == 0 && previousSelected == ParamFieldType_COUNT - 1) {
if (selectedParam == 0 && previousSelected == ParamType_COUNT - 1) {
firstWanted = 0;
} else if (selectedParam > previousSelected) {
firstWanted = selectedParam - numVisible + 1;
@ -90,8 +93,8 @@ void VehicleConfigView::updateSelectedParam(int select) {
}
if (firstWanted < 0) {
firstWanted = 0;
} else if (firstWanted > ParamFieldType_COUNT - 1) {
firstWanted = ParamFieldType_COUNT - 1;
} else if (firstWanted > ParamType_COUNT - 1) {
firstWanted = ParamType_COUNT - 1;
}
params.animateToItem(firstWanted, 0);
}