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

v1.14.0 #304

Merged
muellerr merged 366 commits from develop into main 2022-10-10 17:46:38 +02:00
Conversation 0 Commits 366 Files Changed 420 +15 -1
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 521b17a8f8 - Show all commits

14
bsp_linux_board/InitMission.cpp
View File

@ -100,6 +100,20 @@ void initmission::initTasks() {
result = tmtcPollingTask->addComponent(objects::SCEX, DeviceHandlerIF::GET_READ); result = tmtcPollingTask->addComponent(objects::SCEX, DeviceHandlerIF::GET_READ);
#endif #endif
#if OBSW_ADD_SCEX_READER == 1
result = HasReturnvaluesIF::RETURN_OK;
PeriodicTaskIF* scexReaderTask = factory->createPeriodicTask(
"SCEX_UART_READER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, missedDeadlineFunc);
result = scexReaderTask->addComponent(objects::SCEX_UART_READER);
if (result != HasReturnvaluesIF::RETURN_OK) {
initmission::printAddObjectError("SCEX_UART_READER", objects::SCEX_UART_READER);
}
sif::info << "Starting tasks.." << std::endl;
tmTcDistributor->startTask();
tmtcBridgeTask->startTask();
tmtcPollingTask->startTask();
#endif
/* PUS Services */ /* PUS Services */
std::vector<PeriodicTaskIF*> pusTasks; std::vector<PeriodicTaskIF*> pusTasks;
createPusTasks(*factory, missedDeadlineFunc, pusTasks); createPusTasks(*factory, missedDeadlineFunc, pusTasks);

2
linux/devices/ScexUartReader.cpp
View File

@ -165,7 +165,7 @@ void ScexUartReader::foundDlePacketHandler(const DleParser::Context &ctx) {
if (ctx.getType() == DleParser::ContextType::PACKET_FOUND) { if (ctx.getType() == DleParser::ContextType::PACKET_FOUND) {
obj->handleFoundDlePacket(ctx.decodedPacket.first, ctx.decodedPacket.second); obj->handleFoundDlePacket(ctx.decodedPacket.first, ctx.decodedPacket.second);
} else { } else {
DleParser::defaultErrorHandler(ctx.error.first, ctx.error.second); DleParser::defaultErrorHandler(ctx.error.first, ctx.error.second);
} }
} }