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

WIP: somethings wrong.. #19

Closed
muellerr wants to merge 808 commits from source/master into master
pull from: source/master
merge into: KSat:master
Conversation 0 Commits 808 Files Changed 512 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e3af7cf83 - Show all commits

8
devicehandlers/FixedSlotSequence.cpp
View File

@ -3,7 +3,7 @@
#include <cstdlib> #include <cstdlib>
FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) : FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
slotLengthMs(setLengthMs) { lengthMs(setLengthMs) {
current = slotList.begin(); current = slotList.begin();
} }
@ -50,7 +50,7 @@ uint32_t FixedSlotSequence::getIntervalToNextSlotMs() {
// the interval is calculated by subtracting the remaining time of the PST // the interval is calculated by subtracting the remaining time of the PST
// and adding the start time of the first handler in the list. // and adding the start time of the first handler in the list.
slotListIter = slotList.begin(); slotListIter = slotList.begin();
return slotLengthMs - oldTime + slotListIter->pollingTimeMs; return lengthMs - oldTime + slotListIter->pollingTimeMs;
} }
uint32_t FixedSlotSequence::getIntervalToPreviousSlotMs() { uint32_t FixedSlotSequence::getIntervalToPreviousSlotMs() {
@ -61,7 +61,7 @@ uint32_t FixedSlotSequence::getIntervalToPreviousSlotMs() {
//if it is the first slot, calculate difference to last slot //if it is the first slot, calculate difference to last slot
if (slotListIter == slotList.begin()){ if (slotListIter == slotList.begin()){
return slotLengthMs - (--slotList.end())->pollingTimeMs + currentTime; return lengthMs - (--slotList.end())->pollingTimeMs + currentTime;
} }
// get previous slot // get previous slot
slotListIter--; slotListIter--;
@ -84,7 +84,7 @@ bool FixedSlotSequence::slotFollowsImmediately() {
} }
uint32_t FixedSlotSequence::getLengthMs() const { uint32_t FixedSlotSequence::getLengthMs() const {
return this->slotLengthMs; return this->lengthMs;
} }
ReturnValue_t FixedSlotSequence::checkSequence() const { ReturnValue_t FixedSlotSequence::checkSequence() const {

2
devicehandlers/FixedSlotSequence.h
View File

@ -126,7 +126,7 @@ protected:
*/ */
SlotList slotList; SlotList slotList;
uint32_t slotLengthMs; uint32_t lengthMs;
bool isEmpty = false; bool isEmpty = false;
}; };