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

action/ActionHelper.cpp

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

action/ActionHelper.h

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

action/ActionMessage.cpp

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

action/ActionMessage.h

@@ -1,9 +1,9 @@
 #ifndef ACTIONMESSAGE_H_
 #define ACTIONMESSAGE_H_
 
-#include <framework/ipc/CommandMessage.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/storagemanager/StorageManagerIF.h>
+#include "../ipc/CommandMessage.h"
+#include "../objectmanager/ObjectManagerIF.h"
+#include "../storagemanager/StorageManagerIF.h"
 typedef uint32_t ActionId_t;
 
 class ActionMessage {

action/CommandActionHelper.cpp

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

action/CommandActionHelper.h

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

action/CommandsActionsIF.h

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

action/HasActionsIF.h

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

action/SimpleActionHelper.cpp

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

action/SimpleActionHelper.h

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

container/ArrayList.h

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

container/DynamicFIFO.h

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

container/FIFO.h

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

container/FIFOBase.h

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

container/FixedArrayList.h

@@ -1,7 +1,7 @@
 #ifndef FIXEDARRAYLIST_H_
 #define FIXEDARRAYLIST_H_
 
-#include <framework/container/ArrayList.h>
+#include "../container/ArrayList.h"
 
 /**
  * @brief 	Array List with a fixed maximum size

container/FixedMap.h

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

container/FixedOrderedMultimap.h

@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_
 #define FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_
 
-#include <framework/container/ArrayList.h>
+#include "../container/ArrayList.h"
 #include <cstring>
 #include <set>
 
@@ -166,6 +166,6 @@ private:
 	}
 };
 
-#include <framework/container/FixedOrderedMultimap.tpp>
+#include "FixedOrderedMultimap.tpp"
 
 #endif /* FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_ */

container/HybridIterator.h

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

container/IndexedRingMemoryArray.h

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

container/PlacementFactory.h

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

container/RingBufferBase.h

@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_CONTAINER_RINGBUFFERBASE_H_
 #define FRAMEWORK_CONTAINER_RINGBUFFERBASE_H_
 
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "../returnvalues/HasReturnvaluesIF.h"
 #include <cstddef>
 
 template<uint8_t N_READ_PTRS = 1>
@@ -21,10 +21,10 @@ public:
 		return (availableWriteSpace(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;
 	}
 	size_t availableWriteSpace(uint8_t n = 0) const  {
@@ -36,7 +36,7 @@ public:
 		return overwriteOld;
 	}
 
-	size_t maxSize() const {
+	size_t getMaxSize() const {
 		return size - 1;
 	}
 
@@ -73,7 +73,7 @@ protected:
 	}
 
 	ReturnValue_t readData(uint32_t amount, uint8_t n = 0) {
-		if (availableReadData(n) >= amount) {
+		if (getAvailableReadData(n) >= amount) {
 			incrementRead(amount, n);
 			return HasReturnvaluesIF::RETURN_OK;
 		} else {

container/SharedRingBuffer.cpp

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

container/SharedRingBuffer.h

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

container/SimpleRingBuffer.cpp

@@ -1,4 +1,4 @@
-#include <framework/container/SimpleRingBuffer.h>
+#include "../container/SimpleRingBuffer.h"
 #include <cstring>
 
 SimpleRingBuffer::SimpleRingBuffer(const size_t size, bool overwriteOld,
@@ -42,7 +42,6 @@ ReturnValue_t SimpleRingBuffer::getFreeElement(uint8_t **writePointer,
             excessBytes = amount - amountTillWrap;
         }
         *writePointer = &buffer[write];
-        incrementWrite(amount);
         return HasReturnvaluesIF::RETURN_OK;
     }
     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,
 		size_t amount) {
 	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,
 		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);
 	if (availableData < amount) {
 		if (readRemaining) {
@@ -110,7 +117,7 @@ void SimpleRingBuffer::moveExcessBytesToStart() {
 
 ReturnValue_t SimpleRingBuffer::deleteData(size_t amount,
 		bool deleteRemaining, size_t* trueAmount) {
-	size_t availableData = availableReadData(READ_PTR);
+	size_t availableData = getAvailableReadData(READ_PTR);
 	if (availableData < amount) {
 		if (deleteRemaining) {
 			amount = availableData;
@@ -125,3 +132,4 @@ ReturnValue_t SimpleRingBuffer::deleteData(size_t amount,
 	return HasReturnvaluesIF::RETURN_OK;
 }
 
+

container/SimpleRingBuffer.h

@@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_
 #define FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_
 
-#include <framework/container/RingBufferBase.h>
+#include "../container/RingBufferBase.h"
 #include <cstddef>
 
 /**
@@ -56,7 +56,8 @@ public:
 	/**
 	 * Returns a pointer to a free element. If the remaining buffer is
 	 * 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
 	 * contiguous blocks into the ring buffer
 	 * @param amount
@@ -64,6 +65,14 @@ public:
 	 */
 	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;
 	/**
 	 * Helper functions which moves any excess bytes to the start

controller/ControllerBase.cpp

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

controller/ControllerBase.h

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

coordinates/CoordinateTransformations.cpp

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

coordinates/CoordinateTransformations.h

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

coordinates/Jgm3Model.h

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

coordinates/Sgp4Propagator.cpp

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

coordinates/Sgp4Propagator.h

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

datalinklayer/BCFrame.h

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

datalinklayer/CCSDSReturnValuesIF.h

@@ -8,7 +8,7 @@
 #ifndef 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.
  * @ingroup ccsds_handling

datalinklayer/Clcw.cpp

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

datalinklayer/Clcw.h

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

datalinklayer/DataLinkLayer.cpp

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

datalinklayer/DataLinkLayer.h

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

datalinklayer/Farm1StateIF.h

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

datalinklayer/Farm1StateLockout.cpp

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

datalinklayer/Farm1StateLockout.h

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

datalinklayer/Farm1StateOpen.cpp

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

datalinklayer/Farm1StateOpen.h

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

datalinklayer/Farm1StateWait.cpp

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

datalinklayer/Farm1StateWait.h

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

datalinklayer/MapPacketExtraction.cpp

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

datalinklayer/MapPacketExtraction.h

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

datalinklayer/MapPacketExtractionIF.h

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

datalinklayer/TcTransferFrame.cpp

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

datalinklayer/TcTransferFrameLocal.cpp

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

datalinklayer/TcTransferFrameLocal.h

@@ -8,7 +8,7 @@
 #ifndef 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.

datalinklayer/VirtualChannelReception.cpp

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

datalinklayer/VirtualChannelReception.h

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

datalinklayer/VirtualChannelReceptionIF.h

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

datapool/ControllerSet.cpp

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

datapool/ControllerSet.h

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

datapool/DataSetIF.h

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

datapool/HkSwitchHelper.cpp

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

datapool/HkSwitchHelper.h

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

datapool/PoolDataSetBase.cpp

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

datapool/PoolDataSetBase.h

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

datapool/PoolDataSetIF.h

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

datapool/PoolEntry.cpp

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

datapool/PoolEntry.h

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

datapool/PoolEntryIF.h

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

datapool/PoolRawAccessHelper.cpp

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

datapool/PoolRawAccessHelper.h

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

datapool/PoolVarList.h

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

datapool/PoolVariableIF.h

@@ -1,8 +1,8 @@
 #ifndef FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_
 #define FRAMEWORK_DATAPOOL_POOLVARIABLEIF_H_
 
-#include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/serialize/SerializeIF.h>
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../serialize/SerializeIF.h"
 
 /**
  * @brief	This interface is used to control data pool

datapool/SharedDataSetIF.h

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

datapoolglob/DataPoolAdmin.cpp

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

datapoolglob/DataPoolAdmin.h

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

datapoolglob/DataPoolParameterWrapper.cpp

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

datapoolglob/DataPoolParameterWrapper.h

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

datapoolglob/GlobalDataPool.cpp

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

datapoolglob/GlobalDataPool.h

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

datapoolglob/GlobalDataSet.cpp

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

datapoolglob/GlobalDataSet.h

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

datapoolglob/GlobalPoolVariable.h

@@ -1,12 +1,12 @@
 #ifndef GLOBALPOOLVARIABLE_H_
 #define GLOBALPOOLVARIABLE_H_
 
-#include <framework/datapool/DataSetIF.h>
-#include <framework/datapoolglob/GlobalDataPool.h>
-#include <framework/datapool/PoolVariableIF.h>
-#include <framework/datapool/PoolEntry.h>
-#include <framework/serialize/SerializeAdapter.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../datapool/DataSetIF.h"
+#include "../datapoolglob/GlobalDataPool.h"
+#include "../datapool/PoolVariableIF.h"
+#include "../datapool/PoolEntry.h"
+#include "../serialize/SerializeAdapter.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
 
 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_uint8_t;

datapoolglob/GlobalPoolVector.h

@@ -1,11 +1,11 @@
 #ifndef GLOBALPOOLVECTOR_H_
 #define GLOBALPOOLVECTOR_H_
 
-#include <framework/datapool/DataSetIF.h>
-#include <framework/datapool/PoolEntry.h>
-#include <framework/datapool/PoolVariableIF.h>
-#include <framework/serialize/SerializeAdapter.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../datapool/DataSetIF.h"
+#include "../datapool/PoolEntry.h"
+#include "../datapool/PoolVariableIF.h"
+#include "../serialize/SerializeAdapter.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
 
 /**
  * @brief	This is the access class for array-type data pool entries.
@@ -177,7 +177,7 @@ private:
 	ReadWriteMode_t readWriteMode;
 };
 
-#include <framework/datapoolglob/GlobalPoolVector.tpp>
+#include "../datapoolglob/GlobalPoolVector.tpp"
 
 template<typename T, uint16_t vectorSize>
 using gp_vec_t = GlobPoolVector<T, vectorSize>;

datapoolglob/PIDReader.h

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

datapoolglob/PIDReaderList.h

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

datapoolglob/PoolRawAccess.cpp

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

datapoolglob/PoolRawAccess.h

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

datapoollocal/HasLocalDataPoolIF.h

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

datapoollocal/LocalDataPoolManager.cpp

@@ -1,10 +1,9 @@
-#include <framework/datapoollocal/LocalDataPoolManager.h>
-#include <framework/datapoollocal/LocalPoolDataSetBase.h>
-#include <framework/housekeeping/AcceptsHkPacketsIF.h>
-#include <framework/housekeeping/HousekeepingPacketDownlink.h>
-#include <framework/ipc/MutexFactory.h>
-#include <framework/ipc/MutexHelper.h>
-#include <framework/ipc/QueueFactory.h>
+#include "../datapoollocal/LocalDataPoolManager.h"
+#include "../datapoollocal/LocalDataSet.h"
+#include "../housekeeping/AcceptsHkPacketsIF.h"
+#include "../ipc/MutexFactory.h"
+#include "../ipc/MutexHelper.h"
+#include "../ipc/QueueFactory.h"
 
 #include <array>
 #include <cmath>

datapoollocal/LocalDataPoolManager.h

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

datapoollocal/LocalDataSet.cpp

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

datapoollocal/LocalDataSet.h

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

datapoollocal/LocalPoolDataSetBase.cpp

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

datapoollocal/LocalPoolDataSetBase.h

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

datapoollocal/LocalPoolVariable.h

@@ -1,13 +1,13 @@
 #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_
 #define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVARIABLE_H_
 
-#include <framework/datapool/PoolVariableIF.h>
-#include <framework/datapool/DataSetIF.h>
-#include <framework/datapoollocal/HasLocalDataPoolIF.h>
-#include <framework/datapoollocal/LocalDataPoolManager.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
+#include "../datapool/PoolVariableIF.h"
+#include "../datapool/DataSetIF.h"
+#include "../datapoollocal/HasLocalDataPoolIF.h"
+#include "../datapoollocal/LocalDataPoolManager.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.
@@ -155,7 +155,7 @@ private:
 	LocalDataPoolManager* hkManager;
 };
 
-#include <framework/datapoollocal/LocalPoolVariable.tpp>
+#include "LocalPoolVariable.tpp"
 
 template<class T>
 using lp_var_t = LocalPoolVar<T>;

datapoollocal/LocalPoolVector.h

@@ -1,12 +1,12 @@
 #ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVECTOR_H_
 #define FRAMEWORK_DATAPOOLLOCAL_LOCALPOOLVECTOR_H_
 
-#include <framework/datapool/DataSetIF.h>
-#include <framework/datapool/PoolEntry.h>
-#include <framework/datapool/PoolVariableIF.h>
-#include <framework/datapoollocal/LocalDataPoolManager.h>
-#include <framework/serialize/SerializeAdapter.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../datapool/DataSetIF.h"
+#include "../datapool/PoolEntry.h"
+#include "../datapool/PoolVariableIF.h"
+#include "../datapoollocal/LocalDataPoolManager.h"
+#include "../serialize/SerializeAdapter.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>
 using lp_vec_t = LocalPoolVector<T, vectorSize>;

datapoollocal/SharedLocalDataSet.cpp

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

datapoollocal/SharedLocalDataSet.h

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

datapoollocal/StaticLocalDataSet.h

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

devicehandlers/AcceptsDeviceResponsesIF.h

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

devicehandlers/AssemblyBase.cpp

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

devicehandlers/AssemblyBase.h

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

devicehandlers/ChildHandlerBase.cpp

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