From f545928adcbf2a93634059260e5bd47a2a1cf863 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 18 Nov 2022 16:13:55 +0100
Subject: [PATCH] some bugfixes

---
 linux/devices/ploc/PlocSupervisorHandler.cpp | 33 +++++++-------------
 linux/devices/ploc/PlocSupvUartMan.cpp       | 11 ++++---
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/linux/devices/ploc/PlocSupervisorHandler.cpp b/linux/devices/ploc/PlocSupervisorHandler.cpp
index e596d768..3293c652 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
@@ -136,28 +136,19 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
 
 void PlocSupervisorHandler::doStartUp() {
   if (setTimeDuringStartup) {
-    switch (startupState) {
-      case StartupState::OFF: {
-        bootTimeout.resetTimer();
-        uartManager.start();
-        startupState = StartupState::BOOTING;
-        break;
+    if (startupState == StartupState::OFF) {
+      bootTimeout.resetTimer();
+      uartManager.start();
+      startupState = StartupState::BOOTING;
+    }
+    if (startupState == StartupState::BOOTING) {
+      if (bootTimeout.hasTimedOut()) {
+        uartIsolatorSwitch.pullHigh();
+        startupState = StartupState::SET_TIME;
       }
-      case StartupState::BOOTING: {
-        if (bootTimeout.hasTimedOut()) {
-          uartIsolatorSwitch.pullHigh();
-          startupState = StartupState::SET_TIME;
-        }
-        break;
-      }
-      case StartupState::SET_TIME_EXECUTING:
-        break;
-      case StartupState::ON: {
-        setMode(_MODE_TO_ON);
-        break;
-      }
-      default:
-        break;
+    }
+    if (startupState == StartupState::ON) {
+      setMode(_MODE_TO_ON);
     }
   } else {
     uartIsolatorSwitch.pullHigh();
diff --git a/linux/devices/ploc/PlocSupvUartMan.cpp b/linux/devices/ploc/PlocSupvUartMan.cpp
index 8938b5d3..8bc2019d 100644
--- a/linux/devices/ploc/PlocSupvUartMan.cpp
+++ b/linux/devices/ploc/PlocSupvUartMan.cpp
@@ -571,9 +571,9 @@ ReturnValue_t PlocSupvUartManager::handlePacketTransmissionNoReply(
   bool ackReceived = false;
   bool packetWasHandled = false;
   while (true) {
-    while (result != NO_PACKET_FOUND) {
+    do {
       result = tryHdlcParsing();
-    }
+    } while (result != NO_PACKET_FOUND);
     if (not decodedQueue.empty()) {
       size_t packetLen = 0;
       decodedQueue.retrieve(&packetLen);
@@ -589,6 +589,7 @@ ReturnValue_t PlocSupvUartManager::handlePacketTransmissionNoReply(
         if (not ackReceived) {
           retval = handleAckReception(packet, serviceId, packetLen);
           if (retval == 1) {
+            sif::debug << "ACK received" << std::endl;
             ackReceived = true;
             packetWasHandled = true;
           } else if (retval == -1) {
@@ -597,6 +598,7 @@ ReturnValue_t PlocSupvUartManager::handlePacketTransmissionNoReply(
         } else {
           retval = handleExeAckReception(packet, serviceId, packetLen);
           if (retval == 1) {
+            sif::debug << "EXE ACK received" << std::endl;
             break;
           } else if (retval == -1) {
             return returnvalue::FAILED;
@@ -758,9 +760,10 @@ ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand() {
   bool packetWasHandled = false;
   bool exeReceived = false;
   while (true) {
-    while (result != NO_PACKET_FOUND) {
+    do {
       result = tryHdlcParsing();
-    }
+
+    } while (result != NO_PACKET_FOUND);
     if (not decodedQueue.empty()) {
       size_t packetLen = 0;
       decodedQueue.retrieve(&packetLen);