rm3100 continued

bsp_hosted/InitMission.cpp

@@ -8,8 +8,8 @@
 #include <fsfw/tasks/FixedTimeslotTaskIF.h>
 #include <fsfw/tasks/PeriodicTaskIF.h>
 #include <fsfw/tasks/TaskFactory.h>
-#include <fsfwconfig/objects/systemObjectList.h>
-#include <fsfwconfig/OBSWConfig.h>
+#include <objects/systemObjectList.h>
+#include <OBSWConfig.h>
 
 #include <iostream>
 

bsp_hosted/fsfwconfig/OBSWConfig.h

@@ -6,6 +6,9 @@
 #ifndef CONFIG_OBSWCONFIG_H_
 #define CONFIG_OBSWCONFIG_H_
 
+#include "returnvalues/classIds.h"
+#include "events/subsystemIdRanges.h"
+
 #define OBSW_ADD_TEST_CODE      0
 
 // These defines should be disabled for mission code but are useful for

bsp_hosted/fsfwconfig/events/subsystemIdRanges.h

@@ -18,6 +18,7 @@ enum: uint8_t {
 	PUS_SERVICE_8,
 	PUS_SERVICE_23,
 	MGM_LIS3MDL,
+	MGM_RM3100,
 
 	DUMMY_DEVICE,
 };

bsp_hosted/fsfwconfig/fsfwconfig.mk

@@ -4,12 +4,4 @@ CXXSRC += $(wildcard $(CURRENTPATH)/objects/*.cpp)
 CXXSRC += $(wildcard $(CURRENTPATH)/pollingsequence/*.cpp)
 CXXSRC += $(wildcard $(CURRENTPATH)/events/*.cpp)
 
-INCLUDES += $(CURRENTPATH)
-INCLUDES += $(CURRENTPATH)/objects
-INCLUDES += $(CURRENTPATH)/ipc
-INCLUDES += $(CURRENTPATH)/pollingsequence
-INCLUDES += $(CURRENTPATH)/returnvalues
-INCLUDES += $(CURRENTPATH)/tmtc
-INCLUDES += $(CURRENTPATH)/events
-INCLUDES += $(CURRENTPATH)/devices
-INCLUDES += $(CURRENTPATH)/cdatapool
+INCLUDES += $(CURRENTPATH)

bsp_hosted/fsfwconfig/returnvalues/classIds.h

@@ -11,7 +11,8 @@
 namespace CLASS_ID {
 enum {
 	MISSION_CLASS_ID_START = FW_CLASS_ID_COUNT,
-	MGM_LIS3MDL
+	MGM_LIS3MDL,
+	MGM_RM3100
 };
 }
 

bsp_hosted/main.cpp

@@ -1,5 +1,6 @@
-#include <bsp_hosted/fsfwconfig/OBSWVersion.h>
-#include <bsp_linux/InitMission.h>
+#include "InitMission.h"
+
+#include <OBSWVersion.h>
 #include <fsfw/tasks/TaskFactory.h>
 #include <iostream>