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 +4 -9
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c42b5283af - Show all commits

7
osal/linux/PeriodicPosixTask.cpp
View File

@ -21,8 +21,7 @@ void* PeriodicPosixTask::taskEntryPoint(void* arg) {
return NULL;
}
ReturnValue_t PeriodicPosixTask::addComponent(object_id_t object,
bool addTaskIF) {
ReturnValue_t PeriodicPosixTask::addComponent(object_id_t object) {
ExecutableObjectIF* newObject = objectManager->get<ExecutableObjectIF>(
object);
if (newObject == nullptr) {
@ -30,9 +29,7 @@ ReturnValue_t PeriodicPosixTask::addComponent(object_id_t object,
}
objectList.push_back(newObject);
if(setTaskIF) {
newObject->setTaskIF(this);
}
newObject->setTaskIF(this);
return HasReturnvaluesIF::RETURN_OK;
}

3
osal/linux/PeriodicPosixTask.h
View File

@ -39,8 +39,7 @@ public:
* @param object Id of the object to add.
* @return RETURN_OK on success, RETURN_FAILED if the object could not be added.
*/
ReturnValue_t addComponent(object_id_t object,
bool addTaskIF = true) override;
ReturnValue_t addComponent(object_id_t object) override;
uint32_t getPeriodMs() const override;

3
tasks/PeriodicTaskIF.h
View File

@ -36,8 +36,7 @@ public:
* to the component.
* @return
*/
virtual ReturnValue_t addComponent(object_id_t object,
bool setTaskIF = true) {
virtual ReturnValue_t addComponent(object_id_t object) {
return HasReturnvaluesIF::RETURN_FAILED;
};