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

Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/master

Browse Source
This commit is contained in:
Robin Müller 2020-08-23 20:27:00 +02:00
commit 2f53a3fb1b
471 changed files with 39160 additions and 39069 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 "../action/ActionHelper.h"
#include <framework/action/HasActionsIF.h> #include "../action/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 "../action/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 "../action/ActionMessage.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/storagemanager/StorageManagerIF.h> #include "../storagemanager/StorageManagerIF.h"
ActionMessage::ActionMessage() { ActionMessage::ActionMessage() {
} }

6
action/ActionMessage.h
View File

@ -1,9 +1,9 @@
#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 {

10
action/CommandActionHelper.cpp
View File

@ -1,8 +1,8 @@
#include <framework/action/ActionMessage.h> #include "../action/ActionMessage.h"
#include <framework/action/CommandActionHelper.h> #include "../action/CommandActionHelper.h"
#include <framework/action/CommandsActionsIF.h> #include "../action/CommandsActionsIF.h"
#include <framework/action/HasActionsIF.h> #include "../action/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 "../action/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 "../action/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 "../action/ActionHelper.h"
#include <framework/action/ActionMessage.h> #include "../action/ActionMessage.h"
#include <framework/action/SimpleActionHelper.h> #include "../action/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 "../action/HasActionsIF.h"
#include <framework/action/SimpleActionHelper.h> #include "../action/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 "../action/ActionHelper.h"
class SimpleActionHelper: public ActionHelper { class SimpleActionHelper: public ActionHelper {
public: public:

6
container/ArrayList.h
View File

@ -1,9 +1,9 @@
#ifndef FRAMEWORK_CONTAINER_ARRAYLIST_H_ #ifndef FRAMEWORK_CONTAINER_ARRAYLIST_H_
#define FRAMEWORK_CONTAINER_ARRAYLIST_H_ #define FRAMEWORK_CONTAINER_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"
/** /**
* @brief A List that stores its values in an array. * @brief A List that stores its values in an array.

2
container/DynamicFIFO.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_CONTAINER_DYNAMICFIFO_H_ #ifndef FRAMEWORK_CONTAINER_DYNAMICFIFO_H_
#define FRAMEWORK_CONTAINER_DYNAMICFIFO_H_ #define FRAMEWORK_CONTAINER_DYNAMICFIFO_H_
#include <framework/container/FIFOBase.h> #include "../container/FIFOBase.h"
#include <vector> #include <vector>
/** /**

4
container/FIFO.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_CONTAINER_FIFO_H_ #ifndef FRAMEWORK_CONTAINER_FIFO_H_
#define FRAMEWORK_CONTAINER_FIFO_H_ #define FRAMEWORK_CONTAINER_FIFO_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/container/FIFOBase.h> #include "../container/FIFOBase.h"
#include <array> #include <array>
/** /**

4
container/FIFOBase.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_CONTAINER_FIFOBASE_H_ #ifndef FRAMEWORK_CONTAINER_FIFOBASE_H_
#define FRAMEWORK_CONTAINER_FIFOBASE_H_ #define FRAMEWORK_CONTAINER_FIFOBASE_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <cstddef> #include <cstddef>
#include <cstring> #include <cstring>
@ -60,6 +60,6 @@ protected:
size_t next(size_t current); size_t next(size_t current);
}; };
#include <framework/container/FIFOBase.tpp> #include "../container/FIFOBase.tpp"
#endif /* FRAMEWORK_CONTAINER_FIFOBASE_H_ */ #endif /* FRAMEWORK_CONTAINER_FIFOBASE_H_ */

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 "../container/ArrayList.h"
/** /**
* @brief Array List with a fixed maximum size * @brief Array List with a fixed maximum size

4
container/FixedMap.h
View File

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

4
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 "../container/ArrayList.h"
#include <cstring> #include <cstring>
#include <set> #include <set>
@ -166,6 +166,6 @@ private:
} }
}; };
#include <framework/container/FixedOrderedMultimap.tpp> #include "FixedOrderedMultimap.tpp"
#endif /* FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_ */ #endif /* FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_ */

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 "../container/ArrayList.h"
#include <framework/container/SinglyLinkedList.h> #include "../container/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 "../container/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>
/** /**

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 {

10
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"
#include <cstddef> #include <cstddef>
template<uint8_t N_READ_PTRS = 1> template<uint8_t N_READ_PTRS = 1>
@ -21,10 +21,10 @@ public:
return (availableWriteSpace(n) == 0); return (availableWriteSpace(n) == 0);
} }
bool isEmpty(uint8_t n = 0) { bool isEmpty(uint8_t n = 0) {
return (availableReadData(n) == 0); return (getAvailableReadData(n) == 0);
} }
size_t availableReadData(uint8_t n = 0) const { size_t getAvailableReadData(uint8_t n = 0) const {
return ((write + size) - read[n]) % size; return ((write + size) - read[n]) % size;
} }
size_t availableWriteSpace(uint8_t n = 0) const { size_t availableWriteSpace(uint8_t n = 0) const {
@ -36,7 +36,7 @@ public:
return overwriteOld; return overwriteOld;
} }
size_t maxSize() const { size_t getMaxSize() const {
return size - 1; return size - 1;
} }
@ -73,7 +73,7 @@ protected:
} }
ReturnValue_t readData(uint32_t amount, uint8_t n = 0) { ReturnValue_t readData(uint32_t amount, uint8_t n = 0) {
if (availableReadData(n) >= amount) { if (getAvailableReadData(n) >= amount) {
incrementRead(amount, n); incrementRead(amount, n);
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} else { } else {

6
container/SharedRingBuffer.cpp
View File

@ -1,6 +1,6 @@
#include <framework/container/SharedRingBuffer.h> #include "../container/SharedRingBuffer.h"
#include <framework/ipc/MutexFactory.h> #include "../ipc/MutexFactory.h"
#include <framework/ipc/MutexHelper.h> #include "../ipc/MutexHelper.h"
SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size, SharedRingBuffer::SharedRingBuffer(object_id_t objectId, const size_t size,
bool overwriteOld, size_t maxExcessBytes): bool overwriteOld, size_t maxExcessBytes):

8
container/SharedRingBuffer.h
View File

@ -1,10 +1,10 @@
#ifndef FRAMEWORK_CONTAINER_SHAREDRINGBUFFER_H_ #ifndef FRAMEWORK_CONTAINER_SHAREDRINGBUFFER_H_
#define FRAMEWORK_CONTAINER_SHAREDRINGBUFFER_H_ #define FRAMEWORK_CONTAINER_SHAREDRINGBUFFER_H_
#include <framework/container/SimpleRingBuffer.h> #include "../container/SimpleRingBuffer.h"
#include <framework/ipc/MutexIF.h> #include "../ipc/MutexIF.h"
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <framework/timemanager/Clock.h> #include "../timemanager/Clock.h"
/** /**
* @brief Ring buffer which can be shared among multiple objects * @brief Ring buffer which can be shared among multiple objects

16
container/SimpleRingBuffer.cpp
View File

@ -1,4 +1,4 @@
#include <framework/container/SimpleRingBuffer.h> #include "../container/SimpleRingBuffer.h"
#include <cstring> #include <cstring>
SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld, SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld,
@ -42,7 +42,6 @@ ReturnValue_t SimpleRingBuffer::getFreeElement(uint8_t **writePointer,
excessBytes = amount - amountTillWrap; excessBytes = amount - amountTillWrap;
} }
*writePointer = &buffer[write]; *writePointer = &buffer[write];
incrementWrite(amount);
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }
else { else {
@ -50,6 +49,14 @@ ReturnValue_t SimpleRingBuffer::getFreeElement(uint8_t **writePointer,
} }
} }
void SimpleRingBuffer::confirmBytesWritten(size_t amount) {
if(getExcessBytes() > 0) {
moveExcessBytesToStart();
}
incrementWrite(amount);
}
ReturnValue_t SimpleRingBuffer::writeData(const uint8_t* data, ReturnValue_t SimpleRingBuffer::writeData(const uint8_t* data,
size_t amount) { size_t amount) {
if (availableWriteSpace() >= amount or overwriteOld) { if (availableWriteSpace() >= amount or overwriteOld) {
@ -71,7 +78,7 @@ ReturnValue_t SimpleRingBuffer::writeData(const uint8_t* data,
ReturnValue_t SimpleRingBuffer::readData(uint8_t* data, size_t amount, ReturnValue_t SimpleRingBuffer::readData(uint8_t* data, size_t amount,
bool incrementReadPtr, bool readRemaining, size_t* trueAmount) { bool incrementReadPtr, bool readRemaining, size_t* trueAmount) {
size_t availableData = availableReadData(READ_PTR); size_t availableData = getAvailableReadData(READ_PTR);
size_t amountTillWrap = readTillWrap(READ_PTR); size_t amountTillWrap = readTillWrap(READ_PTR);
if (availableData < amount) { if (availableData < amount) {
if (readRemaining) { if (readRemaining) {
@ -110,7 +117,7 @@ void SimpleRingBuffer::moveExcessBytesToStart() {
ReturnValue_t SimpleRingBuffer::deleteData(size_t amount, ReturnValue_t SimpleRingBuffer::deleteData(size_t amount,
bool deleteRemaining, size_t* trueAmount) { bool deleteRemaining, size_t* trueAmount) {
size_t availableData = availableReadData(READ_PTR); size_t availableData = getAvailableReadData(READ_PTR);
if (availableData < amount) { if (availableData < amount) {
if (deleteRemaining) { if (deleteRemaining) {
amount = availableData; amount = availableData;
@ -125,3 +132,4 @@ ReturnValue_t SimpleRingBuffer::deleteData(size_t amount,
return HasReturnvaluesIF::RETURN_OK; return HasReturnvaluesIF::RETURN_OK;
} }

13
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 "../container/RingBufferBase.h"
#include <cstddef> #include <cstddef>
/** /**
@ -56,7 +56,8 @@ public:
/** /**
* Returns a pointer to a free element. If the remaining buffer is * Returns a pointer to a free element. If the remaining buffer is
* not large enough, the data will be written past the actual size * not large enough, the data will be written past the actual size
* and the amount of excess bytes will be cached. * and the amount of excess bytes will be cached. This function
* does not increment the write pointer!
* @param writePointer Pointer to a pointer which can be used to write * @param writePointer Pointer to a pointer which can be used to write
* contiguous blocks into the ring buffer * contiguous blocks into the ring buffer
* @param amount * @param amount
@ -64,6 +65,14 @@ public:
*/ */
ReturnValue_t getFreeElement(uint8_t** writePointer, size_t amount); ReturnValue_t getFreeElement(uint8_t** writePointer, size_t amount);
/**
* This increments the write pointer and also copies the excess bytes
* to the beginning. It should be called if the write operation
* conducted after calling getFreeElement() was performed.
* @return
*/
void confirmBytesWritten(size_t amount);
virtual size_t getExcessBytes() const; virtual size_t getExcessBytes() const;
/** /**
* Helper functions which moves any excess bytes to the start * Helper functions which moves any excess bytes to the start

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 "../controller/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 "../coordinates/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 "../coordinates/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 "../coordinates/CoordinateTransformations.h"
#include <framework/coordinates/Sgp4Propagator.h> #include "../coordinates/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 "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/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/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 "../datalinklayer/CCSDSReturnValuesIF.h"
#include <framework/datalinklayer/ClcwIF.h> #include "../datalinklayer/ClcwIF.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "../datalinklayer/TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReceptionIF.h> #include "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/ClcwIF.h"
#include <framework/datalinklayer/Farm1StateLockout.h> #include "../datalinklayer/Farm1StateLockout.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "../datalinklayer/TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/ClcwIF.h"
#include <framework/datalinklayer/Farm1StateOpen.h> #include "../datalinklayer/Farm1StateOpen.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "../datalinklayer/TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/ClcwIF.h"
#include <framework/datalinklayer/Farm1StateWait.h> #include "../datalinklayer/Farm1StateWait.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "../datalinklayer/TcTransferFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/CCSDSReturnValuesIF.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/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 "../datalinklayer/BCFrame.h"
#include <framework/datalinklayer/VirtualChannelReception.h> #include "../datalinklayer/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 "../datalinklayer/CCSDSReturnValuesIF.h"
#include <framework/datalinklayer/Clcw.h> #include "../datalinklayer/Clcw.h"
#include <framework/datalinklayer/Farm1StateIF.h> #include "../datalinklayer/Farm1StateIF.h"
#include <framework/datalinklayer/Farm1StateLockout.h> #include "../datalinklayer/Farm1StateLockout.h"
#include <framework/datalinklayer/Farm1StateOpen.h> #include "../datalinklayer/Farm1StateOpen.h"
#include <framework/datalinklayer/Farm1StateWait.h> #include "../datalinklayer/Farm1StateWait.h"
#include <framework/datalinklayer/MapPacketExtractionIF.h> #include "../datalinklayer/MapPacketExtractionIF.h"
#include <framework/datalinklayer/VirtualChannelReceptionIF.h> #include "../datalinklayer/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 "../datalinklayer/ClcwIF.h"
#include <framework/datalinklayer/TcTransferFrame.h> #include "../datalinklayer/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 "../datapool/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/datapoolglob/GlobalDataSet.h> #include "../datapoolglob/GlobalDataSet.h"
class ControllerSet :public GlobDataSet { class ControllerSet :public GlobDataSet {
public: public:

8
datapool/DataSetIF.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DATAPOOL_DATASETIF_H_ #ifndef DATASETIF_H_
#define FRAMEWORK_DATAPOOL_DATASETIF_H_ #define DATASETIF_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/timemanager/Clock.h> #include "../timemanager/Clock.h"
class PoolVariableIF; class PoolVariableIF;
/** /**

4
datapool/HkSwitchHelper.cpp
View File

@ -1,5 +1,5 @@
#include <framework/datapool/HkSwitchHelper.h> #include "../datapool/HkSwitchHelper.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

4
datapool/PoolDataSetBase.cpp
View File

@ -1,5 +1,5 @@
#include <framework/datapool/PoolDataSetBase.h> #include "PoolDataSetBase.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
PoolDataSetBase::PoolDataSetBase(PoolVariableIF** registeredVariablesArray, PoolDataSetBase::PoolDataSetBase(PoolVariableIF** registeredVariablesArray,
const size_t maxFillCount): const size_t maxFillCount):

11
datapool/PoolDataSetBase.h
View File

@ -1,9 +1,8 @@
#ifndef FRAMEWORK_DATAPOOL_POOLPOOLDATASETBASE_H_ #ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_
#define FRAMEWORK_DATAPOOL_POOLPOOLDATASETBASE_H_ #define FRAMEWORK_DATAPOOL_DATASETBASE_H_
#include <framework/datapool/DataSetIF.h> #include "../datapool/PoolDataSetIF.h"
#include <framework/datapool/PoolDataSetIF.h> #include "../datapool/PoolVariableIF.h"
#include <framework/datapool/PoolVariableIF.h> #include "../ipc/MutexIF.h"
#include <framework/ipc/MutexIF.h>
/** /**
* @brief The DataSetBase class manages a set of locally checked out variables. * @brief The DataSetBase class manages a set of locally checked out variables.

2
datapool/PoolDataSetIF.h
View File

@ -1,6 +1,6 @@
#ifndef FRAMEWORK_DATAPOOL_POOLDATASETIF_H_ #ifndef FRAMEWORK_DATAPOOL_POOLDATASETIF_H_
#define FRAMEWORK_DATAPOOL_POOLDATASETIF_H_ #define FRAMEWORK_DATAPOOL_POOLDATASETIF_H_
#include <framework/datapool/DataSetIF.h> #include "DataSetIF.h"
class PoolDataSetIF: public DataSetIF { class PoolDataSetIF: public DataSetIF {
public: public:

6
datapool/PoolEntry.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapool/PoolEntry.h> #include "../datapool/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 "../datapool/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>
/** /**

8
datapool/PoolRawAccessHelper.cpp
View File

@ -5,10 +5,10 @@
* @author R. Mueller * @author R. Mueller
*/ */
#include <framework/datapool/PoolRawAccessHelper.h> #include "../datapool/PoolRawAccessHelper.h"
#include <framework/datapoolglob/GlobalDataSet.h> #include "../datapoolglob/GlobalDataSet.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

6
datapool/PoolRawAccessHelper.h
View File

@ -7,9 +7,9 @@
#ifndef FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_ #ifndef FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
#define FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_ #define FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
#include <framework/returnvalues/HasReturnvaluesIF.h> #include "../returnvalues/HasReturnvaluesIF.h"
#include <framework/datapoolglob/GlobalDataSet.h> #include "../datapoolglob/GlobalDataSet.h"
#include <framework/datapoolglob/PoolRawAccess.h> #include "../datapoolglob/PoolRawAccess.h"
/** /**
* @brief This helper function simplifies accessing data pool entries * @brief This helper function simplifies accessing data pool entries

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/PoolVariableIF.h> #include "../datapool/PoolVariableIF.h"
#include <framework/datapoolglob/GlobalPoolVariable.h> #include "../datapoolglob/GlobalPoolVariable.h"
template <class T, uint8_t n_var> template <class T, uint8_t n_var>
class PoolVarList { class PoolVarList {
private: private:

4
datapool/PoolVariableIF.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_ #ifndef FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_
#define FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_ #define FRAMEWORK_DATAPOOL_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 data pool * @brief This interface is used to control data pool

3
datapool/SharedDataSetIF.h
View File

@ -1,7 +1,6 @@
#ifndef FRAMEWORK_DATAPOOL_SHAREDDATASETIF_H_ #ifndef FRAMEWORK_DATAPOOL_SHAREDDATASETIF_H_
#define FRAMEWORK_DATAPOOL_SHAREDDATASETIF_H_ #define FRAMEWORK_DATAPOOL_SHAREDDATASETIF_H_
#include <framework/datapool/DataSetIF.h> #include "PoolDataSetIF.h"
#include <framework/datapool/PoolDataSetIF.h>
class SharedDataSetIF: public PoolDataSetIF { class SharedDataSetIF: public PoolDataSetIF {
public: public:

14
datapoolglob/DataPoolAdmin.cpp
View File

@ -1,10 +1,10 @@
#include <framework/datapoolglob/DataPoolAdmin.h> #include "../datapoolglob/DataPoolAdmin.h"
#include <framework/datapoolglob/GlobalDataSet.h> #include "../datapoolglob/GlobalDataSet.h"
#include <framework/datapoolglob/GlobalDataPool.h> #include "../datapoolglob/GlobalDataPool.h"
#include <framework/datapoolglob/PoolRawAccess.h> #include "../datapoolglob/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
datapoolglob/DataPoolAdmin.h
View File

@ -1,16 +1,16 @@
#ifndef DATAPOOLADMIN_H_ #ifndef DATAPOOLADMIN_H_
#define DATAPOOLADMIN_H_ #define DATAPOOLADMIN_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/action/HasActionsIF.h> #include "../action/HasActionsIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MessageQueueIF.h"
#include <framework/parameters/ReceivesParameterMessagesIF.h> #include "../parameters/ReceivesParameterMessagesIF.h"
#include <framework/memory/MemoryHelper.h> #include "../memory/MemoryHelper.h"
#include <framework/action/SimpleActionHelper.h> #include "../action/SimpleActionHelper.h"
#include <framework/datapoolglob/DataPoolParameterWrapper.h> #include "../datapoolglob/DataPoolParameterWrapper.h"
class DataPoolAdmin: public HasActionsIF, class DataPoolAdmin: public HasActionsIF,
public ExecutableObjectIF, public ExecutableObjectIF,

8
datapoolglob/DataPoolParameterWrapper.cpp
View File

@ -1,7 +1,7 @@
#include <framework/datapoolglob/GlobalDataSet.h> #include "../datapoolglob/GlobalDataSet.h"
#include <framework/datapoolglob/DataPoolParameterWrapper.h> #include "../datapoolglob/DataPoolParameterWrapper.h"
#include <framework/datapoolglob/PoolRawAccess.h> #include "../datapoolglob/PoolRawAccess.h"
#include <framework/parameters/HasParametersIF.h> #include "../parameters/HasParametersIF.h"
DataPoolParameterWrapper::DataPoolParameterWrapper() : DataPoolParameterWrapper::DataPoolParameterWrapper() :

4
datapoolglob/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:

6
datapoolglob/GlobalDataPool.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapoolglob/GlobalDataPool.h> #include "../datapoolglob/GlobalDataPool.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/ipc/MutexFactory.h> #include "../ipc/MutexFactory.h"
GlobalDataPool::GlobalDataPool( GlobalDataPool::GlobalDataPool(
void(*initFunction)(GlobPoolMap* pool_map)) { void(*initFunction)(GlobPoolMap* pool_map)) {

6
datapoolglob/GlobalDataPool.h
View File

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

6
datapoolglob/GlobalDataSet.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapoolglob/GlobalDataPool.h> #include "../datapoolglob/GlobalDataPool.h"
#include <framework/datapoolglob/GlobalDataSet.h> #include "../datapoolglob/GlobalDataSet.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
GlobDataSet::GlobDataSet(): PoolDataSetBase( GlobDataSet::GlobDataSet(): PoolDataSetBase(
reinterpret_cast<PoolVariableIF**>(&registeredVariables), reinterpret_cast<PoolVariableIF**>(&registeredVariables),

2
datapoolglob/GlobalDataSet.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOLGLOB_DATASET_H_ #ifndef FRAMEWORK_DATAPOOLGLOB_DATASET_H_
#define FRAMEWORK_DATAPOOLGLOB_DATASET_H_ #define FRAMEWORK_DATAPOOLGLOB_DATASET_H_
#include <framework/datapool/PoolDataSetBase.h> #include "../datapool/PoolDataSetBase.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

14
datapoolglob/GlobalPoolVariable.h
View File

@ -1,12 +1,12 @@
#ifndef GLOBALPOOLVARIABLE_H_ #ifndef GLOBALPOOLVARIABLE_H_
#define GLOBALPOOLVARIABLE_H_ #define GLOBALPOOLVARIABLE_H_
#include <framework/datapool/DataSetIF.h> #include "../datapool/DataSetIF.h"
#include <framework/datapoolglob/GlobalDataPool.h> #include "../datapoolglob/GlobalDataPool.h"
#include <framework/datapool/PoolVariableIF.h> #include "../datapool/PoolVariableIF.h"
#include <framework/datapool/PoolEntry.h> #include "../datapool/PoolEntry.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;
@ -198,7 +198,7 @@ public:
} }
}; };
#include <framework/datapoolglob/GlobalPoolVariable.tpp> #include "../datapoolglob/GlobalPoolVariable.tpp"
typedef GlobPoolVar<uint8_t> gp_bool_t; typedef GlobPoolVar<uint8_t> gp_bool_t;
typedef GlobPoolVar<uint8_t> gp_uint8_t; typedef GlobPoolVar<uint8_t> gp_uint8_t;

12
datapoolglob/GlobalPoolVector.h
View File

@ -1,11 +1,11 @@
#ifndef GLOBALPOOLVECTOR_H_ #ifndef GLOBALPOOLVECTOR_H_
#define GLOBALPOOLVECTOR_H_ #define GLOBALPOOLVECTOR_H_
#include <framework/datapool/DataSetIF.h> #include "../datapool/DataSetIF.h"
#include <framework/datapool/PoolEntry.h> #include "../datapool/PoolEntry.h"
#include <framework/datapool/PoolVariableIF.h> #include "../datapool/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.
@ -177,7 +177,7 @@ private:
ReadWriteMode_t readWriteMode; ReadWriteMode_t readWriteMode;
}; };
#include <framework/datapoolglob/GlobalPoolVector.tpp> #include "../datapoolglob/GlobalPoolVector.tpp"
template<typename T, uint16_t vectorSize> template<typename T, uint16_t vectorSize>
using gp_vec_t = GlobPoolVector<T, vectorSize>; using gp_vec_t = GlobPoolVector<T, vectorSize>;

12
datapoolglob/PIDReader.h
View File

@ -1,11 +1,11 @@
#ifndef PIDREADER_H_ #ifndef PIDREADER_H_
#define PIDREADER_H_ #define PIDREADER_H_
#include <framework/datapool/DataSetIF.h> #include "../datapool/DataSetIF.h"
#include <framework/datapoolglob/GlobalDataPool.h> #include "../datapoolglob/GlobalDataPool.h"
#include <framework/datapool/PoolEntry.h> #include "../datapool/PoolEntry.h"
#include <framework/datapool/PoolVariableIF.h> #include "../datapool/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
datapoolglob/PIDReaderList.h
View File

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

8
datapoolglob/PoolRawAccess.cpp
View File

@ -1,7 +1,7 @@
#include <framework/datapoolglob/GlobalDataPool.h> #include "../datapoolglob/GlobalDataPool.h"
#include <framework/datapoolglob/PoolRawAccess.h> #include "../datapoolglob/PoolRawAccess.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
#include <framework/serialize/EndianConverter.h> #include "../serialize/EndianConverter.h"
#include <cstring> #include <cstring>

8
datapoolglob/PoolRawAccess.h
View File

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

6
datapoollocal/HasLocalDataPoolIF.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ #ifndef FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_
#define FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ #define FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_
#include <framework/datapool/PoolEntryIF.h> #include "../datapool/PoolEntryIF.h"
#include <framework/ipc/MessageQueueSenderIF.h> #include "../ipc/MessageQueueSenderIF.h"
#include <framework/housekeeping/HousekeepingMessage.h> #include "../housekeeping/HousekeepingMessage.h"
#include <map> #include <map>
class LocalDataPoolManager; class LocalDataPoolManager;

15
datapoollocal/LocalDataPoolManager.cpp
View File

@ -1,10 +1,9 @@
#include <framework/datapoollocal/LocalDataPoolManager.h> #include "../datapoollocal/LocalDataPoolManager.h"
#include <framework/datapoollocal/LocalPoolDataSetBase.h> #include "../datapoollocal/LocalDataSet.h"
#include <framework/housekeeping/AcceptsHkPacketsIF.h> #include "../housekeeping/AcceptsHkPacketsIF.h"
#include <framework/housekeeping/HousekeepingPacketDownlink.h> #include "../ipc/MutexFactory.h"
#include <framework/ipc/MutexFactory.h> #include "../ipc/MutexHelper.h"
#include <framework/ipc/MutexHelper.h> #include "../ipc/QueueFactory.h"
#include <framework/ipc/QueueFactory.h>
#include <array> #include <array>
#include <cmath> #include <cmath>
@ -264,7 +263,7 @@ void LocalDataPoolManager::performPeriodicHkGeneration(HkReceiver* receiver) {
uint32_t LocalDataPoolManager::intervalSecondsToInterval(bool isDiagnostics, uint32_t LocalDataPoolManager::intervalSecondsToInterval(bool isDiagnostics,
float collectionIntervalSeconds) { float collectionIntervalSeconds) {
if(isDiagnostics) { if(isDiagnostics) {
return std::ceil(collectionIntervalSeconds/diagnosticMinimumInterval); return std::ceil(collectionIntervalSeconds/diagnosticMinimumInterval);
} }
else { else {
return std::ceil(collectionIntervalSeconds/regularMinimumInterval); return std::ceil(collectionIntervalSeconds/regularMinimumInterval);

22
datapoollocal/LocalDataPoolManager.h
View File

@ -1,21 +1,21 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATAPOOLMANAGER_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATAPOOLMANAGER_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALDATAPOOLMANAGER_H_ #define FRAMEWORK_DATAPOOLLOCAL_LOCALDATAPOOLMANAGER_H_
#include <framework/datapool/DataSetIF.h> #include "../housekeeping/HousekeepingPacketDownlink.h"
#include <framework/objectmanager/SystemObjectIF.h> #include "../datapool/DataSetIF.h"
#include <framework/ipc/MutexIF.h> #include "../objectmanager/SystemObjectIF.h"
#include "../ipc/MutexIF.h"
#include <framework/housekeeping/HousekeepingMessage.h> #include "../housekeeping/HousekeepingMessage.h"
#include <framework/datapool/PoolEntry.h> #include "../datapool/PoolEntry.h"
#include <framework/datapoollocal/HasLocalDataPoolIF.h> #include "../datapoollocal/HasLocalDataPoolIF.h"
#include <framework/housekeeping/HousekeepingPacketDownlink.h> #include "../ipc/CommandMessage.h"
#include <framework/ipc/CommandMessage.h> #include "../ipc/MessageQueueIF.h"
#include <framework/ipc/MessageQueueIF.h> #include "../ipc/MutexHelper.h"
#include <framework/ipc/MutexHelper.h>
#include <map> #include <map>
class LocalPoolDataSetBase; class LocalDataSetBase;
/** /**
* @brief This class is the managing instance for local data pool. * @brief This class is the managing instance for local data pool.

6
datapoollocal/LocalDataSet.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapoollocal/LocalDataPoolManager.h> #include "LocalDataSet.h"
#include <framework/datapoollocal/LocalDataSet.h> #include "../datapoollocal/LocalDataPoolManager.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

2
datapoollocal/LocalDataSet.h
View File

@ -1,6 +1,6 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ #define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
#include <framework/datapoollocal/LocalPoolDataSetBase.h> #include "../datapoollocal/LocalPoolDataSetBase.h"
#include <vector> #include <vector>
class LocalDataSet: public LocalPoolDataSetBase { class LocalDataSet: public LocalPoolDataSetBase {

6
datapoollocal/LocalPoolDataSetBase.cpp
View File

@ -1,6 +1,6 @@
#include <framework/datapoollocal/LocalDataPoolManager.h> #include "LocalPoolDataSetBase.h"
#include <framework/datapoollocal/LocalPoolDataSetBase.h> #include "../datapoollocal/LocalDataPoolManager.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <cmath> #include <cmath>
#include <cstring> #include <cstring>

8
datapoollocal/LocalPoolDataSetBase.h
View File

@ -1,9 +1,9 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_ #define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLDATASETBASE_H_
#include <framework/datapool/DataSetIF.h> #include "../datapool/DataSetIF.h"
#include <framework/datapool/PoolDataSetBase.h> #include "../datapool/PoolDataSetBase.h"
#include <framework/datapoollocal/HasLocalDataPoolIF.h> #include "../datapoollocal/HasLocalDataPoolIF.h"
#include <framework/serialize/SerializeIF.h> #include "../serialize/SerializeIF.h"
#include <vector> #include <vector>

14
datapoollocal/LocalPoolVariable.h
View File

@ -1,13 +1,13 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_ #define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_
#include <framework/datapool/PoolVariableIF.h> #include "../datapool/PoolVariableIF.h"
#include <framework/datapool/DataSetIF.h> #include "../datapool/DataSetIF.h"
#include <framework/datapoollocal/HasLocalDataPoolIF.h> #include "../datapoollocal/HasLocalDataPoolIF.h"
#include <framework/datapoollocal/LocalDataPoolManager.h> #include "../datapoollocal/LocalDataPoolManager.h"
#include <framework/objectmanager/ObjectManagerIF.h> #include "../objectmanager/ObjectManagerIF.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
/** /**
* @brief Local Pool Variable class which is used to access the local pools. * @brief Local Pool Variable class which is used to access the local pools.
@ -155,7 +155,7 @@ private:
LocalDataPoolManager* hkManager; LocalDataPoolManager* hkManager;
}; };
#include <framework/datapoollocal/LocalPoolVariable.tpp> #include "LocalPoolVariable.tpp"
template<class T> template<class T>
using lp_var_t = LocalPoolVar<T>; using lp_var_t = LocalPoolVar<T>;

14
datapoollocal/LocalPoolVector.h
View File

@ -1,12 +1,12 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVECTOR_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVECTOR_H_
#define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVECTOR_H_ #define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVECTOR_H_
#include <framework/datapool/DataSetIF.h> #include "../datapool/DataSetIF.h"
#include <framework/datapool/PoolEntry.h> #include "../datapool/PoolEntry.h"
#include <framework/datapool/PoolVariableIF.h> #include "../datapool/PoolVariableIF.h"
#include <framework/datapoollocal/LocalDataPoolManager.h> #include "../datapoollocal/LocalDataPoolManager.h"
#include <framework/serialize/SerializeAdapter.h> #include "../serialize/SerializeAdapter.h"
#include <framework/serviceinterface/ServiceInterfaceStream.h> #include "../serviceinterface/ServiceInterfaceStream.h"
/** /**
@ -192,7 +192,7 @@ private:
}; };
#include <framework/datapoollocal/LocalPoolVector.tpp> #include "../datapoollocal/LocalPoolVector.tpp"
template<typename T, uint16_t vectorSize> template<typename T, uint16_t vectorSize>
using lp_vec_t = LocalPoolVector<T, vectorSize>; using lp_vec_t = LocalPoolVector<T, vectorSize>;

2
datapoollocal/SharedLocalDataSet.cpp
View File

@ -1,4 +1,4 @@
#include <framework/datapoollocal/SharedLocalDataSet.h> #include "SharedLocalDataSet.h"
SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId, object_id_t owner, SharedLocalDataSet::SharedLocalDataSet(object_id_t objectId, object_id_t owner,
const size_t maxSize): SystemObject(objectId), const size_t maxSize): SystemObject(objectId),

6
datapoollocal/SharedLocalDataSet.h
View File

@ -1,8 +1,8 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_ #define FRAMEWORK_DATAPOOLLOCAL_SHAREDLOCALDATASET_H_
#include <framework/datapool/SharedDataSetIF.h> #include "../datapool/SharedDataSetIF.h"
#include <framework/datapoollocal/LocalPoolDataSetBase.h> #include "../datapoollocal/LocalPoolDataSetBase.h"
#include <framework/objectmanager/SystemObject.h> #include "../objectmanager/SystemObject.h"
#include <vector> #include <vector>
/** /**

4
datapoollocal/StaticLocalDataSet.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_ #ifndef FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_
#define FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_ #define FRAMEWORK_DATAPOOLLOCAL_STATICLOCALDATASET_H_
#include <framework/datapoollocal/LocalPoolDataSetBase.h> #include "LocalPoolDataSetBase.h"
#include <framework/objectmanager/SystemObjectIF.h> #include "../objectmanager/SystemObjectIF.h"
#include <array> #include <array>
/** /**

2
devicehandlers/AcceptsDeviceResponsesIF.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_DEVICEHANDLERS_ACCEPTSDEVICERESPONSESIF_H_ #ifndef FRAMEWORK_DEVICEHANDLERS_ACCEPTSDEVICERESPONSESIF_H_
#define FRAMEWORK_DEVICEHANDLERS_ACCEPTSDEVICERESPONSESIF_H_ #define FRAMEWORK_DEVICEHANDLERS_ACCEPTSDEVICERESPONSESIF_H_
#include <framework/ipc/MessageQueueSenderIF.h> #include "../ipc/MessageQueueSenderIF.h"
/** /**
* This interface is used by the device handler to send a device response * This interface is used by the device handler to send a device response

2
devicehandlers/AssemblyBase.cpp
View File

@ -1,4 +1,4 @@
#include <framework/devicehandlers/AssemblyBase.h> #include "../devicehandlers/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 FRAMEWORK_DEVICEHANDLERS_ASSEMBLYBASE_H_ #ifndef FRAMEWORK_DEVICEHANDLERS_ASSEMBLYBASE_H_
#define FRAMEWORK_DEVICEHANDLERS_ASSEMBLYBASE_H_ #define FRAMEWORK_DEVICEHANDLERS_ASSEMBLYBASE_H_
#include <framework/container/FixedArrayList.h> #include "../container/FixedArrayList.h"
#include <framework/devicehandlers/DeviceHandlerBase.h> #include "../devicehandlers/DeviceHandlerBase.h"
#include <framework/subsystem/SubsystemBase.h> #include "../subsystem/SubsystemBase.h"
/** /**
* @brief Base class to implement reconfiguration and failure handling for * @brief Base class to implement reconfiguration and failure handling for

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 "../devicehandlers/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 * cookie, object_id_t deviceCommunication, CookieIF * cookie,

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