mohr/fsfw
1
0
Fork 0
forked from fsfw/fsfw
Code Pull Requests Activity

Merge branch 'mueller_FixedSequenceImprovements' into mueller_framework

Browse Source
This commit is contained in:
Robin Müller
2020-05-11 19:25:45 +02:00
parent 43d3ca7e37 77565c7412
commit e5c46c5ec1
5 changed files with 51 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osal/FreeRTOS/FixedTimeslotTask.cpp
View File

@ -57,6 +57,7 @@ ReturnValue_t FixedTimeslotTask::startTask() {
ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
uint32_t slotTimeMs, int8_t executionStep) {
if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
if(slotTimeMs == 0) {
// FreeRTOS throws a sanity error for zero values, so we set
@ -67,8 +68,8 @@ ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId,
return HasReturnvaluesIF::RETURN_OK;
}
sif::error << "Component " << std::hex << componentId
<< " not found, not adding it to pst" << std::endl;
sif::error << "Component " << std::hex << componentId <<
" not found, not adding it to pst" << std::endl;
return HasReturnvaluesIF::RETURN_FAILED;
}