finished power clean up

bsp_q7s/core/ObjectFactory.cpp

@@ -12,6 +12,7 @@
 #include <mission/acs/MgmRm3100CustomHandler.h>
 #include <mission/acs/str/StarTrackerHandler.h>
 #include <mission/acs/str/strHelpers.h>
+#include <mission/power/CspCookie.h>
 #include <mission/system/acs/ImtqAssembly.h>
 #include <mission/system/fdir/StrFdir.h>
 #include <mission/system/objects/CamSwitcher.h>
@@ -53,7 +54,6 @@
 #include "linux/ipcore/Ptme.h"
 #include "linux/ipcore/PtmeConfig.h"
 #include "mission/config/configfile.h"
-#include "mission/csp/CspCookie.h"
 #include "mission/system/acs/AcsBoardFdir.h"
 #include "mission/system/acs/AcsSubsystem.h"
 #include "mission/system/acs/RwAssembly.h"

linux/csp/CspComIF.cpp

@@ -3,6 +3,7 @@
 #include <csp/drivers/can_socketcan.h>
 #include <fsfw/serialize/SerializeAdapter.h>
 #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
+#include <mission/power/CspCookie.h>
 #include <mission/power/gsDefs.h>
 #include <p60acu.h>
 #include <p60dock.h>
@@ -10,8 +11,6 @@
 #include <param/param_string.h>
 #include <param/rparam_client.h>
 
-#include "mission/csp/CspCookie.h"
-
 using namespace GOMSPACE;
 
 CspComIF::CspComIF(object_id_t objectId, const char* routeTaskName, uint32_t routerRealTimePriority)

mission/CMakeLists.txt

@@ -8,7 +8,6 @@ add_subdirectory(system)
 add_subdirectory(com)
 add_subdirectory(acs)
 add_subdirectory(power)
-add_subdirectory(csp)
 add_subdirectory(cfdp)
 add_subdirectory(config)
 

mission/csp/CMakeLists.txt

@@ -1 +0,0 @@
-target_sources(${LIB_EIVE_MISSION} PRIVATE CspCookie.cpp)

mission/power/CMakeLists.txt

@@ -1,6 +1,7 @@
 target_sources(
   ${LIB_EIVE_MISSION}
-  PRIVATE Pdu1Handler.cpp
+  PRIVATE CspCookie.cpp
+          Pdu1Handler.cpp
           Pdu2Handler.cpp
           AcuHandler.cpp
           P60DockHandler.cpp

mission/power/CspCookie.cpp

@@ -1,4 +1,4 @@
-#include "CspCookie.h"
+#include <mission/power/CspCookie.h>
 
 using namespace GOMSPACE;
 CspCookie::CspCookie(uint16_t maxReplyLength_, uint8_t cspAddress_, uint32_t timeoutMs)

mission/power/GomspaceDeviceHandler.cpp

@@ -1,8 +1,9 @@
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/globalfunctions/arrayprinter.h>
-#include <mission/power/defs.h>
 #include <mission/power/GomSpacePackets.h>
 #include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/defs.h>
+
 #include <cassert>
 
 #include "eive/objects.h"

mission/power/GomspaceDeviceHandler.h

@@ -1,7 +1,7 @@
 #ifndef MISSION_POWER_GOMSPACEDEVICEHANDLER_H_
 #define MISSION_POWER_GOMSPACEDEVICEHANDLER_H_
 
-#include <mission/csp/CspCookie.h>
+#include <mission/power/CspCookie.h>
 #include <mission/power/GomSpacePackets.h>
 #include <mission/power/gsDefs.h>
 

mission/power/PcduHandler.h

@@ -8,8 +8,8 @@
 #include <fsfw/power/PowerSwitchIF.h>
 #include <fsfw/tasks/ExecutableObjectIF.h>
 #include <fsfw/timemanager/CCSDSTime.h>
-#include <mission/power/defs.h>
 #include <mission/power/GomspaceDeviceHandler.h>
+#include <mission/power/defs.h>
 #include <mission/power/gsDefs.h>
 
 /**

mission/power/defs.h

@@ -19,13 +19,11 @@ static constexpr Event SWITCHING_Q7S_DENIED = event::makeEvent(SUBSYSTEM_ID, 2,
 
 static constexpr Event FDIR_REACTION_IGNORED = event::makeEvent(SUBSYSTEM_ID, 3, severity::MEDIUM);
 
-
 enum class States { IDLE, SWITCHING_POWER, CHECKING_POWER, MODE_COMMANDING };
 enum class OpCodes { NONE, TO_OFF_DONE, TO_NOT_OFF_DONE, TIMEOUT_OCCURED };
 
 }  // namespace power
 
-
 namespace duallane {
 
 enum Submodes : Submode_t { A_SIDE = 0, B_SIDE = 1, DUAL_MODE = 2 };

mission/system/fdir/GomspacePowerFdir.cpp

@@ -1,6 +1,7 @@
-#include <mission/power/defs.h>
 #include "GomspacePowerFdir.h"
 
+#include <mission/power/defs.h>
+
 #include "fsfw/devicehandlers/DeviceHandlerIF.h"
 #include "fsfw/health/HealthTableIF.h"
 #include "fsfw/modes/HasModesIF.h"