From e1c91f82b763b0d57710a16ab40697df87e6ce74 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 12 May 2021 10:54:10 +0200
Subject: [PATCH] some fixes and tweaks

---
 events/EventManager.cpp             | 48 +++++++++++++++++++----------
 objectmanager/ObjectManagerIF.h     |  2 +-
 serviceinterface/ServiceInterface.h |  4 +--
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/events/EventManager.cpp b/events/EventManager.cpp
index 5b2b31b54..2d4b6a495 100644
--- a/events/EventManager.cpp
+++ b/events/EventManager.cpp
@@ -2,7 +2,7 @@
 #include "EventMessage.h"
 
 #include <FSFWConfig.h>
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../serviceinterface/ServiceInterface.h"
 #include "../ipc/QueueFactory.h"
 #include "../ipc/MutexFactory.h"
 
@@ -120,23 +120,39 @@ ReturnValue_t EventManager::unsubscribeFromEventRange(MessageQueueId_t listener,
 void EventManager::printEvent(EventMessage* message) {
 	const char *string = 0;
 	switch (message->getSeverity()) {
-	case severity::INFO:
-#if DEBUG_INFO_EVENT == 1
-		string = translateObject(message->getReporter());
+	case severity::INFO: {
+#if FSFW_DEBUG_INFO == 1
+        string = translateObject(message->getReporter());
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-		sif::info << "EVENT: ";
-		if (string != 0) {
-			sif::info << string;
-		} else {
-			sif::info << "0x" << std::hex << message->getReporter() << std::dec;
-		}
-		sif::info << " reported " << translateEvents(message->getEvent()) << " ("
-				<< std::dec << message->getEventId() << std::hex << ") P1: 0x"
-				<< message->getParameter1() << " P2: 0x"
-				<< message->getParameter2() << std::dec << std::endl;
-#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
+        sif::info << "EVENT: ";
+        if (string != 0) {
+            sif::info << string;
+        }
+        else {
+            sif::info << "0x" << std::hex << std::setfill('0') << std::setw(8) <<
+                    message->getReporter() << std::setfill(' ') << std::dec;
+        }
+        sif::info << " reported " << translateEvents(message->getEvent()) << " ("
+                << std::dec << message->getEventId() << std::hex << ") P1: 0x"
+                << message->getParameter1() << " P2: 0x"
+                << message->getParameter2() << std::dec << std::endl;
+#else
+        const char totalString[140] = {};
+        if (string != 0) {
+            snprintf((char*) totalString, sizeof(totalString),"Event: %s", string);
+        }
+        else {
+            snprintf((char*) totalString, sizeof(totalString),"Event: 0x%08x",
+                    message->getReporter());
+        }
+        snprintf((char*) totalString, sizeof(totalString),
+                " reported %s | ID %d | P1: 0x%x | P2: 0x%x\n", translateEvents(message->getEvent()),
+                message->getEventId(), message->getParameter1(), message->getParameter2());
+        sif::printInfo("%s", totalString);
+#endif /* FSFW_CPP_OSTREAM_ENABLED == 0 */
 #endif /* DEBUG_INFO_EVENT == 1 */
-		break;
+        break;
+	}
 	default:
 		string = translateObject(message->getReporter());
 #if FSFW_CPP_OSTREAM_ENABLED == 1
diff --git a/objectmanager/ObjectManagerIF.h b/objectmanager/ObjectManagerIF.h
index 8bebb609e..61e6f4237 100644
--- a/objectmanager/ObjectManagerIF.h
+++ b/objectmanager/ObjectManagerIF.h
@@ -4,7 +4,7 @@
 #include "frameworkObjects.h"
 #include "SystemObjectIF.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
-#include "../serviceinterface/ServiceInterfaceStream.h"
+#include "../serviceinterface/ServiceInterface.h"
 
 /**
  * @brief	This class provides an interface to the global object manager.
diff --git a/serviceinterface/ServiceInterface.h b/serviceinterface/ServiceInterface.h
index 1f7e5e84a..e95dd9a47 100644
--- a/serviceinterface/ServiceInterface.h
+++ b/serviceinterface/ServiceInterface.h
@@ -5,9 +5,9 @@
 #include "serviceInterfaceDefintions.h"
 
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
+#include "ServiceInterfaceStream.h"
 #else
-#include <fsfw/serviceinterface/ServiceInterfacePrinter.h>
+#include "ServiceInterfacePrinter.h"
 #endif
 
 #endif /* FSFW_SERVICEINTERFACE_SERVICEINTERFACE_H_ */