From 1dfcc238ed6e0ffd4f0e59d02bca918ebdfbb309 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 13 Dec 2023 10:12:29 +0100 Subject: [PATCH 1/3] ... --- mission/controller/acs/AttitudeEstimation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mission/controller/acs/AttitudeEstimation.cpp b/mission/controller/acs/AttitudeEstimation.cpp index 5e07642f..cf55a31e 100644 --- a/mission/controller/acs/AttitudeEstimation.cpp +++ b/mission/controller/acs/AttitudeEstimation.cpp @@ -10,7 +10,7 @@ void AttitudeEstimation::quest(acsctrl::SusDataProcessed *susData, acsctrl::MgmDataProcessed *mgmData, acsctrl::AttitudeEstimationData *attitudeEstimation) { if (not(susData->susVecTot.isValid() and susData->sunIjkModel.isValid() and - mgmData->mgmVecTot.value and mgmData->magIgrfModel.isValid())) { + mgmData->mgmVecTot.isValid() and mgmData->magIgrfModel.isValid())) { { PoolReadGuard pg{attitudeEstimation}; if (pg.getReadResult() == returnvalue::OK) { From f9b56d206eda3d4bb717782b306dca63811da3cb Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 13 Dec 2023 10:13:21 +0100 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe4c44f9..69706abb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ will consitute of a breaking change warranting a new major release: ## Fixed - Faulty mapping of input values for QUEST algorithm. +- Fixed validity check for QUEST algorithm. # [v7.5.0] 2023-12-06 From be2c4379a77c1a3ad4ea5210a312a452899199d2 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 13 Dec 2023 10:31:29 +0100 Subject: [PATCH 3/3] smoll refactor --- mission/controller/acs/AttitudeEstimation.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mission/controller/acs/AttitudeEstimation.cpp b/mission/controller/acs/AttitudeEstimation.cpp index cf55a31e..95a4046d 100644 --- a/mission/controller/acs/AttitudeEstimation.cpp +++ b/mission/controller/acs/AttitudeEstimation.cpp @@ -8,14 +8,14 @@ AttitudeEstimation::~AttitudeEstimation() {} void AttitudeEstimation::quest(acsctrl::SusDataProcessed *susData, acsctrl::MgmDataProcessed *mgmData, - acsctrl::AttitudeEstimationData *attitudeEstimation) { + acsctrl::AttitudeEstimationData *attitudeEstimationData) { if (not(susData->susVecTot.isValid() and susData->sunIjkModel.isValid() and mgmData->mgmVecTot.isValid() and mgmData->magIgrfModel.isValid())) { { - PoolReadGuard pg{attitudeEstimation}; + PoolReadGuard pg{attitudeEstimationData}; if (pg.getReadResult() == returnvalue::OK) { - std::memcpy(attitudeEstimation->quatQuest.value, ZERO_VEC4, 4 * sizeof(double)); - attitudeEstimation->quatQuest.setValid(false); + std::memcpy(attitudeEstimationData->quatQuest.value, ZERO_VEC4, 4 * sizeof(double)); + attitudeEstimationData->quatQuest.setValid(false); } } return; @@ -102,10 +102,10 @@ void AttitudeEstimation::quest(acsctrl::SusDataProcessed *susData, QuaternionOperations::slerp(qBI, qOld, acsParameters->onBoardParams.questFilterWeight, qBI); } { - PoolReadGuard pg{attitudeEstimation}; + PoolReadGuard pg{attitudeEstimationData}; if (pg.getReadResult() == returnvalue::OK) { - std::memcpy(attitudeEstimation->quatQuest.value, qBI, 4 * sizeof(double)); - attitudeEstimation->quatQuest.setValid(true); + std::memcpy(attitudeEstimationData->quatQuest.value, qBI, 4 * sizeof(double)); + attitudeEstimationData->quatQuest.setValid(true); } } }