From e5ec8a74901f586b569cfd994f3a59c7efbe7c0f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 15 Nov 2022 17:21:12 +0100 Subject: [PATCH] now the linux files are compiling --- CMakeLists.txt | 3 +++ bsp_hosted/scheduling.cpp | 9 +++++---- bsp_hosted/scheduling.h | 2 +- linux/devices/ploc/PlocSupvUartMan.cpp | 2 +- mission/utility/InitMission.h | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97b7601c..0753ea9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -296,6 +296,9 @@ if(TGT_BSP) else() # Required by FSFW library set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig") + if(UNIX) + set(EIVE_ADD_LINUX_FILES ON) + endif() endif() # Configuration files diff --git a/bsp_hosted/scheduling.cpp b/bsp_hosted/scheduling.cpp index 20b8ba9c..9c239eb3 100644 --- a/bsp_hosted/scheduling.cpp +++ b/bsp_hosted/scheduling.cpp @@ -1,7 +1,4 @@ #include "linux/scheduling.h" -#include "scheduling.h" -#include "ObjectFactory.h" -#include "OBSWConfig.h" #include #include @@ -15,6 +12,10 @@ #include +#include "OBSWConfig.h" +#include "ObjectFactory.h" +#include "scheduling.h" + #ifdef LINUX ServiceInterfaceStream sif::debug("DEBUG"); ServiceInterfaceStream sif::info("INFO"); @@ -174,7 +175,7 @@ void scheduling::initTasks() { PeriodicTaskIF* plTask = factory->createPeriodicTask( "PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc); - //scheduling::addMpsocSupvHandlers(plTask); + scheduling::addMpsocSupvHandlers(plTask); #if OBSW_ADD_TEST_CODE == 1 result = testTask->addComponent(objects::TEST_TASK); if (result != returnvalue::OK) { diff --git a/bsp_hosted/scheduling.h b/bsp_hosted/scheduling.h index fabec0ce..2f98ade2 100644 --- a/bsp_hosted/scheduling.h +++ b/bsp_hosted/scheduling.h @@ -4,6 +4,6 @@ namespace scheduling { void initMission(); void initTasks(); -}; // namespace initmission +}; // namespace scheduling #endif diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp index 26da089b..3189cb65 100644 --- a/linux/devices/ploc/PlocSupvUartMan.cpp +++ b/linux/devices/ploc/PlocSupvUartMan.cpp @@ -42,7 +42,7 @@ PlocSupvHelper::PlocSupvHelper(object_id_t objectId) PlocSupvHelper::~PlocSupvHelper() = default; ReturnValue_t PlocSupvHelper::initializeInterface(CookieIF* cookie) { - UartCookie* uartCookie = dynamic_cast(cookie); + auto* uartCookie = dynamic_cast(cookie); if (uartCookie == nullptr) { return FAILED; } diff --git a/mission/utility/InitMission.h b/mission/utility/InitMission.h index c0663544..85d8ae21 100644 --- a/mission/utility/InitMission.h +++ b/mission/utility/InitMission.h @@ -16,4 +16,4 @@ static void printAddObjectError(const char* name, object_id_t objectId) { #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ } -} // namespace initmission +} // namespace scheduling