From eb896157226b913fbc447a6143ef4e8ff16b4c66 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 15 Jul 2021 20:06:20 +0200 Subject: [PATCH] update fsfw, fixes for CFDP --- CMakeLists.txt | 2 +- src/core/tcdistribution/CFDPDistributor.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ea8c9b1..fa721031 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ elseif(${CMAKE_CXX_STANDARD} LESS 11) endif() # Backwards comptability -if(OS_FSFW) +if(OS_FSFW AND NOT FSFW_OSAL) message(WARNING "Please pass the FSFW OSAL as FSFW_OSAL instead of OS_FSFW") set(FSFW_OSAL OS_FSFW) endif() diff --git a/src/core/tcdistribution/CFDPDistributor.cpp b/src/core/tcdistribution/CFDPDistributor.cpp index 1b257517..9266a7fa 100644 --- a/src/core/tcdistribution/CFDPDistributor.cpp +++ b/src/core/tcdistribution/CFDPDistributor.cpp @@ -1,8 +1,8 @@ -#include "CCSDSDistributorIF.h" -#include "CFDPDistributor.h" +#include "fsfw/tcdistribution/CCSDSDistributorIF.h" +#include "fsfw/tcdistribution/CFDPDistributor.h" -#include "../objectmanager/ObjectManager.h" -#include "../serviceinterface/ServiceInterface.h" +#include "fsfw/objectmanager/ObjectManager.h" +#include "fsfw/serviceinterface/ServiceInterface.h" #define CFDP_DISTRIBUTOR_DEBUGGING 0