diff --git a/CHANGELOG.md b/CHANGELOG.md index 70e97138..6753b02a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ will consitute of a breaking change warranting a new major release: - `FusedRotationRate` now only uses rotation rate from QUEST and STR in higher modes - QUEST and STR rates are now allowed per default +- Changed PTG Strat priorities to favor STR before MEKF. # [v7.6.1] 2024-02-05 diff --git a/mission/controller/acs/control/PtgCtrl.cpp b/mission/controller/acs/control/PtgCtrl.cpp index eb1e35c8..95b16a3c 100644 --- a/mission/controller/acs/control/PtgCtrl.cpp +++ b/mission/controller/acs/control/PtgCtrl.cpp @@ -15,10 +15,10 @@ acs::ControlModeStrategy PtgCtrl::pointingCtrlStrategy( const bool fusedRateValid, const uint8_t rotRateSource, const uint8_t mekfEnabled) { if (not magFieldValid) { return acs::ControlModeStrategy::CTRL_NO_MAG_FIELD_FOR_CONTROL; - } else if (mekfEnabled and mekfValid) { - return acs::ControlModeStrategy::PTGCTRL_MEKF; } else if (strValid and fusedRateValid and rotRateSource > acs::rotrate::Source::SUSMGM) { return acs::ControlModeStrategy::PTGCTRL_STR; + } else if (mekfEnabled and mekfValid) { + return acs::ControlModeStrategy::PTGCTRL_MEKF; } else if (questValid and fusedRateValid and rotRateSource > acs::rotrate::Source::SUSMGM) { return acs::ControlModeStrategy::PTGCTRL_QUEST; }