From f7ac3824987a54a0a8b2b3d14fbb6235f4f485da Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 26 Jul 2021 14:00:15 +0200 Subject: [PATCH] fixes for host build --- bsp_hosted/ObjectFactory.cpp | 2 ++ bsp_hosted/main.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bsp_hosted/ObjectFactory.cpp b/bsp_hosted/ObjectFactory.cpp index c5b9ded7..9ea97fd1 100644 --- a/bsp_hosted/ObjectFactory.cpp +++ b/bsp_hosted/ObjectFactory.cpp @@ -56,4 +56,6 @@ void ObjectFactory::produce(void* args){ new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE); #endif + new TestTask(objects::TEST_TASK); + } diff --git a/bsp_hosted/main.cpp b/bsp_hosted/main.cpp index 5b43da1e..153cc447 100644 --- a/bsp_hosted/main.cpp +++ b/bsp_hosted/main.cpp @@ -1,9 +1,10 @@ #include "InitMission.h" +#include "OBSWVersion.h" + +#include "fsfw/FSFWVersion.h" +#include "fsfw/tasks/TaskFactory.h" -#include -#include #include - #ifdef WIN32 static const char* COMPILE_PRINTOUT = "Windows"; #elif LINUX @@ -20,8 +21,9 @@ int main(void) { std::cout << "-- EIVE OBSW --" << std::endl; std::cout << "-- Compiled for " << COMPILE_PRINTOUT << " --" << std::endl; - std::cout << "-- Software version " << SW_NAME << " v" << SW_VERSION << "." - << SW_SUBVERSION << "." << SW_REVISION << " -- " << std::endl; + std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << + "." << SW_REVISION << ", FSFW v" << FSFW_VERSION << "." << FSFW_SUBVERSION << "." << + FSFW_REVISION << "--" << std::endl; std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl; initmission::initMission();