From 2100ae34f2c69d9a982e1d52d2f8068558daff9b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 14 Dec 2020 20:49:17 +0100
Subject: [PATCH] event folder taken over

---
 events/CMakeLists.txt               |  8 ++++++++
 events/EventManager.cpp             |  3 ++-
 events/EventManager.h               | 12 +++++++-----
 events/eventmatching/CMakeLists.txt |  7 +++++++
 events/fwSubsystemIdRanges.h        |  6 +++---
 5 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 events/CMakeLists.txt
 create mode 100644 events/eventmatching/CMakeLists.txt

diff --git a/events/CMakeLists.txt b/events/CMakeLists.txt
new file mode 100644
index 00000000..9e63deb8
--- /dev/null
+++ b/events/CMakeLists.txt
@@ -0,0 +1,8 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		Event.cpp
+		EventManager.cpp
+		EventMessage.cpp
+)
+
+add_subdirectory(eventmatching)
\ No newline at end of file
diff --git a/events/EventManager.cpp b/events/EventManager.cpp
index 182fb72b..33276141 100644
--- a/events/EventManager.cpp
+++ b/events/EventManager.cpp
@@ -1,4 +1,6 @@
 #include "EventManager.h"
+#include "EventMessage.h"
+
 #include <FSFWConfig.h>
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "../ipc/QueueFactory.h"
@@ -9,7 +11,6 @@
 // objects registering for certain events.
 // Each listener requires 1 or 2 EventIdMatcher and 1 or 2 ReportRangeMatcher.
 // So a good guess is 75 to a max of 100 pools required for each, which fits well.
-// This should be configurable..
 const LocalPool::LocalPoolConfig EventManager::poolConfig = {
         {fsfwconfig::FSFW_EVENTMGMR_MATCHTREE_NODES,
         		sizeof(EventMatchTree::Node)},
diff --git a/events/EventManager.h b/events/EventManager.h
index fe35d9d3..6678fc07 100644
--- a/events/EventManager.h
+++ b/events/EventManager.h
@@ -1,14 +1,16 @@
-#ifndef EVENTMANAGER_H_
-#define EVENTMANAGER_H_
+#ifndef FSFW_EVENT_EVENTMANAGER_H_
+#define FSFW_EVENT_EVENTMANAGER_H_
 
-#include "eventmatching/EventMatchTree.h"
 #include "EventManagerIF.h"
+#include "eventmatching/EventMatchTree.h"
+
+#include <FSFWConfig.h>
+
 #include "../objectmanager/SystemObject.h"
 #include "../storagemanager/LocalPool.h"
 #include "../tasks/ExecutableObjectIF.h"
 #include "../ipc/MessageQueueIF.h"
 #include "../ipc/MutexIF.h"
-#include <FSFWConfig.h>
 
 #include <map>
 
@@ -68,4 +70,4 @@ protected:
 	void unlockMutex();
 };
 
-#endif /* EVENTMANAGER_H_ */
+#endif /* FSFW_EVENT_EVENTMANAGER_H_ */
diff --git a/events/eventmatching/CMakeLists.txt b/events/eventmatching/CMakeLists.txt
new file mode 100644
index 00000000..81ff9ed8
--- /dev/null
+++ b/events/eventmatching/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(${LIB_FSFW_NAME} 
+	PRIVATE 
+		EventIdRangeMatcher.cpp
+		EventMatchTree.cpp
+		ReporterRangeMatcher.cpp
+		SeverityRangeMatcher.cpp
+)
\ No newline at end of file
diff --git a/events/fwSubsystemIdRanges.h b/events/fwSubsystemIdRanges.h
index 8dc4def7..1b0b238e 100644
--- a/events/fwSubsystemIdRanges.h
+++ b/events/fwSubsystemIdRanges.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_EVENTS_FWSUBSYSTEMIDRANGES_H_
-#define FRAMEWORK_EVENTS_FWSUBSYSTEMIDRANGES_H_
+#ifndef FSFW_EVENTS_FWSUBSYSTEMIDRANGES_H_
+#define FSFW_EVENTS_FWSUBSYSTEMIDRANGES_H_
 
 namespace SUBSYSTEM_ID {
 enum {
@@ -27,4 +27,4 @@ enum {
 
 
 
-#endif /* FRAMEWORK_EVENTS_FWSUBSYSTEMIDRANGES_H_ */
+#endif /* FSFW_EVENTS_FWSUBSYSTEMIDRANGES_H_ */