a lot of internal include replacements

inc/fsfw/action.h

@@ -0,0 +1,11 @@
+#ifndef FSFW_INC_FSFW_ACTION_H_
+#define FSFW_INC_FSFW_ACTION_H_
+
+#include "action/ActionHelper.h"
+#include "action/ActionMessage.h"
+#include "action/CommandActionHelper.h"
+#include "action/HasActionsIF.h"
+#include "action/CommandsActionsIF.h"
+#include "action/SimpleActionHelper.h"
+
+#endif /* FSFW_INC_FSFW_ACTION_H_ */

inc/fsfw/action/ActionMessage.h

@@ -1,9 +1,9 @@
 #ifndef FSFW_ACTION_ACTIONMESSAGE_H_
 #define FSFW_ACTION_ACTIONMESSAGE_H_
 
-#include "../ipc/CommandMessage.h"
-#include "../objectmanager/ObjectManagerIF.h"
-#include "../storagemanager/StorageManagerIF.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 using ActionId_t = uint32_t;
 

inc/fsfw/action/CommandActionHelper.h

@@ -2,11 +2,11 @@
 #define COMMANDACTIONHELPER_H_
 
 #include "ActionMessage.h"
-#include "../objectmanager/ObjectManagerIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../serialize/SerializeIF.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../ipc/MessageQueueIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/serialize/SerializeIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 
 class CommandsActionsIF;
 

inc/fsfw/container/SharedRingBuffer.h

@@ -3,9 +3,10 @@
 
 #include "SimpleRingBuffer.h"
 #include "DynamicFIFO.h"
-#include "../ipc/MutexIF.h"
-#include "../objectmanager/SystemObject.h"
-#include "../timemanager/Clock.h"
+
+#include "fsfw/ipc/MutexIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/timemanager/Clock.h"
 
 /**
  * @brief   Ring buffer which can be shared among multiple objects

inc/fsfw/controller/ControllerBase.h

@@ -1,14 +1,14 @@
 #ifndef FSFW_CONTROLLER_CONTROLLERBASE_H_
 #define FSFW_CONTROLLER_CONTROLLERBASE_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 "../tasks/PeriodicTaskIF.h"
-#include "../datapool/HkSwitchHelper.h"
+#include "fsfw/health/HasHealthIF.h"
+#include "fsfw/health/HealthHelper.h"
+#include "fsfw/modes/HasModesIF.h"
+#include "fsfw/modes/ModeHelper.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/tasks/PeriodicTaskIF.h"
+#include "fsfw/datapool/HkSwitchHelper.h"
 
 /**
  * @brief   Generic base class for controller classes

inc/fsfw/controller/ExtendedControllerBase.h

@@ -3,10 +3,9 @@
 
 #include "ControllerBase.h"
 
-#include "../action/HasActionsIF.h"
-#include "../datapoollocal/HasLocalDataPoolIF.h"
-#include "../action/ActionHelper.h"
-#include "../datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/action.h"
+#include "fsfw/datapoollocal/HasLocalDataPoolIF.h"
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
 
 /**
  * @brief   Extendes the basic ControllerBase with the common components

inc/fsfw/coordinates/CoordinateTransformations.h

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

inc/fsfw/coordinates/Sgp4Propagator.h

@@ -1,11 +1,12 @@
 #ifndef SGP4PROPAGATOR_H_
 #define SGP4PROPAGATOR_H_
 
-#ifndef WIN32
+#include "fsfw/platform.h"
+#ifndef PLATFORM_WIN
 #include <sys/time.h>
 #endif
-#include "../contrib/sgp4/sgp4unit.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/contrib/sgp4/sgp4unit.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
 class Sgp4Propagator {
 public:

inc/fsfw/datalinklayer/Clcw.h

@@ -1,10 +1,3 @@
-/**
- * @file	Clcw.h
- * @brief	This file defines the Clcw class.
- * @date	17.04.2013
- * @author	baetz
- */
-
 #ifndef CLCW_H_
 #define CLCW_H_
 

inc/fsfw/datalinklayer/Farm1StateLockout.h

