Merge pull request 'PLOC Handler Update' (#234) from meier/plocSupv into develop

Reviewed-on: #234 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2022-05-08 12:32:47 +02:00 · 2022-05-08 12:32:47 +02:00 · 9f9fa9b41b
commit 9f9fa9b41b
parent 576f71304c 421237bfb7
52 changed files with 4196 additions and 2896 deletions
--- a/README.md
+++ b/README.md
@ -1204,7 +1204,7 @@ in the same way.

 * the formatting is based on the clang-format tools

-## Setting up eclipse auto-fromatter with clang-format
+## Setting up auto-formatter with clang-format in Xilinx SDK

 1. Help &rarr; Install New Software &rarr; Add
 2. In location insert the link http://www.cppstyle.com/luna
@ -1214,3 +1214,11 @@ in the same way.
 6. Insert the path to the clang-format executable
 7. Under C/C++ &rarr; Code Style &rarr; Formatter, change the formatter to CppStyle (clang-format)
 8. Code can now be formatted with the clang tool by using the key combination Ctrl + Shift + f
+
+## Setting up auto-fromatter with clang-format in eclipse
+1. Help &rarr; Eclipse market place &rarr; Search for "Cppstyle" and install
+2. On windows download the clang-formatting tools from https://llvm.org/builds/. On linux clang-format can be installed with the package manager.
+3. Navigate to Preferences &rarr; C/C++ &rarr; CppStyle 
+4. Insert the path to the clang-format executable
+5. Under C/C++ &rarr; Code Style &rarr; Formatter, change the formatter to CppStyle (clang-format)
+6. Code can now be formatted with the clang tool by using the key combination Ctrl + Shift + f
--- a/bsp_q7s/OBSWConfig.h.in
+++ b/bsp_q7s/OBSWConfig.h.in
@ -25,8 +25,8 @@
 #define OBSW_ADD_MGT                                @OBSW_ADD_MGT@
 #define OBSW_ADD_BPX_BATTERY_HANDLER                @OBSW_ADD_BPX_BATTERY_HANDLER@
 #define OBSW_ADD_STAR_TRACKER                       @OBSW_ADD_STAR_TRACKER@
-#define OBSW_ADD_PLOC_SUPERVISOR                    0
-#define OBSW_ADD_PLOC_MPSOC                         0
+#define OBSW_ADD_PLOC_SUPERVISOR                    1
+#define OBSW_ADD_PLOC_MPSOC                         1
 #define OBSW_ADD_SUN_SENSORS                        @OBSW_ADD_SUN_SENSORS@
 #define OBSW_ADD_SUS_BOARD_ASS                      @OBSW_ADD_SUS_BOARD_ASS@
 #define OBSW_ADD_ACS_BOARD                          @OBSW_ADD_ACS_BOARD@
@ -38,6 +38,7 @@
 #define OBSW_ADD_PL_PCDU                            @OBSW_ADD_PL_PCDU@
 #define OBSW_ADD_SYRLINKS                           @OBSW_ADD_SYRLINKS@
 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
+#define OBSW_MPSOC_JTAG_BOOT                        0

 // This is a really tricky switch.. It initializes the PCDU switches to their default states
 // at powerup. I think it would be better
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@ -73,7 +73,7 @@ class CoreController : public ExtendedControllerBase {
  static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::CORE;

  static constexpr Event ALLOC_FAILURE = event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
-  //! [EXPORT] : [COMMENT]  Software reboot occured. Can also be a systemd reboot.
+  //! [EXPORT] : [COMMENT]  Software reboot occurred. Can also be a systemd reboot.
  //! P1: Current Chip, P2: Current Copy
  static constexpr Event REBOOT_SW = event::makeEvent(SUBSYSTEM_ID, 1, severity::MEDIUM);
  //! [EXPORT] : [COMMENT] The reboot mechanism was triggered.
--- a/bsp_q7s/core/InitMission.cpp
+++ b/bsp_q7s/core/InitMission.cpp
@ -120,25 +120,29 @@ void initmission::initTasks() {
  if (result != HasReturnvaluesIF::RETURN_OK) {
    initmission::printAddObjectError("GPS_CTRL", objects::GPS_CONTROLLER);
  }
-
 #endif /* OBSW_ADD_ACS_HANDLERS */

  PeriodicTaskIF* sysTask = factory->createPeriodicTask(
      "SYS_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
+#if OBSW_ADD_ACS_HANDLERS == 1
  result = sysTask->addComponent(objects::ACS_BOARD_ASS);
  if (result != HasReturnvaluesIF::RETURN_OK) {
    initmission::printAddObjectError("ACS_BOARD_ASS", objects::ACS_BOARD_ASS);
  }
+#endif /* OBSW_ADD_ACS_HANDLERS */
+
 #if OBSW_ADD_SUS_BOARD_ASS == 1
  result = sysTask->addComponent(objects::SUS_BOARD_ASS);
  if (result != HasReturnvaluesIF::RETURN_OK) {
    initmission::printAddObjectError("SUS_BOARD_ASS", objects::SUS_BOARD_ASS);
  }
 #endif
+#if OBSW_ADD_RTD_DEVICES == 1
  result = sysTask->addComponent(objects::TCS_BOARD_ASS);
  if (result != HasReturnvaluesIF::RETURN_OK) {
    initmission::printAddObjectError("TCS_BOARD_ASS", objects::TCS_BOARD_ASS);
  }
+#endif /* OBSW_ADD_RTD_DEVICES == 1 */

  // FS task, task interval does not matter because it runs in permanent loop, priority low
  // because it is a non-essential background task
@ -167,6 +171,15 @@ void initmission::initTasks() {
  }
 #endif /* OBSW_ADD_PLOC_MPSOC */

+#if OBSW_ADD_PLOC_SUPERVISOR == 1
+  PeriodicTaskIF* supvHelperTask = factory->createPeriodicTask(
+      "PLOC_SUPV_HELPER", 10, PeriodicTaskIF::MINIMUM_STACK_SIZE, 1.0, missedDeadlineFunc);
+  result = supvHelperTask->addComponent(objects::PLOC_SUPERVISOR_HELPER);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    initmission::printAddObjectError("PLOC_SUPV_HELPER", objects::PLOC_SUPERVISOR_HELPER);
+  }
+#endif /* OBSW_ADD_PLOC_SUPERVISOR */
+
 #if OBSW_TEST_CCSDS_BRIDGE == 1
  PeriodicTaskIF* ptmeTestTask = factory->createPeriodicTask(
      "PTME_TEST", 80, PeriodicTaskIF::MINIMUM_STACK_SIZE, 2.0, missedDeadlineFunc);
@ -229,8 +242,12 @@ void initmission::initTasks() {
 #if OBSW_ADD_ACS_HANDLERS == 1
  acsTask->startTask();
 #endif
+#if OBSW_ADD_RTD_DEVICES == 1
  sysTask->startTask();
-
+#endif
+#if OBSW_ADD_PLOC_SUPERVISOR == 1
+  supvHelperTask->startTask();
+#endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
  sif::info << "Tasks started.." << std::endl;
 }

--- a/bsp_q7s/em/emObjectFactory.cpp
+++ b/bsp_q7s/em/emObjectFactory.cpp
@ -31,7 +31,7 @@
 #include "linux/devices/ploc/PlocMPSoCHelper.h"
 #include "linux/devices/ploc/PlocMemoryDumper.h"
 #include "linux/devices/ploc/PlocSupervisorHandler.h"
-#include "linux/devices/ploc/PlocUpdater.h"
+#include "linux/devices/ploc/PlocSupvHelper.h"
 #include "linux/devices/startracker/StarTrackerHandler.h"
 #include "linux/devices/startracker/StrHelper.h"
 #include "linux/obc/AxiPtmeConfig.h"
@ -82,14 +82,12 @@
 #include "mission/devices/RadiationSensorHandler.h"
 #include "mission/devices/RwHandler.h"
 #include "mission/devices/SolarArrayDeploymentHandler.h"
-#include "mission/devices/SusHandler.h"
 #include "mission/devices/SyrlinksHkHandler.h"
 #include "mission/devices/Tmp1075Handler.h"
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
 #include "mission/devices/devicedefinitions/RwDefinitions.h"
-#include "mission/devices/devicedefinitions/SusDefinitions.h"
 #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/system/AcsBoardAssembly.h"
@ -202,7 +200,6 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_TEST_CODE == 1
  createTestComponents(gpioComIF);
 #endif /* OBSW_ADD_TEST_CODE == 1 */
-  new PlocUpdater(objects::PLOC_UPDATER);
  new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER);
 }

@ -553,7 +550,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
  auto gpsHandler0 =
      new GPSHyperionLinuxController(objects::GPS_CONTROLLER, objects::NO_OBJECT, debugGps);
  gpsHandler0->setResetPinTriggerFunction(gps::triggerGpioResetPin, &resetArgsGnss0);
-
  AcsBoardHelper acsBoardHelper = AcsBoardHelper(
      objects::MGM_0_LIS3_HANDLER, objects::MGM_1_RM3100_HANDLER, objects::MGM_2_LIS3_HANDLER,
      objects::MGM_3_RM3100_HANDLER, objects::GYRO_0_ADIS_HANDLER, objects::GYRO_1_L3G_HANDLER,
@ -652,7 +648,7 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
 #if OBSW_ADD_PLOC_MPSOC == 1
  consumer << "0x" << std::hex << objects::PLOC_MPSOC_HANDLER;
  auto gpioConfigMPSoC = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_MPSOC_UART,
-                                                    consumer.str(), Direction::OUT, Levels::HIGH);
+                                                    consumer.str(), Direction::OUT, Levels::LOW);
  auto mpsocGpioCookie = new GpioCookie;
  mpsocGpioCookie->addGpio(gpioIds::ENABLE_MPSOC_UART, gpioConfigMPSoC);
  gpioComIF->addGpios(mpsocGpioCookie);
@ -668,17 +664,18 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
  consumer << "0x" << std::hex << objects::PLOC_SUPERVISOR_HANDLER;
  auto gpioConfigSupv = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_SUPV_UART, consumer.str(),
-                                                   Direction::OUT, Levels::HIGH);
+                                                   Direction::OUT, Levels::LOW);
  auto supvGpioCookie = new GpioCookie;
  supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv);
  gpioComIF->addGpios(supvGpioCookie);
-  auto supervisorCookie = new UartCookie(objects::PLOC_SUPERVISOR_HANDLER,
-                                         q7s::UART_PLOC_SUPERVSIOR_DEV, uart::PLOC_SUPERVISOR_BAUD,
-                                         supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
+  auto supervisorCookie =
+      new UartCookie(objects::PLOC_SUPERVISOR_HANDLER, q7s::UART_PLOC_SUPERVSIOR_DEV,
+                     uart::PLOC_SUPV_BAUD, supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
  supervisorCookie->setNoFixedSizeReply();
+  auto supvHelper = new PlocSupvHelper(objects::PLOC_SUPERVISOR_HELPER);
  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF,
                            supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
-                            pcdu::PDU1_CH6_PLOC_12V);
+                            pcdu::PDU1_CH6_PLOC_12V, supvHelper);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
  static_cast<void>(consumer);
 }
--- a/bsp_q7s/fm/fmObjectFactory.cpp
+++ b/bsp_q7s/fm/fmObjectFactory.cpp
@ -31,7 +31,6 @@
 #include "linux/devices/ploc/PlocMPSoCHelper.h"
 #include "linux/devices/ploc/PlocMemoryDumper.h"
 #include "linux/devices/ploc/PlocSupervisorHandler.h"
-#include "linux/devices/ploc/PlocUpdater.h"
 #include "linux/devices/startracker/StarTrackerHandler.h"
 #include "linux/devices/startracker/StrHelper.h"
 #include "linux/obc/AxiPtmeConfig.h"
@ -39,8 +38,6 @@
 #include "linux/obc/PdecHandler.h"
 #include "linux/obc/Ptme.h"
 #include "linux/obc/PtmeConfig.h"
-#include "mission/system/SusAssembly.h"
-#include "mission/system/TcsBoardAssembly.h"
 #include "mission/system/fdir/AcsBoardFdir.h"
 #include "mission/system/fdir/RtdFdir.h"
 #include "mission/system/fdir/SusFdir.h"
@ -82,14 +79,12 @@
 #include "mission/devices/RadiationSensorHandler.h"
 #include "mission/devices/RwHandler.h"
 #include "mission/devices/SolarArrayDeploymentHandler.h"
-#include "mission/devices/SusHandler.h"
 #include "mission/devices/SyrlinksHkHandler.h"
 #include "mission/devices/Tmp1075Handler.h"
 #include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 #include "mission/devices/devicedefinitions/Max31865Definitions.h"
 #include "mission/devices/devicedefinitions/RadSensorDefinitions.h"
 #include "mission/devices/devicedefinitions/RwDefinitions.h"
-#include "mission/devices/devicedefinitions/SusDefinitions.h"
 #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/system/AcsBoardAssembly.h"
@ -202,7 +197,6 @@ void ObjectFactory::produce(void* args) {
 #if OBSW_ADD_TEST_CODE == 1
  createTestComponents(gpioComIF);
 #endif /* OBSW_ADD_TEST_CODE == 1 */
-  new PlocUpdater(objects::PLOC_UPDATER);
  new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER);
 }

@ -668,17 +662,18 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
  consumer << "0x" << std::hex << objects::PLOC_SUPERVISOR_HANDLER;
  auto gpioConfigSupv = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_SUPV_UART, consumer.str(),
-                                                   Direction::OUT, Levels::HIGH);
+                                                   Direction::OUT, Levels::LOW);
  auto supvGpioCookie = new GpioCookie;
  supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv);
  gpioComIF->addGpios(supvGpioCookie);
-  auto supervisorCookie = new UartCookie(objects::PLOC_SUPERVISOR_HANDLER,
-                                         q7s::UART_PLOC_SUPERVSIOR_DEV, uart::PLOC_SUPERVISOR_BAUD,
-                                         supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
+  auto supervisorCookie =
+      new UartCookie(objects::PLOC_SUPERVISOR_HANDLER, q7s::UART_PLOC_SUPERVSIOR_DEV,
+                     uart::PLOC_SUPV_BAUD, supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
  supervisorCookie->setNoFixedSizeReply();
+  auto supvHelper = new PlocSupvHelper(objects::PLOC_SUPERVISOR_HELPER);
  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF,
                            supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
-                            pcdu::PDU1_CH6_PLOC_12V);
+                            pcdu::PDU1_CH6_PLOC_12V, supvHelper);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
  static_cast<void>(consumer);
 }
--- a/bsp_q7s/memory/FilesystemHelper.cpp
+++ b/bsp_q7s/memory/FilesystemHelper.cpp
@ -8,8 +8,6 @@

 FilesystemHelper::FilesystemHelper() {}

