Revert ACS Safe Mode Controller to FLP Design #466

Merged
muellerr merged 64 commits from acs-flp-safe into develop 2023-04-14 20:26:20 +02:00
2 changed files with 7 additions and 17 deletions
Showing only changes of commit a09cc86336 - Show all commits

View File

@ -348,15 +348,9 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId,
parameterWrapper->setVector(safeModeControllerParameters.sunTargetDir);
break;
case 0x8:
parameterWrapper->set(safeModeControllerParameters.satRateRef);
break;
case 0x9:
parameterWrapper->set(safeModeControllerParameters.angleStartSpin);
break;
case 0xA:
parameterWrapper->set(safeModeControllerParameters.useMekf);
break;
case 0xB:
case 0x9:
parameterWrapper->set(safeModeControllerParameters.dampingDuringEclipse);
break;
default:

View File

@ -810,21 +810,17 @@ class AcsParameters : public HasParametersIF {
} rwMatrices;
struct SafeModeControllerParameters {
double k_orthoMekf = 1.0e-1;
double k_alignMekf = 7.0e-5;
double k_parallelMekf = 4.0e-4;
double k_orthoMekf = 3.25e-2;
double k_alignMekf = 4.0e-5;
double k_parallelMekf = 3.75e-4;
double k_orthoNonMekf = 1.0e-1;
double k_alignNonMekf = 7.0e-5;
double k_parallelNonMekf = 4.0e-4;
double k_orthoNonMekf = 3.25e-2;
double k_alignNonMekf = 4.0e-5;
double k_parallelNonMekf = 3.75e-4;
double sunTargetDirLeop[3] = {0, sqrt(.5), sqrt(.5)};
double sunTargetDir[3] = {0, 0, 1};
double satRateRef = 0;
float angleStartSpin = 20 * M_PI / 180;
uint8_t useMekf = true;
uint8_t dampingDuringEclipse = true;
} safeModeControllerParameters;