From 6f9a1853ffc6b709e085b6f5d9f74d63bf5f1544 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 May 2021 16:37:29 +0200 Subject: [PATCH] host compiling again --- .../fsfwconfig/events/subsystemIdRanges.h | 14 ++-------- common/config/commonSubsystemId.h | 26 +++++++++++++++++++ fsfwconfig/events/subsystemIdRanges.h | 15 ++--------- linux/CMakeLists.txt | 1 + linux/devices/CMakeLists.txt | 5 ++++ {bsp_q7s => linux}/devices/HeaterHandler.cpp | 5 ++-- {bsp_q7s => linux}/devices/HeaterHandler.h | 0 .../devices/SolarArrayDeploymentHandler.cpp | 0 .../devices/SolarArrayDeploymentHandler.h | 0 {mission => linux}/devices/SusHandler.cpp | 5 ++-- {mission => linux}/devices/SusHandler.h | 0 mission/devices/CMakeLists.txt | 1 - mission/devices/IMTQHandler.cpp | 4 +-- mission/devices/PlocHandler.cpp | 3 +-- mission/devices/PlocHandler.h | 2 +- mission/devices/SyrlinksHkHandler.cpp | 5 ++-- 16 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 common/config/commonSubsystemId.h create mode 100644 linux/devices/CMakeLists.txt rename {bsp_q7s => linux}/devices/HeaterHandler.cpp (99%) rename {bsp_q7s => linux}/devices/HeaterHandler.h (100%) rename {bsp_q7s => linux}/devices/SolarArrayDeploymentHandler.cpp (100%) rename {bsp_q7s => linux}/devices/SolarArrayDeploymentHandler.h (100%) rename {mission => linux}/devices/SusHandler.cpp (99%) rename {mission => linux}/devices/SusHandler.h (100%) diff --git a/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h index 51534f60..98776b6a 100644 --- a/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h +++ b/bsp_hosted/fsfwconfig/events/subsystemIdRanges.h @@ -1,7 +1,7 @@ #ifndef CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_ #define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_ -#include +#include "commonSubsystemId.h" #include /** @@ -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 }; } diff --git a/common/config/commonSubsystemId.h b/common/config/commonSubsystemId.h new file mode 100644 index 00000000..b19fea3a --- /dev/null +++ b/common/config/commonSubsystemId.h @@ -0,0 +1,26 @@ +#ifndef COMMON_CONFIG_COMMONSUBSYSTEMID_H_ +#define COMMON_CONFIG_COMMONSUBSYSTEMID_H_ + +#include + +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_ */ diff --git a/fsfwconfig/events/subsystemIdRanges.h b/fsfwconfig/events/subsystemIdRanges.h index b33ee807..f6f6b161 100644 --- a/fsfwconfig/events/subsystemIdRanges.h +++ b/fsfwconfig/events/subsystemIdRanges.h @@ -1,6 +1,7 @@ #ifndef FSFWCONFIG_EVENTS_SUBSYSTEMIDRANGES_H_ #define FSFWCONFIG_EVENTS_SUBSYSTEMIDRANGES_H_ +#include "commonSubsystemId.h" #include #include @@ -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 }; } diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7e6d1f35..1e00391b 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -2,3 +2,4 @@ add_subdirectory(csp) add_subdirectory(uart) add_subdirectory(utility) add_subdirectory(boardtest) +add_subdirectory(devices) diff --git a/linux/devices/CMakeLists.txt b/linux/devices/CMakeLists.txt new file mode 100644 index 00000000..3871a6a6 --- /dev/null +++ b/linux/devices/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(${TARGET_NAME} PRIVATE + HeaterHandler.cpp + SolarArrayDeploymentHandler.cpp + SusHandler.cpp +) diff --git a/bsp_q7s/devices/HeaterHandler.cpp b/linux/devices/HeaterHandler.cpp similarity index 99% rename from bsp_q7s/devices/HeaterHandler.cpp rename to linux/devices/HeaterHandler.cpp index 6c5af7be..6f38eb52 100644 --- a/bsp_q7s/devices/HeaterHandler.cpp +++ b/linux/devices/HeaterHandler.cpp @@ -1,7 +1,8 @@ #include "HeaterHandler.h" -#include +#include "devices/gpioIds.h" +#include "devices/powerSwitcherList.h" + #include -#include #include HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_, diff --git a/bsp_q7s/devices/HeaterHandler.h b/linux/devices/HeaterHandler.h similarity index 100% rename from bsp_q7s/devices/HeaterHandler.h rename to linux/devices/HeaterHandler.h diff --git a/bsp_q7s/devices/SolarArrayDeploymentHandler.cpp b/linux/devices/SolarArrayDeploymentHandler.cpp similarity index 100% rename from bsp_q7s/devices/SolarArrayDeploymentHandler.cpp rename to linux/devices/SolarArrayDeploymentHandler.cpp diff --git a/bsp_q7s/devices/SolarArrayDeploymentHandler.h b/linux/devices/SolarArrayDeploymentHandler.h similarity index 100% rename from bsp_q7s/devices/SolarArrayDeploymentHandler.h rename to linux/devices/SolarArrayDeploymentHandler.h diff --git a/mission/devices/SusHandler.cpp b/linux/devices/SusHandler.cpp similarity index 99% rename from mission/devices/SusHandler.cpp rename to linux/devices/SusHandler.cpp index 59560707..c658eb67 100644 --- a/mission/devices/SusHandler.cpp +++ b/linux/devices/SusHandler.cpp @@ -1,6 +1,7 @@ -#include +#include "OBSWConfig.h" #include -#include + +#include #include SusHandler::SusHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie, diff --git a/mission/devices/SusHandler.h b/linux/devices/SusHandler.h similarity index 100% rename from mission/devices/SusHandler.h rename to linux/devices/SusHandler.h diff --git a/mission/devices/CMakeLists.txt b/mission/devices/CMakeLists.txt index 9965fedc..4088d98b 100644 --- a/mission/devices/CMakeLists.txt +++ b/mission/devices/CMakeLists.txt @@ -15,7 +15,6 @@ target_sources(${TARGET_NAME} PUBLIC IMTQHandler.cpp PlocHandler.cpp RadiationSensorHandler.cpp - SusHandler.cpp ) diff --git a/mission/devices/IMTQHandler.cpp b/mission/devices/IMTQHandler.cpp index 3111c39d..5751dd50 100644 --- a/mission/devices/IMTQHandler.cpp +++ b/mission/devices/IMTQHandler.cpp @@ -1,9 +1,9 @@ #include "IMTQHandler.h" +#include "OBSWConfig.h" -#include #include #include -#include + IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) : DeviceHandlerBase(objectId, comIF, comCookie), engHkDataset(this), calMtmMeasurementSet( diff --git a/mission/devices/PlocHandler.cpp b/mission/devices/PlocHandler.cpp index b0660ba0..2101915a 100644 --- a/mission/devices/PlocHandler.cpp +++ b/mission/devices/PlocHandler.cpp @@ -1,9 +1,8 @@ #include "PlocHandler.h" +#include "OBSWConfig.h" -#include #include #include -#include PlocHandler::PlocHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) : DeviceHandlerBase(objectId, comIF, comCookie) { diff --git a/mission/devices/PlocHandler.h b/mission/devices/PlocHandler.h index 06965d0f..c92b3705 100644 --- a/mission/devices/PlocHandler.h +++ b/mission/devices/PlocHandler.h @@ -3,7 +3,7 @@ #include #include -#include +#include /** * @brief This is the device handler for the PLOC. diff --git a/mission/devices/SyrlinksHkHandler.cpp b/mission/devices/SyrlinksHkHandler.cpp index bab5e551..7900b8e4 100644 --- a/mission/devices/SyrlinksHkHandler.cpp +++ b/mission/devices/SyrlinksHkHandler.cpp @@ -1,8 +1,9 @@ +#include "OBSWConfig.h" + #include -#include #include #include -#include + SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF * comCookie) : DeviceHandlerBase(objectId, comIF, comCookie), rxDataset(this), txDataset(this) {