refactoring for added unittests

unittest/CMakeLists.txt

@@ -1 +1,5 @@
 add_subdirectory(testcfg)
+
+target_sources(${TARGET_NAME} PRIVATE
+    main.cpp
+)

unittest/main.cpp

@@ -0,0 +1,6 @@
+#include "fsfw_tests/unit/CatchRunner.h"
+
+int main(int argc, char* argv[]) {
+    fsfwtest::customMain(argc, argv);
+}
+

unittest/testcfg/FSFWConfig.h.in

@@ -7,7 +7,7 @@
 //! Used to determine whether C++ ostreams are used which can increase
 //! the binary size significantly. If this is disabled,
 //! the C stdio functions can be used alternatively
-#define FSFW_CPP_OSTREAM_ENABLED 	0
+#define FSFW_CPP_OSTREAM_ENABLED 	1
 
 //! More FSFW related printouts. Useful for development.
 #define FSFW_ENHANCED_PRINTOUT		0
@@ -20,6 +20,9 @@
 	#endif
 #endif
 
+#define FSFW_USE_PUS_C_TELEMETRY    1
+#define FSFW_USE_PUS_C_TELECOMMANDS 1
+
 //! Can be used to enable additional debugging printouts for developing the FSFW
 #define FSFW_PRINT_VERBOSITY_LEVEL   0
 

unittest/testcfg/events/subsystemIdRanges.h

@@ -2,6 +2,7 @@
 #define CONFIG_EVENTS_SUBSYSTEMIDRANGES_H_
 
 #include <cstdint>
+#include "commonSubsystemIds.h"
 #include <fsfw/events/fwSubsystemIdRanges.h>
 
 /**

unittest/testcfg/objects/systemObjectList.h

@@ -2,6 +2,7 @@
 #define HOSTED_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
 
 #include <cstdint>
+#include "commonObjects.h"
 #include <fsfw/objectmanager/frameworkObjects.h>
 
 // The objects will be instantiated in the ID order

unittest/testcfg/returnvalues/classIds.h

@@ -1,6 +1,7 @@
 #ifndef CONFIG_RETURNVALUES_CLASSIDS_H_
 #define CONFIG_RETURNVALUES_CLASSIDS_H_
 
+#include "commonClassIds.h"
 #include <fsfw/returnvalues/FwClassIds.h>
 
 /**

unittest/testcfg/tmtc/apid.h

@@ -11,7 +11,7 @@
  * Chose APID(s) for mission and define it here.
  */
 namespace apid {
-	static const uint16_t DEFAULT_APID = 0x00;
+	static const uint16_t EIVE_OBSW = 0x65;
 }