Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR

2020-08-19 17:26:50 +02:00 · 2020-08-19 17:26:50 +02:00 · 5b4e49e966
commit 5b4e49e966
parent 6b4fa0cc04 49d4b6ebc7
386 changed files with 3147 additions and 1551 deletions
--- a/action/ActionHelper.cpp
+++ b/action/ActionHelper.cpp
@ -1,6 +1,6 @@
-#include <framework/action/ActionHelper.h>
-#include <framework/action/HasActionsIF.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
+#include "ActionHelper.h"
+#include "HasActionsIF.h"
+#include "../objectmanager/ObjectManagerIF.h"

 ActionHelper::ActionHelper(HasActionsIF* setOwner, MessageQueueIF* useThisQueue) :
 		owner(setOwner), queueToUse(useThisQueue), ipcStore(nullptr) {
--- a/action/ActionHelper.h
+++ b/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 "ActionMessage.h"
+#include "../serialize/SerializeIF.h"
+#include "../ipc/MessageQueueIF.h"
 /**
 * \brief Action Helper is a helper class which handles action messages
 *
--- a/action/ActionMessage.cpp
+++ b/action/ActionMessage.cpp
@ -1,6 +1,6 @@
-#include <framework/action/ActionMessage.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/storagemanager/StorageManagerIF.h>
+#include "ActionMessage.h"
+#include "../objectmanager/ObjectManagerIF.h"
+#include "../storagemanager/StorageManagerIF.h"

 ActionMessage::ActionMessage() {
 }
--- a/action/ActionMessage.h
+++ b/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 {
--- a/action/CommandActionHelper.cpp
+++ b/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 "ActionMessage.h"
+#include "CommandActionHelper.h"
+#include "CommandsActionsIF.h"
+#include "HasActionsIF.h"
+#include "../objectmanager/ObjectManagerIF.h"

 CommandActionHelper::CommandActionHelper(CommandsActionsIF *setOwner) :
 		owner(setOwner), queueToUse(NULL), ipcStore(
--- a/action/CommandActionHelper.h
+++ b/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 "ActionMessage.h"
+#include "../objectmanager/ObjectManagerIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../serialize/SerializeIF.h"
+#include "../storagemanager/StorageManagerIF.h"
+#include "../ipc/MessageQueueIF.h"

 class CommandsActionsIF;

--- a/action/CommandsActionsIF.h
+++ b/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 "CommandActionHelper.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../ipc/MessageQueueIF.h"

 /**
 * Interface to separate commanding actions of other objects.
--- a/action/HasActionsIF.h
+++ b/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 "ActionHelper.h"
+#include "ActionMessage.h"
+#include "SimpleActionHelper.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../ipc/MessageQueueIF.h"
 /**
 * @brief
 * Interface for component which uses actions
--- a/action/SimpleActionHelper.cpp
+++ b/action/SimpleActionHelper.cpp
@ -1,5 +1,5 @@
-#include <framework/action/HasActionsIF.h>
-#include <framework/action/SimpleActionHelper.h>
+#include "HasActionsIF.h"
+#include "SimpleActionHelper.h"
 SimpleActionHelper::SimpleActionHelper(HasActionsIF* setOwner,
 		MessageQueueIF* useThisQueue) :
 		ActionHelper(setOwner, useThisQueue), isExecuting(false), lastCommander(
--- a/action/SimpleActionHelper.h
+++ b/action/SimpleActionHelper.h
@ -1,7 +1,7 @@
 #ifndef SIMPLEACTIONHELPER_H_
 #define SIMPLEACTIONHELPER_H_

-#include <framework/action/ActionHelper.h>
+#include "ActionHelper.h"

 class SimpleActionHelper: public ActionHelper {
 public:
--- a/container/ArrayList.h
+++ b/container/ArrayList.h
@ -1,9 +1,9 @@
 #ifndef ARRAYLIST_H_
 #define 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"

 /**
 * A List that stores its values in an array.
--- a/container/FIFO.h
+++ b/container/FIFO.h
@ -1,7 +1,7 @@
 #ifndef FIFO_H_
 #define FIFO_H_

-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "../returnvalues/HasReturnvaluesIF.h"

 /**
 * @brief Simple First-In-First-Out data structure
--- a/container/FixedArrayList.h
+++ b/container/FixedArrayList.h
@ -1,7 +1,7 @@
 #ifndef FIXEDARRAYLIST_H_
 #define FIXEDARRAYLIST_H_

-#include <framework/container/ArrayList.h>
+#include "ArrayList.h"
 /**
 * \ingroup container
 */
--- a/container/FixedMap.h
+++ b/container/FixedMap.h
@ -1,8 +1,8 @@
 #ifndef FIXEDMAP_H_
 #define FIXEDMAP_H_

-#include <framework/container/ArrayList.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "ArrayList.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
 #include <utility>

 /**
--- a/container/FixedOrderedMultimap.h
+++ b/container/FixedOrderedMultimap.h
@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_
 #define FRAMEWORK_CONTAINER_FIXEDORDEREDMULTIMAP_H_

-#include <framework/container/ArrayList.h>
+#include "ArrayList.h"
 #include <cstring>
 #include <set>
 /**
--- a/container/HybridIterator.h
+++ b/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 "ArrayList.h"
+#include "SinglyLinkedList.h"

 template<typename T, typename count_t = uint8_t>
 class HybridIterator: public LinkedElement<T>::Iterator,
--- a/container/IndexedRingMemoryArray.h
+++ b/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 "ArrayList.h"
+#include "../globalfunctions/CRC.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../serialize/SerialArrayListAdapter.h"
 #include <cmath>

 template<typename T>
--- a/container/PlacementFactory.h
+++ b/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 {
--- a/container/RingBufferBase.h
+++ b/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"

 template<uint8_t N_READ_PTRS = 1>
 class RingBufferBase {
--- a/container/SimpleRingBuffer.cpp
+++ b/container/SimpleRingBuffer.cpp
@ -1,4 +1,4 @@
-#include <framework/container/SimpleRingBuffer.h>
+#include "SimpleRingBuffer.h"
 #include <string.h>

 SimpleRingBuffer::SimpleRingBuffer(uint32_t size, bool overwriteOld) :
--- a/container/SimpleRingBuffer.h
+++ b/container/SimpleRingBuffer.h
@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_
 #define FRAMEWORK_CONTAINER_SIMPLERINGBUFFER_H_

-#include <framework/container/RingBufferBase.h>
+#include "RingBufferBase.h"
 #include <stddef.h>

 class SimpleRingBuffer: public RingBufferBase<> {
--- a/controller/ControllerBase.cpp
+++ b/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 "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) :
--- a/controller/ControllerBase.h
+++ b/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,
--- a/coordinates/CoordinateTransformations.cpp
+++ b/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 "CoordinateTransformations.h"
+#include "../globalfunctions/constants.h"
+#include "../globalfunctions/math/MatrixOperations.h"
+#include "../globalfunctions/math/VectorOperations.h"
 #include <stddef.h>
 #include <cmath>

--- a/coordinates/CoordinateTransformations.h
+++ b/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 {
--- a/coordinates/Jgm3Model.h
+++ b/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 "CoordinateTransformations.h"
+#include "../globalfunctions/math/VectorOperations.h"
+#include "../globalfunctions/timevalOperations.h"
+#include "../globalfunctions/constants.h"
 #include <memory.h>


--- a/coordinates/Sgp4Propagator.cpp
+++ b/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 "CoordinateTransformations.h"
+#include "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) {
--- a/coordinates/Sgp4Propagator.h
+++ b/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:
--- a/datalinklayer/BCFrame.h
+++ b/datalinklayer/BCFrame.h
@ -8,7 +8,7 @@
 #ifndef BCFRAME_H_
 #define BCFRAME_H_

-#include <framework/datalinklayer/CCSDSReturnValuesIF.h>
+#include "CCSDSReturnValuesIF.h"

 /**
 * Small helper class to identify a BcFrame.
--- a/datalinklayer/CCSDSReturnValuesIF.h
+++ b/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
--- a/datalinklayer/Clcw.cpp
+++ b/datalinklayer/Clcw.cpp
@ -7,8 +7,8 @@



-#include <framework/datalinklayer/Clcw.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "Clcw.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 Clcw::Clcw() {
 	content.raw = 0;
--- a/datalinklayer/Clcw.h
+++ b/datalinklayer/Clcw.h
@ -8,7 +8,7 @@
 #ifndef CLCW_H_
 #define CLCW_H_

-#include <framework/datalinklayer/ClcwIF.h>
+#include "ClcwIF.h"
 /**
 * Small helper method to handle the Clcw values.
 * It has a content struct that manages the register and can be set externally.
--- a/datalinklayer/DataLinkLayer.cpp
+++ b/datalinklayer/DataLinkLayer.cpp
@ -1,6 +1,6 @@
-#include <framework/datalinklayer/DataLinkLayer.h>
-#include <framework/globalfunctions/CRC.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "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) :
--- a/datalinklayer/DataLinkLayer.h
+++ b/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 "CCSDSReturnValuesIF.h"
+#include "ClcwIF.h"
+#include "TcTransferFrame.h"
+#include "VirtualChannelReceptionIF.h"
+#include "../events/Event.h"
 #include <map>


--- a/datalinklayer/Farm1StateIF.h
+++ b/datalinklayer/Farm1StateIF.h
@ -8,7 +8,7 @@
 #ifndef FARM1STATEIF_H_
 #define FARM1STATEIF_H_

-#include <framework/datalinklayer/CCSDSReturnValuesIF.h>
+#include "CCSDSReturnValuesIF.h"
 class VirtualChannelReception;
 class TcTransferFrame;
 class ClcwIF;
--- a/datalinklayer/Farm1StateLockout.cpp
+++ b/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 "ClcwIF.h"
+#include "Farm1StateLockout.h"
+#include "TcTransferFrame.h"
+#include "VirtualChannelReception.h"
 Farm1StateLockout::Farm1StateLockout(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
 }

--- a/datalinklayer/Farm1StateLockout.h
+++ b/datalinklayer/Farm1StateLockout.h
@ -8,7 +8,7 @@
 #ifndef FARM1STATELOCKOUT_H_
 #define FARM1STATELOCKOUT_H_

-#include <framework/datalinklayer/Farm1StateIF.h>
+#include "Farm1StateIF.h"

 /**
 * This class represents the FARM-1 "Lockout" State.
--- a/datalinklayer/Farm1StateOpen.cpp
+++ b/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 "ClcwIF.h"
+#include "Farm1StateOpen.h"
+#include "TcTransferFrame.h"
+#include "VirtualChannelReception.h"

 Farm1StateOpen::Farm1StateOpen(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
 }
--- a/datalinklayer/Farm1StateOpen.h
+++ b/datalinklayer/Farm1StateOpen.h
@ -8,7 +8,7 @@
 #ifndef FARM1STATEOPEN_H_
 #define FARM1STATEOPEN_H_

-#include <framework/datalinklayer/Farm1StateIF.h>
+#include "Farm1StateIF.h"

 /**
 * This class represents the FARM-1 "Open" State.
--- a/datalinklayer/Farm1StateWait.cpp
+++ b/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 "ClcwIF.h"
+#include "Farm1StateWait.h"
+#include "TcTransferFrame.h"
+#include "VirtualChannelReception.h"

 Farm1StateWait::Farm1StateWait(VirtualChannelReception* setMyVC) : myVC(setMyVC) {
 }
--- a/datalinklayer/Farm1StateWait.h
+++ b/datalinklayer/Farm1StateWait.h
@ -8,7 +8,7 @@
 #ifndef FARM1STATEWAIT_H_
 #define FARM1STATEWAIT_H_

-#include <framework/datalinklayer/Farm1StateIF.h>
+#include "Farm1StateIF.h"

 /**
 * This class represents the FARM-1 "Wait" State.
--- a/datalinklayer/MapPacketExtraction.cpp
+++ b/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 "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,
--- a/datalinklayer/MapPacketExtraction.h
+++ b/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 "MapPacketExtractionIF.h"
+#include "../objectmanager/ObjectManagerIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../ipc/MessageQueueSenderIF.h"

 class StorageManagerIF;

--- a/datalinklayer/MapPacketExtractionIF.h
+++ b/datalinklayer/MapPacketExtractionIF.h
@ -8,8 +8,8 @@
 #ifndef MAPPACKETEXTRACTIONIF_H_
 #define MAPPACKETEXTRACTIONIF_H_

-#include <framework/datalinklayer/CCSDSReturnValuesIF.h>
-#include <framework/datalinklayer/TcTransferFrame.h>
+#include "CCSDSReturnValuesIF.h"
+#include "TcTransferFrame.h"

 /**
 * This is the interface for MAP Packet Extraction classes.
--- a/datalinklayer/TcTransferFrame.cpp
+++ b/datalinklayer/TcTransferFrame.cpp
@ -7,8 +7,8 @@



-#include <framework/datalinklayer/TcTransferFrame.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "TcTransferFrame.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 TcTransferFrame::TcTransferFrame() {
 	 frame = NULL;
--- a/datalinklayer/TcTransferFrameLocal.cpp
+++ b/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 "TcTransferFrameLocal.h"
+#include "../globalfunctions/CRC.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
 #include <string.h>

 TcTransferFrameLocal::TcTransferFrameLocal(bool bypass, bool controlCommand, uint16_t scid,
--- a/datalinklayer/TcTransferFrameLocal.h
+++ b/datalinklayer/TcTransferFrameLocal.h
@ -8,7 +8,7 @@
 #ifndef TCTRANSFERFRAMELOCAL_H_
 #define TCTRANSFERFRAMELOCAL_H_

-#include <framework/datalinklayer/TcTransferFrame.h>
+#include "TcTransferFrame.h"

 /**
 * This is a helper class to locally create TC Transfer Frames.
--- a/datalinklayer/VirtualChannelReception.cpp
+++ b/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 "BCFrame.h"
+#include "VirtualChannelReception.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 VirtualChannelReception::VirtualChannelReception(uint8_t setChannelId,
 		uint8_t setSlidingWindowWidth) :
--- a/datalinklayer/VirtualChannelReception.h
+++ b/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 "CCSDSReturnValuesIF.h"
+#include "Clcw.h"
+#include "Farm1StateIF.h"
+#include "Farm1StateLockout.h"
+#include "Farm1StateOpen.h"
+#include "Farm1StateWait.h"
+#include "MapPacketExtractionIF.h"
+#include "VirtualChannelReceptionIF.h"
 #include <map>
 /**
 * Implementation of a TC Virtual Channel.
--- a/datalinklayer/VirtualChannelReceptionIF.h
+++ b/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 "ClcwIF.h"
+#include "TcTransferFrame.h"
+#include "../returnvalues/HasReturnvaluesIF.h"

 /**
 * This is the interface for Virtual Channel reception classes.
--- a/datapool/ControllerSet.cpp
+++ b/datapool/ControllerSet.cpp
@ -1,4 +1,4 @@
-#include <framework/datapool/ControllerSet.h>
+#include "ControllerSet.h"

 ControllerSet::ControllerSet() {

--- a/datapool/ControllerSet.h
+++ b/datapool/ControllerSet.h
@ -1,7 +1,7 @@
 #ifndef CONTROLLERSET_H_
 #define CONTROLLERSET_H_

-#include <framework/datapool/DataSet.h>
+#include "DataSet.h"

 class ControllerSet :public DataSet {
 public:
--- a/datapool/DataPool.cpp
+++ b/datapool/DataPool.cpp
@ -1,6 +1,6 @@
-#include <framework/datapool/DataPool.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/ipc/MutexFactory.h>
+#include "DataPool.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../ipc/MutexFactory.h"

 DataPool::DataPool( void ( *initFunction )( std::map<uint32_t, PoolEntryIF*>* pool_map ) ) {
 	mutex = MutexFactory::instance()->createMutex();
--- a/datapool/DataPool.h
+++ b/datapool/DataPool.h
@ -11,9 +11,9 @@
 #ifndef DATAPOOL_H_
 #define DATAPOOL_H_

-#include <framework/datapool/PoolEntry.h>
-#include <framework/globalfunctions/Type.h>
-#include <framework/ipc/MutexIF.h>
+#include "PoolEntry.h"
+#include "../globalfunctions/Type.h"
+#include "../ipc/MutexIF.h"
 #include <map>

 /**
--- a/datapool/DataPoolAdmin.cpp
+++ b/datapool/DataPoolAdmin.cpp
@ -1,10 +1,10 @@
-#include <framework/datapool/DataPool.h>
-#include <framework/datapool/DataPoolAdmin.h>
-#include <framework/datapool/DataSet.h>
-#include <framework/datapool/PoolRawAccess.h>
-#include <framework/ipc/CommandMessage.h>
-#include <framework/ipc/QueueFactory.h>
-#include <framework/parameters/ParameterMessage.h>
+#include "DataPool.h"
+#include "DataPoolAdmin.h"
+#include "DataSet.h"
+#include "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(
--- a/datapool/DataPoolAdmin.h
+++ b/datapool/DataPoolAdmin.h
@ -1,15 +1,15 @@
 #ifndef DATAPOOLADMIN_H_
 #define DATAPOOLADMIN_H_

-#include <framework/memory/MemoryHelper.h>
-#include <framework/action/HasActionsIF.h>
-#include <framework/action/SimpleActionHelper.h>
-#include <framework/objectmanager/SystemObject.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/parameters/ReceivesParameterMessagesIF.h>
-#include <framework/datapool/DataPoolParameterWrapper.h>
-#include <framework/ipc/MessageQueueIF.h>
+#include "../memory/MemoryHelper.h"
+#include "../action/HasActionsIF.h"
+#include "../action/SimpleActionHelper.h"
+#include "../objectmanager/SystemObject.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../tasks/ExecutableObjectIF.h"
+#include "../parameters/ReceivesParameterMessagesIF.h"
+#include "DataPoolParameterWrapper.h"
+#include "../ipc/MessageQueueIF.h"

 class DataPoolAdmin: public HasActionsIF,
 		public ExecutableObjectIF,
--- a/datapool/DataPoolParameterWrapper.cpp
+++ b/datapool/DataPoolParameterWrapper.cpp
@ -1,10 +1,10 @@
 #include "DataPoolParameterWrapper.h"

 //for returncodes
-#include <framework/parameters/HasParametersIF.h>
+#include "../parameters/HasParametersIF.h"

-#include <framework/datapool/DataSet.h>
-#include <framework/datapool/PoolRawAccess.h>
+#include "DataSet.h"
+#include "PoolRawAccess.h"

 DataPoolParameterWrapper::DataPoolParameterWrapper() :
 		type(Type::UNKNOWN_TYPE), rows(0), columns(0), poolId(
--- a/datapool/DataPoolParameterWrapper.h
+++ b/datapool/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:
--- a/datapool/DataSet.cpp
+++ b/datapool/DataSet.cpp
@ -1,5 +1,5 @@
-#include <framework/datapool/DataSet.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "DataSet.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 DataSet::DataSet() :
 		fill_count(0), state(DATA_SET_UNINITIALISED) {
--- a/datapool/DataSet.h
+++ b/datapool/DataSet.h
@ -12,13 +12,13 @@
 #ifndef DATASET_H_
 #define DATASET_H_

-#include <framework/datapool/DataPool.h>
-#include <framework/datapool/DataSetIF.h>
-#include <framework/datapool/PoolRawAccess.h>
-#include <framework/datapool/PoolVariable.h>
-#include <framework/datapool/PoolVarList.h>
-#include <framework/datapool/PoolVector.h>
-#include <framework/serialize/SerializeAdapter.h>
+#include "DataPool.h"
+#include "DataSetIF.h"
+#include "PoolRawAccess.h"
+#include "PoolVariable.h"
+#include "PoolVarList.h"
+#include "PoolVector.h"
+#include "../serialize/SerializeAdapter.h"
 /**
 * \brief	The DataSet class manages a set of locally checked out variables.
 *
--- a/datapool/HkSwitchHelper.cpp
+++ b/datapool/HkSwitchHelper.cpp
@ -1,6 +1,6 @@
-#include <framework/datapool/HkSwitchHelper.h>
+#include "HkSwitchHelper.h"
 //#include <mission/tmtcservices/HKService_03.h>
-#include <framework/ipc/QueueFactory.h>
+#include "../ipc/QueueFactory.h"

 HkSwitchHelper::HkSwitchHelper(EventReportingProxyIF* eventProxy) :
 		commandActionHelper(this), eventProxy(eventProxy) {
--- a/datapool/HkSwitchHelper.h
+++ b/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
--- a/datapool/PIDReader.h
+++ b/datapool/PIDReader.h
@ -1,11 +1,11 @@
 #ifndef PIDREADER_H_
 #define PIDREADER_H_
-#include <framework/datapool/DataPool.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.h"
+#include "DataSetIF.h"
+#include "PoolEntry.h"
+#include "PoolVariableIF.h"
+#include "../serialize/SerializeAdapter.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 template<typename U, uint8_t n_var> class PIDReaderList;

--- a/datapool/PIDReaderList.h
+++ b/datapool/PIDReaderList.h
@ -1,8 +1,8 @@
 #ifndef FRAMEWORK_DATAPOOL_PIDREADERLIST_H_
 #define FRAMEWORK_DATAPOOL_PIDREADERLIST_H_

-#include <framework/datapool/PIDReader.h>
-#include <framework/datapool/PoolVariableIF.h>
+#include "PIDReader.h"
+#include "PoolVariableIF.h"
 template <class T, uint8_t n_var>
 class PIDReaderList {
 private:
--- a/datapool/PoolEntry.cpp
+++ b/datapool/PoolEntry.cpp
@ -1,6 +1,6 @@
-#include <framework/datapool/PoolEntry.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/globalfunctions/arrayprinter.h>
+#include "PoolEntry.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../globalfunctions/arrayprinter.h"
 #include <cstring>

 template <typename T>
--- a/datapool/PoolEntry.h
+++ b/datapool/PoolEntry.h
@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_DATAPOOL_POOLENTRY_H_
 #define FRAMEWORK_DATAPOOL_POOLENTRY_H_

-#include <framework/datapool/PoolEntryIF.h>
+#include "PoolEntryIF.h"

 #include <initializer_list>
 #include <type_traits>
--- a/datapool/PoolEntryIF.h
+++ b/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>

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

 #include <cstring>

--- a/datapool/PoolRawAccess.h
+++ b/datapool/PoolRawAccess.h
@ -1,8 +1,8 @@
 #ifndef POOLRAWACCESS_H_
 #define POOLRAWACCESS_H_

-#include <framework/datapool/DataSetIF.h>
-#include <framework/datapool/PoolVariableIF.h>
+#include "DataSetIF.h"
+#include "PoolVariableIF.h"

 /**
 * This class allows accessing Data Pool variables as raw bytes.
--- a/datapool/PoolVarList.h
+++ b/datapool/PoolVarList.h
@ -1,8 +1,8 @@
 #ifndef POOLVARLIST_H_
 #define POOLVARLIST_H_

-#include <framework/datapool/PoolVariable.h>
-#include <framework/datapool/PoolVariableIF.h>
+#include "PoolVariable.h"
+#include "PoolVariableIF.h"
 template <class T, uint8_t n_var>
 class PoolVarList {
 private:
--- a/datapool/PoolVariable.h
+++ b/datapool/PoolVariable.h
@ -11,11 +11,11 @@
 #ifndef POOLVARIABLE_H_
 #define POOLVARIABLE_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 "DataSetIF.h"
+#include "PoolEntry.h"
+#include "PoolVariableIF.h"
+#include "../serialize/SerializeAdapter.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 template<typename T, uint8_t n_var> class PoolVarList;

--- a/datapool/PoolVariableIF.h
+++ b/datapool/PoolVariableIF.h
@ -11,8 +11,8 @@
 #ifndef POOLVARIABLEIF_H_
 #define 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 local data pool variable representations.
--- a/datapool/PoolVector.h
+++ b/datapool/PoolVector.h
@ -11,11 +11,11 @@
 #ifndef POOLVECTOR_H_
 #define POOLVECTOR_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 "DataSetIF.h"
+#include "PoolEntry.h"
+#include "PoolVariableIF.h"
+#include "../serialize/SerializeAdapter.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 /**
 * \brief	This is the access class for array-type data pool entries.
--- a/devicehandlers/AcceptsDeviceResponsesIF.h
+++ b/devicehandlers/AcceptsDeviceResponsesIF.h
@ -8,7 +8,7 @@
 #ifndef ACCEPTSDEVICERESPONSESIF_H_
 #define ACCEPTSDEVICERESPONSESIF_H_

-#include <framework/ipc/MessageQueueSenderIF.h>
+#include "../ipc/MessageQueueSenderIF.h"

 class AcceptsDeviceResponsesIF {
 public:
--- a/devicehandlers/AssemblyBase.cpp
+++ b/devicehandlers/AssemblyBase.cpp
@ -1,4 +1,4 @@
-#include <framework/devicehandlers/AssemblyBase.h>
+#include "AssemblyBase.h"

 AssemblyBase::AssemblyBase(object_id_t objectId, object_id_t parentId,
 		uint16_t commandQueueDepth) :
--- a/devicehandlers/AssemblyBase.h
+++ b/devicehandlers/AssemblyBase.h
@ -1,9 +1,9 @@
 #ifndef ASSEMBLYBASE_H_
 #define ASSEMBLYBASE_H_

-#include <framework/container/FixedArrayList.h>
-#include <framework/devicehandlers/DeviceHandlerBase.h>
-#include <framework/subsystem/SubsystemBase.h>
+#include "../container/FixedArrayList.h"
+#include "DeviceHandlerBase.h"
+#include "../subsystem/SubsystemBase.h"

 class AssemblyBase: public SubsystemBase {
 public:
--- a/devicehandlers/ChildHandlerBase.cpp
+++ b/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 "ChildHandlerBase.h"
+#include "../subsystem/SubsystemBase.h"

 ChildHandlerBase::ChildHandlerBase(object_id_t setObjectId,
 		object_id_t deviceCommunication, CookieIF * comCookie,
--- a/devicehandlers/ChildHandlerBase.h
+++ b/devicehandlers/ChildHandlerBase.h
@ -1,8 +1,8 @@
 #ifndef PAYLOADHANDLERBASE_H_
 #define PAYLOADHANDLERBASE_H_

-#include <framework/devicehandlers/ChildHandlerFDIR.h>
-#include <framework/devicehandlers/DeviceHandlerBase.h>
+#include "ChildHandlerFDIR.h"
+#include "DeviceHandlerBase.h"

 class ChildHandlerBase: public DeviceHandlerBase {
 public:
--- a/devicehandlers/ChildHandlerFDIR.cpp
+++ b/devicehandlers/ChildHandlerFDIR.cpp
@ -1,4 +1,4 @@
-#include <framework/devicehandlers/ChildHandlerFDIR.h>
+#include "ChildHandlerFDIR.h"

 ChildHandlerFDIR::ChildHandlerFDIR(object_id_t owner, object_id_t faultTreeParent, uint32_t recoveryCount) :
 		DeviceHandlerFailureIsolation(owner, faultTreeParent) {
--- a/devicehandlers/ChildHandlerFDIR.h
+++ b/devicehandlers/ChildHandlerFDIR.h
@ -1,7 +1,7 @@
 #ifndef FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_
 #define FRAMEWORK_DEVICEHANDLERS_CHILDHANDLERFDIR_H_

-#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
+#include "DeviceHandlerFailureIsolation.h"

 /**
 * Very simple extension to normal FDIR.
--- a/devicehandlers/DeviceCommunicationIF.h
+++ b/devicehandlers/DeviceCommunicationIF.h
@ -1,8 +1,8 @@
 #ifndef DEVICECOMMUNICATIONIF_H_
 #define DEVICECOMMUNICATIONIF_H_

-#include <framework/devicehandlers/CookieIF.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
+#include "CookieIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
 #include <cstddef>
 /**
 * @defgroup interfaces Interfaces
--- a/devicehandlers/DeviceHandlerBase.cpp
+++ b/devicehandlers/DeviceHandlerBase.cpp
@ -1,16 +1,16 @@
-#include <framework/devicehandlers/DeviceHandlerBase.h>
-#include <framework/objectmanager/ObjectManager.h>
-#include <framework/storagemanager/StorageManagerIF.h>
-#include <framework/thermal/ThermalComponentIF.h>
-#include <framework/devicehandlers/AcceptsDeviceResponsesIF.h>
+#include "DeviceHandlerBase.h"
+#include "../objectmanager/ObjectManager.h"
+#include "../storagemanager/StorageManagerIF.h"
+#include "../thermal/ThermalComponentIF.h"
+#include "AcceptsDeviceResponsesIF.h"

-#include <framework/datapool/DataSet.h>
-#include <framework/datapool/PoolVariable.h>
-#include <framework/devicehandlers/DeviceTmReportingWrapper.h>
-#include <framework/globalfunctions/CRC.h>
-#include <framework/subsystem/SubsystemBase.h>
-#include <framework/ipc/QueueFactory.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "../datapool/DataSet.h"
+#include "../datapool/PoolVariable.h"
+#include "DeviceTmReportingWrapper.h"
+#include "../globalfunctions/CRC.h"
+#include "../subsystem/SubsystemBase.h"
+#include "../ipc/QueueFactory.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 #include <iomanip>

--- a/devicehandlers/DeviceHandlerBase.h
+++ b/devicehandlers/DeviceHandlerBase.h
@ -1,22 +1,22 @@
 #ifndef DEVICEHANDLERBASE_H_
 #define DEVICEHANDLERBASE_H_

-#include <framework/objectmanager/SystemObject.h>
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/devicehandlers/DeviceHandlerIF.h>
-#include <framework/returnvalues/HasReturnvaluesIF.h>
-#include <framework/action/HasActionsIF.h>
-#include <framework/datapool/PoolVariableIF.h>
-#include <framework/devicehandlers/DeviceCommunicationIF.h>
-#include <framework/modes/HasModesIF.h>
-#include <framework/power/PowerSwitchIF.h>
-#include <framework/ipc/MessageQueueIF.h>
+#include "../objectmanager/SystemObject.h"
+#include "../tasks/ExecutableObjectIF.h"
+#include "DeviceHandlerIF.h"
+#include "../returnvalues/HasReturnvaluesIF.h"
+#include "../action/HasActionsIF.h"
+#include "../datapool/PoolVariableIF.h"
+#include "DeviceCommunicationIF.h"
+#include "../modes/HasModesIF.h"
+#include "../power/PowerSwitchIF.h"
+#include "../ipc/MessageQueueIF.h"

-#include <framework/action/ActionHelper.h>
-#include <framework/health/HealthHelper.h>
-#include <framework/parameters/ParameterHelper.h>
-#include <framework/datapool/HkSwitchHelper.h>
-#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
+#include "../action/ActionHelper.h"
+#include "../health/HealthHelper.h"
+#include "../parameters/ParameterHelper.h"
+#include "../datapool/HkSwitchHelper.h"
+#include "DeviceHandlerFailureIsolation.h"

 #include <map>

--- a/devicehandlers/DeviceHandlerFailureIsolation.cpp
+++ b/devicehandlers/DeviceHandlerFailureIsolation.cpp
@ -1,9 +1,9 @@
-#include <framework/devicehandlers/DeviceHandlerBase.h>
-#include <framework/devicehandlers/DeviceHandlerFailureIsolation.h>
-#include <framework/health/HealthTableIF.h>
-#include <framework/power/Fuse.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/thermal/ThermalComponentIF.h>
+#include "DeviceHandlerBase.h"
+#include "DeviceHandlerFailureIsolation.h"
+#include "../health/HealthTableIF.h"
+#include "../power/Fuse.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../thermal/ThermalComponentIF.h"

 object_id_t DeviceHandlerFailureIsolation::powerConfirmationId = 0;

--- a/devicehandlers/DeviceHandlerFailureIsolation.h
+++ b/devicehandlers/DeviceHandlerFailureIsolation.h
@ -1,8 +1,8 @@
 #ifndef FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_
 #define FRAMEWORK_DEVICEHANDLERS_DEVICEHANDLERFAILUREISOLATION_H_

-#include <framework/fdir/FaultCounter.h>
-#include <framework/fdir/FailureIsolationBase.h>
+#include "../fdir/FaultCounter.h"
+#include "../fdir/FailureIsolationBase.h"
 namespace Factory{
 void setStaticFrameworkObjectIds();
 }
--- a/devicehandlers/DeviceHandlerIF.h
+++ b/devicehandlers/DeviceHandlerIF.h
@ -1,11 +1,11 @@
 #ifndef DEVICEHANDLERIF_H_
 #define DEVICEHANDLERIF_H_

-#include <framework/action/HasActionsIF.h>
-#include <framework/devicehandlers/DeviceHandlerMessage.h>
-#include <framework/events/Event.h>
-#include <framework/modes/HasModesIF.h>
-#include <framework/ipc/MessageQueueSenderIF.h>
+#include "../action/HasActionsIF.h"
+#include "DeviceHandlerMessage.h"
+#include "../events/Event.h"
+#include "../modes/HasModesIF.h"
+#include "../ipc/MessageQueueSenderIF.h"

 /**
 * @brief 	This is the Interface used to communicate with a device handler.
--- a/devicehandlers/DeviceHandlerMessage.cpp
+++ b/devicehandlers/DeviceHandlerMessage.cpp
@ -1,6 +1,6 @@
-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/devicehandlers/DeviceHandlerMessage.h>
-#include <framework/objectmanager/ObjectManagerIF.h>
+#include "../objectmanager/ObjectManagerIF.h"
+#include "DeviceHandlerMessage.h"
+#include "../objectmanager/ObjectManagerIF.h"

 DeviceHandlerMessage::DeviceHandlerMessage() {
 }
--- a/devicehandlers/DeviceHandlerMessage.h
+++ b/devicehandlers/DeviceHandlerMessage.h
@ -1,10 +1,10 @@
 #ifndef DEVICEHANDLERMESSAGE_H_
 #define DEVICEHANDLERMESSAGE_H_

-#include <framework/action/ActionMessage.h>
-#include <framework/ipc/CommandMessage.h>
-#include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/storagemanager/StorageManagerIF.h>
+#include "../action/ActionMessage.h"
+#include "../ipc/CommandMessage.h"
+#include "../objectmanager/SystemObjectIF.h"
+#include "../storagemanager/StorageManagerIF.h"
 //SHOULDDO: rework the static constructors to name the type of command they are building, maybe even hide setting the commandID.

 /**
--- a/devicehandlers/DeviceTmReportingWrapper.cpp
+++ b/devicehandlers/DeviceTmReportingWrapper.cpp
@ -1,6 +1,6 @@
-#include <framework/serialize/SerializeAdapter.h>
-#include <framework/devicehandlers/DeviceTmReportingWrapper.h>
-#include <framework/serialize/SerializeAdapter.h>
+#include "../serialize/SerializeAdapter.h"
+#include "DeviceTmReportingWrapper.h"
+#include "../serialize/SerializeAdapter.h"

 DeviceTmReportingWrapper::DeviceTmReportingWrapper(object_id_t objectId,
 		ActionId_t actionId, SerializeIF* data) :
--- a/devicehandlers/DeviceTmReportingWrapper.h
+++ b/devicehandlers/DeviceTmReportingWrapper.h
@ -1,9 +1,9 @@
 #ifndef DEVICETMREPORTINGWRAPPER_H_
 #define DEVICETMREPORTINGWRAPPER_H_

-#include <framework/action/HasActionsIF.h>
-#include <framework/objectmanager/SystemObjectIF.h>
-#include <framework/serialize/SerializeIF.h>
+#include "../action/HasActionsIF.h"
+#include "../objectmanager/SystemObjectIF.h"
+#include "../serialize/SerializeIF.h"

 class DeviceTmReportingWrapper: public SerializeIF {
 public:
--- a/devicehandlers/FixedSequenceSlot.cpp
+++ b/devicehandlers/FixedSequenceSlot.cpp
@ -5,8 +5,8 @@
 * @author	baetz
 */

-#include <framework/devicehandlers/FixedSequenceSlot.h>
-#include <framework/objectmanager/SystemObjectIF.h>
+#include "FixedSequenceSlot.h"
+#include "../objectmanager/SystemObjectIF.h"
 #include <cstddef>

 FixedSequenceSlot::FixedSequenceSlot(object_id_t handlerId, uint32_t setTime,
--- a/devicehandlers/FixedSequenceSlot.h
+++ b/devicehandlers/FixedSequenceSlot.h
@ -8,8 +8,8 @@
 #ifndef FIXEDSEQUENCESLOT_H_
 #define FIXEDSEQUENCESLOT_H_

-#include <framework/objectmanager/ObjectManagerIF.h>
-#include <framework/tasks/ExecutableObjectIF.h>
+#include "../objectmanager/ObjectManagerIF.h"
+#include "../tasks/ExecutableObjectIF.h"
 class PeriodicTaskIF;

 /**
--- a/devicehandlers/FixedSlotSequence.cpp
+++ b/devicehandlers/FixedSlotSequence.cpp
@ -1,5 +1,5 @@
-#include <framework/devicehandlers/FixedSlotSequence.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
+#include "FixedSlotSequence.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"

 FixedSlotSequence::FixedSlotSequence(uint32_t setLengthMs) :
 		lengthMs(setLengthMs) {
--- a/devicehandlers/FixedSlotSequence.h
+++ b/devicehandlers/FixedSlotSequence.h
@ -1,8 +1,8 @@
 #ifndef FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_
 #define FRAMEWORK_DEVICEHANDLERS_FIXEDSLOTSEQUENCE_H_

-#include <framework/devicehandlers/FixedSequenceSlot.h>
-#include <framework/objectmanager/SystemObject.h>
+#include "FixedSequenceSlot.h"
+#include "../objectmanager/SystemObject.h"
 #include <set>

 /**
--- a/devicehandlers/HealthDevice.cpp
+++ b/devicehandlers/HealthDevice.cpp
@ -1,5 +1,5 @@
-#include <framework/devicehandlers/HealthDevice.h>
-#include <framework/ipc/QueueFactory.h>
+#include "HealthDevice.h"
+#include "../ipc/QueueFactory.h"

 HealthDevice::HealthDevice(object_id_t setObjectId,
 		MessageQueueId_t parentQueue) :
--- a/devicehandlers/HealthDevice.h
+++ b/devicehandlers/HealthDevice.h
@ -1,11 +1,11 @@
 #ifndef HEALTHDEVICE_H_
 #define HEALTHDEVICE_H_

-#include <framework/health/HasHealthIF.h>
-#include <framework/health/HealthHelper.h>
-#include <framework/objectmanager/SystemObject.h>
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/ipc/MessageQueueIF.h>
+#include "../health/HasHealthIF.h"
+#include "../health/HealthHelper.h"
+#include "../objectmanager/SystemObject.h"
+#include "../tasks/ExecutableObjectIF.h"
+#include "../ipc/MessageQueueIF.h"

 class HealthDevice: public SystemObject,
 		public ExecutableObjectIF,
--- a/events/Event.cpp
+++ b/events/Event.cpp
@ -1,4 +1,4 @@
-#include <framework/events/Event.h>
+#include "Event.h"
 namespace EVENT {
 EventId_t getEventId(Event event) {
 	return (event & 0xFFFF);
--- a/events/Event.h
+++ b/events/Event.h
@ -2,7 +2,7 @@
 #define EVENTOBJECT_EVENT_H_

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

--- a/events/EventManager.cpp
+++ b/events/EventManager.cpp
@ -1,8 +1,8 @@
-#include <framework/events/EventManager.h>
-#include <framework/events/EventMessage.h>
-#include <framework/serviceinterface/ServiceInterfaceStream.h>
-#include <framework/ipc/QueueFactory.h>
-#include <framework/ipc/MutexFactory.h>
+#include "EventManager.h"
+#include "EventMessage.h"
+#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../ipc/QueueFactory.h"
+#include "../ipc/MutexFactory.h"


 const uint16_t EventManager::POOL_SIZES[N_POOLS] = {
--- a/events/EventManager.h
+++ b/events/EventManager.h
@ -1,13 +1,13 @@
 #ifndef EVENTMANAGER_H_
 #define EVENTMANAGER_H_

-#include <framework/events/eventmatching/EventMatchTree.h>
-#include <framework/events/EventManagerIF.h>
-#include <framework/objectmanager/SystemObject.h>
-#include <framework/storagemanager/LocalPool.h>
-#include <framework/tasks/ExecutableObjectIF.h>
-#include <framework/ipc/MessageQueueIF.h>
-#include <framework/ipc/MutexIF.h>
+#include "eventmatching/EventMatchTree.h"
+#include "EventManagerIF.h"
+#include "../objectmanager/SystemObject.h"
+#include "../storagemanager/LocalPool.h"
+#include "../tasks/ExecutableObjectIF.h"
+#include "../ipc/MessageQueueIF.h"
+#include "../ipc/MutexIF.h"
 #include <map>

 class EventManager: public EventManagerIF,
--- a/Show More
+++ b/Show More