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

now the linux files are compiling
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
Details

Browse Source
This commit is contained in:
Robin Müller 2022-11-15 17:21:12 +01:00
parent 23cfe3aa69
commit e5ec8a7490
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
5 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -296,6 +296,9 @@ if(TGT_BSP)
else() else()
# Required by FSFW library # Required by FSFW library
set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig") set(FSFW_CONFIG_PATH "${BSP_PATH}/fsfwconfig")
if(UNIX)
set(EIVE_ADD_LINUX_FILES ON)
endif()
endif() endif()
# Configuration files # Configuration files

9
bsp_hosted/scheduling.cpp
View File

@ -1,7 +1,4 @@
#include "linux/scheduling.h" #include "linux/scheduling.h"
#include "scheduling.h"
#include "ObjectFactory.h"
#include "OBSWConfig.h"
#include <bsp_hosted/fsfwconfig/pollingsequence/DummyPst.h> #include <bsp_hosted/fsfwconfig/pollingsequence/DummyPst.h>
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
@ -15,6 +12,10 @@
#include <iostream> #include <iostream>
#include "OBSWConfig.h"
#include "ObjectFactory.h"
#include "scheduling.h"
#ifdef LINUX #ifdef LINUX
ServiceInterfaceStream sif::debug("DEBUG"); ServiceInterfaceStream sif::debug("DEBUG");
ServiceInterfaceStream sif::info("INFO"); ServiceInterfaceStream sif::info("INFO");
@ -174,7 +175,7 @@ void scheduling::initTasks() {
PeriodicTaskIF* plTask = factory->createPeriodicTask( PeriodicTaskIF* plTask = factory->createPeriodicTask(
"PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc); "PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
//scheduling::addMpsocSupvHandlers(plTask); scheduling::addMpsocSupvHandlers(plTask);
#if OBSW_ADD_TEST_CODE == 1 #if OBSW_ADD_TEST_CODE == 1
result = testTask->addComponent(objects::TEST_TASK); result = testTask->addComponent(objects::TEST_TASK);
if (result != returnvalue::OK) { if (result != returnvalue::OK) {

2
bsp_hosted/scheduling.h
View File

@ -4,6 +4,6 @@
namespace scheduling { namespace scheduling {
void initMission(); void initMission();
void initTasks(); void initTasks();
}; // namespace initmission }; // namespace scheduling
#endif #endif

2
linux/devices/ploc/PlocSupvUartMan.cpp
View File

@ -42,7 +42,7 @@ PlocSupvHelper::PlocSupvHelper(object_id_t objectId)
PlocSupvHelper::~PlocSupvHelper() = default; PlocSupvHelper::~PlocSupvHelper() = default;
ReturnValue_t PlocSupvHelper::initializeInterface(CookieIF* cookie) { ReturnValue_t PlocSupvHelper::initializeInterface(CookieIF* cookie) {
UartCookie* uartCookie = dynamic_cast<UartCookie*>(cookie); auto* uartCookie = dynamic_cast<SerialCookie*>(cookie);
if (uartCookie == nullptr) { if (uartCookie == nullptr) {
return FAILED; return FAILED;
} }

2
mission/utility/InitMission.h
View File

@ -16,4 +16,4 @@ static void printAddObjectError(const char* name, object_id_t objectId) {
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
} }
} // namespace initmission } // namespace scheduling