From d7bc35ea458f272de1da17c5319fd5dffd8d7797 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 22 Aug 2022 22:25:22 +0200
Subject: [PATCH] crc check fails on mem 0

---
 linux/devices/ploc/PlocSupervisorHandler.cpp |  6 +++---
 linux/devices/ploc/PlocSupvHelper.cpp        | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp
index b2759e53..b90fa721 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
@@ -2066,9 +2066,9 @@ ReturnValue_t PlocSupervisorHandler::eventSubscription() {
   if (result != RETURN_OK) {
     return result;
   }
-  result = manager->subscribeToEventRange(
-      eventQueue->getId(), event::getEventId(PlocSupvHelper::SUPV_UPDATE_FAILED),
-      event::getEventId(PlocSupvHelper::SUPV_MEM_CHECK_FAIL));
+  result = manager->subscribeToEventRange(eventQueue->getId(),
+                                          event::getEventId(PlocSupvHelper::SUPV_UPDATE_FAILED),
+                                          event::getEventId(PlocSupvHelper::SUPV_MEM_CHECK_FAIL));
   if (result != RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::warning << "PlocSupervisorHandler::eventSubscritpion: Failed to subscribe to events from "
diff --git a/linux/devices/ploc/PlocSupvHelper.cpp b/linux/devices/ploc/PlocSupvHelper.cpp
index 42464dc7..6c195865 100644
--- a/linux/devices/ploc/PlocSupvHelper.cpp
+++ b/linux/devices/ploc/PlocSupvHelper.cpp
@@ -194,26 +194,26 @@ void PlocSupvHelper::stopProcess() { terminate = true; }
 void PlocSupvHelper::executeFullCheckMemoryCommand() {
   ReturnValue_t result;
   if (update.crcShouldBeChecked) {
-    sif::info << "PlocSupvHelper::performUpdate: Calculating Image CRC" << std::endl;
+    sif::info << "PLOC SUPV Mem Check: Calculating Image CRC" << std::endl;
     result = calcImageCrc();
     if (result != RETURN_OK) {
       triggerEvent(SUPV_MEM_CHECK_FAIL, result);
       return;
     }
   }
-  sif::info << "PlocSupvHelper::executeFullCheckMemoryCommand: Selecting Memory" << std::endl;
+  sif::info << "PLOC SUPV Mem Check: Selecting Memory" << std::endl;
   result = selectMemory();
   if (result != RETURN_OK) {
     triggerEvent(SUPV_MEM_CHECK_FAIL, result);
     return;
   }
-  sif::info << "PlocSupvHelper::executeFullCheckMemoryCommand: Preparing Update" << std::endl;
+  sif::info << "PLOC SUPV Mem Check: Preparing Update" << std::endl;
   result = prepareUpdate();
   if (result != RETURN_OK) {
     triggerEvent(SUPV_MEM_CHECK_FAIL, result);
     return;
   }
-  sif::info << "PlocSupvHelper::executeFullCheckMemoryCommand: Memory Check" << std::endl;
+  sif::info << "PLOC SUPV Mem Check: Memory Check" << std::endl;
   result = handleCheckMemoryCommand();
   if (result == HasReturnvaluesIF::RETURN_OK) {
     triggerEvent(SUPV_MEM_CHECK_OK, result);
@@ -224,22 +224,22 @@ void PlocSupvHelper::executeFullCheckMemoryCommand() {
 
 ReturnValue_t PlocSupvHelper::performUpdate() {
   ReturnValue_t result = RETURN_OK;
-  sif::info << "PlocSupvHelper::performUpdate: Calculating Image CRC" << std::endl;
+  sif::info << "PLOC SUPV Update MPSoC: Calculating Image CRC" << std::endl;
   result = calcImageCrc();
   if (result != RETURN_OK) {
     return result;
   }
-  sif::info << "PlocSupvHelper::performUpdate: Selecting Memory" << std::endl;
+  sif::info << "PLOC SUPV Update MPSoC: Selecting Memory" << std::endl;
   result = selectMemory();
   if (result != RETURN_OK) {
     return result;
   }
-  sif::info << "PlocSupvHelper::performUpdate: Preparing Update" << std::endl;
+  sif::info << "PLOC SUPV Update MPSoC: Preparing Update" << std::endl;
   result = prepareUpdate();
   if (result != RETURN_OK) {
     return result;
   }
-  sif::info << "PlocSupvHelper::performUpdate: Erasing Memory" << std::endl;
+  sif::info << "PLOC SUPV Update MPSoC: Erasing Memory" << std::endl;
   result = eraseMemory();
   if (result != RETURN_OK) {
     return result;