Merge branch 'main' into auto-switch-image-feature

Reviewed-on: #815
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+## Added
+
+- Added a new safety mechanism where the ProASIC scratch buffer can be used to trigger an
+  auto-boot to another image. The auto-boot is currently implemented as a one-shot mechanism:
+  The key-value pair which triggers the auto-boot will be removed from the scratch buffer.
+  See more information [here](https://egit.irs.uni-stuttgart.de/redmine/projects/eive-flight-manual/wiki/OBC_Auto_Switch_Image)
+
 # [v7.2.0] 2023-10-27
 
 - `eive-tmtc` v5.10.1

bsp_q7s/core/CoreController.cpp

@@ -359,6 +359,29 @@ ReturnValue_t CoreController::executeAction(ActionId_t actionId, MessageQueueId_
     case (OBSW_UPDATE_FROM_TMP): {
       return executeSwUpdate(SwUpdateSources::TMP_DIR, data, size);
     }
+    case (ENABLE_AUTO_SWITCH): {
+      if (size < 2) {
+        return HasActionsIF::INVALID_PARAMETERS;
+      }
+      uint8_t chip = data[0];
+      uint8_t copy = data[1];
+      if (chip > 1 or copy > 1) {
+        return HasActionsIF::INVALID_PARAMETERS;
+      }
+      std::string value = std::to_string(chip) + std::to_string(copy);
+      ReturnValue_t result = scratch::writeString(scratch::AUTO_SWITCH_IMAGE, value);
+      if (result == returnvalue::OK) {
+        return EXECUTION_FINISHED;
+      }
+      return result;
+    }
+    case (DISABLE_AUTO_SWITCH): {
+      ReturnValue_t result = scratch::clearValue(scratch::AUTO_SWITCH_IMAGE);
+      if (result != returnvalue::OK and result != scratch::KEY_NOT_FOUND) {
+        return result;
+      }
+      return EXECUTION_FINISHED;
+    }
     case (SWITCH_TO_SD_0): {
       if (not startSdStateMachine(sd::SdCard::SLOT_0, SdCfgMode::COLD_REDUNDANT, commandedBy,
                                   actionId)) {

bsp_q7s/memory/scratchApi.h

@@ -19,6 +19,7 @@ namespace scratch {
 
 static constexpr char PREFERED_SDC_KEY[] = "PREFSD";
 static constexpr char ALLOC_FAILURE_COUNT[] = "ALLOCERR";
+static constexpr char AUTO_SWITCH_IMAGE[] = "ASWI";
 
 static constexpr uint8_t INTERFACE_ID = CLASS_ID::SCRATCH_BUFFER;
 static constexpr ReturnValue_t KEY_NOT_FOUND = returnvalue::makeCode(INTERFACE_ID, 0);
@@ -76,7 +77,6 @@ ReturnValue_t readToFile(std::string name, std::ifstream& file, std::string& fil
   int result = std::system(oss.str().c_str());
   if (result != 0) {
     if (WEXITSTATUS(result) == 1) {
-      sif::warning << "scratch::readToFile: Key " << name << " does not exist" << std::endl;
       // Could not find value
       std::remove(filename.c_str());
       return KEY_NOT_FOUND;

bsp_q7s/obsw.cpp

@@ -1,5 +1,6 @@
 #include "obsw.h"
 
+#include <libxiphos.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -13,6 +14,7 @@
 #include "commonConfig.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
+#include "memory/scratchApi.h"
 #include "mission/acs/defs.h"
 #include "mission/com/defs.h"
 #include "mission/system/systemTree.h"
@@ -50,6 +52,8 @@ int obsw::obsw(int argc, char* argv[]) {
   }
 #endif
 
+  autoSwitchHandling();
+
   // Delay the boot if applicable.
   bootDelayHandling();
 
@@ -82,6 +86,33 @@ int obsw::obsw(int argc, char* argv[]) {
   return 0;
 }
 
+void obsw::autoSwitchHandling() {
+  std::string autoSwitchTarget;
+  auto switchToTarget = [&](xsc_libnor_chip_t chip, xsc_libnor_copy_t copy) {
+    sif::warning << "Detected ASWI=" << autoSwitchTarget
+                 << " in ProASIC scratch buffer, auto-switching to image " << int(chip) << " "
+                 << int(copy) << std::endl;
+    scratch::clearValue(scratch::AUTO_SWITCH_IMAGE);
+    // A bit of delay to ensure printout works..
+    TaskFactory::delayTask(500);
+    xsc_boot_copy(chip, copy);
+  };
+  if (scratch::readString(scratch::AUTO_SWITCH_IMAGE, autoSwitchTarget) == returnvalue::OK) {
+    if (autoSwitchTarget == "00") {
+      switchToTarget(XSC_LIBNOR_CHIP_0, XSC_LIBNOR_COPY_NOMINAL);
+    } else if (autoSwitchTarget == "01") {
+      switchToTarget(XSC_LIBNOR_CHIP_0, XSC_LIBNOR_COPY_GOLD);
+    } else if (autoSwitchTarget == "10") {
+      switchToTarget(XSC_LIBNOR_CHIP_1, XSC_LIBNOR_COPY_NOMINAL);
+    } else if (autoSwitchTarget == "11") {
+      switchToTarget(XSC_LIBNOR_CHIP_1, XSC_LIBNOR_COPY_GOLD);
+    } else {
+      sif::warning << "Invalid Auto Switch Image (ASWI) value detected: " << autoSwitchTarget
+                   << std::endl;
+    }
+  }
+}
+
 void obsw::bootDelayHandling() {
   const char* homedir = nullptr;
   homedir = getenv("HOME");

bsp_q7s/obsw.h

@@ -5,6 +5,12 @@ namespace obsw {
 
 int obsw(int argc, char* argv[]);
 
+/**
+ * This is a safety mechanism where the ProASIC scratch buffer can be used to trigger an
+ * auto-boot to another image. The auto-boot is currently implemented as a one-shot mechanism:
+ * The key-value pair which triggers the auto-boot will be removed from the scratch buffer.
+ */
+void autoSwitchHandling();
 void bootDelayHandling();
 void commandEiveSystemToSafe();
 void commandComSubsystemRxOnly();

linux/payload/PlocSupervisorHandler.cpp

@@ -223,6 +223,7 @@ ReturnValue_t PlocSupervisorHandler::buildCommandFromCommand(DeviceCommandId_t d
       break;
     }
     case RESET_MPSOC: {
+      sif::info << "PLOC SUPV: Resetting MPSoC" << std::endl;
       prepareEmptyCmd(Apid::BOOT_MAN, static_cast<uint8_t>(tc::BootManId::RESET_MPSOC));
       result = returnvalue::OK;
       break;
@@ -320,85 +321,6 @@ ReturnValue_t PlocSupervisorHandler::buildCommandFromCommand(DeviceCommandId_t d
       result = prepareWipeMramCmd(commandData);
       break;
     }
-      //    case ENABLE_NVMS: {
-      //      result = prepareEnableNvmsCommand(commandData);
-      //      break;
-      //    }
-      //    case RESTART_SUPERVISOR: {
-      //      prepareEmptyCmd(APID_RESTART_SUPERVISOR);
-      //      result = returnvalue::OK;
-      //      break;
-      //    }
-      // Removed command
-      //    case START_MPSOC_QUIET: {
-      //      prepareEmptyCmd(APID_START_MPSOC_QUIET);
-      //      result = returnvalue::OK;
-      //      break;
-      //    }
-      //    case ENABLE_AUTO_TM: {
-      //      EnableAutoTm packet(spParams);
-      //      result = packet.buildPacket();
-      //      if (result != returnvalue::OK) {
-      //        break;
-      //      }
-      //      finishTcPrep(packet.getFullPacketLen());
-      //      break;
-      //    }
-      //    case DISABLE_AUTO_TM: {
-      //      DisableAutoTm packet(spParams);
-      //      result = packet.buildPacket();
-      //      if (result != returnvalue::OK) {
-      //        break;
-      //      }
-      //      finishTcPrep(packet.getFullPacketLen());
-      //      break;
-      //    }
-      //    case LOGGING_REQUEST_COUNTERS: {
-      //      RequestLoggingData packet(spParams);
-      //      result = packet.buildPacket(RequestLoggingData::Sa::REQUEST_COUNTERS);
-      //      if (result != returnvalue::OK) {
-      //        break;
-      //      }
-      //      finishTcPrep(packet.getFullPacketLen());
-      //      break;
-      //    }
-      //    case LOGGING_CLEAR_COUNTERS: {
-      //      RequestLoggingData packet(spParams);
-      //      result = packet.buildPacket(RequestLoggingData::Sa::CLEAR_COUNTERS);
-      //      if (result != returnvalue::OK) {
-      //        break;
-      //      }
-      //      finishTcPrep(packet.getFullPacketLen());
-      //      break;
-      //    }
-      //    case LOGGING_SET_TOPIC: {
-      //      if (commandData == nullptr or commandDataLen == 0) {
-      //        return HasActionsIF::INVALID_PARAMETERS;
-      //      }
-      //      uint8_t tpc = *(commandData);
-      //      RequestLoggingData packet(spParams);
-      //      result = packet.buildPacket(RequestLoggingData::Sa::SET_LOGGING_TOPIC, tpc);
-      //      if (result != returnvalue::OK) {
-      //        break;
-      //      }
-      //      finishTcPrep(packet.getFullPacketLen());
-      //      break;
-      //    }
-      // I think this is disabled right now according to the TC excel table
-      //    case COPY_ADC_DATA_TO_MRAM: {
-      //      prepareEmptyCmd(APID_COPY_ADC_DATA_TO_MRAM);
-      //      result = returnvalue::OK;
-      //      break;
-      //    }
-      //    case REQUEST_ADC_REPORT: {
-      //      prepareEmptyCmd(APID_REQUEST_ADC_REPORT);
-      //      result = returnvalue::OK;
-      //      break;
-      //    }
-      //    case FIRST_MRAM_DUMP:
-      //    case CONSECUTIVE_MRAM_DUMP:
-      //      result = prepareDumpMramCmd(commandData);
-      //      break;
     default:
       sif::debug << "PlocSupervisorHandler::buildCommandFromCommand: Command not implemented"
                  << std::endl;
@@ -550,23 +472,17 @@ ReturnValue_t PlocSupervisorHandler::enableReplyInReplyMap(DeviceCommandMap::ite
     case SET_ADC_ENABLED_CHANNELS:
     case SET_ADC_WINDOW_AND_STRIDE:
     case SET_ADC_THRESHOLD:
-    // case COPY_ADC_DATA_TO_MRAM:
     case RUN_AUTO_EM_TESTS:
     case WIPE_MRAM:
     case SET_GPIO:
     case FACTORY_RESET:
     case READ_GPIO:
-    // case RESTART_SUPERVISOR:
     case DISABLE_PERIOIC_HK_TRANSMISSION:
-    // case START_MPSOC_QUIET:
     case SET_SHUTDOWN_TIMEOUT:
     case FACTORY_FLASH:
     case ENABLE_AUTO_TM:
     case DISABLE_AUTO_TM:
-    // case LOGGING_CLEAR_COUNTERS:
-    // case LOGGING_SET_TOPIC:
     case RESET_PL:
-      // case ENABLE_NVMS:
       enabledReplies = 2;
       break;
     default:
@@ -598,19 +514,12 @@ ReturnValue_t PlocSupervisorHandler::enableReplyInReplyMap(DeviceCommandMap::ite
 ReturnValue_t PlocSupervisorHandler::scanForReply(const uint8_t* start, size_t remainingSize,
                                                   DeviceCommandId_t* foundId, size_t* foundLen) {
   using namespace supv;
-  // TODO: Is this still required?
-  //  if (nextReplyId == FIRST_MRAM_DUMP) {
-  //    *foundId = FIRST_MRAM_DUMP;
-  //    return parseMramPackets(start, remainingSize, foundLen);
-  //  } else if (nextReplyId == CONSECUTIVE_MRAM_DUMP) {
-  //    *foundId = CONSECUTIVE_MRAM_DUMP;
-  //    return parseMramPackets(start, remainingSize, foundLen);
-  //  }
 
   tmReader.setData(start, remainingSize);
-  // sif::debug << "PlocSupervisorHandler::scanForReply: Received Packet" << std::endl;
-  // arrayprinter::print(start, remainingSize);
   uint16_t apid = tmReader.getModuleApid();
+  if (DEBUG_PLOC_SUPV) {
+    handlePacketPrint();
+  }
 
   switch (apid) {
     case (Apid::TMTC_MAN): {
@@ -664,6 +573,42 @@ ReturnValue_t PlocSupervisorHandler::scanForReply(const uint8_t* start, size_t r
   return INVALID_DATA;
 }
 
+void PlocSupervisorHandler::handlePacketPrint() {
+  if (tmReader.getModuleApid() == Apid::TMTC_MAN) {
+    if ((tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::ACK)) or
+        (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::NAK))) {
+      AcknowledgmentReport ack(tmReader);
+      const char* printStr = "???";
+      if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::ACK)) {
+        printStr = "ACK";
+
+      } else if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::NAK)) {
+        printStr = "NAK";
+      }
+      sif::debug << "PlocSupervisorHandler: RECV " << printStr << " for APID Module ID "
+                 << (int)ack.getRefModuleApid() << " Service ID " << (int)ack.getRefServiceId()
+                 << " Seq Count " << ack.getRefSequenceCount() << std::endl;
+      return;
+    } else if ((tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_ACK)) or
+               (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_NAK))) {
+      ExecutionReport exe(tmReader);
+      const char* printStr = "???";
+      if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_ACK)) {
+        printStr = "ACK EXE";
+
+      } else if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_NAK)) {
+        printStr = "NAK EXE";
+      }
+      sif::debug << "PlocSupervisorHandler: RECV " << printStr << " for APID Module ID "
+                 << (int)exe.getRefModuleApid() << " Service ID " << (int)exe.getRefServiceId()
+                 << " Seq Count " << exe.getRefSequenceCount() << std::endl;
+      return;
+    }
+  }
+  sif::debug << "PlocSupervisorHandler: RECV PACKET Size " << tmReader.getFullPacketLen()
+             << " Module APID " << (int)tmReader.getModuleApid() << " Service ID "
+             << (int)tmReader.getServiceId() << std::endl;
+}
 ReturnValue_t PlocSupervisorHandler::interpretDeviceReply(DeviceCommandId_t id,
                                                           const uint8_t* packet) {
   using namespace supv;
@@ -1292,7 +1237,7 @@ ReturnValue_t PlocSupervisorHandler::prepareEmptyCmd(uint16_t apid, uint8_t serv
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1303,7 +1248,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSelBootImageCmd(const uint8_t* comma
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1320,7 +1265,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetTimeRefCmd() {
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1330,7 +1275,7 @@ ReturnValue_t PlocSupervisorHandler::prepareDisableHk() {
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1342,7 +1287,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetBootTimeoutCmd(const uint8_t* com
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1353,7 +1298,7 @@ ReturnValue_t PlocSupervisorHandler::prepareRestartTriesCmd(const uint8_t* comma
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1371,7 +1316,7 @@ ReturnValue_t PlocSupervisorHandler::prepareLatchupConfigCmd(const uint8_t* comm
       if (result != returnvalue::OK) {
         return result;
       }
-      finishTcPrep(packet.getFullPacketLen());
+      finishTcPrep(packet);
       break;
     }
     case (supv::DISABLE_LATCHUP_ALERT): {
@@ -1380,7 +1325,7 @@ ReturnValue_t PlocSupervisorHandler::prepareLatchupConfigCmd(const uint8_t* comm
       if (result != returnvalue::OK) {
         return result;
       }
-      finishTcPrep(packet.getFullPacketLen());
+      finishTcPrep(packet);
       break;
     }
     default: {
@@ -1407,7 +1352,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetAlertLimitCmd(const uint8_t* comm
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1418,7 +1363,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetAdcEnabledChannelsCmd(const uint8
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1432,7 +1377,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetAdcWindowAndStrideCmd(const uint8
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1444,7 +1389,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetAdcThresholdCmd(const uint8_t* co
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1458,7 +1403,7 @@ ReturnValue_t PlocSupervisorHandler::prepareRunAutoEmTest(const uint8_t* command
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1471,7 +1416,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetGpioCmd(const uint8_t* commandDat
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1483,7 +1428,7 @@ ReturnValue_t PlocSupervisorHandler::prepareReadGpioCmd(const uint8_t* commandDa
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1497,14 +1442,18 @@ ReturnValue_t PlocSupervisorHandler::prepareFactoryResetCmd(const uint8_t* comma
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(resetCmd.getFullPacketLen());
+  finishTcPrep(resetCmd);
   return returnvalue::OK;
 }
 
-void PlocSupervisorHandler::finishTcPrep(size_t packetLen) {
+void PlocSupervisorHandler::finishTcPrep(TcBase& tc) {
   nextReplyId = supv::ACK_REPORT;
   rawPacket = commandBuffer;
-  rawPacketLen = packetLen;
+  rawPacketLen = tc.getFullPacketLen();
+  if (DEBUG_PLOC_SUPV) {
+    sif::debug << "PLOC SUPV: SEND PACKET Size " << tc.getFullPacketLen() << " Module APID "
+               << (int)tc.getModuleApid() << " Service ID " << (int)tc.getServiceId() << std::endl;
+  }
 }
 
 ReturnValue_t PlocSupervisorHandler::prepareSetShutdownTimeoutCmd(const uint8_t* commandData) {
@@ -1523,7 +1472,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetShutdownTimeoutCmd(const uint8_t*
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -1740,7 +1689,7 @@ ReturnValue_t PlocSupervisorHandler::prepareWipeMramCmd(const uint8_t* commandDa
   if (result != returnvalue::OK) {
     return result;
   }
-  finishTcPrep(packet.getFullPacketLen());
+  finishTcPrep(packet);
   return returnvalue::OK;
 }
 
@@ -2006,134 +1955,3 @@ ReturnValue_t PlocSupervisorHandler::checkModeCommand(Mode_t commandedMode,
   }
   return DeviceHandlerBase::checkModeCommand(commandedMode, commandedSubmode, msToReachTheMode);
 }
-
-// ReturnValue_t PlocSupervisorHandler::checkMramPacketApid() {
-//   uint16_t apid = (spacePacketBuffer[0] << 8 | spacePacketBuffer[1]) & supv::APID_MASK;
-//  TODO: Fix
-//  if (apid != supv::APID_MRAM_DUMP_TM) {
-//    return result::NO_MRAM_PACKET;
-//  }
-// return APERIODIC_REPLY;
-//}
-
-// ReturnValue_t PlocSupervisorHandler::parseMramPackets(const uint8_t* packet, size_t
-// remainingSize,
-//                                                       size_t* foundLen) {
-//   ReturnValue_t result = IGNORE_FULL_PACKET;
-//   uint16_t packetLen = 0;
-//   *foundLen = 0;
-//
-//   for (size_t idx = 0; idx < remainingSize; idx++) {
-//     std::memcpy(spacePacketBuffer + bufferTop, packet + idx, 1);
-//     bufferTop += 1;
-//     *foundLen += 1;
-//     if (bufferTop >= ccsds::HEADER_LEN) {
-//       packetLen = readSpacePacketLength(spacePacketBuffer);
-//     }
-//
-//     if (bufferTop == ccsds::HEADER_LEN + packetLen + 1) {
-//       packetInBuffer = true;
-//       bufferTop = 0;
-//       return checkMramPacketApid();
-//     }
-//
-//     if (bufferTop == supv::MAX_PACKET_SIZE) {
-//       *foundLen = remainingSize;
-//       disableAllReplies();
-//       bufferTop = 0;
-//       sif::info << "PlocSupervisorHandler::parseMramPackets: Can not find MRAM packet in space "
-//                    "packet buffer"
-//                 << std::endl;
-//       return result::MRAM_PACKET_PARSING_FAILURE;
-//     }
-//   }
-//
-//   return result;
-// }
-
-// ReturnValue_t PlocSupervisorHandler::prepareDumpMramCmd(const uint8_t* commandData) {
-//   uint32_t start = 0;
-//   uint32_t stop = 0;
-//   size_t size = sizeof(start) + sizeof(stop);
-//   SerializeAdapter::deSerialize(&start, &commandData, &size, SerializeIF::Endianness::BIG);
-//   SerializeAdapter::deSerialize(&stop, &commandData, &size, SerializeIF::Endianness::BIG);
-//   if ((stop - start) <= 0) {
-//     return SupvReturnValuesIF::INVALID_MRAM_ADDRESSES;
-//   }
-//   supv::MramCmd packet(spParams);
-//   ReturnValue_t result = packet.buildPacket(start, stop, supv::MramCmd::MramAction::DUMP);
-//   if (result != returnvalue::OK) {
-//     return result;
-//   }
-//   expectedMramDumpPackets = (stop - start) / supv::MAX_DATA_CAPACITY;
-//   if ((stop - start) % supv::MAX_DATA_CAPACITY) {
-//     expectedMramDumpPackets++;
-//   }
-//   receivedMramDumpPackets = 0;
-//
-//   finishTcPrep(packet.getFullPacketLen());
-//   return returnvalue::OK;
-// }
-
-// ReturnValue_t PlocSupervisorHandler::prepareLoggingRequest(const uint8_t* commandData,
-//                                                            size_t commandDataLen) {
-//   using namespace supv;
-//   RequestLoggingData::Sa sa = static_cast<RequestLoggingData::Sa>(*commandData);
-//   uint8_t tpc = *(commandData + 1);
-//   RequestLoggingData packet(spParams);
-//   ReturnValue_t result = packet.buildPacket(sa, tpc);
-//   if (result != returnvalue::OK) {
-//     return result;
-//   }
-//   finishTcPrep(packet.getFullPacketLen());
-//   return returnvalue::OK;
-// }
-
-// ReturnValue_t PlocSupervisorHandler::prepareEnableNvmsCommand(const uint8_t* commandData) {
-//   using namespace supv;
-//   uint8_t nvm01 = *(commandData);
-//   uint8_t nvm3 = *(commandData + 1);
-//   EnableNvms packet(spParams);
-//   ReturnValue_t result = packet.buildPacket(nvm01, nvm3);
-//   if (result != returnvalue::OK) {
-//     return result;
-//   }
-//   finishTcPrep(packet.getFullPacketLen());
-//   return returnvalue::OK;
-// }
-
-// ReturnValue_t PlocSupervisorHandler::handleLoggingReport(const uint8_t* data) {
-//   ReturnValue_t result = returnvalue::OK;
-//
-//   result = verifyPacket(data, supv::SIZE_LOGGING_REPORT);
-//
-//   if (result == SupvReturnValuesIF::CRC_FAILURE) {
-//     sif::warning << "PlocSupervisorHandler::handleLoggingReport: Logging report has "
-//                  << "invalid crc" << std::endl;
-//     return result;
-//   }
-//
-//   const uint8_t* dataField = data + supv::PAYLOAD_OFFSET + sizeof(supv::RequestLoggingData::Sa);
-//   result = loggingReport.read();
-//   if (result != returnvalue::OK) {
-//     return result;
-//   }
-//   loggingReport.setValidityBufferGeneration(false);
-//   size_t size = loggingReport.getSerializedSize();
-//   result = loggingReport.deSerialize(&dataField, &size, SerializeIF::Endianness::BIG);
-//   if (result != returnvalue::OK) {
-//     sif::warning << "PlocSupervisorHandler::handleLoggingReport: Deserialization failed"
-//                  << std::endl;
-//   }
-//   loggingReport.setValidityBufferGeneration(true);
-//   loggingReport.setValidity(true, true);
-//   result = loggingReport.commit();
-//   if (result != returnvalue::OK) {
-//     return result;
-//   }
-// #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
-//   loggingReport.printSet();
-// #endif
-//   nextReplyId = supv::EXE_REPORT;
-//   return result;
-// }

linux/payload/PlocSupervisorHandler.h

@@ -18,6 +18,9 @@
 #endif
 
 using supv::ExecutionReport;
+using supv::TcBase;
+
+static constexpr bool DEBUG_PLOC_SUPV = false;
 
 /**
  * @brief	This is the device handler for the supervisor of the PLOC which is programmed by
@@ -174,6 +177,8 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
    */
   void setExecutionTimeout(DeviceCommandId_t command);
 
+  void handlePacketPrint();
+
   /**
    * @brief   Handles event messages received from the supervisor helper
    */
@@ -227,7 +232,6 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
 
   ReturnValue_t handleLatchupStatusReport(const uint8_t* data);
   void handleBadApidServiceCombination(Event result, unsigned int apid, unsigned int serviceId);
-  // ReturnValue_t handleLoggingReport(const uint8_t* data);
   ReturnValue_t handleAdcReport(const uint8_t* data);
 
   /**
@@ -297,16 +301,13 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   ReturnValue_t prepareSetAdcThresholdCmd(const uint8_t* commandData);
   ReturnValue_t prepareRunAutoEmTest(const uint8_t* commandData);
   ReturnValue_t prepareWipeMramCmd(const uint8_t* commandData);
-  // ReturnValue_t prepareDumpMramCmd(const uint8_t* commandData);
   ReturnValue_t prepareSetGpioCmd(const uint8_t* commandData);
   ReturnValue_t prepareReadGpioCmd(const uint8_t* commandData);
-  // ReturnValue_t prepareLoggingRequest(const uint8_t* commandData, size_t commandDataLen);
-  //  ReturnValue_t prepareEnableNvmsCommand(const uint8_t* commandData);
 
   /**
    * @brief   Copies the content of a space packet to the command buffer.
    */
-  void finishTcPrep(size_t packetLen);
+  void finishTcPrep(TcBase& tc);
 
   /**
    * @brief   In case an acknowledgment failure reply has been received this function disables
@@ -332,12 +333,6 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
    */
   void disableExeReportReply();
 
-  /**
-   * @brief   Function is called in scanForReply and fills the spacePacketBuffer with the read
-   *          data until a full packet has been received.
-   */
-  // ReturnValue_t parseMramPackets(const uint8_t* packet, size_t remainingSize, size_t* foundlen);
-
   /**
    * @brief   This function generates the Service 8 packets for the MRAM dump data.
    */
@@ -350,12 +345,6 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
    */
   void increaseExpectedMramReplies(DeviceCommandId_t id);
 
-  /**
-   * @brief   Function checks if the packet written to the space packet buffer is really a
-   *          MRAM dump packet.
-   */
-  // ReturnValue_t checkMramPacketApid();
-
   /**
    * @brief   Writes the data of the MRAM dump to a file. The file will be created when receiving
    *          the first packet.

mission/sysDefs.h

@@ -75,6 +75,8 @@ static constexpr ActionId_t OBSW_UPDATE_FROM_TMP = 12;
 static constexpr ActionId_t SWITCH_TO_SD_0 = 16;
 static constexpr ActionId_t SWITCH_TO_SD_1 = 17;
 static constexpr ActionId_t SWITCH_TO_BOTH_SD_CARDS = 18;
+static constexpr ActionId_t ENABLE_AUTO_SWITCH = 19;
+static constexpr ActionId_t DISABLE_AUTO_SWITCH = 20;
 
 //! Reboot using the xsc_boot_copy command
 static constexpr ActionId_t XSC_REBOOT_OBC = 32;