From 565fd63d0855e10fc29e46a7ab0f31a45e253ba8 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 29 Oct 2020 12:07:48 +0100 Subject: [PATCH] makefile moved --- defaultcfg/config/FSFWConfig.h | 4 ++-- unittest/testcfg/FSFWConfig.h | 3 +++ unittest/{ => testcfg}/Makefile-FSFW-Tests | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename unittest/{ => testcfg}/Makefile-FSFW-Tests (100%) diff --git a/defaultcfg/config/FSFWConfig.h b/defaultcfg/config/FSFWConfig.h index f723f9d8..d72f2374 100644 --- a/defaultcfg/config/FSFWConfig.h +++ b/defaultcfg/config/FSFWConfig.h @@ -20,11 +20,11 @@ //! each CSB service ! #define FSFW_CSB_FIFO_DEPTH 6 -#define FSFW_OBJ_EVENT_TRANSLATION 0 - //! 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 + #if FSFW_OBJ_EVENT_TRANSLATION == 1 #define FSFW_DEBUG_OUTPUT 1 //! Specify whether info events are printed too. diff --git a/unittest/testcfg/FSFWConfig.h b/unittest/testcfg/FSFWConfig.h index b1177b74..4fb224c1 100644 --- a/unittest/testcfg/FSFWConfig.h +++ b/unittest/testcfg/FSFWConfig.h @@ -20,6 +20,9 @@ //! each CSB service ! #define FSFW_CSB_FIFO_DEPTH 6 +//! 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 //! If -DDEBUG is supplied in the build defines, there will be diff --git a/unittest/Makefile-FSFW-Tests b/unittest/testcfg/Makefile-FSFW-Tests similarity index 100% rename from unittest/Makefile-FSFW-Tests rename to unittest/testcfg/Makefile-FSFW-Tests