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

setTaskIF in periodic task #154

Merged
gaisser merged 8 commits from KSat/fsfw:mueller/Linux-SetTaskIF-Fix into master 2020-08-25 12:29:02 +02:00
Conversation 0 Commits 8 Files Changed 7 +3 -6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9102eec4ab - Show all commits

6
osal/FreeRTOS/PeriodicTask.cpp
View File

@ -81,7 +81,7 @@ void PeriodicTask::taskFunctionality() {
}
}
ReturnValue_t PeriodicTask::addComponent(object_id_t object, bool setTaskIF) {
ReturnValue_t PeriodicTask::addComponent(object_id_t object) {
ExecutableObjectIF* newObject = objectManager->get<ExecutableObjectIF>(
object);
if (newObject == nullptr) {
@ -91,9 +91,7 @@ ReturnValue_t PeriodicTask::addComponent(object_id_t object, bool setTaskIF) {
}
objectList.push_back(newObject);
if(setTaskIF) {
newObject->setTaskIF(this);
}
newObject->setTaskIF(this);
return HasReturnvaluesIF::RETURN_OK;
}

3
osal/FreeRTOS/PeriodicTask.h
View File

@ -63,8 +63,7 @@ public:
* -@c RETURN_OK on success
* -@c RETURN_FAILED if the object could not be added.
*/
ReturnValue_t addComponent(object_id_t object,
bool setTaskIF = true) override;
ReturnValue_t addComponent(object_id_t object) override;
uint32_t getPeriodMs() const override;