@@ -1,10 +1,3 @@
-/**
- * @file	Farm1StateLockout.h
- * @brief	This file defines the Farm1StateLockout class.
- * @date	24.04.2013
- * @author	baetz
- */
-
 #ifndef FARM1STATELOCKOUT_H_
 #define FARM1STATELOCKOUT_H_
 

inc/fsfw/datapool/HkSwitchHelper.h

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

inc/fsfw/datapool/PoolDataSetBase.h

@@ -3,8 +3,9 @@
 
 #include "PoolDataSetIF.h"
 #include "PoolVariableIF.h"
-#include "../serialize/SerializeIF.h"
-#include "../ipc/MutexIF.h"
+
+#include "fsfw/serialize/SerializeIF.h"
+#include "fsfw/ipc/MutexIF.h"
 
 /**
  * @brief	The DataSetBase class manages a set of locally checked out variables.

inc/fsfw/datapoollocal/LocalDataPoolManager.h

@@ -4,17 +4,17 @@
 #include "ProvidesDataPoolSubscriptionIF.h"
 #include "AccessLocalPoolF.h"
 
-#include "../serviceinterface/ServiceInterface.h"
-#include "../housekeeping/HousekeepingPacketDownlink.h"
-#include "../housekeeping/HousekeepingMessage.h"
-#include "../housekeeping/PeriodicHousekeepingHelper.h"
-#include "../datapool/DataSetIF.h"
-#include "../datapool/PoolEntry.h"
-#include "../objectmanager/SystemObjectIF.h"
-#include "../ipc/MutexIF.h"
-#include "../ipc/CommandMessage.h"
-#include "../ipc/MessageQueueIF.h"
-#include "../ipc/MutexGuard.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/housekeeping/HousekeepingPacketDownlink.h"
+#include "fsfw/housekeeping/HousekeepingMessage.h"
+#include "fsfw/housekeeping/PeriodicHousekeepingHelper.h"
+#include "fsfw/datapool/DataSetIF.h"
+#include "fsfw/datapool/PoolEntry.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
+#include "fsfw/ipc/MutexIF.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/ipc/MutexGuard.h"
 
 #include <map>
 #include <vector>

inc/fsfw/datapoollocal/LocalPoolDataSetBase.h

@@ -4,8 +4,8 @@
 #include "MarkChangedIF.h"
 #include "localPoolDefinitions.h"
 
-#include "../datapool/DataSetIF.h"
-#include "../datapool/PoolDataSetBase.h"
+#include "fsfw/datapool/DataSetIF.h"
+#include "fsfw/datapool/PoolDataSetBase.h"
 
 #include <vector>
 

inc/fsfw/datapoollocal/LocalPoolObjectBase.h

@@ -4,9 +4,9 @@
 #include "MarkChangedIF.h"
 #include "localPoolDefinitions.h"
 
-#include "../objectmanager/SystemObjectIF.h"
-#include "../datapool/PoolVariableIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
+#include "fsfw/datapool/PoolVariableIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
 class LocalDataPoolManager;
 class DataSetIF;

inc/fsfw/datapoollocal/internal/LocalDpManagerAttorney.h

@@ -0,0 +1,31 @@
+#ifndef FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_
+#define FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_
+
+#include "../LocalDataPoolManager.h"
+
+/**
+ * @brief	This is a helper class implements the Attorney-Client idiom for access to
+ * 			LocalDataPoolManager internals
+ * @details
+ * This helper class provides better control over which classes are allowed to access
+ * LocalDataPoolManager internals in a granular and encapsulated way when compared to
+ * other methods like direct friend declarations. It allows these classes to use
+ * an explicit subset of the pool manager private/protected functions.
+ * See: https://en.wikibooks.org/wiki/More_C%2B%2B_Idioms/Friendship_and_the_Attorney-Client
+ */
+class LocalDpManagerAttorney {
+private:
+    template<typename T> static ReturnValue_t fetchPoolEntry(LocalDataPoolManager& manager,
+            lp_id_t localPoolId, PoolEntry<T> **poolEntry) {
+        return manager.fetchPoolEntry(localPoolId, poolEntry);
+    }
+
+    static MutexIF* getMutexHandle(LocalDataPoolManager& manager) {
+        return manager.getMutexHandle();
+    }
+
+    template<typename T> friend class LocalPoolVariable;
+    template<typename T, uint16_t vecSize> friend class LocalPoolVector;
+};
+
+#endif /* FSFW_DATAPOOLLOCAL_LOCALDPMANAGERATTORNEY_H_ */

