From 0b08ac10041cd6803cf3058ddd0ef030422157ca Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Jan 2021 20:56:53 +0100 Subject: [PATCH] updated template config files --- datapoollocal/PoolReadHelper.h | 2 +- defaultcfg/fsfwconfig/FSFWConfig.h | 3 --- unittest/user/testcfg/FSFWConfig.h | 10 +++------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/datapoollocal/PoolReadHelper.h b/datapoollocal/PoolReadHelper.h index 61e5feaf..62db1598 100644 --- a/datapoollocal/PoolReadHelper.h +++ b/datapoollocal/PoolReadHelper.h @@ -16,7 +16,7 @@ public: readObject(readObject), mutexTimeout(mutexTimeout) { if(readObject != nullptr) { readResult = readObject->read(timeoutType, mutexTimeout); -#if FSFW_PRINT_VERBOSITY_LEVEL == 1 +#if FSFW_VERBOSE_LEVEL == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::error << "PoolReadHelper: Read failed!" << std::endl; #endif diff --git a/defaultcfg/fsfwconfig/FSFWConfig.h b/defaultcfg/fsfwconfig/FSFWConfig.h index 0740c9c7..ed86e6e1 100644 --- a/defaultcfg/fsfwconfig/FSFWConfig.h +++ b/defaultcfg/fsfwconfig/FSFWConfig.h @@ -17,9 +17,6 @@ #define FSFW_DISABLE_PRINTOUT 0 #endif -//! Can be used to enable additional debugging printouts for developing the FSFW -#define FSFW_PRINT_VERBOSITY_LEVEL 0 - //! Can be used to disable the ANSI color sequences for C stdio. #define FSFW_COLORED_OUTPUT 1 diff --git a/unittest/user/testcfg/FSFWConfig.h b/unittest/user/testcfg/FSFWConfig.h index 261e3d6d..ed86e6e1 100644 --- a/unittest/user/testcfg/FSFWConfig.h +++ b/unittest/user/testcfg/FSFWConfig.h @@ -9,18 +9,14 @@ //! the C stdio functions can be used alternatively #define FSFW_CPP_OSTREAM_ENABLED 1 -//! More FSFW related printouts. -//! Be careful, this also turns off most diagnostic prinouts! -#define FSFW_ENHANCED_PRINTOUT 0 +//! More FSFW related printouts depending on level. Useful for development. +#define FSFW_VERBOSE_LEVEL 1 //! Can be used to completely disable printouts, even the C stdio ones. -#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_ENHANCED_PRINTOUT == 0 +#if FSFW_CPP_OSTREAM_ENABLED == 0 && FSFW_VERBOSE_LEVEL == 0 #define FSFW_DISABLE_PRINTOUT 0 #endif -//! Can be used to enable additional debugging printouts for developing the FSFW -#define FSFW_PRINT_VERBOSITY_LEVEL 0 - //! Can be used to disable the ANSI color sequences for C stdio. #define FSFW_COLORED_OUTPUT 1