some linux fixes
This commit is contained in:
@ -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)
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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>
|
||||||
|
Submodule example_common updated: 64935286e1...d79ab3df35
2
fsfw
2
fsfw
Submodule fsfw updated: 2f511523cb...fb7b059137
2
fsfw_hal
2
fsfw_hal
Submodule fsfw_hal updated: ae322d981b...cd0dfc49d5
Reference in New Issue
Block a user