inc/fsfw/devicehandlers/HealthDevice.h

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

inc/fsfw/events/EventMessage.h

@@ -1,9 +1,9 @@
-#ifndef EVENTMESSAGE_H_
-#define EVENTMESSAGE_H_
+#ifndef FSFW_EVENTS_EVENTMESSAGE_H_
+#define FSFW_EVENTS_EVENTMESSAGE_H_
 
 #include "Event.h"
-#include "../ipc/MessageQueueMessage.h"
-#include "../objectmanager/ObjectManagerIF.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
 
 /**
  * Passing on events through IPC.
@@ -49,4 +49,4 @@ protected:
 
 };
 
-#endif /* EVENTMESSAGE_H_ */
+#endif /* FSFW_EVENTS_EVENTMESSAGE_H_ */

inc/fsfw/events/eventmatching/CMakeLists.txt

@@ -1,7 +0,0 @@
-target_sources(${LIB_FSFW_NAME} 
-	PRIVATE 
-		EventIdRangeMatcher.cpp
-		EventMatchTree.cpp
-		ReporterRangeMatcher.cpp
-		SeverityRangeMatcher.cpp
-)

inc/fsfw/events/eventmatching/EventIdRangeMatcher.cpp

@@ -1,12 +0,0 @@
-#include "EventIdRangeMatcher.h"
-
-EventIdRangeMatcher::EventIdRangeMatcher(EventId_t lower, EventId_t upper,
-		bool inverted) : EventRangeMatcherBase<EventId_t>(lower, upper, inverted) {
-}
-
-EventIdRangeMatcher::~EventIdRangeMatcher() {
-}
-
-bool EventIdRangeMatcher::match(EventMessage* message) {
-	return rangeMatcher.match(message->getEventId());
-}

inc/fsfw/events/eventmatching/EventMatchTree.cpp

