Merge branch 'main' into revert-str-com-if-changes

2023-11-29 14:57:05 +01:00 · 2023-11-29 14:57:05 +01:00 · d553afcc5b
commit d553afcc5b
parent 178da2fec1 66d4fa1806
45 changed files with 2487 additions and 492 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,7 @@ __pycache__
 !/.idea/cmake.xml

 generators/*.db
+
+# Clangd LSP
+/compile_commands.json
+/.cache
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,25 @@ will consitute of a breaking change warranting a new major release:

 # [unreleased]

+## Changed
+
+- Rewrote the PLOC Supervisor Handler, which is now based on a new device handler base class.
+  Added ADC and Logging Counters telemetry set support.
+
+## Fixed
+
+- STR config path was previously hardcoded to `/mnt/sd0/startracker/flight-config.json`.
+  A new abstraction was introduces which now uses the active SD card to build the correct
+  config path when initializing the star tracker.
+
+## Added
+
+- Added new PUS 15 subservice `DELETE_BY_TIME_RANGE` which allows to also specify a deletion
+  start time when deleting packets from the persistent TM store.
+- Introduced a new `RELOAD_JSON_CFG_FILE` command for the STR to reload the JSON configuration
+  data based on the current output of the config file path getter function. A reboot of the
+  device is still necessary to load the configuration to the STR.
+
 # [v7.3.0] 2023-11-07

 ## Changed
@ -697,7 +716,7 @@ This is the version which will fly on the satellite for the initial launch phase
  This gives other tasks some time to register the SD cards being unusable, and therefore provides
  a way for them to perform any re-initialization tasks necessary after SD card switches.
 - TCS controller now only has an OFF mode and an ON mode
- The TCS controller pauses operations related to the TCS board assembly (reading sensors and 
+- The TCS controller pauses operations related to the TCS board assembly (reading sensors and
  the primary control loop) while a TCS board recovery is on-going.
 - Allow specifying custom OBSW update filename. This allowed keeping a cleaner file structure
  where each update has a name including the version
@ -1762,8 +1781,8 @@ Syrlinks PR: PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/353
 - Syrlinks Handler: Read RX frequency shift as 24 bit signed number now. Also include
  validity handling for datasets.
  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/350
- `GyroADIS1650XHandler`: Changed calculation of angular rate to be sensitivity based instead of 
-  max. range based, as previous fix still left an margin of error between ADIS16505 sensors 
+- `GyroADIS1650XHandler`: Changed calculation of angular rate to be sensitivity based instead of
+  max. range based, as previous fix still left an margin of error between ADIS16505 sensors
  and L3GD20 sensors.
  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/346

--- a/linux/payload/PlocSupervisorHandler.cpp
+++ b/linux/payload/PlocSupervisorHandler.cpp
@ -19,8 +19,6 @@
 using namespace supv;
 using namespace returnvalue;

-std::atomic_bool supv::SUPV_ON = false;
-
 PlocSupervisorHandler::PlocSupervisorHandler(object_id_t objectId, CookieIF* comCookie,
                                             Gpio uartIsolatorSwitch, power::Switch_t powerSwitch,
                                             PlocSupvUartManager& supvHelper)
@ -29,7 +27,7 @@ PlocSupervisorHandler::PlocSupervisorHandler(object_id_t objectId, CookieIF* com
      hkset(this),
      bootStatusReport(this),
      latchupStatusReport(this),
-      loggingReport(this),
+      countersReport(this),
      adcReport(this),
      powerSwitch(powerSwitch),
      uartManager(supvHelper) {
@ -61,6 +59,19 @@ ReturnValue_t PlocSupervisorHandler::initialize() {
 }

 void PlocSupervisorHandler::performOperationHook() {
+  if (normalCommandIsPending and normalCmdCd.hasTimedOut()) {
+    // Event, FDIR, printout? Leads to spam though and normally should not happen..
+    normalCommandIsPending = false;
+  }
+  if (commandIsPending and cmdCd.hasTimedOut()) {
+    // Event, FDIR, printout? Leads to spam though and normally should not happen..
+    commandIsPending = false;
+
+    //    if(iter->second.sendReplyTo != NO_COMMANDER) {
+    //      actionHelper.finish(true, iter->second.sendReplyTo, iter->first, returnvalue::OK);
+    //    }
+    disableAllReplies();
+  }
  EventMessage event;
  for (ReturnValue_t result = eventQueue->receiveMessage(&event); result == returnvalue::OK;
       result = eventQueue->receiveMessage(&event)) {
@ -172,13 +183,16 @@ void PlocSupervisorHandler::doShutDown() {
  nextReplyId = supv::NONE;
  uartManager.stop();
  uartIsolatorSwitch.pullLow();
+  disableAllReplies();
  supv::SUPV_ON = false;
  startupState = StartupState::OFF;
 }

 ReturnValue_t PlocSupervisorHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
-  if (not commandIsExecuting(GET_HK_REPORT)) {
+  if (not normalCommandIsPending) {
    *id = GET_HK_REPORT;
+    normalCommandIsPending = true;
+    normalCmdCd.resetTimer();
    return buildCommandFromCommand(*id, nullptr, 0);
  }
  return NOTHING_TO_SEND;
@ -274,8 +288,7 @@ ReturnValue_t PlocSupervisorHandler::buildCommandFromCommand(DeviceCommandId_t d
      break;
    }
    case SET_GPIO: {
-      prepareSetGpioCmd(commandData);
-      result = returnvalue::OK;
+      result = prepareSetGpioCmd(commandData, commandDataLen);
      break;
    }
    case FACTORY_RESET: {
@ -283,8 +296,7 @@ ReturnValue_t PlocSupervisorHandler::buildCommandFromCommand(DeviceCommandId_t d
      break;
    }
    case READ_GPIO: {
-      prepareReadGpioCmd(commandData);
-      result = returnvalue::OK;
+      result = prepareReadGpioCmd(commandData, commandDataLen);
      break;
    }
    case SET_SHUTDOWN_TIMEOUT: {
@ -321,12 +333,25 @@ ReturnValue_t PlocSupervisorHandler::buildCommandFromCommand(DeviceCommandId_t d
      result = prepareWipeMramCmd(commandData);
      break;
    }
+    case REQUEST_ADC_REPORT: {
+      prepareEmptyCmd(Apid::ADC_MON, static_cast<uint8_t>(tc::AdcMonId::REQUEST_ADC_SAMPLE));
+      result = returnvalue::OK;
+      break;
+    }
+    case REQUEST_LOGGING_COUNTERS: {
+      prepareEmptyCmd(Apid::DATA_LOGGER,
+                      static_cast<uint8_t>(tc::DataLoggerServiceId::REQUEST_COUNTERS));
+      result = returnvalue::OK;
+      break;
+    }
    default:
      sif::debug << "PlocSupervisorHandler::buildCommandFromCommand: Command not implemented"
                 << std::endl;
      result = DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
      break;
  }
+  commandIsPending = true;
+  cmdCd.resetTimer();
  return result;
 }

@ -358,6 +383,8 @@ void PlocSupervisorHandler::fillCommandAndReplyMap() {
  insertInCommandMap(SET_ADC_THRESHOLD);
  insertInCommandMap(SET_ADC_WINDOW_AND_STRIDE);
  insertInCommandMap(RESET_PL);
+  insertInCommandMap(REQUEST_ADC_REPORT);
+  insertInCommandMap(REQUEST_LOGGING_COUNTERS);

  // ACK replies, use countdown for them
  insertInReplyMap(ACK_REPORT, 0, nullptr, SIZE_ACK_REPORT, false, &acknowledgementReportTimeout);
@ -368,7 +395,7 @@ void PlocSupervisorHandler::fillCommandAndReplyMap() {
  insertInReplyMap(HK_REPORT, 3, &hkset);
  insertInReplyMap(BOOT_STATUS_REPORT, 3, &bootStatusReport, SIZE_BOOT_STATUS_REPORT);
  insertInReplyMap(LATCHUP_REPORT, 3, &latchupStatusReport, SIZE_LATCHUP_STATUS_REPORT);
-  insertInReplyMap(LOGGING_REPORT, 3, &loggingReport, SIZE_LOGGING_REPORT);
+  insertInReplyMap(COUNTERS_REPORT, 3, &countersReport, SIZE_COUNTERS_REPORT);
  insertInReplyMap(ADC_REPORT, 3, &adcReport, SIZE_ADC_REPORT);
 }

@ -410,13 +437,13 @@ ReturnValue_t PlocSupervisorHandler::enableReplyInReplyMap(DeviceCommandMap::ite
      }
      break;
    }
-    case LOGGING_REQUEST_COUNTERS: {
+    case REQUEST_LOGGING_COUNTERS: {
      enabledReplies = 3;
      result =
-          DeviceHandlerBase::enableReplyInReplyMap(command, enabledReplies, true, LOGGING_REPORT);
+          DeviceHandlerBase::enableReplyInReplyMap(command, enabledReplies, true, COUNTERS_REPORT);
      if (result != returnvalue::OK) {
        sif::debug << "PlocSupervisorHandler::enableReplyInReplyMap: Reply with id "
-                   << LOGGING_REPORT << " not in replyMap" << std::endl;
+                   << COUNTERS_REPORT << " not in replyMap" << std::endl;
      }
      break;
    }
@ -541,6 +568,9 @@ ReturnValue_t PlocSupervisorHandler::scanForReply(const uint8_t* start, size_t r
    }
    case (Apid::HK): {
      if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::HkId::REPORT)) {
+        normalCommandIsPending = false;
+        // Yeah apparently this is needed??
+        disableCommand(GET_HK_REPORT);
        *foundLen = tmReader.getFullPacketLen();
        *foundId = ReplyId::HK_REPORT;
        return OK;
@ -559,6 +589,14 @@ ReturnValue_t PlocSupervisorHandler::scanForReply(const uint8_t* start, size_t r
      }
      break;
    }
+    case (Apid::ADC_MON): {
+      if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::AdcMonId::ADC_REPORT)) {
+        *foundLen = tmReader.getFullPacketLen();
+        *foundId = ReplyId::ADC_REPORT;
+        return OK;
+      }
+      break;
+    }
    case (Apid::MEM_MAN): {
      if (tmReader.getServiceId() ==
          static_cast<uint8_t>(supv::tm::MemManId::UPDATE_STATUS_REPORT)) {
@ -566,6 +604,15 @@ ReturnValue_t PlocSupervisorHandler::scanForReply(const uint8_t* start, size_t r
        *foundId = ReplyId::UPDATE_STATUS_REPORT;
        return OK;
      }
+      break;
+    }
+    case (Apid::DATA_LOGGER): {
+      if (tmReader.getServiceId() ==
+          static_cast<uint8_t>(supv::tm::DataLoggerId::COUNTERS_REPORT)) {
+        *foundLen = tmReader.getFullPacketLen();
+        *foundId = ReplyId::COUNTERS_REPORT;
+        return OK;
+      }
    }
  }
  handleBadApidServiceCombination(SUPV_UNKNOWN_TM, apid, tmReader.getServiceId());
@ -578,6 +625,14 @@ void PlocSupervisorHandler::handlePacketPrint() {
    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);
+      ReturnValue_t result = ack.parse();
+      if (result != returnvalue::OK) {
+        sif::warning << "PlocSupervisorHandler: Parsing ACK failed" << std::endl;
+      }
+      if (REDUCE_NORMAL_MODE_PRINTOUT and ack.getRefModuleApid() == (uint8_t)supv::Apid::HK and
+          ack.getRefServiceId() == (uint8_t)supv::tc::HkId::GET_REPORT) {
+        return;
+      }
      const char* printStr = "???";
      if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::ACK)) {
        printStr = "ACK";
@ -592,7 +647,15 @@ void PlocSupervisorHandler::handlePacketPrint() {
    } 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);
+      ReturnValue_t result = exe.parse();
+      if (result != returnvalue::OK) {
+        sif::warning << "PlocSupervisorHandler: Parsing EXE failed" << std::endl;
+      }
      const char* printStr = "???";
+      if (REDUCE_NORMAL_MODE_PRINTOUT and exe.getRefModuleApid() == (uint8_t)supv::Apid::HK and
+          exe.getRefServiceId() == (uint8_t)supv::tc::HkId::GET_REPORT) {
+        return;
+      }
      if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_ACK)) {
        printStr = "ACK EXE";

@ -627,12 +690,22 @@ ReturnValue_t PlocSupervisorHandler::interpretDeviceReply(DeviceCommandId_t id,
      result = handleBootStatusReport(packet);
      break;
    }
+    case (COUNTERS_REPORT): {
+      result = genericHandleTm("COUNTERS", packet, countersReport);
+#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
+      countersReport.printSet();
+#endif
+      break;
+    }
    case (LATCHUP_REPORT): {
      result = handleLatchupStatusReport(packet);
      break;
    }
    case (ADC_REPORT): {
-      result = handleAdcReport(packet);
+      result = genericHandleTm("ADC", packet, adcReport);
+#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
+      adcReport.printSet();
+#endif
      break;
    }
    case (EXE_REPORT): {
@ -697,13 +770,8 @@ ReturnValue_t PlocSupervisorHandler::initializeLocalDataPool(localpool::DataPool
  localDataPoolMap.emplace(supv::LATCHUP_RPT_TIME_YEAR, new PoolEntry<uint8_t>({0}));
  localDataPoolMap.emplace(supv::LATCHUP_RPT_IS_SET, new PoolEntry<uint8_t>({0}));

-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_0, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_1, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_2, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_3, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_4, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_5, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNT_6, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::SIGNATURE, new PoolEntry<uint32_t>());
+  localDataPoolMap.emplace(supv::LATCHUP_HAPPENED_CNTS, &latchupCounters);
  localDataPoolMap.emplace(supv::ADC_DEVIATION_TRIGGERS_CNT, new PoolEntry<uint32_t>({0}));
  localDataPoolMap.emplace(supv::TC_RECEIVED_CNT, new PoolEntry<uint32_t>({0}));
  localDataPoolMap.emplace(supv::TM_AVAILABLE_CNT, new PoolEntry<uint32_t>({0}));
@ -712,41 +780,22 @@ ReturnValue_t PlocSupervisorHandler::initializeLocalDataPool(localpool::DataPool
  localDataPoolMap.emplace(supv::MPSOC_BOOT_FAILED_ATTEMPTS, new PoolEntry<uint32_t>({0}));
  localDataPoolMap.emplace(supv::MPSOC_POWER_UP, new PoolEntry<uint32_t>({0}));
  localDataPoolMap.emplace(supv::MPSOC_UPDATES, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(supv::LAST_RECVD_TC, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MPSOC_HEARTBEAT_RESETS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::CPU_WDT_RESETS, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::PS_HEARTBEATS_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::PL_HEARTBEATS_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::EB_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::BM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::LM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::AM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::TCTMM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::MM_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::HK_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::DL_TASK_LOST, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(supv::RWS_TASKS_LOST, new PoolEntry<uint32_t>(3));

-  localDataPoolMap.emplace(supv::ADC_RAW_0, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_2, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_4, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_5, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_6, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_7, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_8, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_9, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_10, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_11, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_12, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_13, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_14, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_RAW_15, new PoolEntry<uint16_t>({0}));
-
-  localDataPoolMap.emplace(supv::ADC_ENG_0, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_2, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_4, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_5, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_6, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_7, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_8, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_9, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_10, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_11, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_12, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_13, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_14, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(supv::ADC_ENG_15, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(supv::ADC_RAW, &adcRawEntry);
+  localDataPoolMap.emplace(supv::ADC_ENG, &adcEngEntry);

  poolManager.subscribeForRegularPeriodicPacket(
      subdp::RegularHkPeriodicParams(hkset.getSid(), false, 10.0));
@ -871,6 +920,7 @@ ReturnValue_t PlocSupervisorHandler::handleExecutionReport(const uint8_t* data)
  } else if (tmReader.getServiceId() == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_NAK)) {
    handleExecutionFailureReport(report);
  }
+  commandIsPending = false;
  nextReplyId = supv::NONE;
  return result;
 }
@ -1105,37 +1155,31 @@ ReturnValue_t PlocSupervisorHandler::handleLatchupStatusReport(const uint8_t* da
  return result;
 }

-ReturnValue_t PlocSupervisorHandler::handleAdcReport(const uint8_t* data) {
+ReturnValue_t PlocSupervisorHandler::genericHandleTm(const char* contextString, const uint8_t* data,
+                                                     LocalPoolDataSetBase& set) {
  ReturnValue_t result = returnvalue::OK;

-  result = verifyPacket(data, supv::SIZE_ADC_REPORT);
+  result = verifyPacket(data, tmReader.getFullPacketLen());

  if (result == result::CRC_FAILURE) {
-    sif::error << "PlocSupervisorHandler::handleAdcReport: ADC report has "
-               << "invalid crc" << std::endl;
+    sif::warning << "PlocSupervisorHandler: " << contextString << " report has "
+                 << "invalid CRC" << std::endl;
    return result;
  }

  const uint8_t* dataField = data + supv::PAYLOAD_OFFSET;
-  result = adcReport.read();
-  if (result != returnvalue::OK) {
+  PoolReadGuard pg(&set);
+  if (pg.getReadResult() != returnvalue::OK) {
    return result;
  }
-  adcReport.setValidityBufferGeneration(false);
-  size_t size = adcReport.getSerializedSize();
-  result = adcReport.deSerialize(&dataField, &size, SerializeIF::Endianness::BIG);
+  set.setValidityBufferGeneration(false);
+  size_t size = set.getSerializedSize();
+  result = set.deSerialize(&dataField, &size, SerializeIF::Endianness::BIG);
  if (result != returnvalue::OK) {
-    sif::warning << "PlocSupervisorHandler::handleAdcReport: Deserialization failed" << std::endl;
+    sif::warning << "PlocSupervisorHandler: Deserialization failed" << std::endl;
  }
-  adcReport.setValidityBufferGeneration(true);
-  adcReport.setValidity(true, true);
-  result = adcReport.commit();
-  if (result != returnvalue::OK) {
-    return result;
-  }
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PLOC_SUPERVISOR == 1
-  adcReport.printSet();
-#endif
+  set.setValidityBufferGeneration(true);
+  set.setValidity(true, true);
  nextReplyId = supv::EXE_REPORT;
  return result;
 }
@ -1157,8 +1201,8 @@ void PlocSupervisorHandler::setNextReplyId() {
    case supv::CONSECUTIVE_MRAM_DUMP:
      nextReplyId = supv::CONSECUTIVE_MRAM_DUMP;
      break;
-    case supv::LOGGING_REQUEST_COUNTERS:
-      nextReplyId = supv::LOGGING_REPORT;
+    case supv::REQUEST_LOGGING_COUNTERS:
+      nextReplyId = supv::COUNTERS_REPORT;
      break;
    case supv::REQUEST_ADC_REPORT:
      nextReplyId = supv::ADC_REPORT;
@ -1407,7 +1451,11 @@ ReturnValue_t PlocSupervisorHandler::prepareRunAutoEmTest(const uint8_t* command
  return returnvalue::OK;
 }

-ReturnValue_t PlocSupervisorHandler::prepareSetGpioCmd(const uint8_t* commandData) {
+ReturnValue_t PlocSupervisorHandler::prepareSetGpioCmd(const uint8_t* commandData,
+                                                       size_t commandDataLen) {
+  if (commandDataLen < 3) {
+    return HasActionsIF::INVALID_PARAMETERS;
+  }
  uint8_t port = *commandData;
  uint8_t pin = *(commandData + 1);
  uint8_t val = *(commandData + 2);
@ -1420,7 +1468,11 @@ ReturnValue_t PlocSupervisorHandler::prepareSetGpioCmd(const uint8_t* commandDat
  return returnvalue::OK;
 }

-ReturnValue_t PlocSupervisorHandler::prepareReadGpioCmd(const uint8_t* commandData) {
+ReturnValue_t PlocSupervisorHandler::prepareReadGpioCmd(const uint8_t* commandData,
+                                                        size_t commandDataLen) {
+  if (commandDataLen < 2) {
+    return HasActionsIF::INVALID_PARAMETERS;
+  }
  uint8_t port = *commandData;
  uint8_t pin = *(commandData + 1);
  supv::ReadGpio packet(spParams);
@ -1466,6 +1518,7 @@ ReturnValue_t PlocSupervisorHandler::prepareSetShutdownTimeoutCmd(const uint8_t*
    sif::warning
        << "PlocSupervisorHandler::prepareSetShutdownTimeoutCmd: Failed to deserialize timeout"
        << std::endl;
+    return result;
  }
  supv::SetShutdownTimeout packet(spParams);
  result = packet.buildPacket(timeout);
@ -1517,8 +1570,8 @@ void PlocSupervisorHandler::disableAllReplies() {
      disableReply(LATCHUP_REPORT);
      break;
    }
-    case LOGGING_REQUEST_COUNTERS: {
-      disableReply(LOGGING_REPORT);
+    case REQUEST_LOGGING_COUNTERS: {
+      disableReply(COUNTERS_REPORT);
      break;
    }
    default: {
@ -1532,6 +1585,9 @@ void PlocSupervisorHandler::disableAllReplies() {

 void PlocSupervisorHandler::disableReply(DeviceCommandId_t replyId) {
  DeviceReplyMap::iterator iter = deviceReplyMap.find(replyId);
+  if (iter == deviceReplyMap.end()) {
+    return;
+  }
  DeviceReplyInfo* info = &(iter->second);
  info->delayCycles = 0;
  info->active = false;
@ -1562,6 +1618,9 @@ void PlocSupervisorHandler::sendFailureReport(DeviceCommandId_t replyId, ReturnV

 void PlocSupervisorHandler::disableExeReportReply() {
  DeviceReplyIter iter = deviceReplyMap.find(supv::EXE_REPORT);
+  if (iter == deviceReplyMap.end()) {
+    return;
+  }
  DeviceReplyInfo* info = &(iter->second);
  info->delayCycles = 0;
  info->command = deviceCommandMap.end();
@ -1584,7 +1643,9 @@ ReturnValue_t PlocSupervisorHandler::handleMramDumpPacket(DeviceCommandId_t id)
    result = handleMramDumpFile(id);
    if (result != returnvalue::OK) {
      DeviceCommandMap::iterator iter = deviceCommandMap.find(id);
-      actionHelper.finish(false, iter->second.sendReplyTo, id, result);
+      if (iter != deviceCommandMap.end()) {
+        actionHelper.finish(false, iter->second.sendReplyTo, id, result);
+      }
      disableAllReplies();
      nextReplyId = supv::NONE;
      return result;
@ -1851,7 +1912,12 @@ ReturnValue_t PlocSupervisorHandler::eventSubscription() {

 ReturnValue_t PlocSupervisorHandler::handleExecutionSuccessReport(ExecutionReport& report) {
  DeviceCommandId_t commandId = getPendingCommand();
-  ReturnValue_t result = OK;
+  DeviceCommandMap::iterator iter = deviceCommandMap.find(commandId);
+  if (iter != deviceCommandMap.end() and iter->second.sendReplyTo != NO_COMMANDER) {
+    actionHelper.finish(true, iter->second.sendReplyTo, iter->first, returnvalue::OK);
+    iter->second.isExecuting = false;
+  }
+  commandIsPending = false;
  switch (commandId) {
    case supv::READ_GPIO: {
      // TODO: Fix
@ -1859,14 +1925,13 @@ ReturnValue_t PlocSupervisorHandler::handleExecutionSuccessReport(ExecutionRepor
 #if OBSW_DEBUG_PLOC_SUPERVISOR == 1
      sif::info << "PlocSupervisorHandler: Read GPIO TM, State: " << gpioState << std::endl;
 #endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
-      DeviceCommandMap::iterator iter = deviceCommandMap.find(commandId);
-      if (iter->second.sendReplyTo == NO_COMMAND_ID) {
+      if (iter != deviceCommandMap.end() and iter->second.sendReplyTo == NO_COMMAND_ID) {
        return returnvalue::OK;
      }
      uint8_t data[sizeof(gpioState)];
      size_t size = 0;
-      result = SerializeAdapter::serialize(&gpioState, data, &size, sizeof(gpioState),
-                                           SerializeIF::Endianness::BIG);
+      ReturnValue_t result = SerializeAdapter::serialize(&gpioState, data, &size, sizeof(gpioState),
+                                                         SerializeIF::Endianness::BIG);
      if (result != returnvalue::OK) {
        sif::debug << "PlocSupervisorHandler: Failed to deserialize GPIO state" << std::endl;
      }
@ -1942,6 +2007,11 @@ uint32_t PlocSupervisorHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t mod
  return 7000;
 }

+void PlocSupervisorHandler::disableCommand(DeviceCommandId_t cmd) {
+  auto commandIter = deviceCommandMap.find(GET_HK_REPORT);
+  commandIter->second.isExecuting = false;
+}
+
 ReturnValue_t PlocSupervisorHandler::checkModeCommand(Mode_t commandedMode,
                                                      Submode_t commandedSubmode,
                                                      uint32_t* msToReachTheMode) {
--- a/linux/payload/PlocSupervisorHandler.h
+++ b/linux/payload/PlocSupervisorHandler.h
@ -20,7 +20,8 @@
 using supv::ExecutionReport;
 using supv::TcBase;

-static constexpr bool DEBUG_PLOC_SUPV = false;
+static constexpr bool DEBUG_PLOC_SUPV = true;
+static constexpr bool REDUCE_NORMAL_MODE_PRINTOUT = true;

 /**
 * @brief	This is the device handler for the supervisor of the PLOC which is programmed by
@ -67,26 +68,6 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  void doOffActivity() override;

 private:
-  static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER;
-
-  //! [EXPORT] : [COMMENT] PLOC supervisor crc failure in telemetry packet
-  static const Event SUPV_MEMORY_READ_RPT_CRC_FAILURE = MAKE_EVENT(1, severity::LOW);
-  //! [EXPORT] : [COMMENT] Unhandled event. P1: APID, P2: Service ID
-  static constexpr Event SUPV_UNKNOWN_TM = MAKE_EVENT(2, severity::LOW);
-  static constexpr Event SUPV_UNINIMPLEMENTED_TM = MAKE_EVENT(3, severity::LOW);
-  //! [EXPORT] : [COMMENT] PLOC supervisor received acknowledgment failure report
-  static const Event SUPV_ACK_FAILURE = MAKE_EVENT(4, severity::LOW);
-  //! [EXPORT] : [COMMENT] PLOC received execution failure report
-  //! P1: ID of command for which the execution failed
-  //! P2: Status code sent by the supervisor handler
-  static const Event SUPV_EXE_FAILURE = MAKE_EVENT(5, severity::LOW);
-  //! [EXPORT] : [COMMENT] PLOC supervisor reply has invalid crc
-  static const Event SUPV_CRC_FAILURE_EVENT = MAKE_EVENT(6, severity::LOW);
-  //! [EXPORT] : [COMMENT] Supervisor helper currently executing a command
-  static const Event SUPV_HELPER_EXECUTING = MAKE_EVENT(7, severity::LOW);
-  //! [EXPORT] : [COMMENT] Failed to build the command to shutdown the MPSoC
-  static const Event SUPV_MPSOC_SHUTDOWN_BUILD_FAILED = MAKE_EVENT(8, severity::LOW);
-
  static const uint16_t APID_MASK = 0x7FF;
  static const uint16_t PACKET_SEQUENCE_COUNT_MASK = 0x3FFF;
  static const uint8_t EXE_STATUS_OFFSET = 10;
@ -94,15 +75,14 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  // 5 s
  static const uint32_t EXECUTION_DEFAULT_TIMEOUT = 5000;
  // 70 S
-  static const uint32_t ACKNOWLEDGE_DEFAULT_TIMEOUT = 70000;
+  static const uint32_t ACKNOWLEDGE_DEFAULT_TIMEOUT = 5000;
  // 60 s
  static const uint32_t MRAM_DUMP_EXECUTION_TIMEOUT = 60000;
  // 70 s
  static const uint32_t COPY_ADC_TO_MRAM_TIMEOUT = 70000;
  // 60 s
  static const uint32_t MRAM_DUMP_TIMEOUT = 60000;
-  // 4 s
-  static const uint32_t BOOT_TIMEOUT = 4000;
+
  enum class StartupState : uint8_t {
    OFF,
    BOOTING,
@ -131,11 +111,18 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  LinuxLibgpioIF* gpioComIF = nullptr;
  Gpio uartIsolatorSwitch;
  bool shutdownCmdSent = false;
+  // Yeah, I am using an extra variable because I once again don't know
+  // what the hell the base class is doing and I don't care anymore.
+  bool normalCommandIsPending = false;
+  // True men implement their reply timeout handling themselves!
+  Countdown normalCmdCd = Countdown(2000);
+  bool commandIsPending = false;
+  Countdown cmdCd = Countdown(2000);

  supv::HkSet hkset;
  supv::BootStatusReport bootStatusReport;
  supv::LatchupStatusReport latchupStatusReport;
-  supv::LoggingReport loggingReport;
+  supv::CountersReport countersReport;
  supv::AdcReport adcReport;

  const power::Switch_t powerSwitch = power::NO_SWITCH;
@ -164,9 +151,12 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  Countdown executionReportTimeout = Countdown(EXECUTION_DEFAULT_TIMEOUT, false);
  Countdown acknowledgementReportTimeout = Countdown(ACKNOWLEDGE_DEFAULT_TIMEOUT, false);
  // Vorago nees some time to boot properly
-  Countdown bootTimeout = Countdown(BOOT_TIMEOUT);
+  Countdown bootTimeout = Countdown(supv::BOOT_TIMEOUT_MS);
  Countdown mramDumpTimeout = Countdown(MRAM_DUMP_TIMEOUT);

+  PoolEntry<uint16_t> adcRawEntry = PoolEntry<uint16_t>(16);
+  PoolEntry<uint16_t> adcEngEntry = PoolEntry<uint16_t>(16);
+  PoolEntry<uint32_t> latchupCounters = PoolEntry<uint32_t>(7);
  PoolEntry<uint8_t> fmcStateEntry = PoolEntry<uint8_t>(1);
  PoolEntry<uint8_t> bootStateEntry = PoolEntry<uint8_t>(1);
  PoolEntry<uint8_t> bootCyclesEntry = PoolEntry<uint8_t>(1);
@ -231,8 +221,13 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  ReturnValue_t handleBootStatusReport(const uint8_t* data);

  ReturnValue_t handleLatchupStatusReport(const uint8_t* data);
+  ReturnValue_t handleCounterReport(const uint8_t* data);
  void handleBadApidServiceCombination(Event result, unsigned int apid, unsigned int serviceId);
  ReturnValue_t handleAdcReport(const uint8_t* data);
+  ReturnValue_t genericHandleTm(const char* contextString, const uint8_t* data,
+                                LocalPoolDataSetBase& set);
+
+  void disableCommand(DeviceCommandId_t cmd);

  /**
   * @brief   Depending on the current active command, this function sets the reply id of the
@ -301,8 +296,8 @@ 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 prepareSetGpioCmd(const uint8_t* commandData);
-  ReturnValue_t prepareReadGpioCmd(const uint8_t* commandData);
+  ReturnValue_t prepareSetGpioCmd(const uint8_t* commandData, size_t commandDataLen);
+  ReturnValue_t prepareReadGpioCmd(const uint8_t* commandData, size_t commandDataLen);

  /**
   * @brief   Copies the content of a space packet to the command buffer.
--- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp
+++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 315 translations.
+ * @brief    Auto-generated event translation file. Contains 317 translations.
 * @details
- * Generated on: 2023-10-27 14:24:05
+ * Generated on: 2023-11-21 16:44:58
 */
 #include "translateEvents.h"

