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

Parameters for ASR test day

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-04-11 21:10:20 +02:00
parent 253b10ba15
commit 7065cb455a
8 changed files with 101 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Core/Inc/params.h
View File

@ -10,14 +10,14 @@ extern "C" {
#include "util.h"
CountedEnum(ParamType, size_t, PF_BBAL, PF_TC1, PF_TC2, PF_TORQUEMAP, PF_TEST1,
CountedEnum(ParamType, size_t, PF_BBAL, PF_SLIPREF, PF_ASRP, PF_ASRON, PF_TEST1,
PF_TEST2, PF_TEST3, PF_TEST4);
typedef struct {
float bbal;
unsigned tc1;
unsigned tc2;
unsigned torque_map;
float slipref;
unsigned asrp;
unsigned asron;
unsigned test[4];
} Params;

42
Core/Src/params.c
View File

@ -14,14 +14,14 @@ void params_inc(ParamType param) {
params.bbal = 100.0f;
}
break;
case PF_TC1:
params.tc1++;
case PF_SLIPREF:
params.slipref += 0.01f;
break;
case PF_TC2:
params.tc2++;
case PF_ASRP:
params.asrp++;
break;
case PF_TORQUEMAP:
params.torque_map++;
case PF_ASRON:
params.asron = 1;
break;
case PF_TEST1:
params.test[0]++;
@ -46,20 +46,18 @@ void params_dec(ParamType param) {
params.bbal = 0.0f;
}
break;
case PF_TC1:
if (params.tc1 > 0) {
params.tc1--;
case PF_SLIPREF:
if (params.slipref > 0) {
params.slipref -= 0.01f;
}
break;
case PF_TC2:
if (params.tc2 > 0) {
params.tc2--;
case PF_ASRP:
if (params.asrp > 0) {
params.asrp--;
}
break;
case PF_TORQUEMAP:
if (params.torque_map > 0) {
params.torque_map--;
}
case PF_ASRON:
params.asron = 0;
break;
case PF_TEST1:
if (params.test[0] > 0) {
@ -90,14 +88,14 @@ void params_broadcast(ParamType param) {
case PF_BBAL:
value = params.bbal * 10;
break;
case PF_TC1:
value = params.tc1;
case PF_SLIPREF:
value = params.slipref * 100;
break;
case PF_TC2:
value = params.tc2;
case PF_ASRP:
value = params.asrp;
break;
case PF_TORQUEMAP:
value = params.torque_map;
case PF_ASRON:
value = params.asron;
break;
case PF_TEST1:
value = params.test[0];