@@ -1,149 +0,0 @@
-#include "EventIdRangeMatcher.h"
-#include "EventMatchTree.h"
-#include "ReporterRangeMatcher.h"
-#include "SeverityRangeMatcher.h"
-
-EventMatchTree::EventMatchTree(StorageManagerIF* storageBackend,
-		bool invertedMatch) :
-		MatchTree<EventMessage*>(end(), 1), factory(storageBackend), invertedMatch(
-				invertedMatch) {
-}
-
-EventMatchTree::~EventMatchTree() {
-}
-
-bool EventMatchTree::match(EventMessage* number) {
-	if (invertedMatch) {
-		return !MatchTree<EventMessage*>::match(number);
-	} else {
-		return MatchTree<EventMessage*>::match(number);
-	}
-}
-
-ReturnValue_t EventMatchTree::addMatch(EventId_t idFrom, EventId_t idTo,
-		bool idInverted, object_id_t reporterFrom, object_id_t reporterTo,
-		bool reporterInverted) {
-	if (idFrom == 0) {
-		//Assuming all events shall be forwarded.
-		idTo = 0;
-		idInverted = true;
-	}
-	if (idTo == 0) {
-		idTo = idFrom;
-	}
-	iterator lastTest;
-	ReturnValue_t result = findOrInsertRangeMatcher<EventId_t,
-			EventIdRangeMatcher>(begin(), idFrom, idTo, idInverted, &lastTest);
-	if (result != HasReturnvaluesIF::RETURN_OK) {
-		return result;
-	}
-	if (reporterFrom == 0) {
-		//No need to add another AND branch
-		return RETURN_OK;
-	}
-	if (reporterTo == 0) {
-		reporterTo = reporterFrom;
-	}
-	return findOrInsertRangeMatcher<object_id_t, ReporterRangeMatcher>(
-			lastTest.left(), reporterFrom, reporterTo, reporterInverted,
-			&lastTest);
-}
-
-ReturnValue_t EventMatchTree::removeMatch(EventId_t idFrom, EventId_t idTo,
-		bool idInverted, object_id_t reporterFrom, object_id_t reporterTo,
-		bool reporterInverted) {
-
-	iterator foundElement;
-
-	if (idFrom == 0) {
-		//Assuming a "forward all events" request.
-		idTo = 0;
-		idInverted = true;
-	}
-	if (idTo == 0) {
-		idTo = idFrom;
-	}
-	foundElement = findRangeMatcher<EventId_t, EventIdRangeMatcher>(begin(),
-			idFrom, idTo, idInverted);
-	if (foundElement == end()) {
-		return NO_MATCH; //Can't tell if too detailed or just not found.
-	}
-	if (reporterFrom == 0) {
-		if (foundElement.left() == end()) {
-			return removeElementAndReconnectChildren(foundElement);
-		} else {
-			return TOO_GENERAL_REQUEST;
-		}
-	}
-	if (reporterTo == 0) {
-		reporterTo = reporterFrom;
-	}
-	foundElement = findRangeMatcher<object_id_t, ReporterRangeMatcher>(
-			foundElement.left(), reporterFrom, reporterTo, reporterInverted);
-	if (foundElement == end()) {
-		return NO_MATCH;
-	} else {
-		return removeElementAndReconnectChildren(foundElement);
-	}
-}
-
-template<typename VALUE_T, typename INSERTION_T>
-inline ReturnValue_t EventMatchTree::findOrInsertRangeMatcher(iterator start,
-		VALUE_T idFrom, VALUE_T idTo, bool inverted, iterator* lastTest) {
-	bool attachToBranch = AND;
-	iterator iter = start;
-	while (iter != end()) {
-		INSERTION_T* matcher = static_cast<INSERTION_T*>(*iter);
-		attachToBranch = OR;
-		*lastTest = iter;
-		if ((matcher->rangeMatcher.lowerBound == idFrom)
-				&& (matcher->rangeMatcher.upperBound == idTo)
-				&& (matcher->rangeMatcher.inverted == inverted)) {
-			return RETURN_OK;
-		} else {
-			iter = iter.right();
-		}
-	}
-	//Only reached if nothing was found.
-	SerializeableMatcherIF<EventMessage*>* newContent = factory.generate<
-			INSERTION_T>(idFrom, idTo, inverted);
-	if (newContent == NULL) {
-		return FULL;
-	}
-	Node* newNode = factory.generate<Node>(newContent);
-	if (newNode == NULL) {
-		//Need to make sure partially generated content is deleted, otherwise, that's a leak.
-		factory.destroy<INSERTION_T>(static_cast<INSERTION_T*>(newContent));
-		return FULL;
-	}
-	*lastTest = insert(attachToBranch, *lastTest, newNode);
-	if (*lastTest == end()) {
-		//This actaully never fails, so creating a dedicated returncode seems an overshoot.
-		return RETURN_FAILED;
-	}
-	return RETURN_OK;
-}
-
-template<typename VALUE_T, typename INSERTION_T>
-EventMatchTree::iterator EventMatchTree::findRangeMatcher(iterator start,
-		VALUE_T idFrom, VALUE_T idTo, bool inverted) {
-	iterator iter = start;
-	while (iter != end()) {
-		INSERTION_T* matcher = static_cast<INSERTION_T*>(*iter);
-		if ((matcher->rangeMatcher.lowerBound == idFrom)
-				&& (matcher->rangeMatcher.upperBound == idTo)
-				&& (matcher->rangeMatcher.inverted == inverted)) {
-			break;
-		} else {
-			iter = iter.right(); //next OR element
-		}
-	}
-	return iter;
-}
-
-ReturnValue_t EventMatchTree::cleanUpElement(iterator position) {
-	factory.destroy(position.element->value);
-	//If deletion fails, delete element anyway, nothing we can do.
-	//SHOULDO: Throw event, or write debug output.
-	return factory.destroy(position.element);
-}

inc/fsfw/events/eventmatching/ReporterRangeMatcher.cpp

