From ba70bde3e96945f8260280bde823b95deff98b21 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 3 Nov 2022 20:57:55 +0100
Subject: [PATCH] small fix

---
 mission/system/tree/acsModeTree.cpp     | 15 ---------------
 mission/system/tree/payloadModeTree.cpp |  2 +-
 mission/system/tree/util.cpp            | 10 +++++++++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/mission/system/tree/acsModeTree.cpp b/mission/system/tree/acsModeTree.cpp
index 32ced828..4e390985 100644
--- a/mission/system/tree/acsModeTree.cpp
+++ b/mission/system/tree/acsModeTree.cpp
@@ -16,7 +16,6 @@ namespace {
 // Alias for checker function
 const auto check = subsystem::checkInsert;
 
-void checkInsert(ReturnValue_t result, const char* ctx);
 void buildOffSequence(Subsystem* ss, ModeListEntry& eh);
 void buildDetumbleSequence(Subsystem* ss, ModeListEntry& entryHelper);
 void buildSafeSequence(Subsystem* ss, ModeListEntry& entryHelper);
@@ -25,7 +24,6 @@ void buildIdleChargeSequence(Subsystem* ss, ModeListEntry& entryHelper);
 void buildTargetPtSequence(Subsystem* ss, ModeListEntry& entryHelper);
 }  // namespace
 
-
 static const auto OFF = HasModesIF::MODE_OFF;
 static const auto NML = DeviceHandlerIF::MODE_NORMAL;
 
@@ -390,17 +388,4 @@ void buildTargetPtSequence(Subsystem* ss, ModeListEntry& eh) {
         ctxc);
 }
 
-void checkInsert(ReturnValue_t result, const char* ctx) {
-  if (result != returnvalue::OK) {
-    sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx;
-    if (result == mapdefs::KEY_ALREADY_EXISTS) {
-      sif::warning << ": Key already exists" << std::endl;
-    } else if (result == mapdefs::MAP_FULL) {
-      sif::warning << ": Map full" << std::endl;
-    } else {
-      sif::warning << std::endl;
-    }
-  }
-}
-
 }  // namespace
diff --git a/mission/system/tree/payloadModeTree.cpp b/mission/system/tree/payloadModeTree.cpp
index 95368822..f89bd41d 100644
--- a/mission/system/tree/payloadModeTree.cpp
+++ b/mission/system/tree/payloadModeTree.cpp
@@ -1,11 +1,11 @@
 #include "payloadModeTree.h"
 
-#include "eive/objects.h"
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/retval.h>
 #include <fsfw/subsystem/Subsystem.h>
 
+#include "eive/objects.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/system/objects/PayloadSubsystem.h"
 #include "mission/system/objects/definitions.h"
diff --git a/mission/system/tree/util.cpp b/mission/system/tree/util.cpp
index 176728eb..92a752e7 100644
--- a/mission/system/tree/util.cpp
+++ b/mission/system/tree/util.cpp
@@ -1,9 +1,17 @@
 #include "util.h"
 
+#include "fsfw/container/FixedMap.h"
 #include "fsfw/serviceinterface.h"
 
 void subsystem::checkInsert(ReturnValue_t result, const char* ctx) {
   if (result != returnvalue::OK) {
-    sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx << std::endl;
+    sif::warning << "satsystem::checkInsert: Insertion failed at " << ctx;
+    if (result == mapdefs::KEY_ALREADY_EXISTS) {
+      sif::warning << ": Key already exists" << std::endl;
+    } else if (result == mapdefs::MAP_FULL) {
+      sif::warning << ": Map full" << std::endl;
+    } else {
+      sif::warning << std::endl;
+    }
   }
 }