From ae0413f7f6b3139858445248b994b4586d9f4889 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 4 Apr 2023 14:52:22 +0200
Subject: [PATCH] clean up code structure a bit

---
 mission/power/GomspaceDeviceHandler.cpp              | 2 +-
 mission/system/acs/CMakeLists.txt                    | 3 ++-
 mission/system/{fdir => acs}/StrFdir.cpp             | 0
 mission/system/{fdir => acs}/StrFdir.h               | 0
 mission/system/fdir/CMakeLists.txt                   | 3 +--
 mission/system/power/CMakeLists.txt                  | 2 ++
 mission/system/{fdir => power}/GomspacePowerFdir.cpp | 0
 mission/system/{fdir => power}/GomspacePowerFdir.h   | 0
 mission/tcs/Tmp1075Handler.cpp                       | 2 +-
 9 files changed, 7 insertions(+), 5 deletions(-)
 rename mission/system/{fdir => acs}/StrFdir.cpp (100%)
 rename mission/system/{fdir => acs}/StrFdir.h (100%)
 create mode 100644 mission/system/power/CMakeLists.txt
 rename mission/system/{fdir => power}/GomspacePowerFdir.cpp (100%)
 rename mission/system/{fdir => power}/GomspacePowerFdir.h (100%)

diff --git a/mission/power/GomspaceDeviceHandler.cpp b/mission/power/GomspaceDeviceHandler.cpp
index 80caba0c..89fca8ee 100644
--- a/mission/power/GomspaceDeviceHandler.cpp
+++ b/mission/power/GomspaceDeviceHandler.cpp
@@ -644,7 +644,7 @@ ReturnValue_t GomspaceDeviceHandler::parsePduHkTable(PDU::PduCoreHk& coreHk, PDU
 }
 
 ReturnValue_t GomspaceDeviceHandler::setHealth(HealthState health) {
-  if(health != HealthState::HEALTHY and health != HealthState::EXTERNAL_CONTROL and
+  if (health != HealthState::HEALTHY and health != HealthState::EXTERNAL_CONTROL and
       health != HealthState::NEEDS_RECOVERY) {
     return returnvalue::FAILED;
   }
diff --git a/mission/system/acs/CMakeLists.txt b/mission/system/acs/CMakeLists.txt
index e5ef2cb8..b7f927a0 100644
--- a/mission/system/acs/CMakeLists.txt
+++ b/mission/system/acs/CMakeLists.txt
@@ -9,4 +9,5 @@ target_sources(
           SusAssembly.cpp
           AcsBoardFdir.cpp
           acsModeTree.cpp
-          SusFdir.cpp)
+          SusFdir.cpp
+          StrFdir.cpp)
diff --git a/mission/system/fdir/StrFdir.cpp b/mission/system/acs/StrFdir.cpp
similarity index 100%
rename from mission/system/fdir/StrFdir.cpp
rename to mission/system/acs/StrFdir.cpp
diff --git a/mission/system/fdir/StrFdir.h b/mission/system/acs/StrFdir.h
similarity index 100%
rename from mission/system/fdir/StrFdir.h
rename to mission/system/acs/StrFdir.h
diff --git a/mission/system/fdir/CMakeLists.txt b/mission/system/fdir/CMakeLists.txt
index fb737a3f..3f0baf01 100644
--- a/mission/system/fdir/CMakeLists.txt
+++ b/mission/system/fdir/CMakeLists.txt
@@ -1,2 +1 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp StrFdir.cpp
-                                           GomspacePowerFdir.cpp)
+target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp)
diff --git a/mission/system/power/CMakeLists.txt b/mission/system/power/CMakeLists.txt
new file mode 100644
index 00000000..fb737a3f
--- /dev/null
+++ b/mission/system/power/CMakeLists.txt
@@ -0,0 +1,2 @@
+target_sources(${LIB_EIVE_MISSION} PRIVATE RtdFdir.cpp StrFdir.cpp
+                                           GomspacePowerFdir.cpp)
diff --git a/mission/system/fdir/GomspacePowerFdir.cpp b/mission/system/power/GomspacePowerFdir.cpp
similarity index 100%
rename from mission/system/fdir/GomspacePowerFdir.cpp
rename to mission/system/power/GomspacePowerFdir.cpp
diff --git a/mission/system/fdir/GomspacePowerFdir.h b/mission/system/power/GomspacePowerFdir.h
similarity index 100%
rename from mission/system/fdir/GomspacePowerFdir.h
rename to mission/system/power/GomspacePowerFdir.h
diff --git a/mission/tcs/Tmp1075Handler.cpp b/mission/tcs/Tmp1075Handler.cpp
index 92ac8a5c..df57aa8a 100644
--- a/mission/tcs/Tmp1075Handler.cpp
+++ b/mission/tcs/Tmp1075Handler.cpp
@@ -134,7 +134,7 @@ ReturnValue_t Tmp1075Handler::initializeLocalDataPool(localpool::DataPool &local
 void Tmp1075Handler::setModeNormal() { setMode(_MODE_TO_NORMAL); }
 
 ReturnValue_t Tmp1075Handler::setHealth(HealthState health) {
-  if(health != FAULTY and health != PERMANENT_FAULTY and health != HEALTHY and
+  if (health != FAULTY and health != PERMANENT_FAULTY and health != HEALTHY and
       health != EXTERNAL_CONTROL) {
     return returnvalue::FAILED;
   }