fsfw/fsfw
fsfw
/
fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

Merge branch 'master' into gaisser_fixes_fixedMap

This commit is contained in:
Steffen Gaisser 2020-09-01 11:41:03 +02:00
parent b484e4d5ad f645fe6607
commit cc5c944c84
408 changed files with 4351 additions and 2800 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
action/ActionHelper.cpp
View File

@ -1,6 +1,6 @@
#include <framework/action/ActionHelper.h> #include "ActionHelper.h"
#include <framework/action/HasActionsIF.h> #include "HasActionsIF.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) : ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) :
owner(setOwner), queueToUse(useThisQueue), ipcStore(nullptr) { owner(setOwner), queueToUse(useThisQueue), ipcStore(nullptr) {

6
action/ActionHelper.h
View File

@ -1,9 +1,9 @@
#ifndef ACTIONHELPER_H_ #ifndef ACTIONHELPER_H_
#define ACTIONHELPER_H_ #define ACTIONHELPER_H_
#include <framework/action/ActionMessage.h> #include "ActionMessage.h"
#include <framework/serialize/SerializeIF.h> #include "../serialize/SerializeIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
/** /**
* \brief Action Helper is a helper class which handles action messages * \brief Action Helper is a helper class which handles action messages
* *

6
action/ActionMessage.cpp
View File

@ -1,6 +1,6 @@
#include <framework/action/ActionMessage.h> #include "ActionMessage.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
ActionMessage::ActionMessage() { ActionMessage::ActionMessage() {
} }

8
action/ActionMessage.h
View File

@ -1,16 +1,16 @@
#ifndef ACTIONMESSAGE_H_ #ifndef ACTIONMESSAGE_H_
#define ACTIONMESSAGE_H_ #define ACTIONMESSAGE_H_
#include <framework/ipc/CommandMessage.h> #include "../ipc/CommandMessage.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
typedef uint32_t ActionId_t; typedef uint32_t ActionId_t;
class ActionMessage { class ActionMessage {
private: private:
ActionMessage(); ActionMessage();
public: public:
static const uint8_t MESSAGE_ID = MESSAGE_TYPE::ACTION; static const uint8_t MESSAGE_ID = messagetypes::ACTION;
static const Command_t EXECUTE_ACTION = MAKE_COMMAND_ID(1); static const Command_t EXECUTE_ACTION = MAKE_COMMAND_ID(1);
static const Command_t STEP_SUCCESS = MAKE_COMMAND_ID(2); static const Command_t STEP_SUCCESS = MAKE_COMMAND_ID(2);
static const Command_t STEP_FAILED = MAKE_COMMAND_ID(3); static const Command_t STEP_FAILED = MAKE_COMMAND_ID(3);

10
action/CommandActionHelper.cpp
View File

@ -1,8 +1,8 @@
#include <framework/action/ActionMessage.h> #include "ActionMessage.h"
#include <framework/action/CommandActionHelper.h> #include "CommandActionHelper.h"
#include <framework/action/CommandsActionsIF.h> #include "CommandsActionsIF.h"
#include <framework/action/HasActionsIF.h> #include "HasActionsIF.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) : CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :
owner(setOwner), queueToUse(NULL), ipcStore( owner(setOwner), queueToUse(NULL), ipcStore(

12
action/CommandActionHelper.h
View File

@ -1,12 +1,12 @@
#ifndef COMMANDACTIONHELPER_H_ #ifndef COMMANDACTIONHELPER_H_
#define COMMANDACTIONHELPER_H_ #define COMMANDACTIONHELPER_H_
#include <framework/action/ActionMessage.h> #include "ActionMessage.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/serialize/SerializeIF.h> #include "../serialize/SerializeIF.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
class CommandsActionsIF; class CommandsActionsIF;

6
action/CommandsActionsIF.h
View File

@ -1,9 +1,9 @@
#ifndef COMMANDSACTIONSIF_H_ #ifndef COMMANDSACTIONSIF_H_
#define COMMANDSACTIONSIF_H_ #define COMMANDSACTIONSIF_H_
#include <framework/action/CommandActionHelper.h> #include "CommandActionHelper.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
/** /**
* Interface to separate commanding actions of other objects. * Interface to separate commanding actions of other objects.

10
action/HasActionsIF.h
View File

@ -1,11 +1,11 @@
#ifndef FRAMEWORK_ACTION_HASACTIONSIF_H_ #ifndef FRAMEWORK_ACTION_HASACTIONSIF_H_
#define FRAMEWORK_ACTION_HASACTIONSIF_H_ #define FRAMEWORK_ACTION_HASACTIONSIF_H_
#include <framework/action/ActionHelper.h> #include "ActionHelper.h"
#include <framework/action/ActionMessage.h> #include "ActionMessage.h"
#include <framework/action/SimpleActionHelper.h> #include "SimpleActionHelper.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
/** /**
* @brief * @brief
* Interface for component which uses actions * Interface for component which uses actions

4
action/SimpleActionHelper.cpp
View File

@ -1,5 +1,5 @@
#include <framework/action/HasActionsIF.h> #include "HasActionsIF.h"
#include <framework/action/SimpleActionHelper.h> #include "SimpleActionHelper.h"
SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner, SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner,
MessageQueueIF* useThisQueue) : MessageQueueIF* useThisQueue) :
ActionHelper(setOwner, useThisQueue), isExecuting(false), lastCommander( ActionHelper(setOwner, useThisQueue), isExecuting(false), lastCommander(

2
action/SimpleActionHelper.h
View File

@ -1,7 +1,7 @@
#ifndef SIMPLEACTIONHELPER_H_ #ifndef SIMPLEACTIONHELPER_H_
#define SIMPLEACTIONHELPER_H_ #define SIMPLEACTIONHELPER_H_
#include <framework/action/ActionHelper.h> #include "ActionHelper.h"
class SimpleActionHelper: public ActionHelper { class SimpleActionHelper: public ActionHelper {
public: public:

6
container/ArrayList.h
View File

@ -1,9 +1,9 @@
#ifndef ARRAYLIST_H_ #ifndef ARRAYLIST_H_
#define ARRAYLIST_H_ #define ARRAYLIST_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/serialize/SerializeIF.h> #include "../serialize/SerializeIF.h"
/** /**
* A List that stores its values in an array. * A List that stores its values in an array.

2
container/FIFO.h
View File

@ -1,7 +1,7 @@
#ifndef FIFO_H_ #ifndef FIFO_H_
#define FIFO_H_ #define FIFO_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
/** /**
* @brief Simple First-In-First-Out data structure * @brief Simple First-In-First-Out data structure

2
container/FixedArrayList.h
View File

@ -1,7 +1,7 @@
#ifndef FIXEDARRAYLIST_H_ #ifndef FIXEDARRAYLIST_H_
#define FIXEDARRAYLIST_H_ #define FIXEDARRAYLIST_H_
#include <framework/container/ArrayList.h> #include "ArrayList.h"
/** /**
* \ingroup container * \ingroup container
*/ */

4
container/FixedMap.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_CONTAINER_FIXEDMAP_H_ #ifndef FRAMEWORK_CONTAINER_FIXEDMAP_H_
#define FRAMEWORK_CONTAINER_FIXEDMAP_H_ #define FRAMEWORK_CONTAINER_FIXEDMAP_H_
#include <framework/container/ArrayList.h> #include "ArrayList.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <utility> #include <utility>
/** /**

2
container/FixedOrderedMultimap.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_ #ifndef FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_
#define FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_ #define FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_
#include <framework/container/ArrayList.h> #include "ArrayList.h"
#include <cstring> #include <cstring>
#include <set> #include <set>
/** /**

4
container/HybridIterator.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_ #ifndef FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_
#define FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_ #define FRAMEWORK_CONTAINER_HYBRIDITERATOR_H_
#include <framework/container/ArrayList.h> #include "ArrayList.h"
#include <framework/container/SinglyLinkedList.h> #include "SinglyLinkedList.h"
template<typename T, typename count_t = uint8_t> template<typename T, typename count_t = uint8_t>
class HybridIterator: public LinkedElement<T>::Iterator, class HybridIterator: public LinkedElement<T>::Iterator,

10
container/IndexedRingMemoryArray.h
View File

@ -1,11 +1,11 @@
#ifndef FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_ #ifndef FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_
#define FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_ #define FRAMEWORK_CONTAINER_INDEXEDRINGMEMORY_H_
#include <framework/container/ArrayList.h> #include "ArrayList.h"
#include <framework/globalfunctions/CRC.h> #include "../globalfunctions/CRC.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/serialize/SerialArrayListAdapter.h> #include "../serialize/SerialArrayListAdapter.h"
#include <cmath> #include <cmath>
template<typename T> template<typename T>

2
container/PlacementFactory.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_CONTAINER_PLACEMENTFACTORY_H_ #ifndef FRAMEWORK_CONTAINER_PLACEMENTFACTORY_H_
#define FRAMEWORK_CONTAINER_PLACEMENTFACTORY_H_ #define FRAMEWORK_CONTAINER_PLACEMENTFACTORY_H_
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
#include <utility> #include <utility>
class PlacementFactory { class PlacementFactory {

2
container/RingBufferBase.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_CONTAINER_RINGBUFFERBASE_H_ #ifndef FRAMEWORK_CONTAINER_RINGBUFFERBASE_H_
#define FRAMEWORK_CONTAINER_RINGBUFFERBASE_H_ #define FRAMEWORK_CONTAINER_RINGBUFFERBASE_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
template<uint8_t N_READ_PTRS = 1> template<uint8_t N_READ_PTRS = 1>
class RingBufferBase { class RingBufferBase {

2
container/SimpleRingBuffer.cpp
View File

@ -1,4 +1,4 @@
#include <framework/container/SimpleRingBuffer.h> #include "SimpleRingBuffer.h"
#include <string.h> #include <string.h>
SimpleRingBuffer::SimpleRingBuffer(uint32_t size, bool overwriteOld) : SimpleRingBuffer::SimpleRingBuffer(uint32_t size, bool overwriteOld) :

2
container/SimpleRingBuffer.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_ #ifndef FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_
#define FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_ #define FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_
#include <framework/container/RingBufferBase.h> #include "RingBufferBase.h"
#include <stddef.h> #include <stddef.h>
class SimpleRingBuffer: public RingBufferBase<> { class SimpleRingBuffer: public RingBufferBase<> {

117
container/SinglyLinkedList.h
View File

@ -1,10 +1,13 @@
#ifndef SINGLYLINKEDLIST_H_ #ifndef FRAMEWORK_CONTAINER_SINGLYLINKEDLIST_H_
#define SINGLYLINKEDLIST_H_ #define FRAMEWORK_CONTAINER_SINGLYLINKEDLIST_H_
#include <cstddef>
#include <cstdint>
#include <stddef.h>
#include <stdint.h>
/** /**
* \ingroup container * @brief Linked list data structure,
* each entry has a pointer to the next entry (singly)
* @ingroup container
*/ */
template<typename T> template<typename T>
class LinkedElement { class LinkedElement {
@ -12,11 +15,8 @@ public:
T *value; T *value;
class Iterator { class Iterator {
public: public:
LinkedElement<T> *value; LinkedElement<T> *value = nullptr;
Iterator() : Iterator() {}
value(NULL) {
}
Iterator(LinkedElement<T> *element) : Iterator(LinkedElement<T> *element) :
value(element) { value(element) {
@ -45,12 +45,11 @@ public:
} }
}; };
LinkedElement(T* setElement, LinkedElement<T>* setNext = NULL) : value(setElement), LinkedElement(T* setElement, LinkedElement<T>* setNext = nullptr):
next(setNext) { value(setElement), next(setNext) {}
}
virtual ~LinkedElement(){ virtual ~LinkedElement(){}
}
virtual LinkedElement* getNext() const { virtual LinkedElement* getNext() const {
return next; return next;
} }
@ -58,11 +57,16 @@ public:
virtual void setNext(LinkedElement* next) { virtual void setNext(LinkedElement* next) {
this->next = next; this->next = next;
} }
virtual void setEnd() {
this->next = nullptr;
}
LinkedElement* begin() { LinkedElement* begin() {
return this; return this;
} }
LinkedElement* end() { LinkedElement* end() {
return NULL; return nullptr;
} }
private: private:
LinkedElement *next; LinkedElement *next;
@ -71,37 +75,80 @@ private:
template<typename T> template<typename T>
class SinglyLinkedList { class SinglyLinkedList {
public: public:
SinglyLinkedList() : using ElementIterator = typename LinkedElement<T>::Iterator;
start(NULL) {
} SinglyLinkedList() {}
SinglyLinkedList(ElementIterator start) :
start(start.value) {}
SinglyLinkedList(typename LinkedElement<T>::Iterator start) :
start(start.value) {
}
SinglyLinkedList(LinkedElement<T>* startElement) : SinglyLinkedList(LinkedElement<T>* startElement) :
start(startElement) { start(startElement) {}
}
typename LinkedElement<T>::Iterator begin() const { ElementIterator begin() const {
return LinkedElement<T>::Iterator::Iterator(start); return ElementIterator::Iterator(start);
}
typename LinkedElement<T>::Iterator::Iterator end() const {
return LinkedElement<T>::Iterator::Iterator();
} }
uint32_t getSize() const { /** Returns iterator to nulltr */
uint32_t size = 0; ElementIterator end() const {
return ElementIterator::Iterator();
}
/**
* Returns last element in singly linked list.
* @return
*/
ElementIterator back() const {
LinkedElement<T> *element = start;
while (element->getNext() != nullptr) {
element = element->getNext();
}
return ElementIterator::Iterator(element);
}
size_t getSize() const {
size_t size = 0;
LinkedElement<T> *element = start; LinkedElement<T> *element = start;
while (element != NULL) { while (element != nullptr) {
size++; size++;
element = element->getNext(); element = element->getNext();
} }
return size; return size;
} }
void setStart(LinkedElement<T>* setStart) { void setStart(LinkedElement<T>* firstElement) {
start = setStart; start = firstElement;
} }
void setNext(LinkedElement<T>* currentElement,
LinkedElement<T>* nextElement) {
currentElement->setNext(nextElement);
}
void setLast(LinkedElement<T>* lastElement) {
lastElement->setEnd();
}
void insertElement(LinkedElement<T>* element, size_t position) {
LinkedElement<T> *currentElement = start;
for(size_t count = 0; count < position; count++) {
if(currentElement == nullptr) {
return;
}
currentElement = currentElement->getNext();
}
LinkedElement<T>* elementAfterCurrent = currentElement->next;
currentElement->setNext(element);
if(elementAfterCurrent != nullptr) {
element->setNext(elementAfterCurrent);
}
}
void insertBack(LinkedElement<T>* lastElement) {
back().value->setNext(lastElement);
}
protected: protected:
LinkedElement<T> *start; LinkedElement<T> *start = nullptr;
}; };
#endif /* SINGLYLINKEDLIST_H_ */ #endif /* SINGLYLINKEDLIST_H_ */

10
controller/ControllerBase.cpp
View File

@ -1,8 +1,8 @@
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
#include <framework/controller/ControllerBase.h> #include "ControllerBase.h"
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
#include <framework/action/HasActionsIF.h> #include "../action/HasActionsIF.h"
ControllerBase::ControllerBase(uint32_t setObjectId, uint32_t parentId, ControllerBase::ControllerBase(uint32_t setObjectId, uint32_t parentId,
size_t commandQueueDepth) : size_t commandQueueDepth) :

14
controller/ControllerBase.h
View File

@ -1,13 +1,13 @@
#ifndef CONTROLLERBASE_H_ #ifndef CONTROLLERBASE_H_
#define CONTROLLERBASE_H_ #define CONTROLLERBASE_H_
#include <framework/health/HasHealthIF.h> #include "../health/HasHealthIF.h"
#include <framework/health/HealthHelper.h> #include "../health/HealthHelper.h"
#include <framework/modes/HasModesIF.h> #include "../modes/HasModesIF.h"
#include <framework/modes/ModeHelper.h> #include "../modes/ModeHelper.h"
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <framework/tasks/ExecutableObjectIF.h> #include "../tasks/ExecutableObjectIF.h"
#include <framework/datapool/HkSwitchHelper.h> #include "../datapool/HkSwitchHelper.h"
class ControllerBase: public HasModesIF, class ControllerBase: public HasModesIF,

8
coordinates/CoordinateTransformations.cpp
View File

@ -1,7 +1,7 @@
#include <framework/coordinates/CoordinateTransformations.h> #include "CoordinateTransformations.h"
#include <framework/globalfunctions/constants.h> #include "../globalfunctions/constants.h"
#include <framework/globalfunctions/math/MatrixOperations.h> #include "../globalfunctions/math/MatrixOperations.h"
#include <framework/globalfunctions/math/VectorOperations.h> #include "../globalfunctions/math/VectorOperations.h"
#include <stddef.h> #include <stddef.h>
#include <cmath> #include <cmath>

2
coordinates/CoordinateTransformations.h
View File

@ -1,7 +1,7 @@
#ifndef COORDINATETRANSFORMATIONS_H_ #ifndef COORDINATETRANSFORMATIONS_H_
#define COORDINATETRANSFORMATIONS_H_ #define COORDINATETRANSFORMATIONS_H_
#include <framework/timemanager/Clock.h> #include "../timemanager/Clock.h"
#include <cstring> #include <cstring>
class CoordinateTransformations { class CoordinateTransformations {

8
coordinates/Jgm3Model.h
View File

@ -2,10 +2,10 @@
#define FRAMEWORK_COORDINATES_JGM3MODEL_H_ #define FRAMEWORK_COORDINATES_JGM3MODEL_H_
#include <stdint.h> #include <stdint.h>
#include <framework/coordinates/CoordinateTransformations.h> #include "CoordinateTransformations.h"
#include <framework/globalfunctions/math/VectorOperations.h> #include "../globalfunctions/math/VectorOperations.h"
#include <framework/globalfunctions/timevalOperations.h> #include "../globalfunctions/timevalOperations.h"
#include <framework/globalfunctions/constants.h> #include "../globalfunctions/constants.h"
#include <memory.h> #include <memory.h>

12
coordinates/Sgp4Propagator.cpp
View File

@ -1,9 +1,9 @@
#include <framework/coordinates/CoordinateTransformations.h> #include "CoordinateTransformations.h"
#include <framework/coordinates/Sgp4Propagator.h> #include "Sgp4Propagator.h"
#include <framework/globalfunctions/constants.h> #include "../globalfunctions/constants.h"
#include <framework/globalfunctions/math/MatrixOperations.h> #include "../globalfunctions/math/MatrixOperations.h"
#include <framework/globalfunctions/math/VectorOperations.h> #include "../globalfunctions/math/VectorOperations.h"
#include <framework/globalfunctions/timevalOperations.h> #include "../globalfunctions/timevalOperations.h"
#include <cstring> #include <cstring>
Sgp4Propagator::Sgp4Propagator() : Sgp4Propagator::Sgp4Propagator() :
initialized(false), epoch({0, 0}), whichconst(wgs84) { initialized(false), epoch({0, 0}), whichconst(wgs84) {

2
coordinates/Sgp4Propagator.h
View File

@ -3,7 +3,7 @@
#include <sys/time.h> #include <sys/time.h>
#include "../contrib/sgp4/sgp4unit.h" #include "../contrib/sgp4/sgp4unit.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
class Sgp4Propagator { class Sgp4Propagator {
public: public:

2
datalinklayer/BCFrame.h
View File

@ -8,7 +8,7 @@
#ifndef BCFRAME_H_ #ifndef BCFRAME_H_
#define BCFRAME_H_ #define BCFRAME_H_
#include <framework/datalinklayer/CCSDSReturnValuesIF.h> #include "CCSDSReturnValuesIF.h"
/** /**
* Small helper class to identify a BcFrame. * Small helper class to identify a BcFrame.

2
datalinklayer/CCSDSReturnValuesIF.h
View File

@ -8,7 +8,7 @@
#ifndef CCSDSRETURNVALUESIF_H_ #ifndef CCSDSRETURNVALUESIF_H_
#define CCSDSRETURNVALUESIF_H_ #define CCSDSRETURNVALUESIF_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
/** /**
* This is a helper class to collect special return values that come up during CCSDS Handling. * This is a helper class to collect special return values that come up during CCSDS Handling.
* @ingroup ccsds_handling * @ingroup ccsds_handling

4
datalinklayer/Clcw.cpp
View File

@ -7,8 +7,8 @@
#include <framework/datalinklayer/Clcw.h> #include "Clcw.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
Clcw::Clcw() { Clcw::Clcw() {
content.raw = 0; content.raw = 0;

2
datalinklayer/Clcw.h
View File

@ -8,7 +8,7 @@
#ifndef CLCW_H_ #ifndef CLCW_H_
#define CLCW_H_ #define CLCW_H_
#include <framework/datalinklayer/ClcwIF.h> #include "ClcwIF.h"
/** /**
* Small helper method to handle the Clcw values. * Small helper method to handle the Clcw values.
* It has a content struct that manages the register and can be set externally. * It has a content struct that manages the register and can be set externally.

6
datalinklayer/DataLinkLayer.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datalinklayer/DataLinkLayer.h> #include "DataLinkLayer.h"
#include <framework/globalfunctions/CRC.h> #include "../globalfunctions/CRC.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
DataLinkLayer::DataLinkLayer(uint8_t* set_frame_buffer, ClcwIF* setClcw, DataLinkLayer::DataLinkLayer(uint8_t* set_frame_buffer, ClcwIF* setClcw,
uint8_t set_start_sequence_length, uint16_t set_scid) : uint8_t set_start_sequence_length, uint16_t set_scid) :

10
datalinklayer/DataLinkLayer.h
View File

@ -1,11 +1,11 @@
#ifndef DATALINKLAYER_H_ #ifndef DATALINKLAYER_H_
#define DATALINKLAYER_H_ #define DATALINKLAYER_H_
#include <framework/datalinklayer/CCSDSReturnValuesIF.h> #include "CCSDSReturnValuesIF.h"
#include <framework/datalinklayer/ClcwIF.h> #include "ClcwIF.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReceptionIF.h> #include "VirtualChannelReceptionIF.h"
#include <framework/events/Event.h> #include "../events/Event.h"
#include <map> #include <map>

2
datalinklayer/Farm1StateIF.h
View File

@ -8,7 +8,7 @@
#ifndef FARM1STATEIF_H_ #ifndef FARM1STATEIF_H_
#define FARM1STATEIF_H_ #define FARM1STATEIF_H_
#include <framework/datalinklayer/CCSDSReturnValuesIF.h> #include "CCSDSReturnValuesIF.h"
class VirtualChannelReception; class VirtualChannelReception;
class TcTransferFrame; class TcTransferFrame;
class ClcwIF; class ClcwIF;

8
datalinklayer/Farm1StateLockout.cpp
View File

@ -7,10 +7,10 @@
#include <framework/datalinklayer/ClcwIF.h> #include "ClcwIF.h"
#include <framework/datalinklayer/Farm1StateLockout.h> #include "Farm1StateLockout.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "VirtualChannelReception.h"
Farm1StateLockout::Farm1StateLockout(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateLockout::Farm1StateLockout(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

2
datalinklayer/Farm1StateLockout.h
View File

@ -8,7 +8,7 @@
#ifndef FARM1STATELOCKOUT_H_ #ifndef FARM1STATELOCKOUT_H_
#define FARM1STATELOCKOUT_H_ #define FARM1STATELOCKOUT_H_
#include <framework/datalinklayer/Farm1StateIF.h> #include "Farm1StateIF.h"
/** /**
* This class represents the FARM-1 "Lockout" State. * This class represents the FARM-1 "Lockout" State.

8
datalinklayer/Farm1StateOpen.cpp
View File

@ -8,10 +8,10 @@
#include <framework/datalinklayer/ClcwIF.h> #include "ClcwIF.h"
#include <framework/datalinklayer/Farm1StateOpen.h> #include "Farm1StateOpen.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "VirtualChannelReception.h"
Farm1StateOpen::Farm1StateOpen(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateOpen::Farm1StateOpen(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

2
datalinklayer/Farm1StateOpen.h
View File

@ -8,7 +8,7 @@
#ifndef FARM1STATEOPEN_H_ #ifndef FARM1STATEOPEN_H_
#define FARM1STATEOPEN_H_ #define FARM1STATEOPEN_H_
#include <framework/datalinklayer/Farm1StateIF.h> #include "Farm1StateIF.h"
/** /**
* This class represents the FARM-1 "Open" State. * This class represents the FARM-1 "Open" State.

8
datalinklayer/Farm1StateWait.cpp
View File

@ -6,10 +6,10 @@
*/ */
#include <framework/datalinklayer/ClcwIF.h> #include "ClcwIF.h"
#include <framework/datalinklayer/Farm1StateWait.h> #include "Farm1StateWait.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "VirtualChannelReception.h"
Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) { Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
} }

2
datalinklayer/Farm1StateWait.h
View File

@ -8,7 +8,7 @@
#ifndef FARM1STATEWAIT_H_ #ifndef FARM1STATEWAIT_H_
#define FARM1STATEWAIT_H_ #define FARM1STATEWAIT_H_
#include <framework/datalinklayer/Farm1StateIF.h> #include "Farm1StateIF.h"
/** /**
* This class represents the FARM-1 "Wait" State. * This class represents the FARM-1 "Wait" State.

14
datalinklayer/MapPacketExtraction.cpp
View File

@ -5,13 +5,13 @@
* @author baetz * @author baetz
*/ */
#include <framework/datalinklayer/MapPacketExtraction.h> #include "MapPacketExtraction.h"
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
#include <framework/tmtcpacket/SpacePacketBase.h> #include "../tmtcpacket/SpacePacketBase.h"
#include <framework/tmtcservices/AcceptsTelecommandsIF.h> #include "../tmtcservices/AcceptsTelecommandsIF.h"
#include <framework/tmtcservices/TmTcMessage.h> #include "../tmtcservices/TmTcMessage.h"
#include <string.h> #include <string.h>
MapPacketExtraction::MapPacketExtraction(uint8_t setMapId, MapPacketExtraction::MapPacketExtraction(uint8_t setMapId,

8
datalinklayer/MapPacketExtraction.h
View File

@ -8,10 +8,10 @@
#ifndef MAPPACKETEXTRACTION_H_ #ifndef MAPPACKETEXTRACTION_H_
#define MAPPACKETEXTRACTION_H_ #define MAPPACKETEXTRACTION_H_
#include <framework/datalinklayer/MapPacketExtractionIF.h> #include "MapPacketExtractionIF.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/ipc/MessageQueueSenderIF.h> #include "../ipc/MessageQueueSenderIF.h"
class StorageManagerIF; class StorageManagerIF;

4
datalinklayer/MapPacketExtractionIF.h
View File

@ -8,8 +8,8 @@
#ifndef MAPPACKETEXTRACTIONIF_H_ #ifndef MAPPACKETEXTRACTIONIF_H_
#define MAPPACKETEXTRACTIONIF_H_ #define MAPPACKETEXTRACTIONIF_H_
#include <framework/datalinklayer/CCSDSReturnValuesIF.h> #include "CCSDSReturnValuesIF.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
/** /**
* This is the interface for MAP Packet Extraction classes. * This is the interface for MAP Packet Extraction classes.

4
datalinklayer/TcTransferFrame.cpp
View File

@ -7,8 +7,8 @@
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
TcTransferFrame::TcTransferFrame() { TcTransferFrame::TcTransferFrame() {
frame = NULL; frame = NULL;

6
datalinklayer/TcTransferFrameLocal.cpp
View File

@ -5,9 +5,9 @@
* @author baetz * @author baetz
*/ */
#include <framework/datalinklayer/TcTransferFrameLocal.h> #include "TcTransferFrameLocal.h"
#include <framework/globalfunctions/CRC.h> #include "../globalfunctions/CRC.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <string.h> #include <string.h>
TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid, TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid,

2
datalinklayer/TcTransferFrameLocal.h
View File

@ -8,7 +8,7 @@
#ifndef TCTRANSFERFRAMELOCAL_H_ #ifndef TCTRANSFERFRAMELOCAL_H_
#define TCTRANSFERFRAMELOCAL_H_ #define TCTRANSFERFRAMELOCAL_H_
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
/** /**
* This is a helper class to locally create TC Transfer Frames. * This is a helper class to locally create TC Transfer Frames.

6
datalinklayer/VirtualChannelReception.cpp
View File

@ -5,9 +5,9 @@
* @author baetz * @author baetz
*/ */
#include <framework/datalinklayer/BCFrame.h> #include "BCFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "VirtualChannelReception.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId, VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,
uint8_t setSlidingWindowWidth) : uint8_t setSlidingWindowWidth) :

16
datalinklayer/VirtualChannelReception.h
View File

@ -8,14 +8,14 @@
#ifndef VIRTUALCHANNELRECEPTION_H_ #ifndef VIRTUALCHANNELRECEPTION_H_
#define VIRTUALCHANNELRECEPTION_H_ #define VIRTUALCHANNELRECEPTION_H_
#include <framework/datalinklayer/CCSDSReturnValuesIF.h> #include "CCSDSReturnValuesIF.h"
#include <framework/datalinklayer/Clcw.h> #include "Clcw.h"
#include <framework/datalinklayer/Farm1StateIF.h> #include "Farm1StateIF.h"
#include <framework/datalinklayer/Farm1StateLockout.h> #include "Farm1StateLockout.h"
#include <framework/datalinklayer/Farm1StateOpen.h> #include "Farm1StateOpen.h"
#include <framework/datalinklayer/Farm1StateWait.h> #include "Farm1StateWait.h"
#include <framework/datalinklayer/MapPacketExtractionIF.h> #include "MapPacketExtractionIF.h"
#include <framework/datalinklayer/VirtualChannelReceptionIF.h> #include "VirtualChannelReceptionIF.h"
#include <map> #include <map>
/** /**
* Implementation of a TC Virtual Channel. * Implementation of a TC Virtual Channel.

6
datalinklayer/VirtualChannelReceptionIF.h
View File

@ -8,9 +8,9 @@
#ifndef VIRTUALCHANNELRECEPTIONIF_H_ #ifndef VIRTUALCHANNELRECEPTIONIF_H_
#define VIRTUALCHANNELRECEPTIONIF_H_ #define VIRTUALCHANNELRECEPTIONIF_H_
#include <framework/datalinklayer/ClcwIF.h> #include "ClcwIF.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "TcTransferFrame.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
/** /**
* This is the interface for Virtual Channel reception classes. * This is the interface for Virtual Channel reception classes.

2
datapool/ControllerSet.cpp
View File

@ -1,4 +1,4 @@
#include <framework/datapool/ControllerSet.h> #include "ControllerSet.h"
ControllerSet::ControllerSet() { ControllerSet::ControllerSet() {

2
datapool/ControllerSet.h
View File

@ -1,7 +1,7 @@
#ifndef CONTROLLERSET_H_ #ifndef CONTROLLERSET_H_
#define CONTROLLERSET_H_ #define CONTROLLERSET_H_
#include <framework/datapool/DataSet.h> #include "DataSet.h"
class ControllerSet :public DataSet { class ControllerSet :public DataSet {
public: public:

8
datapool/DataPool.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapool/DataPool.h> #include "DataPool.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/ipc/MutexFactory.h> #include "../ipc/MutexFactory.h"
DataPool::DataPool( void ( *initFunction )( std::map<uint32_t, PoolEntryIF*>* pool_map ) ) { DataPool::DataPool( void ( *initFunction )( std::map<uint32_t, PoolEntryIF*>* pool_map ) ) {
mutex = MutexFactory::instance()->createMutex(); mutex = MutexFactory::instance()->createMutex();
@ -61,7 +61,7 @@ ReturnValue_t DataPool::freeDataPoolLock() {
} }
ReturnValue_t DataPool::lockDataPool() { ReturnValue_t DataPool::lockDataPool() {
ReturnValue_t status = mutex->lockMutex(MutexIF::NO_TIMEOUT); ReturnValue_t status = mutex->lockMutex(MutexIF::BLOCKING);
if ( status != RETURN_OK ) { if ( status != RETURN_OK ) {
sif::error << "DataPool::DataPool: lock of mutex failed with error code: " << status << std::endl; sif::error << "DataPool::DataPool: lock of mutex failed with error code: " << status << std::endl;
} }

6
datapool/DataPool.h
View File

@ -11,9 +11,9 @@
#ifndef DATAPOOL_H_ #ifndef DATAPOOL_H_
#define DATAPOOL_H_ #define DATAPOOL_H_
#include <framework/datapool/PoolEntry.h> #include "PoolEntry.h"
#include <framework/globalfunctions/Type.h> #include "../globalfunctions/Type.h"
#include <framework/ipc/MutexIF.h> #include "../ipc/MutexIF.h"
#include <map> #include <map>
/** /**

14
datapool/DataPoolAdmin.cpp
View File

@ -1,10 +1,10 @@
#include <framework/datapool/DataPool.h> #include "DataPool.h"
#include <framework/datapool/DataPoolAdmin.h> #include "DataPoolAdmin.h"
#include <framework/datapool/DataSet.h> #include "DataSet.h"
#include <framework/datapool/PoolRawAccess.h> #include "PoolRawAccess.h"
#include <framework/ipc/CommandMessage.h> #include "../ipc/CommandMessage.h"
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
#include <framework/parameters/ParameterMessage.h> #include "../parameters/ParameterMessage.h"
DataPoolAdmin::DataPoolAdmin(object_id_t objectId) : DataPoolAdmin::DataPoolAdmin(object_id_t objectId) :
SystemObject(objectId), storage(NULL), commandQueue(NULL), memoryHelper( SystemObject(objectId), storage(NULL), commandQueue(NULL), memoryHelper(

18
datapool/DataPoolAdmin.h
View File

@ -1,15 +1,15 @@
#ifndef DATAPOOLADMIN_H_ #ifndef DATAPOOLADMIN_H_
#define DATAPOOLADMIN_H_ #define DATAPOOLADMIN_H_
#include <framework/memory/MemoryHelper.h> #include "../memory/MemoryHelper.h"
#include <framework/action/HasActionsIF.h> #include "../action/HasActionsIF.h"
#include <framework/action/SimpleActionHelper.h> #include "../action/SimpleActionHelper.h"
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/tasks/ExecutableObjectIF.h> #include "../tasks/ExecutableObjectIF.h"
#include <framework/parameters/ReceivesParameterMessagesIF.h> #include "../parameters/ReceivesParameterMessagesIF.h"
#include <framework/datapool/DataPoolParameterWrapper.h> #include "DataPoolParameterWrapper.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
class DataPoolAdmin: public HasActionsIF, class DataPoolAdmin: public HasActionsIF,
public ExecutableObjectIF, public ExecutableObjectIF,

6
datapool/DataPoolParameterWrapper.cpp
View File

@ -1,10 +1,10 @@
#include "DataPoolParameterWrapper.h" #include "DataPoolParameterWrapper.h"
//for returncodes //for returncodes
#include <framework/parameters/HasParametersIF.h> #include "../parameters/HasParametersIF.h"
#include <framework/datapool/DataSet.h> #include "DataSet.h"
#include <framework/datapool/PoolRawAccess.h> #include "PoolRawAccess.h"
DataPoolParameterWrapper::DataPoolParameterWrapper() : DataPoolParameterWrapper::DataPoolParameterWrapper() :
type(Type::UNKNOWN_TYPE), rows(0), columns(0), poolId( type(Type::UNKNOWN_TYPE), rows(0), columns(0), poolId(

4
datapool/DataPoolParameterWrapper.h
View File

@ -1,8 +1,8 @@
#ifndef DATAPOOLPARAMETERWRAPPER_H_ #ifndef DATAPOOLPARAMETERWRAPPER_H_
#define DATAPOOLPARAMETERWRAPPER_H_ #define DATAPOOLPARAMETERWRAPPER_H_
#include <framework/globalfunctions/Type.h> #include "../globalfunctions/Type.h"
#include <framework/parameters/ParameterWrapper.h> #include "../parameters/ParameterWrapper.h"
class DataPoolParameterWrapper: public SerializeIF { class DataPoolParameterWrapper: public SerializeIF {
public: public:

4
datapool/DataSet.cpp
View File

@ -1,5 +1,5 @@
#include <framework/datapool/DataSet.h> #include "DataSet.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
DataSet::DataSet() : DataSet::DataSet() :
fill_count(0), state(DATA_SET_UNINITIALISED) { fill_count(0), state(DATA_SET_UNINITIALISED) {

14
datapool/DataSet.h
View File

@ -12,13 +12,13 @@
#ifndef DATASET_H_ #ifndef DATASET_H_
#define DATASET_H_ #define DATASET_H_
#include <framework/datapool/DataPool.h> #include "DataPool.h"
#include <framework/datapool/DataSetIF.h> #include "DataSetIF.h"
#include <framework/datapool/PoolRawAccess.h> #include "PoolRawAccess.h"
#include <framework/datapool/PoolVariable.h> #include "PoolVariable.h"
#include <framework/datapool/PoolVarList.h> #include "PoolVarList.h"
#include <framework/datapool/PoolVector.h> #include "PoolVector.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
/** /**
* \brief The DataSet class manages a set of locally checked out variables. * \brief The DataSet class manages a set of locally checked out variables.
* *

4
datapool/HkSwitchHelper.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapool/HkSwitchHelper.h> #include "HkSwitchHelper.h"
//#include <mission/tmtcservices/HKService_03.h> //#include <mission/tmtcservices/HKService_03.h>
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) : HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) :
commandActionHelper(this), eventProxy(eventProxy) { commandActionHelper(this), eventProxy(eventProxy) {

6
datapool/HkSwitchHelper.h
View File

@ -1,9 +1,9 @@
#ifndef FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_ #ifndef FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_
#define FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_ #define FRAMEWORK_DATAPOOL_HKSWITCHHELPER_H_
#include <framework/tasks/ExecutableObjectIF.h> #include "../tasks/ExecutableObjectIF.h"
#include <framework/action/CommandsActionsIF.h> #include "../action/CommandsActionsIF.h"
#include <framework/events/EventReportingProxyIF.h> #include "../events/EventReportingProxyIF.h"
//TODO this class violations separation between mission and framework //TODO this class violations separation between mission and framework
//but it is only a transitional solution until the Datapool is //but it is only a transitional solution until the Datapool is

12
datapool/PIDReader.h
View File

@ -1,11 +1,11 @@
#ifndef PIDREADER_H_ #ifndef PIDREADER_H_
#define PIDREADER_H_ #define PIDREADER_H_
#include <framework/datapool/DataPool.h> #include "DataPool.h"
#include <framework/datapool/DataSetIF.h> #include "DataSetIF.h"
#include <framework/datapool/PoolEntry.h> #include "PoolEntry.h"
#include <framework/datapool/PoolVariableIF.h> #include "PoolVariableIF.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
template<typename U, uint8_t n_var> class PIDReaderList; template<typename U, uint8_t n_var> class PIDReaderList;

4
datapool/PIDReaderList.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DATAPOOL_PIDREADERLIST_H_ #ifndef FRAMEWORK_DATAPOOL_PIDREADERLIST_H_
#define FRAMEWORK_DATAPOOL_PIDREADERLIST_H_ #define FRAMEWORK_DATAPOOL_PIDREADERLIST_H_
#include <framework/datapool/PIDReader.h> #include "PIDReader.h"
#include <framework/datapool/PoolVariableIF.h> #include "PoolVariableIF.h"
template <class T, uint8_t n_var> template <class T, uint8_t n_var>
class PIDReaderList { class PIDReaderList {
private: private:

6
datapool/PoolEntry.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapool/PoolEntry.h> #include "PoolEntry.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/globalfunctions/arrayprinter.h> #include "../globalfunctions/arrayprinter.h"
#include <cstring> #include <cstring>
template <typename T> template <typename T>

2
datapool/PoolEntry.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOL_POOLENTRY_H_ #ifndef FRAMEWORK_DATAPOOL_POOLENTRY_H_
#define FRAMEWORK_DATAPOOL_POOLENTRY_H_ #define FRAMEWORK_DATAPOOL_POOLENTRY_H_
#include <framework/datapool/PoolEntryIF.h> #include "PoolEntryIF.h"
#include <initializer_list> #include <initializer_list>
#include <type_traits> #include <type_traits>

2
datapool/PoolEntryIF.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOL_POOLENTRYIF_H_ #ifndef FRAMEWORK_DATAPOOL_POOLENTRYIF_H_
#define FRAMEWORK_DATAPOOL_POOLENTRYIF_H_ #define FRAMEWORK_DATAPOOL_POOLENTRYIF_H_
#include <framework/globalfunctions/Type.h> #include "../globalfunctions/Type.h"
#include <cstdint> #include <cstdint>
/** /**

10
datapool/PoolRawAccess.cpp
View File

@ -1,8 +1,8 @@
#include <framework/datapool/DataPool.h> #include "DataPool.h"
#include <framework/datapool/PoolEntryIF.h> #include "PoolEntryIF.h"
#include <framework/datapool/PoolRawAccess.h> #include "PoolRawAccess.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/serialize/EndianConverter.h> #include "../serialize/EndianConverter.h"
#include <cstring> #include <cstring>

4
datapool/PoolRawAccess.h
View File

@ -1,8 +1,8 @@
#ifndef POOLRAWACCESS_H_ #ifndef POOLRAWACCESS_H_
#define POOLRAWACCESS_H_ #define POOLRAWACCESS_H_
#include <framework/datapool/DataSetIF.h> #include "DataSetIF.h"
#include <framework/datapool/PoolVariableIF.h> #include "PoolVariableIF.h"
/** /**
* This class allows accessing Data Pool variables as raw bytes. * This class allows accessing Data Pool variables as raw bytes.

4
datapool/PoolVarList.h
View File

@ -1,8 +1,8 @@
#ifndef POOLVARLIST_H_ #ifndef POOLVARLIST_H_
#define POOLVARLIST_H_ #define POOLVARLIST_H_
#include <framework/datapool/PoolVariable.h> #include "PoolVariable.h"
#include <framework/datapool/PoolVariableIF.h> #include "PoolVariableIF.h"
template <class T, uint8_t n_var> template <class T, uint8_t n_var>
class PoolVarList { class PoolVarList {
private: private:

10
datapool/PoolVariable.h
View File

@ -11,11 +11,11 @@
#ifndef POOLVARIABLE_H_ #ifndef POOLVARIABLE_H_
#define POOLVARIABLE_H_ #define POOLVARIABLE_H_
#include <framework/datapool/DataSetIF.h> #include "DataSetIF.h"
#include <framework/datapool/PoolEntry.h> #include "PoolEntry.h"
#include <framework/datapool/PoolVariableIF.h> #include "PoolVariableIF.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
template<typename T, uint8_t n_var> class PoolVarList; template<typename T, uint8_t n_var> class PoolVarList;

4
datapool/PoolVariableIF.h
View File

@ -11,8 +11,8 @@
#ifndef POOLVARIABLEIF_H_ #ifndef POOLVARIABLEIF_H_
#define POOLVARIABLEIF_H_ #define POOLVARIABLEIF_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/serialize/SerializeIF.h> #include "../serialize/SerializeIF.h"
/** /**
* \brief This interface is used to control local data pool variable representations. * \brief This interface is used to control local data pool variable representations.

10
datapool/PoolVector.h
View File

@ -11,11 +11,11 @@
#ifndef POOLVECTOR_H_ #ifndef POOLVECTOR_H_
#define POOLVECTOR_H_ #define POOLVECTOR_H_
#include <framework/datapool/DataSetIF.h> #include "DataSetIF.h"
#include <framework/datapool/PoolEntry.h> #include "PoolEntry.h"
#include <framework/datapool/PoolVariableIF.h> #include "PoolVariableIF.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
/** /**
* \brief This is the access class for array-type data pool entries. * \brief This is the access class for array-type data pool entries.

2
devicehandlers/AcceptsDeviceResponsesIF.h
View File

@ -8,7 +8,7 @@
#ifndef ACCEPTSDEVICERESPONSESIF_H_ #ifndef ACCEPTSDEVICERESPONSESIF_H_
#define ACCEPTSDEVICERESPONSESIF_H_ #define ACCEPTSDEVICERESPONSESIF_H_
#include <framework/ipc/MessageQueueSenderIF.h> #include "../ipc/MessageQueueSenderIF.h"
class AcceptsDeviceResponsesIF { class AcceptsDeviceResponsesIF {
public: public:

2
devicehandlers/AssemblyBase.cpp
View File

@ -1,4 +1,4 @@
#include <framework/devicehandlers/AssemblyBase.h> #include "AssemblyBase.h"
AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId, AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId,
uint16_t commandQueueDepth) : uint16_t commandQueueDepth) :

6
devicehandlers/AssemblyBase.h
View File

@ -1,9 +1,9 @@
#ifndef ASSEMBLYBASE_H_ #ifndef ASSEMBLYBASE_H_
#define ASSEMBLYBASE_H_ #define ASSEMBLYBASE_H_
#include <framework/container/FixedArrayList.h> #include "../container/FixedArrayList.h"
#include <framework/devicehandlers/DeviceHandlerBase.h> #include "DeviceHandlerBase.h"
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
class AssemblyBase: public SubsystemBase { class AssemblyBase: public SubsystemBase {
public: public:

6
devicehandlers/ChildHandlerBase.cpp
View File

@ -1,6 +1,6 @@
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
#include <framework/devicehandlers/ChildHandlerBase.h> #include "ChildHandlerBase.h"
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId, ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
object_id_t deviceCommunication, CookieIF * comCookie, object_id_t deviceCommunication, CookieIF * comCookie,

4
devicehandlers/ChildHandlerBase.h
View File

@ -1,8 +1,8 @@
#ifndef PAYLOADHANDLERBASE_H_ #ifndef PAYLOADHANDLERBASE_H_
#define PAYLOADHANDLERBASE_H_ #define PAYLOADHANDLERBASE_H_
#include <framework/devicehandlers/ChildHandlerFDIR.h> #include "ChildHandlerFDIR.h"
#include <framework/devicehandlers/DeviceHandlerBase.h> #include "DeviceHandlerBase.h"
class ChildHandlerBase: public DeviceHandlerBase { class ChildHandlerBase: public DeviceHandlerBase {
public: public:

2
devicehandlers/ChildHandlerFDIR.cpp
View File

@ -1,4 +1,4 @@
#include <framework/devicehandlers/ChildHandlerFDIR.h> #include "ChildHandlerFDIR.h"
ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner, object_id_t faultTreeParent, uint32_t recoveryCount) : ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner, object_id_t faultTreeParent, uint32_t recoveryCount) :
DeviceHandlerFailureIsolation(owner, faultTreeParent) { DeviceHandlerFailureIsolation(owner, faultTreeParent) {

2
devicehandlers/ChildHandlerFDIR.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_ #ifndef FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_
#define FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_ #define FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_
#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h> #include "DeviceHandlerFailureIsolation.h"
/** /**
* Very simple extension to normal FDIR. * Very simple extension to normal FDIR.

4
devicehandlers/DeviceCommunicationIF.h
View File

@ -1,8 +1,8 @@
#ifndef DEVICECOMMUNICATIONIF_H_ #ifndef DEVICECOMMUNICATIONIF_H_
#define DEVICECOMMUNICATIONIF_H_ #define DEVICECOMMUNICATIONIF_H_
#include <framework/devicehandlers/CookieIF.h> #include "CookieIF.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <cstddef> #include <cstddef>
/** /**
* @defgroup interfaces Interfaces * @defgroup interfaces Interfaces

24
devicehandlers/DeviceHandlerBase.cpp
View File

@ -1,16 +1,16 @@
#include <framework/devicehandlers/DeviceHandlerBase.h> #include "DeviceHandlerBase.h"
#include <framework/objectmanager/ObjectManager.h> #include "../objectmanager/ObjectManager.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
#include <framework/thermal/ThermalComponentIF.h> #include "../thermal/ThermalComponentIF.h"
#include <framework/devicehandlers/AcceptsDeviceResponsesIF.h> #include "AcceptsDeviceResponsesIF.h"
#include <framework/datapool/DataSet.h> #include "../datapool/DataSet.h"
#include <framework/datapool/PoolVariable.h> #include "../datapool/PoolVariable.h"
#include <framework/devicehandlers/DeviceTmReportingWrapper.h> #include "DeviceTmReportingWrapper.h"
#include <framework/globalfunctions/CRC.h> #include "../globalfunctions/CRC.h"
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <iomanip> #include <iomanip>

30
devicehandlers/DeviceHandlerBase.h
View File

@ -1,22 +1,22 @@
#ifndef DEVICEHANDLERBASE_H_ #ifndef DEVICEHANDLERBASE_H_
#define DEVICEHANDLERBASE_H_ #define DEVICEHANDLERBASE_H_
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <framework/tasks/ExecutableObjectIF.h> #include "../tasks/ExecutableObjectIF.h"
#include <framework/devicehandlers/DeviceHandlerIF.h> #include "DeviceHandlerIF.h"
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/action/HasActionsIF.h> #include "../action/HasActionsIF.h"
#include <framework/datapool/PoolVariableIF.h> #include "../datapool/PoolVariableIF.h"
#include <framework/devicehandlers/DeviceCommunicationIF.h> #include "DeviceCommunicationIF.h"
#include <framework/modes/HasModesIF.h> #include "../modes/HasModesIF.h"
#include <framework/power/PowerSwitchIF.h> #include "../power/PowerSwitchIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
#include <framework/action/ActionHelper.h> #include "../action/ActionHelper.h"
#include <framework/health/HealthHelper.h> #include "../health/HealthHelper.h"
#include <framework/parameters/ParameterHelper.h> #include "../parameters/ParameterHelper.h"
#include <framework/datapool/HkSwitchHelper.h> #include "../datapool/HkSwitchHelper.h"
#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h> #include "DeviceHandlerFailureIsolation.h"
#include <map> #include <map>

12
devicehandlers/DeviceHandlerFailureIsolation.cpp
View File

@ -1,9 +1,9 @@
#include <framework/devicehandlers/DeviceHandlerBase.h> #include "DeviceHandlerBase.h"
#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h> #include "DeviceHandlerFailureIsolation.h"
#include <framework/health/HealthTableIF.h> #include "../health/HealthTableIF.h"
#include <framework/power/Fuse.h> #include "../power/Fuse.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/thermal/ThermalComponentIF.h> #include "../thermal/ThermalComponentIF.h"
object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = 0; object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = 0;

4
devicehandlers/DeviceHandlerFailureIsolation.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_ #ifndef FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_
#define FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_ #define FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_
#include <framework/fdir/FaultCounter.h> #include "../fdir/FaultCounter.h"
#include <framework/fdir/FailureIsolationBase.h> #include "../fdir/FailureIsolationBase.h"
namespace Factory{ namespace Factory{
void setStaticFrameworkObjectIds(); void setStaticFrameworkObjectIds();
} }

10
devicehandlers/DeviceHandlerIF.h
View File

@ -1,11 +1,11 @@
#ifndef DEVICEHANDLERIF_H_ #ifndef DEVICEHANDLERIF_H_
#define DEVICEHANDLERIF_H_ #define DEVICEHANDLERIF_H_
#include <framework/action/HasActionsIF.h> #include "../action/HasActionsIF.h"
#include <framework/devicehandlers/DeviceHandlerMessage.h> #include "DeviceHandlerMessage.h"
#include <framework/events/Event.h> #include "../events/Event.h"
#include <framework/modes/HasModesIF.h> #include "../modes/HasModesIF.h"
#include <framework/ipc/MessageQueueSenderIF.h> #include "../ipc/MessageQueueSenderIF.h"
/** /**
* @brief This is the Interface used to communicate with a device handler. * @brief This is the Interface used to communicate with a device handler.

6
devicehandlers/DeviceHandlerMessage.cpp
View File

@ -1,6 +1,6 @@
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/devicehandlers/DeviceHandlerMessage.h> #include "DeviceHandlerMessage.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
DeviceHandlerMessage::DeviceHandlerMessage() { DeviceHandlerMessage::DeviceHandlerMessage() {
} }

10
devicehandlers/DeviceHandlerMessage.h
View File

@ -1,10 +1,10 @@
#ifndef DEVICEHANDLERMESSAGE_H_ #ifndef DEVICEHANDLERMESSAGE_H_
#define DEVICEHANDLERMESSAGE_H_ #define DEVICEHANDLERMESSAGE_H_
#include <framework/action/ActionMessage.h> #include "../action/ActionMessage.h"
#include <framework/ipc/CommandMessage.h> #include "../ipc/CommandMessage.h"
#include <framework/objectmanager/SystemObjectIF.h> #include "../objectmanager/SystemObjectIF.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
//SHOULDDO: rework the static constructors to name the type of command they are building, maybe even hide setting the commandID. //SHOULDDO: rework the static constructors to name the type of command they are building, maybe even hide setting the commandID.
/** /**
@ -25,7 +25,7 @@ public:
/** /**
* These are the commands that can be sent to a DeviceHandlerBase * These are the commands that can be sent to a DeviceHandlerBase
*/ */
static const uint8_t MESSAGE_ID = MESSAGE_TYPE::DEVICE_HANDLER_COMMAND; static const uint8_t MESSAGE_ID = messagetypes::DEVICE_HANDLER_COMMAND;
static const Command_t CMD_RAW = MAKE_COMMAND_ID( 1 ); //!< Sends a raw command, setParameter is a ::store_id_t containing the raw packet to send static const Command_t CMD_RAW = MAKE_COMMAND_ID( 1 ); //!< Sends a raw command, setParameter is a ::store_id_t containing the raw packet to send
// static const Command_t CMD_DIRECT = MAKE_COMMAND_ID( 2 ); //!< Sends a direct command, setParameter is a ::DeviceCommandId_t, setParameter2 is a ::store_id_t containing the data needed for the command // static const Command_t CMD_DIRECT = MAKE_COMMAND_ID( 2 ); //!< Sends a direct command, setParameter is a ::DeviceCommandId_t, setParameter2 is a ::store_id_t containing the data needed for the command
static const Command_t CMD_SWITCH_IOBOARD = MAKE_COMMAND_ID( 3 ); //!< Requests a IO-Board switch, setParameter() is the IO-Board identifier static const Command_t CMD_SWITCH_IOBOARD = MAKE_COMMAND_ID( 3 ); //!< Requests a IO-Board switch, setParameter() is the IO-Board identifier

6
devicehandlers/DeviceTmReportingWrapper.cpp
View File

@ -1,6 +1,6 @@
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/devicehandlers/DeviceTmReportingWrapper.h> #include "DeviceTmReportingWrapper.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId, DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId,
ActionId_t actionId, SerializeIF* data) : ActionId_t actionId, SerializeIF* data) :

6
devicehandlers/DeviceTmReportingWrapper.h
View File

@ -1,9 +1,9 @@
#ifndef DEVICETMREPORTINGWRAPPER_H_ #ifndef DEVICETMREPORTINGWRAPPER_H_
#define DEVICETMREPORTINGWRAPPER_H_ #define DEVICETMREPORTINGWRAPPER_H_
#include <framework/action/HasActionsIF.h> #include "../action/HasActionsIF.h"
#include <framework/objectmanager/SystemObjectIF.h> #include "../objectmanager/SystemObjectIF.h"
#include <framework/serialize/SerializeIF.h> #include "../serialize/SerializeIF.h"
class DeviceTmReportingWrapper: public SerializeIF { class DeviceTmReportingWrapper: public SerializeIF {
public: public:

4
devicehandlers/FixedSequenceSlot.cpp
View File

@ -5,8 +5,8 @@
* @author baetz * @author baetz
*/ */
#include <framework/devicehandlers/FixedSequenceSlot.h> #include "FixedSequenceSlot.h"
#include <framework/objectmanager/SystemObjectIF.h> #include "../objectmanager/SystemObjectIF.h"
#include <cstddef> #include <cstddef>
FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime, FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime,

4
devicehandlers/FixedSequenceSlot.h
View File

@ -8,8 +8,8 @@
#ifndef FIXEDSEQUENCESLOT_H_ #ifndef FIXEDSEQUENCESLOT_H_
#define FIXEDSEQUENCESLOT_H_ #define FIXEDSEQUENCESLOT_H_
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/tasks/ExecutableObjectIF.h> #include "../tasks/ExecutableObjectIF.h"
class PeriodicTaskIF; class PeriodicTaskIF;
/** /**

4
devicehandlers/FixedSlotSequence.cpp
View File

@ -1,5 +1,5 @@
#include <framework/devicehandlers/FixedSlotSequence.h> #include "FixedSlotSequence.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) : FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
lengthMs(setLengthMs) { lengthMs(setLengthMs) {

4
devicehandlers/FixedSlotSequence.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_ #ifndef FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_
#define FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_ #define FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_
#include <framework/devicehandlers/FixedSequenceSlot.h> #include "FixedSequenceSlot.h"
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <set> #include <set>
/** /**

4
devicehandlers/HealthDevice.cpp
View File

@ -1,5 +1,5 @@
#include <framework/devicehandlers/HealthDevice.h> #include "HealthDevice.h"
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
HealthDevice::HealthDevice(object_id_t setObjectId, HealthDevice::HealthDevice(object_id_t setObjectId,
MessageQueueId_t parentQueue) : MessageQueueId_t parentQueue) :

10
devicehandlers/HealthDevice.h
View File

@ -1,11 +1,11 @@
#ifndef HEALTHDEVICE_H_ #ifndef HEALTHDEVICE_H_
#define HEALTHDEVICE_H_ #define HEALTHDEVICE_H_
#include <framework/health/HasHealthIF.h> #include "../health/HasHealthIF.h"
#include <framework/health/HealthHelper.h> #include "../health/HealthHelper.h"
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <framework/tasks/ExecutableObjectIF.h> #include "../tasks/ExecutableObjectIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
class HealthDevice: public SystemObject, class HealthDevice: public SystemObject,
public ExecutableObjectIF, public ExecutableObjectIF,

2
events/Event.cpp
View File

@ -1,4 +1,4 @@
#include <framework/events/Event.h> #include "Event.h"
namespace EVENT { namespace EVENT {
EventId_t getEventId(Event event) { EventId_t getEventId(Event event) {
return (event & 0xFFFF); return (event & 0xFFFF);

2
events/Event.h
View File

@ -2,7 +2,7 @@
#define EVENTOBJECT_EVENT_H_ #define EVENTOBJECT_EVENT_H_
#include <stdint.h> #include <stdint.h>
#include <framework/events/fwSubsystemIdRanges.h> #include "fwSubsystemIdRanges.h"
//could be move to more suitable location //could be move to more suitable location
#include <config/tmtc/subsystemIdRanges.h> #include <config/tmtc/subsystemIdRanges.h>

12
events/EventManager.cpp
View File

@ -1,8 +1,8 @@
#include <framework/events/EventManager.h> #include "EventManager.h"
#include <framework/events/EventMessage.h> #include "EventMessage.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/ipc/QueueFactory.h> #include "../ipc/QueueFactory.h"
#include <framework/ipc/MutexFactory.h> #include "../ipc/MutexFactory.h"
const uint16_t EventManager::POOL_SIZES[N_POOLS] = { const uint16_t EventManager::POOL_SIZES[N_POOLS] = {
@ -147,7 +147,7 @@ void EventManager::printEvent(EventMessage* message) {
#endif #endif
void EventManager::lockMutex() { void EventManager::lockMutex() {
mutex->lockMutex(MutexIF::NO_TIMEOUT); mutex->lockMutex(MutexIF::BLOCKING);
} }
void EventManager::unlockMutex() { void EventManager::unlockMutex() {

Some files were not shown because too many files have changed in this diff Show More