eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

update fsfw

Browse Source
This commit is contained in:
Robin Müller 2021-07-15 01:25:32 +02:00
parent 76e0501813
commit 4c2620fc3e
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -20,8 +20,8 @@ if(TGT_BSP MATCHES "arm/q7s")
endif() endif()
option(ADD_ETL_LIB "Add ETL library" ON) option(ADD_ETL_LIB "Add ETL library" ON)
if(NOT OS_FSFW) if(NOT FSFW_OSAL)
set(OS_FSFW host CACHE STRING "OS for the FSFW.") set(FSFW_OSAL host CACHE STRING "OS for the FSFW.")
endif() endif()
if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack") if(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/beagleboneblack")
@ -156,7 +156,7 @@ endif()
# Post-Sources preparation # Post-Sources preparation
################################################################################ ################################################################################
set_property(CACHE OS_FSFW PROPERTY STRINGS host linux) set_property(CACHE FSFW_OSAL PROPERTY STRINGS host linux)
if(NOT Q7S_SIMPLE_MODE) if(NOT Q7S_SIMPLE_MODE)
# Add libraries for all sources. # Add libraries for all sources.
@ -243,7 +243,7 @@ endif()
string(CONCAT POST_BUILD_COMMENT string(CONCAT POST_BUILD_COMMENT
"Build directory: ${CMAKE_BINARY_DIR}\n" "Build directory: ${CMAKE_BINARY_DIR}\n"
"Target OSAL: ${OS_FSFW}\n" "Target OSAL: ${FSFW_OSAL}\n"
"Target Build Type: ${CMAKE_BUILD_TYPE}\n" "Target Build Type: ${CMAKE_BUILD_TYPE}\n"
"${TARGET_STRING}" "${TARGET_STRING}"
) )

6
cmake/HardwareOsPreConfig.cmake
View File

@ -1,13 +1,13 @@
function(pre_source_hw_os_config) function(pre_source_hw_os_config)
# FreeRTOS # FreeRTOS
if(${OS_FSFW} MATCHES freertos) if(FSFW_OSAL MATCHES freertos)
message(FATAL_ERROR "No FreeRTOS support implemented yet.") message(FATAL_ERROR "No FreeRTOS support implemented yet.")
# RTEMS # RTEMS
elseif(${OS_FSFW} STREQUAL rtems) elseif(FSFW_OSAL STREQUAL rtems)
add_definitions(-DRTEMS) add_definitions(-DRTEMS)
message(FATAL_ERROR "No RTEMS support implemented yet.") message(FATAL_ERROR "No RTEMS support implemented yet.")
elseif(${OS_FSFW} STREQUAL linux) elseif(FSFW_OSAL STREQUAL linux)
add_definitions(-DUNIX -DLINUX) add_definitions(-DUNIX -DLINUX)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
# Hosted # Hosted

12
cmake/PreProjectConfig.cmake
View File

@ -2,21 +2,21 @@ function(pre_project_config)
# Basic input sanitization # Basic input sanitization
if(DEFINED TGT_BSP) if(DEFINED TGT_BSP)
if(${TGT_BSP} MATCHES "arm/raspberrypi" AND NOT ${OS_FSFW} MATCHES linux) if(${TGT_BSP} MATCHES "arm/raspberrypi" AND NOT FSFW_OSAL MATCHES linux)
message(STATUS "FSFW OSAL invalid for specified target BSP ${TGT_BSP}!") message(STATUS "FSFW OSAL invalid for specified target BSP ${TGT_BSP}!")
message(STATUS "Setting valid OS_FSFW: linux") message(STATUS "Setting valid FSFW_OSAL: linux")
set(OS_FSFW "linux") set(FSFW_OSAL "linux")
endif() endif()
endif() endif()
# Disable compiler checks for cross-compiling. # Disable compiler checks for cross-compiling.
if(${OS_FSFW} STREQUAL linux AND TGT_BSP) if(FSFW_OSAL MATCHES linux AND TGT_BSP)
if(${TGT_BSP} MATCHES "arm/q7s") if(TGT_BSP MATCHES "arm/q7s")
set(CMAKE_TOOLCHAIN_FILE set(CMAKE_TOOLCHAIN_FILE
"${CMAKE_SCRIPT_PATH}/Q7SCrossCompileConfig.cmake" "${CMAKE_SCRIPT_PATH}/Q7SCrossCompileConfig.cmake"
PARENT_SCOPE PARENT_SCOPE
) )
elseif (${TGT_BSP} MATCHES "arm/raspberrypi") elseif(TGT_BSP MATCHES "arm/raspberrypi")
if(NOT DEFINED ENV{RASPBIAN_ROOTFS}) if(NOT DEFINED ENV{RASPBIAN_ROOTFS})
if(NOT DEFINED RASPBIAN_ROOTFS) if(NOT DEFINED RASPBIAN_ROOTFS)
message(WARNING "No RASPBIAN_ROOTFS environmental or CMake variable set!") message(WARNING "No RASPBIAN_ROOTFS environmental or CMake variable set!")

2
fsfw

@ -1 +1 @@
Subproject commit eef2fd3b7ac764f06ed5d9a3c97c894d92a515fa Subproject commit 62e0465b3d3aad22d03be45ca4fe30f25bc38010

2
mission/core/GenericFactory.cpp
View File

@ -7,7 +7,7 @@
#include <fsfw/events/EventManager.h> #include <fsfw/events/EventManager.h>
#include <fsfw/health/HealthTable.h> #include <fsfw/health/HealthTable.h>
#include <fsfw/internalError/InternalErrorReporter.h> #include <fsfw/internalerror/InternalErrorReporter.h>
#include <fsfw/pus/CService200ModeCommanding.h> #include <fsfw/pus/CService200ModeCommanding.h>
#include <fsfw/pus/Service17Test.h> #include <fsfw/pus/Service17Test.h>
#include <fsfw/pus/Service1TelecommandVerification.h> #include <fsfw/pus/Service1TelecommandVerification.h>