From b8b6a14e3bf741c085637066795f8ba8d993306a Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 16 Aug 2022 11:27:16 +0200
Subject: [PATCH] some bugfixes

---
 fsfw                                                      | 2 +-
 mission/controller/AcsController.cpp                      | 8 +++++---
 mission/controller/AcsController.h                        | 2 +-
 .../controller/controllerdefinitions/AcsCtrlDefinitions.h | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/fsfw b/fsfw
index f4c4f994..d9759581 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit f4c4f9946c7fb9fd050178baa4865da654366b70
+Subproject commit d975958120bd151dabdc450a104e9cc8069ff509
diff --git a/mission/controller/AcsController.cpp b/mission/controller/AcsController.cpp
index c7309097..46db49ce 100644
--- a/mission/controller/AcsController.cpp
+++ b/mission/controller/AcsController.cpp
@@ -29,9 +29,11 @@ void AcsController::performControlOperation() {
       break;
   }
 
-  if (mgmData.read() == RETURN_OK) {
-      copyMgmData();
-      mgmData.commit();
+  {
+    PoolReadGuard pg(&mgmData);
+    if (pg.getReadResult() == RETURN_OK) {
+        copyMgmData();
+    }
   }
 }
 
diff --git a/mission/controller/AcsController.h b/mission/controller/AcsController.h
index 35503c48..8dbe38aa 100644
--- a/mission/controller/AcsController.h
+++ b/mission/controller/AcsController.h
@@ -43,7 +43,7 @@ class AcsController : public ExtendedControllerBase {
   PoolEntry<float> mgm1PoolVec = PoolEntry<float>(3);
   PoolEntry<float> mgm2PoolVec = PoolEntry<float>(3);
   PoolEntry<float> mgm3PoolVec = PoolEntry<float>(3);
-  PoolEntry<float> imtqMgmPoolVec = PoolEntry<float>(3);
+  PoolEntry<int32_t> imtqMgmPoolVec = PoolEntry<int32_t>(3);
   PoolEntry<uint8_t> imtqCalActStatus = PoolEntry<uint8_t>();
   void copyMgmData();
 
diff --git a/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h b/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
index 9062ef6b..f2913943 100644
--- a/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
+++ b/mission/controller/controllerdefinitions/AcsCtrlDefinitions.h
@@ -21,7 +21,7 @@ enum PoolIds : lp_id_t {
 };
 
 
-static constexpr uint8_t MGM_SET_ENTRIES = 5;
+static constexpr uint8_t MGM_SET_ENTRIES = 10;
 
 /**
  * @brief   This dataset can be used to store the collected temperatures of all temperature sensors