eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge remote-tracking branch 'origin/main' into mpsoc-overhaul
Some checks failed
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2024-04-25 17:29:57 +02:00
commit 393a4af2b4
8 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsp_q7s/objectFactory.cpp
View File

@ -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"

2
dummies/helperFactory.cpp
View File

@ -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"

2
linux/ObjectFactory.cpp
View File

@ -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,

3
mission/system/CMakeLists.txt
View File

@ -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)

1
mission/system/payload/CMakeLists.txt Normal file
View File

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

0
mission/system/payloadModeTree.cpp → mission/system/payload/payloadModeTree.cpp
View File

0
mission/system/payloadModeTree.h → mission/system/payload/payloadModeTree.h
View File

2
mission/system/systemTree.cpp
View File

@ -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"