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

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

@ -133,7 +133,7 @@ ReturnValue_t FixedTimeslotTask::addSlot(object_id_t componentId, uint32_t slotT
return HasReturnvaluesIF::RETURN_FAILED;
}
ReturnValue_t FixedTimeslotTask::checkSequence() const { return pollingSeqTable.checkSequence(); }
ReturnValue_t FixedTimeslotTask::checkSequence() { return pollingSeqTable.checkSequence(); }
uint32_t FixedTimeslotTask::getPeriodMs() const { return period * 1000; }
@ -176,3 +176,5 @@ bool FixedTimeslotTask::delayForInterval(chron_ms* previousWakeTimeMs, const chr
(*previousWakeTimeMs) = currentStartTime;
return false;
}
bool FixedTimeslotTask::isEmpty() const { return pollingSeqTable.isEmpty(); }

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

@ -59,12 +59,14 @@ class FixedTimeslotTask : public FixedTimeslotTaskIF {
*/
ReturnValue_t addSlot(object_id_t componentId, uint32_t slotTimeMs, int8_t executionStep);
ReturnValue_t checkSequence() const override;
ReturnValue_t checkSequence() override;
uint32_t getPeriodMs() const;
ReturnValue_t sleepFor(uint32_t ms);
bool isEmpty() const override;
protected:
using chron_ms = std::chrono::milliseconds;

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

@ -156,3 +156,5 @@ bool PeriodicTask::delayForInterval(chron_ms* previousWakeTimeMs, const chron_ms
(*previousWakeTimeMs) = currentStartTime;
return false;
}
bool PeriodicTask::isEmpty() const { return objectList.empty(); }

1
src/fsfw/osal/host/PeriodicTask.h
View File

@ -73,6 +73,7 @@ class PeriodicTask : public PeriodicTaskIF {
ReturnValue_t sleepFor(uint32_t ms);
bool isEmpty() const override;
protected:
using chron_ms = std::chrono::milliseconds;
bool started;