@ -157,6 +157,8 @@ const char *SUPV_EXE_FAILURE_STRING = "SUPV_EXE_FAILURE";
 const char *SUPV_CRC_FAILURE_EVENT_STRING = "SUPV_CRC_FAILURE_EVENT";
 const char *SUPV_HELPER_EXECUTING_STRING = "SUPV_HELPER_EXECUTING";
 const char *SUPV_MPSOC_SHUTDOWN_BUILD_FAILED_STRING = "SUPV_MPSOC_SHUTDOWN_BUILD_FAILED";
+const char *SUPV_ACK_UNKNOWN_COMMAND_STRING = "SUPV_ACK_UNKNOWN_COMMAND";
+const char *SUPV_EXE_ACK_UNKNOWN_COMMAND_STRING = "SUPV_EXE_ACK_UNKNOWN_COMMAND";
 const char *SANITIZATION_FAILED_STRING = "SANITIZATION_FAILED";
 const char *MOUNTED_SD_CARD_STRING = "MOUNTED_SD_CARD";
 const char *SEND_MRAM_DUMP_FAILED_STRING = "SEND_MRAM_DUMP_FAILED";
@ -627,6 +629,10 @@ const char *translateEvents(Event event) {
      return SUPV_HELPER_EXECUTING_STRING;
    case (12008):
      return SUPV_MPSOC_SHUTDOWN_BUILD_FAILED_STRING;
+    case (12009):
+      return SUPV_ACK_UNKNOWN_COMMAND_STRING;
+    case (12010):
+      return SUPV_EXE_ACK_UNKNOWN_COMMAND_STRING;
    case (12100):
      return SANITIZATION_FAILED_STRING;
    case (12101):
--- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp
+++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 175 translations.
- * Generated on: 2023-10-27 14:24:05
+ * Generated on: 2023-11-21 16:44:58
 */
 #include "translateObjects.h"

--- a/bsp_hosted/objectFactory.cpp
+++ b/bsp_hosted/objectFactory.cpp
@ -38,9 +38,9 @@

 #include "devices/gpioIds.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
+#include "linux/payload/FreshSupvHandler.h"
 #include "linux/payload/PlocMpsocHandler.h"
 #include "linux/payload/PlocMpsocSpecialComHelper.h"
-#include "linux/payload/PlocSupervisorHandler.h"
 #include "linux/payload/PlocSupvUartMan.h"
 #include "test/gpio/DummyGpioIF.h"
 #endif
@ -97,10 +97,11 @@ void ObjectFactory::produce(void* args) {
      new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER, plocSupvString, uart::PLOC_SUPV_BAUD,
                       supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
  supervisorCookie->setNoFixedSizeReply();
-  auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
-  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie,
-                            Gpio(gpioIds::ENABLE_SUPV_UART, dummyGpioIF), pcdu::PDU1_CH6_PLOC_12V,
-                            *supvHelper);
+  new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
+  DhbConfig dhbConf(objects::PLOC_SUPERVISOR_HANDLER);
+  auto* supvHandler =
+      new FreshSupvHandler(dhbConf, supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, dummyGpioIF),
+                           dummySwitcher, power::PDU1_CH6_PLOC_12V);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
 #endif

