From 6732303eb9a1ddc497b6ff1a7c3fef770cd07a55 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 28 May 2021 18:31:35 +0200 Subject: [PATCH] event translation for linux --- bsp_hosted/fsfwconfig/CMakeLists.txt | 14 ++++++++++++++ bsp_linux/fsfwconfig/CMakeLists.txt | 14 ++++++++++++++ bsp_linux/fsfwconfig/FSFWConfig.h | 2 +- common/config/OBSWVersion.h | 2 +- fsfw | 2 +- 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/bsp_hosted/fsfwconfig/CMakeLists.txt b/bsp_hosted/fsfwconfig/CMakeLists.txt index 7b92e4f..c336e10 100644 --- a/bsp_hosted/fsfwconfig/CMakeLists.txt +++ b/bsp_hosted/fsfwconfig/CMakeLists.txt @@ -9,3 +9,17 @@ target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) + +# If a special translation file for object IDs exists, compile it. +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp") + target_sources(${TARGET_NAME} PRIVATE + objects/translateObjects.cpp + ) +endif() + +# If a special translation file for events exists, compile it. +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp") + target_sources(${TARGET_NAME} PRIVATE + events/translateEvents.cpp + ) +endif() diff --git a/bsp_linux/fsfwconfig/CMakeLists.txt b/bsp_linux/fsfwconfig/CMakeLists.txt index 8aae3e5..a81b34d 100644 --- a/bsp_linux/fsfwconfig/CMakeLists.txt +++ b/bsp_linux/fsfwconfig/CMakeLists.txt @@ -6,3 +6,17 @@ target_sources(${TARGET_NAME} PRIVATE target_include_directories(${TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ) + +# If a special translation file for object IDs exists, compile it. +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp") + target_sources(${TARGET_NAME} PRIVATE + objects/translateObjects.cpp + ) +endif() + +# If a special translation file for events exists, compile it. +if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp") + target_sources(${TARGET_NAME} PRIVATE + events/translateEvents.cpp + ) +endif() diff --git a/bsp_linux/fsfwconfig/FSFWConfig.h b/bsp_linux/fsfwconfig/FSFWConfig.h index 5bae107..bd128ad 100644 --- a/bsp_linux/fsfwconfig/FSFWConfig.h +++ b/bsp_linux/fsfwconfig/FSFWConfig.h @@ -25,7 +25,7 @@ //! If FSFW_OBJ_EVENT_TRANSLATION is set to one, //! additional output which requires the translation files translateObjects //! and translateEvents (and their compiled source files) -#define FSFW_OBJ_EVENT_TRANSLATION 0 +#define FSFW_OBJ_EVENT_TRANSLATION 1 #if FSFW_OBJ_EVENT_TRANSLATION == 1 //! Specify whether info events are printed too. diff --git a/common/config/OBSWVersion.h b/common/config/OBSWVersion.h index f994c8d..4ae99b0 100644 --- a/common/config/OBSWVersion.h +++ b/common/config/OBSWVersion.h @@ -2,7 +2,7 @@ #define COMMON_OBSWVERSION_H_ #define FSFW_EXAMPLE_VERSION 1 -#define FSFW_EXAMPLE_SUBVERSION 0 +#define FSFW_EXAMPLE_SUBVERSION 1 #define FSFW_EXAMPLE_REVISION 0 #endif /* COMMON_OBSWVERSION_H_ */ diff --git a/fsfw b/fsfw index f3d9fb6..5676999 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit f3d9fb645ea5f4dfdf8b1d8aafe542ff8bbbefd6 +Subproject commit 567699954c0e91f0a5ebd692f3e27ab51d94d1f3