cleaning up com

bsp_q7s/core/ObjectFactory.cpp

@@ -58,12 +58,12 @@
 #include "mission/system/fdir/GomspacePowerFdir.h"
 #include "mission/system/fdir/RtdFdir.h"
 #include "mission/system/fdir/SusFdir.h"
-#include "mission/system/fdir/SyrlinksFdir.h"
+#include "mission/com/SyrlinksFdir.h"
 #include "mission/system/objects/AcsSubsystem.h"
 #include "mission/system/objects/RwAssembly.h"
 #include "mission/system/objects/TcsBoardAssembly.h"
 #include "mission/system/tree/acsModeTree.h"
-#include "mission/system/tree/comModeTree.h"
+#include "mission/com/comModeTree.h"
 #include "mission/system/tree/payloadModeTree.h"
 #include "mission/system/tree/tcsModeTree.h"
 #include "mission/tmtc/tmFilters.h"
@@ -80,7 +80,7 @@ using gpio::Levels;
 #include <mission/devices/PcduHandler.h>
 #include <mission/devices/Pdu1Handler.h>
 #include <mission/devices/Pdu2Handler.h>
-#include <mission/devices/SyrlinksHandler.h>
+#include <mission/com/SyrlinksHandler.h>
 #include <mission/devices/devicedefinitions/rwHelpers.h>
 #include <mission/tmtc/VirtualChannelWithQueue.h>
 
@@ -116,10 +116,10 @@ using gpio::Levels;
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
-#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+#include "mission/com/syrlinksDefs.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/system/objects/AcsBoardAssembly.h"
-#include "mission/tmtc/CcsdsIpCoreHandler.h"
+#include "mission/com/CcsdsIpCoreHandler.h"
 #include "mission/tmtc/TmFunnelHandler.h"
 
 ResetArgs RESET_ARGS_GNSS;

bsp_q7s/core/ObjectFactory.h

@@ -6,7 +6,7 @@
 #include <mission/core/GenericFactory.h>
 #include <mission/devices/HeaterHandler.h>
 #include <mission/system/objects/Stack5VHandler.h>
-#include <mission/tmtc/CcsdsIpCoreHandler.h>
+#include <mission/com/CcsdsIpCoreHandler.h>
 #include <mission/tmtc/CfdpTmFunnel.h>
 #include <mission/tmtc/PersistentLogTmStoreTask.h>
 #include <mission/tmtc/PusTmFunnel.h>

bsp_q7s/obsw.cpp

@@ -15,7 +15,7 @@
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
 #include "mission/acsDefs.h"
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
 #include "mission/system/tree/system.h"
 #include "q7sConfig.h"
 #include "watchdog/definitions.h"

dummies/SyrlinksDummy.cpp

@@ -1,6 +1,6 @@
 #include "SyrlinksDummy.h"
 
-#include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
+#include <mission/com/syrlinksDefs.h>
 
 SyrlinksDummy::SyrlinksDummy(object_id_t objectId, object_id_t comif, CookieIF *comCookie)
     : DeviceHandlerBase(objectId, comif, comCookie) {}

dummies/helpers.cpp

@@ -36,7 +36,7 @@
 #include "mission/core/GenericFactory.h"
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/system/tree/acsModeTree.h"
-#include "mission/system/tree/comModeTree.h"
+#include "mission/com/comModeTree.h"
 #include "mission/system/tree/payloadModeTree.h"
 #include "mission/system/tree/tcsModeTree.h"
 

linux/ObjectFactory.h

@@ -4,7 +4,7 @@
 #include <fsfw/returnvalues/returnvalue.h>
 #include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
 #include <mission/memory/SdCardMountedIF.h>
-#include <mission/tmtc/CcsdsIpCoreHandler.h>
+#include <mission/com/CcsdsIpCoreHandler.h>
 #include <mission/tmtc/CfdpTmFunnel.h>
 #include <mission/tmtc/PusTmFunnel.h>
 

mission/CMakeLists.txt

@@ -5,6 +5,7 @@ add_subdirectory(utility)
 add_subdirectory(memory)
 add_subdirectory(tmtc)
 add_subdirectory(system)
