From 0c75997ba08d1842a06e43272af19100a9ce16eb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 27 Sep 2022 23:59:17 +0200 Subject: [PATCH] now it compiles for windows again --- CMakeLists.txt | 6 ++-- fsfw | 2 +- .../devicedefinitions/GomspaceDefinitions.h | 8 ++---- .../devicedefinitions/gomspaceDefines.h | 28 +++++++++++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 mission/devices/devicedefinitions/gomspaceDefines.h diff --git a/CMakeLists.txt b/CMakeLists.txt index a59783b4..e8efc3fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -462,9 +462,9 @@ if(TGT_BSP MATCHES "arm/egse") target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC}) endif() -target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS}) -target_link_libraries(${LIB_EIVE_MISSION} PRIVATE ${LIB_GOMSPACE_CLIENTS}) -target_link_libraries(${LIB_DUMMIES} PRIVATE ${LIB_GOMSPACE_CLIENTS}) +if(UNIX) + target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_GOMSPACE_CLIENTS}) +endif() if(EIVE_ADD_ETL_LIB) target_link_libraries(${LIB_EIVE_MISSION} PUBLIC ${LIB_ETL_TARGET}) diff --git a/fsfw b/fsfw index 7e0a5d5a..03e1a932 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 7e0a5d5a9e4f38c6d818bbdd5b44d34d8007eb1e +Subproject commit 03e1a9325034bd9805bfc3a1aa65e9c188762d12 diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h index cab71362..879adf82 100644 --- a/mission/devices/devicedefinitions/GomspaceDefinitions.h +++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h @@ -5,16 +5,12 @@ #include #include #include +#include "fsfw/platform.h" #include #include "devices/powerSwitcherList.h" -#include "p60acu_hk.h" -#include "p60acu_param.h" -#include "p60dock_hk.h" -#include "p60dock_param.h" -#include "p60pdu_hk.h" -#include "p60pdu_param.h" +#include "gomspaceDefines.h" namespace GOMSPACE { diff --git a/mission/devices/devicedefinitions/gomspaceDefines.h b/mission/devices/devicedefinitions/gomspaceDefines.h new file mode 100644 index 00000000..2260e7e6 --- /dev/null +++ b/mission/devices/devicedefinitions/gomspaceDefines.h @@ -0,0 +1,28 @@ +#ifndef MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ +#define MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ + +#include "fsfw/platform.h" + +#ifdef PLATFORM_WIN + +static constexpr uint32_t P60DOCK_HK_SIZE = 0xBE; +static constexpr uint32_t P60DOCK_PARAM_SIZE = 0x19C; +static constexpr uint32_t P60PDU_HK_SIZE = 0x90; +static constexpr uint32_t P60PDU_PARAM_SIZE = 0x13E; +static constexpr uint32_t P60ACU_HK_SIZE = 0x7C; +static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B; + +#else + +#include "p60acu_hk.h" +#include "p60acu_param.h" +#include "p60dock_hk.h" +#include "p60dock_param.h" +#include "p60pdu_hk.h" +#include "p60pdu_param.h" + +#endif + + + +#endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */