From fc639a3e3fc7becc1714c8552b82020ab5682172 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Jul 2022 16:57:40 +0200
Subject: [PATCH] move countdown reset

---
 mission/devices/ScexDeviceHandler.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/mission/devices/ScexDeviceHandler.cpp b/mission/devices/ScexDeviceHandler.cpp
index 7417ca0d..85fbdc3a 100644
--- a/mission/devices/ScexDeviceHandler.cpp
+++ b/mission/devices/ScexDeviceHandler.cpp
@@ -52,36 +52,57 @@ ReturnValue_t ScexDeviceHandler::buildCommandFromCommand(DeviceCommandId_t devic
 
   switch (deviceCommand) {
     case (PING): {
+      finishCountdown.setTimeout(SHORT_CD);
+      // countdown starten
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {nullptr, 0},
                      tempCheck);
       break;
     }
     case (EXP_STATUS_CMD): {
+      finishCountdown.setTimeout(SHORT_CD);
+      // countdown starten
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {nullptr, 0},
                      tempCheck);
       break;
     }
     case (ION_CMD): {
+      finishCountdown.setTimeout(SHORT_CD);
+      // countdown starten
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {nullptr, 0},
                      tempCheck);
       break;
     }
     case (TEMP_CMD): {
+      finishCountdown.setTimeout(SHORT_CD);
+      // countdown starten
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen, {nullptr, 0},
                      tempCheck);
       break;
     }
     case (FRAM): {
+      finishCountdown.setTimeout(SHORT_CD);
+      // countdown starten
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       break;
     }
     case (ONE_CELL): {
+      finishCountdown.setTimeout(LONG_CD);
+      // countdown starts
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       break;
     }
     case (ALL_CELLS_CMD): {
+      finishCountdown.setTimeout(LONG_CD);
+      // countdown starts
+      finishCountdown.resetTimer();
       prepareScexCmd(cmdTyped, {cmdBuf.data(), cmdBuf.size()}, rawPacketLen,
                      {commandData + 1, commandDataLen - 1}, tempCheck);
       break;
@@ -130,9 +151,6 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
   ReturnValue_t status = RETURN_OK;
   auto oneFileHandler = [&](std::string cmdName) {
     fileId = random_string(6);
-    finishCountdown.setTimeout(SHORT_CD);
-    // countdown starten
-    finishCountdown.resetTimer();
     std::ostringstream oss("/tmp/scex-");
     oss << cmdName << fileId << ".bin";
     fileName = oss.str();
@@ -149,9 +167,6 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
   };
   auto multiFileHandler = [&](std::string cmdName) {
     if ((helper.getPacketCounter() == 1) or (not fileNameSet)) {
-      finishCountdown.setTimeout(LONG_CD);
-      // countdown starts
-      finishCountdown.resetTimer();
 
       fileId = random_string(6);
       std::ostringstream oss("/tmp/scex-");