fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 32 Pull Requests 4 Releases 10 Wiki Activity

mohr_serialize_merged_master #123

Closed
muellerr wants to merge 84 commits from mohr_serialize_merged_master into mohr_serialize
pull from: mohr_serialize_merged_master
merge into: fsfw:mohr_serialize
Conversation 0 Commits 84 Files Changed 114 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3dca8044e - Show all commits

2
osal/rtems/PollingTask.cpp
View File

@ -66,7 +66,7 @@ ReturnValue_t PollingTask::startTask() {
}
}
ReturnValue_t Polling::addSlot(object_id_t componentId,
ReturnValue_t PollingTask::addSlot(object_id_t componentId,
uint32_t slotTimeMs, int8_t executionStep) {
if (objectManager->get<ExecutableObjectIF>(componentId) != nullptr) {
pst.addSlot(componentId, slotTimeMs, executionStep, this);