--- a/bsp_q7s/CMakeLists.txt
+++ b/bsp_q7s/CMakeLists.txt
@ -25,3 +25,4 @@ add_subdirectory(memory)
 add_subdirectory(callbacks)
 add_subdirectory(xadc)
 add_subdirectory(fs)
+add_subdirectory(acs)
--- a/bsp_q7s/acs/CMakeLists.txt
+++ b/bsp_q7s/acs/CMakeLists.txt
@ -0,0 +1 @@
+# target_sources(${OBSW_NAME} PUBLIC <Source File List>)
--- a/bsp_q7s/acs/StrConfigPathGetter.h
+++ b/bsp_q7s/acs/StrConfigPathGetter.h
@ -0,0 +1,23 @@
+#include <optional>
+
+#include "bsp_q7s/fs/SdCardManager.h"
+#include "mission/acs/str/strHelpers.h"
+
+class StrConfigPathGetter : public startracker::SdCardConfigPathGetter {
+ public:
+  StrConfigPathGetter(SdCardManager& sdcMan) : sdcMan(sdcMan) {}
+
+  std::optional<std::string> getCfgPath() override {
+    if (!sdcMan.isSdCardUsable(std::nullopt)) {
+      return std::nullopt;
+    }
+    if (sdcMan.getActiveSdCard() == sd::SdCard::SLOT_1) {
+      return std::string("/mnt/sd1/startracker/flight-config.json");
+    } else {
+      return std::string("/mnt/sd0/startracker/flight-config.json");
+    }
+  }
+
+ private:
+  SdCardManager& sdcMan;
+};
--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@ -152,7 +152,7 @@ void ObjectFactory::produce(void* args) {
 #endif

 #if OBSW_ADD_STAR_TRACKER == 1
-  createStrComponents(pwrSwitcher);
+  createStrComponents(pwrSwitcher, *SdCardManager::instance());
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */

 #if OBSW_ADD_PL_PCDU == 1
--- a/bsp_q7s/fmObjectFactory.cpp
+++ b/bsp_q7s/fmObjectFactory.cpp
@ -109,7 +109,7 @@ void ObjectFactory::produce(void* args) {
  createPayloadComponents(gpioComIF, *pwrSwitcher);

 #if OBSW_ADD_STAR_TRACKER == 1
-  createStrComponents(pwrSwitcher);
+  createStrComponents(pwrSwitcher, *SdCardManager::instance());
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */

 #if OBSW_ADD_CCSDS_IP_CORES == 1
--- a/bsp_q7s/objectFactory.cpp
+++ b/bsp_q7s/objectFactory.cpp
@ -13,7 +13,6 @@
 #include <linux/payload/PlocMemoryDumper.h>
 #include <linux/payload/PlocMpsocHandler.h>
 #include <linux/payload/PlocMpsocSpecialComHelper.h>
-#include <linux/payload/PlocSupervisorHandler.h>
 #include <linux/payload/ScexUartReader.h>
 #include <linux/payload/plocMpsocHelpers.h>
 #include <linux/power/CspComIF.h>
@ -37,6 +36,7 @@
 #include <cstring>

 #include "OBSWConfig.h"
+#include "bsp_q7s/acs/StrConfigPathGetter.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
 #include "bsp_q7s/callbacks/gnssCallback.h"
 #include "bsp_q7s/callbacks/pcduSwitchCb.h"
@ -60,6 +60,7 @@
 #include "linux/ipcore/PdecHandler.h"
 #include "linux/ipcore/Ptme.h"
 #include "linux/ipcore/PtmeConfig.h"
+#include "linux/payload/FreshSupvHandler.h"
 #include "mission/config/configfile.h"
 #include "mission/system/acs/AcsBoardFdir.h"
 #include "mission/system/acs/AcsSubsystem.h"
@ -612,11 +613,11 @@ void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
 #endif
 }

-void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF& pwrSwitch) {
+void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF& pwrSwitcher) {
  using namespace gpio;
  std::stringstream consumer;
  auto* camSwitcher =
-      new CamSwitcher(objects::CAM_SWITCHER, pwrSwitch, power::PDU2_CH8_PAYLOAD_CAMERA);
+      new CamSwitcher(objects::CAM_SWITCHER, pwrSwitcher, power::PDU2_CH8_PAYLOAD_CAMERA);
  camSwitcher->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
 #if OBSW_ADD_PLOC_MPSOC == 1
  consumer << "0x" << std::hex << objects::PLOC_MPSOC_HANDLER;
@ -650,11 +651,11 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwit
      new SerialCookie(objects::PLOC_SUPERVISOR_HANDLER, plocSupvDev, serial::PLOC_SUPV_BAUD,
                       supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
  supervisorCookie->setNoFixedSizeReply();
-  auto supvHelper = new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
-  auto* supvHandler = new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, supervisorCookie,
-                                                Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
-                                                power::PDU1_CH6_PLOC_12V, *supvHelper);
-  supvHandler->setPowerSwitcher(&pwrSwitch);
+  new PlocSupvUartManager(objects::PLOC_SUPERVISOR_HELPER);
+  DhbConfig dhbConf(objects::PLOC_SUPERVISOR_HANDLER);
+  auto* supvHandler =
+      new FreshSupvHandler(dhbConf, supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
+                           pwrSwitcher, power::PDU1_CH6_PLOC_12V);
  supvHandler->connectModeTreeParent(satsystem::payload::SUBSYSTEM);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
  static_cast<void>(consumer);
@ -935,7 +936,7 @@ void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {
 #endif
 }

-void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher) {
+void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher, SdCardManager& sdcMan) {
  auto* strAssy = new StrAssembly(objects::STR_ASSY);
  strAssy->connectModeTreeParent(satsystem::acs::ACS_SUBSYSTEM);
  auto* starTrackerCookie =
@ -949,9 +950,10 @@ void ObjectFactory::createStrComponents(PowerSwitchIF* pwrSwitcher) {
    sif::error << "No valid Star Tracker parameter JSON file" << std::endl;
  }
  auto strFdir = new StrFdir(objects::STAR_TRACKER);
+  auto cfgGetter = new StrConfigPathGetter(sdcMan);
  auto starTracker =
      new StarTrackerHandler(objects::STAR_TRACKER, objects::STR_COM_IF, starTrackerCookie,
-                             paramJsonFile, strComIF, power::PDU1_CH2_STAR_TRACKER_5V);
+                             strComIF, power::PDU1_CH2_STAR_TRACKER_5V, *cfgGetter);
  starTracker->setPowerSwitcher(pwrSwitcher);
  starTracker->connectModeTreeParent(*strAssy);
  starTracker->setCustomFdir(strFdir);
--- a/bsp_q7s/objectFactory.h
+++ b/bsp_q7s/objectFactory.h
@ -15,6 +15,8 @@
 #include <atomic>
 #include <string>

+#include "bsp_q7s/fs/SdCardManager.h"
+
 class LinuxLibgpioIF;
 class SerialComIF;
 class SpiComIF;
@ -75,7 +77,7 @@ void createHeaterComponents(GpioIF* gpioIF, PowerSwitchIF* pwrSwitcher, HealthTa
                            HeaterHandler*& heaterHandler);
 void createImtqComponents(PowerSwitchIF* pwrSwitcher, bool enableHkSets, const char* i2cDev);
 void createBpxBatteryComponent(bool enableHkSets, const char* i2cDev);
-void createStrComponents(PowerSwitchIF* pwrSwitcher);
+void createStrComponents(PowerSwitchIF* pwrSwitcher, SdCardManager& sdcMan);
 void createSolarArrayDeploymentComponents(PowerSwitchIF& pwrSwitcher, GpioIF& gpioIF);
 void createSyrlinksComponents(PowerSwitchIF* pwrSwitcher);
 void createPayloadComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF& pwrSwitcher);
--- a/bsp_q7s/scheduling.cpp
+++ b/bsp_q7s/scheduling.cpp
@ -383,11 +383,9 @@ void scheduling::initTasks() {
  }
 #endif /* OBSW_ADD_PLOC_SUPERVISOR */

