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

renormalizing pull request step2

Browse Source
This commit is contained in:
Robin Müller 2020-09-04 13:52:54 +02:00
parent 5eaf6cfd1f
commit 04532b8f6b
4 changed files with 382 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/FixedSequenceSlot.cpp
View File

@ -1,10 +1,10 @@
#include "FixedSequenceSlot.h"
#include "../objectmanager/SystemObjectIF.h" #include "../objectmanager/SystemObjectIF.h"
#include "../tasks/FixedSequenceSlot.h"
#include <cstddef> #include <cstddef>
FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime, FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime,
int8_t setSequenceId, ExecutableObjectIF* executableObject, int8_t setSequenceId, ExecutableObjectIF* executableObject,
PeriodicTaskIF* executingTask) : PeriodicTaskIF* executingTask) : handlerId(handlerId),
pollingTimeMs(setTime), opcode(setSequenceId) { pollingTimeMs(setTime), opcode(setSequenceId) {
if(executableObject == nullptr) { if(executableObject == nullptr) {
return; return;

2
tasks/FixedSequenceSlot.h
View File

@ -20,6 +20,8 @@ public:
PeriodicTaskIF* executingTask); PeriodicTaskIF* executingTask);
virtual ~FixedSequenceSlot(); virtual ~FixedSequenceSlot();
object_id_t handlerId;
/** /**
* @brief Handler identifies which object is executed in this slot. * @brief Handler identifies which object is executed in this slot.
*/ */

2
tasks/FixedSlotSequence.cpp
View File

@ -1,5 +1,5 @@
#include "FixedSlotSequence.h"
#include "../serviceinterface/ServiceInterfaceStream.h" #include "../serviceinterface/ServiceInterfaceStream.h"
#include "../tasks/FixedSlotSequence.h"
#include <cstdlib> #include <cstdlib>
FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) : FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :

4
tasks/FixedSlotSequence.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_TASKS_FIXEDSLOTSEQUENCE_H_ #ifndef FRAMEWORK_TASKS_FIXEDSLOTSEQUENCE_H_
#define FRAMEWORK_TASKS_FIXEDSLOTSEQUENCE_H_ #define FRAMEWORK_TASKS_FIXEDSLOTSEQUENCE_H_
#include "FixedSequenceSlot.h"
#include "../objectmanager/SystemObject.h" #include "../objectmanager/SystemObject.h"
#include "../tasks/FixedSequenceSlot.h"
#include <set> #include <set>
@ -152,6 +152,8 @@ protected:
SlotList slotList; SlotList slotList;
uint32_t lengthMs; uint32_t lengthMs;
bool isEmpty = false;
}; };
#endif /* FIXEDSLOTSEQUENCE_H_ */ #endif /* FIXEDSLOTSEQUENCE_H_ */