Merge branch 'develop' into tweaks_scex_filenames
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good

This commit is contained in:
Robin Müller 2023-03-29 13:39:46 +02:00
commit 0bf4527e94
6 changed files with 3 additions and 3 deletions

View File

@ -23,7 +23,7 @@
#include <mission/system/acs/ImtqAssembly.h> #include <mission/system/acs/ImtqAssembly.h>
#include <mission/system/fdir/StrFdir.h> #include <mission/system/fdir/StrFdir.h>
#include <mission/system/objects/CamSwitcher.h> #include <mission/system/objects/CamSwitcher.h>
#include <mission/system/objects/StrAssembly.h> #include <mission/system/acs/StrAssembly.h>
#include <mission/system/objects/SyrlinksAssembly.h> #include <mission/system/objects/SyrlinksAssembly.h>
#include <mission/tmtc/LiveTmTask.h> #include <mission/tmtc/LiveTmTask.h>
#include <mission/tmtc/PersistentLogTmStoreTask.h> #include <mission/tmtc/PersistentLogTmStoreTask.h>

View File

@ -27,8 +27,8 @@
#include <fsfw_hal/common/gpio/GpioIF.h> #include <fsfw_hal/common/gpio/GpioIF.h>
#include <mission/power/gsDefs.h> #include <mission/power/gsDefs.h>
#include <mission/system/acs/ImtqAssembly.h> #include <mission/system/acs/ImtqAssembly.h>
#include <mission/system/acs/StrAssembly.h>
#include <mission/system/objects/CamSwitcher.h> #include <mission/system/objects/CamSwitcher.h>
#include <mission/system/objects/StrAssembly.h>
#include <mission/system/objects/TcsBoardAssembly.h> #include <mission/system/objects/TcsBoardAssembly.h>
#include "TemperatureSensorInserter.h" #include "TemperatureSensorInserter.h"

View File

@ -2,6 +2,7 @@ target_sources(
${LIB_EIVE_MISSION} ${LIB_EIVE_MISSION}
PRIVATE AcsBoardAssembly.cpp PRIVATE AcsBoardAssembly.cpp
AcsSubsystem.cpp AcsSubsystem.cpp
StrAssembly.cpp
DualLaneAssemblyBase.cpp DualLaneAssemblyBase.cpp
ImtqAssembly.cpp ImtqAssembly.cpp
RwAssembly.cpp RwAssembly.cpp

View File

@ -5,6 +5,5 @@ target_sources(
TcsSubsystem.cpp TcsSubsystem.cpp
PayloadSubsystem.cpp PayloadSubsystem.cpp
Stack5VHandler.cpp Stack5VHandler.cpp
StrAssembly.cpp
PowerStateMachineBase.cpp PowerStateMachineBase.cpp
TcsBoardAssembly.cpp) TcsBoardAssembly.cpp)