KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

update fsfw, fixes for CFDP

Browse Source
This commit is contained in:
Robin Müller 2021-07-15 20:06:20 +02:00
parent 94f8a36eb4
commit eb89615722
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -29,7 +29,7 @@ elseif(${CMAKE_CXX_STANDARD} LESS 11)
endif() endif()
# Backwards comptability # 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") message(WARNING "Please pass the FSFW OSAL as FSFW_OSAL instead of OS_FSFW")
set(FSFW_OSAL OS_FSFW) set(FSFW_OSAL OS_FSFW)
endif() endif()

8
src/core/tcdistribution/CFDPDistributor.cpp
View File

@ -1,8 +1,8 @@
#include "CCSDSDistributorIF.h" #include "fsfw/tcdistribution/CCSDSDistributorIF.h"
#include "CFDPDistributor.h" #include "fsfw/tcdistribution/CFDPDistributor.h"
#include "../objectmanager/ObjectManager.h" #include "fsfw/objectmanager/ObjectManager.h"
#include "../serviceinterface/ServiceInterface.h" #include "fsfw/serviceinterface/ServiceInterface.h"
#define CFDP_DISTRIBUTOR_DEBUGGING 0 #define CFDP_DISTRIBUTOR_DEBUGGING 0