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

Update FSFW from upstream #71

Closed
muellerr wants to merge 1112 commits from development into eive/develop
pull from: development
merge into: eive:eive/develop
Conversation 0 Commits 1112 Files Changed 1041 +4292 -1598
167 changed files with 4292 additions and 1598 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 08ff061d07 - Show all commits

3
src/fsfw/tasks/CMakeLists.txt
View File

@@ -1,2 +1,3 @@
target_sources(${LIB_FSFW_NAME} PRIVATE FixedSequenceSlot.cpp target_sources(${LIB_FSFW_NAME} PRIVATE FixedSequenceSlot.cpp
FixedSlotSequence.cpp) FixedSlotSequence.cpp
PeriodicTaskBase.cpp)

2
src/fsfw/tasks/PeriodicTaskBase.cpp
View File

@@ -9,7 +9,7 @@ PeriodicTaskBase::PeriodicTaskBase(uint32_t periodMs_,
uint32_t PeriodicTaskBase::getPeriodMs() const { return periodMs; } uint32_t PeriodicTaskBase::getPeriodMs() const { return periodMs; }
bool PeriodicTaskBase::isEmpty() const override { bool PeriodicTaskBase::isEmpty() const {
return objectList.empty(); return objectList.empty();
} }

1
src/fsfw/tasks/PeriodicTaskBase.h
View File

@@ -15,7 +15,6 @@ public:
ReturnValue_t addComponent(object_id_t object, uint8_t opCode) override; ReturnValue_t addComponent(object_id_t object, uint8_t opCode) override;
ReturnValue_t addComponent(ExecutableObjectIF* object, uint8_t opCode) override; ReturnValue_t addComponent(ExecutableObjectIF* object, uint8_t opCode) override;
uint32_t getPeriodMs() const override; uint32_t getPeriodMs() const override;
bool isEmpty() const override; bool isEmpty() const override;