From e323c69f20da5b2321fbecd5ef2ab84dc1b2060d Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 1 Dec 2020 13:36:30 +0100
Subject: [PATCH] better name for preproc define

---
 defaultcfg/fsfwconfig/FSFWConfig.h | 8 ++++----
 storagemanager/LocalPool.cpp       | 9 +++++----
 storagemanager/PoolManager.cpp     | 3 ++-
 unittest/testcfg/FSFWConfig.h      | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/defaultcfg/fsfwconfig/FSFWConfig.h b/defaultcfg/fsfwconfig/FSFWConfig.h
index f475e3fa8..1386bf66f 100644
--- a/defaultcfg/fsfwconfig/FSFWConfig.h
+++ b/defaultcfg/fsfwconfig/FSFWConfig.h
@@ -8,12 +8,12 @@
 //! Those can lead to code bloat.
 #define FSFW_CPP_OSTREAM_ENABLED 	1
 
-//! Reduced printout to further decrese code size
+//! Reduced printout to further decrease code size
 //! Be careful, this also turns off most diagnostic prinouts!
-#define FSFW_REDUCED_PRINTOUT		0
+#define FSFW_ENHANCED_PRINTOUT		0
 
-//! Can be used to enable debugging printouts for developing the FSFW
-#define FSFW_DEBUGGING              0
+//! Can be used to enable additional debugging printouts for developing the FSFW
+#define FSFW_PRINT_VERBOSITY_LEVEL   0
 
 //! Defines the FIFO depth of each commanding service base which
 //! also determines how many commands a CSB service can handle in one cycle
diff --git a/storagemanager/LocalPool.cpp b/storagemanager/LocalPool.cpp
index 8e5f4d488..74e362d49 100644
--- a/storagemanager/LocalPool.cpp
+++ b/storagemanager/LocalPool.cpp
@@ -1,4 +1,5 @@
 #include "LocalPool.h"
+#include <FSFWConfig.h>
 #include <cstring>
 
 LocalPool::LocalPool(object_id_t setObjectId, const LocalPoolConfig& poolConfig,
@@ -116,7 +117,7 @@ ReturnValue_t LocalPool::modifyData(store_address_t storeId,
 }
 
 ReturnValue_t LocalPool::deleteData(store_address_t storeId) {
-#if FSFW_DEBUGGING == 1
+#if FSFW_VERBOSE_PRINTOUT == 2
       sif::debug << "Delete: Pool: " << std::dec << storeId.poolIndex
               << " Index: " << storeId.packetIndex << std::endl;
 
@@ -155,7 +156,7 @@ ReturnValue_t LocalPool::deleteData(uint8_t *ptr, size_t size,
             // element of an object.
             localId.packetIndex = deltaAddress / elementSizes[n];
             result = deleteData(localId);
-#if FSFW_DEBUGGING == 1
+#if FSFW_VERBOSE_PRINTOUT == 2
             if (deltaAddress % elementSizes[n] != 0) {
                 sif::error << "LocalPool::deleteData: Address not aligned!"
                         << std::endl;
@@ -222,7 +223,7 @@ ReturnValue_t LocalPool::reserveSpace(const size_t size,
         status = findEmpty(storeId->poolIndex, &storeId->packetIndex);
     }
     if (status == RETURN_OK) {
-#if FSFW_DEBUGGING == 1
+#if FSFW_VERBOSE_PRINTOUT == 2
         sif::debug << "Reserve: Pool: " << std::dec
                 << storeId->poolIndex << " Index: " << storeId->packetIndex
                 << std::endl;
@@ -264,7 +265,7 @@ void LocalPool::setToSpillToHigherPools(bool enable) {
 ReturnValue_t LocalPool::getPoolIndex(size_t packetSize, uint16_t *poolIndex,
         uint16_t startAtIndex) {
     for (uint16_t n = startAtIndex; n < NUMBER_OF_POOLS; n++) {
-#if FSFW_DEBUGGING == 1
+#if FSFW_VERBOSE_PRINTOUT == 2
         sif::debug << "LocalPool " << getObjectId() << "::getPoolIndex: Pool: "
              << n << ", Element Size: " << elementSizes[n] << std::endl;
 #endif
diff --git a/storagemanager/PoolManager.cpp b/storagemanager/PoolManager.cpp
index 9c801a3da..3b7b549bd 100644
--- a/storagemanager/PoolManager.cpp
+++ b/storagemanager/PoolManager.cpp
@@ -1,4 +1,5 @@
 #include "PoolManager.h"
+#include <FSFWConfig.h>
 
 PoolManager::PoolManager(object_id_t setObjectId,
         const LocalPoolConfig& localPoolConfig):
@@ -24,7 +25,7 @@ ReturnValue_t PoolManager::reserveSpace(const size_t size,
 
 ReturnValue_t PoolManager::deleteData(
         store_address_t storeId) {
-#if FSFW_DEBUGGING == 1
+#if FSFW_VERBOSE_PRINTOUT == 2
      sif::debug << "PoolManager( " << translateObject(getObjectId()) <<
            " )::deleteData from store " << storeId.poolIndex <<
            ". id is "<< storeId.packetIndex << std::endl;
diff --git a/unittest/testcfg/FSFWConfig.h b/unittest/testcfg/FSFWConfig.h
index 4fb224c15..d3451985e 100644
--- a/unittest/testcfg/FSFWConfig.h
+++ b/unittest/testcfg/FSFWConfig.h
@@ -12,7 +12,7 @@
 #define FSFW_REDUCED_PRINTOUT		0
 
 //! Can be used to enable debugging printouts for developing the FSFW
-#define FSFW_DEBUGGING              0
+#define FSFW_VERBOSE_PRINTOUT       0
 
 //! Defines the FIFO depth of each commanding service base which
 //! also determines how many commands a CSB service can handle in one cycle