diff --git a/mission/controller/acs/AcsParameters.cpp b/mission/controller/acs/AcsParameters.cpp index 1d1502f2..54be281c 100644 --- a/mission/controller/acs/AcsParameters.cpp +++ b/mission/controller/acs/AcsParameters.cpp @@ -351,10 +351,7 @@ ReturnValue_t AcsParameters::getParameter(uint8_t domainId, uint8_t parameterId, parameterWrapper->setVector(safeModeControllerParameters.satRateRef); break; case 0xA: - parameterWrapper->set(safeModeControllerParameters.cosineStartSpin); - break; - case 0xB: - parameterWrapper->set(safeModeControllerParameters.sineCalculateOmegaSun); + parameterWrapper->set(safeModeControllerParameters.angleStartSpin); break; default: return INVALID_IDENTIFIER_ID; diff --git a/mission/controller/acs/AcsParameters.h b/mission/controller/acs/AcsParameters.h index 3e956ae3..d5946245 100644 --- a/mission/controller/acs/AcsParameters.h +++ b/mission/controller/acs/AcsParameters.h @@ -811,13 +811,13 @@ class AcsParameters : public HasParametersIF { } rwMatrices; struct SafeModeControllerParameters { - double k_ortho_mekf = 0.00059437; - double k_align_mekf = 0.000056875; - double k_parallel_mekf = 0; + double k_ortho_mekf = 2.0e-1; + double k_align_mekf = 5.0e-4; + double k_parallel_mekf = 1.4e-4; - double k_ortho_no_mekf = 0.00059437; - double k_align_no_mekf = 0.000056875; - double k_parallel_no_mekf = 0; + double k_ortho_no_mekf = 2.0e-1; + double k_align_no_mekf = 5.0e-4; + double k_parallel_no_mekf = 1.4e-4; double sunMagAngleMin = 5 * M_PI / 180; @@ -826,8 +826,7 @@ class AcsParameters : public HasParametersIF { double satRateRef[3] = {0, 0, 0}; - float cosineStartSpin = 0.9; - float sineCalculateOmegaSun = 0.24; + float angleStartSpin = 20 * M_PI / 180; } safeModeControllerParameters; struct PointingLawParameters {