From dac52af779625355d0a9875dcfbed49d39520eda Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Thu, 15 Jul 2021 19:27:54 +0200
Subject: [PATCH] last include corrections

---
 CMakeLists.txt                              |  2 --
 bsp_stm32h7_freertos/core/ObjectFactory.cpp | 10 +++++-----
 fsfw                                        |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 552810c..d188520 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,12 +39,10 @@ set(FREERTOS_NAMESPACE FreeRTOS::STM32::H7::M7)
 # Set names and variables
 set(TARGET_NAME ${CMAKE_PROJECT_NAME}) 
 set(LIB_FSFW_NAME fsfw)
-set(LIB_FSFW_HAL_NAME fsfw_hal)
 
 # Set path names
 set(FSFW_PATH fsfw)
 set(COMMON_PATH example_common)
-# set(LIB_FSFW_HAL_PATH fsfw_hal)
 
 set(BSP_PATH "bsp_stm32h7_freertos")
 set(COMMON_CONFIG_PATH "${COMMON_PATH}/config")
diff --git a/bsp_stm32h7_freertos/core/ObjectFactory.cpp b/bsp_stm32h7_freertos/core/ObjectFactory.cpp
index 5c28d6e..0b0f936 100644
--- a/bsp_stm32h7_freertos/core/ObjectFactory.cpp
+++ b/bsp_stm32h7_freertos/core/ObjectFactory.cpp
@@ -19,11 +19,11 @@
 
 
 #if OBSW_PERFORM_L3GD20H_TEST == 1
-#include "fsfw_hal/stm32h7/spi/SpiCookie.h"
-#include "fsfw_hal/stm32h7/spi/SpiComIF.h"
-#include "fsfw_hal/devicehandlers/GyroL3GD20Handler.h"
-#include "fsfw_hal/stm32h7/spi/stm32h743ziSpi.h"
-#include "fsfw_hal/stm32h7/spi/spiCore.h"
+#include "fsfw/hal/stm32h7/spi/SpiCookie.h"
+#include "fsfw/hal/stm32h7/spi/SpiComIF.h"
+#include "fsfw/hal/devicehandlers/GyroL3GD20Handler.h"
+#include "fsfw/hal/stm32h7/spi/stm32h743ziSpi.h"
+#include "fsfw/hal/stm32h7/spi/spiCore.h"
 DMA_HandleTypeDef* txHandle = nullptr;
 DMA_HandleTypeDef* rxHandle = nullptr;
 #endif
diff --git a/fsfw b/fsfw
index 1db5c95..aafccd1 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 1db5c950b883a0e95644e06a49ef74577a289a4e
+Subproject commit aafccd191e3a592e19c09b01b95dea89c8936e54