From 24062071c047886be41a62dedc82653da759ed89 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 27 Sep 2022 14:56:32 +0200 Subject: [PATCH 1/7] bump json dependency to concrete version v3.11.2 --- thirdparty/json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/json b/thirdparty/json index fb1ee4f9..bc889afb 160000 --- a/thirdparty/json +++ b/thirdparty/json @@ -1 +1 @@ -Subproject commit fb1ee4f94b426a398969b2c96df9784be8e007e6 +Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d From 1aa3cc3595e7aba7f07f4a305076f32e103ff89f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 27 Sep 2022 21:45:22 +0200 Subject: [PATCH 2/7] cant build GW SW of windows --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b8190ec..a59783b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -367,7 +367,11 @@ if(EIVE_ADD_LINUX_FILES) add_subdirectory(${LINUX_PATH}) endif() add_subdirectory(${BSP_PATH}) -add_subdirectory(${LIB_GOMSPACE_PATH}) + +if(UNIX) + add_subdirectory(${LIB_GOMSPACE_PATH}) +endif() + add_subdirectory(${COMMON_PATH}) add_subdirectory(${DUMMY_PATH}) @@ -452,8 +456,7 @@ if(TGT_BSP MATCHES "arm/q7s") endif() target_link_libraries( - ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES} - ${LIB_GOMSPACE_CLIENTS}) + ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES}) if(TGT_BSP MATCHES "arm/egse") target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC}) From 0c75997ba08d1842a06e43272af19100a9ce16eb Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 27 Sep 2022 23:59:17 +0200 Subject: [PATCH 3/7] 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_ */ From 6888df5c44c3816a64bc635fb4d0d600ea3453ff Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 27 Sep 2022 23:59:38 +0200 Subject: [PATCH 4/7] afmt --- linux/obc/PtmeConfig.h | 2 +- mission/devices/SusHandler.h | 3 +-- mission/devices/devicedefinitions/GomspaceDefinitions.h | 2 +- mission/devices/devicedefinitions/gomspaceDefines.h | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/linux/obc/PtmeConfig.h b/linux/obc/PtmeConfig.h index aa5c663a..9c5a85af 100644 --- a/linux/obc/PtmeConfig.h +++ b/linux/obc/PtmeConfig.h @@ -4,8 +4,8 @@ #include "AxiPtmeConfig.h" #include "fsfw/objectmanager/SystemObject.h" #include "fsfw/returnvalues/returnvalue.h" -#include "returnvalues/classIds.h" #include "linux/obc/PtmeConfig.h" +#include "returnvalues/classIds.h" /** * @brief Class to configure donwlink specific parameters in the PTME IP core. diff --git a/mission/devices/SusHandler.h b/mission/devices/SusHandler.h index 94673c40..5645c47d 100644 --- a/mission/devices/SusHandler.h +++ b/mission/devices/SusHandler.h @@ -4,10 +4,9 @@ #include #include "devicedefinitions/SusDefinitions.h" +#include "events/subsystemIdRanges.h" #include "fsfw/globalfunctions/PeriodicOperationDivider.h" #include "mission/devices/max1227.h" - -#include "events/subsystemIdRanges.h" #include "returnvalues/classIds.h" /** diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h index 879adf82..40a4fc59 100644 --- a/mission/devices/devicedefinitions/GomspaceDefinitions.h +++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h @@ -5,11 +5,11 @@ #include #include #include -#include "fsfw/platform.h" #include #include "devices/powerSwitcherList.h" +#include "fsfw/platform.h" #include "gomspaceDefines.h" namespace GOMSPACE { diff --git a/mission/devices/devicedefinitions/gomspaceDefines.h b/mission/devices/devicedefinitions/gomspaceDefines.h index 2260e7e6..af96c228 100644 --- a/mission/devices/devicedefinitions/gomspaceDefines.h +++ b/mission/devices/devicedefinitions/gomspaceDefines.h @@ -23,6 +23,4 @@ static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B; #endif - - #endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */ From e2b83f92228ba72b7d78c506fe24272d798f37d6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 28 Sep 2022 00:02:03 +0200 Subject: [PATCH 5/7] update .cproject file --- misc/eclipse/.cproject | 66 +++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/misc/eclipse/.cproject b/misc/eclipse/.cproject index 9bb5f401..082b64f2 100644 --- a/misc/eclipse/.cproject +++ b/misc/eclipse/.cproject @@ -19,7 +19,7 @@ - +