v1.17.0 #327

Merged
muellerr merged 131 commits from develop into main 2022-11-28 18:29:31 +01:00
3 changed files with 15 additions and 4 deletions
Showing only changes of commit b9f4a7be0c - Show all commits

View File

@ -10,6 +10,7 @@
#include <fsfw/tasks/PeriodicTaskIF.h> #include <fsfw/tasks/PeriodicTaskIF.h>
#include <fsfw/tasks/TaskFactory.h> #include <fsfw/tasks/TaskFactory.h>
#include <mission/utility/InitMission.h> #include <mission/utility/InitMission.h>
#include "linux/InitMission.h"
#include <iostream> #include <iostream>
@ -163,6 +164,18 @@ void initmission::initTasks() {
sif::error << "Failed to add dummy pst to fixed timeslot task" << std::endl; sif::error << "Failed to add dummy pst to fixed timeslot task" << std::endl;
} }
#if OBSW_ADD_PLOC_SUPERVISOR == 1
PeriodicTaskIF* supvHelperTask = factory->createPeriodicTask(
"PLOC_SUPV_HELPER", 10, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
result = supvHelperTask->addComponent(objects::PLOC_SUPERVISOR_HELPER);
if (result != returnvalue::OK) {
initmission::printAddObjectError("PLOC_SUPV_HELPER", objects::PLOC_SUPERVISOR_HELPER);
}
#endif /* OBSW_ADD_PLOC_SUPERVISOR */
PeriodicTaskIF* plTask = factory->createPeriodicTask(
"PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
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) {

View File

@ -1,9 +1,6 @@
#ifndef BSP_LINUX_INITMISSION_H_ #pragma once
#define BSP_LINUX_INITMISSION_H_
namespace initmission { namespace initmission {
void initMission(); void initMission();
void initTasks(); void initTasks();
}; // namespace initmission }; // namespace initmission
#endif /* BSP_LINUX_INITMISSION_H_ */

View File

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <fsfw/tasks/TaskFactory.h> #include <fsfw/tasks/TaskFactory.h>
namespace scheduling { namespace scheduling {