filename fixes scex

mission/payload/ScexDeviceHandler.cpp

@@ -11,6 +11,7 @@
 #include <iostream>
 #include <random>
 
+#include "eive/definitions.h"
 #include "fsfw/globalfunctions/CRC.h"
 
 using std::ofstream;
@@ -205,50 +206,9 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
   using namespace scex;
 
   ReturnValue_t status = OK;
-  auto oneFileHandler = [&](const char* cmdName) {
-    auto activeSd = sdcMan.getActiveSdCard();
-    if (not activeSd) {
-      return HasFileSystemIF::FILESYSTEM_INACTIVE;
-    }
-    fileId = date_time_string();
-    std::ostringstream oss;
-    auto prefix = sdcMan.getCurrentMountPrefix();
-    if (prefix == nullptr) {
-      return returnvalue::FAILED;
-    }
-    oss << prefix << "/scex/scex-" << cmdName << "-" << fileId << ".bin";
-    fileName = oss.str();
-    ofstream out(fileName, ofstream::binary);
-    if (out.bad()) {
-      sif::error << "ScexDeviceHandler::interpretDeviceReply: Could not open file " << fileName
-                 << std::endl;
-      return FAILED;
-    }
-    out << helper;
-    return OK;
-  };
   auto multiFileHandler = [&](const char* cmdName) {
     if ((helper.getPacketCounter() == 1) or (not fileNameSet)) {
-      auto activeSd = sdcMan.getActiveSdCard();
-      if (not activeSd) {
-        return HasFileSystemIF::FILESYSTEM_INACTIVE;
-      }
-      fileId = date_time_string();
-      std::ostringstream oss;
-      auto prefix = sdcMan.getCurrentMountPrefix();
-      if (prefix == nullptr) {
-        return returnvalue::FAILED;
-      }
-      oss << prefix << "/scex/scex-" << cmdName << fileId << ".bin";
-      fileName = oss.str();
-      fileNameSet = true;
-      ofstream out(fileName, ofstream::binary);
-      if (out.bad()) {
-        sif::error << "ScexDeviceHandler::handleValidReply: Could not open file " << fileName
-                   << std::endl;
-        return FAILED;
-      }
-      out << helper;
+      return generateNewScexFile(cmdName);
     } else {
       ofstream out(fileName,
                    ofstream::binary | ofstream::app);  // append
@@ -264,19 +224,19 @@ ReturnValue_t ScexDeviceHandler::interpretDeviceReply(DeviceCommandId_t id, cons
   id = helper.getCmd();
   switch (id) {
     case (PING): {
-      status = oneFileHandler(PING_IDLE_BASE_NAME);
+      status = generateNewScexFile(PING_IDLE_BASE_NAME);
       break;
     }
     case (ION_CMD): {
-      status = oneFileHandler(ION_BASE_NAME);
+      status = generateNewScexFile(ION_BASE_NAME);
       break;
     }
     case (TEMP_CMD): {
-      status = oneFileHandler(TEMPERATURE_BASE_NAME);
+      status = generateNewScexFile(TEMPERATURE_BASE_NAME);
       break;
     }
     case (EXP_STATUS_CMD): {
-      status = oneFileHandler(EXP_STATUS_BASE_NAME);
+      status = generateNewScexFile(EXP_STATUS_BASE_NAME);
       break;
     }
     case (FRAM): {
@@ -383,6 +343,41 @@ std::string ScexDeviceHandler::date_time_string() {
   return date_time;
 }
 
+ReturnValue_t ScexDeviceHandler::generateNewScexFile(const char* cmdName) {
+  char timeString[64]{};
+  auto activeSd = sdcMan.getActiveSdCard();
+  if (not activeSd) {
+    return HasFileSystemIF::FILESYSTEM_INACTIVE;
+  }
+
+  std::ostringstream oss;
+  auto prefix = sdcMan.getCurrentMountPrefix();
+  if (prefix == nullptr) {
+    return returnvalue::FAILED;
+  }
+  timeval tv;
+  Clock::getClock_timeval(&tv);
+  time_t epoch = tv.tv_sec;
+  struct tm* time = gmtime(&epoch);
+  size_t writtenBytes = strftime(reinterpret_cast<char*>(timeString), sizeof(timeString),
+                                 config::FILE_DATE_FORMAT, time);
+  if (writtenBytes == 0) {
+    sif::error << "PersistentTmStore::createMostRecentFile: Could not create file timestamp"
+               << std::endl;
+    return returnvalue::FAILED;
+  }
+  oss << prefix << "/scex/scex-" << cmdName << "-" << timeString << ".bin";
+  fileName = oss.str();
+  ofstream out(fileName, ofstream::binary);
+  if (out.bad()) {
+    sif::error << "ScexDeviceHandler::interpretDeviceReply: Could not open file " << fileName
+               << std::endl;
+    return FAILED;
+  }
+  out << helper;
+  return OK;
+}
+
 void ScexDeviceHandler::modeChanged() {}
 
 void ScexDeviceHandler::setPowerSwitcher(PowerSwitchIF& powerSwitcher, power::Switch_t switchId) {

mission/payload/ScexDeviceHandler.h

@@ -67,6 +67,7 @@ class ScexDeviceHandler : public DeviceHandlerBase {
   ReturnValue_t initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                         LocalDataPoolManager &poolManager) override;
   ReturnValue_t initializeAfterTaskCreation() override;
+  ReturnValue_t generateNewScexFile(const char *cmdName);
   void modeChanged() override;
 };