changes and tweaks taken over

subsystem/modes/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		ModeSequenceMessage.cpp
+		ModeStore.cpp
+)

subsystem/modes/ModeSequenceMessage.h

@@ -2,6 +2,7 @@
 #define FSFW_SUBSYSTEM_MODES_MODESEQUENCEMESSAGE_H_
 
 #include "ModeDefinitions.h"
+
 #include "../../ipc/CommandMessage.h"
 #include "../../storagemanager/StorageManagerIF.h"
 

subsystem/modes/ModeStore.cpp

@@ -1,8 +1,8 @@
-#include "../../subsystem/modes/ModeStore.h"
+#include "ModeStore.h"
 
 // todo: I think some parts are deprecated. If this is used,  the define
 // USE_MODESTORE could be part of the new FSFWConfig.h file.
-#ifdef USE_MODESTORE
+#if FSFW_USE_MODESTORE == 1
 
 ModeStore::ModeStore(object_id_t objectId, uint32_t slots) :
 		SystemObject(objectId), store(slots), emptySlot(store.front()) {

subsystem/modes/ModeStore.h

@@ -1,7 +1,9 @@
 #ifndef MODESTORE_H_
 #define MODESTORE_H_
 
-#ifdef USE_MODESTORE
+#include <FSFWConfig.h>
+
+#if FSFW_USE_MODESTORE == 1
 
 #include "../../container/ArrayList.h"
 #include "../../container/SinglyLinkedList.h"

subsystem/modes/ModeStoreIF.h

@@ -1,7 +1,9 @@
 #ifndef MODESTOREIF_H_
 #define MODESTOREIF_H_
 
-#ifdef USE_MODESTORE
+#include <FSFWConfig.h>
+
+#if FSFW_USE_MODESTORE == 1
 
 #include "../../container/ArrayList.h"
 #include "../../container/SinglyLinkedList.h"