@@ -1,13 +0,0 @@
-#include "ReporterRangeMatcher.h"
-
-ReporterRangeMatcher::ReporterRangeMatcher(object_id_t lower, object_id_t upper,
-		bool inverted) : EventRangeMatcherBase<object_id_t>(lower, upper, inverted) {
-}
-
-ReporterRangeMatcher::~ReporterRangeMatcher() {
-	
-}
-
-bool ReporterRangeMatcher::match(EventMessage* message) {
-	return rangeMatcher.match(message->getReporter());
-}

inc/fsfw/events/eventmatching/SeverityRangeMatcher.cpp

@@ -1,14 +0,0 @@
-#include "SeverityRangeMatcher.h"
-#include "../../events/EventMessage.h"
-#include "../../serialize/SerializeAdapter.h"
-
-SeverityRangeMatcher::SeverityRangeMatcher(EventSeverity_t from,
-		EventSeverity_t till, bool inverted) : EventRangeMatcherBase<EventSeverity_t>(from, till, inverted) {
-}
-
-SeverityRangeMatcher::~SeverityRangeMatcher() {
-}
-
-bool SeverityRangeMatcher::match(EventMessage* message) {
-	return rangeMatcher.match(message->getSeverity());
-}

inc/fsfw/fdir/FaultCounter.h

@@ -1,8 +1,8 @@
-#ifndef FRAMEWORK_FDIR_FAULTCOUNTER_H_
-#define FRAMEWORK_FDIR_FAULTCOUNTER_H_
+#ifndef FSFW_FDIR_FAULTCOUNTER_H_
+#define FSFW_FDIR_FAULTCOUNTER_H_
 
-#include "../parameters/HasParametersIF.h"
-#include "../timemanager/Countdown.h"
+#include "fsfw/parameters/HasParametersIF.h"
+#include "fsfw/timemanager/Countdown.h"
 
 class FaultCounter: public HasParametersIF {
 public:
@@ -35,4 +35,4 @@ private:
 	uint32_t failureThreshold;
 };
 
-#endif /* FRAMEWORK_FDIR_FAULTCOUNTER_H_ */
+#endif /* FSFW_FDIR_FAULTCOUNTER_H_ */

inc/fsfw/globalfunctions/Type.h

