clean up op done

2023-03-26 16:42:00 +02:00
parent e7eaaa9295
commit 63b50e6101
116 changed files with 630 additions and 601 deletions
--- a/mission/controller/AcsController.h
+++ b/mission/controller/AcsController.h
@ -11,8 +11,8 @@
 #include <fsfw_hal/devicehandlers/MgmRM3100Handler.h>
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
-#include <mission/trace.h>
+#include <mission/acs/susMax1227Helpers.h>
+#include <mission/utility/trace.h>

 #include "acs/ActuatorCmd.h"
 #include "acs/Guidance.h"
--- a/mission/controller/ThermalController.cpp
+++ b/mission/controller/ThermalController.cpp
@ -10,7 +10,7 @@
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
 #include <mission/com/syrlinksDefs.h>
-#include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
+#include <mission/payload/payloadPcduDefinitions.h>
 #include <mission/power/bpxBattDefs.h>
 #include <mission/power/gsDefs.h>
 #include <objects/systemObjectList.h>
--- a/mission/controller/ThermalController.h
+++ b/mission/controller/ThermalController.h
@ -11,20 +11,19 @@
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
+#include <mission/acs/susMax1227Helpers.h>
 #include <mission/com/syrlinksDefs.h>
 #include <mission/controller/controllerdefinitions/ThermalControllerDefinitions.h>
-#include <mission/devices/devicedefinitions/Max31865Definitions.h>
-#include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
-#include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
+#include <mission/payload/payloadPcduDefinitions.h>
 #include <mission/power/bpxBattDefs.h>
 #include <mission/power/gsDefs.h>
+#include <mission/tcs/HeaterHandler.h>
+#include <mission/tcs/Max31865Definitions.h>
+#include <mission/tcs/Tmp1075Definitions.h>
+#include <mission/utility/trace.h>

 #include <list>

-#include "mission/devices/HeaterHandler.h"
-#include "mission/trace.h"
-
 /**
 * NOP Limit: Hard limit for device, usually from datasheet. Device damage is possible lif NOP limit
 * is exceeded.
--- a/mission/controller/acs/SensorValues.h
+++ b/mission/controller/acs/SensorValues.h
@ -9,7 +9,7 @@
 #include <mission/acs/imtqHelpers.h>
 #include <mission/acs/rwHelpers.h>
 #include <mission/acs/str/strHelpers.h>
-#include <mission/devices/devicedefinitions/susMax1227Helpers.h>
+#include <mission/acs/susMax1227Helpers.h>

 namespace ACS {