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

Merge branch 'development' into mueller/rtems-update-stm32

Browse Source
This commit is contained in:
Steffen Gaisser 2021-01-12 15:01:33 +01:00
commit fa66fafd2c
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -139,5 +139,4 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
target_compile_options(${LIB_FSFW_NAME} PRIVATE target_compile_options(${LIB_FSFW_NAME} PRIVATE
${WARNING_FLAGS} ${WARNING_FLAGS}
${COMPILER_FLAGS} ${COMPILER_FLAGS}
${ABI_FLAGS}
) )

3
defaultcfg/fsfwconfig/OBSWConfig.h
View File

@ -3,11 +3,12 @@
#include "OBSWVersion.h" #include "OBSWVersion.h"
#ifdef __cplusplus
#include "objects/systemObjectList.h" #include "objects/systemObjectList.h"
#include "events/subsystemIdRanges.h" #include "events/subsystemIdRanges.h"
#include "returnvalues/classIds.h" #include "returnvalues/classIds.h"
#ifdef __cplusplus
namespace config { namespace config {
#endif #endif

6
devicehandlers/DeviceHandlerBase.cpp
View File

@ -682,8 +682,10 @@ void DeviceHandlerBase::doGetRead() {
replyRawData(receivedData, receivedDataLen, requestedRawTraffic); replyRawData(receivedData, receivedDataLen, requestedRawTraffic);
} }
if (mode == MODE_RAW and defaultRawReceiver != MessageQueueIF::NO_QUEUE) { if (mode == MODE_RAW) {
replyRawReplyIfnotWiretapped(receivedData, receivedDataLen); if (defaultRawReceiver != MessageQueueIF::NO_QUEUE) {
replyRawReplyIfnotWiretapped(receivedData, receivedDataLen);
}
} }
else { else {
parseReply(receivedData, receivedDataLen); parseReply(receivedData, receivedDataLen);

4
osal/host/CMakeLists.txt
View File

@ -13,9 +13,11 @@ target_sources(${LIB_FSFW_NAME}
) )
if(UNIX) if(UNIX)
find_package(Threads REQUIRED)
target_link_libraries(${LIB_FSFW_NAME} target_link_libraries(${LIB_FSFW_NAME}
PRIVATE PRIVATE
rt rt
pthread ${CMAKE_THREAD_LIBS_INIT}
) )
endif() endif()

14
osal/linux/CMakeLists.txt
View File

@ -18,8 +18,14 @@ target_sources(${LIB_FSFW_NAME}
Timer.cpp Timer.cpp
) )
target_link_libraries(${LIB_FSFW_NAME} find_package(Threads REQUIRED)
PRIVATE
rt target_link_libraries(${LIB_FSFW_NAME} PRIVATE
pthread ${CMAKE_THREAD_LIBS_INIT}
rt
) )
target_link_libraries(${LIB_FSFW_NAME} INTERFACE
${CMAKE_THREAD_LIBS_INIT}
)

2
unittest/CMakeLists.txt Normal file
View File

@ -0,0 +1,2 @@
add_subdirectory(internal)
add_subdirectory(tests)