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

This commit is contained in:
Robin Müller 2022-11-28 08:49:00 +01:00
commit 46165f8166
2 changed files with 2 additions and 2 deletions

View File

@ -1,4 +1,4 @@
target_sources(${OBSW_NAME} PRIVATE CoreController.cpp scheduling.cpp
ObjectFactory.cpp)
target_sources(${SIMPLE_OBSW_NAME} PRIVATE InitMission.cpp)
target_sources(${SIMPLE_OBSW_NAME} PRIVATE scheduling.cpp)

2
fsfw

@ -1 +1 @@
Subproject commit 160ff799ace61e24708dcf1fdeaf5fafdf23a4ca
Subproject commit 46a1c2bacea142994666b2201acf0246ba0fd0b4