From 29187fbc4badd33e7533c53b2aaa8032b73353e0 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Thu, 29 Oct 2020 11:59:50 +0100 Subject: [PATCH] some config adaptions --- defaultcfg/FSFWConfig.h | 41 ---------------------------------- defaultcfg/config/FSFWConfig.h | 8 ++++--- defaultcfg/config/version.h | 9 -------- defaultcfg/version.h | 11 --------- events/EventManager.cpp | 3 ++- fsfw.mk | 2 ++ unittest/testcfg/FSFWConfig.h | 11 ++++++--- unittest/testcfg/version.h | 7 ------ 8 files changed, 17 insertions(+), 75 deletions(-) delete mode 100644 defaultcfg/FSFWConfig.h delete mode 100644 defaultcfg/config/version.h delete mode 100644 defaultcfg/version.h delete mode 100644 unittest/testcfg/version.h diff --git a/defaultcfg/FSFWConfig.h b/defaultcfg/FSFWConfig.h deleted file mode 100644 index 2001f306..00000000 --- a/defaultcfg/FSFWConfig.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef CONFIG_FSFWCONFIG_H_ -#define CONFIG_FSFWCONFIG_H_ - -#include "version.h" - -//! Used to determine whether C++ ostreams are used -//! Those can lead to code bloat. -#define FSFW_CPP_OSTREAM_ENABLED 1 - -//! Reduced printout to further decrese code size -//! Be careful, this also turns off most diagnostic prinouts! -#define FSFW_REDUCED_PRINTOUT 0 - -//! Can be used to enable debugging printouts for developing the FSFW -#define FSFW_DEBUGGING 0 - -//! Defines the FIFO depth of each commanding service base which -//! also determines how many commands a CSB service can handle in one cycle -//! simulataneously. This will increase the required RAM for -//! each CSB service ! -#define FSFW_CSB_FIFO_DEPTH 6 - -//! If -DDEBUG is supplied in the build defines, there will be -//! additional output which requires the translation files translateObjects -//! and translateEvents (and their compiles source files) -#ifdef DEBUG -#define FSFW_DEBUG_OUTPUT 1 -//! Specify whether info events are printed too. -#define FSFW_DEBUG_INFO 1 -#include -#include -#else -#define FSFW_DEBUG_OUTPUT 0 -#endif - -//! When using the newlib nano library, C99 support for stdio facilities -//! will not be provided. This define should be set to 1 if this is the case. -#define FSFW_NO_C99_IO 1 - - -#endif /* CONFIG_FSFWCONFIG_H_ */ diff --git a/defaultcfg/config/FSFWConfig.h b/defaultcfg/config/FSFWConfig.h index cfe89864..f723f9d8 100644 --- a/defaultcfg/config/FSFWConfig.h +++ b/defaultcfg/config/FSFWConfig.h @@ -20,10 +20,12 @@ //! each CSB service ! #define FSFW_CSB_FIFO_DEPTH 6 -//! If -DDEBUG is supplied in the build defines, there will be +#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 compiles source files) -#ifdef DEBUG +//! and translateEvents (and their compiled source files) +#if FSFW_OBJ_EVENT_TRANSLATION == 1 #define FSFW_DEBUG_OUTPUT 1 //! Specify whether info events are printed too. #define FSFW_DEBUG_INFO 1 diff --git a/defaultcfg/config/version.h b/defaultcfg/config/version.h deleted file mode 100644 index 3c60317c..00000000 --- a/defaultcfg/config/version.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef CONFIG_VERSION_H_ -#define CONFIG_VERSION_H_ - -/* OBSW versioning can be specified in this file */ - -#define OBSW_VERSION 0 -#define OBSW_SUBVERSION 0 - -#endif /* CONFIG_VERSION_H_ */ diff --git a/defaultcfg/version.h b/defaultcfg/version.h deleted file mode 100644 index b3ef8318..00000000 --- a/defaultcfg/version.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef FSFW_DEFAULTCFG_VERSION_H_ -#define FSFW_DEFAULTCFG_VERSION_H_ - -static const char* FSFW_VERSION_NAME = "fsfw"; - -#define FSFW_VERSION 0 -#define FSFW_SUBVERSION 0 - - - -#endif /* FSFW_DEFAULTCFG_VERSION_H_ */ diff --git a/events/EventManager.cpp b/events/EventManager.cpp index 57bda13f..16ac289d 100644 --- a/events/EventManager.cpp +++ b/events/EventManager.cpp @@ -1,4 +1,5 @@ #include "EventManager.h" +#include #include "../serviceinterface/ServiceInterfaceStream.h" #include "../ipc/QueueFactory.h" #include "../ipc/MutexFactory.h" @@ -38,7 +39,7 @@ ReturnValue_t EventManager::performOperation(uint8_t opCode) { EventMessage message; result = eventReportQueue->receiveMessage(&message); if (result == HasReturnvaluesIF::RETURN_OK) { -#ifdef DEBUG +#ifdef FSFW_OBJECTMANAGER_ printEvent(&message); #endif notifyListeners(&message); diff --git a/fsfw.mk b/fsfw.mk index c5847554..1dd4f166 100644 --- a/fsfw.mk +++ b/fsfw.mk @@ -73,3 +73,5 @@ CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/packetmatcher/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcpacket/pus/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/tmtcservices/*.cpp) CXXSRC += $(wildcard $(FRAMEWORK_PATH)/pus/*.cpp) + +INCLUDES += $(CURRENTPATH) diff --git a/unittest/testcfg/FSFWConfig.h b/unittest/testcfg/FSFWConfig.h index bb285472..b1177b74 100644 --- a/unittest/testcfg/FSFWConfig.h +++ b/unittest/testcfg/FSFWConfig.h @@ -1,7 +1,7 @@ #ifndef CONFIG_FSFWCONFIG_H_ #define CONFIG_FSFWCONFIG_H_ -#include +#include //! Used to determine whether C++ ostreams are used //! Those can lead to code bloat. @@ -11,16 +11,21 @@ //! Be careful, this also turns off most diagnostic prinouts! #define FSFW_REDUCED_PRINTOUT 0 +//! Can be used to enable debugging printouts for developing the FSFW +#define FSFW_DEBUGGING 0 + //! Defines the FIFO depth of each commanding service base which //! also determines how many commands a CSB service can handle in one cycle //! simulataneously. This will increase the required RAM for //! each CSB service ! #define FSFW_CSB_FIFO_DEPTH 6 +#define FSFW_OBJ_EVENT_TRANSLATION 0 + //! If -DDEBUG is supplied in the build defines, there will be //! additional output which requires the translation files translateObjects //! and translateEvents (and their compiles source files) -#ifdef DEBUG +#if FSFW_OBJ_EVENT_TRANSLATION == 1 #define FSFW_DEBUG_OUTPUT 1 //! Specify whether info events are printed too. #define FSFW_DEBUG_INFO 1 @@ -32,7 +37,7 @@ //! When using the newlib nano library, C99 support for stdio facilities //! will not be provided. This define should be set to 1 if this is the case. -#define FSFW_NEWLIB_NANO_NO_C99_IO 1 +#define FSFW_NO_C99_IO 1 #endif /* CONFIG_FSFWCONFIG_H_ */ diff --git a/unittest/testcfg/version.h b/unittest/testcfg/version.h deleted file mode 100644 index f53345c1..00000000 --- a/unittest/testcfg/version.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CONFIG_VERSION_H_ -#define CONFIG_VERSION_H_ - -#define SW_VERSION 1 -#define SW_SUBVERSION 6 - -#endif /* CONFIG_VERSION_H_ */