From a7becd254534b6aec4233a4110f1acd2100aa46b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 11 Jun 2021 14:01:11 +0200
Subject: [PATCH] some linux fixes

---
 CMakeLists.txt                 | 11 +----------
 bsp_linux/core/InitMission.cpp |  4 ++--
 bsp_linux/main.cpp             |  6 +++---
 example_common                 |  2 +-
 fsfw                           |  2 +-
 fsfw_hal                       |  2 +-
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e305fd7..63e540f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,16 +64,7 @@ set(FSFW_ADDITIONAL_INC_PATHS
     "FSFW configuration paths"
 )
 
-if(TGT_BSP MATCHES "arm/stm32h743zi-nucleo")
-    # 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()
+message(STATUS ${FSFW_ADDITIONAL_INC_PATHS})
 
 configure_file(${COMMON_CONFIG_PATH}/commonConfig.h.in commonConfig.h)
 configure_file(${FSFW_CONFIG_PATH}/FSFWConfig.h.in FSFWConfig.h)
diff --git a/bsp_linux/core/InitMission.cpp b/bsp_linux/core/InitMission.cpp
index d74ba45..af2926f 100644
--- a/bsp_linux/core/InitMission.cpp
+++ b/bsp_linux/core/InitMission.cpp
@@ -1,8 +1,8 @@
 #include "InitMission.h"
 #include "OBSWConfig.h"
 
-#include <bsp_linux/fsfwconfig/objects/systemObjectList.h>
-#include <bsp_linux/fsfwconfig/pollingsequence/pollingSequenceFactory.h>
+#include "objects/systemObjectList.h"
+#include "pollingsequence/pollingSequenceFactory.h"
 
 #include <mission/utility/TaskCreation.h>
 
diff --git a/bsp_linux/main.cpp b/bsp_linux/main.cpp
index 4696be2..d7857cb 100644
--- a/bsp_linux/main.cpp
+++ b/bsp_linux/main.cpp
@@ -1,9 +1,9 @@
-#include <bsp_hosted/core/InitMission.h>
-#include <bsp_hosted/core/ObjectFactory.h>
+#include "core/InitMission.h"
+#include "core/ObjectFactory.h"
 
 #include <test/MutexExample.h>
 #include <mission/utility/PusPacketCreator.h>
-#include <common/utility/utility.h>
+#include "utility/utility.h"
 
 #include <fsfw/objectmanager/ObjectManager.h>
 #include <fsfw/serviceinterface/ServiceInterface.h>
diff --git a/example_common b/example_common
index 6493528..d79ab3d 160000
--- a/example_common
+++ b/example_common
@@ -1 +1 @@
-Subproject commit 64935286e10d01760c6b21b2aa2e1f44ae6c1083
+Subproject commit d79ab3df3548f4020cb763bac800765b53f07716
diff --git a/fsfw b/fsfw
index 2f51152..fb7b059 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 2f511523cb71e00b4669db002b171d626a63fddf
+Subproject commit fb7b059137ca873b405b95f8d3072f4ae85ce2ff
diff --git a/fsfw_hal b/fsfw_hal
index ae322d9..cd0dfc4 160000
--- a/fsfw_hal
+++ b/fsfw_hal
@@ -1 +1 @@
-Subproject commit ae322d981bd1ed8411a058ba6b4dc185f00a12f3
+Subproject commit cd0dfc49d5527755462118445832888572a92169