From 1d0a4bca94b05032854e4e26d4a847ada5724412 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 17 May 2021 19:49:29 +0200
Subject: [PATCH] compiling with translation files

---
 bsp_q7s/ObjectFactory.cpp         |  3 +--
 cmake/BBBCrossCompileConfig.cmake |  2 +-
 cmake/Q7SCrossCompileConfig.cmake |  2 +-
 cmake/RPiCrossCompileConfig.cmake |  2 +-
 fsfwconfig/CMakeLists.txt         | 13 ++++++++++++-
 fsfwconfig/FSFWConfig.h           |  2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/bsp_q7s/ObjectFactory.cpp b/bsp_q7s/ObjectFactory.cpp
index 22418bc5..85573bbd 100644
--- a/bsp_q7s/ObjectFactory.cpp
+++ b/bsp_q7s/ObjectFactory.cpp
@@ -29,13 +29,12 @@
 #include <mission/devices/PlocHandler.h>
 #include <mission/devices/RadiationSensorHandler.h>
 
-
+#include <linux/devices/devicedefinitions/SusDefinitions.h>
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 #include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
 #include <mission/devices/devicedefinitions/PlocDefinitions.h>
 #include <mission/devices/devicedefinitions/RadSensorDefinitions.h>
 #include <mission/devices/devicedefinitions/Max31865Definitions.h>
-#include <mission/devices/devicedefinitions/SusDefinitions.h>
 #include <mission/utility/TmFunnel.h>
 
 #include <linux/csp/CspCookie.h>
diff --git a/cmake/BBBCrossCompileConfig.cmake b/cmake/BBBCrossCompileConfig.cmake
index b32897f5..e1a669db 100644
--- a/cmake/BBBCrossCompileConfig.cmake
+++ b/cmake/BBBCrossCompileConfig.cmake
@@ -13,7 +13,7 @@ if(NOT DEFINED ENV{BBB_ROOTFS})
 		"Define the BBB_ROOTFS variable to point to the Beagle Bone Black rootfs."
 	)
 else()
-	set(SYSROOT_PATH "$ENV{BBB_ROOTFS}")
+	set(SYSROOT_PATH "$ENV{BBB_ROOTFS}" CACHE  FILEPATH "BBB root filesystem path")
 	message(STATUS "Beagle Bone Black sysroot: ${SYSROOT_PATH}")
 endif()
 
diff --git a/cmake/Q7SCrossCompileConfig.cmake b/cmake/Q7SCrossCompileConfig.cmake
index 2c5bd4e9..66d9e0a8 100644
--- a/cmake/Q7SCrossCompileConfig.cmake
+++ b/cmake/Q7SCrossCompileConfig.cmake
@@ -6,7 +6,7 @@ if(NOT DEFINED ENV{Q7S_SYSROOT})
 #		"point to the raspbian rootfs."
 #	)
 else()
-	set(SYSROOT_PATH "$ENV{Q7S_SYSROOT}")
+	set(SYSROOT_PATH "$ENV{Q7S_SYSROOT}" CACHE FILEPATH "Q7S root filesystem path")
 endif()
 
 if(NOT DEFINED ENV{CROSS_COMPILE})
diff --git a/cmake/RPiCrossCompileConfig.cmake b/cmake/RPiCrossCompileConfig.cmake
index e1b4cce3..1f246443 100644
--- a/cmake/RPiCrossCompileConfig.cmake
+++ b/cmake/RPiCrossCompileConfig.cmake
@@ -25,7 +25,7 @@ if(NOT DEFINED ENV{RASPBIAN_ROOTFS})
 		"point to the raspbian rootfs."
 	)
 else()
-	set(SYSROOT_PATH "$ENV{RASPBIAN_ROOTFS}")
+	set(SYSROOT_PATH "$ENV{RASPBIAN_ROOTFS}" CACHE FILEPATH "RPi root filesystem path")
 endif()
 
 if(NOT DEFINED ENV{CROSS_COMPILE})
diff --git a/fsfwconfig/CMakeLists.txt b/fsfwconfig/CMakeLists.txt
index 87ddea03..277b89db 100644
--- a/fsfwconfig/CMakeLists.txt
+++ b/fsfwconfig/CMakeLists.txt
@@ -7,5 +7,16 @@ 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/fsfwconfig/FSFWConfig.h b/fsfwconfig/FSFWConfig.h
index 097f8aaf..8095bd12 100644
--- a/fsfwconfig/FSFWConfig.h
+++ b/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.