From a6dd2d5dcb21058c4c487ac1ef027ea6ece1b98f Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 12 May 2021 16:37:12 +0200
Subject: [PATCH] event manager update

---
 events/EventManager.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/events/EventManager.cpp b/events/EventManager.cpp
index 8e8f797f..2337ba83 100644
--- a/events/EventManager.cpp
+++ b/events/EventManager.cpp
@@ -156,21 +156,19 @@ void EventManager::printUtility(sif::OutputTypes printType, EventMessage *messag
             sif::info << "0x" << std::hex << std::setw(8) << std::setfill('0') <<
                     message->getReporter() << std::setfill(' ') << std::dec;
         }
-        sif::info << " reported " << translateEvents(message->getEvent())
-                        << " with event ID " << std::dec << message->getEventId() << std::endl;
+        sif::info << " report event with ID " << message->getEventId() << std::endl;
         sif::info << std::hex << "P1 Hex: 0x" << message->getParameter1() <<
                 " | P1 Dec: " << std::dec << message->getParameter1() <<  std::hex <<
                 " | P2 Hex: 0x" << message->getParameter2() << " | P2 Dec: " <<  std::dec <<
                 message->getParameter2() << std::endl;
 #else
         if (string != 0) {
-            sif::printInfo("Event Manager: %s reported %s with event ID %d\n",
-                    message->getReporter(), translateEvents(message->getEvent()),
+            sif::printInfo("Event Manager: %s reported event with ID %d\n", string,
                     message->getEventId());
         }
         else {
-            sif::printInfo("Event Manager: Reporter ID 0x%08x reported %s with event ID %d\n",
-                    string, translateEvents(message->getEvent()), message->getEventId());
+            sif::printInfo("Event Manager: Reporter ID 0x%08x reported event with ID %d\n",
+                    message->getReporter(), message->getEventId());
         }
         sif::printInfo("P1 Hex: 0x%x | P1 Dec: %d | P2 Hex: 0x%x | P2 Dec: %d\n",
                 message->getParameter1(), message->getParameter1(),
@@ -185,23 +183,22 @@ void EventManager::printUtility(sif::OutputTypes printType, EventMessage *messag
             sif::debug << string;
         }
         else {
-            sif::debug << "0x" << std::hex << message->getReporter() << std::dec;
+            sif::debug << "0x" << std::hex << std::setw(8) << std::setfill('0') <<
+                    message->getReporter() << std::setfill(' ') << std::dec;
         }
-        sif::debug << " reported " << translateEvents(message->getEvent())
-                        << " with event ID " << std::dec << message->getEventId() << std::endl;
+        sif::debug << " report event with ID " << message->getEventId() << std::endl;
         sif::debug << std::hex << "P1 Hex: 0x" << message->getParameter1() <<
                 " | P1 Dec: " << std::dec << message->getParameter1() <<  std::hex <<
                 " | P2 Hex: 0x" << message->getParameter2() << " | P2 Dec: " <<  std::dec <<
                 message->getParameter2() << std::endl;
 #else
         if (string != 0) {
-            sif::printDebug("Event Manager: %s reported %s with event ID %d\n",
-                    message->getReporter(), translateEvents(message->getEvent()),
+            sif::printDebug("Event Manager: %s reported event with ID %d\n", string,
                     message->getEventId());
         }
         else {
-            sif::printDebug("Event Manager: Reporter ID 0x%08x reported %s with event ID %d\n",
-                    string, translateEvents(message->getEvent()), message->getEventId());
+            sif::printDebug("Event Manager: Reporter ID 0x%08x reported event with ID %d\n",
+                    message->getReporter(), message->getEventId());
         }
         sif::printDebug("P1 Hex: 0x%x | P1 Dec: %d | P2 Hex: 0x%x | P2 Dec: %d\n",
                 message->getParameter1(), message->getParameter1(),