esbo_ds/fsfw
3
0
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

name slotLengthMs reverted to lengthMs

Browse Source
This commit is contained in:
Robin Müller 2020-04-19 21:37:55 +02:00
parent 4d64a76b8e
commit cee8b4dc37
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devicehandlers/FixedSlotSequence.cpp
View File

@ -2,7 +2,7 @@
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include <framework/serviceinterface/ServiceInterfaceStream.h>
FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) : FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
slotLengthMs(setLengthMs) { lengthMs(setLengthMs) {
current = slotList.begin(); current = slotList.begin();
} }
@ -49,7 +49,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() {
@ -60,7 +60,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--;
@ -83,7 +83,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 {

3
devicehandlers/FixedSlotSequence.h
View File

@ -23,7 +23,6 @@ using SlotListIter = std::multiset<FixedSequenceSlot>::iterator;
class FixedSlotSequence { class FixedSlotSequence {
public: public:
/** /**
* @brief The constructor of the FixedSlotSequence object. * @brief The constructor of the FixedSlotSequence object.
* *
@ -126,7 +125,7 @@ protected:
*/ */
SlotList slotList; SlotList slotList;
uint32_t slotLengthMs; uint32_t lengthMs;
}; };
#endif /* FIXEDSLOTSEQUENCE_H_ */ #endif /* FIXEDSLOTSEQUENCE_H_ */