eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

new params

Browse Source
This commit is contained in:
Marius Eggert 2023-07-19 14:41:09 +02:00
parent 8db131f4ab
commit 9dfc8a0e93
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mission/controller/acs/AcsParameters.cpp
View File

@ -348,24 +348,36 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
parameterWrapper->set(safeModeControllerParameters.k_parallelMekf); parameterWrapper->set(safeModeControllerParameters.k_parallelMekf);
break; break;
case 0x3: case 0x3:
parameterWrapper->set(safeModeControllerParameters.k_orthoNonMekf); parameterWrapper->set(safeModeControllerParameters.k_orthoGyr);
break; break;
case 0x4: case 0x4:
parameterWrapper->set(safeModeControllerParameters.k_alignNonMekf); parameterWrapper->set(safeModeControllerParameters.k_alignGyr);
break; break;
case 0x5: case 0x5:
parameterWrapper->set(safeModeControllerParameters.k_parallelNonMekf); parameterWrapper->set(safeModeControllerParameters.k_parallelGyr);
break; break;
case 0x6: case 0x6:
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDirLeop); parameterWrapper->set(safeModeControllerParameters.k_orthoGyr);
break; break;
case 0x7: case 0x7:
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDir); parameterWrapper->set(safeModeControllerParameters.k_alignGyr);
break; break;
case 0x8: case 0x8:
parameterWrapper->set(safeModeControllerParameters.useMekf); parameterWrapper->set(safeModeControllerParameters.k_parallelGyr);
break; break;
case 0x9: case 0x9:
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDirLeop);
break;
case 0xA:
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDir);
break;
case 0xB:
parameterWrapper->set(safeModeControllerParameters.useMekf);
break;
case 0xC:
parameterWrapper->set(safeModeControllerParameters.useGyr);
break;
case 0xD:
parameterWrapper->set(safeModeControllerParameters.dampingDuringEclipse); parameterWrapper->set(safeModeControllerParameters.dampingDuringEclipse);
break; break;
default: default:

7
mission/controller/acs/AcsParameters.h
View File

@ -828,9 +828,9 @@ class AcsParameters : public HasParametersIF {
double k_alignMekf = 4.0e-5; double k_alignMekf = 4.0e-5;
double k_parallelMekf = 3.75e-4; double k_parallelMekf = 3.75e-4;
double k_orthoNonMekf = 4.4e-3; double k_orthoGyr = 4.4e-3;
double k_alignNonMekf = 4.0e-5; double k_alignGyr = 4.0e-5;
double k_parallelNonMekf = 3.75e-4; double k_parallelGyr = 3.75e-4;
double k_orthoSusMgm = 1.1e-2; double k_orthoSusMgm = 1.1e-2;
double k_alignSusMgm = 2.0e-5; double k_alignSusMgm = 2.0e-5;
@ -840,6 +840,7 @@ class AcsParameters : public HasParametersIF {
double sunTargetDir[3] = {0, 0, 1}; double sunTargetDir[3] = {0, 0, 1};
uint8_t useMekf = false; uint8_t useMekf = false;
uint8_t useGyr = false;
uint8_t dampingDuringEclipse = true; uint8_t dampingDuringEclipse = true;
} safeModeControllerParameters; } safeModeControllerParameters;