fsfw/fsfw-example-linux-mcu
fsfw/fsfw-example-linux-mcu
11
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some linux fixes

Browse Source
This commit is contained in:
Robin Müller 2021-06-11 14:01:11 +02:00
parent c847305f0a
commit a7becd2545
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
6 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -64,16 +64,7 @@ set(FSFW_ADDITIONAL_INC_PATHS
"FSFW configuration paths" "FSFW configuration paths"
) )
if(TGT_BSP MATCHES "arm/stm32h743zi-nucleo") message(STATUS ${FSFW_ADDITIONAL_INC_PATHS})
# TODO: This works but is a horrible mess. In the future, stm32-cmake support will be used and
# linked against, so we have a clean interface which can be used by FSFW HAL.
set(FSFW_HAL_ADDITIONAL_INC_PATHS
${BOARD_CONFIG_PATH}
"${BSP_PATH}/STM32CubeH7/Drivers/BSP/STM32H7xx_Nucleo"
CACHE STRING
"FSFW HAL configuration paths"
)
endif()
configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h) configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h) configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)

4
bsp_linux/core/InitMission.cpp
View File

@ -1,8 +1,8 @@
#include "InitMission.h" #include "InitMission.h"
#include "OBSWConfig.h" #include "OBSWConfig.h"
#include <bsp_linux/fsfwconfig/objects/systemObjectList.h> #include "objects/systemObjectList.h"
#include <bsp_linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h> #include "pollingsequence/pollingSequenceFactory.h"
#include <mission/utility/TaskCreation.h> #include <mission/utility/TaskCreation.h>

6
bsp_linux/main.cpp
View File

@ -1,9 +1,9 @@
#include <bsp_hosted/core/InitMission.h> #include "core/InitMission.h"
#include <bsp_hosted/core/ObjectFactory.h> #include "core/ObjectFactory.h"
#include <test/MutexExample.h> #include <test/MutexExample.h>
#include <mission/utility/PusPacketCreator.h> #include <mission/utility/PusPacketCreator.h>
#include <common/utility/utility.h> #include "utility/utility.h"
#include <fsfw/objectmanager/ObjectManager.h> #include <fsfw/objectmanager/ObjectManager.h>
#include <fsfw/serviceinterface/ServiceInterface.h> #include <fsfw/serviceinterface/ServiceInterface.h>

2
example_common

@ -1 +1 @@
Subproject commit 64935286e10d01760c6b21b2aa2e1f44ae6c1083 Subproject commit d79ab3df3548f4020cb763bac800765b53f07716

2
fsfw

@ -1 +1 @@
Subproject commit 2f511523cb71e00b4669db002b171d626a63fddf Subproject commit fb7b059137ca873b405b95f8d3072f4ae85ce2ff

2
fsfw_hal

@ -1 +1 @@
Subproject commit ae322d981bd1ed8411a058ba6b4dc185f00a12f3 Subproject commit cd0dfc49d5527755462118445832888572a92169