Compare commits
No commits in common. "5121dcb74f253699705d75d8bbd7690e5924919a" and "2b54a8ffe826e96e1d9282ba71160b7e04985510" have entirely different histories.
5121dcb74f
...
2b54a8ffe8
@ -11,7 +11,7 @@ extern "C" {
|
||||
#include "util.h"
|
||||
|
||||
CountedEnum(ParamType, size_t, PF_BBAL, PF_SLIPREF, PF_MUMAX, PF_ASRP, PF_ASRON,
|
||||
PF_ASRI, PF_PLIM);
|
||||
PF_ASRI);
|
||||
|
||||
typedef struct {
|
||||
float bbal;
|
||||
@ -20,7 +20,6 @@ typedef struct {
|
||||
unsigned asrp;
|
||||
unsigned asri;
|
||||
unsigned asron;
|
||||
unsigned plim;
|
||||
} Params;
|
||||
|
||||
extern Params params;
|
||||
|
@ -4,10 +4,7 @@
|
||||
|
||||
Params params = {0};
|
||||
|
||||
void params_init() {
|
||||
params.bbal = 50;
|
||||
params.plim = 20;
|
||||
}
|
||||
void params_init() { params.bbal = 50; }
|
||||
|
||||
void params_inc(ParamType param) {
|
||||
switch (param) {
|
||||
@ -32,9 +29,6 @@ void params_inc(ParamType param) {
|
||||
case PF_ASRON:
|
||||
params.asron = 1;
|
||||
break;
|
||||
case PF_PLIM:
|
||||
params.plim = (params.plim < 80) ? params.plim + 1 : 80;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,9 +63,6 @@ void params_dec(ParamType param) {
|
||||
case PF_ASRON:
|
||||
params.asron = 0;
|
||||
break;
|
||||
case PF_PLIM:
|
||||
params.plim = (params.plim > 2) ? params.plim - 1 : 2;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,8 +87,6 @@ void params_broadcast(ParamType param) {
|
||||
case PF_ASRON:
|
||||
value = params.asron;
|
||||
break;
|
||||
case PF_PLIM:
|
||||
value = params.plim;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
@ -78,19 +78,19 @@ void VehicleConfigViewBase::handleKeyEvent(uint8_t key)
|
||||
|
||||
}
|
||||
|
||||
if(107 == key)
|
||||
if(106 == key)
|
||||
{
|
||||
//DecreaseParam
|
||||
//When hardware button 107 clicked call virtual function
|
||||
//When hardware button 106 clicked call virtual function
|
||||
//Call decParam
|
||||
decParam();
|
||||
|
||||
}
|
||||
|
||||
if(106 == key)
|
||||
if(107 == key)
|
||||
{
|
||||
//IncreaseParam
|
||||
//When hardware button 106 clicked call virtual function
|
||||
//When hardware button 107 clicked call virtual function
|
||||
//Call incParam
|
||||
incParam();
|
||||
|
||||
|
@ -316,7 +316,6 @@ NamedFieldDescription paramFieldDescs[] = {
|
||||
[PF_ASRP] = {NamedFieldKind::Int, "ASR-P", 2, 0, PARAM_FIELD(asrp)},
|
||||
[PF_ASRON] = {NamedFieldKind::Int, "ASR-ON", 2, 0, PARAM_FIELD(asron)},
|
||||
[PF_ASRI] = {NamedFieldKind::Int, "ASR-I", 2, 0, PARAM_FIELD(asri)},
|
||||
[PF_PLIM] = {NamedFieldKind::Int, "PLIM", 2, 0, PARAM_FIELD(plim)},
|
||||
};
|
||||
|
||||
static_assert(sizeof(paramFieldDescs) / sizeof(paramFieldDescs[0]) ==
|
||||
|
@ -1185,7 +1185,7 @@
|
||||
"InteractionName": "DecreaseParam",
|
||||
"Trigger": {
|
||||
"Type": "TriggerPhysicalButtonClicked",
|
||||
"ButtonKey": 107
|
||||
"ButtonKey": 106
|
||||
},
|
||||
"Action": {
|
||||
"Type": "ActionCustom",
|
||||
@ -1196,7 +1196,7 @@
|
||||
"InteractionName": "IncreaseParam",
|
||||
"Trigger": {
|
||||
"Type": "TriggerPhysicalButtonClicked",
|
||||
"ButtonKey": 106
|
||||
"ButtonKey": 107
|
||||
},
|
||||
"Action": {
|
||||
"Type": "ActionCustom",
|
||||
|
Loading…
x
Reference in New Issue
Block a user