-FilesystemHelper::~FilesystemHelper() {}
-
 ReturnValue_t FilesystemHelper::checkPath(std::string path) {
  SdCardManager* sdcMan = SdCardManager::instance();
  if (sdcMan == nullptr) {
--- a/bsp_q7s/memory/FilesystemHelper.h
+++ b/bsp_q7s/memory/FilesystemHelper.h
@ -7,7 +7,7 @@
 #include "fsfw/returnvalues/HasReturnvaluesIF.h"

 /**
- * @brief   This class implements often used functions concerning the file system management.
+ * @brief   This class implements often used functions related to the file system management.
 *
 * @author  J. Meier
 */
@ -20,11 +20,8 @@ class FilesystemHelper : public HasReturnvaluesIF {
  //! [EXPORT] : [COMMENT] Specified file does not exist on filesystem
  static const ReturnValue_t FILE_NOT_EXISTS = MAKE_RETURN_CODE(0xA1);

-  FilesystemHelper();
-  virtual ~FilesystemHelper();
-
  /**
-   * @brief   In case the path points to a directory on the sd card the function checks if the
+   * @brief   In case the path points to a directory on the sd card, the function checks if the
   *          appropriate SD card is mounted.
   *
   * @param path  Path to check
@ -39,11 +36,14 @@ class FilesystemHelper : public HasReturnvaluesIF {
  /**
   * @brief   Checks if the file exists on the filesystem.
   *
-   * param file   File to check
+   * @param file   File to check
   *
-   * @return  RETURN_OK if fiel exists, otherwise return error code.
+   * @return  RETURN_OK if file exists, otherwise return error code.
   */
  static ReturnValue_t fileExists(std::string file);
+
+ private:
+  FilesystemHelper();
 };

 #endif /* BSP_Q7S_MEMORY_FILESYSTEMHELPER_H_ */
--- a/bsp_te0720_1cfa/InitMission.cpp
+++ b/bsp_te0720_1cfa/InitMission.cpp
@ -89,13 +89,23 @@ void initmission::initTasks() {
  }
  pstTasks.push_back(pst);

+#if OBSW_ADD_PLOC_MPSOC == 1
  PeriodicTaskIF* mpsocHelperTask = factory->createPeriodicTask(
      "PLOC_MPSOC_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
  result = mpsocHelperTask->addComponent(objects::PLOC_MPSOC_HELPER);
  if (result != HasReturnvaluesIF::RETURN_OK) {
    initmission::printAddObjectError("PLOC_MPSOC_HELPER", objects::PLOC_MPSOC_HELPER);
  }
-  pstTasks.push_back(mpsocHelperTask);
+#endif /* OBSW_ADD_PLOC_MPSOC == 1*/
+
+#if OBSW_ADD_PLOC_SUPERVISOR == 1
+  PeriodicTaskIF* supvHelperTask = factory->createPeriodicTask(
+      "PLOC_SUPV_HELPER", 20, PeriodicTaskIF::MINIMUM_STACK_SIZE, 0.2, missedDeadlineFunc);
+  result = supvHelperTask->addComponent(objects::PLOC_SUPERVISOR_HELPER);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    initmission::printAddObjectError("PLOC_SUPV_HELPER", objects::PLOC_SUPERVISOR_HELPER);
+  }
+#endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */

  auto taskStarter = [](std::vector<PeriodicTaskIF*>& taskVector, std::string name) {
    for (const auto& task : taskVector) {
@ -111,6 +121,12 @@ void initmission::initTasks() {
  tmtcDistributor->startTask();
  tmtcBridgeTask->startTask();
  tmtcPollingTask->startTask();
+#if OBSW_ADD_PLOC_SUPERVISOR == 1
+  supvHelperTask->startTask();
+#endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
+#if OBSW_ADD_PLOC_MPSOC == 1
+  mpsocHelperTask->startTask();
+#endif /* OBSW_ADD_PLOC_MPSOC == 1 */

  taskStarter(pstTasks, "PST Tasks");
  taskStarter(pusTasks, "PUS Tasks");
--- a/bsp_te0720_1cfa/ObjectFactory.cpp
+++ b/bsp_te0720_1cfa/ObjectFactory.cpp
@ -1,27 +1,30 @@
 #include "ObjectFactory.h"

 #include <devConf.h>
-#include "fsfw_hal/linux/uart/UartComIF.h"
-#include "fsfw_hal/linux/i2c/I2cComIF.h"
-#include "fsfw_hal/linux/uart/UartCookie.h"

 #include "OBSWConfig.h"
 #include "busConf.h"
 #include "devConf.h"
+#include "devices/addresses.h"
+#include "devices/gpioIds.h"
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
 #include "fsfw/tmtcpacket/pus/tm.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
 #include "fsfw/tmtcservices/PusServiceBase.h"
+#include "fsfw_hal/linux/i2c/I2cComIF.h"
 #include "fsfw_hal/linux/i2c/I2cCookie.h"
+#include "fsfw_hal/linux/uart/UartComIF.h"
+#include "fsfw_hal/linux/uart/UartCookie.h"
 #include "linux/devices/ploc/PlocMPSoCHandler.h"
 #include "linux/devices/ploc/PlocMPSoCHelper.h"
-#include "mission/devices/Tmp1075Handler.h"
+#include "linux/devices/ploc/PlocMemoryDumper.h"
+#include "linux/devices/ploc/PlocSupervisorHandler.h"
+#include "linux/devices/ploc/PlocSupvHelper.h"
 #include "mission/core/GenericFactory.h"
+#include "mission/devices/Tmp1075Handler.h"
 #include "mission/utility/TmFunnel.h"
-#include "test/gpio/DummyGpioIF.h"
 #include "objects/systemObjectList.h"
-#include "devices/addresses.h"
-#include "devices/gpioIds.h"
+#include "test/gpio/DummyGpioIF.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"

@ -43,12 +46,13 @@ void ObjectFactory::produce(void* args) {
  Factory::setStaticFrameworkObjectIds();
  ObjectFactory::produceGenericObjects();

+  new UartComIF(objects::UART_COM_IF);
+
 #if OBSW_ADD_PLOC_MPSOC == 1
  UartCookie* mpsocUartCookie = new UartCookie(objects::PLOC_MPSOC_HANDLER, te0720_1cfa::MPSOC_UART,
                                               uart::PLOC_MPSOC_BAUD, mpsoc::MAX_REPLY_SIZE);
  mpsocUartCookie->setNoFixedSizeReply();
  PlocMPSoCHelper* plocMpsocHelper = new PlocMPSoCHelper(objects::PLOC_MPSOC_HELPER);
-  new UartComIF(objects::UART_COM_IF);
  auto dummyGpioIF = new DummyGpioIF();
  PlocMPSoCHandler* plocMPSoCHandler = new PlocMPSoCHandler(
      objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocUartCookie, plocMpsocHelper,
@ -56,6 +60,20 @@ void ObjectFactory::produce(void* args) {
  plocMPSoCHandler->setStartUpImmediately();
 #endif /* OBSW_ADD_PLOC_MPSOC == 1 */

+#if OBSW_ADD_PLOC_SUPERVISOR == 1
+  UartCookie* supervisorCookie =
+      new UartCookie(objects::PLOC_SUPERVISOR_HANDLER, std::string("/dev/ttyPS1"),
+                     uart::PLOC_SUPV_BAUD, supv::MAX_PACKET_SIZE * 20);
+  supervisorCookie->setNoFixedSizeReply();
+  auto supvGpioIF = new DummyGpioIF();
+  auto supvHelper = new PlocSupvHelper(objects::PLOC_SUPERVISOR_HELPER);
+  new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF,
+                            supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, supvGpioIF),
+                            pcdu::PDU1_CH6_PLOC_12V, supvHelper);
+
+  new PlocMemoryDumper(objects::PLOC_MEMORY_DUMPER);
+#endif
+
 #if OBSW_TEST_LIBGPIOD == 1
 #if OBSW_TEST_GPIO_OPEN_BYLABEL == 1
  /* Configure MIO0 as input */
@ -124,28 +142,17 @@ void ObjectFactory::produce(void* args) {
  GpioCookie* gpioCookie = new GpioCookie;
  gpioCookie->addGpio(gpioIds::HEATER_0, heaterGpio);
  new HeaterHandler(objects::HEATER_HANDLER, objects::GPIO_IF, gpioCookie, objects::PCDU_HANDLER,
-                    pcduSwitches::TCS_BOARD_8V_HEATER_IN);
+                    pcdu::TCS_BOARD_8V_HEATER_IN);
 #endif

-#if OBSW_ADD_PLOC_SUPERVISOR == 1
-  /* Configuration for MIO0 on TE0720-03-1CFA */
-  UartCookie* plocSupervisorCookie =
-      new UartCookie(objects::PLOC_SUPERVISOR_HANDLER, std::string("/dev/ttyPS1"),
-                     UartModes::NON_CANONICAL, 115200, PLOC_SPV::MAX_PACKET_SIZE * 20);
-  plocSupervisorCookie->setNoFixedSizeReply();
-  PlocSupervisorHandler* plocSupervisor = new PlocSupervisorHandler(
-      objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF, plocSupervisorCookie);
-  plocSupervisor->setStartUpImmediately();
-#endif
+  new I2cComIF(objects::I2C_COM_IF);

-new I2cComIF(objects::I2C_COM_IF);
+  I2cCookie* i2cCookieTmp1075tcs1 =
+      new I2cCookie(addresses::TMP1075_TCS_1, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
+  I2cCookie* i2cCookieTmp1075tcs2 =
+      new I2cCookie(addresses::TMP1075_TCS_2, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));

-I2cCookie* i2cCookieTmp1075tcs1 =
-  new I2cCookie(addresses::TMP1075_TCS_1, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
-I2cCookie* i2cCookieTmp1075tcs2 =
-  new I2cCookie(addresses::TMP1075_TCS_2, TMP1075::MAX_REPLY_LENGTH, std::string("/dev/i2c-0"));
-
-/* Temperature sensors */
-new Tmp1075Handler(objects::TMP1075_HANDLER_1, objects::I2C_COM_IF, i2cCookieTmp1075tcs1);
-new Tmp1075Handler(objects::TMP1075_HANDLER_2, objects::I2C_COM_IF, i2cCookieTmp1075tcs2);
+  /* Temperature sensors */
+  new Tmp1075Handler(objects::TMP1075_HANDLER_1, objects::I2C_COM_IF, i2cCookieTmp1075tcs1);
+  new Tmp1075Handler(objects::TMP1075_HANDLER_2, objects::I2C_COM_IF, i2cCookieTmp1075tcs2);
 }
--- a/common/config/commonClassIds.h
+++ b/common/config/commonClassIds.h
@ -16,6 +16,7 @@ enum commonClassIds: uint8_t {
 	DWLPWRON_CMD, //DWLPWRON
 	MPSOC_TM, //MPTM
 	PLOC_SUPERVISOR_HANDLER, //PLSV
+	PLOC_SUPV_HELPER, //PLSPVhLP
 	SUS_HANDLER, //SUSS
 	CCSDS_IP_CORE_BRIDGE, //IPCI
 	PTME, //PTME
@ -32,6 +33,7 @@ enum commonClassIds: uint8_t {
    PLOC_MPSOC_HELPER, // PLMPHLP
 	SA_DEPL_HANDLER, //SADPL
 	MPSOC_RETURN_VALUES_IF, //MPSOCRTVIF
+	SUPV_RETURN_VALUES_IF, //SPVRTVIF
 	COMMON_CLASS_ID_END // [EXPORT] : [END]
 };

--- a/common/config/commonObjects.h
+++ b/common/config/commonObjects.h
@ -98,7 +98,6 @@ enum commonObjects: uint32_t {

    STAR_TRACKER = 0x44130001,

-    PLOC_UPDATER = 0x44330000,
    PLOC_MEMORY_DUMPER = 0x44330001,
    STR_HELPER = 0x44330002,
    PLOC_MPSOC_HELPER = 0x44330003,
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@ -30,7 +30,8 @@ enum: uint8_t {
 	PDU1_HANDLER = 133,
 	PDU2_HANDLER = 134,
 	ACU_HANDLER = 135,
-	SYRLINKS = 136,
+	PLOC_SUPV_HELPER = 136,
+	SYRLINKS = 137,
 	COMMON_SUBSYSTEM_ID_END
 };
 }
--- a/common/config/devConf.h
+++ b/common/config/devConf.h
@ -53,7 +53,7 @@ static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
 static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
 static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
 static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
-static constexpr UartBaudRate PLOC_SUPERVISOR_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate PLOC_SUPV_BAUD = UartBaudRate::RATE_115200;
 static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;

 }
--- a/generators/bsp_q7s_events.csv
+++ b/generators/bsp_q7s_events.csv
@ -1,187 +1,199 @@
-2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2201;0x0899;STORE_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2202;0x089a;STORE_SEND_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2203;0x089b;STORE_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2204;0x089c;UNEXPECTED_MSG;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2205;0x089d;STORING_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2206;0x089e;TM_DUMP_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2207;0x089f;STORE_INIT_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2208;0x08a0;STORE_INIT_EMPTY;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2209;0x08a1;STORE_CONTENT_CORRUPTED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2210;0x08a2;STORE_INITIALIZE;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2211;0x08a3;INIT_DONE;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2212;0x08a4;DUMP_FINISHED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2213;0x08a5;DELETION_FINISHED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2214;0x08a6;DELETION_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2215;0x08a7;AUTO_CATALOGS_SENDING_FAILED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2600;0x0a28;GET_DATA_FAILED;LOW;;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-2601;0x0a29;STORE_DATA_FAILED;LOW;;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-2800;0x0af0;DEVICE_BUILDING_COMMAND_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2801;0x0af1;DEVICE_SENDING_COMMAND_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2802;0x0af2;DEVICE_REQUESTING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2803;0x0af3;DEVICE_READING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2804;0x0af4;DEVICE_INTERPRETING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2805;0x0af5;DEVICE_MISSED_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2806;0x0af6;DEVICE_UNKNOWN_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2807;0x0af7;DEVICE_UNREQUESTED_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2808;0x0af8;INVALID_DEVICE_COMMAND;LOW;Indicates a SW bug in child class.;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-4201;0x1069;FUSE_CURRENT_HIGH;LOW;;fsfw/src/fsfw/power/Fuse.h
-4202;0x106a;FUSE_WENT_OFF;LOW;;fsfw/src/fsfw/power/Fuse.h
-4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;;fsfw/src/fsfw/power/Fuse.h
-4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;;fsfw/src/fsfw/power/Fuse.h
-4300;0x10cc;SWITCH_WENT_OFF;LOW;;fsfw/src/fsfw/power/PowerSwitchIF.h
-5000;0x1388;HEATER_ON;INFO;;fsfw/src/fsfw/thermal/Heater.h
-5001;0x1389;HEATER_OFF;INFO;;fsfw/src/fsfw/thermal/Heater.h
-5002;0x138a;HEATER_TIMEOUT;LOW;;fsfw/src/fsfw/thermal/Heater.h
-5003;0x138b;HEATER_STAYED_ON;LOW;;fsfw/src/fsfw/thermal/Heater.h
-5004;0x138c;HEATER_STAYED_OFF;LOW;;fsfw/src/fsfw/thermal/Heater.h
-5200;0x1450;TEMP_SENSOR_HIGH;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
-5201;0x1451;TEMP_SENSOR_LOW;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
-5202;0x1452;TEMP_SENSOR_GRADIENT;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
-5901;0x170d;COMPONENT_TEMP_LOW;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5902;0x170e;COMPONENT_TEMP_HIGH;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5903;0x170f;COMPONENT_TEMP_OOL_LOW;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5904;0x1710;COMPONENT_TEMP_OOL_HIGH;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5905;0x1711;TEMP_NOT_IN_OP_RANGE;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-7101;0x1bbd;FDIR_CHANGED_STATE;INFO;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
-7102;0x1bbe;FDIR_STARTS_RECOVERY;MEDIUM;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
-7103;0x1bbf;FDIR_TURNS_OFF_DEVICE;MEDIUM;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
-7201;0x1c21;MONITOR_CHANGED_STATE;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7202;0x1c22;VALUE_BELOW_LOW_LIMIT;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7203;0x1c23;VALUE_ABOVE_HIGH_LIMIT;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7204;0x1c24;VALUE_OUT_OF_RANGE;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7400;0x1ce8;CHANGING_MODE;INFO;;fsfw/src/fsfw/modes/HasModesIF.h
-7401;0x1ce9;MODE_INFO;INFO;;fsfw/src/fsfw/modes/HasModesIF.h
-7402;0x1cea;FALLBACK_FAILED;HIGH;;fsfw/src/fsfw/modes/HasModesIF.h
-7403;0x1ceb;MODE_TRANSITION_FAILED;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
-7404;0x1cec;CANT_KEEP_MODE;HIGH;;fsfw/src/fsfw/modes/HasModesIF.h
-7405;0x1ced;OBJECT_IN_INVALID_MODE;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
-7406;0x1cee;FORCING_MODE;MEDIUM;;fsfw/src/fsfw/modes/HasModesIF.h
-7407;0x1cef;MODE_CMD_REJECTED;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
-7506;0x1d52;HEALTH_INFO;INFO;;fsfw/src/fsfw/health/HasHealthIF.h
-7507;0x1d53;CHILD_CHANGED_HEALTH;INFO;;fsfw/src/fsfw/health/HasHealthIF.h
-7508;0x1d54;CHILD_PROBLEMS;LOW;;fsfw/src/fsfw/health/HasHealthIF.h
-7509;0x1d55;OVERWRITING_HEALTH;LOW;;fsfw/src/fsfw/health/HasHealthIF.h
-7510;0x1d56;TRYING_RECOVERY;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
-7511;0x1d57;RECOVERY_STEP;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
-7512;0x1d58;RECOVERY_DONE;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
-7900;0x1edc;RF_AVAILABLE;INFO;A RF available signal was detected. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
-7901;0x1edd;RF_LOST;INFO;A previously found RF available signal was lost. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
-7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
-7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
-7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
-8900;0x22c4;CLOCK_SET;INFO;;fsfw/src/fsfw/pus/Service9TimeManagement.h
-8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h
-9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h
-10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
-11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
-11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
-11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
-11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
-11402;0x2c8a;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
-11403;0x2c8b;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
-11404;0x2c8c;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h
-11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
-11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
-11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
-11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
-11605;0x2d55;MPSOC_HANDLER_SEQ_CNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h
-11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h
-11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
-11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/RwHandler.h
-11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
-11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
-12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
-12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
-12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report;linux/devices/ploc/PlocSupervisorHandler.h
-12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
-12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
-12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
-12200;0x2fa8;UPDATE_FILE_NOT_EXISTS;LOW;;linux/devices/ploc/PlocUpdater.h
-12201;0x2fa9;ACTION_COMMANDING_FAILED;LOW;Failed to send command to supervisor handler P1: Return value of CommandActionHelper::commandAction P2: Action ID of command to send;linux/devices/ploc/PlocUpdater.h
-12202;0x2faa;UPDATE_AVAILABLE_FAILED;LOW;Supervisor handler replied action message indicating a command execution failure of the update available command;linux/devices/ploc/PlocUpdater.h
-12203;0x2fab;UPDATE_TRANSFER_FAILED;LOW;Supervisor handler failed to transfer an update space packet. P1: Parameter holds the number of update packets already sent (inclusive the failed packet);linux/devices/ploc/PlocUpdater.h
-12204;0x2fac;UPDATE_VERIFY_FAILED;LOW;Supervisor failed to execute the update verify command.;linux/devices/ploc/PlocUpdater.h
-12205;0x2fad;UPDATE_FINISHED;INFO;MPSoC update successful completed;linux/devices/ploc/PlocUpdater.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/devices/ploc/PlocMemoryDumper.h
-12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
-12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
-12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
-12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
-12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
-12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
-12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
-12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
-12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
-12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
-12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
-12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
-12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
-12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
-12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
-12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
-12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
-12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
-12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
-12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
-12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
-12602;0x313a;SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
-12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12605;0x313d;MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12606;0x313e;MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12607;0x313f;ACK_FAILURE_REPORT;LOW;Received acknowledgement failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12608;0x3140;EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12609;0x3141;ACK_INVALID_APID;LOW;Expected acknowledgement report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12610;0x3142;EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h
-12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
-12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
-12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
-12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
-12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
-12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
-13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.h
-13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
-13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
-13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
-13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
-13600;0x3520;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
-13601;0x3521;REBOOT_SW;MEDIUM; Software reboot occured. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
-13602;0x3522;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
-13603;0x3523;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
+2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2201;0x0899;STORE_WRITE_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2202;0x089a;STORE_SEND_READ_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2203;0x089b;STORE_READ_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2204;0x089c;UNEXPECTED_MSG;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2205;0x089d;STORING_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2206;0x089e;TM_DUMP_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2207;0x089f;STORE_INIT_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2208;0x08a0;STORE_INIT_EMPTY;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2209;0x08a1;STORE_CONTENT_CORRUPTED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2210;0x08a2;STORE_INITIALIZE;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2211;0x08a3;INIT_DONE;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2212;0x08a4;DUMP_FINISHED;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2213;0x08a5;DELETION_FINISHED;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2214;0x08a6;DELETION_FAILED;LOW;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2215;0x08a7;AUTO_CATALOGS_SENDING_FAILED;INFO;;fsfw\src\fsfw\tmstorage\TmStoreBackendIF.h
+2600;0x0a28;GET_DATA_FAILED;LOW;;fsfw\src\fsfw\storagemanager\StorageManagerIF.h
+2601;0x0a29;STORE_DATA_FAILED;LOW;;fsfw\src\fsfw\storagemanager\StorageManagerIF.h
+2800;0x0af0;DEVICE_BUILDING_COMMAND_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2801;0x0af1;DEVICE_SENDING_COMMAND_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2802;0x0af2;DEVICE_REQUESTING_REPLY_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2803;0x0af3;DEVICE_READING_REPLY_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2804;0x0af4;DEVICE_INTERPRETING_REPLY_FAILED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2805;0x0af5;DEVICE_MISSED_REPLY;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2806;0x0af6;DEVICE_UNKNOWN_REPLY;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2807;0x0af7;DEVICE_UNREQUESTED_REPLY;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2808;0x0af8;INVALID_DEVICE_COMMAND;LOW;Indicates a SW bug in child class.;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;;fsfw\src\fsfw\devicehandlers\DeviceHandlerIF.h
+4201;0x1069;FUSE_CURRENT_HIGH;LOW;;fsfw\src\fsfw\power\Fuse.h
+4202;0x106a;FUSE_WENT_OFF;LOW;;fsfw\src\fsfw\power\Fuse.h
+4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;;fsfw\src\fsfw\power\Fuse.h
+4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;;fsfw\src\fsfw\power\Fuse.h
+4300;0x10cc;SWITCH_WENT_OFF;LOW;;fsfw\src\fsfw\power\PowerSwitchIF.h
+5000;0x1388;HEATER_ON;INFO;;fsfw\src\fsfw\thermal\Heater.h
+5001;0x1389;HEATER_OFF;INFO;;fsfw\src\fsfw\thermal\Heater.h
+5002;0x138a;HEATER_TIMEOUT;LOW;;fsfw\src\fsfw\thermal\Heater.h
+5003;0x138b;HEATER_STAYED_ON;LOW;;fsfw\src\fsfw\thermal\Heater.h
+5004;0x138c;HEATER_STAYED_OFF;LOW;;fsfw\src\fsfw\thermal\Heater.h
+5200;0x1450;TEMP_SENSOR_HIGH;LOW;;fsfw\src\fsfw\thermal\AbstractTemperatureSensor.h
+5201;0x1451;TEMP_SENSOR_LOW;LOW;;fsfw\src\fsfw\thermal\AbstractTemperatureSensor.h
+5202;0x1452;TEMP_SENSOR_GRADIENT;LOW;;fsfw\src\fsfw\thermal\AbstractTemperatureSensor.h
+5901;0x170d;COMPONENT_TEMP_LOW;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
+5902;0x170e;COMPONENT_TEMP_HIGH;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
+5903;0x170f;COMPONENT_TEMP_OOL_LOW;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
+5904;0x1710;COMPONENT_TEMP_OOL_HIGH;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
+5905;0x1711;TEMP_NOT_IN_OP_RANGE;LOW;;fsfw\src\fsfw\thermal\ThermalComponentIF.h
+7101;0x1bbd;FDIR_CHANGED_STATE;INFO;;fsfw\src\fsfw\fdir\FailureIsolationBase.h
+7102;0x1bbe;FDIR_STARTS_RECOVERY;MEDIUM;;fsfw\src\fsfw\fdir\FailureIsolationBase.h
+7103;0x1bbf;FDIR_TURNS_OFF_DEVICE;MEDIUM;;fsfw\src\fsfw\fdir\FailureIsolationBase.h
+7201;0x1c21;MONITOR_CHANGED_STATE;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
+7202;0x1c22;VALUE_BELOW_LOW_LIMIT;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
+7203;0x1c23;VALUE_ABOVE_HIGH_LIMIT;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
+7204;0x1c24;VALUE_OUT_OF_RANGE;LOW;;fsfw\src\fsfw\monitoring\MonitoringIF.h
+7400;0x1ce8;CHANGING_MODE;INFO;;fsfw\src\fsfw\modes\HasModesIF.h
+7401;0x1ce9;MODE_INFO;INFO;;fsfw\src\fsfw\modes\HasModesIF.h
+7402;0x1cea;FALLBACK_FAILED;HIGH;;fsfw\src\fsfw\modes\HasModesIF.h
+7403;0x1ceb;MODE_TRANSITION_FAILED;LOW;;fsfw\src\fsfw\modes\HasModesIF.h
+7404;0x1cec;CANT_KEEP_MODE;HIGH;;fsfw\src\fsfw\modes\HasModesIF.h
+7405;0x1ced;OBJECT_IN_INVALID_MODE;LOW;;fsfw\src\fsfw\modes\HasModesIF.h
+7406;0x1cee;FORCING_MODE;MEDIUM;;fsfw\src\fsfw\modes\HasModesIF.h
+7407;0x1cef;MODE_CMD_REJECTED;LOW;;fsfw\src\fsfw\modes\HasModesIF.h
+7506;0x1d52;HEALTH_INFO;INFO;;fsfw\src\fsfw\health\HasHealthIF.h
+7507;0x1d53;CHILD_CHANGED_HEALTH;INFO;;fsfw\src\fsfw\health\HasHealthIF.h
+7508;0x1d54;CHILD_PROBLEMS;LOW;;fsfw\src\fsfw\health\HasHealthIF.h
+7509;0x1d55;OVERWRITING_HEALTH;LOW;;fsfw\src\fsfw\health\HasHealthIF.h
+7510;0x1d56;TRYING_RECOVERY;MEDIUM;;fsfw\src\fsfw\health\HasHealthIF.h
+7511;0x1d57;RECOVERY_STEP;MEDIUM;;fsfw\src\fsfw\health\HasHealthIF.h
+7512;0x1d58;RECOVERY_DONE;MEDIUM;;fsfw\src\fsfw\health\HasHealthIF.h
+7900;0x1edc;RF_AVAILABLE;INFO;A RF available signal was detected. P1: raw RFA state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
+7901;0x1edd;RF_LOST;INFO;A previously found RF available signal was lost. P1: raw RFA state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
+7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
+7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
+7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw\src\fsfw\datalinklayer\DataLinkLayer.h
+8900;0x22c4;CLOCK_SET;INFO;;fsfw\src\fsfw\pus\Service9TimeManagement.h
+8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw\src\fsfw\pus\Service9TimeManagement.h
+9700;0x25e4;TEST;INFO;;fsfw\src\fsfw\pus\Service17Test.h
+10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw\hal\src\fsfw_hal\devicehandlers\MgmLIS3MDLHandler.h
+11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission\devices\devicedefinitions\powerDefinitions.h
+11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission\devices\devicedefinitions\powerDefinitions.h
+11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission\devices\devicedefinitions\powerDefinitions.h
+11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission\devices\devicedefinitions\powerDefinitions.h
+11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission\devices\HeaterHandler.h
+11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission\devices\HeaterHandler.h
+11402;0x2c8a;SWITCH_ALREADY_ON;LOW;;mission\devices\HeaterHandler.h
+11403;0x2c8b;SWITCH_ALREADY_OFF;LOW;;mission\devices\HeaterHandler.h
+11404;0x2c8c;MAIN_SWITCH_TIMEOUT;LOW;;mission\devices\HeaterHandler.h
+11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission\devices\SolarArrayDeploymentHandler.h
+11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission\devices\SolarArrayDeploymentHandler.h
+11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission\devices\SolarArrayDeploymentHandler.h
+11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission\devices\SolarArrayDeploymentHandler.h
+11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission\devices\SolarArrayDeploymentHandler.h
+11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux\devices\ploc\PlocMPSoCHandler.h
+11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux\devices\ploc\PlocMPSoCHandler.h
+11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux\devices\ploc\PlocMPSoCHandler.h
+11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux\devices\ploc\PlocMPSoCHandler.h
+11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux\devices\ploc\PlocMPSoCHandler.h
+11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux\devices\ploc\PlocMPSoCHandler.h
+11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission\devices\IMTQHandler.h
+11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission\devices\IMTQHandler.h
+11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission\devices\RwHandler.h
+11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux\devices\startracker\StarTrackerHandler.h
+11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux\devices\startracker\StarTrackerHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux\devices\ploc\PlocSupervisorHandler.h
+12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux\devices\ploc\PlocSupervisorHandler.h
+12003;0x2ee3;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\devices\ploc\PlocSupervisorHandler.h
+12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux\devices\ploc\PlocSupervisorHandler.h
+12005;0x2ee5;SUPV_MPSOC_SHUWDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux\devices\ploc\PlocSupervisorHandler.h
+12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s\memory\SdCardManager.h
+12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s\memory\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\devices\ploc\PlocMemoryDumper.h
+12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux\devices\ploc\PlocMemoryDumper.h
+12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux\devices\ploc\PlocMemoryDumper.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;;linux\obc\PdecHandler.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux\obc\PdecHandler.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux\obc\PdecHandler.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux\obc\PdecHandler.h
+12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux\devices\startracker\StrHelper.h
+12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux\devices\startracker\StrHelper.h
+12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux\devices\startracker\StrHelper.h
+12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux\devices\startracker\StrHelper.h
+12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux\devices\startracker\StrHelper.h
+12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux\devices\startracker\StrHelper.h
+12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux\devices\startracker\StrHelper.h
+12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux\devices\startracker\StrHelper.h
+12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux\devices\startracker\StrHelper.h
+12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux\devices\startracker\StrHelper.h
+12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux\devices\startracker\StrHelper.h
+12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux\devices\startracker\StrHelper.h
+12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux\devices\startracker\StrHelper.h
+12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux\devices\startracker\StrHelper.h
+12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux\devices\startracker\StrHelper.h
+12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux\devices\startracker\StrHelper.h
+12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux\devices\startracker\StrHelper.h
+12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux\devices\ploc\PlocMPSoCHelper.h
+12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux\devices\ploc\PlocMPSoCHelper.h
+12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;;linux\devices\ploc\PlocMPSoCHelper.h
+12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
+12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
+12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
+12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux\devices\ploc\PlocMPSoCHelper.h
+12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
+12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
+12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
+12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux\devices\ploc\PlocMPSoCHelper.h
+12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux\devices\ploc\PlocMPSoCHelper.h
+12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission\devices\PayloadPcduHandler.h
+12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission\devices\PayloadPcduHandler.h
+12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission\system\AcsBoardAssembly.h
+12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission\system\AcsBoardAssembly.h
+12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission\system\AcsBoardAssembly.h
+12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission\system\AcsBoardAssembly.h
+12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission\system\SusAssembly.h
+12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission\system\SusAssembly.h
+12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission\system\SusAssembly.h
+12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission\system\SusAssembly.h
+13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission\system\TcsBoardAssembly.h
+13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission\devices\devicedefinitions\GPSDefinitions.h
+13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission\devices\P60DockHandler.h
+13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission\devices\P60DockHandler.h
+13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission\devices\P60DockHandler.h
+13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux\devices\ploc\PlocSupvHelper.h
+13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux\devices\ploc\PlocSupvHelper.h
+13602;0x3522;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux\devices\ploc\PlocSupvHelper.h
+13603;0x3523;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux\devices\ploc\PlocSupvHelper.h
+13604;0x3524;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux\devices\ploc\PlocSupvHelper.h
+13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux\devices\ploc\PlocSupvHelper.h
+13606;0x3526;SUPV_SENDING_COMMAND_FAILED;LOW;;linux\devices\ploc\PlocSupvHelper.h
+13607;0x3527;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
+13608;0x3528;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
+13609;0x3529;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux\devices\ploc\PlocSupvHelper.h
+13610;0x352a;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
+13611;0x352b;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
+13612;0x352c;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux\devices\ploc\PlocSupvHelper.h
+13613;0x352d;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
+13614;0x352e;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux\devices\ploc\PlocSupvHelper.h
+13615;0x352f;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux\devices\ploc\PlocSupvHelper.h
+13616;0x3530;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux\devices\ploc\PlocSupvHelper.h
+13700;0x3584;ALLOC_FAILURE;MEDIUM;;bsp_q7s\core\CoreController.h
+13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s\core\CoreController.h
+13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s\core\CoreController.h
+13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s\core\CoreController.h
--- a/generators/bsp_q7s_objects.csv
+++ b/generators/bsp_q7s_objects.csv
@ -4,18 +4,18 @@
 0x43400001;THERMAL_CONTROLLER
 0x44120006;MGM_0_LIS3_HANDLER
 0x44120010;GYRO_0_ADIS_HANDLER
-0x44120032;SUS_0
-0x44120033;SUS_1
-0x44120034;SUS_2
-0x44120035;SUS_3
-0x44120036;SUS_4
-0x44120037;SUS_5
-0x44120038;SUS_6
-0x44120039;SUS_7
-0x44120040;SUS_8
-0x44120041;SUS_9
-0x44120042;SUS_10
-0x44120043;SUS_11
+0x44120032;SUS_0_N_LOC_XFYFZM_PT_XF
+0x44120033;SUS_1_N_LOC_XBYFZM_PT_XB
+0x44120034;SUS_2_N_LOC_XFYBZB_PT_YB
+0x44120035;SUS_3_N_LOC_XFYBZF_PT_YF
+0x44120036;SUS_4_N_LOC_XMYFZF_PT_ZF
+0x44120037;SUS_5_N_LOC_XFYMZB_PT_ZB
+0x44120038;SUS_6_R_LOC_XFYBZM_PT_XF
+0x44120039;SUS_7_R_LOC_XBYBZM_PT_XB
+0x44120040;SUS_8_R_LOC_XBYBZB_PT_YB
+0x44120041;SUS_9_R_LOC_XBYBZB_PT_YF
+0x44120042;SUS_10_N_LOC_XMYBZF_PT_ZF
+0x44120043;SUS_11_R_LOC_XBYMZB_PT_ZB
 0x44120047;RW1
 0x44120107;MGM_1_RM3100_HANDLER
 0x44120111;GYRO_1_L3G_HANDLER
@ -37,7 +37,6 @@
 0x44260000;BPX_BATT_HANDLER
 0x44300000;PLPCDU_HANDLER
 0x443200A5;RAD_SENSOR
-0x44330000;PLOC_UPDATER
 0x44330001;PLOC_MEMORY_DUMPER
 0x44330002;STR_HELPER
 0x44330003;PLOC_MPSOC_HELPER
@ -48,22 +47,22 @@
 0x444100A4;HEATER_HANDLER
 0x44420004;TMP1075_HANDLER_1
 0x44420005;TMP1075_HANDLER_2
-0x44420016;RTD_IC_3
-0x44420017;RTD_IC_4
-0x44420018;RTD_IC_5
-0x44420019;RTD_IC_6
-0x44420020;RTD_IC_7
-0x44420021;RTD_IC_8
-0x44420022;RTD_IC_9
-0x44420023;RTD_IC_10
-0x44420024;RTD_IC_11
-0x44420025;RTD_IC_12
-0x44420026;RTD_IC_13
-0x44420027;RTD_IC_14
-0x44420028;RTD_IC_15
-0x44420029;RTD_IC_16
-0x44420030;RTD_IC_17
-0x44420031;RTD_IC_18
+0x44420016;RTD_0_IC3_PLOC_HEATSPREADER
+0x44420017;RTD_1_IC4_PLOC_MISSIONBOARD
+0x44420018;RTD_2_IC5_4K_CAMERA
+0x44420019;RTD_3_IC6_DAC_HEATSPREADER
+0x44420020;RTD_4_IC7_STARTRACKER
+0x44420021;RTD_5_IC8_RW1_MX_MY
+0x44420022;RTD_6_IC9_DRO
+0x44420023;RTD_7_IC10_SCEX
+0x44420024;RTD_8_IC11_X8
+0x44420025;RTD_9_IC12_HPA
+0x44420026;RTD_10_IC13_PL_TX
+0x44420027;RTD_11_IC14_MPA
+0x44420028;RTD_12_IC15_ACU
+0x44420029;RTD_13_IC16_PLPCDU_HEATSPREADER
+0x44420030;RTD_14_IC17_TCS_BOARD
+0x44420031;RTD_15_IC18_IMTQ
 0x445300A3;SYRLINKS_HK_HANDLER
 0x49000000;ARDUINO_COM_IF
 0x49010005;GPIO_IF
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 187 translations.
+ * @brief    Auto-generated event translation file. Contains 199 translations.
 * @details
- * Generated on: 2022-05-03 16:32:00
+ * Generated on: 2022-05-06 19:43:59
 */
 #include "translateEvents.h"

@ -102,7 +102,7 @@ const char *MEMORY_READ_RPT_CRC_FAILURE_STRING = "MEMORY_READ_RPT_CRC_FAILURE";
 const char *ACK_FAILURE_STRING = "ACK_FAILURE";
 const char *EXE_FAILURE_STRING = "EXE_FAILURE";
 const char *MPSOC_HANDLER_CRC_FAILURE_STRING = "MPSOC_HANDLER_CRC_FAILURE";
-const char *MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING = "MPSOC_HANDLER_SEQ_CNT_MISMATCH";
+const char *MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH_STRING = "MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH";
 const char *MPSOC_SHUTDOWN_FAILED_STRING = "MPSOC_SHUTDOWN_FAILED";
 const char *SELF_TEST_I2C_FAILURE_STRING = "SELF_TEST_I2C_FAILURE";
 const char *SELF_TEST_SPI_FAILURE_STRING = "SELF_TEST_SPI_FAILURE";
@ -119,14 +119,9 @@ const char *SUPV_MEMORY_READ_RPT_CRC_FAILURE_STRING = "SUPV_MEMORY_READ_RPT_CRC_
 const char *SUPV_ACK_FAILURE_STRING = "SUPV_ACK_FAILURE";
 const char *SUPV_EXE_FAILURE_STRING = "SUPV_EXE_FAILURE";
 const char *SUPV_CRC_FAILURE_EVENT_STRING = "SUPV_CRC_FAILURE_EVENT";
+const char *SUPV_MPSOC_SHUWDOWN_BUILD_FAILED_STRING = "SUPV_MPSOC_SHUWDOWN_BUILD_FAILED";
 const char *SANITIZATION_FAILED_STRING = "SANITIZATION_FAILED";
 const char *MOUNTED_SD_CARD_STRING = "MOUNTED_SD_CARD";
-const char *UPDATE_FILE_NOT_EXISTS_STRING = "UPDATE_FILE_NOT_EXISTS";
-const char *ACTION_COMMANDING_FAILED_STRING = "ACTION_COMMANDING_FAILED";
-const char *UPDATE_AVAILABLE_FAILED_STRING = "UPDATE_AVAILABLE_FAILED";
-const char *UPDATE_TRANSFER_FAILED_STRING = "UPDATE_TRANSFER_FAILED";
-const char *UPDATE_VERIFY_FAILED_STRING = "UPDATE_VERIFY_FAILED";
-const char *UPDATE_FINISHED_STRING = "UPDATE_FINISHED";
 const char *SEND_MRAM_DUMP_FAILED_STRING = "SEND_MRAM_DUMP_FAILED";
 const char *MRAM_DUMP_FAILED_STRING = "MRAM_DUMP_FAILED";
 const char *MRAM_DUMP_FINISHED_STRING = "MRAM_DUMP_FINISHED";
@ -153,15 +148,15 @@ const char *STR_HELPER_SENDING_PACKET_FAILED_STRING = "STR_HELPER_SENDING_PACKET
 const char *STR_HELPER_REQUESTING_MSG_FAILED_STRING = "STR_HELPER_REQUESTING_MSG_FAILED";
 const char *MPSOC_FLASH_WRITE_FAILED_STRING = "MPSOC_FLASH_WRITE_FAILED";
 const char *MPSOC_FLASH_WRITE_SUCCESSFUL_STRING = "MPSOC_FLASH_WRITE_SUCCESSFUL";
-const char *SENDING_COMMAND_FAILED_STRING = "SENDING_COMMAND_FAILED";
+const char *MPSOC_SENDING_COMMAND_FAILED_STRING = "MPSOC_SENDING_COMMAND_FAILED";
 const char *MPSOC_HELPER_REQUESTING_REPLY_FAILED_STRING = "MPSOC_HELPER_REQUESTING_REPLY_FAILED";
 const char *MPSOC_HELPER_READING_REPLY_FAILED_STRING = "MPSOC_HELPER_READING_REPLY_FAILED";
-const char *MISSING_ACK_STRING = "MISSING_ACK";
-const char *MISSING_EXE_STRING = "MISSING_EXE";
-const char *ACK_FAILURE_REPORT_STRING = "ACK_FAILURE_REPORT";
-const char *EXE_FAILURE_REPORT_STRING = "EXE_FAILURE_REPORT";
-const char *ACK_INVALID_APID_STRING = "ACK_INVALID_APID";
-const char *EXE_INVALID_APID_STRING = "EXE_INVALID_APID";
+const char *MPSOC_MISSING_ACK_STRING = "MPSOC_MISSING_ACK";
+const char *MPSOC_MISSING_EXE_STRING = "MPSOC_MISSING_EXE";
+const char *MPSOC_ACK_FAILURE_REPORT_STRING = "MPSOC_ACK_FAILURE_REPORT";
+const char *MPSOC_EXE_FAILURE_REPORT_STRING = "MPSOC_EXE_FAILURE_REPORT";
+const char *MPSOC_ACK_INVALID_APID_STRING = "MPSOC_ACK_INVALID_APID";
+const char *MPSOC_EXE_INVALID_APID_STRING = "MPSOC_EXE_INVALID_APID";
 const char *MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING = "MPSOC_HELPER_SEQ_CNT_MISMATCH";
 const char *TRANSITION_BACK_TO_OFF_STRING = "TRANSITION_BACK_TO_OFF";
 const char *NEG_V_OUT_OF_BOUNDS_STRING = "NEG_V_OUT_OF_BOUNDS";
@ -184,6 +179,23 @@ const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *P60_BOOT_COUNT_STRING = "P60_BOOT_COUNT";
 const char *BATT_MODE_STRING = "BATT_MODE";
 const char *BATT_MODE_CHANGED_STRING = "BATT_MODE_CHANGED";
+const char *SUPV_UPDATE_FAILED_STRING = "SUPV_UPDATE_FAILED";
+const char *SUPV_UPDATE_SUCCESSFUL_STRING = "SUPV_UPDATE_SUCCESSFUL";
+const char *TERMINATED_UPDATE_PROCEDURE_STRING = "TERMINATED_UPDATE_PROCEDURE";
+const char *SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING = "SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL";
+const char *SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING = "SUPV_EVENT_BUFFER_REQUEST_FAILED";
+const char *SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING = "SUPV_EVENT_BUFFER_REQUEST_TERMINATED";
+const char *SUPV_SENDING_COMMAND_FAILED_STRING = "SUPV_SENDING_COMMAND_FAILED";
+const char *SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING = "SUPV_HELPER_REQUESTING_REPLY_FAILED";
+const char *SUPV_HELPER_READING_REPLY_FAILED_STRING = "SUPV_HELPER_READING_REPLY_FAILED";
+const char *SUPV_MISSING_ACK_STRING = "SUPV_MISSING_ACK";
+const char *SUPV_MISSING_EXE_STRING = "SUPV_MISSING_EXE";
+const char *SUPV_ACK_FAILURE_REPORT_STRING = "SUPV_ACK_FAILURE_REPORT";
+const char *SUPV_EXE_FAILURE_REPORT_STRING = "SUPV_EXE_FAILURE_REPORT";
+const char *SUPV_ACK_INVALID_APID_STRING = "SUPV_ACK_INVALID_APID";
+const char *SUPV_EXE_INVALID_APID_STRING = "SUPV_EXE_INVALID_APID";
+const char *ACK_RECEPTION_FAILURE_STRING = "ACK_RECEPTION_FAILURE";
+const char *EXE_RECEPTION_FAILURE_STRING = "EXE_RECEPTION_FAILURE";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@ -386,7 +398,7 @@ const char *translateEvents(Event event) {
    case (11604):
      return MPSOC_HANDLER_CRC_FAILURE_STRING;
    case (11605):
-      return MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING;
+      return MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH_STRING;
    case (11606):
      return MPSOC_SHUTDOWN_FAILED_STRING;
    case (11701):
@ -419,22 +431,12 @@ const char *translateEvents(Event event) {
      return SUPV_EXE_FAILURE_STRING;
    case (12004):
      return SUPV_CRC_FAILURE_EVENT_STRING;
+    case (12005):
+      return SUPV_MPSOC_SHUWDOWN_BUILD_FAILED_STRING;
    case (12100):
      return SANITIZATION_FAILED_STRING;
    case (12101):
      return MOUNTED_SD_CARD_STRING;
-    case (12200):
-      return UPDATE_FILE_NOT_EXISTS_STRING;
-    case (12201):
-      return ACTION_COMMANDING_FAILED_STRING;
-    case (12202):
-      return UPDATE_AVAILABLE_FAILED_STRING;
-    case (12203):
-      return UPDATE_TRANSFER_FAILED_STRING;
-    case (12204):
-      return UPDATE_VERIFY_FAILED_STRING;
-    case (12205):
-      return UPDATE_FINISHED_STRING;
    case (12300):
      return SEND_MRAM_DUMP_FAILED_STRING;
    case (12301):
@ -488,23 +490,23 @@ const char *translateEvents(Event event) {
    case (12601):
      return MPSOC_FLASH_WRITE_SUCCESSFUL_STRING;
    case (12602):
-      return SENDING_COMMAND_FAILED_STRING;
+      return MPSOC_SENDING_COMMAND_FAILED_STRING;
    case (12603):
      return MPSOC_HELPER_REQUESTING_REPLY_FAILED_STRING;
    case (12604):
      return MPSOC_HELPER_READING_REPLY_FAILED_STRING;
    case (12605):
-      return MISSING_ACK_STRING;
+      return MPSOC_MISSING_ACK_STRING;
    case (12606):
-      return MISSING_EXE_STRING;
+      return MPSOC_MISSING_EXE_STRING;
    case (12607):
-      return ACK_FAILURE_REPORT_STRING;
+      return MPSOC_ACK_FAILURE_REPORT_STRING;
    case (12608):
-      return EXE_FAILURE_REPORT_STRING;
+      return MPSOC_EXE_FAILURE_REPORT_STRING;
    case (12609):
-      return ACK_INVALID_APID_STRING;
+      return MPSOC_ACK_INVALID_APID_STRING;
    case (12610):
-      return EXE_INVALID_APID_STRING;
+      return MPSOC_EXE_INVALID_APID_STRING;
    case (12611):
      return MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING;
    case (12700):
@ -550,12 +552,46 @@ const char *translateEvents(Event event) {
    case (13202):
      return BATT_MODE_CHANGED_STRING;
    case (13600):
-      return ALLOC_FAILURE_STRING;
+      return SUPV_UPDATE_FAILED_STRING;
    case (13601):
-      return REBOOT_SW_STRING;
+      return SUPV_UPDATE_SUCCESSFUL_STRING;
    case (13602):
-      return REBOOT_MECHANISM_TRIGGERED_STRING;
+      return TERMINATED_UPDATE_PROCEDURE_STRING;
    case (13603):
+      return SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING;
+    case (13604):
+      return SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING;
+    case (13605):
+      return SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING;
+    case (13606):
+      return SUPV_SENDING_COMMAND_FAILED_STRING;
+    case (13607):
+      return SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING;
+    case (13608):
+      return SUPV_HELPER_READING_REPLY_FAILED_STRING;
+    case (13609):
+      return SUPV_MISSING_ACK_STRING;
+    case (13610):
+      return SUPV_MISSING_EXE_STRING;
+    case (13611):
+      return SUPV_ACK_FAILURE_REPORT_STRING;
+    case (13612):
+      return SUPV_EXE_FAILURE_REPORT_STRING;
+    case (13613):
+      return SUPV_ACK_INVALID_APID_STRING;
+    case (13614):
+      return SUPV_EXE_INVALID_APID_STRING;
+    case (13615):
+      return ACK_RECEPTION_FAILURE_STRING;
+    case (13616):
+      return EXE_RECEPTION_FAILURE_STRING;
+    case (13700):
+      return ALLOC_FAILURE_STRING;
+    case (13701):
+      return REBOOT_SW_STRING;
+    case (13702):
+      return REBOOT_MECHANISM_TRIGGERED_STRING;
+    case (13703):
      return REBOOT_HW_STRING;
    default:
      return "UNKNOWN_EVENT";
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@ -1,8 +1,8 @@
 /**
 * @brief  Auto-generated object translation file.
 * @details
- * Contains 117 translations.
- * Generated on: 2022-05-03 16:32:00
+ * Contains 116 translations.
+ * Generated on: 2022-05-06 19:43:55
 */
 #include "translateObjects.h"

@ -12,18 +12,18 @@ const char *ACS_CONTROLLER_STRING = "ACS_CONTROLLER";
 const char *THERMAL_CONTROLLER_STRING = "THERMAL_CONTROLLER";
 const char *MGM_0_LIS3_HANDLER_STRING = "MGM_0_LIS3_HANDLER";
 const char *GYRO_0_ADIS_HANDLER_STRING = "GYRO_0_ADIS_HANDLER";
-const char *SUS_0_STRING = "SUS_0";
-const char *SUS_1_STRING = "SUS_1";
-const char *SUS_2_STRING = "SUS_2";
-const char *SUS_3_STRING = "SUS_3";
-const char *SUS_4_STRING = "SUS_4";
-const char *SUS_5_STRING = "SUS_5";
-const char *SUS_6_STRING = "SUS_6";
-const char *SUS_7_STRING = "SUS_7";
-const char *SUS_8_STRING = "SUS_8";
-const char *SUS_9_STRING = "SUS_9";
-const char *SUS_10_STRING = "SUS_10";
-const char *SUS_11_STRING = "SUS_11";
+const char *SUS_0_N_LOC_XFYFZM_PT_XF_STRING = "SUS_0_N_LOC_XFYFZM_PT_XF";
+const char *SUS_1_N_LOC_XBYFZM_PT_XB_STRING = "SUS_1_N_LOC_XBYFZM_PT_XB";
+const char *SUS_2_N_LOC_XFYBZB_PT_YB_STRING = "SUS_2_N_LOC_XFYBZB_PT_YB";
+const char *SUS_3_N_LOC_XFYBZF_PT_YF_STRING = "SUS_3_N_LOC_XFYBZF_PT_YF";
+const char *SUS_4_N_LOC_XMYFZF_PT_ZF_STRING = "SUS_4_N_LOC_XMYFZF_PT_ZF";
+const char *SUS_5_N_LOC_XFYMZB_PT_ZB_STRING = "SUS_5_N_LOC_XFYMZB_PT_ZB";
+const char *SUS_6_R_LOC_XFYBZM_PT_XF_STRING = "SUS_6_R_LOC_XFYBZM_PT_XF";
+const char *SUS_7_R_LOC_XBYBZM_PT_XB_STRING = "SUS_7_R_LOC_XBYBZM_PT_XB";
+const char *SUS_8_R_LOC_XBYBZB_PT_YB_STRING = "SUS_8_R_LOC_XBYBZB_PT_YB";
+const char *SUS_9_R_LOC_XBYBZB_PT_YF_STRING = "SUS_9_R_LOC_XBYBZB_PT_YF";
+const char *SUS_10_N_LOC_XMYBZF_PT_ZF_STRING = "SUS_10_N_LOC_XMYBZF_PT_ZF";
+const char *SUS_11_R_LOC_XBYMZB_PT_ZB_STRING = "SUS_11_R_LOC_XBYMZB_PT_ZB";
 const char *RW1_STRING = "RW1";
 const char *MGM_1_RM3100_HANDLER_STRING = "MGM_1_RM3100_HANDLER";
 const char *GYRO_1_L3G_HANDLER_STRING = "GYRO_1_L3G_HANDLER";
@ -45,7 +45,6 @@ const char *ACU_HANDLER_STRING = "ACU_HANDLER";
 const char *BPX_BATT_HANDLER_STRING = "BPX_BATT_HANDLER";
 const char *PLPCDU_HANDLER_STRING = "PLPCDU_HANDLER";
 const char *RAD_SENSOR_STRING = "RAD_SENSOR";
-const char *PLOC_UPDATER_STRING = "PLOC_UPDATER";
 const char *PLOC_MEMORY_DUMPER_STRING = "PLOC_MEMORY_DUMPER";
 const char *STR_HELPER_STRING = "STR_HELPER";
 const char *PLOC_MPSOC_HELPER_STRING = "PLOC_MPSOC_HELPER";
@ -56,22 +55,22 @@ const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER";
 const char *HEATER_HANDLER_STRING = "HEATER_HANDLER";
 const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1";
 const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2";
-const char *RTD_IC_3_STRING = "RTD_IC_3";
-const char *RTD_IC_4_STRING = "RTD_IC_4";
-const char *RTD_IC_5_STRING = "RTD_IC_5";
-const char *RTD_IC_6_STRING = "RTD_IC_6";
-const char *RTD_IC_7_STRING = "RTD_IC_7";
-const char *RTD_IC_8_STRING = "RTD_IC_8";
-const char *RTD_IC_9_STRING = "RTD_IC_9";
-const char *RTD_IC_10_STRING = "RTD_IC_10";
-const char *RTD_IC_11_STRING = "RTD_IC_11";
-const char *RTD_IC_12_STRING = "RTD_IC_12";
-const char *RTD_IC_13_STRING = "RTD_IC_13";
-const char *RTD_IC_14_STRING = "RTD_IC_14";
-const char *RTD_IC_15_STRING = "RTD_IC_15";
-const char *RTD_IC_16_STRING = "RTD_IC_16";
-const char *RTD_IC_17_STRING = "RTD_IC_17";
-const char *RTD_IC_18_STRING = "RTD_IC_18";
+const char *RTD_0_IC3_PLOC_HEATSPREADER_STRING = "RTD_0_IC3_PLOC_HEATSPREADER";
+const char *RTD_1_IC4_PLOC_MISSIONBOARD_STRING = "RTD_1_IC4_PLOC_MISSIONBOARD";
+const char *RTD_2_IC5_4K_CAMERA_STRING = "RTD_2_IC5_4K_CAMERA";
+const char *RTD_3_IC6_DAC_HEATSPREADER_STRING = "RTD_3_IC6_DAC_HEATSPREADER";
+const char *RTD_4_IC7_STARTRACKER_STRING = "RTD_4_IC7_STARTRACKER";
+const char *RTD_5_IC8_RW1_MX_MY_STRING = "RTD_5_IC8_RW1_MX_MY";
+const char *RTD_6_IC9_DRO_STRING = "RTD_6_IC9_DRO";
+const char *RTD_7_IC10_SCEX_STRING = "RTD_7_IC10_SCEX";
+const char *RTD_8_IC11_X8_STRING = "RTD_8_IC11_X8";
+const char *RTD_9_IC12_HPA_STRING = "RTD_9_IC12_HPA";
+const char *RTD_10_IC13_PL_TX_STRING = "RTD_10_IC13_PL_TX";
+const char *RTD_11_IC14_MPA_STRING = "RTD_11_IC14_MPA";
+const char *RTD_12_IC15_ACU_STRING = "RTD_12_IC15_ACU";
+const char *RTD_13_IC16_PLPCDU_HEATSPREADER_STRING = "RTD_13_IC16_PLPCDU_HEATSPREADER";
+const char *RTD_14_IC17_TCS_BOARD_STRING = "RTD_14_IC17_TCS_BOARD";
+const char *RTD_15_IC18_IMTQ_STRING = "RTD_15_IC18_IMTQ";
 const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER";
 const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF";
 const char *GPIO_IF_STRING = "GPIO_IF";
@ -139,29 +138,29 @@ const char *translateObject(object_id_t object) {
    case 0x44120010:
      return GYRO_0_ADIS_HANDLER_STRING;
    case 0x44120032:
-      return SUS_0_STRING;
+      return SUS_0_N_LOC_XFYFZM_PT_XF_STRING;
    case 0x44120033:
-      return SUS_1_STRING;
+      return SUS_1_N_LOC_XBYFZM_PT_XB_STRING;
    case 0x44120034:
-      return SUS_2_STRING;
+      return SUS_2_N_LOC_XFYBZB_PT_YB_STRING;
    case 0x44120035:
-      return SUS_3_STRING;
+      return SUS_3_N_LOC_XFYBZF_PT_YF_STRING;
    case 0x44120036:
-      return SUS_4_STRING;
+      return SUS_4_N_LOC_XMYFZF_PT_ZF_STRING;
    case 0x44120037:
-      return SUS_5_STRING;
+      return SUS_5_N_LOC_XFYMZB_PT_ZB_STRING;
    case 0x44120038:
-      return SUS_6_STRING;
+      return SUS_6_R_LOC_XFYBZM_PT_XF_STRING;
    case 0x44120039:
-      return SUS_7_STRING;
+      return SUS_7_R_LOC_XBYBZM_PT_XB_STRING;
    case 0x44120040:
-      return SUS_8_STRING;
+      return SUS_8_R_LOC_XBYBZB_PT_YB_STRING;
    case 0x44120041:
-      return SUS_9_STRING;
+      return SUS_9_R_LOC_XBYBZB_PT_YF_STRING;
    case 0x44120042:
-      return SUS_10_STRING;
+      return SUS_10_N_LOC_XMYBZF_PT_ZF_STRING;
    case 0x44120043:
-      return SUS_11_STRING;
+      return SUS_11_R_LOC_XBYMZB_PT_ZB_STRING;
    case 0x44120047:
      return RW1_STRING;
    case 0x44120107:
@ -204,8 +203,6 @@ const char *translateObject(object_id_t object) {
      return PLPCDU_HANDLER_STRING;
    case 0x443200A5:
      return RAD_SENSOR_STRING;
-    case 0x44330000:
-      return PLOC_UPDATER_STRING;
    case 0x44330001:
      return PLOC_MEMORY_DUMPER_STRING;
    case 0x44330002:
@ -227,37 +224,37 @@ const char *translateObject(object_id_t object) {
    case 0x44420005:
      return TMP1075_HANDLER_2_STRING;
    case 0x44420016:
-      return RTD_IC_3_STRING;
+      return RTD_0_IC3_PLOC_HEATSPREADER_STRING;
    case 0x44420017:
-      return RTD_IC_4_STRING;
+      return RTD_1_IC4_PLOC_MISSIONBOARD_STRING;
    case 0x44420018:
-      return RTD_IC_5_STRING;
+      return RTD_2_IC5_4K_CAMERA_STRING;
    case 0x44420019:
-      return RTD_IC_6_STRING;
+      return RTD_3_IC6_DAC_HEATSPREADER_STRING;
    case 0x44420020:
-      return RTD_IC_7_STRING;
+      return RTD_4_IC7_STARTRACKER_STRING;
    case 0x44420021:
-      return RTD_IC_8_STRING;
+      return RTD_5_IC8_RW1_MX_MY_STRING;
    case 0x44420022:
-      return RTD_IC_9_STRING;
+      return RTD_6_IC9_DRO_STRING;
    case 0x44420023:
-      return RTD_IC_10_STRING;
+      return RTD_7_IC10_SCEX_STRING;
    case 0x44420024:
-      return RTD_IC_11_STRING;
+      return RTD_8_IC11_X8_STRING;
    case 0x44420025:
-      return RTD_IC_12_STRING;
+      return RTD_9_IC12_HPA_STRING;
    case 0x44420026:
-      return RTD_IC_13_STRING;
+      return RTD_10_IC13_PL_TX_STRING;
    case 0x44420027:
-      return RTD_IC_14_STRING;
+      return RTD_11_IC14_MPA_STRING;
    case 0x44420028:
-      return RTD_IC_15_STRING;
+      return RTD_12_IC15_ACU_STRING;
    case 0x44420029:
-      return RTD_IC_16_STRING;
+      return RTD_13_IC16_PLPCDU_HEATSPREADER_STRING;
    case 0x44420030:
-      return RTD_IC_17_STRING;
+      return RTD_14_IC17_TCS_BOARD_STRING;
    case 0x44420031:
-      return RTD_IC_18_STRING;
+      return RTD_15_IC18_IMTQ_STRING;
    case 0x445300A3:
      return SYRLINKS_HK_HANDLER_STRING;
    case 0x49000000:
--- a/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h
+++ b/linux/devices/devicedefinitions/PlocMPSoCDefinitions.h
@ -29,6 +29,8 @@ static const DeviceCommandId_t TC_MODE_REPLAY = 16;
 static const DeviceCommandId_t TC_CAM_CMD_SEND = 17;
 static const DeviceCommandId_t TC_MODE_IDLE = 18;
 static const DeviceCommandId_t TM_CAM_CMD_RPT = 19;
+static const DeviceCommandId_t SET_UART_TX_TRISTATE = 20;
+static const DeviceCommandId_t RELEASE_UART_TX = 21;

 // Will reset the sequence count of the OBSW
 static const DeviceCommandId_t OBSW_RESET_SEQ_COUNT = 50;
@ -576,6 +578,9 @@ class TcReplayWriteSeq : public TcBase {
  }
 };

+/**
+ * @brief   Helps to extract the fields of the flash write command from the PUS packet.
+ */
 class FlashWritePusCmd : public MPSoCReturnValuesIF {
 public:
  FlashWritePusCmd(){};
--- a/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
+++ b/linux/devices/devicedefinitions/PlocSupervisorDefinitions.h
--- a/linux/devices/devicedefinitions/SupvReturnValuesIF.h
+++ b/linux/devices/devicedefinitions/SupvReturnValuesIF.h
@ -0,0 +1,61 @@
+#ifndef SUPV_RETURN_VALUES_IF_H_
+#define SUPV_RETURN_VALUES_IF_H_
+
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+
+class SupvReturnValuesIF {
+ public:
+  static const uint8_t INTERFACE_ID = CLASS_ID::SUPV_RETURN_VALUES_IF;
+
+  //! [EXPORT] : [COMMENT] Space Packet received from PLOC supervisor has invalid CRC
+  static const ReturnValue_t CRC_FAILURE = MAKE_RETURN_CODE(0xA0);
+  //! [EXPORT] : [COMMENT] Received ACK failure reply from PLOC supervisor
+  static const ReturnValue_t RECEIVED_ACK_FAILURE = MAKE_RETURN_CODE(0xA1);
+  //! [EXPORT] : [COMMENT] Received execution failure reply from PLOC supervisor
+  static const ReturnValue_t RECEIVED_EXE_FAILURE = MAKE_RETURN_CODE(0xA2);
+  //! [EXPORT] : [COMMENT] Received space packet with invalid APID from PLOC supervisor
+  static const ReturnValue_t INVALID_APID = MAKE_RETURN_CODE(0xA3);
+  //! [EXPORT] : [COMMENT] Failed to read current system time
+  static const ReturnValue_t GET_TIME_FAILURE = MAKE_RETURN_CODE(0xA4);
+  //! [EXPORT] : [COMMENT] Received command with invalid watchdog parameter. Valid watchdogs are 0
+  //! for PS, 1 for PL and 2 for INT
+  static const ReturnValue_t INVALID_WATCHDOG = MAKE_RETURN_CODE(0xA5);
+  //! [EXPORT] : [COMMENT] Received watchdog timeout config command with invalid timeout. Valid
+  //! timeouts must be in the range between 1000 and 360000 ms.
+  static const ReturnValue_t INVALID_WATCHDOG_TIMEOUT = MAKE_RETURN_CODE(0xA6);
+  //! [EXPORT] : [COMMENT] Received latchup config command with invalid latchup ID
+  static const ReturnValue_t INVALID_LATCHUP_ID = MAKE_RETURN_CODE(0xA7);
+  //! [EXPORT] : [COMMENT] Received set adc sweep period command with invalid sweep period. Must be
+  //! larger than 21.
+  static const ReturnValue_t SWEEP_PERIOD_TOO_SMALL = MAKE_RETURN_CODE(0xA8);
+  //! [EXPORT] : [COMMENT] Receive auto EM test command with invalid test param. Valid params are 1
+  //! and 2.
+  static const ReturnValue_t INVALID_TEST_PARAM = MAKE_RETURN_CODE(0xA9);
+  //! [EXPORT] : [COMMENT] Returned when scanning for MRAM dump packets failed.
+  static const ReturnValue_t MRAM_PACKET_PARSING_FAILURE = MAKE_RETURN_CODE(0xAA);
+  //! [EXPORT] : [COMMENT] Returned when the start and stop addresses of the MRAM dump or MRAM  wipe
+  //! commands are invalid (e.g. start address bigger than stop address)
+  static const ReturnValue_t INVALID_MRAM_ADDRESSES = MAKE_RETURN_CODE(0xAB);
+  //! [EXPORT] : [COMMENT] Expect reception of an MRAM dump packet but received space packet with
+  //! other apid.
+  static const ReturnValue_t NO_MRAM_PACKET = MAKE_RETURN_CODE(0xAC);
+  //! [EXPORT] : [COMMENT] Path to PLOC directory on SD card does not exist
+  static const ReturnValue_t PATH_DOES_NOT_EXIST = MAKE_RETURN_CODE(0xAD);
+  //! [EXPORT] : [COMMENT] MRAM dump file does not exists. The file should actually already have
+  //! been created with the reception of the first dump packet.
+  static const ReturnValue_t MRAM_FILE_NOT_EXISTS = MAKE_RETURN_CODE(0xAE);
+  //! [EXPORT] : [COMMENT] Received action command has invalid length
+  static const ReturnValue_t INVALID_LENGTH = MAKE_RETURN_CODE(0xAF);
+  //! [EXPORT] : [COMMENT] Filename too long
+  static const ReturnValue_t FILENAME_TOO_LONG = MAKE_RETURN_CODE(0xB0);
+  //! [EXPORT] : [COMMENT] Received update status report with invalid packet length field
+  static const ReturnValue_t UPDATE_STATUS_REPORT_INVALID_LENGTH = MAKE_RETURN_CODE(0xB1);
+  //! [EXPORT] : [COMMENT] Update status report does not contain expected CRC. There might be a bit
+  //! flip in the update memory region.
+  static const ReturnValue_t UPDATE_CRC_FAILURE = MAKE_RETURN_CODE(0xB2);
+  //! [EXPORT] : [COMMENT] Supervisor helper task ist currently executing a command (wait until
+  //! helper tas has finished or interrupt by sending the terminate command)
+  static const ReturnValue_t SUPV_HELPER_EXECUTING = MAKE_RETURN_CODE(0xB3);
+};
+
+#endif /* SUPV_RETURN_VALUES_IF_H_ */
--- a/linux/devices/ploc/CMakeLists.txt
+++ b/linux/devices/ploc/CMakeLists.txt
@ -1,7 +1,7 @@
 target_sources(${OBSW_NAME} PRIVATE
    PlocSupervisorHandler.cpp
-    PlocUpdater.cpp
    PlocMemoryDumper.cpp
    PlocMPSoCHandler.cpp
    PlocMPSoCHelper.cpp
+    PlocSupvHelper.cpp
 )
--- a/linux/devices/ploc/PlocMPSoCHandler.cpp
+++ b/linux/devices/ploc/PlocMPSoCHandler.cpp
@ -99,6 +99,20 @@ void PlocMPSoCHandler::performOperationHook() {
 ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
                                              const uint8_t* data, size_t size) {
  ReturnValue_t result = RETURN_OK;
+  switch (actionId) {
+    case mpsoc::SET_UART_TX_TRISTATE: {
+      uartIsolatorSwitch.pullLow();
+      return EXECUTION_FINISHED;
+      break;
+    }
+    case mpsoc::RELEASE_UART_TX: {
+      uartIsolatorSwitch.pullHigh();
+      return EXECUTION_FINISHED;
+      break;
+      default:
+        break;
+    }
+  }

  if (plocMPSoCHelperExecuting) {
    return MPSoCReturnValuesIF::MPSOC_HELPER_EXECUTING;
@ -134,6 +148,7 @@ ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueI

 void PlocMPSoCHandler::doStartUp() {
 #ifdef XIPHOS_Q7S
+#if not OBSW_MPSOC_JTAG_BOOT == 1
  switch (powerState) {
    case PowerState::OFF:
      commandActionHelper.commandAction(supervisorHandler, supv::START_MPSOC);
@ -147,11 +162,19 @@ void PlocMPSoCHandler::doStartUp() {
      break;
  }
 #else
+  powerState = PowerState::ON;
+  setMode(_MODE_TO_ON);
+  uartIsolatorSwitch.pullHigh();
+#endif /* not MSPOC_JTAG_BOOT == 1 */
+#else
+  powerState = PowerState::ON;
  setMode(_MODE_TO_ON);
 #endif /* XIPHOS_Q7S */
 }

 void PlocMPSoCHandler::doShutDown() {
+#ifdef XIPHOS_Q7S
+#if not OBSW_MPSOC_JTAG_BOOT == 1
  switch (powerState) {
    case PowerState::ON:
      uartIsolatorSwitch.pullLow();
@ -164,6 +187,12 @@ void PlocMPSoCHandler::doShutDown() {
    default:
      break;
  }
+#else
+  uartIsolatorSwitch.pullLow();
+  setMode(_MODE_POWER_DOWN);
+  powerState = PowerState::OFF;
+#endif
+#endif
 }

 ReturnValue_t PlocMPSoCHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
@ -252,6 +281,8 @@ void PlocMPSoCHandler::fillCommandAndReplyMap() {
  this->insertInCommandMap(mpsoc::TC_MODE_REPLAY);
  this->insertInCommandMap(mpsoc::TC_MODE_IDLE);
  this->insertInCommandMap(mpsoc::TC_CAM_CMD_SEND);
+  this->insertInCommandMap(mpsoc::RELEASE_UART_TX);
+  this->insertInCommandMap(mpsoc::SET_UART_TX_TRISTATE);
  this->insertInReplyMap(mpsoc::ACK_REPORT, 3, nullptr, mpsoc::SIZE_ACK_REPORT);
  this->insertInReplyMap(mpsoc::EXE_REPORT, 3, nullptr, mpsoc::SIZE_EXE_REPORT);
  this->insertInReplyMap(mpsoc::TM_MEMORY_READ_REPORT, 2, nullptr, mpsoc::SIZE_TM_MEM_READ_REPORT);
@ -302,7 +333,7 @@ ReturnValue_t PlocMPSoCHandler::scanForReply(const uint8_t* start, size_t remain
  sequenceCount++;
  uint16_t recvSeqCnt = (*(start + 2) << 8 | *(start + 3)) & PACKET_SEQUENCE_COUNT_MASK;
  if (recvSeqCnt != sequenceCount) {
-    triggerEvent(MPSOC_HANDLER_SEQ_CNT_MISMATCH, sequenceCount, recvSeqCnt);
+    triggerEvent(MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH, sequenceCount, recvSeqCnt);
    sequenceCount = recvSeqCnt;
  }
  return result;
@ -656,10 +687,12 @@ ReturnValue_t PlocMPSoCHandler::handleCamCmdRpt(const uint8_t* data) {
  std::string camCmdRptMsg(
      reinterpret_cast<const char*>(dataFieldPtr),
      tmCamCmdRpt.rememberSpacePacketSize - mpsoc::SPACE_PACKET_HEADER_SIZE - 3);
+#if OBSW_DEBUG_PLOC_MPSOC == 1
  uint8_t ackValue = *(packet.getPacketData() + packet.getPacketDataLength() - 2);
-  sif::info << "CamCmdRpt message: " << camCmdRptMsg << std::endl;
-  sif::info << "CamCmdRpt Ack value: 0x" << std::hex << static_cast<unsigned int>(ackValue)
-            << std::endl;
+  sif::info << "PlocMPSoCHandler: CamCmdRpt message: " << camCmdRptMsg << std::endl;
+  sif::info << "PlocMPSoCHandler: CamCmdRpt Ack value: 0x" << std::hex
+            << static_cast<unsigned int>(ackValue) << std::endl;
+#endif /* OBSW_DEBUG_PLOC_MPSOC == 1 */
  handleDeviceTM(packet.getPacketData(), packet.getPacketDataLength() - 1, mpsoc::TM_CAM_CMD_RPT);
  return result;
 }
@ -799,6 +832,14 @@ size_t PlocMPSoCHandler::getNextReplyLength(DeviceCommandId_t commandId) {
  return replyLen;
 }

+ReturnValue_t PlocMPSoCHandler::doSendReadHook() {
+  // Prevent DHB from polling UART during commands executed by the mpsoc helper task
+  if (plocMPSoCHelperExecuting) {
+    return RETURN_FAILED;
+  }
+  return RETURN_OK;
+}
+
 MessageQueueIF* PlocMPSoCHandler::getCommandQueuePtr() { return commandActionHelperQueue; }

 void PlocMPSoCHandler::stepSuccessfulReceived(ActionId_t actionId, uint8_t step) { return; }
@ -806,16 +847,19 @@ void PlocMPSoCHandler::stepSuccessfulReceived(ActionId_t actionId, uint8_t step)
 void PlocMPSoCHandler::stepFailedReceived(ActionId_t actionId, uint8_t step,
                                          ReturnValue_t returnCode) {
  switch (actionId) {
-    case supv::START_MPSOC:
+    case supv::START_MPSOC: {
      sif::warning << "PlocMPSoCHandler::stepFailedReceived: Failed to start MPSoC" << std::endl;
+      // This usually happens when the supervisor handler is in off mode
      powerState = PowerState::OFF;
+      setMode(MODE_OFF);
      break;
-    case supv::SHUTDOWN_MPSOC:
+    }
+    case supv::SHUTDOWN_MPSOC: {
      triggerEvent(MPSOC_SHUTDOWN_FAILED);
      sif::warning << "PlocMPSoCHandler::stepFailedReceived: Failed to shutdown MPSoC" << std::endl;
-      // TODO: Setting state to on or off here?
-      powerState = PowerState::ON;
+      powerState = PowerState::OFF;
      break;
+    }
    default:
      sif::debug << "PlocMPSoCHandler::stepFailedReceived: Received unexpected action reply"
                 << std::endl;
@ -879,10 +923,11 @@ void PlocMPSoCHandler::handleDeviceTM(const uint8_t* data, size_t dataSize,
 }

 void PlocMPSoCHandler::disableAllReplies() {
+  using namespace mpsoc;
  DeviceReplyMap::iterator iter;

  /* Disable ack reply */
-  iter = deviceReplyMap.find(mpsoc::ACK_REPORT);
+  iter = deviceReplyMap.find(ACK_REPORT);
  DeviceReplyInfo* info = &(iter->second);
  info->delayCycles = 0;
  info->command = deviceCommandMap.end();
@ -891,17 +936,26 @@ void PlocMPSoCHandler::disableAllReplies() {

  /* If the command expects a telemetry packet the appropriate tm reply will be disabled here */
  switch (commandId) {
-    case mpsoc::TC_MEM_WRITE:
+    case TC_MEM_WRITE:
      break;
-    case mpsoc::TC_MEM_READ: {
-      iter = deviceReplyMap.find(mpsoc::TM_MEMORY_READ_REPORT);
+    case TC_MEM_READ: {
+      iter = deviceReplyMap.find(TM_MEMORY_READ_REPORT);
      info = &(iter->second);
      info->delayCycles = 0;
+      info->active = false;
+      info->command = deviceCommandMap.end();
+      break;
+    }
+    case TC_CAM_CMD_SEND: {
+      iter = deviceReplyMap.find(TM_CAM_CMD_RPT);
+      info = &(iter->second);
+      info->delayCycles = 0;
+      info->active = false;
      info->command = deviceCommandMap.end();
      break;
    }
    default: {
-      sif::debug << "PlocMPSoCHandler::disableAllReplies: Unknown command id" << commandId
+      sif::debug << "PlocMPSoCHandler::disableAllReplies: Unknown command id: " << commandId
                 << std::endl;
      break;
    }
@ -959,15 +1013,19 @@ void PlocMPSoCHandler::handleActionCommandFailure(ActionId_t actionId) {
  }
  switch (powerState) {
    case PowerState::BOOTING: {
-      sif::warning << "PlocMPSoCHandler::handleActionCommandFailure: Failed to boot MPSoC"
-                   << std::endl;
-      powerState = PowerState::OFF;
+      sif::info << "PlocMPSoCHandler::handleActionCommandFailure: MPSoC boot command failed"
+                << std::endl;
+      // This is commonly the case when the MPSoC is already operational. Thus the power state is
+      // set to on here
+      powerState = PowerState::ON;
      break;
    }
    case PowerState::SHUTDOWN: {
+      // FDIR will intercept event and switch PLOC power off
+      triggerEvent(MPSOC_SHUTDOWN_FAILED);
      sif::warning << "PlocMPSoCHandler::handleActionCommandFailure: Failed to shutdown MPSoC"
                   << std::endl;
-      powerState = PowerState::ON;
+      powerState = PowerState::OFF;
      break;
    }
    default:
--- a/linux/devices/ploc/PlocMPSoCHandler.h
+++ b/linux/devices/ploc/PlocMPSoCHandler.h
@ -14,6 +14,7 @@
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "linux/devices/devicedefinitions/MPSoCReturnValuesIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
+#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"

 /**
 * @brief	This is the device handler for the MPSoC of the payload computer.
@ -76,6 +77,7 @@ class PlocMPSoCHandler : public DeviceHandlerBase, public CommandsActionsIF {
                                      uint8_t expectedReplies = 1, bool useAlternateId = false,
                                      DeviceCommandId_t alternateReplyID = 0) override;
  size_t getNextReplyLength(DeviceCommandId_t deviceCommand) override;
+  virtual ReturnValue_t doSendReadHook() override;

 private:
  static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_MPSOC_HANDLER;
@ -94,7 +96,7 @@ class PlocMPSoCHandler : public DeviceHandlerBase, public CommandsActionsIF {
  static const Event MPSOC_HANDLER_CRC_FAILURE = MAKE_EVENT(4, severity::LOW);
  //! [EXPORT] : [COMMENT] Packet sequence count in received space packet does not match expected
  //! count P1: Expected sequence count P2: Received sequence count
-  static const Event MPSOC_HANDLER_SEQ_CNT_MISMATCH = MAKE_EVENT(5, severity::LOW);
+  static const Event MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH = MAKE_EVENT(5, severity::LOW);
  //! [EXPORT] : [COMMENT] Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and
  //! thus also to shutdown the supervisor.
  static const Event MPSOC_SHUTDOWN_FAILED = MAKE_EVENT(6, severity::HIGH);
--- a/linux/devices/ploc/PlocMPSoCHelper.cpp
+++ b/linux/devices/ploc/PlocMPSoCHelper.cpp
@ -204,7 +204,7 @@ ReturnValue_t PlocMPSoCHelper::sendCommand(mpsoc::TcBase& tc) {
  result = uartComIF->sendMessage(comCookie, tc.getWholeData(), tc.getFullSize());
  if (result != RETURN_OK) {
    sif::warning << "PlocMPSoCHelper::sendCommand: Failed to send command" << std::endl;
-    triggerEvent(SENDING_COMMAND_FAILED, result, static_cast<uint32_t>(internalState));
+    triggerEvent(MPSOC_SENDING_COMMAND_FAILED, result, static_cast<uint32_t>(internalState));
    return result;
  }
  return result;
@ -227,11 +227,11 @@ ReturnValue_t PlocMPSoCHelper::handleAck() {

 void PlocMPSoCHelper::handleAckApidFailure(uint16_t apid) {
  if (apid == mpsoc::apid::ACK_FAILURE) {
-    triggerEvent(ACK_FAILURE_REPORT, static_cast<uint32_t>(internalState));
+    triggerEvent(MPSOC_ACK_FAILURE_REPORT, static_cast<uint32_t>(internalState));
    sif::warning << "PlocMPSoCHelper::handleAckApidFailure: Received acknowledgement failure "
                 << "report" << std::endl;
  } else {
-    triggerEvent(ACK_INVALID_APID, apid, static_cast<uint32_t>(internalState));
+    triggerEvent(MPSOC_ACK_INVALID_APID, apid, static_cast<uint32_t>(internalState));
    sif::warning << "PlocMPSoCHelper::handleAckApidFailure: Expected acknowledgement report "
                 << "but received space packet with apid " << std::hex << apid << std::endl;
  }
@ -254,11 +254,11 @@ ReturnValue_t PlocMPSoCHelper::handleExe() {

 void PlocMPSoCHelper::handleExeApidFailure(uint16_t apid) {
  if (apid == mpsoc::apid::EXE_FAILURE) {
-    triggerEvent(EXE_FAILURE_REPORT, static_cast<uint32_t>(internalState));
+    triggerEvent(MPSOC_EXE_FAILURE_REPORT, static_cast<uint32_t>(internalState));
    sif::warning << "PlocMPSoCHelper::handleExeApidFailure: Received execution failure "
                 << "report" << std::endl;
  } else {
-    triggerEvent(EXE_INVALID_APID, apid, static_cast<uint32_t>(internalState));
+    triggerEvent(MPSOC_EXE_INVALID_APID, apid, static_cast<uint32_t>(internalState));
    sif::warning << "PlocMPSoCHelper::handleExeApidFailure: Expected execution report "
                 << "but received space packet with apid " << std::hex << apid << std::endl;
  }
@ -281,7 +281,7 @@ ReturnValue_t PlocMPSoCHelper::handleTmReception(mpsoc::TmPacket* tmPacket, size
  }
  if (remainingBytes != 0) {
    sif::warning << "PlocMPSoCHelper::handleTmReception: Failed to receive reply" << std::endl;
-    triggerEvent(MISSING_EXE, remainingBytes, static_cast<uint32_t>(internalState));
+    triggerEvent(MPSOC_MISSING_EXE, remainingBytes, static_cast<uint32_t>(internalState));
    return RETURN_FAILED;
  }
  result = tmPacket->checkCrc();
--- a/linux/devices/ploc/PlocMPSoCHelper.h
+++ b/linux/devices/ploc/PlocMPSoCHelper.h
@ -29,10 +29,10 @@ class PlocMPSoCHelper : public SystemObject, public ExecutableObjectIF, public H
  //! [EXPORT] : [COMMENT] Flash write successful
  static const Event MPSOC_FLASH_WRITE_SUCCESSFUL = MAKE_EVENT(1, severity::LOW);
  //! [EXPORT] : [COMMENT] Communication interface returned failure when trying to send the command
-  //! ot the PLOC
+  //! to the MPSoC
  //! P1: Return value returned by the communication interface sendMessage function
  //! P2: Internal state of MPSoC helper
-  static const Event SENDING_COMMAND_FAILED = MAKE_EVENT(2, severity::LOW);
+  static const Event MPSOC_SENDING_COMMAND_FAILED = MAKE_EVENT(2, severity::LOW);
  //! [EXPORT] : [COMMENT] Request receive message of communication interface failed
  //! P1: Return value returned by the communication interface requestReceiveMessage function
  //! P2: Internal state of MPSoC helper
@ -41,28 +41,28 @@ class PlocMPSoCHelper : public SystemObject, public ExecutableObjectIF, public H
  //! P1: Return value returned by the communication interface readingReceivedMessage function
  //! P2: Internal state of MPSoC helper
  static const Event MPSOC_HELPER_READING_REPLY_FAILED = MAKE_EVENT(4, severity::LOW);
-  //! [EXPORT] : [COMMENT] Did not receive acknowledgement report
+  //! [EXPORT] : [COMMENT] Did not receive acknowledgment report
  //! P1: Number of bytes missing
  //! P2: Internal state of MPSoC helper
-  static const Event MISSING_ACK = MAKE_EVENT(5, severity::LOW);
+  static const Event MPSOC_MISSING_ACK = MAKE_EVENT(5, severity::LOW);
  //! [EXPORT] : [COMMENT] Did not receive execution report
  //! P1: Number of bytes missing
  //! P2: Internal state of MPSoC helper
-  static const Event MISSING_EXE = MAKE_EVENT(6, severity::LOW);
-  //! [EXPORT] : [COMMENT] Received acknowledgement failure report
+  static const Event MPSOC_MISSING_EXE = MAKE_EVENT(6, severity::LOW);
+  //! [EXPORT] : [COMMENT] Received acknowledgment failure report
  //! P1: Internal state of MPSoC
-  static const Event ACK_FAILURE_REPORT = MAKE_EVENT(7, severity::LOW);
+  static const Event MPSOC_ACK_FAILURE_REPORT = MAKE_EVENT(7, severity::LOW);
  //! [EXPORT] : [COMMENT] Received execution failure report
  //! P1: Internal state of MPSoC
-  static const Event EXE_FAILURE_REPORT = MAKE_EVENT(8, severity::LOW);
-  //! [EXPORT] : [COMMENT] Expected acknowledgement report but received space packet with other apid
+  static const Event MPSOC_EXE_FAILURE_REPORT = MAKE_EVENT(8, severity::LOW);
+  //! [EXPORT] : [COMMENT] Expected acknowledgment report but received space packet with other apid
  //! P1: Apid of received space packet
  //! P2: Internal state of MPSoC
-  static const Event ACK_INVALID_APID = MAKE_EVENT(9, severity::LOW);
+  static const Event MPSOC_ACK_INVALID_APID = MAKE_EVENT(9, severity::LOW);
  //! [EXPORT] : [COMMENT] Expected execution report but received space packet with other apid
  //! P1: Apid of received space packet
  //! P2: Internal state of MPSoC
-  static const Event EXE_INVALID_APID = MAKE_EVENT(10, severity::LOW);
+  static const Event MPSOC_EXE_INVALID_APID = MAKE_EVENT(10, severity::LOW);
  //! [EXPORT] : [COMMENT] Received sequence count does not match expected sequence count
  //! P1: Expected sequence count
  //! P2: Received sequence count
--- a/linux/devices/ploc/PlocMemoryDumper.cpp
+++ b/linux/devices/ploc/PlocMemoryDumper.cpp
@ -121,7 +121,10 @@ void PlocMemoryDumper::doStateMachine() {
 void PlocMemoryDumper::stepSuccessfulReceived(ActionId_t actionId, uint8_t step) {}

 void PlocMemoryDumper::stepFailedReceived(ActionId_t actionId, uint8_t step,
-                                          ReturnValue_t returnCode) {}
+                                          ReturnValue_t returnCode) {
+  triggerEvent(MRAM_DUMP_FAILED);
+  state = State::IDLE;
+}

 void PlocMemoryDumper::dataReceived(ActionId_t actionId, const uint8_t* data, uint32_t size) {}

@ -149,10 +152,9 @@ void PlocMemoryDumper::completionFailedReceived(ActionId_t actionId, ReturnValue
    case (supv::FIRST_MRAM_DUMP):
    case (supv::CONSECUTIVE_MRAM_DUMP):
      triggerEvent(MRAM_DUMP_FAILED, mram.lastStartAddress);
+      pendingCommand = NONE;
      break;
    default:
-      sif::debug << "PlocMemoryDumper::completionFailedReceived: Invalid pending command "
-                 << std::endl;
      break;
  }
  state = State::IDLE;
@ -168,12 +170,12 @@ void PlocMemoryDumper::commandNextMramDump(ActionId_t dumpCommand) {
    tempStartAddress = mram.startAddress;
    tempEndAddress = mram.startAddress + MAX_MRAM_DUMP_SIZE;
    mram.startAddress += MAX_MRAM_DUMP_SIZE;
-    mram.lastStartAddress = tempStartAddress;
  } else {
    tempStartAddress = mram.startAddress;
    tempEndAddress = mram.endAddress;
    mram.startAddress = mram.endAddress;
  }
+  mram.lastStartAddress = tempStartAddress;

  MemoryParams params(tempStartAddress, tempEndAddress);

--- a/linux/devices/ploc/PlocSupervisorHandler.cpp
+++ b/linux/devices/ploc/PlocSupervisorHandler.cpp
--- a/linux/devices/ploc/PlocSupervisorHandler.h
+++ b/linux/devices/ploc/PlocSupervisorHandler.h
@ -2,19 +2,22 @@
 #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_

 #include "OBSWConfig.h"
+#include "PlocSupvHelper.h"
 #include "bsp_q7s/memory/SdCardManager.h"
 #include "devices/powerSwitcherList.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
+#include "fsfw/timemanager/Countdown.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
 #include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
+#include "linux/devices/devicedefinitions/SupvReturnValuesIF.h"

 /**
 * @brief	This is the device handler for the supervisor of the PLOC which is programmed by
 *          Thales.
 *
- * @details The PLOC uses the space packet protocol for communication. To each command the PLOC
+ * @details The PLOC uses the space packet protocol for communication. On each command the PLOC
 *          answers with at least one acknowledgment and one execution report.
 *          Flight manual:
 *          https://egit.irs.uni-stuttgart.de/redmine/projects/eive-flight-manual/wiki/PLOC_Commands
@ -25,10 +28,14 @@
 class PlocSupervisorHandler : public DeviceHandlerBase {
 public:
  PlocSupervisorHandler(object_id_t objectId, object_id_t uartComIFid, CookieIF* comCookie,
-                        Gpio uartIsolatorSwitch, power::Switch_t powerSwitch);
+                        Gpio uartIsolatorSwitch, power::Switch_t powerSwitch,
+                        PlocSupvHelper* supvHelper);
  virtual ~PlocSupervisorHandler();

  virtual ReturnValue_t initialize() override;
+  void performOperationHook() override;
+  ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
+                              const uint8_t* data, size_t size) override;

 protected:
  void doStartUp() override;
@ -49,48 +56,10 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
                                      uint8_t expectedReplies = 1, bool useAlternateId = false,
                                      DeviceCommandId_t alternateReplyID = 0) override;
  size_t getNextReplyLength(DeviceCommandId_t deviceCommand) override;
+  ReturnValue_t doSendReadHook() override;
+  void doOffActivity() override;

 private:
-  static const uint8_t INTERFACE_ID = CLASS_ID::PLOC_SUPERVISOR_HANDLER;
-
-  //! [EXPORT] : [COMMENT] Space Packet received from PLOC supervisor has invalid CRC
-  static const ReturnValue_t CRC_FAILURE = MAKE_RETURN_CODE(0xA0);
-  //! [EXPORT] : [COMMENT] Received ACK failure reply from PLOC supervisor
-  static const ReturnValue_t RECEIVED_ACK_FAILURE = MAKE_RETURN_CODE(0xA1);
-  //! [EXPORT] : [COMMENT] Received execution failure reply from PLOC supervisor
-  static const ReturnValue_t RECEIVED_EXE_FAILURE = MAKE_RETURN_CODE(0xA2);
-  //! [EXPORT] : [COMMENT] Received space packet with invalid APID from PLOC supervisor
-  static const ReturnValue_t INVALID_APID = MAKE_RETURN_CODE(0xA3);
-  //! [EXPORT] : [COMMENT] Failed to read current system time
-  static const ReturnValue_t GET_TIME_FAILURE = MAKE_RETURN_CODE(0xA4);
-  //! [EXPORT] : [COMMENT] Received command with invalid watchdog parameter. Valid watchdogs are 0
-  //! for PS, 1 for PL and 2 for INT
-  static const ReturnValue_t INVALID_WATCHDOG = MAKE_RETURN_CODE(0xA5);
-  //! [EXPORT] : [COMMENT] Received watchdog timeout config command with invalid timeout. Valid
-  //! timeouts must be in the range between 1000 and 360000 ms.
-  static const ReturnValue_t INVALID_WATCHDOG_TIMEOUT = MAKE_RETURN_CODE(0xA6);
-  //! [EXPORT] : [COMMENT] Received latchup config command with invalid latchup ID
-  static const ReturnValue_t INVALID_LATCHUP_ID = MAKE_RETURN_CODE(0xA7);
-  //! [EXPORT] : [COMMENT] Received set adc sweep period command with invalid sweep period. Must be
-  //! larger than 21.
-  static const ReturnValue_t SWEEP_PERIOD_TOO_SMALL = MAKE_RETURN_CODE(0xA8);
-  //! [EXPORT] : [COMMENT] Receive auto EM test command with invalid test param. Valid params are 1
-  //! and 2.
-  static const ReturnValue_t INVALID_TEST_PARAM = MAKE_RETURN_CODE(0xA9);
-  //! [EXPORT] : [COMMENT] Returned when scanning for MRAM dump packets failed.
-  static const ReturnValue_t MRAM_PACKET_PARSING_FAILURE = MAKE_RETURN_CODE(0xAA);
-  //! [EXPORT] : [COMMENT] Returned when the start and stop addresses of the MRAM dump or MRAM  wipe
-  //! commands are invalid (e.g. start address bigger than stop address)
-  static const ReturnValue_t INVALID_MRAM_ADDRESSES = MAKE_RETURN_CODE(0xAB);
-  //! [EXPORT] : [COMMENT] Expect reception of an MRAM dump packet but received space packet with
-  //! other apid.
-  static const ReturnValue_t NO_MRAM_PACKET = MAKE_RETURN_CODE(0xAC);
-  //! [EXPORT] : [COMMENT] Path to PLOC directory on SD card does not exist
-  static const ReturnValue_t PATH_DOES_NOT_EXIST = MAKE_RETURN_CODE(0xAD);
-  //! [EXPORT] : [COMMENT] MRAM dump file does not exists. The file should actually already have
-  //! been created with the reception of the first dump packet.
-  static const ReturnValue_t MRAM_FILE_NOT_EXISTS = MAKE_RETURN_CODE(0xAE);
-
  static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPERVISOR_HANDLER;

  //! [EXPORT] : [COMMENT] PLOC supervisor crc failure in telemetry packet
@ -98,12 +67,33 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  //! [EXPORT] : [COMMENT] PLOC supervisor received acknowledgment failure report
  static const Event SUPV_ACK_FAILURE = MAKE_EVENT(2, 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(3, severity::LOW);
  //! [EXPORT] : [COMMENT] PLOC supervisor reply has invalid crc
  static const Event SUPV_CRC_FAILURE_EVENT = MAKE_EVENT(4, severity::LOW);
+  //! [EXPORT] : [COMMENT] Supervisor helper currently executing a command
+  static const Event SUPV_HELPER_EXECUTING = MAKE_EVENT(5, severity::LOW);
+  //! [EXPORT] : [COMMENT] Failed to build the command to shutdown the MPSoC
+  static const Event SUPV_MPSOC_SHUWDOWN_BUILD_FAILED = MAKE_EVENT(5, 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;
+  static const uint8_t SIZE_NULL_TERMINATOR = 1;
+  // 5 s
+  static const uint32_t EXECUTION_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;
+  // 2 s
+  static const uint32_t BOOT_TIMEOUT = 2000;
+  enum class StartupState : uint8_t { OFF, BOOTING, SET_TIME, SET_TIME_EXECUTING, ON };
+
+  StartupState startupState = StartupState::OFF;

  uint8_t commandBuffer[supv::MAX_COMMAND_SIZE];

@ -121,9 +111,14 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  supv::HkSet hkset;
  supv::BootStatusReport bootStatusReport;
  supv::LatchupStatusReport latchupStatusReport;
+  supv::LoggingReport loggingReport;
+  supv::AdcReport adcReport;

  const power::Switch_t powerSwitch = power::NO_SWITCH;

+  PlocSupvHelper* supvHelper = nullptr;
+  MessageQueueIF* eventQueue = nullptr;
+
  /** Number of expected replies following the MRAM dump command */
  uint32_t expectedMramDumpPackets = 0;
  uint32_t receivedMramDumpPackets = 0;
@ -135,16 +130,31 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  /** This buffer is used to concatenate space packets received in two different read steps */
  uint8_t spacePacketBuffer[supv::MAX_PACKET_SIZE];

-#ifdef TE0720_1CFA
+#ifndef TE0720_1CFA
  SdCardManager* sdcMan = nullptr;
 #endif /* BOARD_TE0720 == 0 */

-  /** Path to PLOC specific files on SD card */
-  std::string plocFilePath = "ploc";
+  // Path to supervisor specific files on SD card
+  std::string supervisorFilePath = "ploc/supervisor";
  std::string activeMramFile;

-  /** Setting this variable to true will enable direct downlink of MRAM packets */
-  bool downlinkMramDump = false;
+  // Supervisor helper class currently executing a command
+  bool plocSupvHelperExecuting = false;
+
+  Countdown executionTimeout = Countdown(EXECUTION_DEFAULT_TIMEOUT, false);
+  // Vorago nees some time to boot properly
+  Countdown bootTimeout = Countdown(BOOT_TIMEOUT);
+  Countdown mramDumpTimeout = Countdown(MRAM_DUMP_TIMEOUT);
+
+  /**
+   * @brief Adjusts the timeout of the execution report dependent on command
+   */
+  void setExecutionTimeout(DeviceCommandId_t command);
+
+  /**
+   * @brief   Handles event messages received from the supervisor helper
+   */
+  void handleEvent(EventMessage* eventMessage);

  ReturnValue_t getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches);

@ -193,6 +203,8 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
  ReturnValue_t handleBootStatusReport(const uint8_t* data);

  ReturnValue_t handleLatchupStatusReport(const uint8_t* data);
+  ReturnValue_t handleLoggingReport(const uint8_t* data);
+  ReturnValue_t handleAdcReport(const uint8_t* data);

  /**
   * @brief   Depending on the current active command, this function sets the reply id of the
@ -253,22 +265,17 @@ class PlocSupervisorHandler : public DeviceHandlerBase {

  ReturnValue_t prepareLatchupConfigCmd(const uint8_t* commandData,
                                        DeviceCommandId_t deviceCommand);
-  ReturnValue_t prepareAutoCalibrateAlertCmd(const uint8_t* commandData);
  ReturnValue_t prepareSetAlertLimitCmd(const uint8_t* commandData);
-  ReturnValue_t prepareSetAlertIrqFilterCmd(const uint8_t* commandData);
-  ReturnValue_t prepareSetAdcSweetPeriodCmd(const uint8_t* commandData);
  void prepareSetAdcEnabledChannelsCmd(const uint8_t* commandData);
  void prepareSetAdcWindowAndStrideCmd(const uint8_t* commandData);
  void prepareSetAdcThresholdCmd(const uint8_t* commandData);
-  void prepareEnableNvmsCmd(const uint8_t* commandData);
-  void prepareSelectNvmCmd(const uint8_t* commandData);
  ReturnValue_t prepareRunAutoEmTest(const uint8_t* commandData);
  ReturnValue_t prepareWipeMramCmd(const uint8_t* commandData);
  ReturnValue_t prepareDumpMramCmd(const uint8_t* commandData);
-  void preparePrintCpuStatsCmd(const uint8_t* commandData);
-  void prepareSetDbgVerbosityCmd(const uint8_t* commandData);
  void prepareSetGpioCmd(const uint8_t* commandData);
  void prepareReadGpioCmd(const uint8_t* commandData);
+  ReturnValue_t prepareLoggingRequest(const uint8_t* commandData, size_t commandDataLen);
+  ReturnValue_t prepareEnableNvmsCommand(const uint8_t* commandData);

  /**
   * @brief   Copies the content of a space packet to the command buffer.
@ -282,6 +289,8 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   */
  void disableAllReplies();

+  void disableReply(DeviceCommandId_t replyId);
+
  /**
   * @brief   This function sends a failure report if the active action was commanded by an other
   *          object.
@ -348,6 +357,15 @@ class PlocSupervisorHandler : public DeviceHandlerBase {

  ReturnValue_t createMramDumpFile();
  ReturnValue_t getTimeStampString(std::string& timeStamp);
+
+  void prepareSetShutdownTimeoutCmd(const uint8_t* commandData);
+
+  ReturnValue_t extractUpdateCommand(const uint8_t* commandData, size_t size, std::string* file,
+                                     uint8_t* memoryId, uint32_t* startAddress);
+  ReturnValue_t eventSubscription();
+
+  void handleExecutionSuccessReport(const uint8_t* data);
+  void handleExecutionFailureReport(uint16_t statusCode);
 };

 #endif /* MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_ */
--- a/linux/devices/ploc/PlocSupvHelper.cpp
+++ b/linux/devices/ploc/PlocSupvHelper.cpp
@ -0,0 +1,498 @@
+#include "PlocSupvHelper.h"
+
+#include <filesystem>
+#include <fstream>
+
+#include "OBSWConfig.h"
+#ifdef XIPHOS_Q7S
+#include "bsp_q7s/memory/FilesystemHelper.h"
+#include "bsp_q7s/memory/SdCardManager.h"
+#endif
+
+#include "fsfw/globalfunctions/CRC.h"
+#include "fsfw/timemanager/Countdown.h"
+#include "mission/utility/Filenaming.h"
+#include "mission/utility/ProgressPrinter.h"
+#include "mission/utility/Timestamp.h"
+
+PlocSupvHelper::PlocSupvHelper(object_id_t objectId) : SystemObject(objectId) {}
+
+PlocSupvHelper::~PlocSupvHelper() {}
+
+ReturnValue_t PlocSupvHelper::initialize() {
+#ifdef XIPHOS_Q7S
+  sdcMan = SdCardManager::instance();
+  if (sdcMan == nullptr) {
+    sif::warning << "PlocSupvHelper::initialize: Invalid SD Card Manager" << std::endl;
+    return RETURN_FAILED;
+  }
+#endif
+  return RETURN_OK;
+}
+
+ReturnValue_t PlocSupvHelper::performOperation(uint8_t operationCode) {
+  ReturnValue_t result = RETURN_OK;
+  semaphore.acquire();
+  while (true) {
+    switch (internalState) {
+      case InternalState::IDLE: {
+        semaphore.acquire();
+        break;
+      }
+      case InternalState::UPDATE: {
+        result = performUpdate();
+        if (result == RETURN_OK) {
+          triggerEvent(SUPV_UPDATE_SUCCESSFUL, result);
+        } else if (result == PROCESS_TERMINATED) {
+          // Event already triggered
+        } else {
+          triggerEvent(SUPV_UPDATE_FAILED, result);
+        }
+        internalState = InternalState::IDLE;
+        break;
+      }
+      case InternalState::REQUEST_EVENT_BUFFER: {
+        result = performEventBufferRequest();
+        if (result == RETURN_OK) {
+          triggerEvent(SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL, result);
+        } else if (result == PROCESS_TERMINATED) {
+          // Event already triggered
+          break;
+        } else {
+          triggerEvent(SUPV_EVENT_BUFFER_REQUEST_FAILED, result);
+        }
+        internalState = InternalState::IDLE;
+        break;
+      }
+      default:
+        sif::debug << "PlocSupvHelper::performOperation: Invalid state" << std::endl;
+        break;
+    }
+  }
+}
+
+ReturnValue_t PlocSupvHelper::setComIF(UartComIF* uartComIF_) {
+  if (uartComIF_ == nullptr) {
+    sif::warning << "PlocSupvHelper::initialize: Provided invalid uart com if" << std::endl;
+    return RETURN_FAILED;
+  }
+  uartComIF = uartComIF_;
+  return RETURN_OK;
+}
+
+void PlocSupvHelper::setComCookie(CookieIF* comCookie_) { comCookie = comCookie_; }
+
+ReturnValue_t PlocSupvHelper::startUpdate(std::string file, uint8_t memoryId,
+                                          uint32_t startAddress) {
+  ReturnValue_t result = RETURN_OK;
+#ifdef XIPHOS_Q7S
+  result = FilesystemHelper::checkPath(file);
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::startUpdate: File " << file << " does not exist" << std::endl;
+    return result;
+  }
+  result = FilesystemHelper::fileExists(file);
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::startUpdate: The file " << file << " does not exist"
+                 << std::endl;
+    return result;
+  }
+#endif
+#ifdef TE0720_1CFA
+  if (not std::filesystem::exists(file)) {
+    sif::warning << "PlocSupvHelper::startUpdate: The file " << file << " does not exist"
+                 << std::endl;
+    return RETURN_FAILED;
+  }
+#endif
+  update.file = file;
+  update.length = getFileSize(update.file);
+  update.memoryId = memoryId;
+  update.startAddress = startAddress;
+  internalState = InternalState::UPDATE;
+  uartComIF->flushUartTxAndRxBuf(comCookie);
+  semaphore.release();
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::startEventbBufferRequest(std::string path) {
+#ifdef XIPHOS_Q7S
+  ReturnValue_t result = FilesystemHelper::checkPath(path);
+  if (result != RETURN_OK) {
+    return result;
+  }
+#endif
+  if (not std::filesystem::exists(path)) {
+    return PATH_NOT_EXISTS;
+  }
+  eventBufferReq.path = path;
+  internalState = InternalState::REQUEST_EVENT_BUFFER;
+  uartComIF->flushUartTxAndRxBuf(comCookie);
+  semaphore.release();
+  return RETURN_OK;
+}
+
+void PlocSupvHelper::stopProcess() { terminate = true; }
+
+ReturnValue_t PlocSupvHelper::performUpdate() {
+  ReturnValue_t result = RETURN_OK;
+  result = calcImageCrc();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = prepareUpdate();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = eraseMemory();
+  if (result != RETURN_OK) {
+    return result;
+  }
+#if OBSW_DEBUG_PLOC_SUPERVISOR == 1
+  ProgressPrinter progressPrinter("Supervisor update", update.length,
+                                  ProgressPrinter::HALF_PERCENT);
+#endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
+  uint8_t tempData[supv::WriteMemory::CHUNK_MAX];
+  std::ifstream file(update.file, std::ifstream::binary);
+  size_t remainingSize = update.length;
+  uint16_t dataLength = 0;
+  size_t bytesWritten = 0;
+  uint16_t sequenceCount = 1;
+  supv::SequenceFlags seqFlags = supv::SequenceFlags::FIRST_PKT;
+  while (remainingSize > 0) {
+    if (terminate) {
+      terminate = false;
+      return PROCESS_TERMINATED;
+    }
+    if (remainingSize > supv::WriteMemory::CHUNK_MAX) {
+      dataLength = supv::WriteMemory::CHUNK_MAX;
+    } else {
+      dataLength = static_cast<uint16_t>(remainingSize);
+    }
+    if (file.is_open()) {
+      file.seekg(bytesWritten, file.beg);
+      file.read(reinterpret_cast<char*>(tempData), dataLength);
+      if (!file) {
+        sif::warning << "PlocSupvHelper::performUpdate: Read only " << file.gcount() << " of "
+                     << dataLength << " bytes" << std::endl;
+        sif::info << "PlocSupvHelper::performUpdate: Failed when trying to read byte "
+                  << bytesWritten << std::endl;
+      }
+      remainingSize -= dataLength;
+    } else {
+      return FILE_CLOSED_ACCIDENTALLY;
+    }
+    if (bytesWritten == 0) {
+      seqFlags = supv::SequenceFlags::FIRST_PKT;
+    } else if (remainingSize == 0) {
+      seqFlags = supv::SequenceFlags::LAST_PKT;
+    } else {
+      seqFlags = supv::SequenceFlags::CONTINUED_PKT;
+    }
+    supv::WriteMemory packet(seqFlags, sequenceCount++, update.memoryId,
+                             update.startAddress + bytesWritten, dataLength, tempData);
+    result = handlePacketTransmission(packet);
+    if (result != RETURN_OK) {
+      return result;
+    }
+    bytesWritten += dataLength;
+#if OBSW_DEBUG_PLOC_SUPERVISOR == 1
+    progressPrinter.print(bytesWritten);
+#endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
+  }
+  result = handleCheckMemoryCommand();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::performEventBufferRequest() {
+  using namespace supv;
+  ReturnValue_t result = RETURN_OK;
+  RequestLoggingData packet(RequestLoggingData::Sa::REQUEST_EVENT_BUFFERS);
+  result = sendCommand(packet);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleAck();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleEventBufferReception();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleExe();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::prepareUpdate() {
+  ReturnValue_t result = RETURN_OK;
+  supv::ApidOnlyPacket packet(supv::APID_PREPARE_UPDATE);
+  result = handlePacketTransmission(packet);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t PlocSupvHelper::eraseMemory() {
+  ReturnValue_t result = RETURN_OK;
+  supv::EraseMemory eraseMemory(update.memoryId, update.startAddress, update.length);
+  result = handlePacketTransmission(eraseMemory, supv::recv_timeout::ERASE_MEMORY);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t PlocSupvHelper::handlePacketTransmission(SpacePacket& packet,
+                                                       uint32_t timeoutExecutionReport) {
+  ReturnValue_t result = RETURN_OK;
+  result = sendCommand(packet);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleAck();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleExe(timeoutExecutionReport);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t PlocSupvHelper::sendCommand(SpacePacket& packet) {
+  ReturnValue_t result = RETURN_OK;
+  rememberApid = packet.getAPID();
+  result = uartComIF->sendMessage(comCookie, packet.getWholeData(), packet.getFullSize());
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::sendCommand: Failed to send command" << std::endl;
+    triggerEvent(SUPV_SENDING_COMMAND_FAILED, result, static_cast<uint32_t>(internalState));
+    return result;
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::handleAck() {
+  ReturnValue_t result = RETURN_OK;
+  supv::AcknowledgmentReport ackReport;
+  result = handleTmReception(&ackReport, supv::SIZE_ACK_REPORT);
+  if (result != RETURN_OK) {
+    triggerEvent(ACK_RECEPTION_FAILURE, result, static_cast<uint32_t>(rememberApid));
+    sif::warning << "PlocSupvHelper::handleAck: Error in reception of acknowledgment report"
+                 << std::endl;
+    return result;
+  }
+  result = ackReport.checkApid();
+  if (result != RETURN_OK) {
+    if (result == SupvReturnValuesIF::RECEIVED_ACK_FAILURE) {
+      triggerEvent(SUPV_ACK_FAILURE_REPORT, static_cast<uint32_t>(ackReport.getRefApid()));
+    } else if (result == SupvReturnValuesIF::INVALID_APID) {
+      triggerEvent(SUPV_ACK_INVALID_APID, static_cast<uint32_t>(rememberApid));
+    }
+    return result;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t PlocSupvHelper::handleExe(uint32_t timeout) {
+  ReturnValue_t result = RETURN_OK;
+  supv::ExecutionReport exeReport;
+  result = handleTmReception(&exeReport, supv::SIZE_EXE_REPORT, timeout);
+  if (result != RETURN_OK) {
+    triggerEvent(EXE_RECEPTION_FAILURE, result, static_cast<uint32_t>(rememberApid));
+    sif::warning << "PlocSupvHelper::handleExe: Error in reception of execution report"
+                 << std::endl;
+    return result;
+  }
+  result = exeReport.checkApid();
+  if (result != RETURN_OK) {
+    if (result == SupvReturnValuesIF::RECEIVED_EXE_FAILURE) {
+      triggerEvent(SUPV_EXE_FAILURE_REPORT, static_cast<uint32_t>(exeReport.getRefApid()));
+    } else if (result == SupvReturnValuesIF::INVALID_APID) {
+      triggerEvent(SUPV_EXE_INVALID_APID, static_cast<uint32_t>(rememberApid));
+    }
+    return result;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t PlocSupvHelper::handleTmReception(supv::TmPacket* tmPacket, size_t remainingBytes,
+                                                uint32_t timeout) {
+  ReturnValue_t result = RETURN_OK;
+  size_t readBytes = 0;
+  size_t currentBytes = 0;
+  Countdown countdown(timeout);
+  while (!countdown.hasTimedOut()) {
+    result = receive(tmPacket->getWholeData() + readBytes, &currentBytes, remainingBytes);
+    if (result != RETURN_OK) {
+      return result;
+    }
+    readBytes += currentBytes;
+    remainingBytes = remainingBytes - currentBytes;
+    if (remainingBytes == 0) {
+      break;
+    }
+  }
+  if (remainingBytes != 0) {
+    sif::warning << "PlocSupvHelper::handleTmReception: Failed to read " << remainingBytes
+                 << " bytes" << std::endl;
+    return RETURN_FAILED;
+  }
+  result = tmPacket->checkCrc();
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::handleTmReception: CRC check failed" << std::endl;
+    return result;
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::receive(uint8_t* data, size_t* readBytes, size_t requestBytes) {
+  ReturnValue_t result = RETURN_OK;
+  uint8_t* buffer = nullptr;
+  result = uartComIF->requestReceiveMessage(comCookie, requestBytes);
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::receive: Failed to request reply" << std::endl;
+    triggerEvent(SUPV_HELPER_REQUESTING_REPLY_FAILED, result,
+                 static_cast<uint32_t>(static_cast<uint32_t>(internalState)));
+    return RETURN_FAILED;
+  }
+  result = uartComIF->readReceivedMessage(comCookie, &buffer, readBytes);
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::receive: Failed to read received message" << std::endl;
+    triggerEvent(SUPV_HELPER_READING_REPLY_FAILED, result, static_cast<uint32_t>(internalState));
+    return RETURN_FAILED;
+  }
+  if (*readBytes > 0) {
+    std::memcpy(data, buffer, *readBytes);
+  }
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::calcImageCrc() {
+  ReturnValue_t result = RETURN_OK;
+#ifdef XIPHOS_Q7S
+  result = FilesystemHelper::checkPath(update.file);
+#endif
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::calcImageCrc: File " << update.file << " does not exist"
+                 << std::endl;
+    return result;
+  }
+  std::ifstream file(update.file, std::ifstream::binary);
+  uint16_t remainder = CRC16_INIT;
+  uint8_t input;
+#if OBSW_DEBUG_PLOC_SUPERVISOR == 1
+  ProgressPrinter progress("Supervisor update crc calculation", update.length,
+                           ProgressPrinter::ONE_PERCENT);
+#endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
+  uint32_t byteCount = 0;
+  for (byteCount = 0; byteCount < update.length; byteCount++) {
+    file.seekg(byteCount, file.beg);
+    file.read(reinterpret_cast<char*>(&input), 1);
+    remainder = CRC::crc16ccitt(&input, sizeof(input), remainder);
+#if OBSW_DEBUG_PLOC_SUPERVISOR == 1
+    progress.print(byteCount);
+#endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
+  }
+#if OBSW_DEBUG_PLOC_SUPERVISOR == 1
+  progress.print(byteCount);
+#endif /* OBSW_DEBUG_PLOC_SUPERVISOR == 1 */
+  file.close();
+  update.crc = remainder;
+  return result;
+}
+
+ReturnValue_t PlocSupvHelper::handleCheckMemoryCommand() {
+  ReturnValue_t result = RETURN_OK;
+  // Verification of update write procedure
+  supv::CheckMemory packet(update.memoryId, update.startAddress, update.length);
+  result = sendCommand(packet);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = handleAck();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  supv::UpdateStatusReport updateStatusReport;
+  result = handleTmReception(&updateStatusReport,
+                             static_cast<size_t>(updateStatusReport.getNominalSize()),
+                             supv::recv_timeout::UPDATE_STATUS_REPORT);
+  if (result != RETURN_OK) {
+    sif::warning
+        << "PlocSupvHelper::handleCheckMemoryCommand: Failed to receive update status report"
+        << std::endl;
+    return result;
+  }
+  result = handleExe(CRC_EXECUTION_TIMEOUT);
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = updateStatusReport.parseDataField();
+  if (result != RETURN_OK) {
+    return result;
+  }
+  result = updateStatusReport.verifycrc(update.crc);
+  if (result != RETURN_OK) {
+    sif::warning << "PlocSupvHelper::handleCheckMemoryCommand: CRC failure. Expected CRC 0x"
+                 << std::hex << update.crc << " but received CRC 0x" << updateStatusReport.getCrc()
+                 << std::endl;
+    return result;
+  }
+  return result;
+}
+
+uint32_t PlocSupvHelper::getFileSize(std::string filename) {
+  std::ifstream file(filename, std::ifstream::binary);
+  file.seekg(0, file.end);
+  uint32_t size = file.tellg();
+  file.close();
+  return size;
+}
+
+ReturnValue_t PlocSupvHelper::handleEventBufferReception() {
+  ReturnValue_t result = RETURN_OK;
+  std::string filename = Filenaming::generateAbsoluteFilename(
+      eventBufferReq.path, eventBufferReq.filename, timestamping);
+  std::ofstream file(filename, std::ios_base::app | std::ios_base::out);
+  uint32_t packetsRead = 0;
+  size_t requestLen = 0;
+  supv::TmPacket tmPacket;
+  for (packetsRead = 0; packetsRead < NUM_EVENT_BUFFER_PACKETS; packetsRead++) {
+    if (terminate) {
+      triggerEvent(SUPV_EVENT_BUFFER_REQUEST_TERMINATED, packetsRead - 1);
+      file.close();
+      return PROCESS_TERMINATED;
+    }
+    if (packetsRead == NUM_EVENT_BUFFER_PACKETS - 1) {
+      requestLen = SIZE_EVENT_BUFFER_LAST_PACKET;
+    } else {
+      requestLen = SIZE_EVENT_BUFFER_FULL_PACKET;
+    }
+    result = handleTmReception(&tmPacket, requestLen);
+    if (result != RETURN_OK) {
+      sif::debug << "PlocSupvHelper::handleEventBufferReception: Failed while trying to read packet"
+                 << " " << packetsRead + 1 << std::endl;
+      file.close();
+      return result;
+    }
+    uint16_t apid = tmPacket.getAPID();
+    if (apid != supv::APID_MRAM_DUMP_TM) {
+      sif::warning << "PlocSupvHelper::handleEventBufferReception: Did not expect space packet "
+                   << "with APID 0x" << std::hex << apid << std::endl;
+      file.close();
+      return EVENT_BUFFER_REPLY_INVALID_APID;
+    }
+    file.write(reinterpret_cast<const char*>(tmPacket.getPacketData()),
+               tmPacket.getPayloadDataLength());
+  }
+  return result;
+}
--- a/linux/devices/ploc/PlocSupvHelper.h
+++ b/linux/devices/ploc/PlocSupvHelper.h
@ -0,0 +1,218 @@
+#ifndef BSP_Q7S_DEVICES_PLOCSUPVHELPER_H_
+#define BSP_Q7S_DEVICES_PLOCSUPVHELPER_H_
+
+#include <string>
+
+#include "OBSWConfig.h"
+#include "fsfw/devicehandlers/CookieIF.h"
+#include "fsfw/objectmanager/SystemObject.h"
+#include "fsfw/osal/linux/BinarySemaphore.h"
+#include "fsfw/returnvalues/HasReturnvaluesIF.h"
+#include "fsfw/tasks/ExecutableObjectIF.h"
+#include "fsfw_hal/linux/uart/UartComIF.h"
+#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
+#ifdef XIPHOS_Q7S
+#include "bsp_q7s/memory/SdCardManager.h"
+#endif
+
+/**
+ * @brief   Helper class for supervisor of PLOC intended to accelerate large data transfers between
+ *          the supervisor and the OBC.
+ * @author  J. Meier
+ */
+class PlocSupvHelper : public SystemObject, public ExecutableObjectIF, public HasReturnvaluesIF {
+ public:
+  static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_SUPV_HELPER;
+
+  //! [EXPORT] : [COMMENT] update failed
+  static const Event SUPV_UPDATE_FAILED = MAKE_EVENT(0, severity::LOW);
+  //! [EXPORT] : [COMMENT] update successful
+  static const Event SUPV_UPDATE_SUCCESSFUL = MAKE_EVENT(1, severity::LOW);
+  //! [EXPORT] : [COMMENT] Terminated update procedure by command
+  static const Event TERMINATED_UPDATE_PROCEDURE = MAKE_EVENT(2, severity::LOW);
+  //! [EXPORT] : [COMMENT] Requesting event buffer was successful
+  static const Event SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL = MAKE_EVENT(3, severity::LOW);
+  //! [EXPORT] : [COMMENT] Requesting event buffer failed
+  static const Event SUPV_EVENT_BUFFER_REQUEST_FAILED = MAKE_EVENT(4, severity::LOW);
+  //! [EXPORT] : [COMMENT] Terminated event buffer request by command
+  //! P1: Number of packets read before process was terminated
+  static const Event SUPV_EVENT_BUFFER_REQUEST_TERMINATED = MAKE_EVENT(5, severity::LOW);
+  //! [EXPORT] : [COMMENT] Communication interface returned failure when trying to send the command
+  //! to the supervisor
+  //! P1: Return value returned by the communication interface sendMessage function
+  //! P2: Internal state of supervisor helper
+  static const Event SUPV_SENDING_COMMAND_FAILED = MAKE_EVENT(6, severity::LOW);
+  //! [EXPORT] : [COMMENT] Request receive message of communication interface failed
+  //! P1: Return value returned by the communication interface requestReceiveMessage function
+  //! P2: Internal state of supervisor helper
+  static const Event SUPV_HELPER_REQUESTING_REPLY_FAILED = MAKE_EVENT(7, severity::LOW);
+  //! [EXPORT] : [COMMENT] Reading receive message of communication interface failed
+  //! P1: Return value returned by the communication interface readingReceivedMessage function
+  //! P2: Internal state of supervisor helper
+  static const Event SUPV_HELPER_READING_REPLY_FAILED = MAKE_EVENT(8, severity::LOW);
+  //! [EXPORT] : [COMMENT] Did not receive acknowledgement report
+  //! P1: Number of bytes missing
+  //! P2: Internal state of MPSoC helper
+  static const Event SUPV_MISSING_ACK = MAKE_EVENT(9, severity::LOW);
+  //! [EXPORT] : [COMMENT] Supervisor did not receive execution report
+  //! P1: Number of bytes missing
+  //! P2: Internal state of supervisor helper
+  static const Event SUPV_MISSING_EXE = MAKE_EVENT(10, severity::LOW);
+  //! [EXPORT] : [COMMENT] Supervisor received acknowledgment failure report
+  //! P1: Internal state of supervisor helper
+  static const Event SUPV_ACK_FAILURE_REPORT = MAKE_EVENT(11, severity::LOW);
+  //! [EXPORT] : [COMMENT] Execution report failure
+  //! P1:
+  static const Event SUPV_EXE_FAILURE_REPORT = MAKE_EVENT(12, severity::LOW);
+  //! [EXPORT] : [COMMENT] Supervisor expected acknowledgment report but received space packet with
+  //! other apid P1: Apid of received space packet P2: Internal state of supervisor helper
+  static const Event SUPV_ACK_INVALID_APID = MAKE_EVENT(13, severity::LOW);
+  //! [EXPORT] : [COMMENT] Supervisor helper expected execution report but received space packet
+  //! with other apid P1: Apid of received space packet P2: Internal state of supervisor helper
+  static const Event SUPV_EXE_INVALID_APID = MAKE_EVENT(14, severity::LOW);
+  //! [EXPORT] : [COMMENT] Failed to receive acknowledgment report
+  //! P1: Return value
+  //! P2: Apid of command for which the reception of the acknowledgment report failed
+  static const Event ACK_RECEPTION_FAILURE = MAKE_EVENT(15, severity::LOW);
+  //! [EXPORT] : [COMMENT] Failed to receive execution report
+  //! P1: Return value
+  //! P2: Apid of command for which the reception of the execution report failed
+  static const Event EXE_RECEPTION_FAILURE = MAKE_EVENT(16, severity::LOW);
+
+  PlocSupvHelper(object_id_t objectId);
+  virtual ~PlocSupvHelper();
+
+  ReturnValue_t initialize() override;
+  ReturnValue_t performOperation(uint8_t operationCode = 0) override;
+
+  ReturnValue_t setComIF(UartComIF* uartComfIF_);
+  void setComCookie(CookieIF* comCookie_);
+
+  /**
+   * @brief   Starts update procedure
+   *
+   * @param file            File containing the update data
+   * @param memoryId        ID of the memory where to write to
+   * @param startAddress    Address where to write data
+   *
+   * @return  RETURN_OK if successful, otherwise error return value
+   */
+  ReturnValue_t startUpdate(std::string file, uint8_t memoryId, uint32_t startAddress);
+
+  /**
+   * @brief Calling this function will initiate the procedure to request the event buffer
+   */
+  ReturnValue_t startEventbBufferRequest(std::string path);
+
+  /**
+   * @brief   Can be used to interrupt a running data transfer.
+   */
+  void stopProcess();
+
+ private:
+  static const uint8_t INTERFACE_ID = CLASS_ID::PLOC_SUPV_HELPER;
+
+  //! [EXPORT] : [COMMENT] File accidentally close
+  static const ReturnValue_t FILE_CLOSED_ACCIDENTALLY = MAKE_RETURN_CODE(0xA0);
+  //! [EXPORT] : [COMMENT] Process has been terminated by command
+  static const ReturnValue_t PROCESS_TERMINATED = MAKE_RETURN_CODE(0xA1);
+  //! [EXPORT] : [COMMENT] Received command with invalid pathname
+  static const ReturnValue_t PATH_NOT_EXISTS = MAKE_RETURN_CODE(0xA2);
+  //! [EXPORT] : [COMMENT] Expected event buffer TM but received space packet with other APID
+  static const ReturnValue_t EVENT_BUFFER_REPLY_INVALID_APID = MAKE_RETURN_CODE(0xA3);
+
+  static const uint16_t CRC16_INIT = 0xFFFF;
+  // Event buffer reply will carry 24 space packets with 1016 bytes and one space packet with
+  // 192 bytes
+  static const uint8_t NUM_EVENT_BUFFER_PACKETS = 25;
+  static const size_t SIZE_EVENT_BUFFER_FULL_PACKET = 1024;
+  static const size_t SIZE_EVENT_BUFFER_LAST_PACKET = 200;
+  static const uint32_t CRC_EXECUTION_TIMEOUT = 60000;
+
+  struct Update {
+    uint8_t memoryId;
+    uint32_t startAddress;
+    // Absolute name of file containing update data
+    std::string file;
+    // Size of update
+    uint32_t length;
+    uint32_t crc;
+  };
+
+  struct Update update;
+
+  struct EventBufferRequest {
+    std::string path = "";
+    // Default name of file where event buffer data will be written to. Timestamp will be added to
+    // name when new file is created
+    std::string filename = "event-buffer.bin";
+  };
+
+  EventBufferRequest eventBufferReq;
+
+  enum class InternalState { IDLE, UPDATE, REQUEST_EVENT_BUFFER };
+
+  InternalState internalState = InternalState::IDLE;
+
+  BinarySemaphore semaphore;
+#ifdef XIPHOS_Q7S
+  SdCardManager* sdcMan = nullptr;
+#endif
+  uint8_t commandBuffer[supv::MAX_COMMAND_SIZE];
+
+  bool terminate = false;
+
+  /**
+   * Communication interface responsible for data transactions between OBC and Supervisor.
+   */
+  UartComIF* uartComIF = nullptr;
+  // Communication cookie. Must be set by the supervisor Handler
+  CookieIF* comCookie = nullptr;
+
+  bool timestamping = true;
+
+  // Remembers APID to know at which command a procedure failed
+  uint16_t rememberApid = 0;
+
+  ReturnValue_t performUpdate();
+  ReturnValue_t performEventBufferRequest();
+  ReturnValue_t handlePacketTransmission(SpacePacket& packet,
+                                         uint32_t timeoutExecutionReport = 1000);
+  ReturnValue_t sendCommand(SpacePacket& packet);
+  /**
+   * @brief Function which reads form the communication interface
+   *
+   * @param data            Pointer to buffer where read data will be written to
+   * @param raedBytes       Actual number of bytes read
+   * @param requestBytes    Number of bytes to read
+   */
+  ReturnValue_t receive(uint8_t* data, size_t* readBytes, size_t requestBytes);
+  ReturnValue_t handleAck();
+  ReturnValue_t handleExe(uint32_t timeout = 1000);
+  /**
+   * @brief Handles reading of TM packets from the communication interface
+   *
+   * @param tmPacket        Pointer to space packet where received data will be written to
+   * @param reaminingBytes  Number of bytes to read in the space packet
+   * @param timeout         Receive timeout in milliseconds
+   */
+  ReturnValue_t handleTmReception(supv::TmPacket* tmPacket, size_t remainingBytes,
+                                  uint32_t timeout = 1000);
+  ReturnValue_t prepareUpdate();
+  ReturnValue_t eraseMemory();
+  // Calculates CRC over image. Will be used for verification after update writing has
+  // finished.
+  ReturnValue_t calcImageCrc();
+  ReturnValue_t handleCheckMemoryCommand();
+  /**
+   * @brief Return size of file with name filename
+   *
+   * @param filename
+   *
+   * @return The size of the file
+   */
+  uint32_t getFileSize(std::string filename);
+  ReturnValue_t handleEventBufferReception();
+};
+
+#endif /* BSP_Q7S_DEVICES_PLOCSUPVHELPER_H_ */
--- a/linux/devices/ploc/PlocUpdater.cpp
+++ b/linux/devices/ploc/PlocUpdater.cpp
@ -1,385 +0,0 @@
-#include "PlocUpdater.h"
-
-#include <filesystem>
-#include <fstream>
-#include <string>
-
-#include "fsfw/ipc/QueueFactory.h"
-
-PlocUpdater::PlocUpdater(object_id_t objectId)
-    : SystemObject(objectId), commandActionHelper(this), actionHelper(this, nullptr) {
-  auto mqArgs = MqArgs(this->getObjectId());
-  commandQueue = QueueFactory::instance()->createMessageQueue(
-      QUEUE_SIZE, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
-}
-
-PlocUpdater::~PlocUpdater() {}
-
-ReturnValue_t PlocUpdater::initialize() {
-#ifdef XIPHOS_Q7S
-  sdcMan = SdCardManager::instance();
-#endif
-  ReturnValue_t result = SystemObject::initialize();
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    return result;
-  }
-  result = commandActionHelper.initialize();
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    return result;
-  }
-  result = actionHelper.initialize(commandQueue);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    return result;
-  }
-
-  return HasReturnvaluesIF::RETURN_OK;
-}
-
-ReturnValue_t PlocUpdater::performOperation(uint8_t operationCode) {
-  readCommandQueue();
-  doStateMachine();
-  return HasReturnvaluesIF::RETURN_OK;
-}
-
-ReturnValue_t PlocUpdater::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
-                                         const uint8_t* data, size_t size) {
-  ReturnValue_t result = RETURN_FAILED;
-
-  if (state != State::IDLE) {
-    return IS_BUSY;
-  }
-
-  if (size > MAX_PLOC_UPDATE_PATH) {
-    return NAME_TOO_LONG;
-  }
-
-  switch (actionId) {
-    case UPDATE_A_UBOOT:
-      image = Image::A;
-      partition = Partition::UBOOT;
-      break;
-    case UPDATE_A_BITSTREAM:
-      image = Image::A;
-      partition = Partition::BITSTREAM;
-      break;
-    case UPDATE_A_LINUX:
-      image = Image::A;
-      partition = Partition::LINUX_OS;
-      break;
-    case UPDATE_A_APP_SW:
-      image = Image::A;
-      partition = Partition::APP_SW;
-      break;
-    case UPDATE_B_UBOOT:
-      image = Image::B;
-      partition = Partition::UBOOT;
-      break;
-    case UPDATE_B_BITSTREAM:
-      image = Image::B;
-      partition = Partition::BITSTREAM;
-      break;
-    case UPDATE_B_LINUX:
-      image = Image::B;
-      partition = Partition::LINUX_OS;
-      break;
-    case UPDATE_B_APP_SW:
-      image = Image::B;
-      partition = Partition::APP_SW;
-      break;
-    default:
-      return INVALID_ACTION_ID;
-  }
-
-  result = getImageLocation(data, size);
-
-  if (result != RETURN_OK) {
-    return result;
-  }
-
-  state = State::UPDATE_AVAILABLE;
-
-  return EXECUTION_FINISHED;
-}
-
-MessageQueueId_t PlocUpdater::getCommandQueue() const { return commandQueue->getId(); }
-
-MessageQueueIF* PlocUpdater::getCommandQueuePtr() { return commandQueue; }
-
-void PlocUpdater::readCommandQueue() {
-  CommandMessage message;
-  ReturnValue_t result;
-
-  for (result = commandQueue->receiveMessage(&message); result == HasReturnvaluesIF::RETURN_OK;
-       result = commandQueue->receiveMessage(&message)) {
-    if (result != RETURN_OK) {
-      continue;
-    }
-    result = actionHelper.handleActionMessage(&message);
-    if (result == HasReturnvaluesIF::RETURN_OK) {
-      continue;
-    }
-
-    result = commandActionHelper.handleReply(&message);
-    if (result == HasReturnvaluesIF::RETURN_OK) {
-      continue;
-    }
-  }
-}
-
-void PlocUpdater::doStateMachine() {
-  switch (state) {
-    case State::IDLE:
-      break;
-    case State::UPDATE_AVAILABLE:
-      commandUpdateAvailable();
-      break;
-    case State::UPDATE_TRANSFER:
-      commandUpdatePacket();
-      break;
-    case State::UPDATE_VERIFY:
-      commandUpdateVerify();
-      break;
-    case State::COMMAND_EXECUTING:
-      break;
-    default:
-      break;
-  }
-}
-
-ReturnValue_t PlocUpdater::checkNameLength(size_t size) {
-  if (size > MAX_PLOC_UPDATE_PATH) {
-    return NAME_TOO_LONG;
-  }
-  return RETURN_OK;
-}
-
-ReturnValue_t PlocUpdater::getImageLocation(const uint8_t* data, size_t size) {
-  ReturnValue_t result = checkNameLength(size);
-  if (result != RETURN_OK) {
-    return result;
-  }
-
-#ifdef XIPHOS_Q7S
-  // Check if file is stored on SD card and if associated SD card is mounted
-  if (std::string(reinterpret_cast<const char*>(data), SD_PREFIX_LENGTH) ==
-      std::string(SdCardManager::SD_0_MOUNT_POINT)) {
-    if (!sdcMan->isSdCardMounted(sd::SLOT_0)) {
-      sif::warning << "PlocUpdater::getImageLocation: SD card 0 not mounted" << std::endl;
-      return SD_NOT_MOUNTED;
-    }
-  } else if (std::string(reinterpret_cast<const char*>(data), SD_PREFIX_LENGTH) ==
-             std::string(SdCardManager::SD_1_MOUNT_POINT)) {
-    if (!sdcMan->isSdCardMounted(sd::SLOT_0)) {
-      sif::warning << "PlocUpdater::getImageLocation: SD card 1 not mounted" << std::endl;
-      return SD_NOT_MOUNTED;
-    }
-  } else {
-    // update image not stored on SD card
-  }
-#endif /* BOARD_TE0720 == 0 */
-
-  updateFile = std::string(reinterpret_cast<const char*>(data), size);
-
-  // Check if file exists
-  if (not std::filesystem::exists(updateFile)) {
-    return FILE_NOT_EXISTS;
-  }
-  return RETURN_OK;
-}
-
-void PlocUpdater::stepSuccessfulReceived(ActionId_t actionId, uint8_t step) {}
-
-void PlocUpdater::stepFailedReceived(ActionId_t actionId, uint8_t step, ReturnValue_t returnCode) {}
-
-void PlocUpdater::dataReceived(ActionId_t actionId, const uint8_t* data, uint32_t size) {}
-
-void PlocUpdater::completionSuccessfulReceived(ActionId_t actionId) {
-  switch (pendingCommand) {
-    case (supv::UPDATE_AVAILABLE):
-      state = State::UPDATE_TRANSFER;
-      break;
-    case (supv::UPDATE_IMAGE_DATA):
-      if (remainingPackets == 0) {
-        packetsSent = 0;  // Reset packets sent variable for next update sequence
-        state = State::UPDATE_VERIFY;
-      } else {
-        state = State::UPDATE_TRANSFER;
-      }
-      break;
-    case (supv::UPDATE_VERIFY):
-      triggerEvent(UPDATE_FINISHED);
-      state = State::IDLE;
-      pendingCommand = supv::NONE;
-      break;
-    default:
-      state = State::IDLE;
-      break;
-  }
-}
-
-void PlocUpdater::completionFailedReceived(ActionId_t actionId, ReturnValue_t returnCode) {
-  switch (pendingCommand) {
-    case (supv::UPDATE_AVAILABLE): {
-      triggerEvent(UPDATE_AVAILABLE_FAILED);
-      break;
-    }
-    case (supv::UPDATE_IMAGE_DATA): {
-      triggerEvent(UPDATE_TRANSFER_FAILED, packetsSent);
-      break;
-    }
-    case (supv::UPDATE_VERIFY): {
-      triggerEvent(UPDATE_VERIFY_FAILED);
-      break;
-    }
-    default:
-      break;
-  }
-  state = State::IDLE;
-}
-
-void PlocUpdater::commandUpdateAvailable() {
-  ReturnValue_t result = RETURN_OK;
-
-  if (not std::filesystem::exists(updateFile)) {
-    triggerEvent(UPDATE_FILE_NOT_EXISTS, static_cast<uint8_t>(state));
-    state = State::IDLE;
-    return;
-  }
-
-  std::ifstream file(updateFile, std::ifstream::binary);
-  file.seekg(0, file.end);
-  imageSize = static_cast<size_t>(file.tellg());
-  file.close();
-
-  numOfUpdatePackets = imageSize / MAX_SP_DATA;
-  if (imageSize % MAX_SP_DATA) {
-    numOfUpdatePackets++;
-  }
-
-  remainingPackets = numOfUpdatePackets;
-  packetsSent = 0;
-
-  calcImageCrc();
-
-  supv::UpdateInfo packet(supv::APID_UPDATE_AVAILABLE, static_cast<uint8_t>(image),
-                          static_cast<uint8_t>(partition), imageSize, imageCrc, numOfUpdatePackets);
-
-  result =
-      commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, supv::UPDATE_AVAILABLE,
-                                        packet.getWholeData(), packet.getFullSize());
-  if (result != RETURN_OK) {
-    sif::warning << "PlocUpdater::commandUpdateAvailable: Failed to send update available"
-                 << " packet to supervisor handler" << std::endl;
-    triggerEvent(ACTION_COMMANDING_FAILED, result, supv::UPDATE_AVAILABLE);
-    state = State::IDLE;
-    pendingCommand = supv::NONE;
-    return;
-  }
-
-  pendingCommand = supv::UPDATE_AVAILABLE;
-  state = State::COMMAND_EXECUTING;
-  return;
-}
-
-void PlocUpdater::commandUpdatePacket() {
-  ReturnValue_t result = RETURN_OK;
-  uint16_t payloadLength = 0;
-
-  if (not std::filesystem::exists(updateFile)) {
-    triggerEvent(UPDATE_FILE_NOT_EXISTS, static_cast<uint8_t>(state), packetsSent);
-    state = State::IDLE;
-    return;
-  }
-
-  std::ifstream file(updateFile, std::ifstream::binary);
-  file.seekg(packetsSent * MAX_SP_DATA, file.beg);
-
-  if (remainingPackets == 1) {
-    payloadLength = imageSize - static_cast<uint16_t>(file.tellg());
-  } else {
-    payloadLength = MAX_SP_DATA;
-  }
-
-  supv::UpdatePacket packet(payloadLength);
-  file.read(reinterpret_cast<char*>(packet.getDataFieldPointer()), payloadLength);
-  file.close();
-  // sequence count of first packet is 1
-  packet.setPacketSequenceCount((packetsSent + 1) & supv::SEQUENCE_COUNT_MASK);
-  if (numOfUpdatePackets > 1) {
-    adjustSequenceFlags(packet);
-  }
-  packet.makeCrc();
-
-  result =
-      commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, supv::UPDATE_IMAGE_DATA,
-                                        packet.getWholeData(), packet.getFullSize());
-
-  if (result != RETURN_OK) {
-    sif::warning << "PlocUpdater::commandUpdateAvailable: Failed to send update"
-                 << " packet to supervisor handler" << std::endl;
-    triggerEvent(ACTION_COMMANDING_FAILED, result, supv::UPDATE_IMAGE_DATA);
-    state = State::IDLE;
-    pendingCommand = supv::NONE;
-    return;
-  }
-
-  remainingPackets--;
-  packetsSent++;
-
-  pendingCommand = supv::UPDATE_IMAGE_DATA;
-  state = State::COMMAND_EXECUTING;
-}
-
-void PlocUpdater::commandUpdateVerify() {
-  ReturnValue_t result = RETURN_OK;
-
-  supv::UpdateInfo packet(supv::APID_UPDATE_VERIFY, static_cast<uint8_t>(image),
-                          static_cast<uint8_t>(partition), imageSize, imageCrc, numOfUpdatePackets);
-
-  result = commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, supv::UPDATE_VERIFY,
-                                             packet.getWholeData(), packet.getFullSize());
-  if (result != RETURN_OK) {
-    sif::warning << "PlocUpdater::commandUpdateAvailable: Failed to send update available"
-                 << " packet to supervisor handler" << std::endl;
-    triggerEvent(ACTION_COMMANDING_FAILED, result, supv::UPDATE_VERIFY);
-    state = State::IDLE;
-    pendingCommand = supv::NONE;
-    return;
-  }
-  state = State::COMMAND_EXECUTING;
-  pendingCommand = supv::UPDATE_VERIFY;
-  return;
-}
-
-void PlocUpdater::calcImageCrc() {
-  std::ifstream file(updateFile, std::ifstream::binary);
-  file.seekg(0, file.end);
-  uint32_t count;
-  uint32_t bit;
-  uint32_t remainder = INITIAL_REMAINDER_32;
-  char input;
-  for (count = 0; count < imageSize; count++) {
-    file.seekg(count, file.beg);
-    file.read(&input, 1);
-    remainder ^= (input << 16);
-    for (bit = 8; bit > 0; --bit) {
-      if (remainder & TOPBIT_32) {
-        remainder = (remainder << 1) ^ POLYNOMIAL_32;
-      } else {
-        remainder = (remainder << 1);
-      }
-    }
-  }
-  file.close();
-  imageCrc = (remainder ^ FINAL_XOR_VALUE_32);
-}
-
-void PlocUpdater::adjustSequenceFlags(supv::UpdatePacket& packet) {
-  if (packetsSent == 0) {
-    packet.setSequenceFlags(static_cast<uint8_t>(supv::SequenceFlags::FIRST_PKT));
-  } else if (remainingPackets == 1) {
-    packet.setSequenceFlags(static_cast<uint8_t>(supv::SequenceFlags::LAST_PKT));
-  } else {
-    packet.setSequenceFlags(static_cast<uint8_t>(supv::SequenceFlags::CONTINUED_PKT));
-  }
-}
--- a/linux/devices/ploc/PlocUpdater.h
+++ b/linux/devices/ploc/PlocUpdater.h
@ -1,174 +0,0 @@
-#ifndef MISSION_DEVICES_PLOCUPDATER_H_
-#define MISSION_DEVICES_PLOCUPDATER_H_
-
-#include <linux/devices/devicedefinitions/PlocSupervisorDefinitions.h>
-
-#include "OBSWConfig.h"
-#include "bsp_q7s/memory/SdCardManager.h"
-#include "eive/definitions.h"
-#include "fsfw/action/ActionHelper.h"
-#include "fsfw/action/CommandActionHelper.h"
-#include "fsfw/action/CommandsActionsIF.h"
-#include "fsfw/action/HasActionsIF.h"
-#include "fsfw/objectmanager/SystemObject.h"
-#include "fsfw/returnvalues/HasReturnvaluesIF.h"
-#include "fsfw/tasks/ExecutableObjectIF.h"
-#include "fsfw/tmtcpacket/SpacePacket.h"
-#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
-#include "linux/fsfwconfig/objects/systemObjectList.h"
-
-/**
- * @brief   An object of this class can be used to perform the software updates of the PLOC. The
- *          software update will be read from one of the SD cards, split into multiple space
- *          packets and sent to the PlocSupervisorHandler.
- *
- * @details The MPSoC has two boot memories (NVM0 and NVM1) where each stores two images (Partition
- *          A and Partition B)
- *
- * @author  J. Meier
- */
-class PlocUpdater : public SystemObject,
-                    public HasActionsIF,
-                    public ExecutableObjectIF,
-                    public HasReturnvaluesIF,
-                    public CommandsActionsIF {
- public:
-  static const ActionId_t UPDATE_A_UBOOT = 0;
-  static const ActionId_t UPDATE_A_BITSTREAM = 1;
-  static const ActionId_t UPDATE_A_LINUX = 2;
-  static const ActionId_t UPDATE_A_APP_SW = 3;
-  static const ActionId_t UPDATE_B_UBOOT = 4;
-  static const ActionId_t UPDATE_B_BITSTREAM = 5;
-  static const ActionId_t UPDATE_B_LINUX = 6;
-  static const ActionId_t UPDATE_B_APP_SW = 7;
-
-  PlocUpdater(object_id_t objectId);
-  virtual ~PlocUpdater();
-
-  ReturnValue_t performOperation(uint8_t operationCode = 0) override;
-  ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
-                              const uint8_t* data, size_t size);
-  MessageQueueId_t getCommandQueue() const;
-  ReturnValue_t initialize() override;
-  MessageQueueIF* getCommandQueuePtr() override;
-  void stepSuccessfulReceived(ActionId_t actionId, uint8_t step) override;
-  void stepFailedReceived(ActionId_t actionId, uint8_t step, ReturnValue_t returnCode) override;
-  void dataReceived(ActionId_t actionId, const uint8_t* data, uint32_t size) override;
-  void completionSuccessfulReceived(ActionId_t actionId) override;
-  void completionFailedReceived(ActionId_t actionId, ReturnValue_t returnCode) override;
-
- private:
-  static const uint8_t INTERFACE_ID = CLASS_ID::PLOC_UPDATER;
-
-  //! [EXPORT] : [COMMENT] Updater is already performing an update
-  static const ReturnValue_t UPDATER_BUSY = MAKE_RETURN_CODE(0xA0);
-  //! [EXPORT] : [COMMENT] Received update command with invalid path string (too long).
-  static const ReturnValue_t NAME_TOO_LONG = MAKE_RETURN_CODE(0xA1);
-  //! [EXPORT] : [COMMENT] Received command to initiate update but SD card with update image not
-  //! mounted.
-  static const ReturnValue_t SD_NOT_MOUNTED = MAKE_RETURN_CODE(0xA2);
-  //! [EXPORT] : [COMMENT] Update file received with update command does not exist.
-  static const ReturnValue_t FILE_NOT_EXISTS = MAKE_RETURN_CODE(0xA3);
-
-  static const uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PLOC_UPDATER;
-
-  //! [EXPORT] : [COMMENT] Try to read update file but the file does not exist.
-  //! P1: Indicates in which state the file read fails
-  //! P2: During the update transfer the second parameter gives information about the number of
-  //! already sent packets
-  static const Event UPDATE_FILE_NOT_EXISTS = MAKE_EVENT(0, severity::LOW);
-  //! [EXPORT] : [COMMENT] Failed to send command to supervisor handler
-  //! P1: Return value of CommandActionHelper::commandAction
-  //! P2: Action ID of command to send
-  static const Event ACTION_COMMANDING_FAILED = MAKE_EVENT(1, severity::LOW);
-  //! [EXPORT] : [COMMENT] Supervisor handler replied action message indicating a command execution
-  //! failure of the update available command
-  static const Event UPDATE_AVAILABLE_FAILED = MAKE_EVENT(2, severity::LOW);
-  //! [EXPORT] : [COMMENT] Supervisor handler failed to transfer an update space packet.
-  //! P1: Parameter holds the number of update packets already sent (inclusive the failed packet)
-  static const Event UPDATE_TRANSFER_FAILED = MAKE_EVENT(3, severity::LOW);
-  //! [EXPORT] : [COMMENT] Supervisor failed to execute the update verify command.
-  static const Event UPDATE_VERIFY_FAILED = MAKE_EVENT(4, severity::LOW);
-  //! [EXPORT] : [COMMENT] MPSoC update successful completed
-  static const Event UPDATE_FINISHED = MAKE_EVENT(5, severity::INFO);
-
-  static const uint32_t QUEUE_SIZE = config::PLOC_UPDATER_QUEUE_SIZE;
-  static const size_t MAX_PLOC_UPDATE_PATH = 50;
-  static const size_t SD_PREFIX_LENGTH = 8;
-  // Maximum size of update payload data per space packet (max size of space packet is 1024 bytes)
-  static const size_t MAX_SP_DATA = 1016;
-
-  static const uint32_t TOPBIT_32 = (1 << 31);
-  static const uint32_t POLYNOMIAL_32 = 0x04C11DB7;
-  static const uint32_t INITIAL_REMAINDER_32 = 0xFFFFFFFF;
-  static const uint32_t FINAL_XOR_VALUE_32 = 0xFFFFFFFF;
-
-  MessageQueueIF* commandQueue = nullptr;
-
-#ifdef XIPHOS_Q7S
-  SdCardManager* sdcMan = nullptr;
-#endif
-  CommandActionHelper commandActionHelper;
-
-  ActionHelper actionHelper;
-
-  enum class State : uint8_t {
-    IDLE,
-    UPDATE_AVAILABLE,
-    UPDATE_TRANSFER,
-    UPDATE_VERIFY,
-    COMMAND_EXECUTING
-  };
-
-  State state = State::IDLE;
-
-  ActionId_t pendingCommand = supv::NONE;
-
-  enum class Image : uint8_t { NONE, A, B };
-
-  Image image = Image::NONE;
-
-  enum class Partition : uint8_t { NONE, UBOOT, BITSTREAM, LINUX_OS, APP_SW };
-
-  Partition partition = Partition::NONE;
-
-  uint32_t packetsSent = 0;
-  uint32_t remainingPackets = 0;
-  // Number of packets required to transfer the update image
-  uint32_t numOfUpdatePackets = 0;
-
-  std::string updateFile;
-  uint32_t imageSize = 0;
-  uint32_t imageCrc = 0;
-
-  void readCommandQueue();
-  void doStateMachine();
-
-  /**
-   * @brief   Extracts the path and name of the update image from the service 8 command data.
-   */
-  ReturnValue_t getImageLocation(const uint8_t* data, size_t size);
-
-  ReturnValue_t checkNameLength(size_t size);
-
-  /**
-   * @brief   Prepares and sends update available command to PLOC supervisor handler.
-   */
-  void commandUpdateAvailable();
-
-  /**
-   * @brief   Prepares and sends and update packet to the PLOC supervisor handler.
-   */
-  void commandUpdatePacket();
-
-  /**
-   * @brief   Prepares and sends the update verification packet to the PLOC supervisor handler.
-   */
-  void commandUpdateVerify();
-
-  void calcImageCrc();
-
-  void adjustSequenceFlags(supv::UpdatePacket& packet);
-};
-
-#endif /* MISSION_DEVICES_PLOCUPDATER_H_ */
--- a/linux/devices/startracker/StrHelper.cpp
+++ b/linux/devices/startracker/StrHelper.cpp
@ -6,6 +6,7 @@
 #include "OBSWConfig.h"
 #include "fsfw/timemanager/Countdown.h"
 #include "linux/devices/devicedefinitions/StarTrackerDefinitions.h"
+#include "mission/utility/Filenaming.h"
 #include "mission/utility/ProgressPrinter.h"
 #include "mission/utility/Timestamp.h"

@ -181,7 +182,8 @@ ReturnValue_t StrHelper::performImageDownload() {
  struct DownloadActionRequest downloadReq;
  uint32_t size = 0;
  uint32_t retries = 0;
-  std::string image = makeFullFilename(downloadImage.path, downloadImage.filename);
+  std::string image = Filenaming::generateAbsoluteFilename(downloadImage.path,
+                                                           downloadImage.filename, timestamping);
  std::ofstream file(image, std::ios_base::out);
  if (not std::filesystem::exists(image)) {
    return FILE_CREATION_FAILED;
@ -400,7 +402,8 @@ ReturnValue_t StrHelper::performFlashRead() {
  uint32_t size = 0;
  uint32_t retries = 0;
  Timestamp timestamp;
-  std::string fullname = makeFullFilename(flashRead.path, flashRead.filename);
+  std::string fullname =
+      Filenaming::generateAbsoluteFilename(flashRead.path, flashRead.filename, timestamping);
  std::ofstream file(fullname, std::ios_base::app | std::ios_base::out);
  if (not std::filesystem::exists(fullname)) {
    return FILE_CREATION_FAILED;
@ -588,14 +591,3 @@ ReturnValue_t StrHelper::unlockAndEraseRegions(uint32_t from, uint32_t to) {
  }
  return result;
 }
-
-std::string StrHelper::makeFullFilename(std::string path, std::string filename) {
-  std::string image;
-  Timestamp timestamp;
-  if (timestamping) {
-    image = path + "/" + timestamp.str() + filename;
-  } else {
-    image = path + "/" + filename;
-  }
-  return image;
-}
--- a/linux/devices/startracker/StrHelper.h
+++ b/linux/devices/startracker/StrHelper.h
@ -173,8 +173,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
  static const size_t SIZE_IMAGE_PART = 1024;
  static const uint32_t FLASH_REGION_SIZE = 0x20000;

-  class ImageDownload {
-   public:
+  struct ImageDownload {
    static const uint32_t LAST_POSITION = 4095;
  };

@ -199,15 +198,13 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu

  BinarySemaphore semaphore;

-  class UploadImage {
-   public:
+  struct UploadImage {
    // Name including absolute path of image to upload
    std::string uploadFile;
  };
  UploadImage uploadImage;

-  class DownloadImage {
-   public:
+  struct DownloadImage {
    // Path where the downloaded image will be stored
    std::string path;
    // Default name of downloaded image, can be changed via command
@ -215,8 +212,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
  };
  DownloadImage downloadImage;

-  class FlashWrite {
-   public:
+  struct FlashWrite {
    // File which contains data to write when executing the flash write command
    std::string fullname;
    // The first region to write to
@ -229,8 +225,7 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
  };
  FlashWrite flashWrite;

-  class FlashRead {
-   public:
+  struct FlashRead {
    // Path where the file containing the read data will be stored
    std::string path = "";
    // Default name of file containing the data read from flash, can be changed via command
@ -349,16 +344,6 @@ class StrHelper : public SystemObject, public ExecutableObjectIF, public HasRetu
   *
   */
  ReturnValue_t unlockAndEraseRegions(uint32_t from, uint32_t to);
-
-  /**
-   * @brief Creates full filename either with timestamp or without
-   *
-   * @param path    Path where to create the file
-   * @param filename    Name fo the file
-   *
-   * @return    Full filename
-   */
-  std::string makeFullFilename(std::string path, std::string filename);
 };

 #endif /* BSP_Q7S_DEVICES_STRHELPER_H_ */
--- a/linux/fsfwconfig/events/subsystemIdRanges.h
+++ b/linux/fsfwconfig/events/subsystemIdRanges.h
@ -13,7 +13,7 @@
 namespace SUBSYSTEM_ID {
 enum : uint8_t {
  SUBSYSTEM_ID_START = COMMON_SUBSYSTEM_ID_END,
-  CORE = 136,
+  CORE = 137,
 };
 }

--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 187 translations.
+ * @brief    Auto-generated event translation file. Contains 199 translations.
 * @details
- * Generated on: 2022-05-03 16:32:00
+ * Generated on: 2022-05-06 19:43:59
 */
 #include "translateEvents.h"

@ -102,7 +102,7 @@ const char *MEMORY_READ_RPT_CRC_FAILURE_STRING = "MEMORY_READ_RPT_CRC_FAILURE";
 const char *ACK_FAILURE_STRING = "ACK_FAILURE";
 const char *EXE_FAILURE_STRING = "EXE_FAILURE";
 const char *MPSOC_HANDLER_CRC_FAILURE_STRING = "MPSOC_HANDLER_CRC_FAILURE";
-const char *MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING = "MPSOC_HANDLER_SEQ_CNT_MISMATCH";
+const char *MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH_STRING = "MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH";
 const char *MPSOC_SHUTDOWN_FAILED_STRING = "MPSOC_SHUTDOWN_FAILED";
 const char *SELF_TEST_I2C_FAILURE_STRING = "SELF_TEST_I2C_FAILURE";
 const char *SELF_TEST_SPI_FAILURE_STRING = "SELF_TEST_SPI_FAILURE";
@ -119,14 +119,9 @@ const char *SUPV_MEMORY_READ_RPT_CRC_FAILURE_STRING = "SUPV_MEMORY_READ_RPT_CRC_
 const char *SUPV_ACK_FAILURE_STRING = "SUPV_ACK_FAILURE";
 const char *SUPV_EXE_FAILURE_STRING = "SUPV_EXE_FAILURE";
 const char *SUPV_CRC_FAILURE_EVENT_STRING = "SUPV_CRC_FAILURE_EVENT";
+const char *SUPV_MPSOC_SHUWDOWN_BUILD_FAILED_STRING = "SUPV_MPSOC_SHUWDOWN_BUILD_FAILED";
 const char *SANITIZATION_FAILED_STRING = "SANITIZATION_FAILED";
 const char *MOUNTED_SD_CARD_STRING = "MOUNTED_SD_CARD";
-const char *UPDATE_FILE_NOT_EXISTS_STRING = "UPDATE_FILE_NOT_EXISTS";
-const char *ACTION_COMMANDING_FAILED_STRING = "ACTION_COMMANDING_FAILED";
-const char *UPDATE_AVAILABLE_FAILED_STRING = "UPDATE_AVAILABLE_FAILED";
-const char *UPDATE_TRANSFER_FAILED_STRING = "UPDATE_TRANSFER_FAILED";
-const char *UPDATE_VERIFY_FAILED_STRING = "UPDATE_VERIFY_FAILED";
-const char *UPDATE_FINISHED_STRING = "UPDATE_FINISHED";
 const char *SEND_MRAM_DUMP_FAILED_STRING = "SEND_MRAM_DUMP_FAILED";
 const char *MRAM_DUMP_FAILED_STRING = "MRAM_DUMP_FAILED";
 const char *MRAM_DUMP_FINISHED_STRING = "MRAM_DUMP_FINISHED";
@ -153,15 +148,15 @@ const char *STR_HELPER_SENDING_PACKET_FAILED_STRING = "STR_HELPER_SENDING_PACKET
 const char *STR_HELPER_REQUESTING_MSG_FAILED_STRING = "STR_HELPER_REQUESTING_MSG_FAILED";
 const char *MPSOC_FLASH_WRITE_FAILED_STRING = "MPSOC_FLASH_WRITE_FAILED";
 const char *MPSOC_FLASH_WRITE_SUCCESSFUL_STRING = "MPSOC_FLASH_WRITE_SUCCESSFUL";
-const char *SENDING_COMMAND_FAILED_STRING = "SENDING_COMMAND_FAILED";
+const char *MPSOC_SENDING_COMMAND_FAILED_STRING = "MPSOC_SENDING_COMMAND_FAILED";
 const char *MPSOC_HELPER_REQUESTING_REPLY_FAILED_STRING = "MPSOC_HELPER_REQUESTING_REPLY_FAILED";
 const char *MPSOC_HELPER_READING_REPLY_FAILED_STRING = "MPSOC_HELPER_READING_REPLY_FAILED";
-const char *MISSING_ACK_STRING = "MISSING_ACK";
-const char *MISSING_EXE_STRING = "MISSING_EXE";
-const char *ACK_FAILURE_REPORT_STRING = "ACK_FAILURE_REPORT";
-const char *EXE_FAILURE_REPORT_STRING = "EXE_FAILURE_REPORT";
-const char *ACK_INVALID_APID_STRING = "ACK_INVALID_APID";
-const char *EXE_INVALID_APID_STRING = "EXE_INVALID_APID";
+const char *MPSOC_MISSING_ACK_STRING = "MPSOC_MISSING_ACK";
+const char *MPSOC_MISSING_EXE_STRING = "MPSOC_MISSING_EXE";
+const char *MPSOC_ACK_FAILURE_REPORT_STRING = "MPSOC_ACK_FAILURE_REPORT";
+const char *MPSOC_EXE_FAILURE_REPORT_STRING = "MPSOC_EXE_FAILURE_REPORT";
+const char *MPSOC_ACK_INVALID_APID_STRING = "MPSOC_ACK_INVALID_APID";
+const char *MPSOC_EXE_INVALID_APID_STRING = "MPSOC_EXE_INVALID_APID";
 const char *MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING = "MPSOC_HELPER_SEQ_CNT_MISMATCH";
 const char *TRANSITION_BACK_TO_OFF_STRING = "TRANSITION_BACK_TO_OFF";
 const char *NEG_V_OUT_OF_BOUNDS_STRING = "NEG_V_OUT_OF_BOUNDS";
@ -184,6 +179,23 @@ const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *P60_BOOT_COUNT_STRING = "P60_BOOT_COUNT";
 const char *BATT_MODE_STRING = "BATT_MODE";
 const char *BATT_MODE_CHANGED_STRING = "BATT_MODE_CHANGED";
+const char *SUPV_UPDATE_FAILED_STRING = "SUPV_UPDATE_FAILED";
+const char *SUPV_UPDATE_SUCCESSFUL_STRING = "SUPV_UPDATE_SUCCESSFUL";
+const char *TERMINATED_UPDATE_PROCEDURE_STRING = "TERMINATED_UPDATE_PROCEDURE";
+const char *SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING = "SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL";
+const char *SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING = "SUPV_EVENT_BUFFER_REQUEST_FAILED";
+const char *SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING = "SUPV_EVENT_BUFFER_REQUEST_TERMINATED";
+const char *SUPV_SENDING_COMMAND_FAILED_STRING = "SUPV_SENDING_COMMAND_FAILED";
+const char *SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING = "SUPV_HELPER_REQUESTING_REPLY_FAILED";
+const char *SUPV_HELPER_READING_REPLY_FAILED_STRING = "SUPV_HELPER_READING_REPLY_FAILED";
+const char *SUPV_MISSING_ACK_STRING = "SUPV_MISSING_ACK";
+const char *SUPV_MISSING_EXE_STRING = "SUPV_MISSING_EXE";
+const char *SUPV_ACK_FAILURE_REPORT_STRING = "SUPV_ACK_FAILURE_REPORT";
+const char *SUPV_EXE_FAILURE_REPORT_STRING = "SUPV_EXE_FAILURE_REPORT";
+const char *SUPV_ACK_INVALID_APID_STRING = "SUPV_ACK_INVALID_APID";
+const char *SUPV_EXE_INVALID_APID_STRING = "SUPV_EXE_INVALID_APID";
+const char *ACK_RECEPTION_FAILURE_STRING = "ACK_RECEPTION_FAILURE";
+const char *EXE_RECEPTION_FAILURE_STRING = "EXE_RECEPTION_FAILURE";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@ -386,7 +398,7 @@ const char *translateEvents(Event event) {
    case (11604):
      return MPSOC_HANDLER_CRC_FAILURE_STRING;
    case (11605):
-      return MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING;
+      return MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH_STRING;
    case (11606):
      return MPSOC_SHUTDOWN_FAILED_STRING;
    case (11701):
@ -419,22 +431,12 @@ const char *translateEvents(Event event) {
      return SUPV_EXE_FAILURE_STRING;
    case (12004):
      return SUPV_CRC_FAILURE_EVENT_STRING;
+    case (12005):
+      return SUPV_MPSOC_SHUWDOWN_BUILD_FAILED_STRING;
    case (12100):
      return SANITIZATION_FAILED_STRING;
    case (12101):
      return MOUNTED_SD_CARD_STRING;
-    case (12200):
-      return UPDATE_FILE_NOT_EXISTS_STRING;
-    case (12201):
-      return ACTION_COMMANDING_FAILED_STRING;
-    case (12202):
-      return UPDATE_AVAILABLE_FAILED_STRING;
-    case (12203):
-      return UPDATE_TRANSFER_FAILED_STRING;
-    case (12204):
-      return UPDATE_VERIFY_FAILED_STRING;
-    case (12205):
-      return UPDATE_FINISHED_STRING;
    case (12300):
      return SEND_MRAM_DUMP_FAILED_STRING;
    case (12301):
@ -488,23 +490,23 @@ const char *translateEvents(Event event) {
    case (12601):
      return MPSOC_FLASH_WRITE_SUCCESSFUL_STRING;
    case (12602):
-      return SENDING_COMMAND_FAILED_STRING;
+      return MPSOC_SENDING_COMMAND_FAILED_STRING;
    case (12603):
      return MPSOC_HELPER_REQUESTING_REPLY_FAILED_STRING;
    case (12604):
      return MPSOC_HELPER_READING_REPLY_FAILED_STRING;
    case (12605):
-      return MISSING_ACK_STRING;
+      return MPSOC_MISSING_ACK_STRING;
    case (12606):
-      return MISSING_EXE_STRING;
+      return MPSOC_MISSING_EXE_STRING;
    case (12607):
-      return ACK_FAILURE_REPORT_STRING;
+      return MPSOC_ACK_FAILURE_REPORT_STRING;
    case (12608):
-      return EXE_FAILURE_REPORT_STRING;
+      return MPSOC_EXE_FAILURE_REPORT_STRING;
    case (12609):
-      return ACK_INVALID_APID_STRING;
+      return MPSOC_ACK_INVALID_APID_STRING;
    case (12610):
-      return EXE_INVALID_APID_STRING;
+      return MPSOC_EXE_INVALID_APID_STRING;
    case (12611):
      return MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING;
    case (12700):
@ -550,12 +552,46 @@ const char *translateEvents(Event event) {
    case (13202):
      return BATT_MODE_CHANGED_STRING;
    case (13600):
-      return ALLOC_FAILURE_STRING;
+      return SUPV_UPDATE_FAILED_STRING;
    case (13601):
-      return REBOOT_SW_STRING;
+      return SUPV_UPDATE_SUCCESSFUL_STRING;
    case (13602):
-      return REBOOT_MECHANISM_TRIGGERED_STRING;
+      return TERMINATED_UPDATE_PROCEDURE_STRING;
    case (13603):
+      return SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL_STRING;
+    case (13604):
+      return SUPV_EVENT_BUFFER_REQUEST_FAILED_STRING;
+    case (13605):
+      return SUPV_EVENT_BUFFER_REQUEST_TERMINATED_STRING;
+    case (13606):
+      return SUPV_SENDING_COMMAND_FAILED_STRING;
+    case (13607):
+      return SUPV_HELPER_REQUESTING_REPLY_FAILED_STRING;
+    case (13608):
+      return SUPV_HELPER_READING_REPLY_FAILED_STRING;
+    case (13609):
+      return SUPV_MISSING_ACK_STRING;
+    case (13610):
+      return SUPV_MISSING_EXE_STRING;
+    case (13611):
+      return SUPV_ACK_FAILURE_REPORT_STRING;
+    case (13612):
+      return SUPV_EXE_FAILURE_REPORT_STRING;
+    case (13613):
+      return SUPV_ACK_INVALID_APID_STRING;
+    case (13614):
+      return SUPV_EXE_INVALID_APID_STRING;
+    case (13615):
+      return ACK_RECEPTION_FAILURE_STRING;
+    case (13616):
+      return EXE_RECEPTION_FAILURE_STRING;
+    case (13700):
+      return ALLOC_FAILURE_STRING;
+    case (13701):
+      return REBOOT_SW_STRING;
+    case (13702):
+      return REBOOT_MECHANISM_TRIGGERED_STRING;
+    case (13703):
      return REBOOT_HW_STRING;
    default:
      return "UNKNOWN_EVENT";
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@ -1,8 +1,8 @@
 /**
 * @brief  Auto-generated object translation file.
 * @details
- * Contains 117 translations.
- * Generated on: 2022-05-03 16:32:00
+ * Contains 116 translations.
+ * Generated on: 2022-05-06 19:43:55
 */
 #include "translateObjects.h"

@ -12,18 +12,18 @@ const char *ACS_CONTROLLER_STRING = "ACS_CONTROLLER";
 const char *THERMAL_CONTROLLER_STRING = "THERMAL_CONTROLLER";
 const char *MGM_0_LIS3_HANDLER_STRING = "MGM_0_LIS3_HANDLER";
 const char *GYRO_0_ADIS_HANDLER_STRING = "GYRO_0_ADIS_HANDLER";
-const char *SUS_0_STRING = "SUS_0";
-const char *SUS_1_STRING = "SUS_1";
-const char *SUS_2_STRING = "SUS_2";
-const char *SUS_3_STRING = "SUS_3";
-const char *SUS_4_STRING = "SUS_4";
-const char *SUS_5_STRING = "SUS_5";
-const char *SUS_6_STRING = "SUS_6";
-const char *SUS_7_STRING = "SUS_7";
-const char *SUS_8_STRING = "SUS_8";
-const char *SUS_9_STRING = "SUS_9";
-const char *SUS_10_STRING = "SUS_10";
-const char *SUS_11_STRING = "SUS_11";
+const char *SUS_0_N_LOC_XFYFZM_PT_XF_STRING = "SUS_0_N_LOC_XFYFZM_PT_XF";
+const char *SUS_1_N_LOC_XBYFZM_PT_XB_STRING = "SUS_1_N_LOC_XBYFZM_PT_XB";
+const char *SUS_2_N_LOC_XFYBZB_PT_YB_STRING = "SUS_2_N_LOC_XFYBZB_PT_YB";
+const char *SUS_3_N_LOC_XFYBZF_PT_YF_STRING = "SUS_3_N_LOC_XFYBZF_PT_YF";
+const char *SUS_4_N_LOC_XMYFZF_PT_ZF_STRING = "SUS_4_N_LOC_XMYFZF_PT_ZF";
+const char *SUS_5_N_LOC_XFYMZB_PT_ZB_STRING = "SUS_5_N_LOC_XFYMZB_PT_ZB";
+const char *SUS_6_R_LOC_XFYBZM_PT_XF_STRING = "SUS_6_R_LOC_XFYBZM_PT_XF";
+const char *SUS_7_R_LOC_XBYBZM_PT_XB_STRING = "SUS_7_R_LOC_XBYBZM_PT_XB";
+const char *SUS_8_R_LOC_XBYBZB_PT_YB_STRING = "SUS_8_R_LOC_XBYBZB_PT_YB";
+const char *SUS_9_R_LOC_XBYBZB_PT_YF_STRING = "SUS_9_R_LOC_XBYBZB_PT_YF";
+const char *SUS_10_N_LOC_XMYBZF_PT_ZF_STRING = "SUS_10_N_LOC_XMYBZF_PT_ZF";
+const char *SUS_11_R_LOC_XBYMZB_PT_ZB_STRING = "SUS_11_R_LOC_XBYMZB_PT_ZB";
 const char *RW1_STRING = "RW1";
 const char *MGM_1_RM3100_HANDLER_STRING = "MGM_1_RM3100_HANDLER";
 const char *GYRO_1_L3G_HANDLER_STRING = "GYRO_1_L3G_HANDLER";
@ -45,7 +45,6 @@ const char *ACU_HANDLER_STRING = "ACU_HANDLER";
 const char *BPX_BATT_HANDLER_STRING = "BPX_BATT_HANDLER";
 const char *PLPCDU_HANDLER_STRING = "PLPCDU_HANDLER";
 const char *RAD_SENSOR_STRING = "RAD_SENSOR";
-const char *PLOC_UPDATER_STRING = "PLOC_UPDATER";
 const char *PLOC_MEMORY_DUMPER_STRING = "PLOC_MEMORY_DUMPER";
 const char *STR_HELPER_STRING = "STR_HELPER";
 const char *PLOC_MPSOC_HELPER_STRING = "PLOC_MPSOC_HELPER";
@ -56,22 +55,22 @@ const char *SOLAR_ARRAY_DEPL_HANDLER_STRING = "SOLAR_ARRAY_DEPL_HANDLER";
 const char *HEATER_HANDLER_STRING = "HEATER_HANDLER";
 const char *TMP1075_HANDLER_1_STRING = "TMP1075_HANDLER_1";
 const char *TMP1075_HANDLER_2_STRING = "TMP1075_HANDLER_2";
-const char *RTD_IC_3_STRING = "RTD_IC_3";
-const char *RTD_IC_4_STRING = "RTD_IC_4";
-const char *RTD_IC_5_STRING = "RTD_IC_5";
-const char *RTD_IC_6_STRING = "RTD_IC_6";
-const char *RTD_IC_7_STRING = "RTD_IC_7";
-const char *RTD_IC_8_STRING = "RTD_IC_8";
-const char *RTD_IC_9_STRING = "RTD_IC_9";
-const char *RTD_IC_10_STRING = "RTD_IC_10";
-const char *RTD_IC_11_STRING = "RTD_IC_11";
-const char *RTD_IC_12_STRING = "RTD_IC_12";
-const char *RTD_IC_13_STRING = "RTD_IC_13";
-const char *RTD_IC_14_STRING = "RTD_IC_14";
-const char *RTD_IC_15_STRING = "RTD_IC_15";
-const char *RTD_IC_16_STRING = "RTD_IC_16";
-const char *RTD_IC_17_STRING = "RTD_IC_17";
-const char *RTD_IC_18_STRING = "RTD_IC_18";
+const char *RTD_0_IC3_PLOC_HEATSPREADER_STRING = "RTD_0_IC3_PLOC_HEATSPREADER";
+const char *RTD_1_IC4_PLOC_MISSIONBOARD_STRING = "RTD_1_IC4_PLOC_MISSIONBOARD";
+const char *RTD_2_IC5_4K_CAMERA_STRING = "RTD_2_IC5_4K_CAMERA";
+const char *RTD_3_IC6_DAC_HEATSPREADER_STRING = "RTD_3_IC6_DAC_HEATSPREADER";
+const char *RTD_4_IC7_STARTRACKER_STRING = "RTD_4_IC7_STARTRACKER";
+const char *RTD_5_IC8_RW1_MX_MY_STRING = "RTD_5_IC8_RW1_MX_MY";
+const char *RTD_6_IC9_DRO_STRING = "RTD_6_IC9_DRO";
+const char *RTD_7_IC10_SCEX_STRING = "RTD_7_IC10_SCEX";
+const char *RTD_8_IC11_X8_STRING = "RTD_8_IC11_X8";
+const char *RTD_9_IC12_HPA_STRING = "RTD_9_IC12_HPA";
+const char *RTD_10_IC13_PL_TX_STRING = "RTD_10_IC13_PL_TX";
+const char *RTD_11_IC14_MPA_STRING = "RTD_11_IC14_MPA";
+const char *RTD_12_IC15_ACU_STRING = "RTD_12_IC15_ACU";
+const char *RTD_13_IC16_PLPCDU_HEATSPREADER_STRING = "RTD_13_IC16_PLPCDU_HEATSPREADER";
+const char *RTD_14_IC17_TCS_BOARD_STRING = "RTD_14_IC17_TCS_BOARD";
+const char *RTD_15_IC18_IMTQ_STRING = "RTD_15_IC18_IMTQ";
 const char *SYRLINKS_HK_HANDLER_STRING = "SYRLINKS_HK_HANDLER";
 const char *ARDUINO_COM_IF_STRING = "ARDUINO_COM_IF";
 const char *GPIO_IF_STRING = "GPIO_IF";
@ -139,29 +138,29 @@ const char *translateObject(object_id_t object) {
    case 0x44120010:
      return GYRO_0_ADIS_HANDLER_STRING;
    case 0x44120032:
-      return SUS_0_STRING;
+      return SUS_0_N_LOC_XFYFZM_PT_XF_STRING;
    case 0x44120033:
-      return SUS_1_STRING;
+      return SUS_1_N_LOC_XBYFZM_PT_XB_STRING;
    case 0x44120034:
-      return SUS_2_STRING;
+      return SUS_2_N_LOC_XFYBZB_PT_YB_STRING;
    case 0x44120035:
-      return SUS_3_STRING;
+      return SUS_3_N_LOC_XFYBZF_PT_YF_STRING;
    case 0x44120036:
-      return SUS_4_STRING;
+      return SUS_4_N_LOC_XMYFZF_PT_ZF_STRING;
    case 0x44120037:
-      return SUS_5_STRING;
+      return SUS_5_N_LOC_XFYMZB_PT_ZB_STRING;
    case 0x44120038:
-      return SUS_6_STRING;
+      return SUS_6_R_LOC_XFYBZM_PT_XF_STRING;
    case 0x44120039:
-      return SUS_7_STRING;
+      return SUS_7_R_LOC_XBYBZM_PT_XB_STRING;
    case 0x44120040:
-      return SUS_8_STRING;
+      return SUS_8_R_LOC_XBYBZB_PT_YB_STRING;
    case 0x44120041:
-      return SUS_9_STRING;
+      return SUS_9_R_LOC_XBYBZB_PT_YF_STRING;
    case 0x44120042:
-      return SUS_10_STRING;
+      return SUS_10_N_LOC_XMYBZF_PT_ZF_STRING;
    case 0x44120043:
-      return SUS_11_STRING;
+      return SUS_11_R_LOC_XBYMZB_PT_ZB_STRING;
    case 0x44120047:
      return RW1_STRING;
    case 0x44120107:
@ -204,8 +203,6 @@ const char *translateObject(object_id_t object) {
      return PLPCDU_HANDLER_STRING;
    case 0x443200A5:
      return RAD_SENSOR_STRING;
-    case 0x44330000:
-      return PLOC_UPDATER_STRING;
    case 0x44330001:
      return PLOC_MEMORY_DUMPER_STRING;
    case 0x44330002:
@ -227,37 +224,37 @@ const char *translateObject(object_id_t object) {
    case 0x44420005:
      return TMP1075_HANDLER_2_STRING;
    case 0x44420016:
-      return RTD_IC_3_STRING;
+      return RTD_0_IC3_PLOC_HEATSPREADER_STRING;
    case 0x44420017:
-      return RTD_IC_4_STRING;
+      return RTD_1_IC4_PLOC_MISSIONBOARD_STRING;
    case 0x44420018:
-      return RTD_IC_5_STRING;
+      return RTD_2_IC5_4K_CAMERA_STRING;
    case 0x44420019:
-      return RTD_IC_6_STRING;
+      return RTD_3_IC6_DAC_HEATSPREADER_STRING;
    case 0x44420020:
-      return RTD_IC_7_STRING;
+      return RTD_4_IC7_STARTRACKER_STRING;
    case 0x44420021:
-      return RTD_IC_8_STRING;
+      return RTD_5_IC8_RW1_MX_MY_STRING;
    case 0x44420022:
-      return RTD_IC_9_STRING;
+      return RTD_6_IC9_DRO_STRING;
    case 0x44420023:
-      return RTD_IC_10_STRING;
+      return RTD_7_IC10_SCEX_STRING;
    case 0x44420024:
-      return RTD_IC_11_STRING;
+      return RTD_8_IC11_X8_STRING;
    case 0x44420025:
-      return RTD_IC_12_STRING;
+      return RTD_9_IC12_HPA_STRING;
    case 0x44420026:
-      return RTD_IC_13_STRING;
+      return RTD_10_IC13_PL_TX_STRING;
    case 0x44420027:
-      return RTD_IC_14_STRING;
+      return RTD_11_IC14_MPA_STRING;
    case 0x44420028:
-      return RTD_IC_15_STRING;
+      return RTD_12_IC15_ACU_STRING;
    case 0x44420029:
-      return RTD_IC_16_STRING;
+      return RTD_13_IC16_PLPCDU_HEATSPREADER_STRING;
    case 0x44420030:
-      return RTD_IC_17_STRING;
+      return RTD_14_IC17_TCS_BOARD_STRING;
    case 0x44420031:
-      return RTD_IC_18_STRING;
+      return RTD_15_IC18_IMTQ_STRING;
    case 0x445300A3:
      return SYRLINKS_HK_HANDLER_STRING;
    case 0x49000000:
--- a/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
+++ b/linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp
@ -586,11 +586,8 @@ ReturnValue_t pst::pstUart(FixedTimeslotTaskIF *thisSequence) {
  thisSequence->addSlot(objects::PLOC_MPSOC_HANDLER, length * 0.8, DeviceHandlerIF::GET_READ);
 #endif

-#ifdef XIPHOS_Q7S
-  thisSequence->addSlot(objects::PLOC_UPDATER, length * 0, DeviceHandlerIF::PERFORM_OPERATION);
  thisSequence->addSlot(objects::PLOC_MEMORY_DUMPER, length * 0,
                        DeviceHandlerIF::PERFORM_OPERATION);
-#endif
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
  thisSequence->addSlot(objects::PLOC_SUPERVISOR_HANDLER, length * 0,
                        DeviceHandlerIF::PERFORM_OPERATION);
--- a/mission/devices/IMTQHandler.h
+++ b/mission/devices/IMTQHandler.h
@ -99,6 +99,8 @@ class IMTQHandler : public DeviceHandlerBase {
  IMTQ::PosZSelfTestSet posZselfTestDataset;
  IMTQ::NegZSelfTestSet negZselfTestDataset;

+  power::Switch_t switcher = power::NO_SWITCH;
+
  uint8_t commandBuffer[IMTQ::MAX_COMMAND_SIZE];
  bool goToNormalMode = false;
  bool debugMode = false;
@ -116,7 +118,6 @@ class IMTQHandler : public DeviceHandlerBase {

  StartupStep startupStep = StartupStep::COMMAND_SELF_TEST;

-  power::Switch_t switcher = power::NO_SWITCH;
  bool selfTestPerformed = false;

  /**
--- a/mission/tmtc/CCSDSHandler.cpp
+++ b/mission/tmtc/CCSDSHandler.cpp
@ -22,7 +22,7 @@ CCSDSHandler::CCSDSHandler(object_id_t objectId, object_id_t ptmeId, object_id_t
      gpioIF(gpioIF),
      enTxClock(enTxClock),
      enTxData(enTxData),
-      TRANSMITTER_TIMEOUT(transmitterTimeout) {
+      transmitterTimeout(transmitterTimeout) {
  commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
  auto mqArgs = MqArgs(objectId, static_cast<void*>(this));
  eventQueue =
@ -312,7 +312,7 @@ void CCSDSHandler::enableTransmit() {
    // Transmitter already enabled
    return;
  }
-  transmitterCountdown.setTimeout(TRANSMITTER_TIMEOUT);
+  transmitterCountdown.setTimeout(transmitterTimeout);
 #ifndef TE0720_1CFA
  gpioIF->pullHigh(enTxClock);
  gpioIF->pullHigh(enTxData);
--- a/mission/tmtc/CCSDSHandler.h
+++ b/mission/tmtc/CCSDSHandler.h
@ -133,9 +133,9 @@ class CCSDSHandler : public SystemObject,
  gpioId_t enTxClock = gpio::NO_GPIO;
  gpioId_t enTxData = gpio::NO_GPIO;

-  // syrlinks must not be transmitting more than 15 minutes (according to datasheet)
-  // Value can be configured via CTOR argument to allow test setups
-  const uint32_t TRANSMITTER_TIMEOUT = 900000;  // 900000 ms = 15 min
+  // Syrlinks must not be transmitting more than 15 minutes (according to datasheet)
+  // Value initialized by constructor argument
+  const uint32_t transmitterTimeout = 0;

  // Countdown to disable transmitter after 15 minutes
  Countdown transmitterCountdown;
--- a/mission/tmtc/VirtualChannel.h
+++ b/mission/tmtc/VirtualChannel.h
@ -46,7 +46,7 @@ class VirtualChannel : public AcceptsTelemetryIF, public HasReturnvaluesIF {
 private:
  PtmeIF* ptme = nullptr;
  MessageQueueIF* tmQueue = nullptr;
-  uint8_t vcId;
+  uint8_t vcId = 0;

  bool linkIsUp = false;

--- a/mission/utility/CMakeLists.txt
+++ b/mission/utility/CMakeLists.txt
@ -2,6 +2,7 @@ target_sources(${LIB_EIVE_MISSION} PRIVATE
 	TmFunnel.cpp
 	Timestamp.cpp
 	ProgressPrinter.cpp
+	Filenaming.cpp
 )


--- a/mission/utility/Filenaming.cpp
+++ b/mission/utility/Filenaming.cpp
@ -0,0 +1,17 @@
+#include "Filenaming.h"
+
+#include "Timestamp.h"
+
+Filenaming::Filenaming() {}
+
+std::string Filenaming::generateAbsoluteFilename(std::string path, std::string filename,
+                                                 bool addTimestamp) {
+  std::string absoluteName;
+  Timestamp timestamp;
+  if (addTimestamp) {
+    absoluteName = path + "/" + timestamp.str() + filename;
+  } else {
+    absoluteName = path + "/" + filename;
+  }
+  return absoluteName;
+}
--- a/mission/utility/Filenaming.h
+++ b/mission/utility/Filenaming.h
@ -0,0 +1,28 @@
+#ifndef MISSION_UTILITY_FILENAMING_H_
+#define MISSION_UTILITY_FILENAMING_H_
+
+#include <string>
+
+/**
+ * @brief Static functions related to file name creation
+ */
+class Filenaming {
+ public:
+  /**
+   * @brief Creates the absolute name of a file by merging the path name, the filename and adding
+   *        an optional timestamp.
+   *
+   * @param path
+   * @param filename
+   * @param addTimestap Set to true if timestamp should be considered in name
+   *
+   * @return The absolute filename
+   */
+  static std::string generateAbsoluteFilename(std::string path, std::string filename,
+                                              bool addTimestamp);
+
+ private:
+  Filenaming();
+};
+
+#endif /* MISSION_UTILITY_FILENAMING_H_ */
--- a/mission/utility/ProgressPrinter.cpp
+++ b/mission/utility/ProgressPrinter.cpp
@ -1,16 +1,19 @@
 #include "ProgressPrinter.h"

+#include <iomanip>
+
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"

-ProgressPrinter::ProgressPrinter(std::string name, uint32_t numSteps)
-    : name(name), numSteps(numSteps) {}
+ProgressPrinter::ProgressPrinter(std::string name, uint32_t numSteps, float percentageResolution)
+    : name(name), numSteps(numSteps), percentageResolution(percentageResolution) {}

 ProgressPrinter::~ProgressPrinter() {}

 void ProgressPrinter::print(uint32_t currentStep) {
  float progressInPercent = static_cast<float>(currentStep) / static_cast<float>(numSteps) * 100;
-  if (static_cast<uint32_t>(progressInPercent) >= nextProgressPrint) {
-    sif::info << name << " progress: " << progressInPercent << " %" << std::endl;
-    nextProgressPrint += FIVE_PERCENT;
+  if (progressInPercent >= nextProgressPrint) {
+    sif::info << name << " progress: " << std::setprecision(4) << progressInPercent << " %"
+              << std::endl;
+    nextProgressPrint += percentageResolution;
  }
 }
--- a/mission/utility/ProgressPrinter.h
+++ b/mission/utility/ProgressPrinter.h
@ -10,13 +10,19 @@
 */
 class ProgressPrinter {
 public:
+  static constexpr float HALF_PERCENT = 0.5;
+  static constexpr float ONE_PERCENT = 1;
+  static constexpr float FIVE_PERCENT = 5;
+
  /**
   * @brief Constructor
   *
-   * @param name       Name of the process to monitor
-   * @param numSteps   Number of steps to execute
+   * @param name                   Name of the process to monitor
+   * @param numSteps               Number of steps to execute
+   * @param percentageResolution   Distance between printed percentage steps. E.g. 5 means that
+   *                               a printout will be generated after 0%, 5%, 10% etc.
   */
-  ProgressPrinter(std::string name, uint32_t numSteps);
+  ProgressPrinter(std::string name, uint32_t numSteps, float percentageResolution = FIVE_PERCENT);
  virtual ~ProgressPrinter();

  /**
@ -27,11 +33,10 @@ class ProgressPrinter {
  void print(uint32_t step);

 private:
-  static constexpr uint32_t FIVE_PERCENT = 5;
-
  std::string name = "";
  uint32_t numSteps = 0;
-  uint32_t nextProgressPrint = 0;
+  float nextProgressPrint = 0;
+  float percentageResolution = 0;
 };

 #endif /* MISSION_UTILITY_PROGRESSPRINTER_H_ */
--- a/test/gpio/DummyGpioIF.cpp
+++ b/test/gpio/DummyGpioIF.cpp
@ -10,7 +10,7 @@ ReturnValue_t DummyGpioIF::pullHigh(gpioId_t gpioId) { return RETURN_OK; }

 ReturnValue_t DummyGpioIF::pullLow(gpioId_t gpioId) { return RETURN_OK; }

-ReturnValue_t DummyGpioIF::readGpio(gpioId_t gpioId, int* gpioState) {
-  *gpioState = 0;
+ReturnValue_t DummyGpioIF::readGpio(gpioId_t gpioId, gpio::Levels& gpioState) {
+  gpioState = gpio::Levels::LOW;
  return RETURN_OK;
 }
--- a/test/gpio/DummyGpioIF.h
+++ b/test/gpio/DummyGpioIF.h
@ -10,7 +10,7 @@ class DummyGpioIF : public GpioIF {
  virtual ReturnValue_t addGpios(GpioCookie* cookie);
  virtual ReturnValue_t pullHigh(gpioId_t gpioId);
  virtual ReturnValue_t pullLow(gpioId_t gpioId);
-  virtual ReturnValue_t readGpio(gpioId_t gpioId, int* gpioState);
+  virtual ReturnValue_t readGpio(gpioId_t gpioId, gpio::Levels& gpioState);
 };

 #endif /* TEST_GPIO_DUMMYGPIOIF_H_ */
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c5862579348974882e23d39d0a6d9b2844159b99
+Subproject commit 1e25b08e40db28103b91814f7de5a47dae5b9e76