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

fixes so stm32 example compiles

Browse Source
This commit is contained in:
Robin Müller 2021-10-27 17:08:01 +02:00
parent fb960cce8d
commit 105d59a1f5
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -93,14 +93,6 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
if(FSFW_BUILD_UNITTESTS)
configure_file(src/fsfw/FSFW.h.in fsfw/FSFW.h)
configure_file(src/fsfw/FSFWVersion.h.in fsfw/FSFWVersion.h)
else()
configure_file(src/fsfw/FSFW.h.in FSFW.h)
configure_file(src/fsfw/FSFWVersion.h.in FSFWVersion.h)
endif()
if(NOT CMAKE_CXX_STANDARD) if(NOT CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_STANDARD_REQUIRED True)
@ -155,6 +147,14 @@ else()
set(OS_FSFW "host") set(OS_FSFW "host")
endif() endif()
if(FSFW_BUILD_UNITTESTS)
configure_file(src/fsfw/FSFW.h.in fsfw/FSFW.h)
configure_file(src/fsfw/FSFWVersion.h.in fsfw/FSFWVersion.h)
else()
configure_file(src/fsfw/FSFW.h.in FSFW.h)
configure_file(src/fsfw/FSFWVersion.h.in FSFWVersion.h)
endif()
message(STATUS "Compiling FSFW for the ${FSFW_OS_NAME} operating system.") message(STATUS "Compiling FSFW for the ${FSFW_OS_NAME} operating system.")
add_subdirectory(src) add_subdirectory(src)

2
src/CMakeLists.txt
View File

@ -16,5 +16,3 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
target_include_directories(${LIB_FSFW_NAME} INTERFACE target_include_directories(${LIB_FSFW_NAME} INTERFACE
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
configure_file(fsfw/FSFW.h.in fsfw/FSFW.h)

10
src/fsfw/tcdistribution/PUSDistributor.cpp
View File

@ -30,19 +30,19 @@ PUSDistributor::TcMqMapIter PUSDistributor::selectDestination() {
if(tcStatus != HasReturnvaluesIF::RETURN_OK) { if(tcStatus != HasReturnvaluesIF::RETURN_OK) {
#if FSFW_VERBOSE_LEVEL >= 1 #if FSFW_VERBOSE_LEVEL >= 1
const char* keyword = "unnamed error"; const char* keyword = "unnamed error";
if(tcStatus == TcPacketCheck::INCORRECT_CHECKSUM) { if(tcStatus == TcPacketCheckPUS::INCORRECT_CHECKSUM) {
keyword = "checksum"; keyword = "checksum";
} }
else if(tcStatus == TcPacketCheck::INCORRECT_PRIMARY_HEADER) { else if(tcStatus == TcPacketCheckPUS::INCORRECT_PRIMARY_HEADER) {
keyword = "incorrect primary header"; keyword = "incorrect primary header";
} }
else if(tcStatus == TcPacketCheck::ILLEGAL_APID) { else if(tcStatus == TcPacketCheckPUS::ILLEGAL_APID) {
keyword = "illegal APID"; keyword = "illegal APID";
} }
else if(tcStatus == TcPacketCheck::INCORRECT_SECONDARY_HEADER) { else if(tcStatus == TcPacketCheckPUS::INCORRECT_SECONDARY_HEADER) {
keyword = "incorrect secondary header"; keyword = "incorrect secondary header";
} }
else if(tcStatus == TcPacketCheck::INCOMPLETE_PACKET) { else if(tcStatus == TcPacketCheckPUS::INCOMPLETE_PACKET) {
keyword = "incomplete packet"; keyword = "incomplete packet";
} }
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1