From 9eb652e585c3eaf88c8e9a7778f3cfcd00562c51 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 27 Jul 2022 10:49:49 +0200
Subject: [PATCH] some printout fixes

---
 src/fsfw/tcdistribution/PusDistributor.cpp | 11 ++++++-----
 src/fsfw/tmtcservices/PusServiceBase.cpp   |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/fsfw/tcdistribution/PusDistributor.cpp b/src/fsfw/tcdistribution/PusDistributor.cpp
index 1cef2b9f9..981fca1c2 100644
--- a/src/fsfw/tcdistribution/PusDistributor.cpp
+++ b/src/fsfw/tcdistribution/PusDistributor.cpp
@@ -1,5 +1,6 @@
 #include "fsfw/tcdistribution/PusDistributor.h"
 
+#include "definitions.h"
 #include "fsfw/objectmanager/ObjectManager.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/tcdistribution/CCSDSDistributorIF.h"
@@ -42,15 +43,15 @@ PusDistributor::TcMqMapIter PusDistributor::selectDestination() {
       if (tcStatus != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_VERBOSE_LEVEL >= 1
         const char* keyword = "unnamed error";
-        if (tcStatus == TcPacketCheckPUS::INCORRECT_CHECKSUM) {
+        if (tcStatus == tcdistrib::INCORRECT_CHECKSUM) {
           keyword = "checksum";
-        } else if (tcStatus == TcPacketCheckPUS::INCORRECT_PRIMARY_HEADER) {
+        } else if (tcStatus == tcdistrib::INCORRECT_PRIMARY_HEADER) {
           keyword = "incorrect primary header";
-        } else if (tcStatus == TcPacketCheckPUS::ILLEGAL_APID) {
+        } else if (tcStatus == tcdistrib::INVALID_APID) {
           keyword = "illegal APID";
-        } else if (tcStatus == TcPacketCheckPUS::INCORRECT_SECONDARY_HEADER) {
+        } else if (tcStatus == tcdistrib::INCORRECT_SECONDARY_HEADER) {
           keyword = "incorrect secondary header";
-        } else if (tcStatus == TcPacketCheckPUS::INCOMPLETE_PACKET) {
+        } else if (tcStatus == tcdistrib::INCOMPLETE_PACKET) {
           keyword = "incomplete packet";
         }
 #if FSFW_CPP_OSTREAM_ENABLED == 1
diff --git a/src/fsfw/tmtcservices/PusServiceBase.cpp b/src/fsfw/tmtcservices/PusServiceBase.cpp
index 9390dd19c..97f018e57 100644
--- a/src/fsfw/tmtcservices/PusServiceBase.cpp
+++ b/src/fsfw/tmtcservices/PusServiceBase.cpp
@@ -26,8 +26,8 @@ ReturnValue_t PusServiceBase::performOperation(uint8_t opCode) {
   ReturnValue_t result = performService();
   if (result != RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "PusService " << (uint16_t)this->serviceId << ": performService returned with "
-               << (int16_t)result << std::endl;
+    sif::error << "PusService " << psbParams.serviceId << ": performService returned with "
+               <<  static_cast<uint16_t>(result) << std::endl;
 #endif
     return RETURN_FAILED;
   }
@@ -45,7 +45,7 @@ void PusServiceBase::handleRequestQueue() {
       break;
     } else if (status != HasReturnvaluesIF::RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-      sif::error << "PusServiceBase::performOperation: Service " << this->serviceId
+      sif::error << "PusServiceBase::performOperation: Service " << psbParams.serviceId
                  << ": Error receiving packet. Code: " << std::hex << status << std::dec
                  << std::endl;
 #else