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

frmt

Browse Source
This commit is contained in:
Marius Eggert 2023-03-24 14:51:07 +01:00
parent 9d8dfdfd4f
commit 44d0f1c533
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,36 +321,39 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
case (0x8): // SafeModeControllerParameters case (0x8): // SafeModeControllerParameters
switch (parameterId) { switch (parameterId) {
case 0x0: case 0x0:
parameterWrapper->set(safeModeControllerParameters.k_ortho_mekf); parameterWrapper->set(safeModeControllerParameters.k_orthoMekf);
break; break;
case 0x1: case 0x1:
parameterWrapper->set(safeModeControllerParameters.k_align_mekf); parameterWrapper->set(safeModeControllerParameters.k_alignMekf);
break; break;
case 0x2: case 0x2:
parameterWrapper->set(safeModeControllerParameters.k_parallel_mekf); parameterWrapper->set(safeModeControllerParameters.k_parallelMekf);
break; break;
case 0x3: case 0x3:
parameterWrapper->set(safeModeControllerParameters.k_ortho_no_mekf); parameterWrapper->set(safeModeControllerParameters.k_orthoNonMekf);
break; break;
case 0x4: case 0x4:
parameterWrapper->set(safeModeControllerParameters.k_align_no_mekf); parameterWrapper->set(safeModeControllerParameters.k_alignNonMekf);
break; break;
case 0x5: case 0x5:
parameterWrapper->set(safeModeControllerParameters.k_parallel_no_mekf); parameterWrapper->set(safeModeControllerParameters.k_parallelNonMekf);
break; break;
case 0x6: case 0x6:
parameterWrapper->set(safeModeControllerParameters.sunMagAngleMin); parameterWrapper->set(safeModeControllerParameters.k_rateDamping);
break; break;
case 0x7: case 0x7:
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDirLeop); parameterWrapper->set(safeModeControllerParameters.sunMagAngleMin);
break; break;
case 0x8: case 0x8:
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDir); parameterWrapper->setVector(safeModeControllerParameters.sunTargetDirLeop);
break; break;
case 0x9: case 0x9:
parameterWrapper->setVector(safeModeControllerParameters.satRateRef); parameterWrapper->setVector(safeModeControllerParameters.sunTargetDir);
break; break;
case 0xA: case 0xA:
parameterWrapper->setVector(safeModeControllerParameters.satRateRef);
break;
case 0xB:
parameterWrapper->set(safeModeControllerParameters.angleStartSpin); parameterWrapper->set(safeModeControllerParameters.angleStartSpin);
break; break;
default: default:

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

@ -811,13 +811,15 @@ class AcsParameters : public HasParametersIF {
} rwMatrices; } rwMatrices;
struct SafeModeControllerParameters { struct SafeModeControllerParameters {
double k_ortho_mekf = 2.0e-1; double k_orthoMekf = 2.0e-1;
double k_align_mekf = 5.0e-4; double k_alignMekf = 5.0e-4;
double k_parallel_mekf = 1.4e-4; double k_parallelMekf = 1.4e-4;
double k_ortho_no_mekf = 2.0e-1; double k_orthoNonMekf = 2.0e-1;
double k_align_no_mekf = 5.0e-4; double k_alignNonMekf = 5.0e-4;
double k_parallel_no_mekf = 1.4e-4; double k_parallelNonMekf = 1.4e-4;
double k_rateDamping = 0;
double sunMagAngleMin = 5 * M_PI / 180; double sunMagAngleMin = 5 * M_PI / 180;