eive/eive-obsw
eive
/
eive-obsw
12
3
Fork 0
Code Issues 3 Pull Requests 1 Releases 117 Wiki Activity

now it compiles for windows again

This commit is contained in:
Robin Müller 2022-09-27 23:59:17 +02:00
parent 1aa3cc3595
commit 0c75997ba0
No known key found for this signature in database
GPG Key ID: BE6480244DFE612C
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -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})

2
fsfw

@ -1 +1 @@
Subproject commit 7e0a5d5a9e4f38c6d818bbdd5b44d34d8007eb1e
Subproject commit 03e1a9325034bd9805bfc3a1aa65e9c188762d12

8
mission/devices/devicedefinitions/GomspaceDefinitions.h
View File

@ -5,16 +5,12 @@
#include <fsfw/datapoollocal/StaticLocalDataSet.h>
#include <fsfw/devicehandlers/DeviceHandlerIF.h>
#include <fsfw/power/definitions.h>
#include "fsfw/platform.h"
#include <cstdint>
#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 {

28
mission/devices/devicedefinitions/gomspaceDefines.h Normal file
View File

@ -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_ */