PLOC SUPV Update to newer firmware #316

Merged
muellerr merged 99 commits from mueller/tas_ploc_supv_update into develop 2022-11-18 14:27:13 +01:00
5 changed files with 11 additions and 7 deletions
Showing only changes of commit e5ec8a7490 - Show all commits

View File

@ -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

View File

@ -1,7 +1,4 @@
#include "linux/scheduling.h"
#include "scheduling.h"
#include "ObjectFactory.h"
#include "OBSWConfig.h"
#include <bsp_hosted/fsfwconfig/pollingsequence/DummyPst.h>
#include <fsfw/objectmanager/ObjectManager.h>
@ -15,6 +12,10 @@
#include <iostream>
#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) {

View File

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

View File

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

View File

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