eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Update FSFW from upstream #102

Merged
meierj merged 88 commits from mueller/update-from-upstream into develop 2022-07-04 13:04:01 +02:00
Conversation 1 Commits 88 Files Changed 50 +2 -6
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e0c7f8d51d - Show all commits

8
src/fsfw/tasks/PeriodicTaskIF.h
View File

@ -35,9 +35,7 @@ class PeriodicTaskIF {
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
}; };
virtual ReturnValue_t addComponent(object_id_t object) { virtual ReturnValue_t addComponent(object_id_t object) { return addComponent(object, 0); };
return addComponent(object, 0);
};
/** /**
* Adds an object to the list of objects to be executed. * Adds an object to the list of objects to be executed.
@ -49,9 +47,7 @@ class PeriodicTaskIF {
return HasReturnvaluesIF::RETURN_FAILED; return HasReturnvaluesIF::RETURN_FAILED;
}; };
virtual ReturnValue_t addComponent(ExecutableObjectIF* object) { virtual ReturnValue_t addComponent(ExecutableObjectIF* object) { return addComponent(object, 0); }
return addComponent(object, 0);
}
virtual ReturnValue_t sleepFor(uint32_t ms) = 0; virtual ReturnValue_t sleepFor(uint32_t ms) = 0;