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

EIVE upstream #29

Merged
muellerr merged 693 commits from use-eive-upstream into develop 2023-06-30 15:44:39 +02:00
Conversation 0 Commits 693 Files Changed 188 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08f1ebf9fc - Show all commits

2
src/fsfw/osal/host/FixedTimeslotTask.cpp
View File

@ -176,4 +176,4 @@ bool FixedTimeslotTask::delayForInterval(chron_ms* previousWakeTimeMs, const chr
return false;
}
bool FixedTimeslotTask::isEmpty() const { return pollingSeqTable.isEmpty() };
bool FixedTimeslotTask::isEmpty() const { return pollingSeqTable.isEmpty(); }

5
src/fsfw/osal/host/FixedTimeslotTask.h
View File

@ -73,7 +73,6 @@ class FixedTimeslotTask : public FixedTimeslotTaskIF {
std::thread mainThread;
std::atomic<bool> terminateThread{false};
TaskDeadlineMissedFunction dlmFunc = nullptr;
//! Polling sequence table which contains the object to execute
//! and information like the timeslots and the passed execution step.
@ -89,7 +88,7 @@ class FixedTimeslotTask : public FixedTimeslotTaskIF {
* It is expressed in clock ticks.
*/
TaskPeriod period;
TaskDeadlineMissedFunction dlmFunc = nullptr;
/**
* @brief This is the function executed in the new task's context.
* @details
@ -111,7 +110,7 @@ class FixedTimeslotTask : public FixedTimeslotTaskIF {
*/
void taskFunctionality();
bool delayForInterval(chron_ms* previousWakeTimeMs, chron_ms interval);
static bool delayForInterval(chron_ms* previousWakeTimeMs, chron_ms interval);
};
#endif /* FRAMEWORK_OSAL_HOST_FIXEDTIMESLOTTASK_H_ */