-  PeriodicTaskIF* plTask = factory->createPeriodicTask(
-      "PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.5, missedDeadlineFunc, &RR_SCHEDULING);
-  plTask->addComponent(objects::CAM_SWITCHER);
-  scheduling::addMpsocSupvHandlers(plTask);
-  scheduling::scheduleScexDev(plTask);
+  FixedTimeslotTaskIF* plTask = factory->createFixedTimeslotTask(
+      "PL_TASK", 25, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.5, missedDeadlineFunc);
+  pst::pstPayload(plTask);

 #if OBSW_ADD_SCEX_DEVICE == 1
  PeriodicTaskIF* scexReaderTask;
--- a/cmake/scripts/q7s/q7s-make-debug.sh
+++ b/cmake/scripts/q7s/q7s-make-debug.sh
@ -24,6 +24,8 @@ if [ ! -z "${EIVE_Q7S_EM}" ]; then
    build_defs="EIVE_Q7S_EM=ON"
 fi

+build_defs="${build_defs} CMAKE_EXPORT_COMPILE_COMMANDS=ON" 
+
 os_fsfw="linux"
 tgt_bsp="arm/q7s"
 build_dir="cmake-build-debug-q7s"
--- a/cmake/scripts/q7s/q7s-make-release.sh
+++ b/cmake/scripts/q7s/q7s-make-release.sh
@ -24,6 +24,8 @@ if [ ! -z "${EIVE_Q7S_EM}" ]; then
    build_defs="EIVE_Q7S_EM=ON"
 fi

+build_defs="${build_defs} CMAKE_EXPORT_COMPILE_COMMANDS=ON" 
+
 os_fsfw="linux"
 tgt_bsp="arm/q7s"
 build_dir="cmake-build-release-q7s"
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit cc3e64e70d90f6a2b5c59215b2569c1771e890f0
+Subproject commit b28174db249cb33b541f665270fd6af14c382351
--- a/generators/bsp_hosted_events.csv
+++ b/generators/bsp_hosted_events.csv
@ -143,14 +143,16 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h
 11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h
 11903;0x2e7f;COM_ERROR_REPLY_RECEIVED;LOW;Received COM error. P1:  Communication Error ID (datasheet p32);mission/acs/str/StarTrackerHandler.h
-12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h
-12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h
-12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h
-12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/PlocSupervisorHandler.h
-12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/PlocSupervisorHandler.h
-12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/PlocSupervisorHandler.h
-12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/PlocSupervisorHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/plocSupvDefs.h
+12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/plocSupvDefs.h
+12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/plocSupvDefs.h
+12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/plocSupvDefs.h
+12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/plocSupvDefs.h
+12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/plocSupvDefs.h
+12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/plocSupvDefs.h
+12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/plocSupvDefs.h
+12009;0x2ee9;SUPV_ACK_UNKNOWN_COMMAND;LOW;Received ACK, but no related command is unknown or has not been sent  by this software instance. P1: Module APID. P2: Service ID.;linux/payload/plocSupvDefs.h
+12010;0x2eea;SUPV_EXE_ACK_UNKNOWN_COMMAND;LOW;Received ACK EXE, but no related command is unknown or has not been sent  by this software instance. P1: Module APID. P2: Service ID.;linux/payload/plocSupvDefs.h
 12100;0x2f44;SANITIZATION_FAILED;LOW;No description;bsp_q7s/fs/SdCardManager.h
 12101;0x2f45;MOUNTED_SD_CARD;INFO;No description;bsp_q7s/fs/SdCardManager.h
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/payload/PlocMemoryDumper.h
--- a/generators/bsp_q7s_events.csv
+++ b/generators/bsp_q7s_events.csv
@ -143,14 +143,16 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h
 11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h
 11903;0x2e7f;COM_ERROR_REPLY_RECEIVED;LOW;Received COM error. P1:  Communication Error ID (datasheet p32);mission/acs/str/StarTrackerHandler.h
-12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h
-12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h
-12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h
-12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/PlocSupervisorHandler.h
-12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/PlocSupervisorHandler.h
-12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/PlocSupervisorHandler.h
-12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/PlocSupervisorHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/plocSupvDefs.h
+12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/plocSupvDefs.h
+12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/plocSupvDefs.h
+12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/plocSupvDefs.h
+12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/plocSupvDefs.h
+12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/plocSupvDefs.h
+12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/plocSupvDefs.h
+12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/plocSupvDefs.h
+12009;0x2ee9;SUPV_ACK_UNKNOWN_COMMAND;LOW;Received ACK, but no related command is unknown or has not been sent  by this software instance. P1: Module APID. P2: Service ID.;linux/payload/plocSupvDefs.h
+12010;0x2eea;SUPV_EXE_ACK_UNKNOWN_COMMAND;LOW;Received ACK EXE, but no related command is unknown or has not been sent  by this software instance. P1: Module APID. P2: Service ID.;linux/payload/plocSupvDefs.h
 12100;0x2f44;SANITIZATION_FAILED;LOW;No description;bsp_q7s/fs/SdCardManager.h
 12101;0x2f45;MOUNTED_SD_CARD;INFO;No description;bsp_q7s/fs/SdCardManager.h
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/payload/PlocMemoryDumper.h
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 315 translations.
+ * @brief    Auto-generated event translation file. Contains 317 translations.
 * @details
- * Generated on: 2023-10-27 14:24:05
+ * Generated on: 2023-11-21 16:44:58
 */
 #include "translateEvents.h"

@ -157,6 +157,8 @@ const char *SUPV_EXE_FAILURE_STRING = "SUPV_EXE_FAILURE";
 const char *SUPV_CRC_FAILURE_EVENT_STRING = "SUPV_CRC_FAILURE_EVENT";
 const char *SUPV_HELPER_EXECUTING_STRING = "SUPV_HELPER_EXECUTING";
 const char *SUPV_MPSOC_SHUTDOWN_BUILD_FAILED_STRING = "SUPV_MPSOC_SHUTDOWN_BUILD_FAILED";
+const char *SUPV_ACK_UNKNOWN_COMMAND_STRING = "SUPV_ACK_UNKNOWN_COMMAND";
+const char *SUPV_EXE_ACK_UNKNOWN_COMMAND_STRING = "SUPV_EXE_ACK_UNKNOWN_COMMAND";
 const char *SANITIZATION_FAILED_STRING = "SANITIZATION_FAILED";
 const char *MOUNTED_SD_CARD_STRING = "MOUNTED_SD_CARD";
 const char *SEND_MRAM_DUMP_FAILED_STRING = "SEND_MRAM_DUMP_FAILED";
@ -627,6 +629,10 @@ const char *translateEvents(Event event) {
      return SUPV_HELPER_EXECUTING_STRING;
    case (12008):
      return SUPV_MPSOC_SHUTDOWN_BUILD_FAILED_STRING;
+    case (12009):
+      return SUPV_ACK_UNKNOWN_COMMAND_STRING;
+    case (12010):
+      return SUPV_EXE_ACK_UNKNOWN_COMMAND_STRING;
    case (12100):
      return SANITIZATION_FAILED_STRING;
    case (12101):
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 179 translations.
- * Generated on: 2023-10-27 14:24:05
+ * Generated on: 2023-11-21 16:44:58
 */
 #include "translateObjects.h"

--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 315 translations.
+ * @brief    Auto-generated event translation file. Contains 317 translations.
 * @details
- * Generated on: 2023-10-27 14:24:05
+ * Generated on: 2023-11-21 16:44:58
 */
 #include "translateEvents.h"

@ -157,6 +157,8 @@ const char *SUPV_EXE_FAILURE_STRING = "SUPV_EXE_FAILURE";
 const char *SUPV_CRC_FAILURE_EVENT_STRING = "SUPV_CRC_FAILURE_EVENT";
 const char *SUPV_HELPER_EXECUTING_STRING = "SUPV_HELPER_EXECUTING";
 const char *SUPV_MPSOC_SHUTDOWN_BUILD_FAILED_STRING = "SUPV_MPSOC_SHUTDOWN_BUILD_FAILED";
+const char *SUPV_ACK_UNKNOWN_COMMAND_STRING = "SUPV_ACK_UNKNOWN_COMMAND";
+const char *SUPV_EXE_ACK_UNKNOWN_COMMAND_STRING = "SUPV_EXE_ACK_UNKNOWN_COMMAND";
 const char *SANITIZATION_FAILED_STRING = "SANITIZATION_FAILED";
 const char *MOUNTED_SD_CARD_STRING = "MOUNTED_SD_CARD";
 const char *SEND_MRAM_DUMP_FAILED_STRING = "SEND_MRAM_DUMP_FAILED";
@ -627,6 +629,10 @@ const char *translateEvents(Event event) {
      return SUPV_HELPER_EXECUTING_STRING;
    case (12008):
      return SUPV_MPSOC_SHUTDOWN_BUILD_FAILED_STRING;
+    case (12009):
+      return SUPV_ACK_UNKNOWN_COMMAND_STRING;
+    case (12010):
+      return SUPV_EXE_ACK_UNKNOWN_COMMAND_STRING;
    case (12100):
      return SANITIZATION_FAILED_STRING;
    case (12101):
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 179 translations.
- * Generated on: 2023-10-27 14:24:05
+ * Generated on: 2023-11-21 16:44:58
 */
 #include "translateObjects.h"

--- a/linux/payload/CMakeLists.txt
+++ b/linux/payload/CMakeLists.txt
@ -2,9 +2,9 @@ target_sources(
  ${OBSW_NAME}
  PUBLIC PlocMemoryDumper.cpp
         PlocMpsocHandler.cpp
+         FreshSupvHandler.cpp
         PlocMpsocSpecialComHelper.cpp
         plocMpsocHelpers.cpp
-         PlocSupervisorHandler.cpp
         PlocSupvUartMan.cpp
         ScexDleParser.cpp
         ScexHelper.cpp
--- a/linux/payload/FreshSupvHandler.cpp
+++ b/linux/payload/FreshSupvHandler.cpp
--- a/linux/payload/FreshSupvHandler.h
+++ b/linux/payload/FreshSupvHandler.h
@ -0,0 +1,188 @@
+#ifndef LINUX_PAYLOAD_FRESHSUPVHANDLER_H_
+#define LINUX_PAYLOAD_FRESHSUPVHANDLER_H_
+
+#include <fsfw/power/PowerSwitchIF.h>
+#include <mission/controller/controllerdefinitions/PowerCtrlDefinitions.h>
+
+#include <map>
+
+#include "PlocSupvUartMan.h"
+#include "fsfw/devicehandlers/FreshDeviceHandlerBase.h"
+#include "fsfw/power/definitions.h"
+#include "fsfw_hal/linux/gpio/Gpio.h"
+#include "plocSupvDefs.h"
+
+using supv::TcBase;
+
+class FreshSupvHandler : public FreshDeviceHandlerBase {
+ public:
+  enum OpCode { DEFAULT_OPERATION = 0, PARSE_TM = 1 };
+
+  FreshSupvHandler(DhbConfig cfg, CookieIF* comCookie, Gpio uartIsolatorSwitch,
+                   PowerSwitchIF& switchIF, power::Switch_t powerSwitch);
+  /**
+   * Periodic helper executed function, implemented by child class.
+   */
+  void performDeviceOperation(uint8_t opCode) override;
+
+  /**
+   * Implemented by child class. Handle all command messages which are
+   * not health, mode, action or housekeeping messages.
+   * @param message
+   * @return
+   */
+  ReturnValue_t handleCommandMessage(CommandMessage* message) override;
+
+  ReturnValue_t initialize() override;
+
+ private:
+  // HK manager abstract functions.
+  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
+  ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
+                                        LocalDataPoolManager& poolManager) override;
+
+  // Mode abstract functions
+  ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode,
+                                 uint32_t* msToReachTheMode) override;
+  // Action override. Forward to user.
+  ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
+                              const uint8_t* data, size_t size) override;
+
+  /**
+   * @overload
+   * @param submode
+   */
+  void startTransition(Mode_t newMode, Submode_t submode) override;
+
+  ReturnValue_t performDeviceOperationPreQueueHandling(uint8_t opCode) override;
+  void handleTransitionToOn();
+  void handleTransitionToOff();
+
+ private:
+  static constexpr bool SET_TIME_DURING_BOOT = true;
+  static const uint8_t SIZE_NULL_TERMINATOR = 1;
+
+  enum class StartupState : uint8_t {
+    IDLE,
+    POWER_SWITCHING,
+    BOOTING,
+    SET_TIME,
+    WAIT_FOR_TIME_REPLY,
+    TIME_WAS_SET,
+    ON
+  };
+
+  StartupState startupState = StartupState::IDLE;
+  MessageQueueIF* eventQueue = nullptr;
+  supv::TmBase tmReader;
+
+  enum class ShutdownState : uint8_t { IDLE, POWER_SWITCHING };
+  ShutdownState shutdownState = ShutdownState::IDLE;
+
+  PlocSupvUartManager* uartManager;
+  CookieIF* comCookie;
+  PowerSwitchIF& switchIF;
+  power::Switch_t switchId;
+  Gpio uartIsolatorSwitch;
+
+  supv::HkSet hkSet;
+  supv::BootStatusReport bootStatusReport;
+  supv::LatchupStatusReport latchupStatusReport;
+  supv::CountersReport countersReport;
+  supv::AdcReport adcReport;
+
+  bool transitionActive = false;
+
+  Mode_t targetMode = HasModesIF::MODE_INVALID;
+  Submode_t targetSubmode = 0;
+
+  Countdown switchTimeout = Countdown(2000);
+  // Vorago nees some time to boot properly
+  Countdown bootTimeout = Countdown(supv::BOOT_TIMEOUT_MS);
+  // Countdown interCmdCd = Countdown(supv::INTER_COMMAND_DELAY);
+
+  PoolEntry<uint16_t> adcRawEntry = PoolEntry<uint16_t>(16);
+  PoolEntry<uint16_t> adcEngEntry = PoolEntry<uint16_t>(16);
+  PoolEntry<uint32_t> latchupCounters = PoolEntry<uint32_t>(7);
+  PoolEntry<uint8_t> fmcStateEntry = PoolEntry<uint8_t>(1);
+  PoolEntry<uint8_t> bootStateEntry = PoolEntry<uint8_t>(1);
+  PoolEntry<uint8_t> bootCyclesEntry = PoolEntry<uint8_t>(1);
+  PoolEntry<uint32_t> tempSupEntry = PoolEntry<uint32_t>(1);
+
+  pwrctrl::EnablePl enablePl = pwrctrl::EnablePl(objects::POWER_CONTROLLER);
+
+  struct ActiveCmdInfo {
+    ActiveCmdInfo(DeviceCommandId_t commandId, uint32_t cmdCountdownMs)
+        : commandId(commandId), cmdCountdown(cmdCountdownMs) {}
+
+    DeviceCommandId_t commandId = DeviceHandlerIF::NO_COMMAND_ID;
+    bool isPending = false;
+    bool ackRecv = false;
+    bool ackExeRecv = false;
+    bool replyPacketExpected = false;
+    bool replyPacketReceived = false;
+    MessageQueueId_t commandedBy = MessageQueueIF::NO_QUEUE;
+    bool requiresActionReply = false;
+    Countdown cmdCountdown;
+  };
+
+  uint32_t buildActiveCmdKey(uint16_t moduleApid, uint8_t serviceId);
+
+  // Map for Action commands. For normal commands, a separate static structure will be used.
+  std::map<uint32_t, ActiveCmdInfo> activeActionCmds;
+
+  std::array<uint8_t, supv::MAX_COMMAND_SIZE> commandBuffer{};
+  SpacePacketCreator creator;
+  supv::TcParams spParams = supv::TcParams(creator);
+  DeviceCommandId_t commandedByCached = MessageQueueIF::NO_QUEUE;
+
+  ReturnValue_t parseTmPackets();
+
+  ReturnValue_t sendCommand(DeviceCommandId_t commandId, TcBase& tc, bool replyPacketExpected,
+                            uint32_t cmdCountdownMs = 1000);
+  ReturnValue_t sendEmptyCmd(DeviceCommandId_t commandId, uint16_t apid, uint8_t serviceId,
+                             bool replyPacketExpected);
+  ReturnValue_t prepareSelBootImageCmd(const uint8_t* commandData);
+  ReturnValue_t prepareSetTimeRefCmd();
+  ReturnValue_t prepareSetBootTimeoutCmd(const uint8_t* commandData, size_t cmdDataLen);
+  ReturnValue_t prepareRestartTriesCmd(const uint8_t* commandData, size_t cmdDataLen);
+  ReturnValue_t prepareDisableHk();
+  ReturnValue_t prepareLatchupConfigCmd(const uint8_t* commandData, DeviceCommandId_t deviceCommand,
+                                        size_t cmdDataLen);
+  ReturnValue_t prepareSetAlertLimitCmd(const uint8_t* commandData, size_t cmdDataLen);
+  ReturnValue_t prepareFactoryResetCmd(const uint8_t* commandData, size_t len);
+  ReturnValue_t prepareSetShutdownTimeoutCmd(const uint8_t* commandData, size_t cmdDataLen);
+  ReturnValue_t prepareSetGpioCmd(const uint8_t* commandData, size_t commandDataLen);
+  ReturnValue_t prepareReadGpioCmd(const uint8_t* commandData, size_t commandDataLen);
+  ReturnValue_t prepareSetAdcEnabledChannelsCmd(const uint8_t* commandData);
+  ReturnValue_t prepareSetAdcWindowAndStrideCmd(const uint8_t* commandData);
+  ReturnValue_t prepareSetAdcThresholdCmd(const uint8_t* commandData);
+  ReturnValue_t prepareWipeMramCmd(const uint8_t* commandData, size_t cmdDataLen);
+  ReturnValue_t extractUpdateCommand(const uint8_t* commandData, size_t size,
+                                     supv::UpdateParams& params);
+  ReturnValue_t extractBaseParams(const uint8_t** commandData, size_t& remSize,
+                                  supv::UpdateParams& params);
+  void handleEvent(EventMessage* eventMessage);
+
+  void handleBadApidServiceCombination(Event event, unsigned int apid, unsigned int serviceId);
+  ReturnValue_t eventSubscription();
+  void handlePacketPrint();
+  bool isCommandAlreadyActive(ActionId_t actionId) const;
+  ReturnValue_t handleAckReport(const uint8_t* data);
+  void printAckFailureInfo(uint16_t statusCode, DeviceCommandId_t commandId);
+  ReturnValue_t handleExecutionReport(const uint8_t* data);
+  ReturnValue_t handleExecutionSuccessReport(ActiveCmdInfo& info, supv::ExecutionReport& report);
+  void handleExecutionFailureReport(ActiveCmdInfo& info, supv::ExecutionReport& report);
+  ReturnValue_t handleHkReport(const uint8_t* data);
+  ReturnValue_t verifyPacket(const uint8_t* start, size_t foundLen);
+  void confirmReplyPacketReceived(supv::Apid apid, uint8_t serviceId);
+  void performCommandCompletionHandling(supv::Apid apid, uint8_t serviceId, ActiveCmdInfo& info);
+  ReturnValue_t handleBootStatusReport(const uint8_t* data);
+  ReturnValue_t genericHandleTm(const char* contextString, const uint8_t* data,
+                                LocalPoolDataSetBase& set, supv::Apid apid, uint8_t serviceId);
+  ReturnValue_t handleLatchupStatusReport(const uint8_t* data);
+
+  bool isCommandPending() const;
+};
+
+#endif /* LINUX_PAYLOAD_FRESHSUPVHANDLER_H_ */
--- a/linux/payload/PlocMpsocHandler.cpp
+++ b/linux/payload/PlocMpsocHandler.cpp
@ -20,9 +20,8 @@ PlocMpsocHandler::PlocMpsocHandler(object_id_t objectId, object_id_t uartComIFid
  if (comCookie == nullptr) {
    sif::error << "PlocMPSoCHandler: Invalid communication cookie" << std::endl;
  }
-  eventQueue = QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 5);
-  commandActionHelperQueue =
-      QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 5);
+  eventQueue = QueueFactory::instance()->createMessageQueue(10);
+  commandActionHelperQueue = QueueFactory::instance()->createMessageQueue(10);
  spParams.maxSize = sizeof(commandBuffer);
  spParams.buf = commandBuffer;
 }
--- a/linux/payload/PlocMpsocSpecialComHelper.cpp
+++ b/linux/payload/PlocMpsocSpecialComHelper.cpp
@ -504,7 +504,7 @@ ReturnValue_t PlocMpsocSpecialComHelper::checkReceivedTm() {
    triggerEvent(MPSOC_TM_SIZE_ERROR);
    return result;
  }