@@ -1,8 +1,9 @@
 #ifndef FSFW_GLOBALFUNCTIONS_TYPE_H_
 #define FSFW_GLOBALFUNCTIONS_TYPE_H_
 
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../serialize/SerializeIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/serialize/SerializeIF.h"
+
 #include <type_traits>
 
 /**

inc/fsfw/health/HealthMessage.h

@@ -2,7 +2,7 @@
 #define FSFW_HEALTH_HEALTHMESSAGE_H_
 
 #include "HasHealthIF.h"
-#include "../ipc/CommandMessage.h"
+#include "fsfw/ipc/CommandMessage.h"
 
 class HealthMessage {
 public:

inc/fsfw/housekeeping/HousekeepingMessage.h

@@ -1,11 +1,11 @@
 #ifndef FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_
 #define FSFW_HOUSEKEEPING_HOUSEKEEPINGMESSAGE_H_
 
-#include "../datapoollocal/localPoolDefinitions.h"
-#include "../ipc/CommandMessage.h"
-#include "../ipc/FwMessageTypes.h"
-#include "../objectmanager/frameworkObjects.h"
-#include "../storagemanager/StorageManagerIF.h"
+#include "fsfw/datapoollocal/localPoolDefinitions.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/ipc/FwMessageTypes.h"
+#include "fsfw/objectmanager/frameworkObjects.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 
 /**

inc/fsfw/housekeeping/PeriodicHousekeepingHelper.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_
 #define FSFW_HOUSEKEEPING_PERIODICHOUSEKEEPINGHELPER_H_
 
-#include "../timemanager/Clock.h"
+#include "fsfw/timemanager/Clock.h"
 #include <cstdint>
 
 class LocalPoolDataSetBase;

inc/fsfw/internalerror/InternalErrorReporter.h

@@ -3,12 +3,12 @@
 
 #include "InternalErrorReporterIF.h"
 
-#include "../tasks/PeriodicTaskIF.h"
-#include "../internalError/InternalErrorDataset.h"
-#include "../datapoollocal/LocalDataPoolManager.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../objectmanager/SystemObject.h"
-#include "../ipc/MutexIF.h"
+#include "fsfw/tasks/PeriodicTaskIF.h"
+#include "fsfw/internalerror/InternalErrorDataset.h"
+#include "fsfw/datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/ipc/MutexIF.h"
 
 /**
  * @brief   This class is used to track internal errors like lost telemetry,

inc/fsfw/ipc/MessageQueueMessage.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_IPC_MESSAGEQUEUEMESSAGE_H_
 #define FSFW_IPC_MESSAGEQUEUEMESSAGE_H_
 
-#include "../ipc/MessageQueueMessageIF.h"
+#include "fsfw/ipc/MessageQueueMessageIF.h"
 #include <cstddef>
 
 /**

inc/fsfw/modes/ModeHelper.h

@@ -2,9 +2,9 @@
 #define FSFW_MODES_MODEHELPER_H_
 
 #include "ModeMessage.h"
-#include "../ipc/MessageQueueIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../timemanager/Countdown.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/timemanager/Countdown.h"
 
 class HasModesIF;
 

inc/fsfw/objectmanager/SystemObject.h

@@ -2,9 +2,9 @@
 #define FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_
 
 #include "SystemObjectIF.h"
-#include "../events/Event.h"
-#include "../events/EventReportingProxyIF.h"
-#include "../timemanager/Clock.h"
+#include "fsfw/events/Event.h"
+#include "fsfw/events/EventReportingProxyIF.h"
+#include "fsfw/timemanager/Clock.h"
 
 /**
  * @brief	This class automates insertion into the ObjectManager and

inc/fsfw/power/PowerComponent.h

@@ -3,8 +3,8 @@
 
 #include "PowerComponentIF.h"
 
-#include "../objectmanager/frameworkObjects.h"
-#include "../objectmanager/SystemObjectIF.h"
+#include "fsfw/objectmanager/frameworkObjects.h"
+#include "fsfw/objectmanager/SystemObjectIF.h"
 
 
 class PowerComponent: public PowerComponentIF {

inc/fsfw/power/PowerSensor.h

@@ -1,12 +1,12 @@
 #ifndef FSFW_POWER_POWERSENSOR_H_
 #define FSFW_POWER_POWERSENSOR_H_
 
-#include "../datapoollocal/StaticLocalDataSet.h"
-#include "../devicehandlers/HealthDevice.h"
-#include "../monitoring/LimitMonitor.h"
-#include "../parameters/ParameterHelper.h"
-#include "../objectmanager/SystemObject.h"
-#include "../ipc/MessageQueueIF.h"
+#include "fsfw/datapoollocal/StaticLocalDataSet.h"
+#include "fsfw/devicehandlers/HealthDevice.h"
+#include "fsfw/monitoring/LimitMonitor.h"
+#include "fsfw/parameters/ParameterHelper.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 
 class PowerController;
 

inc/fsfw/serialize/SerialBufferAdapter.h

@@ -1,8 +1,8 @@
 #ifndef SERIALBUFFERADAPTER_H_
 #define SERIALBUFFERADAPTER_H_
 
-#include "../serialize/SerializeIF.h"
-#include "../serialize/SerializeAdapter.h"
+#include "fsfw/serialize/SerializeIF.h"
+#include "fsfw/serialize/SerializeAdapter.h"
 
 /**
  * This adapter provides an interface for SerializeIF to serialize or deserialize

inc/fsfw/storagemanager/LocalPool.h

@@ -1,12 +1,13 @@
 #ifndef FSFW_STORAGEMANAGER_LOCALPOOL_H_
 #define FSFW_STORAGEMANAGER_LOCALPOOL_H_
 
-#include "StorageManagerIF.h"
-#include "../objectmanager/SystemObject.h"
-#include "../objectmanager/ObjectManagerIF.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
-#include "../internalError/InternalErrorReporterIF.h"
-#include "../storagemanager/StorageAccessor.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "fsfw/internalerror/InternalErrorReporterIF.h"
+#include "fsfw/storagemanager/StorageAccessor.h"
 
 #include <vector>
 #include <set>

inc/fsfw/subsystem/modes/ModeSequenceMessage.h

@@ -3,8 +3,8 @@
 
 #include "ModeDefinitions.h"
 
-#include "../../ipc/CommandMessage.h"
-#include "../../storagemanager/StorageManagerIF.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
 
 
 class ModeSequenceMessage {

inc/fsfw/tasks/FixedSequenceSlot.h

@@ -2,7 +2,7 @@
 #define FSFW_TASKS_FIXEDSEQUENCESLOT_H_
 
 #include "ExecutableObjectIF.h"
-#include "../objectmanager/ObjectManagerIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
 
 class PeriodicTaskIF;
 

inc/fsfw/tcdistribution/PUSDistributor.h

@@ -5,10 +5,10 @@
 #include "TcDistributor.h"
 #include "TcPacketCheck.h"
 
-#include "../tmtcpacket/pus/tc.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../tmtcservices/AcceptsTelecommandsIF.h"
-#include "../tmtcservices/VerificationReporter.h"
+#include "fsfw/tmtcpacket/pus/tc.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/tmtcservices/AcceptsTelecommandsIF.h"
+#include "fsfw/tmtcservices/VerificationReporter.h"
 
 /**
  * This class accepts PUS Telecommands and forwards them to Application

inc/fsfw/tcdistribution/TcDistributor.h

@@ -1,13 +1,13 @@
 #ifndef FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_
 #define FSFW_TMTCSERVICES_TCDISTRIBUTOR_H_
 
-#include "../objectmanager/ObjectManagerIF.h"
-#include "../objectmanager/SystemObject.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../tmtcservices/TmTcMessage.h"
-#include "../ipc/MessageQueueIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/tmtcservices/TmTcMessage.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 #include <map>
 
 /**

inc/fsfw/thermal/AbstractTemperatureSensor.h

@@ -1,12 +1,12 @@
 #ifndef ABSTRACTSENSOR_H_
 #define ABSTRACTSENSOR_H_
 
-#include "../health/HasHealthIF.h"
-#include "../health/HealthHelper.h"
-#include "../objectmanager/SystemObject.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../parameters/ParameterHelper.h"
-#include "../ipc/MessageQueueIF.h"
+#include "fsfw/health/HasHealthIF.h"
+#include "fsfw/health/HealthHelper.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/parameters/ParameterHelper.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 #include "ThermalModuleIF.h"
 #include "tcsDefinitions.h"
 

inc/fsfw/thermal/Heater.h

@@ -1,11 +1,12 @@
 #ifndef FSFW_THERMAL_HEATER_H_
 #define FSFW_THERMAL_HEATER_H_
 
-#include "../devicehandlers/HealthDevice.h"
-#include "../parameters/ParameterHelper.h"
-#include "../power/PowerSwitchIF.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../timemanager/Countdown.h"
+#include "fsfw/devicehandlers/HealthDevice.h"
+#include "fsfw/parameters/ParameterHelper.h"
+#include "fsfw/power/PowerSwitchIF.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/timemanager/Countdown.h"
+
 #include <cstdint>
 
 

inc/fsfw/timemanager/Clock.h

@@ -2,9 +2,9 @@
 #define FSFW_TIMEMANAGER_CLOCK_H_
 
 #include "clockDefinitions.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../ipc/MutexFactory.h"
-#include "../globalfunctions/timevalOperations.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/ipc/MutexFactory.h"
+#include "fsfw/globalfunctions/timevalOperations.h"
 
 #include <cstdint>
 

inc/fsfw/tmtcpacket/packetmatcher/PacketMatchTree.h

@@ -1,10 +1,10 @@
 #ifndef FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_
 #define FSFW_TMTCPACKET_PACKETMATCHER_PACKETMATCHTREE_H_
 
-#include "../../container/PlacementFactory.h"
-#include "../../globalfunctions/matching/MatchTree.h"
-#include "../../storagemanager/LocalPool.h"
-#include "../../tmtcpacket/pus/tm/TmPacketMinimal.h"
+#include "fsfw/container/PlacementFactory.h"
+#include "fsfw/globalfunctions/matching/MatchTree.h"
+#include "fsfw/storagemanager/LocalPool.h"
+#include "fsfw/tmtcpacket/pus/tm/TmPacketMinimal.h"
 
 class PacketMatchTree: public MatchTree<TmPacketMinimal*>, public HasReturnvaluesIF {
 public:

inc/fsfw/tmtcpacket/pus/tc/TcPacketBase.h

@@ -1,7 +1,7 @@
 #ifndef TMTCPACKET_PUS_TCPACKETBASE_H_
 #define TMTCPACKET_PUS_TCPACKETBASE_H_
 
-#include "../../../tmtcpacket/SpacePacketBase.h"
+#include "fsfw/tmtcpacket/SpacePacketBase.h"
 #include <cstddef>
 
 /**

inc/fsfw/tmtcpacket/pus/tm/TmPacketStoredBase.h

@@ -1,15 +1,15 @@
 #ifndef FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_
 #define FSFW_TMTCPACKET_PUS_TMPACKETSTOREDBASE_H_
 
-#include "../../../FSFW.h"
+#include "fsfw/FSFW.h"
 #include "TmPacketBase.h"
 #include "TmPacketStoredBase.h"
 #include "TmPacketPusA.h"
 
-#include "../../../serialize/SerializeIF.h"
-#include "../../../storagemanager/StorageManagerIF.h"
-#include "../../../internalError/InternalErrorReporterIF.h"
-#include "../../../ipc/MessageQueueSenderIF.h"
+#include "fsfw/serialize/SerializeIF.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/internalerror/InternalErrorReporterIF.h"
+#include "fsfw/ipc/MessageQueueSenderIF.h"
 
 /**
  *  This class generates a ECSS PUS Telemetry packet within a given

inc/fsfw/tmtcservices/CommandingServiceBase.h

@@ -3,17 +3,16 @@
 
 #include "AcceptsTelecommandsIF.h"
 #include "VerificationReporter.h"
+#include "fsfw/FSFW.h"
 
-#include "../objectmanager/SystemObject.h"
-#include "../storagemanager/StorageManagerIF.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../ipc/MessageQueueIF.h"
-#include "../ipc/CommandMessage.h"
-#include "../container/FixedMap.h"
-#include "../container/FIFO.h"
-#include "../serialize/SerializeIF.h"
-
-#include <FSFWConfig.h>
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/storagemanager/StorageManagerIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/ipc/MessageQueueIF.h"
+#include "fsfw/ipc/CommandMessage.h"
+#include "fsfw/container/FixedMap.h"
+#include "fsfw/container/FIFO.h"
+#include "fsfw/serialize/SerializeIF.h"
 
 class TcPacketStored;
 class TcPacketStoredBase;

inc/fsfw/tmtcservices/PusServiceBase.h

@@ -5,12 +5,12 @@
 #include "VerificationCodes.h"
 #include "VerificationReporter.h"
 
-#include "../objectmanager/ObjectManagerIF.h"
-#include "../objectmanager/SystemObject.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
-#include "../tasks/ExecutableObjectIF.h"
-#include "../tmtcpacket/pus/tc.h"
-#include "../ipc/MessageQueueIF.h"
+#include "fsfw/objectmanager/ObjectManagerIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw/tmtcpacket/pus/tc.h"
+#include "fsfw/ipc/MessageQueueIF.h"
 
 namespace Factory{
 void setStaticFrameworkObjectIds();

inc/fsfw/tmtcservices/PusVerificationReport.h

@@ -3,9 +3,9 @@
 
 #include "VerificationCodes.h"
 
-#include "../ipc/MessageQueueMessage.h"
-#include "../tmtcpacket/pus/tc/TcPacketBase.h"
-#include "../returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/ipc/MessageQueueMessage.h"
+#include "fsfw/tmtcpacket/pus/tc/TcPacketBase.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
 
 class PusVerificationMessage: public MessageQueueMessage {
 private: