From 80349820674a29defcc93ba4a2fde00434447ee9 Mon Sep 17 00:00:00 2001 From: Marius Eggert Date: Wed, 12 Jun 2024 17:04:13 +0200 Subject: [PATCH] and that one --- mission/controller/AcsController.cpp | 4 ++-- mission/controller/AcsController.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp index 8bd63b9c..542da9b4 100644 --- a/mission/controller/AcsController.cpp +++ b/mission/controller/AcsController.cpp @@ -831,8 +831,8 @@ ReturnValue_t AcsController::initializeLocalDataPool(localpool::DataPool &localD localDataPoolMap.emplace(acsctrl::PoolIds::MTQ_TARGET_DIPOLE, &mtqTargetDipole); poolManager.subscribeForRegularPeriodicPacket({actuatorCmdData.getSid(), enableHkSets, 10.0}); // Fused Rot Rate - localDataPoolMap.emplace(acsctrl::PoolIds::ROT_RATE_TOT_SUSMGM, &rotRateTotalSusMgm); - localDataPoolMap.emplace(acsctrl::PoolIds::ROT_RATE_TOT_SOURCE, &rotRateTotalSource); + localDataPoolMap.emplace(acsctrl::PoolIds::ROT_RATE_TOT_SUSMGM, &rotRateTotSusMgm); + localDataPoolMap.emplace(acsctrl::PoolIds::ROT_RATE_TOT_SOURCE, &rotRateTotSource); localDataPoolMap.emplace(acsctrl::PoolIds::ROT_RATE_SOURCE, &rotRateSource); poolManager.subscribeForRegularPeriodicPacket({fusedRotRateData.getSid(), enableHkSets, 10.0}); // Fused Rot Rate Sources diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h index a7da3223..74ff8fdf 100644 --- a/mission/controller/AcsController.h +++ b/mission/controller/AcsController.h @@ -271,8 +271,8 @@ class AcsController : public ExtendedControllerBase, public ReceivesParameterMes // Fused Rot Rate acsctrl::FusedRotRateData fusedRotRateData; - PoolEntry rotRateTotalSusMgm = PoolEntry(3); - PoolEntry rotRateTotalSource = PoolEntry(3); + PoolEntry rotRateTotSusMgm = PoolEntry(3); + PoolEntry rotRateTotSource = PoolEntry(3); PoolEntry rotRateSource = PoolEntry(); // Fused Rot Rate Sources