host compiling again

bsp_hosted/fsfwconfig/events/subsystemIdRanges.h

@@ -1,7 +1,7 @@
 #ifndef CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 #define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 
-#include <fsfw/events/fwSubsystemIdRanges.h>
+#include "commonSubsystemId.h"
 #include <cstdint>
 
 /**
@@ -10,17 +10,7 @@
  */
 namespace SUBSYSTEM_ID {
 enum: uint8_t {
-	SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	PUS_SERVICE_2,
-	PUS_SERVICE_3,
-	PUS_SERVICE_5,
-	PUS_SERVICE_6,
-	PUS_SERVICE_8,
-	PUS_SERVICE_23,
-	MGM_LIS3MDL,
-	MGM_RM3100,
-
-	DUMMY_DEVICE,
+	SUBSYSTEM_ID_START = COMMON_SUBSYSTEM_ID_END
 };
 }
 

common/config/commonSubsystemId.h

@@ -0,0 +1,26 @@
+#ifndef COMMON_CONFIG_COMMONSUBSYSTEMID_H_
+#define COMMON_CONFIG_COMMONSUBSYSTEMID_H_
+
+#include <fsfw/events/fwSubsystemIdRanges.h>
+
+namespace SUBSYSTEM_ID {
+enum: uint8_t {
+	COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
+	PUS_SERVICE_2,
+	PUS_SERVICE_3,
+	PUS_SERVICE_5,
+	PUS_SERVICE_6,
+	PUS_SERVICE_8,
+	PUS_SERVICE_23,
+	MGM_LIS3MDL,
+	MGM_RM3100,
+	PCDU_HANDLER,
+	HEATER_HANDLER,
+	SA_DEPL_HANDLER,
+	PLOC_HANDLER,
+	COMMON_SUBSYSTEM_ID_END
+};
+}
+
+
+#endif /* COMMON_CONFIG_COMMONSUBSYSTEMID_H_ */

fsfwconfig/events/subsystemIdRanges.h

@@ -1,6 +1,7 @@
 #ifndef FSFWCONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 #define FSFWCONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 
+#include "commonSubsystemId.h"
 #include <fsfw/events/fwSubsystemIdRanges.h>
 #include <cstdint>
 
@@ -10,19 +11,7 @@
  */
 namespace SUBSYSTEM_ID {
 enum: uint8_t {
-	SUBSYSTE_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	PUS_SERVICE_2,
-	PUS_SERVICE_3,
-	PUS_SERVICE_5,
-	PUS_SERVICE_6,
-	PUS_SERVICE_8,
-	PUS_SERVICE_23,
-	MGM_LIS3MDL,
-	MGM_RM3100,
-	PCDU_HANDLER,
-	HEATER_HANDLER,
-	SA_DEPL_HANDLER,
-	PLOC_HANDLER
+	SUBSYSTEM_ID_START = COMMON_SUBSYSTEM_ID_END
 };
 }
 

linux/CMakeLists.txt

@@ -2,3 +2,4 @@ add_subdirectory(csp)
 add_subdirectory(uart)
 add_subdirectory(utility)
 add_subdirectory(boardtest)
+add_subdirectory(devices)

linux/devices/CMakeLists.txt

@@ -0,0 +1,5 @@
+target_sources(${TARGET_NAME} PRIVATE
+	HeaterHandler.cpp
+	SolarArrayDeploymentHandler.cpp
+	SusHandler.cpp
+)

linux/devices/HeaterHandler.cpp

@@ -1,7 +1,8 @@
 #include "HeaterHandler.h"
-#include <fsfwconfig/devices/powerSwitcherList.h>
+#include "devices/gpioIds.h"
+#include "devices/powerSwitcherList.h"
+
 #include <fsfw/ipc/QueueFactory.h>
-#include <devices/gpioIds.h>
 #include <fsfw_hal/common/gpio/GpioCookie.h>
 
 HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_,

linux/devices/SusHandler.cpp

@@ -1,6 +1,7 @@
-#include <fsfw/datapool/PoolReadGuard.h>
+#include "OBSWConfig.h"
 #include <mission/devices/SusHandler.h>
-#include <OBSWConfig.h>
+
+#include <fsfw/datapool/PoolReadGuard.h>
 #include <fsfw_hal/linux/spi/SpiComIF.h>
 
 SusHandler::SusHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie,

mission/devices/CMakeLists.txt

@@ -15,7 +15,6 @@ target_sources(${TARGET_NAME} PUBLIC
 	IMTQHandler.cpp
 	PlocHandler.cpp
 	RadiationSensorHandler.cpp
-	SusHandler.cpp
 )
 
 

mission/devices/IMTQHandler.cpp

@@ -1,9 +1,9 @@
 #include "IMTQHandler.h"
+#include "OBSWConfig.h"
 
-#include <fsfwconfig/OBSWConfig.h>
 #include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <fsfwconfig/OBSWConfig.h>
+
 
 IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
         DeviceHandlerBase(objectId, comIF, comCookie), engHkDataset(this), calMtmMeasurementSet(

mission/devices/PlocHandler.cpp

@@ -1,9 +1,8 @@
 #include "PlocHandler.h"
+#include "OBSWConfig.h"
 
-#include <fsfwconfig/OBSWConfig.h>
 #include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <fsfwconfig/OBSWConfig.h>
 
 PlocHandler::PlocHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
         DeviceHandlerBase(objectId, comIF, comCookie) {

mission/devices/PlocHandler.h

@@ -3,7 +3,7 @@
 
 #include <fsfw/devicehandlers/DeviceHandlerBase.h>
 #include <mission/devices/devicedefinitions/PlocDefinitions.h>
-#include <string.h>
+#include <cstring>
 
 /**
  * @brief	This is the device handler for the PLOC.

mission/devices/SyrlinksHkHandler.cpp

@@ -1,8 +1,9 @@
+#include "OBSWConfig.h"
+
 #include <mission/devices/SyrlinksHkHandler.h>
-#include <fsfwconfig/OBSWConfig.h>
 #include <fsfw/globalfunctions/CRC.h>
 #include <fsfw/datapool/PoolReadGuard.h>
-#include <fsfwconfig/OBSWConfig.h>
+
 
 SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) :
         DeviceHandlerBase(objectId, comIF, comCookie), rxDataset(this), txDataset(this) {