From cda88cdc5620c52427037a8b1f28c8ec6f0dca50 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Dec 2023 10:40:18 +0100 Subject: [PATCH 01/11] increase max num of scheduled commands to 1500 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e172ee9c..ad006b06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ include(EiveHelpers) option(EIVE_ADD_ETL_LIB "Add ETL library" ON) option(EIVE_ADD_JSON_LIB "Add JSON library" ON) -set(OBSW_MAX_SCHEDULED_TCS 500) +set(OBSW_MAX_SCHEDULED_TCS 1500) if(EIVE_Q7S_EM) set(OBSW_Q7S_EM From efc4e83857841c8fa306b06a9293f56208aefcc3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Dec 2023 11:16:13 +0100 Subject: [PATCH 02/11] make robin happy --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad006b06..5ec74740 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,7 @@ include(EiveHelpers) option(EIVE_ADD_ETL_LIB "Add ETL library" ON) option(EIVE_ADD_JSON_LIB "Add JSON library" ON) -set(OBSW_MAX_SCHEDULED_TCS 1500) +set(OBSW_MAX_SCHEDULED_TCS 4000) if(EIVE_Q7S_EM) set(OBSW_Q7S_EM From 46ffee3e5df11f4431feada527d241e37de8f7a3 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Dec 2023 11:34:20 +0100 Subject: [PATCH 03/11] bump fsfw --- fsfw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fsfw b/fsfw index 7105e199..48bcce65 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 7105e199c650303ac1a48e75aebc44182630931e +Subproject commit 48bcce65b19f134658cdd9921069bfc0bf953e28 From 8a50746251096aac2ea7bfa277396b5a9f4003fd Mon Sep 17 00:00:00 2001 From: meggert Date: Tue, 12 Dec 2023 16:01:30 +0100 Subject: [PATCH 04/11] i blame robin for not finding this in his review --- mission/controller/acs/AttitudeEstimation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mission/controller/acs/AttitudeEstimation.cpp b/mission/controller/acs/AttitudeEstimation.cpp index e287b22f..5e07642f 100644 --- a/mission/controller/acs/AttitudeEstimation.cpp +++ b/mission/controller/acs/AttitudeEstimation.cpp @@ -24,10 +24,10 @@ void AttitudeEstimation::quest(acsctrl::SusDataProcessed *susData, // Normalize Data double normMgmB[3] = {0, 0, 0}, normMgmI[3] = {0, 0, 0}, normSusB[3] = {0, 0, 0}, normSusI[3] = {0, 0, 0}; - VectorOperations::normalize(susData->susVecTot.value, normMgmB, 3); - VectorOperations::normalize(susData->sunIjkModel.value, normMgmI, 3); - VectorOperations::normalize(mgmData->mgmVecTot.value, normSusB, 3); - VectorOperations::normalize(mgmData->magIgrfModel.value, normSusI, 3); + VectorOperations::normalize(susData->susVecTot.value, normSusB, 3); + VectorOperations::normalize(susData->sunIjkModel.value, normSusI, 3); + VectorOperations::normalize(mgmData->mgmVecTot.value, normMgmB, 3); + VectorOperations::normalize(mgmData->magIgrfModel.value, normMgmI, 3); // Create Helper Vectors double normHelperB[3] = {0, 0, 0}, normHelperI[3] = {0, 0, 0}, helperCross[3] = {0, 0, 0}, From 4858c1ea57a8d990fc6e976c667bcdb729d5689c Mon Sep 17 00:00:00 2001 From: meggert Date: Tue, 12 Dec 2023 17:03:58 +0100 Subject: [PATCH 05/11] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b89cacbe..fe4c44f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Fixed + +- Faulty mapping of input values for QUEST algorithm. + # [v7.5.0] 2023-12-06 - `eive-tmtc` v5.12.0 From 9723bf70a0f93a54db81bc3b8356175bbc25a56c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Dec 2023 17:54:29 +0100 Subject: [PATCH 06/11] changelog update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b89cacbe..29bea1bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Changed + +- Increased the maximum number of scheduled telecommands from 500 to 4000. Merry Christmas! + # [v7.5.0] 2023-12-06 - `eive-tmtc` v5.12.0 From 1dfcc238ed6e0ffd4f0e59d02bca918ebdfbb309 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 13 Dec 2023 10:12:29 +0100 Subject: [PATCH 07/11] ... --- 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 08/11] 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 09/11] 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); } } } From 5cdb8db42a1219153ea1a846b27ac8ae354f1703 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 13 Dec 2023 11:31:59 +0100 Subject: [PATCH 10/11] prep v7.5.1 --- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- bsp_hosted/fsfwconfig/events/translateEvents.cpp | 2 +- bsp_hosted/fsfwconfig/objects/translateObjects.cpp | 2 +- generators/bsp_hosted_returnvalues.csv | 1 + generators/bsp_q7s_returnvalues.csv | 1 + generators/events/translateEvents.cpp | 2 +- generators/objects/translateObjects.cpp | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 2 +- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- tmtc | 2 +- 11 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce293308..4396b43d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v7.5.1] 2023-12-13 + ## Changed - Increased the maximum number of scheduled telecommands from 500 to 4000. Merry Christmas! diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ec74740..9222280e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 7) set(OBSW_VERSION_MINOR 5) -set(OBSW_VERSION_REVISION 0) +set(OBSW_VERSION_REVISION 1) # set(CMAKE_VERBOSE TRUE) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index 18184b50..d5b3de46 100644 --- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp +++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 318 translations. * @details - * Generated on: 2023-12-06 17:19:38 + * Generated on: 2023-12-13 11:29:45 */ #include "translateEvents.h" diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index f8058834..ac61a526 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 175 translations. - * Generated on: 2023-12-06 17:19:38 + * Generated on: 2023-12-13 11:29:45 */ #include "translateObjects.h" diff --git a/generators/bsp_hosted_returnvalues.csv b/generators/bsp_hosted_returnvalues.csv index 8bbb79f4..8ef110db 100644 --- a/generators/bsp_hosted_returnvalues.csv +++ b/generators/bsp_hosted_returnvalues.csv @@ -387,6 +387,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x4304;PUS11_InvalidRelativeTime;No description;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4305;PUS11_ContainedTcTooSmall;No description;5;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4306;PUS11_ContainedTcCrcMissmatch;No description;6;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h +0x4307;PUS11_MapIsFull;No description;7;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4400;FILS_GenericFileError;No description;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h 0x4401;FILS_GenericDirError;No description;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h 0x4402;FILS_FilesystemInactive;No description;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv index e194ac67..76184dce 100644 --- a/generators/bsp_q7s_returnvalues.csv +++ b/generators/bsp_q7s_returnvalues.csv @@ -387,6 +387,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path 0x4304;PUS11_InvalidRelativeTime;No description;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4305;PUS11_ContainedTcTooSmall;No description;5;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4306;PUS11_ContainedTcCrcMissmatch;No description;6;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h +0x4307;PUS11_MapIsFull;No description;7;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h 0x4400;FILS_GenericFileError;No description;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h 0x4401;FILS_GenericDirError;No description;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h 0x4402;FILS_FilesystemInactive;No description;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index 18184b50..d5b3de46 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 318 translations. * @details - * Generated on: 2023-12-06 17:19:38 + * Generated on: 2023-12-13 11:29:45 */ #include "translateEvents.h" diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 279261c2..30696975 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2023-12-06 17:19:38 + * Generated on: 2023-12-13 11:29:45 */ #include "translateObjects.h" diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index 18184b50..d5b3de46 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** * @brief Auto-generated event translation file. Contains 318 translations. * @details - * Generated on: 2023-12-06 17:19:38 + * Generated on: 2023-12-13 11:29:45 */ #include "translateEvents.h" diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 279261c2..30696975 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2023-12-06 17:19:38 + * Generated on: 2023-12-13 11:29:45 */ #include "translateObjects.h" diff --git a/tmtc b/tmtc index 4c54aa75..747ad34e 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 4c54aa75865974c6026828a98f0523ed1074a8cc +Subproject commit 747ad34eec5baa5199de49a1330687508c991550 From 9ceaa6817cf011c1095f1cc008a3ff722f404d57 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 13 Dec 2023 11:32:19 +0100 Subject: [PATCH 11/11] bump tmtc version --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4396b43d..03fd90ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ will consitute of a breaking change warranting a new major release: # [v7.5.1] 2023-12-13 +- `eive-tmtc` v5.12.1 + ## Changed - Increased the maximum number of scheduled telecommands from 500 to 4000. Merry Christmas!