From 777b61376cf5da01ef679c72b525d04773e2622c Mon Sep 17 00:00:00 2001 From: meggert Date: Tue, 16 Jan 2024 15:51:37 +0100 Subject: [PATCH] small fix --- mission/controller/AcsController.cpp | 2 +- mission/controller/acs/control/PtgCtrl.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 6adb4a0b..724477fb 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -403,7 +403,7 @@ void AcsController::performPointingCtrl() { acs::ControlModeStrategy ptgCtrlStrat = ptgCtrl.pointingCtrlStrategy( mgmDataProcessed.mgmVecTot.isValid(), not mekfInvalidFlag, strValid, attitudeEstimationData.quatQuest.isValid(), fusedRotRateData.rotRateTotal.isValid(), - fusedRotRateData.rotRateSource.isValid(), useMekf); + fusedRotRateData.rotRateSource.value, useMekf); if (ptgCtrlStrat == acs::ControlModeStrategy::CTRL_NO_SENSORS_FOR_CONTROL) { ptgCtrlLostCounter++; diff --git a/mission/controller/acs/control/PtgCtrl.cpp b/mission/controller/acs/control/PtgCtrl.cpp index eb510c53..fd5b9f29 100644 --- a/mission/controller/acs/control/PtgCtrl.cpp +++ b/mission/controller/acs/control/PtgCtrl.cpp @@ -21,9 +21,8 @@ acs::ControlModeStrategy PtgCtrl::pointingCtrlStrategy( return acs::ControlModeStrategy::PTGCTRL_STR; } else if (questValid and fusedRateValid and rotRateSource > acs::rotrate::Source::SUSMGM) { return acs::ControlModeStrategy::PTGCTRL_QUEST; - } else { - return acs::ControlModeStrategy::CTRL_NO_SENSORS_FOR_CONTROL; } + return acs::ControlModeStrategy::CTRL_NO_SENSORS_FOR_CONTROL; } void PtgCtrl::ptgLaw(AcsParameters::PointingLawParameters *pointingLawParameters,