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

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +4226 -10526
932 changed files with 4226 additions and 10526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit eb89615722 - Show all commits

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