-  spReader.checkCrc();
+  result = spReader.checkCrc();
  if (result != returnvalue::OK) {
    sif::warning << "PLOC MPSoC: CRC check failed" << std::endl;
    triggerEvent(MPSOC_TM_CRC_MISSMATCH, *sequenceCount);
--- a/linux/payload/PlocSupvUartMan.cpp
+++ b/linux/payload/PlocSupvUartMan.cpp
@ -24,6 +24,7 @@
 #include "mission/utility/Filenaming.h"
 #include "mission/utility/ProgressPrinter.h"
 #include "mission/utility/Timestamp.h"
+#include "tas/crc.h"

 using namespace returnvalue;
 using namespace supv;
@ -96,9 +97,10 @@ ReturnValue_t PlocSupvUartManager::initialize() {
 ReturnValue_t PlocSupvUartManager::performOperation(uint8_t operationCode) {
  bool putTaskToSleep = false;
  while (true) {
-    lock->lockMutex();
-    state = InternalState::SLEEPING;
-    lock->unlockMutex();
+    {
+      MutexGuard mg(lock);
+      state = InternalState::SLEEPING;
+    }
    semaphore->acquire();
    putTaskToSleep = false;
 #if OBSW_THREAD_TRACING == 1
@ -110,9 +112,11 @@ ReturnValue_t PlocSupvUartManager::performOperation(uint8_t operationCode) {
        break;
      }
      handleUartReception();
-      lock->lockMutex();
-      InternalState currentState = state;
-      lock->unlockMutex();
+      InternalState currentState;
+      {
+        MutexGuard mg(lock);
+        currentState = state;
+      }
      switch (currentState) {
        case InternalState::SLEEPING:
        case InternalState::GO_TO_SLEEP: {
@ -156,7 +160,7 @@ ReturnValue_t PlocSupvUartManager::handleUartReception() {
               << " bytes" << std::endl;
    return FAILED;
  } else if (bytesRead > 0) {
-    if (debugMode) {
+    if (DEBUG_MODE) {
      sif::info << "Received " << bytesRead << " bytes from the PLOC Supervisor:" << std::endl;
      arrayprinter::print(recBuf.data(), bytesRead);
    }
@ -571,7 +575,7 @@ ReturnValue_t PlocSupvUartManager::handlePacketTransmissionNoReply(
      size_t packetLen = 0;
      decodedQueue.retrieve(&packetLen);
      decodedRingBuf.readData(decodedBuf.data(), packetLen, true);
-      tmReader.setData(decodedBuf.data(), packetLen);
+      tmReader.setReadOnlyData(decodedBuf.data(), packetLen);
      result = checkReceivedTm();
      if (result != returnvalue::OK) {
        continue;
@ -617,7 +621,7 @@ int PlocSupvUartManager::handleAckReception(supv::TcBase& tc, size_t packetLen)
  if (serviceId == static_cast<uint8_t>(supv::tm::TmtcId::ACK) or
      serviceId == static_cast<uint8_t>(supv::tm::TmtcId::NAK)) {
    AcknowledgmentReport ackReport(tmReader);
-    ReturnValue_t result = ackReport.parse();
+    ReturnValue_t result = ackReport.parse(false);
    if (result != returnvalue::OK) {
      triggerEvent(ACK_RECEPTION_FAILURE);
      return -1;
@ -627,7 +631,7 @@ int PlocSupvUartManager::handleAckReception(supv::TcBase& tc, size_t packetLen)
      if (serviceId == static_cast<uint8_t>(supv::tm::TmtcId::ACK)) {
        return 1;
      } else if (serviceId == static_cast<uint8_t>(supv::tm::TmtcId::NAK)) {
-        ackReport.printStatusInformation();
+        ackReport.printStatusInformationAck();
        triggerEvent(
            SUPV_ACK_FAILURE_REPORT,
            buildApidServiceParam1(ackReport.getRefModuleApid(), ackReport.getRefServiceId()),
@ -649,7 +653,7 @@ int PlocSupvUartManager::handleExeAckReception(supv::TcBase& tc, size_t packetLe
  if (serviceId == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_ACK) or
      serviceId == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_NAK)) {
    ExecutionReport exeReport(tmReader);
-    ReturnValue_t result = exeReport.parse();
+    ReturnValue_t result = exeReport.parse(false);
    if (result != returnvalue::OK) {
      triggerEvent(EXE_RECEPTION_FAILURE);
      return -1;
@ -659,7 +663,7 @@ int PlocSupvUartManager::handleExeAckReception(supv::TcBase& tc, size_t packetLe
      if (serviceId == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_ACK)) {
        return 1;
      } else if (serviceId == static_cast<uint8_t>(supv::tm::TmtcId::EXEC_NAK)) {
-        exeReport.printStatusInformation();
+        exeReport.printStatusInformationExe();
        triggerEvent(
            SUPV_EXE_FAILURE_REPORT,
            buildApidServiceParam1(exeReport.getRefModuleApid(), exeReport.getRefServiceId()),
@ -682,7 +686,7 @@ ReturnValue_t PlocSupvUartManager::checkReceivedTm() {
    triggerEvent(SUPV_REPLY_SIZE_MISSMATCH, rememberApid);
    return result;
  }
-  if (not tmReader.verifyCrc()) {
+  if (tmReader.checkCrc() != returnvalue::OK) {
    triggerEvent(SUPV_REPLY_CRC_MISSMATCH, rememberApid);
    return result;
  }
@ -758,7 +762,7 @@ ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand(uint8_t failStep) {
      size_t packetLen = 0;
      decodedQueue.retrieve(&packetLen);
      decodedRingBuf.readData(decodedBuf.data(), packetLen, true);
-      tmReader.setData(decodedBuf.data(), packetLen);
+      tmReader.setReadOnlyData(decodedBuf.data(), packetLen);
      result = checkReceivedTm();
      if (result != returnvalue::OK) {
        continue;
@ -786,7 +790,7 @@ ReturnValue_t PlocSupvUartManager::handleCheckMemoryCommand(uint8_t failStep) {
      } else if (tmReader.getModuleApid() == Apid::MEM_MAN) {
        if (ackReceived) {
          supv::UpdateStatusReport report(tmReader);
-          result = report.parse();
+          result = report.parse(false);
          if (result != returnvalue::OK) {
            return result;
          }
@ -962,7 +966,7 @@ ReturnValue_t PlocSupvUartManager::handleRunningLongerRequest() {
 ReturnValue_t PlocSupvUartManager::encodeAndSendPacket(const uint8_t* sendData, size_t sendLen) {
  size_t encodedLen = 0;
  addHdlcFraming(sendData, sendLen, encodedSendBuf.data(), &encodedLen, encodedSendBuf.size());
-  if (printTc) {
+  if (PRINT_TC) {
    sif::debug << "Sending TC" << std::endl;
    arrayprinter::print(encodedSendBuf.data(), encodedLen);
  }
@ -984,6 +988,9 @@ ReturnValue_t PlocSupvUartManager::readReceivedMessage(CookieIF* cookie, uint8_t
    return OK;
  }
  ipcQueue.retrieve(size);
+  if (*size > ipcBuffer.size()) {
+    return FAILED;
+  }
  *buffer = ipcBuffer.data();
  ReturnValue_t result = ipcRingBuf.readData(ipcBuffer.data(), *size, true);
  if (result != OK) {
@ -1054,6 +1061,7 @@ ReturnValue_t PlocSupvUartManager::parseRecRingBufForHdlc(size_t& readSize, size
          triggerEvent(HDLC_CRC_ERROR);
        }
        if (retval != 0) {
+          readSize = ++idx;
          return HDLC_ERROR;
        }
        return returnvalue::OK;
@ -1084,11 +1092,14 @@ void PlocSupvUartManager::performUartShutdown() {
  while (not decodedQueue.empty()) {
    decodedQueue.pop();
  }
-  MutexGuard mg(ipcLock);
-  ipcRingBuf.clear();
-  while (not ipcQueue.empty()) {
-    ipcQueue.pop();
+  {
+    MutexGuard mg0(ipcLock);
+    ipcRingBuf.clear();
+    while (not ipcQueue.empty()) {
+      ipcQueue.pop();
+    }
  }
+  MutexGuard mg1(lock);
  state = InternalState::GO_TO_SLEEP;
 }

--- a/linux/payload/PlocSupvUartMan.h
+++ b/linux/payload/PlocSupvUartMan.h
@ -16,7 +16,6 @@
 #include "fsfw/returnvalues/returnvalue.h"
 #include "fsfw/tasks/ExecutableObjectIF.h"
 #include "fsfw_hal/linux/serial/SerialComIF.h"
-#include "tas/crc.h"

 #ifdef XIPHOS_Q7S
 #include "bsp_q7s/fs/SdCardManager.h"
@ -121,6 +120,32 @@ class PlocSupvUartManager : public DeviceCommunicationIF,

  PlocSupvUartManager(object_id_t objectId);
  virtual ~PlocSupvUartManager();
+  /**
+   * @brief Device specific initialization, using the cookie.
+   * @details
+   * The cookie is already prepared in the factory. If the communication
+   * interface needs to be set up in some way and requires cookie information,
+   * this can be performed in this function, which is called on device handler
+   * initialization.
+   * @param cookie
+   * @return
+   *  - @c returnvalue::OK if initialization was successfull
+   *  - Everything else triggers failure event with returnvalue as parameter 1
+   */
+  ReturnValue_t initializeInterface(CookieIF* cookie) override;
+  /**
+   * Called by DHB in the SEND_WRITE doSendWrite().
+   * This function is used to send data to the physical device
+   * by implementing and calling related drivers or wrapper functions.
+   * @param cookie
+   * @param data
+   * @param len If this is 0, nothing shall be sent.
+   * @return
+   *  - @c returnvalue::OK for successfull send
+   *  - Everything else triggers failure event with returnvalue as parameter 1
+   */
+  ReturnValue_t sendMessage(CookieIF* cookie, const uint8_t* sendData, size_t sendLen) override;
+  ReturnValue_t readReceivedMessage(CookieIF* cookie, uint8_t** buffer, size_t* size) override;

  ReturnValue_t initialize() override;
  ReturnValue_t performOperation(uint8_t operationCode = 0) override;
@ -206,11 +231,11 @@ class PlocSupvUartManager : public DeviceCommunicationIF,

  struct Update update;

+  int serialPort = 0;
  SemaphoreIF* semaphore;
  MutexIF* lock;
  MutexIF* ipcLock;
  supv::TmBase tmReader;
-  int serialPort = 0;
  struct termios tty = {};
 #if OBSW_THREAD_TRACING == 1
  uint32_t opCounter = 0;
@ -257,8 +282,8 @@ class PlocSupvUartManager : public DeviceCommunicationIF,

  std::array<uint8_t, supv::MAX_COMMAND_SIZE> tmBuf{};

-  bool printTc = false;
-  bool debugMode = false;
+  static constexpr bool PRINT_TC = false;
+  static constexpr bool DEBUG_MODE = false;
  bool timestamping = true;

  // Remembers APID to know at which command a procedure failed
@ -319,32 +344,6 @@ class PlocSupvUartManager : public DeviceCommunicationIF,
  void resetSpParams();
  void pushIpcData(const uint8_t* data, size_t len);

-  /**
-   * @brief Device specific initialization, using the cookie.
-   * @details
-   * The cookie is already prepared in the factory. If the communication
-   * interface needs to be set up in some way and requires cookie information,
-   * this can be performed in this function, which is called on device handler
-   * initialization.
-   * @param cookie
-   * @return
-   *  - @c returnvalue::OK if initialization was successfull
-   *  - Everything else triggers failure event with returnvalue as parameter 1
-   */
-  ReturnValue_t initializeInterface(CookieIF* cookie) override;
-
-  /**
-   * Called by DHB in the SEND_WRITE doSendWrite().
-   * This function is used to send data to the physical device
-   * by implementing and calling related drivers or wrapper functions.
-   * @param cookie
-   * @param data
-   * @param len If this is 0, nothing shall be sent.
-   * @return
-   *  - @c returnvalue::OK for successfull send
-   *  - Everything else triggers failure event with returnvalue as parameter 1
-   */
-  ReturnValue_t sendMessage(CookieIF* cookie, const uint8_t* sendData, size_t sendLen) override;
  /**
   * Called by DHB in the GET_WRITE doGetWrite().
   * Get send confirmation that the data in sendMessage() was sent successfully.
@ -369,7 +368,6 @@ class PlocSupvUartManager : public DeviceCommunicationIF,
   *           returnvalue as parameter 1
   */
  ReturnValue_t requestReceiveMessage(CookieIF* cookie, size_t requestLen) override;
-  ReturnValue_t readReceivedMessage(CookieIF* cookie, uint8_t** buffer, size_t* size) override;

  void performUartShutdown();
  void updateVtime(uint8_t vtime);
--- a/linux/payload/plocSupvDefs.h
+++ b/linux/payload/plocSupvDefs.h
@ -11,13 +11,46 @@
 #include <mission/payload/plocSpBase.h>

 #include <atomic>
-#include <optional>

+#include "eive/eventSubsystemIds.h"
 #include "eive/resultClassIds.h"

 namespace supv {

+static constexpr bool DEBUG_PLOC_SUPV = false;
+static constexpr bool REDUCE_NORMAL_MODE_PRINTOUT = true;
+
+static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER;
+
+//! [EXPORT] : [COMMENT] PLOC supervisor crc failure in telemetry packet
+static const Event SUPV_MEMORY_READ_RPT_CRC_FAILURE = MAKE_EVENT(1, severity::LOW);
+//! [EXPORT] : [COMMENT] Unhandled event. P1: APID, P2: Service ID
+static constexpr Event SUPV_UNKNOWN_TM = MAKE_EVENT(2, severity::LOW);
+static constexpr Event SUPV_UNINIMPLEMENTED_TM = MAKE_EVENT(3, severity::LOW);
+//! [EXPORT] : [COMMENT] PLOC supervisor received acknowledgment failure report
+static const Event SUPV_ACK_FAILURE = MAKE_EVENT(4, severity::LOW);
+//! [EXPORT] : [COMMENT] PLOC received execution failure report
+//! P1: ID of command for which the execution failed
+//! P2: Status code sent by the supervisor handler
+static const Event SUPV_EXE_FAILURE = MAKE_EVENT(5, severity::LOW);
+//! [EXPORT] : [COMMENT] PLOC supervisor reply has invalid crc
+static const Event SUPV_CRC_FAILURE_EVENT = MAKE_EVENT(6, severity::LOW);
+//! [EXPORT] : [COMMENT] Supervisor helper currently executing a command
+static const Event SUPV_HELPER_EXECUTING = MAKE_EVENT(7, severity::LOW);
+//! [EXPORT] : [COMMENT] Failed to build the command to shutdown the MPSoC
+static const Event SUPV_MPSOC_SHUTDOWN_BUILD_FAILED = MAKE_EVENT(8, severity::LOW);
+//! [EXPORT] : [COMMENT] Received ACK, but no related command is unknown or has not been sent
+//  by this software instance. P1: Module APID. P2: Service ID.
+static const Event SUPV_ACK_UNKNOWN_COMMAND = MAKE_EVENT(9, severity::LOW);
+//! [EXPORT] : [COMMENT] Received ACK EXE, but no related command is unknown or has not been sent
+//  by this software instance. P1: Module APID. P2: Service ID.
+static const Event SUPV_EXE_ACK_UNKNOWN_COMMAND = MAKE_EVENT(10, severity::LOW);
+
 extern std::atomic_bool SUPV_ON;
+static constexpr uint32_t INTER_COMMAND_DELAY = 20;
+static constexpr uint32_t BOOT_TIMEOUT_MS = 4000;
+static constexpr uint32_t MAX_TRANSITION_TIME_TO_ON_MS = BOOT_TIMEOUT_MS + 2000;
+static constexpr uint32_t MAX_TRANSITION_TIME_TO_OFF_MS = 1000;

 namespace result {
 static const uint8_t INTERFACE_ID = CLASS_ID::SUPV_RETURN_VALUES_IF;
@ -107,7 +140,7 @@ static const DeviceCommandId_t FIRST_MRAM_DUMP = 30;
 static const DeviceCommandId_t SET_GPIO = 34;
 static const DeviceCommandId_t READ_GPIO = 35;
 static const DeviceCommandId_t RESTART_SUPERVISOR = 36;
-static const DeviceCommandId_t LOGGING_REQUEST_COUNTERS = 38;
+static const DeviceCommandId_t REQUEST_LOGGING_COUNTERS = 38;
 static constexpr DeviceCommandId_t FACTORY_RESET = 39;
 static const DeviceCommandId_t CONSECUTIVE_MRAM_DUMP = 43;
 static const DeviceCommandId_t START_MPSOC_QUIET = 45;
@ -120,7 +153,7 @@ static const DeviceCommandId_t DISABLE_AUTO_TM = 51;
 static const DeviceCommandId_t LOGGING_REQUEST_EVENT_BUFFERS = 54;
 static const DeviceCommandId_t LOGGING_CLEAR_COUNTERS = 55;
 static const DeviceCommandId_t LOGGING_SET_TOPIC = 56;
-static const DeviceCommandId_t REQUEST_ADC_REPORT = 57;
+static constexpr DeviceCommandId_t REQUEST_ADC_REPORT = 57;
 static const DeviceCommandId_t RESET_PL = 58;
 static const DeviceCommandId_t ENABLE_NVMS = 59;
 static const DeviceCommandId_t CONTINUE_UPDATE = 60;
@ -134,7 +167,7 @@ enum ReplyId : DeviceCommandId_t {
  HK_REPORT = 102,
  BOOT_STATUS_REPORT = 103,
  LATCHUP_REPORT = 104,
-  LOGGING_REPORT = 105,
+  COUNTERS_REPORT = 105,
  ADC_REPORT = 106,
  UPDATE_STATUS_REPORT = 107,
 };
@ -144,7 +177,7 @@ static const uint16_t SIZE_ACK_REPORT = 14;
 static const uint16_t SIZE_EXE_REPORT = 14;
 static const uint16_t SIZE_BOOT_STATUS_REPORT = 24;
 static const uint16_t SIZE_LATCHUP_STATUS_REPORT = 31;
-static const uint16_t SIZE_LOGGING_REPORT = 73;
+static const uint16_t SIZE_COUNTERS_REPORT = 120;
 static const uint16_t SIZE_ADC_REPORT = 72;

 // 2 bits APID SRC, 00 for OBC, 2 bits APID DEST, 01 for SUPV, 7 bits CMD ID -> Mask 0x080
@ -207,12 +240,18 @@ enum class AdcMonId : uint8_t {
  SET_ENABLED_CHANNELS = 0x02,
  SET_WINDOW_STRIDE = 0x03,
  SET_ADC_THRESHOLD = 0x04,
-  COPY_ADC_DATA_TO_MRAM = 0x05
+  COPY_ADC_DATA_TO_MRAM = 0x05,
+  REQUEST_ADC_SAMPLE = 0x06
 };

 enum class MemManId : uint8_t { ERASE = 0x01, WRITE = 0x02, CHECK = 0x03 };

 enum class DataLoggerServiceId : uint8_t {
+  // Not implemented.
+  READ_MRAM_CFG_DATA_LOGGER = 0x00,
+  REQUEST_COUNTERS = 0x01,
+  // Not implemented.
+  EVENT_BUFFER_DOWNLOAD = 0x02,
  WIPE_MRAM = 0x05,
  DUMP_MRAM = 0x06,
  FACTORY_RESET = 0x07
@ -231,10 +270,12 @@ enum class TmtcId : uint8_t { ACK = 0x01, NAK = 0x02, EXEC_ACK = 0x03, EXEC_NAK
 enum class HkId : uint8_t { REPORT = 0x01, HARDFAULTS = 0x02 };

 enum class BootManId : uint8_t { BOOT_STATUS_REPORT = 0x01 };
+enum class AdcMonId : uint8_t { ADC_REPORT = 0x01 };

 enum class MemManId : uint8_t { UPDATE_STATUS_REPORT = 0x01 };

 enum class LatchupMonId : uint8_t { LATCHUP_STATUS_REPORT = 0x01 };
+enum class DataLoggerId : uint8_t { COUNTERS_REPORT = 0x01 };

 }  // namespace tm

@ -321,13 +362,13 @@ static const uint16_t SEQUENCE_COUNT_MASK = 0xFFF;
 static const uint8_t HK_SET_ENTRIES = 13;
 static const uint8_t BOOT_REPORT_SET_ENTRIES = 10;
 static const uint8_t LATCHUP_RPT_SET_ENTRIES = 16;
-static const uint8_t LOGGING_RPT_SET_ENTRIES = 16;
+static const uint8_t LOGGING_RPT_SET_ENTRIES = 30;
 static const uint8_t ADC_RPT_SET_ENTRIES = 32;

 static const uint32_t HK_SET_ID = HK_REPORT;
 static const uint32_t BOOT_REPORT_SET_ID = BOOT_STATUS_REPORT;
 static const uint32_t LATCHUP_RPT_ID = LATCHUP_REPORT;
-static const uint32_t LOGGING_RPT_ID = LOGGING_REPORT;
+static const uint32_t LOGGING_RPT_ID = COUNTERS_REPORT;
 static const uint32_t ADC_REPORT_SET_ID = ADC_REPORT;

 namespace timeout {
@ -392,7 +433,7 @@ enum PoolIds : lp_id_t {
  BR_SOC_STATE,
  POWER_CYCLES,
  BOOT_AFTER_MS,
-  BOOT_TIMEOUT_MS,
+  BOOT_TIMEOUT_POOL_VAR_MS,
  ACTIVE_NVM,
  BP0_STATE,
  BP1_STATE,
@ -417,13 +458,8 @@ enum PoolIds : lp_id_t {
  LATCHUP_RPT_TIME_MSEC,
  LATCHUP_RPT_IS_SET,

-  LATCHUP_HAPPENED_CNT_0,
-  LATCHUP_HAPPENED_CNT_1,
-  LATCHUP_HAPPENED_CNT_2,
-  LATCHUP_HAPPENED_CNT_3,
-  LATCHUP_HAPPENED_CNT_4,
-  LATCHUP_HAPPENED_CNT_5,
-  LATCHUP_HAPPENED_CNT_6,
+  SIGNATURE,
+  LATCHUP_HAPPENED_CNTS,
  ADC_DEVIATION_TRIGGERS_CNT,
  TC_RECEIVED_CNT,
  TM_AVAILABLE_CNT,
@ -432,40 +468,22 @@ enum PoolIds : lp_id_t {
  MPSOC_BOOT_FAILED_ATTEMPTS,
  MPSOC_POWER_UP,
  MPSOC_UPDATES,
-  LAST_RECVD_TC,
+  MPSOC_HEARTBEAT_RESETS,
+  CPU_WDT_RESETS,
+  PS_HEARTBEATS_LOST,
+  PL_HEARTBEATS_LOST,
+  EB_TASK_LOST,
+  BM_TASK_LOST,
+  LM_TASK_LOST,
+  AM_TASK_LOST,
+  TCTMM_TASK_LOST,
+  MM_TASK_LOST,
+  HK_TASK_LOST,
+  DL_TASK_LOST,
+  RWS_TASKS_LOST,

-  ADC_RAW_0,
-  ADC_RAW_1,
-  ADC_RAW_2,
-  ADC_RAW_3,
-  ADC_RAW_4,
-  ADC_RAW_5,
-  ADC_RAW_6,
-  ADC_RAW_7,
-  ADC_RAW_8,
-  ADC_RAW_9,
-  ADC_RAW_10,
-  ADC_RAW_11,
-  ADC_RAW_12,
-  ADC_RAW_13,
-  ADC_RAW_14,
-  ADC_RAW_15,
-  ADC_ENG_0,
-  ADC_ENG_1,
-  ADC_ENG_2,
-  ADC_ENG_3,
-  ADC_ENG_4,
-  ADC_ENG_5,
-  ADC_ENG_6,
-  ADC_ENG_7,
-  ADC_ENG_8,
-  ADC_ENG_9,
-  ADC_ENG_10,
-  ADC_ENG_11,
-  ADC_ENG_12,
-  ADC_ENG_13,
-  ADC_ENG_14,
-  ADC_ENG_15
+  ADC_RAW,
+  ADC_ENG,
 };

 struct TcParams : public ploc::SpTcParams {
@ -539,15 +557,6 @@ class TmBase : public ploc::SpTmReader {
    }
  }

-  bool verifyCrc() {
-    if (checkCrc() == returnvalue::OK) {
-      crcOk = true;
-    }
-    return crcOk;
-  }
-
-  bool crcIsOk() const { return crcOk; }
-
  uint8_t getServiceId() const { return getPacketData()[TIMESTAMP_LEN]; }

  uint16_t getModuleApid() const { return getApid() & APID_MODULE_MASK; }
@ -559,9 +568,6 @@ class TmBase : public ploc::SpTmReader {
    }
    return 0;
  }
-
- private:
-  bool crcOk = false;
 };

 class NoPayloadPacket : public TcBase {
@ -769,8 +775,6 @@ class SetRestartTries : public TcBase {
  }

 private:
-  uint8_t restartTries = 0;
-
  void initPacket(uint8_t restartTries) { payloadStart[0] = restartTries; }
 };

@ -831,8 +835,6 @@ class LatchupAlert : public TcBase {
  }

 private:
-  uint8_t latchupId = 0;
-
  void initPacket(uint8_t latchupId) { payloadStart[0] = latchupId; }
 };

@ -862,9 +864,6 @@ class SetAlertlimit : public TcBase {
  }

 private:
-  uint8_t latchupId = 0;
-  uint32_t dutycycle = 0;
-
  ReturnValue_t initPacket(uint8_t latchupId, uint32_t dutycycle) {
    payloadStart[0] = latchupId;
    size_t serLen = 0;
@ -1295,8 +1294,8 @@ class VerificationReport {

  virtual ~VerificationReport() = default;

-  virtual ReturnValue_t parse() {
-    if (not readerBase.crcIsOk()) {
+  virtual ReturnValue_t parse(bool checkCrc) {
+    if (checkCrc and readerBase.checkCrc() != returnvalue::OK) {
      return result::CRC_FAILURE;
    }
    if (readerBase.getModuleApid() != Apid::TMTC_MAN) {
@ -1313,27 +1312,27 @@ class VerificationReport {
    ReturnValue_t result = SerializeAdapter::deSerialize(&refApid, &payloadStart, &remLen,
                                                         SerializeIF::Endianness::BIG);
    if (result != returnvalue::OK) {
-      sif::debug << "VerificationReport: Failed to deserialize reference APID field" << std::endl;
+      sif::warning << "VerificationReport: Failed to deserialize reference APID field" << std::endl;
      return result;
    }
    result = SerializeAdapter::deSerialize(&refServiceId, &payloadStart, &remLen,
                                           SerializeIF::Endianness::BIG);
    if (result != returnvalue::OK) {
-      sif::debug << "VerificationReport: Failed to deserialize reference Service ID field"
-                 << std::endl;
+      sif::warning << "VerificationReport: Failed to deserialize reference Service ID field"
+                   << std::endl;
      return result;
    }
    result = SerializeAdapter::deSerialize(&refSeqCount, &payloadStart, &remLen,
                                           SerializeIF::Endianness::BIG);
    if (result != returnvalue::OK) {
-      sif::debug << "VerificationReport: Failed to deserialize reference sequence count field"
-                 << std::endl;
+      sif::warning << "VerificationReport: Failed to deserialize reference sequence count field"
+                   << std::endl;
      return result;
    }
    result = SerializeAdapter::deSerialize(&statusCode, &payloadStart, &remLen,
                                           SerializeIF::Endianness::BIG);
    if (result != returnvalue::OK) {
-      sif::debug << "VerificationReport: Failed to deserialize status code field" << std::endl;
+      sif::warning << "VerificationReport: Failed to deserialize status code field" << std::endl;
      return result;
    }
    return returnvalue::OK;
@ -1350,7 +1349,7 @@ class VerificationReport {

  uint32_t getStatusCode() const { return statusCode; }

-  virtual void printStatusInformation(const char* prefix) {
+  virtual void printStatusInformation(const char* prefix) const {
    bool codeHandled = true;
    if (statusCode < 0x100) {
      GeneralStatusCode code = static_cast<GeneralStatusCode>(getStatusCode());
@ -1637,15 +1636,15 @@ class AcknowledgmentReport : public VerificationReport {
 public:
  AcknowledgmentReport(TmBase& readerBase) : VerificationReport(readerBase) {}

-  virtual ReturnValue_t parse() override {
+  ReturnValue_t parse(bool checkCrc) override {
    if (readerBase.getServiceId() != static_cast<uint8_t>(tm::TmtcId::ACK) and
        readerBase.getServiceId() != static_cast<uint8_t>(tm::TmtcId::NAK)) {
      return result::INVALID_SERVICE_ID;
    }
-    return VerificationReport::parse();
+    return VerificationReport::parse(checkCrc);
  }

-  void printStatusInformation() {
+  void printStatusInformationAck() {
    VerificationReport::printStatusInformation(STATUS_PRINTOUT_PREFIX);
  }

@ -1659,15 +1658,15 @@ class ExecutionReport : public VerificationReport {

  TmBase& getReader() { return readerBase; }

-  ReturnValue_t parse() override {
+  ReturnValue_t parse(bool checkCrc) override {
    if (readerBase.getServiceId() != static_cast<uint8_t>(tm::TmtcId::EXEC_ACK) and
        readerBase.getServiceId() != static_cast<uint8_t>(tm::TmtcId::EXEC_NAK)) {
      return returnvalue::FAILED;
    }
-    return VerificationReport::parse();
+    return VerificationReport::parse(checkCrc);
  }

-  void printStatusInformation() {
+  void printStatusInformationExe() {
    VerificationReport::printStatusInformation(STATUS_PRINTOUT_PREFIX);
  }

@ -1679,8 +1678,8 @@ class UpdateStatusReport {
 public:
  UpdateStatusReport(TmBase& tmReader) : tmReader(tmReader) {}

-  ReturnValue_t parse() {
-    if (not tmReader.crcIsOk()) {
+  ReturnValue_t parse(bool checkCrc) {
+    if (checkCrc and tmReader.checkCrc() != returnvalue::OK) {
      return result::CRC_FAILURE;
    }
    if (tmReader.getModuleApid() != Apid::MEM_MAN) {
@ -1742,7 +1741,7 @@ class BootStatusReport : public StaticLocalDataSet<BOOT_REPORT_SET_ENTRIES> {
  lp_var_t<uint32_t> bootAfterMs = lp_var_t<uint32_t>(sid.objectId, PoolIds::BOOT_AFTER_MS, this);
  /** The currently set boot timeout */
  lp_var_t<uint32_t> bootTimeoutMs =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::BOOT_TIMEOUT_MS, this);
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::BOOT_TIMEOUT_POOL_VAR_MS, this);
  lp_var_t<uint8_t> activeNvm = lp_var_t<uint8_t>(sid.objectId, PoolIds::ACTIVE_NVM, this);
  /** States of the boot partition pins */
  lp_var_t<uint8_t> bp0State = lp_var_t<uint8_t>(sid.objectId, PoolIds::BP0_STATE, this);
@ -1814,26 +1813,16 @@ class LatchupStatusReport : public StaticLocalDataSet<LATCHUP_RPT_SET_ENTRIES> {
 /**
 * @brief   This dataset stores the logging report.
 */
-class LoggingReport : public StaticLocalDataSet<LOGGING_RPT_SET_ENTRIES> {
+class CountersReport : public StaticLocalDataSet<LOGGING_RPT_SET_ENTRIES> {
 public:
-  LoggingReport(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, LOGGING_RPT_ID) {}
+  CountersReport(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, LOGGING_RPT_ID) {}

-  LoggingReport(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, LOGGING_RPT_ID)) {}
+  CountersReport(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, LOGGING_RPT_ID)) {}

-  lp_var_t<uint32_t> latchupHappenCnt0 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_0, this);
-  lp_var_t<uint32_t> latchupHappenCnt1 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_1, this);
-  lp_var_t<uint32_t> latchupHappenCnt2 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_2, this);
-  lp_var_t<uint32_t> latchupHappenCnt3 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_3, this);
-  lp_var_t<uint32_t> latchupHappenCnt4 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_4, this);
-  lp_var_t<uint32_t> latchupHappenCnt5 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_5, this);
-  lp_var_t<uint32_t> latchupHappenCnt6 =
-      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNT_6, this);
+  lp_var_t<uint32_t> signature =
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNTS, this);
+  lp_vec_t<uint32_t, 7> latchupHappenCnts =
+      lp_vec_t<uint32_t, 7>(sid.objectId, PoolIds::LATCHUP_HAPPENED_CNTS, this);
  lp_var_t<uint32_t> adcDeviationTriggersCnt =
      lp_var_t<uint32_t>(sid.objectId, PoolIds::ADC_DEVIATION_TRIGGERS_CNT, this);
  lp_var_t<uint32_t> tcReceivedCnt =
@ -1847,23 +1836,31 @@ class LoggingReport : public StaticLocalDataSet<LOGGING_RPT_SET_ENTRIES> {
      lp_var_t<uint32_t>(sid.objectId, PoolIds::MPSOC_BOOT_FAILED_ATTEMPTS, this);
  lp_var_t<uint32_t> mpsocPowerup = lp_var_t<uint32_t>(sid.objectId, PoolIds::MPSOC_POWER_UP, this);
  lp_var_t<uint32_t> mpsocUpdates = lp_var_t<uint32_t>(sid.objectId, PoolIds::MPSOC_UPDATES, this);
-  lp_var_t<uint32_t> lastRecvdTc = lp_var_t<uint32_t>(sid.objectId, PoolIds::LAST_RECVD_TC, this);
+  lp_var_t<uint32_t> mpsocHeartbeatResets =
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::MPSOC_HEARTBEAT_RESETS, this);
+  lp_var_t<uint32_t> cpuWdtResets =
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::MPSOC_HEARTBEAT_RESETS, this);
+  lp_var_t<uint32_t> psHeartbeatsLost =
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::PS_HEARTBEATS_LOST, this);
+  lp_var_t<uint32_t> plHeartbeatsLost =
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::PL_HEARTBEATS_LOST, this);
+  lp_var_t<uint32_t> ebTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::EB_TASK_LOST, this);
+  lp_var_t<uint32_t> bmTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::BM_TASK_LOST, this);
+  lp_var_t<uint32_t> lmTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::LM_TASK_LOST, this);
+  lp_var_t<uint32_t> amTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::AM_TASK_LOST, this);
+  lp_var_t<uint32_t> tctmmTaskLost =
+      lp_var_t<uint32_t>(sid.objectId, PoolIds::TCTMM_TASK_LOST, this);
+  lp_var_t<uint32_t> mmTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::MM_TASK_LOST, this);
+  lp_var_t<uint32_t> hkTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::HK_TASK_LOST, this);
+  lp_var_t<uint32_t> dlTaskLost = lp_var_t<uint32_t>(sid.objectId, PoolIds::DL_TASK_LOST, this);
+  lp_vec_t<uint32_t, 3> rwsTasksLost =
+      lp_vec_t<uint32_t, 3>(sid.objectId, PoolIds::RWS_TASKS_LOST, this);

  void printSet() {
-    sif::info << "LoggingReport: Latchup happened count 0: " << this->latchupHappenCnt0
-              << std::endl;
-    sif::info << "LoggingReport: Latchup happened count 1: " << this->latchupHappenCnt1
-              << std::endl;
-    sif::info << "LoggingReport: Latchup happened count 2: " << this->latchupHappenCnt2
-              << std::endl;
-    sif::info << "LoggingReport: Latchup happened count 3: " << this->latchupHappenCnt3
-              << std::endl;
-    sif::info << "LoggingReport: Latchup happened count 4: " << this->latchupHappenCnt4
-              << std::endl;
-    sif::info << "LoggingReport: Latchup happened count 5: " << this->latchupHappenCnt5
-              << std::endl;
-    sif::info << "LoggingReport: Latchup happened count 6: " << this->latchupHappenCnt6
-              << std::endl;
+    for (unsigned i = 0; i < 7; i++) {
+      sif::info << "LoggingReport: Latchup happened count " << i << ": "
+                << this->latchupHappenCnts[i] << std::endl;
+    }
    sif::info << "LoggingReport: ADC deviation triggers count: " << this->adcDeviationTriggersCnt
              << std::endl;
    sif::info << "LoggingReport: TC received count: " << this->tcReceivedCnt << std::endl;
@ -1874,88 +1871,29 @@ class LoggingReport : public StaticLocalDataSet<LOGGING_RPT_SET_ENTRIES> {
              << std::endl;
    sif::info << "LoggingReport: MPSoC power up: " << this->mpsocPowerup << std::endl;
    sif::info << "LoggingReport: MPSoC updates: " << this->mpsocUpdates << std::endl;
-    sif::info << "LoggingReport: APID of last received TC: 0x" << std::hex << this->lastRecvdTc
-              << std::endl;
  }
 };

 /**
 * @brief   This dataset stores the ADC report.
 */
-class AdcReport : public StaticLocalDataSet<ADC_RPT_SET_ENTRIES> {
+class AdcReport : public StaticLocalDataSet<3> {
 public:
  AdcReport(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, ADC_REPORT_SET_ID) {}

  AdcReport(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, ADC_REPORT_SET_ID)) {}

-  lp_var_t<uint16_t> adcRaw0 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_0, this);
-  lp_var_t<uint16_t> adcRaw1 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_1, this);
-  lp_var_t<uint16_t> adcRaw2 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_2, this);
-  lp_var_t<uint16_t> adcRaw3 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_3, this);
-  lp_var_t<uint16_t> adcRaw4 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_4, this);
-  lp_var_t<uint16_t> adcRaw5 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_5, this);
-  lp_var_t<uint16_t> adcRaw6 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_6, this);
-  lp_var_t<uint16_t> adcRaw7 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_7, this);
-  lp_var_t<uint16_t> adcRaw8 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_8, this);
-  lp_var_t<uint16_t> adcRaw9 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_9, this);
-  lp_var_t<uint16_t> adcRaw10 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_10, this);
-  lp_var_t<uint16_t> adcRaw11 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_11, this);
-  lp_var_t<uint16_t> adcRaw12 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_12, this);
-  lp_var_t<uint16_t> adcRaw13 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_13, this);
-  lp_var_t<uint16_t> adcRaw14 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_14, this);
-  lp_var_t<uint16_t> adcRaw15 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_RAW_15, this);
-  lp_var_t<uint16_t> adcEng0 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_0, this);
-  lp_var_t<uint16_t> adcEng1 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_1, this);
-  lp_var_t<uint16_t> adcEng2 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_2, this);
-  lp_var_t<uint16_t> adcEng3 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_3, this);
-  lp_var_t<uint16_t> adcEng4 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_4, this);
-  lp_var_t<uint16_t> adcEng5 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_5, this);
-  lp_var_t<uint16_t> adcEng6 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_6, this);
-  lp_var_t<uint16_t> adcEng7 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_7, this);
-  lp_var_t<uint16_t> adcEng8 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_8, this);
-  lp_var_t<uint16_t> adcEng9 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_9, this);
-  lp_var_t<uint16_t> adcEng10 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_10, this);
-  lp_var_t<uint16_t> adcEng11 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_11, this);
-  lp_var_t<uint16_t> adcEng12 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_12, this);
-  lp_var_t<uint16_t> adcEng13 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_13, this);
-  lp_var_t<uint16_t> adcEng14 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_14, this);
-  lp_var_t<uint16_t> adcEng15 = lp_var_t<uint16_t>(sid.objectId, PoolIds::ADC_ENG_15, this);
+  lp_vec_t<uint16_t, 16> adcRaw = lp_vec_t<uint16_t, 16>(sid.objectId, PoolIds::ADC_RAW, this);
+  lp_vec_t<uint16_t, 16> adcEng = lp_vec_t<uint16_t, 16>(sid.objectId, PoolIds::ADC_ENG, this);

  void printSet() {
    sif::info << "---- Adc Report: Raw values ----" << std::endl;
-    sif::info << "AdcReport: ADC raw 0: " << std::dec << this->adcRaw0 << std::endl;
-    sif::info << "AdcReport: ADC raw 1: " << this->adcRaw1 << std::endl;
-    sif::info << "AdcReport: ADC raw 2: " << this->adcRaw2 << std::endl;
-    sif::info << "AdcReport: ADC raw 3: " << this->adcRaw3 << std::endl;
-    sif::info << "AdcReport: ADC raw 4: " << this->adcRaw4 << std::endl;
-    sif::info << "AdcReport: ADC raw 5: " << this->adcRaw5 << std::endl;
-    sif::info << "AdcReport: ADC raw 6: " << this->adcRaw6 << std::endl;
-    sif::info << "AdcReport: ADC raw 7: " << this->adcRaw7 << std::endl;
-    sif::info << "AdcReport: ADC raw 8: " << this->adcRaw8 << std::endl;
-    sif::info << "AdcReport: ADC raw 9: " << this->adcRaw9 << std::endl;
-    sif::info << "AdcReport: ADC raw 10: " << this->adcRaw10 << std::endl;
-    sif::info << "AdcReport: ADC raw 11: " << this->adcRaw11 << std::endl;
-    sif::info << "AdcReport: ADC raw 12: " << this->adcRaw12 << std::endl;
-    sif::info << "AdcReport: ADC raw 13: " << this->adcRaw13 << std::endl;
-    sif::info << "AdcReport: ADC raw 14: " << this->adcRaw14 << std::endl;
-    sif::info << "AdcReport: ADC raw 15: " << this->adcRaw15 << std::endl;
-    sif::info << "---- Adc Report: Engineering values ----" << std::endl;
-    sif::info << "AdcReport: ADC eng 0: " << this->adcEng0 << std::endl;
-    sif::info << "AdcReport: ADC eng 1: " << this->adcEng1 << std::endl;
-    sif::info << "AdcReport: ADC eng 2: " << this->adcEng2 << std::endl;
-    sif::info << "AdcReport: ADC eng 3: " << this->adcEng3 << std::endl;
-    sif::info << "AdcReport: ADC eng 4: " << this->adcEng4 << std::endl;
-    sif::info << "AdcReport: ADC eng 5: " << this->adcEng5 << std::endl;
-    sif::info << "AdcReport: ADC eng 6: " << this->adcEng6 << std::endl;
-    sif::info << "AdcReport: ADC eng 7: " << this->adcEng7 << std::endl;
-    sif::info << "AdcReport: ADC eng 8: " << this->adcEng8 << std::endl;
-    sif::info << "AdcReport: ADC eng 9: " << this->adcEng9 << std::endl;
-    sif::info << "AdcReport: ADC eng 10: " << this->adcEng10 << std::endl;
-    sif::info << "AdcReport: ADC eng 11: " << this->adcEng11 << std::endl;
-    sif::info << "AdcReport: ADC eng 12: " << this->adcEng12 << std::endl;
-    sif::info << "AdcReport: ADC eng 13: " << this->adcEng13 << std::endl;
-    sif::info << "AdcReport: ADC eng 14: " << this->adcEng14 << std::endl;
-    sif::info << "AdcReport: ADC eng 15: " << this->adcEng15 << std::endl;
+    for (unsigned i = 0; i < 16; i++) {
+      sif::info << "AdcReport: ADC raw " << i << ": " << std::dec << this->adcRaw[i] << std::endl;
+    }
+    for (unsigned i = 0; i < 16; i++) {
+      sif::info << "AdcReport: ADC eng " << i << ": " << std::dec << this->adcEng[i] << std::endl;
+    }
  }
 };

@ -2045,11 +1983,7 @@ class EnableNvms : public TcBase {
 */
 class EnableAutoTm : public TcBase {
 public:
-  EnableAutoTm(TcParams params) : TcBase(params) {
-    spParams.setFullPayloadLen(PAYLOAD_LENGTH + 2);
-    // spParams.creator.setApid(APID_AUTO_TM);
-    // spParams.creator.setSeqCount(DEFAULT_SEQUENCE_COUNT);
-  }
+  EnableAutoTm(TcParams params) : TcBase(params) { spParams.setFullPayloadLen(PAYLOAD_LENGTH + 2); }

  ReturnValue_t buildPacket() {
    auto res = checkSizeAndSerializeHeader();
--- a/mission/acs/str/ArcsecJsonParamBase.cpp
+++ b/mission/acs/str/ArcsecJsonParamBase.cpp
@ -65,7 +65,7 @@ void ArcsecJsonParamBase::addSetParamHeader(uint8_t* buffer, uint8_t setId) {
  *(buffer + 1) = setId;
 }

-ReturnValue_t ArcsecJsonParamBase::init(const std::string filename) {
+ReturnValue_t ArcsecJsonParamBase::init(const std::string& filename) {
  ReturnValue_t result = returnvalue::OK;
  if (not std::filesystem::exists(filename)) {
    sif::warning << "ArcsecJsonParamBase::init: JSON file " << filename << " does not exist"
--- a/mission/acs/str/ArcsecJsonParamBase.h
+++ b/mission/acs/str/ArcsecJsonParamBase.h
@ -46,7 +46,7 @@ class ArcsecJsonParamBase {
   * @param return    JSON_FILE_NOT_EXISTS if specified file does not exist, otherwise
   *                  returnvalue::OK
   */
-  ReturnValue_t init(const std::string filename);
+  ReturnValue_t init(const std::string& filename);

  /**
   * @brief   Fills a buffer with a parameter set
--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@ -5,6 +5,8 @@
 #include <mission/acs/str/strHelpers.h>
 #include <mission/acs/str/strJsonCommands.h>

+#include "fsfw/ipc/MessageQueueIF.h"
+
 extern "C" {
 #include <sagitta/client/actionreq.h>
 #include <sagitta/client/client_tm_structs.h>
@ -24,8 +26,8 @@ extern "C" {
 std::atomic_bool JCFG_DONE(false);

 StarTrackerHandler::StarTrackerHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
-                                       const char* jsonFileStr, StrComHandler* strHelper,
-                                       power::Switch_t powerSwitch)
+                                       StrComHandler* strHelper, power::Switch_t powerSwitch,
+                                       startracker::SdCardConfigPathGetter& cfgPathGetter)
    : DeviceHandlerBase(objectId, comIF, comCookie),
      temperatureSet(this),
      versionSet(this),
@ -57,8 +59,8 @@ StarTrackerHandler::StarTrackerHandler(object_id_t objectId, object_id_t comIF,
      centroidsSet(this),
      contrastSet(this),
      strHelper(strHelper),
-      paramJsonFile(jsonFileStr),
-      powerSwitch(powerSwitch) {
+      powerSwitch(powerSwitch),
+      cfgPathGetter(cfgPathGetter) {
  if (comCookie == nullptr) {
    sif::error << "StarTrackerHandler: Invalid com cookie" << std::endl;
  }
@ -82,17 +84,12 @@ void StarTrackerHandler::doStartUp() {
      // the device handler's submode to the star tracker's mode
      return;
    case StartupState::DONE:
-      if (jcfgCountdown.isBusy()) {
+      if (!JCFG_DONE) {
        startupState = StartupState::WAIT_JCFG;
        return;
      }
-      startupState = StartupState::IDLE;
      break;
    case StartupState::WAIT_JCFG: {
-      if (jcfgCountdown.hasTimedOut()) {
-        startupState = StartupState::IDLE;
-        break;
-      }
      return;
    }
    default:
@ -139,8 +136,7 @@ ReturnValue_t StarTrackerHandler::initialize() {

  // Spin up a thread to do the JSON initialization, takes 200-250 ms which would
  // delay whole satellite boot process.
-  jcfgCountdown.resetTimer();
-  jsonCfgTask = std::thread{setUpJsonCfgs, std::ref(jcfgs), paramJsonFile.c_str()};
+  reloadJsonCfgFile();

  EventManagerIF* manager = ObjectManager::instance()->get<EventManagerIF>(objects::EVENT_MANAGER);
  if (manager == nullptr) {
@ -169,6 +165,20 @@ ReturnValue_t StarTrackerHandler::initialize() {
  return returnvalue::OK;
 }

+bool StarTrackerHandler::reloadJsonCfgFile() {
+  jcfgCountdown.resetTimer();
+  auto strCfgPath = cfgPathGetter.getCfgPath();
+  if (strCfgPath.has_value()) {
+    jcfgPending = true;
+    JCFG_DONE = false;
+    jsonCfgTask = std::thread{setUpJsonCfgs, std::ref(jcfgs), strCfgPath.value()};
+    return true;
+  }
+  // Simplified FDIR: Just continue as usual..
+  JCFG_DONE = true;
+  return false;
+}
+
 ReturnValue_t StarTrackerHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
                                                const uint8_t* data, size_t size) {
  ReturnValue_t result = returnvalue::OK;
@ -335,6 +345,24 @@ void StarTrackerHandler::performOperationHook() {
        break;
    }
  }
+  if (jcfgPending) {
+    if (JCFG_DONE) {
+      if(startupState == StartupState::WAIT_JCFG) {
+        startupState = StartupState::DONE;
+      }
+      jsonCfgTask.join();
+      jcfgPending = false;
+      auto iter = deviceCommandMap.find(startracker::RELOAD_JSON_CFG_FILE);
+      if (iter != deviceCommandMap.end() and iter->second.sendReplyTo != MessageQueueIF::NO_QUEUE) {
+        actionHelper.finish(true, iter->second.sendReplyTo, startracker::RELOAD_JSON_CFG_FILE);
+      }
+    } else if (jcfgCountdown.hasTimedOut()) {
+      auto iter = deviceCommandMap.find(startracker::RELOAD_JSON_CFG_FILE);
+      if (iter != deviceCommandMap.end() and iter->second.sendReplyTo != MessageQueueIF::NO_QUEUE) {
+        actionHelper.finish(false, iter->second.sendReplyTo, startracker::RELOAD_JSON_CFG_FILE);
+      }
+    }
+  }
 }

 Submode_t StarTrackerHandler::getInitialSubmode() { return startracker::SUBMODE_BOOTLOADER; }
@ -499,6 +527,16 @@ ReturnValue_t StarTrackerHandler::buildCommandFromCommand(DeviceCommandId_t devi
      preparePingRequest();
      return returnvalue::OK;
    }
+    case (startracker::RELOAD_JSON_CFG_FILE): {
+      if (jcfgPending) {
+        return HasActionsIF::IS_BUSY;
+      }
+      // It should be noted that this just reloads the JSON config structure in memory from the
+      // JSON file. The configuration still needs to be sent to the STR. The easiest way to achieve
+      // this is to simply reboot the device after a reload.
+      reloadJsonCfgFile();
+      return returnvalue::OK;
+    }
    case (startracker::SET_TIME_FROM_SYS_TIME): {
      SetTimeActionRequest setTimeRequest{};
      timeval tv;
@ -513,6 +551,7 @@ ReturnValue_t StarTrackerHandler::buildCommandFromCommand(DeviceCommandId_t devi
      rawPacket = commandBuffer;
      return returnvalue::OK;
    }
+
    case (startracker::REQ_TIME): {
      prepareTimeRequest();
      return returnvalue::OK;
@ -726,6 +765,7 @@ void StarTrackerHandler::fillCommandAndReplyMap() {
                                   startracker::MAX_FRAME_SIZE * 2 + 2);
  this->insertInCommandMap(startracker::UPLOAD_IMAGE);
  this->insertInCommandMap(startracker::DOWNLOAD_IMAGE);
+  this->insertInCommandMap(startracker::RELOAD_JSON_CFG_FILE);
  this->insertInCommandAndReplyMap(startracker::REQ_POWER, 3, &powerSet,
                                   startracker::MAX_FRAME_SIZE * 2 + 2);
  this->insertInCommandAndReplyMap(startracker::REQ_INTERFACE, 3, &interfaceSet,
@ -928,7 +968,7 @@ void StarTrackerHandler::bootFirmware(Mode_t toMode) {
  }
 }

-void StarTrackerHandler::setUpJsonCfgs(JsonConfigs& cfgs, const char* paramJsonFile) {
+void StarTrackerHandler::setUpJsonCfgs(JsonConfigs& cfgs, std::string paramJsonFile) {
  cfgs.tracking.init(paramJsonFile);
  cfgs.logLevel.init(paramJsonFile);
  cfgs.logSubscription.init(paramJsonFile);
@ -2811,3 +2851,5 @@ ReturnValue_t StarTrackerHandler::checkCommand(ActionId_t actionId) {
  }
  return returnvalue::OK;
 }
+
+ReturnValue_t StarTrackerHandler::acceptExternalDeviceCommands() { return returnvalue::OK; }
--- a/mission/acs/str/StarTrackerHandler.h
+++ b/mission/acs/str/StarTrackerHandler.h
@ -27,7 +27,9 @@ extern "C" {
 * @details Datasheet: https://eive-cloud.irs.uni-stuttgart.de/index.php/apps/files/?dir=/EIVE_IRS/
 *                     Arbeitsdaten/08_Used%20Components/ArcSec_KULeuven_Startracker/
 *                     Sagitta%201.0%20Datapack&fileid=659181
- * @author	J. Meier
+ * @note The STR code is a chaotic inconsistent mess and should be re-written with a simpler base
+ *       class. DO NOT USE THIS AS REFERENCE. Stay away from it.
+ * @author	J. Meier, R. Mueller
 */
 class StarTrackerHandler : public DeviceHandlerBase {
 public:
@ -42,8 +44,8 @@ class StarTrackerHandler : public DeviceHandlerBase {
   * 						to high to enable the device.
   */
  StarTrackerHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
-                     const char* jsonFileStr, StrComHandler* strHelper,
-                     power::Switch_t powerSwitch);
+                     StrComHandler* strHelper, power::Switch_t powerSwitch,
+                     startracker::SdCardConfigPathGetter& cfgPathGetter);
  virtual ~StarTrackerHandler();

  ReturnValue_t initialize() override;
@ -240,11 +242,12 @@ class StarTrackerHandler : public DeviceHandlerBase {
    Subscription subscription;
    AutoThreshold autoThreshold;
  };
+  bool jcfgPending = false;
  JsonConfigs jcfgs;
-  Countdown jcfgCountdown = Countdown(250);
+  Countdown jcfgCountdown = Countdown(1000);
  bool commandExecuted = false;
  std::thread jsonCfgTask;
-  static void setUpJsonCfgs(JsonConfigs& cfgs, const char* paramJsonFile);
+  static void setUpJsonCfgs(JsonConfigs& cfgs, std::string paramJsonFile);

  std::string paramJsonFile;

@ -311,6 +314,8 @@ class StarTrackerHandler : public DeviceHandlerBase {
  std::set<DeviceCommandId_t> additionalRequestedTm{};
  std::set<DeviceCommandId_t>::iterator currentSecondaryTmIter;

+  startracker::SdCardConfigPathGetter& cfgPathGetter;
+
  /**
   * @brief   Handles internal state
   */
@ -542,6 +547,8 @@ class StarTrackerHandler : public DeviceHandlerBase {
  void doNormalTransition(Mode_t modeFrom, Submode_t subModeFrom);
  void bootFirmware(Mode_t toMode);
  void bootBootloader();
+  bool reloadJsonCfgFile();
+  ReturnValue_t acceptExternalDeviceCommands() override;
 };

 #endif /* MISSION_DEVICES_STARTRACKERHANDLER_H_ */
--- a/mission/acs/str/strHelpers.h
+++ b/mission/acs/str/strHelpers.h
@ -14,6 +14,12 @@ namespace startracker {
 static const Submode_t SUBMODE_BOOTLOADER = 1;
 static const Submode_t SUBMODE_FIRMWARE = 2;

+class SdCardConfigPathGetter {
+ public:
+  virtual ~SdCardConfigPathGetter() = default;
+  virtual std::optional<std::string> getCfgPath() = 0;
+};
+
 /**
 * @brief    Returns the frame type field of a decoded frame.
 */
@ -381,6 +387,7 @@ static constexpr DeviceCommandId_t REQ_CENTROIDS = 94;
 static constexpr DeviceCommandId_t ADD_SECONDARY_TM_TO_NORMAL_MODE = 95;
 static constexpr DeviceCommandId_t RESET_SECONDARY_TM_SET = 96;
 static constexpr DeviceCommandId_t READ_SECONDARY_TM_SET = 97;
+static constexpr DeviceCommandId_t RELOAD_JSON_CFG_FILE = 100;
 static const DeviceCommandId_t NONE = 0xFFFFFFFF;

 static const uint32_t VERSION_SET_ID = REQ_VERSION;
--- a/mission/payload/plocSpBase.h
+++ b/mission/payload/plocSpBase.h
@ -104,10 +104,6 @@ class SpTmReader : public SpacePacketReader {
   */
  SpTmReader(const uint8_t* buf, size_t maxSize) : SpacePacketReader(buf, maxSize) {}

-  ReturnValue_t setData(const uint8_t* buf, size_t maxSize) {
-    return setReadOnlyData(buf, maxSize);
-  }
-
  ReturnValue_t checkCrc() const {
    if (CRC::crc16ccitt(getFullData(), getFullPacketLen()) != 0) {
      return returnvalue::FAILED;
--- a/mission/pollingSeqTables.cpp
+++ b/mission/pollingSeqTables.cpp
@ -9,6 +9,8 @@

 #include "OBSWConfig.h"
 #include "eive/definitions.h"
+#include "eive/objects.h"
+#include "linux/payload/FreshSupvHandler.h"

 #ifndef RPI_TEST_ADIS16507
 #define RPI_TEST_ADIS16507 0
@ -608,3 +610,25 @@ ReturnValue_t pst::pstTcsAndAcs(FixedTimeslotTaskIF *thisSequence, AcsPstCfg cfg
                        0);
  return returnvalue::OK;
 }
+ReturnValue_t pst::pstPayload(FixedTimeslotTaskIF *thisSequence) {
+  uint32_t length = thisSequence->getPeriodMs();
+
+  thisSequence->addSlot(objects::CAM_SWITCHER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0,
+                        DeviceHandlerIF::PERFORM_OPERATION);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_WRITE);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::GET_WRITE);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::SEND_READ);
+  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0, DeviceHandlerIF::GET_READ);
+
+  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0,
+                        FreshSupvHandler::OpCode::DEFAULT_OPERATION);
+  // Two COM TM steps, which might cover telemetry which takes a bit longer to be sent.
+  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.1,
+                        FreshSupvHandler::OpCode::PARSE_TM);
+  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0.2,
+                        FreshSupvHandler::OpCode::PARSE_TM);
+  static_cast<void>(length);
+
+  return thisSequence->checkSequence();
+}
--- a/mission/pollingSeqTables.h
+++ b/mission/pollingSeqTables.h
@ -63,6 +63,8 @@ ReturnValue_t pstTcsAndAcs(FixedTimeslotTaskIF* thisSequence, AcsPstCfg cfg);

 ReturnValue_t pstI2c(TmpSchedConfig schedConf, FixedTimeslotTaskIF* thisSequence);

+ReturnValue_t pstPayload(FixedTimeslotTaskIF* thisSequence);
+
 /**
 * Generic test PST
 * @param thisSequence
--- a/mission/tmtc/PersistentTmStore.cpp
+++ b/mission/tmtc/PersistentTmStore.cpp
@ -137,40 +137,68 @@ ReturnValue_t PersistentTmStore::handleCommandQueue(StorageManagerIF& ipcStore,
  if (cmdMessage.getMessageType() == messagetypes::TM_STORE) {
    Command_t cmd = cmdMessage.getCommand();
    if (cmd == TmStoreMessage::DELETE_STORE_CONTENT_TIME) {
-      Clock::getClock_timeval(&currentTv);
-      store_address_t storeId = TmStoreMessage::getStoreId(&cmdMessage);
-      auto accessor = ipcStore.getData(storeId);
-      uint32_t deleteUpToUnixSeconds = 0;
-      size_t size = accessor.second.size();
-      SerializeAdapter::deSerialize(&deleteUpToUnixSeconds, accessor.second.data(), &size,
-                                    SerializeIF::Endianness::NETWORK);
+      result = handleDeletionCmd(ipcStore, cmdMessage);
      execCmd = cmd;
-      deleteUpTo(deleteUpToUnixSeconds);
    } else if (cmd == TmStoreMessage::DOWNLINK_STORE_CONTENT_TIME) {
-      Clock::getClock_timeval(&currentTv);
-      store_address_t storeId = TmStoreMessage::getStoreId(&cmdMessage);
-      auto accessor = ipcStore.getData(storeId);
-      if (accessor.second.size() < 8) {
-        return returnvalue::FAILED;
-      }
-      uint32_t dumpFromUnixSeconds = 0;
-      uint32_t dumpUntilUnixSeconds = 0;
-      size_t size = 8;
-      SerializeAdapter::deSerialize(&dumpFromUnixSeconds, accessor.second.data(), &size,
-                                    SerializeIF::Endianness::NETWORK);
-      SerializeAdapter::deSerialize(&dumpUntilUnixSeconds, accessor.second.data() + 4, &size,
-                                    SerializeIF::Endianness::NETWORK);
-      result = startDumpFromUpTo(dumpFromUnixSeconds, dumpUntilUnixSeconds);
-      if (result == BUSY_DUMPING) {
-        triggerEvent(persTmStore::BUSY_DUMPING_EVENT);
-        return result;
-      }
+      result = handleDumpCmd(ipcStore, cmdMessage);
      execCmd = cmd;
    }
  }
  return result;
 }

+ReturnValue_t PersistentTmStore::handleDeletionCmd(StorageManagerIF& ipcStore,
+                                                   CommandMessage& cmdMessage) {
+  Clock::getClock_timeval(&currentTv);
+  store_address_t storeId = TmStoreMessage::getStoreId(&cmdMessage);
+  auto accessor = ipcStore.getData(storeId);
+  size_t size = accessor.second.size();
+  if (size < 4) {
+    return returnvalue::FAILED;
+  }
+  const uint8_t* data = accessor.second.data();
+  uint32_t deleteUpToUnixSeconds = 0;
+  if (size == 4) {
+    SerializeAdapter::deSerialize(&deleteUpToUnixSeconds, &data, &size,
+                                  SerializeIF::Endianness::NETWORK);
+    deleteUpTo(deleteUpToUnixSeconds);
+  } else if (size == 8) {
+    uint32_t deleteFromUnixSeconds = 0;
+    SerializeAdapter::deSerialize(&deleteFromUnixSeconds, &data, &size,
+                                  SerializeIF::Endianness::NETWORK);
+    SerializeAdapter::deSerialize(&deleteUpToUnixSeconds, &data, &size,
+                                  SerializeIF::Endianness::NETWORK);
+    deleteFromUpTo(deleteFromUnixSeconds, deleteUpToUnixSeconds);
+  } else {
+    sif::warning << "PersistentTmStore: Unknown deletion time specification" << std::endl;
+    return returnvalue::FAILED;
+  }
+  return returnvalue::OK;
+}
+
+ReturnValue_t PersistentTmStore::handleDumpCmd(StorageManagerIF& ipcStore,
+                                               CommandMessage& cmdMessage) {
+  Clock::getClock_timeval(&currentTv);
+  store_address_t storeId = TmStoreMessage::getStoreId(&cmdMessage);
+  auto accessor = ipcStore.getData(storeId);
+  if (accessor.second.size() < 8) {
+    return returnvalue::FAILED;
+  }
+  uint32_t dumpFromUnixSeconds = 0;
+  uint32_t dumpUntilUnixSeconds = 0;
+  size_t size = 8;
+  SerializeAdapter::deSerialize(&dumpFromUnixSeconds, accessor.second.data(), &size,
+                                SerializeIF::Endianness::NETWORK);
+  SerializeAdapter::deSerialize(&dumpUntilUnixSeconds, accessor.second.data() + 4, &size,
+                                SerializeIF::Endianness::NETWORK);
+  ReturnValue_t result = startDumpFromUpTo(dumpFromUnixSeconds, dumpUntilUnixSeconds);
+  if (result == BUSY_DUMPING) {
+    triggerEvent(persTmStore::BUSY_DUMPING_EVENT);
+    return result;
+  }
+  return returnvalue::OK;
+}
+
 ReturnValue_t PersistentTmStore::startDumpFrom(uint32_t fromUnixSeconds) {
  return startDumpFromUpTo(fromUnixSeconds, currentTv.tv_sec);
 }
@ -257,7 +285,9 @@ bool PersistentTmStore::updateBaseDir() {
  return true;
 }

-void PersistentTmStore::deleteUpTo(uint32_t unixSeconds) {
+void PersistentTmStore::deleteUpTo(uint32_t unixSeconds) { deleteFromUpTo(0, unixSeconds); }
+
+void PersistentTmStore::deleteFromUpTo(uint32_t startUnixTime, uint32_t endUnixTime) {
  using namespace std::filesystem;
  for (auto const& file : directory_iterator(basePath)) {
    if (file.is_directory() or (activeFile.has_value() and (activeFile.value() == file.path()))) {
@ -270,7 +300,8 @@ void PersistentTmStore::deleteUpTo(uint32_t unixSeconds) {
      continue;
    }
    time_t fileEpoch = timegm(&fileTime);
-    if (fileEpoch + rolloverDiffSeconds < unixSeconds) {
+    if (fileEpoch + rolloverDiffSeconds < endUnixTime and
+        static_cast<uint32_t>(fileEpoch) >= startUnixTime) {
      std::error_code e;
      std::filesystem::remove(file.path(), e);
    }
--- a/mission/tmtc/PersistentTmStore.h
+++ b/mission/tmtc/PersistentTmStore.h
@ -14,6 +14,7 @@

 #include "eive/eventSubsystemIds.h"
 #include "eive/resultClassIds.h"
+#include "fsfw/ipc/CommandMessage.h"

 enum class RolloverInterval { MINUTELY, HOURLY, DAILY };

@ -60,6 +61,7 @@ class PersistentTmStore : public TmStoreFrontendSimpleIF, public SystemObject {
  ReturnValue_t handleCommandQueue(StorageManagerIF& ipcStore, Command_t& execCmd);

  void deleteUpTo(uint32_t unixSeconds);
+  void deleteFromUpTo(uint32_t startUnixTime, uint32_t endUnixTime);
  ReturnValue_t startDumpFrom(uint32_t fromUnixSeconds);
  ReturnValue_t startDumpFromUpTo(uint32_t fromUnixSeconds, uint32_t upToUnixSeconds);
  /**
@ -145,6 +147,8 @@ class PersistentTmStore : public TmStoreFrontendSimpleIF, public SystemObject {
  std::optional<uint8_t> extractSuffix(const std::string& pathStr);
  bool updateBaseDir();
  ReturnValue_t assignAndOrCreateMostRecentFile();
+  ReturnValue_t handleDeletionCmd(StorageManagerIF& ipcStore, CommandMessage& cmdMessage);
+  ReturnValue_t handleDumpCmd(StorageManagerIF& ipcStore, CommandMessage& cmdMessage);
 };

 #endif /* MISSION_TMTC_TMSTOREBACKEND_H_ */
--- a/mission/tmtc/Service15TmStorage.cpp
+++ b/mission/tmtc/Service15TmStorage.cpp
@ -16,8 +16,9 @@ Service15TmStorage::Service15TmStorage(object_id_t objectId, uint16_t apid,

 ReturnValue_t Service15TmStorage::isValidSubservice(uint8_t subservice) {
  switch (subservice) {
-    case (Subservices::DELETE_UP_TO):
-    case (Subservices::START_BY_TIME_RANGE_RETRIEVAL): {
+    case (Subservice::DELETE_UP_TO):
+    case (Subservice::DELETE_BY_TIME_RANGE):
+    case (Subservice::START_BY_TIME_RANGE_RETRIEVAL): {
      return OK;
    }
    default: {
@ -45,34 +46,55 @@ ReturnValue_t Service15TmStorage::getMessageQueueAndObject(uint8_t subservice,
 ReturnValue_t Service15TmStorage::prepareCommand(CommandMessage *message, uint8_t subservice,
                                                 const uint8_t *tcData, size_t tcDataLen,
                                                 uint32_t *state, object_id_t objectId) {
-  if (subservice == Subservices::START_BY_TIME_RANGE_RETRIEVAL) {
-    // TODO: Hardcoded to UNIX timestamps.. Should allow arbitrary timestamp and let receiver
-    //       to time reading and reply handling
-    if (tcDataLen != 12) {
-      return INVALID_TC;
+  switch (subservice) {
+    case (Subservice::START_BY_TIME_RANGE_RETRIEVAL): {
+      // TODO: Hardcoded to UNIX timestamps.. Should allow arbitrary timestamp and let receiver
+      //       to time reading and reply handling
+      if (tcDataLen != 12) {
+        return INVALID_TC;
+      }
+      store_address_t storeId;
+      ReturnValue_t result = ipcStore->addData(&storeId, tcData + 4, tcDataLen - 4);
+      if (result != OK) {
+        return result;
+      }
+      // Store timestamps
+      TmStoreMessage::setDownlinkContentTimeMessage(message, storeId);
+      return CommandingServiceBase::EXECUTION_COMPLETE;
    }
-    store_address_t storeId;
-    ReturnValue_t result = ipcStore->addData(&storeId, tcData + 4, tcDataLen - 4);
-    if (result != OK) {
-      return result;
+    case (Subservice::DELETE_UP_TO): {
+      // TODO: Hardcoded to UNIX timestamps.. Should allow arbitrary timestamp and let receiver
+      //       to time reading and reply handling
+      if (tcDataLen != 8) {
+        return INVALID_TC;
+      }
+      store_address_t storeId;
+      ReturnValue_t result = ipcStore->addData(&storeId, tcData + 4, tcDataLen - 4);
+      if (result != OK) {
+        return result;
+      }
+      // Store timestamps
+      TmStoreMessage::setDeleteContentTimeMessage(message, storeId);
+      return CommandingServiceBase::EXECUTION_COMPLETE;
    }
-    // Store timestamps
-    TmStoreMessage::setDownlinkContentTimeMessage(message, storeId);
-    return CommandingServiceBase::EXECUTION_COMPLETE;
-  } else if (subservice == Subservices::DELETE_UP_TO) {
-    // TODO: Hardcoded to UNIX timestamps.. Should allow arbitrary timestamp and let receiver
-    //       to time reading and reply handling
-    if (tcDataLen != 8) {
-      return INVALID_TC;
+    case (Subservice::DELETE_BY_TIME_RANGE): {
+      // TODO: Hardcoded two UNIX timestamps.. Should allow arbitrary timestamp and let receiver
+      //       to time reading and reply handling
+      if (tcDataLen != 12) {
+        return INVALID_TC;
+      }
+      store_address_t storeId;
+      ReturnValue_t result = ipcStore->addData(&storeId, tcData + 4, tcDataLen - 4);
+      if (result != OK) {
+        return result;
+      }
+      // Store timestamps
+      TmStoreMessage::setDeleteContentTimeMessage(message, storeId);
+      return CommandingServiceBase::EXECUTION_COMPLETE;
    }
-    store_address_t storeId;
-    ReturnValue_t result = ipcStore->addData(&storeId, tcData + 4, tcDataLen - 4);
-    if (result != OK) {
-      return result;
+    default: {
+      return CommandingServiceBase::INVALID_SUBSERVICE;
    }
-    // Store timestamps
-    TmStoreMessage::setDeleteContentTimeMessage(message, storeId);
-    return CommandingServiceBase::EXECUTION_COMPLETE;
  }
  return OK;
 }
--- a/mission/tmtc/Service15TmStorage.h
+++ b/mission/tmtc/Service15TmStorage.h
@ -5,7 +5,11 @@

 class Service15TmStorage : public CommandingServiceBase {
 public:
-  enum Subservices : uint8_t { START_BY_TIME_RANGE_RETRIEVAL = 9, DELETE_UP_TO = 11 };
+  enum Subservice : uint8_t {
+    START_BY_TIME_RANGE_RETRIEVAL = 9,
+    DELETE_UP_TO = 11,
+    DELETE_BY_TIME_RANGE = 128
+  };
  explicit Service15TmStorage(object_id_t objectId, uint16_t apid, uint8_t numParallelCommands,
                              uint16_t commandTimeoutSecs = 60, size_t queueDepth = 10);

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 99c6c8bbd0d791d8b17720de481c6142091a54a4
+Subproject commit a41dc9b691ab51b8526b3a3982f35072f5d82632
				`@ -0,0 +1 @@`
				`# target_sources(${OBSW_NAME} PUBLIC <Source File List>)`