Merge branch 'develop' into meier/ploc-commands

linux/devices/ploc/PlocMPSoCHelper.cpp

@@ -3,7 +3,6 @@
 #include <filesystem>
 #include <fstream>
 
-#include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/FilesystemHelper.h"
 #endif
@@ -34,6 +33,9 @@ ReturnValue_t PlocMPSoCHelper::performOperation(uint8_t operationCode) {
   ReturnValue_t result = returnvalue::OK;
   semaphore.acquire();
   while (true) {
+#if OBSW_THREAD_TRACING == 1
+    trace::threadTrace(opCounter, "PLOC MPSOC Helper");
+#endif
     switch (internalState) {
       case InternalState::IDLE: {
         semaphore.acquire();

linux/devices/ploc/PlocMPSoCHelper.h

@@ -11,6 +11,7 @@
 #include "fsfw/tmtcservices/SourceSequenceCounter.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
+#include "mission/trace.h"
 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/SdCardManager.h"
 #endif
@@ -116,6 +117,10 @@ class PlocMPSoCHelper : public SystemObject, public ExecutableObjectIF {
 
   struct FlashWrite flashWrite;
 
+#if OBSW_THREAD_TRACING == 1
+  uint32_t opCounter = 0;
+#endif
+
   enum class InternalState { IDLE, FLASH_WRITE, FLASH_READ };
 
   InternalState internalState = InternalState::IDLE;

linux/devices/ploc/PlocSupervisorHandler.cpp

@@ -119,7 +119,7 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
     case MEMORY_CHECK_WITH_FILE: {
       shutdownCmdSent = false;
       UpdateParams params;
-      ReturnValue_t result = extractBaseParams(&data, size, params);
+      result = extractBaseParams(&data, size, params);
       if (result != returnvalue::OK) {
         return result;
       }
@@ -1742,18 +1742,21 @@ ReturnValue_t PlocSupervisorHandler::createMramDumpFile() {
   std::string filename = "mram-dump--" + timeStamp + ".bin";
 
 #ifdef XIPHOS_Q7S
-  std::string currentMountPrefix = sdcMan->getCurrentMountPrefix();
+  const char* currentMountPrefix = sdcMan->getCurrentMountPrefix();
 #else
-  std::string currentMountPrefix("/mnt/sd0");
+  const char* currentMountPrefix = "/mnt/sd0";
 #endif /* BOARD_TE0720 == 0 */
+  if (currentMountPrefix == nullptr) {
+    return returnvalue::FAILED;
+  }
 
   // Check if path to PLOC directory exists
-  if (not std::filesystem::exists(std::string(currentMountPrefix + "/" + supervisorFilePath))) {
+  if (not std::filesystem::exists(std::string(currentMountPrefix) + "/" + supervisorFilePath)) {
     sif::warning << "PlocSupervisorHandler::createMramDumpFile: Supervisor path does not exist"
                  << std::endl;
     return result::PATH_DOES_NOT_EXIST;
   }
-  activeMramFile = currentMountPrefix + "/" + supervisorFilePath + "/" + filename;
+  activeMramFile = std::string(currentMountPrefix) + "/" + supervisorFilePath + "/" + filename;
   // Create new file
   std::ofstream file(activeMramFile, std::ios_base::out);
   file.close();

linux/devices/ploc/PlocSupvUartMan.cpp

@@ -101,6 +101,9 @@ ReturnValue_t PlocSupvUartManager::performOperation(uint8_t operationCode) {
     lock->unlockMutex();
     semaphore->acquire();
     putTaskToSleep = false;
+#if OBSW_THREAD_TRACING == 1
+    trace::threadTrace(opCounter, "PLOC SUPV Helper PST");
+#endif
     while (true) {
       if (putTaskToSleep) {
         performUartShutdown();

linux/devices/ploc/PlocSupvUartMan.h

@@ -15,6 +15,7 @@
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
 #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
+#include "mission/trace.h"
 #include "tas/crc.h"
 
 #ifdef XIPHOS_Q7S
@@ -211,6 +212,9 @@ class PlocSupvUartManager : public DeviceCommunicationIF,
   supv::TmBase tmReader;
   int serialPort = 0;
   struct termios tty = {};
+#if OBSW_THREAD_TRACING == 1
+  uint32_t opCounter = 0;
+#endif
 
   struct EventBufferRequest {
     std::string path = "";