+add_subdirectory(com)
 add_subdirectory(csp)
 add_subdirectory(cfdp)
 add_subdirectory(config)

mission/com/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(
+  ${LIB_EIVE_MISSION}
+  PRIVATE SyrlinksHandler.cpp ComSubsystem.cpp SyrlinksFdir.cpp comModeTree.cpp
+        CcsdsIpCoreHandler.cpp
+)

mission/com/CcsdsIpCoreHandler.cpp

@@ -11,7 +11,7 @@
 #include "fsfw/serialize/SerializeAdapter.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/serviceinterface/serviceInterfaceDefintions.h"
-#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+#include "mission/com/syrlinksDefs.h"
 
 CcsdsIpCoreHandler::CcsdsIpCoreHandler(object_id_t objectId, object_id_t tcDestination,
                                        PtmeConfig& ptmeConfig, std::atomic_bool& linkState,

mission/com/CcsdsIpCoreHandler.h

@@ -23,7 +23,7 @@
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "fsfw_hal/common/gpio/gpioDefinitions.h"
 #include "linux/ipcore/PtmeConfig.h"
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
 
 struct PtmeGpios {
   gpioId_t enableTxClock = gpio::NO_GPIO;

mission/com/ComSubsystem.cpp

@@ -5,7 +5,7 @@
 #include <fsfw/ipc/QueueFactory.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
 #include <linux/ipcore/PdecHandler.h>
-#include <mission/comDefs.h>
+#include <mission/com/defs.h>
 #include <mission/config/comCfg.h>
 
 #include <utility>

mission/com/ComSubsystem.h

@@ -7,7 +7,7 @@
 #include <fsfw/parameters/ParameterHelper.h>
 #include <fsfw/subsystem/Subsystem.h>
 
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
 
 class ComSubsystem : public Subsystem, public ReceivesParameterMessagesIF {
  public:

mission/com/SyrlinksFdir.cpp

@@ -7,7 +7,7 @@
 #include "fsfw/power/Fuse.h"
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
 #include "fsfw/thermal/ThermalComponentIF.h"
-#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+#include "mission/com/syrlinksDefs.h"
 
 SyrlinksFdir::SyrlinksFdir(object_id_t syrlinksId)
     : DeviceHandlerFailureIsolation(syrlinksId, objects::NO_OBJECT) {}

mission/com/SyrlinksHandler.cpp

@@ -1,6 +1,6 @@
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw/globalfunctions/CRC.h>
-#include <mission/devices/SyrlinksHandler.h>
+#include <mission/com/SyrlinksHandler.h>
 
 #include "OBSWConfig.h"
 #include "mission/config/comCfg.h"

mission/com/SyrlinksHandler.h

@@ -7,8 +7,8 @@
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/timemanager/Countdown.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
-#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+#include "mission/com/syrlinksDefs.h"
 #include "returnvalues/classIds.h"
 
 /**

mission/com/comModeTree.cpp

@@ -1,12 +1,10 @@
-#include "comModeTree.h"
-
 #include <fsfw/modes/HasModesIF.h>
 #include <fsfw/returnvalues/returnvalue.h>
 #include <fsfw/subsystem/Subsystem.h>
-
+#include <mission/com/comModeTree.h>
 #include "eive/objects.h"
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
-#include "util.h"
+#include "mission/system/tree/util.h"
 
 const auto check = subsystem::checkInsert;
 

mission/com/comModeTree.h

@@ -2,7 +2,7 @@
 #define MISSION_SYSTEM_TREE_COMMODETREE_H_
 
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
-#include <mission/system/objects/ComSubsystem.h>
+#include <mission/com/ComSubsystem.h>
 
 namespace satsystem {
 

mission/com/defs.h

@@ -1,6 +1,8 @@
 #ifndef MISSION_COMDEFS_H_
 #define MISSION_COMDEFS_H_
 
+#include <cstdint>
+
 namespace com {
 
 enum class Datarate : uint8_t {

mission/config/comCfg.h

@@ -3,7 +3,7 @@
 
 #include <fsfw/ipc/MutexIF.h>
 
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
 
 namespace com {
 

mission/controller/ThermalController.cpp

@@ -8,7 +8,7 @@
 #include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include <mission/devices/devicedefinitions/GyroL3GD20Definitions.h>
-#include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
+#include <mission/com/syrlinksDefs.h>
 #include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
 #include <mission/devices/devicedefinitions/imtqHelpers.h>
 #include <mission/devices/devicedefinitions/payloadPcduDefinitions.h>

mission/controller/ThermalController.h

@@ -11,7 +11,7 @@
 #include <mission/controller/controllerdefinitions/ThermalControllerDefinitions.h>
 #include <mission/devices/devicedefinitions/BpxBatteryDefinitions.h>
 #include <mission/devices/devicedefinitions/Max31865Definitions.h>
-#include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
+#include <mission/com/syrlinksDefs.h>
 #include <mission/devices/devicedefinitions/Tmp1075Definitions.h>
 #include <mission/devices/devicedefinitions/gyroAdisHelpers.h>
 #include <mission/devices/devicedefinitions/imtqHelpers.h>

mission/devices/CMakeLists.txt

@@ -8,7 +8,6 @@ target_sources(
           Pdu1Handler.cpp
           Pdu2Handler.cpp
           ACUHandler.cpp
-          SyrlinksHandler.cpp
           Max31865PT1000Handler.cpp
           Max31865EiveHandler.cpp
           ImtqHandler.cpp

mission/system/fdir/CMakeLists.txt

@@ -1,4 +1,4 @@
 target_sources(
   ${LIB_EIVE_MISSION}
-  PRIVATE AcsBoardFdir.cpp RtdFdir.cpp StrFdir.cpp SusFdir.cpp SyrlinksFdir.cpp
+  PRIVATE AcsBoardFdir.cpp RtdFdir.cpp StrFdir.cpp SusFdir.cpp
           GomspacePowerFdir.cpp)

mission/system/objects/CMakeLists.txt

@@ -3,7 +3,6 @@ target_sources(
   PRIVATE EiveSystem.cpp
           CamSwitcher.cpp
           AcsSubsystem.cpp
-          ComSubsystem.cpp
           TcsSubsystem.cpp
           PayloadSubsystem.cpp
           AcsBoardAssembly.cpp

mission/system/tree/CMakeLists.txt

@@ -1,4 +1,4 @@
 target_sources(
   ${LIB_EIVE_MISSION}
-  PRIVATE acsModeTree.cpp payloadModeTree.cpp comModeTree.cpp tcsModeTree.cpp
+  PRIVATE acsModeTree.cpp payloadModeTree.cpp tcsModeTree.cpp
           system.cpp util.cpp)

mission/system/tree/system.cpp

@@ -3,12 +3,12 @@
 #include <fsfw/devicehandlers/DeviceHandlerIF.h>
 #include <fsfw/subsystem/Subsystem.h>
 #include <mission/acsDefs.h>
+#include <mission/com/comModeTree.h>
 #include <mission/sysDefs.h>
 
 #include "acsModeTree.h"
-#include "comModeTree.h"
 #include "eive/objects.h"
-#include "mission/comDefs.h"
+#include "mission/com/defs.h"
 #include "payloadModeTree.h"
 #include "tcsModeTree.h"
 #include "util.h"

mission/tmtc/CMakeLists.txt

@@ -1,6 +1,6 @@
 target_sources(
   ${LIB_EIVE_MISSION}
-  PRIVATE CcsdsIpCoreHandler.cpp
+  PRIVATE
           VirtualChannelWithQueue.cpp
           PersistentTmStoreWithTmQueue.cpp
           LiveTmTask.cpp

mission/tmtc/VirtualChannelWithQueue.cpp

@@ -1,6 +1,6 @@
 #include <mission/tmtc/VirtualChannelWithQueue.h>
 
-#include "CcsdsIpCoreHandler.h"
+#include "mission/com/CcsdsIpCoreHandler.h"
 #include "OBSWConfig.h"
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/objectmanager/ObjectManager.h"

tmtc

@@ -1 +1 @@
-Subproject commit 5e0d33c9a843c3cd2da10304050665ef25a08f2a
+Subproject commit c2100c2f09b2dd82ef4ef192860aec4e7800f538