From a12e98d9481e224a30a1150e9dfd0a48501f410f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 18 Feb 2022 13:39:42 +0100
Subject: [PATCH] update event mngr printout

---
 src/fsfw/events/EventManager.cpp        | 23 ++++++++++++++++++++---
 src/fsfw/events/EventManager.h          |  1 +
 src/fsfw/osal/linux/MessageQueue.cpp    |  4 ++--
 src/fsfw/pus/Service5EventReporting.cpp |  1 +
 src/fsfw/rmap/RMAPChannelIF.h           |  6 +++---
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/fsfw/events/EventManager.cpp b/src/fsfw/events/EventManager.cpp
index 35dc9d22f..c027fce50 100644
--- a/src/fsfw/events/EventManager.cpp
+++ b/src/fsfw/events/EventManager.cpp
@@ -52,10 +52,12 @@ void EventManager::notifyListeners(EventMessage* message) {
           MessageQueueSenderIF::sendMessage(listener.first, message, message->getSender());
       if (result != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-        sif::error << "Sending message to listener failed with result " << std::hex << std::setw(4)
-                   << result << std::endl;
+        sif::error << std::hex << "EventManager::notifyListeners: MSG to " << std::setw(8)
+                   << std::setfill('0') << "0x" << listener.first << " failed with result "
+                   << std::setw(4) << "0x" << result << std::setfill(' ') << std::endl;
 #else
-        sif::printError("Sending message to listener failed with result %04x\n", result);
+        sif::printError("Sending message to listener 0x%08x failed with result %04x\n",
+                        listener.first, result);
 #endif
       }
     }
@@ -198,4 +200,19 @@ void EventManager::printUtility(sif::OutputTypes printType, EventMessage* messag
   }
 }
 
+void EventManager::printListeners() {
+#if FSFW_CPP_OSTREAM_ENABLED == 1
+  sif::info << "Event manager listener MQ IDs:" << std::endl;
+  for (auto& listener : listenerList) {
+    sif::info << std::hex << std::setw(8) << std::setfill('0') << "0x" << listener.first << std::dec
+              << std::setfill(' ') << std::endl;
+  }
+#else
+  sif::printInfo("Event manager listener MQ IDs:\n");
+  for (auto& listener : listenerList) {
+    sif::printInfo("0x%08x\n", listener.first);
+  }
+#endif
+}
+
 #endif /* FSFW_OBJ_EVENT_TRANSLATION == 1 */
diff --git a/src/fsfw/events/EventManager.h b/src/fsfw/events/EventManager.h
index f2d642ffb..e2a8dd950 100644
--- a/src/fsfw/events/EventManager.h
+++ b/src/fsfw/events/EventManager.h
@@ -42,6 +42,7 @@ class EventManager : public EventManagerIF, public ExecutableObjectIF, public Sy
                                           object_id_t reporterFrom = 0, object_id_t reporterTo = 0,
                                           bool reporterInverted = false);
   ReturnValue_t performOperation(uint8_t opCode);
+  void printListeners();
 
  protected:
   MessageQueueIF* eventReportQueue = nullptr;
diff --git a/src/fsfw/osal/linux/MessageQueue.cpp b/src/fsfw/osal/linux/MessageQueue.cpp
index c806783b0..bdba912e0 100644
--- a/src/fsfw/osal/linux/MessageQueue.cpp
+++ b/src/fsfw/osal/linux/MessageQueue.cpp
@@ -240,9 +240,9 @@ ReturnValue_t MessageQueue::sendMessageFromMessageQueue(MessageQueueId_t sendTo,
                                                         bool ignoreFault) {
   if (message == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "MessageQueue::sendMessageFromMessageQueue: Message is nullptr!" << std::endl;
+    sif::error << "MessageQueue::sendMessageFromMessageQueue: Message is nullptr" << std::endl;
 #else
-    sif::printError("MessageQueue::sendMessageFromMessageQueue: Message is nullptr!\n");
+    sif::printError("MessageQueue::sendMessageFromMessageQueue: Message is nullptr\n");
 #endif
     return HasReturnvaluesIF::RETURN_FAILED;
   }
diff --git a/src/fsfw/pus/Service5EventReporting.cpp b/src/fsfw/pus/Service5EventReporting.cpp
index 4517bc262..dfce9ba2a 100644
--- a/src/fsfw/pus/Service5EventReporting.cpp
+++ b/src/fsfw/pus/Service5EventReporting.cpp
@@ -13,6 +13,7 @@ Service5EventReporting::Service5EventReporting(object_id_t objectId, uint16_t ap
     : PusServiceBase(objectId, apid, serviceId),
       maxNumberReportsPerCycle(maxNumberReportsPerCycle) {
   eventQueue = QueueFactory::instance()->createMessageQueue(messageQueueDepth);
+  sif::info << eventQueue->getId() << std::endl;
 }
 
 Service5EventReporting::~Service5EventReporting() {
diff --git a/src/fsfw/rmap/RMAPChannelIF.h b/src/fsfw/rmap/RMAPChannelIF.h
index 0c937dc82..9e666dfb6 100644
--- a/src/fsfw/rmap/RMAPChannelIF.h
+++ b/src/fsfw/rmap/RMAPChannelIF.h
@@ -77,9 +77,9 @@ class RMAPChannelIF {
    * command; command was not sent
    *      - @c COMMAND_BUFFER_FULL				no receiver buffer available for
    * expected len; command was not sent
-   *      - @c COMMAND_TOO_BIG					the data that was to be sent was too long for
-   * the hw to handle (write command) or the expected len was bigger than maximal expected len (read
-   * command) command was not sent
+   *      - @c COMMAND_TOO_BIG					the data that was to be sent was too
+   * long for the hw to handle (write command) or the expected len was bigger than maximal expected
+   * len (read command) command was not sent
    *      - @c COMMAND_CHANNEL_DEACTIVATED		the channel has no port set
    *      - @c NOT_SUPPORTED						if you dont feel like
    * implementing something...