Merge remote-tracking branch 'origin/main' into mpsoc-overhaul

bsp_q7s/objectFactory.cpp

@@ -72,7 +72,7 @@
 #include "mission/system/acs/acsModeTree.h"
 #include "mission/system/com/SyrlinksFdir.h"
 #include "mission/system/com/comModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/power/GomspacePowerFdir.h"
 #include "mission/system/tcs/RtdFdir.h"
 #include "mission/system/tcs/TcsBoardAssembly.h"

dummies/helperFactory.cpp

@@ -40,7 +40,7 @@
 #include "mission/genericFactory.h"
 #include "mission/system/acs/acsModeTree.h"
 #include "mission/system/com/comModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/tcs/tcsModeTree.h"
 #include "mission/tcs/defs.h"
 

linux/ObjectFactory.cpp

@@ -26,7 +26,7 @@
 #include "devConf.h"
 #include "devices/gpioIds.h"
 #include "mission/system/acs/acsModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/power/epsModeTree.h"
 
 void ObjectFactory::createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF,

mission/system/CMakeLists.txt

@@ -3,8 +3,9 @@ add_subdirectory(acs)
 add_subdirectory(tcs)
 add_subdirectory(com)
 add_subdirectory(power)
+add_subdirectory(payload)
 
 target_sources(
   ${LIB_EIVE_MISSION}
   PRIVATE systemTree.cpp DualLanePowerStateMachine.cpp EiveSystem.cpp
-          treeUtil.cpp SharedPowerAssemblyBase.cpp payloadModeTree.cpp)
+          treeUtil.cpp SharedPowerAssemblyBase.cpp)

mission/system/payload/CMakeLists.txt

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

mission/system/systemTree.cpp

@@ -10,7 +10,7 @@
 #include "mission/com/defs.h"
 #include "mission/sysDefs.h"
 #include "mission/system/acs/acsModeTree.h"
-#include "mission/system/payloadModeTree.h"
+#include "mission/system/payload/payloadModeTree.h"
 #include "mission/system/power/epsModeTree.h"
 #include "mission/system/tcs/tcsModeTree.h"
 #include "treeUtil.h"