From 3673ae8e62250e2ec8ebe2010a180beb955fc9b0 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Sep 2022 17:46:41 +0200 Subject: [PATCH] doc correction --- fsfw | 2 +- mission/controller/AcsController.h | 2 +- .../controller/controllerdefinitions/AcsCtrlDefinitions.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fsfw b/fsfw index cf8fe7ea..7e0a5d5a 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit cf8fe7ea728bea077b9936bcf0db96845bc6419e +Subproject commit 7e0a5d5a9e4f38c6d818bbdd5b44d34d8007eb1e diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h index 83d9afab..14b710a2 100644 --- a/mission/controller/AcsController.h +++ b/mission/controller/AcsController.h @@ -33,7 +33,7 @@ class AcsController : public ExtendedControllerBase { uint32_t* msToReachTheMode) override; // MGMs - acsctrl::MgmData mgmData; + acsctrl::MgmDataRaw mgmData; MGMLIS3MDL::MgmPrimaryDataset mgm0Lis3Set = MGMLIS3MDL::MgmPrimaryDataset(objects::MGM_0_LIS3_HANDLER); diff --git a/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h b/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h index de971cf5..9a2b1abd 100644 --- a/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h +++ b/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h @@ -41,11 +41,11 @@ static constexpr uint8_t MGM_SET_ENTRIES = 10; static constexpr uint8_t SUS_SET_ENTRIES = 12; /** - * @brief This dataset can be used to store the collected temperatures of all temperature sensors + * @brief Raw MGM sensor data. Includes the IMTQ sensor data and actuator status. */ -class MgmData : public StaticLocalDataSet { +class MgmDataRaw : public StaticLocalDataSet { public: - MgmData(HasLocalDataPoolIF* hkOwner) : StaticLocalDataSet(hkOwner, MGM_SENSOR_DATA) {} + MgmDataRaw(HasLocalDataPoolIF* hkOwner) : StaticLocalDataSet(hkOwner, MGM_SENSOR_DATA) {} // The ACS board measurement are in floating point uT lp_vec_t mgm0Lis3 = lp_vec_t(sid.objectId, MGM_0_LIS3_UT, this);