From 6cc1d86018c01dbf0639fa668d72867ee759eb07 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 13:19:52 +0200 Subject: [PATCH 1/4] add new payload module --- mission/system/CMakeLists.txt | 3 ++- mission/system/{ => payload}/payloadModeTree.cpp | 0 mission/system/{ => payload}/payloadModeTree.h | 0 tmtc | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename mission/system/{ => payload}/payloadModeTree.cpp (100%) rename mission/system/{ => payload}/payloadModeTree.h (100%) diff --git a/mission/system/CMakeLists.txt b/mission/system/CMakeLists.txt index 6b63b706..403cb821 100644 --- a/mission/system/CMakeLists.txt +++ b/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) diff --git a/mission/system/payloadModeTree.cpp b/mission/system/payload/payloadModeTree.cpp similarity index 100% rename from mission/system/payloadModeTree.cpp rename to mission/system/payload/payloadModeTree.cpp diff --git a/mission/system/payloadModeTree.h b/mission/system/payload/payloadModeTree.h similarity index 100% rename from mission/system/payloadModeTree.h rename to mission/system/payload/payloadModeTree.h diff --git a/tmtc b/tmtc index c843356c..b160f079 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit c843356c8af22bf45a04c71c93813716c9d743ec +Subproject commit b160f079b104be5f43b76f4fdcd7a4321d09b4a7 From 1793b325ec323733f99a0b4adfff5711bf7084e6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 13:33:56 +0200 Subject: [PATCH 2/4] compiles again --- bsp_q7s/objectFactory.cpp | 2 +- dummies/helperFactory.cpp | 2 +- linux/ObjectFactory.cpp | 2 +- mission/system/payload/CMakeLists.txt | 1 + mission/system/systemTree.cpp | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 mission/system/payload/CMakeLists.txt diff --git a/bsp_q7s/objectFactory.cpp b/bsp_q7s/objectFactory.cpp index c0dc489a..3926743a 100644 --- a/bsp_q7s/objectFactory.cpp +++ b/bsp_q7s/objectFactory.cpp @@ -67,7 +67,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" diff --git a/dummies/helperFactory.cpp b/dummies/helperFactory.cpp index c3df5704..667ab620 100644 --- a/dummies/helperFactory.cpp +++ b/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" diff --git a/linux/ObjectFactory.cpp b/linux/ObjectFactory.cpp index 5626ee49..4a78d754 100644 --- a/linux/ObjectFactory.cpp +++ b/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, diff --git a/mission/system/payload/CMakeLists.txt b/mission/system/payload/CMakeLists.txt new file mode 100644 index 00000000..7b546846 --- /dev/null +++ b/mission/system/payload/CMakeLists.txt @@ -0,0 +1 @@ +target_sources(${LIB_EIVE_MISSION} PRIVATE payloadModeTree.cpp) diff --git a/mission/system/systemTree.cpp b/mission/system/systemTree.cpp index f636b248..ba44957b 100644 --- a/mission/system/systemTree.cpp +++ b/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" From eec934e1b02cfb3aa2f972e129caa195d278d232 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 14:32:00 +0200 Subject: [PATCH 3/4] bump submodules --- fsfw | 2 +- tmtc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fsfw b/fsfw index 43ea29cb..8b21dd27 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 43ea29cb845d4a7d190c87df490eb53c4992618b +Subproject commit 8b21dd276de72b46b41bc7080d6646180bfa0662 diff --git a/tmtc b/tmtc index b160f079..7dfdd409 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit b160f079b104be5f43b76f4fdcd7a4321d09b4a7 +Subproject commit 7dfdd4096303ff9971e3e236132be7ea20ff8e18 From df0c8eefabc383a3f039f6cdaef1703a1260115e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 9 Apr 2024 17:41:34 +0200 Subject: [PATCH 4/4] bump tmtc --- tmtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmtc b/tmtc index 7dfdd409..102821fc 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 7dfdd4096303ff9971e3e236132be7ea20ff8e18 +Subproject commit 102821fc718fb70b01ef949bd54da3d438f0d455