From 4e3fa54ae25f54dde23b0669737dbb20d86f3cce Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 12:22:08 +0200
Subject: [PATCH 01/12] split P60 dock HK into core and aux HK

---
 linux/devices/GPSHyperionLinuxController.cpp  |   1 -
 mission/devices/ACUHandler.cpp                |   9 +-
 mission/devices/ACUHandler.h                  |   2 +
 mission/devices/GomspaceDeviceHandler.cpp     |  18 +-
 mission/devices/GomspaceDeviceHandler.h       |   4 +-
 mission/devices/P60DockHandler.cpp            | 175 +++++++++---------
 mission/devices/P60DockHandler.h              |   4 +-
 mission/devices/PDU1Handler.cpp               |  10 +-
 mission/devices/PDU1Handler.h                 |   2 +-
 mission/devices/PDU2Handler.cpp               |  10 +-
 mission/devices/PDU2Handler.h                 |   1 +
 .../devicedefinitions/GomspaceDefinitions.h   |  50 +++--
 mission/utility/compileTime.h                 | 113 ++++++-----
 13 files changed, 205 insertions(+), 194 deletions(-)

diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 34e02001..4ab0988b 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -3,7 +3,6 @@
 #include "OBSWConfig.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
-
 #include "mission/utility/compileTime.h"
 
 #if FSFW_DEV_HYPERION_GPS_CREATE_NMEA_CSV == 1
diff --git a/mission/devices/ACUHandler.cpp b/mission/devices/ACUHandler.cpp
index 7c6e048c..3abe5f53 100644
--- a/mission/devices/ACUHandler.cpp
+++ b/mission/devices/ACUHandler.cpp
@@ -4,7 +4,7 @@
 
 ACUHandler::ACUHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie)
     : GomspaceDeviceHandler(objectId, comIF, comCookie, ACU::MAX_CONFIGTABLE_ADDRESS,
-                            ACU::MAX_HKTABLE_ADDRESS, ACU::HK_TABLE_REPLY_SIZE, &acuHkTableDataset),
+                            ACU::MAX_HKTABLE_ADDRESS, ACU::HK_TABLE_REPLY_SIZE),
       acuHkTableDataset(this) {}
 
 ACUHandler::~ACUHandler() {}
@@ -39,6 +39,13 @@ void ACUHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pack
 #endif
 }
 
+LocalPoolDataSetBase *ACUHandler::getDataSetHandle(sid_t sid) {
+  if (sid == acuHkTableDataset.getSid()) {
+    return &acuHkTableDataset;
+  }
+  return nullptr;
+}
+
 void ACUHandler::parseHkTableReply(const uint8_t *packet) {
   uint16_t dataOffset = 0;
   acuHkTableDataset.read();
diff --git a/mission/devices/ACUHandler.h b/mission/devices/ACUHandler.h
index f3af5eae..3b1feaf3 100644
--- a/mission/devices/ACUHandler.h
+++ b/mission/devices/ACUHandler.h
@@ -31,6 +31,8 @@ class ACUHandler : public GomspaceDeviceHandler {
   virtual ReturnValue_t childCommandHook(DeviceCommandId_t cmd, const uint8_t* commandData,
                                          size_t commandDataLen) override;
 
+  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
+
  private:
   static const DeviceCommandId_t PRINT_CHANNEL_STATS = 51;
 
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index 25bde5db..26c09901 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -7,20 +7,14 @@
 
 GomspaceDeviceHandler::GomspaceDeviceHandler(object_id_t objectId, object_id_t comIF,
                                              CookieIF* comCookie, uint16_t maxConfigTableAddress,
-                                             uint16_t maxHkTableAddress, uint16_t hkTableReplySize,
-                                             LocalPoolDataSetBase* hkTableDataset)
+                                             uint16_t maxHkTableAddress, uint16_t hkTableReplySize)
     : DeviceHandlerBase(objectId, comIF, comCookie),
       maxConfigTableAddress(maxConfigTableAddress),
       maxHkTableAddress(maxHkTableAddress),
-      hkTableReplySize(hkTableReplySize),
-      hkTableDataset(hkTableDataset) {
+      hkTableReplySize(hkTableReplySize) {
   if (comCookie == nullptr) {
     sif::error << "GomspaceDeviceHandler::GomspaceDeviceHandler: Invalid com cookie" << std::endl;
   }
-  if (hkTableDataset == nullptr) {
-    sif::error << "GomspaceDeviceHandler::GomspaceDeviceHandler: Invalid hk table data set"
-               << std::endl;
-  }
 }
 
 GomspaceDeviceHandler::~GomspaceDeviceHandler() {}
@@ -405,14 +399,6 @@ ReturnValue_t GomspaceDeviceHandler::generateRequestFullHkTableCmd(uint16_t hkTa
 
 uint32_t GomspaceDeviceHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 0; }
 
-LocalPoolDataSetBase* GomspaceDeviceHandler::getDataSetHandle(sid_t sid) {
-  if (sid == hkTableDataset->getSid()) {
-    return hkTableDataset;
-  } else {
-    return nullptr;
-  }
-}
-
 void GomspaceDeviceHandler::setModeNormal() { mode = MODE_NORMAL; }
 
 ReturnValue_t GomspaceDeviceHandler::printStatus(DeviceCommandId_t cmd) {
diff --git a/mission/devices/GomspaceDeviceHandler.h b/mission/devices/GomspaceDeviceHandler.h
index 3d50b27b..fedc91d9 100644
--- a/mission/devices/GomspaceDeviceHandler.h
+++ b/mission/devices/GomspaceDeviceHandler.h
@@ -39,7 +39,7 @@ class GomspaceDeviceHandler : public DeviceHandlerBase {
    */
   GomspaceDeviceHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie,
                         uint16_t maxConfigTableAddress, uint16_t maxHkTableAddress,
-                        uint16_t hkTableReplySize, LocalPoolDataSetBase *hkTableDataset);
+                        uint16_t hkTableReplySize);
   virtual ~GomspaceDeviceHandler();
 
   /**
@@ -100,7 +100,7 @@ class GomspaceDeviceHandler : public DeviceHandlerBase {
    */
   virtual void letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) = 0;
 
-  virtual LocalPoolDataSetBase *getDataSetHandle(sid_t sid) override;
+  virtual LocalPoolDataSetBase *getDataSetHandle(sid_t sid) = 0;
 
   /**
    * @brief   Can be overriden by child classes to implement device specific commands.
diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index 455784fb..9a337687 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -6,9 +6,9 @@
 
 P60DockHandler::P60DockHandler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie)
     : GomspaceDeviceHandler(objectId, comIF, comCookie, P60Dock::MAX_CONFIGTABLE_ADDRESS,
-                            P60Dock::MAX_HKTABLE_ADDRESS, P60Dock::HK_TABLE_REPLY_SIZE,
-                            &p60dockHkTableDataset),
-      p60dockHkTableDataset(this) {}
+                            P60Dock::MAX_HKTABLE_ADDRESS, P60Dock::HK_TABLE_REPLY_SIZE),
+      coreHk(this),
+      auxHk(this) {}
 
 P60DockHandler::~P60DockHandler() {}
 
@@ -23,7 +23,7 @@ void P60DockHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *
    * Hk table will be sent to the commander if hk table request was not triggered by the
    * P60DockHandler itself.
    */
-  handleDeviceTM(&p60dockHkTableDataset, id, true);
+  handleDeviceTM(&coreHk, id, true);
 
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_P60DOCK == 1
   p60dockHkTableDataset.read();
@@ -73,8 +73,12 @@ void P60DockHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *
 void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   using namespace P60Dock;
   uint16_t dataOffset = 0;
-  PoolReadGuard pg(&p60dockHkTableDataset);
-  if (pg.getReadResult() != HasReturnvaluesIF::RETURN_OK) {
+  PoolReadGuard pg0(&coreHk);
+  PoolReadGuard pg1(&auxHk);
+  if (pg0.getReadResult() != HasReturnvaluesIF::RETURN_OK or
+      pg1.getReadResult() != HasReturnvaluesIF::RETURN_OK) {
+    coreHk.setValidity(false, true);
+    auxHk.setValidity(false, true);
     return;
   }
   /**
@@ -83,129 +87,116 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
    */
   dataOffset += 12;
   for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
-    p60dockHkTableDataset.currents[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    coreHk.currents[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
     dataOffset += 4;
   }
   for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
-    p60dockHkTableDataset.voltages[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    coreHk.voltages[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
     dataOffset += 4;
   }
   for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
-    p60dockHkTableDataset.outputEnables[idx] = *(packet + dataOffset);
+    coreHk.outputEnables[idx] = *(packet + dataOffset);
     dataOffset += 3;
   }
 
-  p60dockHkTableDataset.temperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.temperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.temperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.temperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
-  p60dockHkTableDataset.bootcause = *(packet + dataOffset) << 24 |
+  auxHk.bootcause = *(packet + dataOffset) << 24 |
 
-                                    *(packet + dataOffset + 1) << 16 |
-                                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+                    *(packet + dataOffset + 1) << 16 | *(packet + dataOffset + 2) << 8 |
+                    *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.bootCount = *(packet + dataOffset) << 24 |
-                                    *(packet + dataOffset + 1) << 16 |
-                                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  coreHk.bootCount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.resetcause = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.resetcause = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.battMode = *(packet + dataOffset);
+  coreHk.battMode = *(packet + dataOffset);
   dataOffset += 3;
-  p60dockHkTableDataset.heaterOn = *(packet + dataOffset);
+  auxHk.heaterOn = *(packet + dataOffset);
   /* + 13 because here begins a new gomspace csp data field */
   dataOffset += 13;
-  p60dockHkTableDataset.converter5VStatus = *(packet + dataOffset);
+  auxHk.converter5VStatus = *(packet + dataOffset);
   dataOffset += 3;
 
   for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
-    p60dockHkTableDataset.latchups[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    auxHk.latchups[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
     dataOffset += 4;
   }
 
-  p60dockHkTableDataset.dockVbatVoltageValue =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.dockVbatVoltageValue = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.dockVccCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.dockVccCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.batteryCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.batteryCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.batteryVoltage = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.batteryVoltage = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
-  p60dockHkTableDataset.batteryTemperature1 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.batteryTemperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.batteryTemperature2 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.batteryTemperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
   for (uint8_t idx = 0; idx < NUM_DEVS; idx++) {
-    p60dockHkTableDataset.devicesType[idx] = *(packet + dataOffset);
+    auxHk.devicesType[idx] = *(packet + dataOffset);
     dataOffset += 3;
   }
   for (uint8_t idx = 0; idx < NUM_DEVS; idx++) {
-    p60dockHkTableDataset.devicesStatus[idx] = *(packet + dataOffset);
+    auxHk.devicesStatus[idx] = *(packet + dataOffset);
     dataOffset += 3;
   }
 
-  p60dockHkTableDataset.dearmStatus = *(packet + dataOffset);
+  auxHk.dearmStatus = *(packet + dataOffset);
   dataOffset += 3;
 
-  p60dockHkTableDataset.wdtCntGnd = *(packet + dataOffset) << 24 |
-                                    *(packet + dataOffset + 1) << 16 |
-                                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtCntGnd = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.wdtCntI2c = *(packet + dataOffset) << 24 |
-                                    *(packet + dataOffset + 1) << 16 |
-                                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtCntI2c = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.wdtCntCan = *(packet + dataOffset) << 24 |
-                                    *(packet + dataOffset + 1) << 16 |
-                                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtCntCan = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.wdtCntCsp1 = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtCntCsp1 = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.wdtCntCsp2 = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtCntCsp2 = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
 
-  p60dockHkTableDataset.wdtGndLeft = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtGndLeft = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.wdtI2cLeft = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtI2cLeft = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
-  p60dockHkTableDataset.wdtCanLeft = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  auxHk.wdtCanLeft = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   /* +16 because here begins a new gomspace csp packet */
   dataOffset += 16;
 
-  p60dockHkTableDataset.wdtCspLeft1 = *(packet + dataOffset);
+  auxHk.wdtCspLeft1 = *(packet + dataOffset);
   dataOffset += 3;
-  p60dockHkTableDataset.wdtCspLeft2 = *(packet + dataOffset);
+  auxHk.wdtCspLeft2 = *(packet + dataOffset);
   dataOffset += 3;
 
-  p60dockHkTableDataset.batteryChargeCurrent =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.batteryChargeCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.batteryDischargeCurrent =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.batteryDischargeCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.ant6Depl = *(packet + dataOffset);
+  auxHk.ant6Depl = *(packet + dataOffset);
   dataOffset += 3;
-  p60dockHkTableDataset.ar6Depl = *(packet + dataOffset);
-  p60dockHkTableDataset.setValidity(true, true);
+  auxHk.ar6Depl = *(packet + dataOffset);
+  coreHk.setValidity(true, true);
+  auxHk.setValidity(true, true);
 }
 
 ReturnValue_t P60DockHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
@@ -260,7 +251,8 @@ ReturnValue_t P60DockHandler::initializeLocalDataPool(localpool::DataPool &local
 
   localDataPoolMap.emplace(pool::P60DOCK_ANT6_DEPL, new PoolEntry<int8_t>({0}));
   localDataPoolMap.emplace(pool::P60DOCK_AR6_DEPL, new PoolEntry<int8_t>({0}));
-  poolManager.subscribeForPeriodicPacket(p60dockHkTableDataset.getSid(), false, 10.0, false);
+  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, false);
+  poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -268,16 +260,17 @@ ReturnValue_t P60DockHandler::printStatus(DeviceCommandId_t cmd) {
   ReturnValue_t result = RETURN_OK;
   switch (cmd) {
     case (GOMSPACE::PRINT_SWITCH_V_I): {
-      PoolReadGuard pg(&p60dockHkTableDataset);
-      result = pg.getReadResult();
-      if (result != HasReturnvaluesIF::RETURN_OK) {
+      PoolReadGuard pg0(&coreHk);
+      PoolReadGuard pg1(&auxHk);
+      if (pg0.getReadResult() != HasReturnvaluesIF::RETURN_OK or
+          pg1.getReadResult() != HasReturnvaluesIF::RETURN_OK) {
         break;
       }
       printHkTableSwitchIV();
       return HasReturnvaluesIF::RETURN_OK;
     }
     case (GOMSPACE::PRINT_LATCHUPS): {
-      PoolReadGuard pg(&p60dockHkTableDataset);
+      PoolReadGuard pg(&auxHk);
       result = pg.getReadResult();
       printHkTableLatchups();
       if (result != HasReturnvaluesIF::RETURN_OK) {
@@ -296,25 +289,22 @@ ReturnValue_t P60DockHandler::printStatus(DeviceCommandId_t cmd) {
 void P60DockHandler::printHkTableSwitchIV() {
   using namespace P60Dock;
   sif::info << "P60 Dock Info:" << std::endl;
-  sif::info << "Boot Cause: " << p60dockHkTableDataset.bootcause
-            << " | Boot Count: " << std::setw(4) << std::right << p60dockHkTableDataset.bootCount
-            << std::endl;
-  sif::info << "Reset Cause: " << p60dockHkTableDataset.resetcause
-            << " | Battery Mode: " << static_cast<int>(p60dockHkTableDataset.battMode.value)
-            << std::endl;
+  sif::info << "Boot Cause: " << auxHk.bootcause << " | Boot Count: " << std::setw(4) << std::right
+            << coreHk.bootCount << std::endl;
+  sif::info << "Reset Cause: " << auxHk.resetcause
+            << " | Battery Mode: " << static_cast<int>(coreHk.battMode.value) << std::endl;
   sif::info << "SwitchState, Currents [mA], Voltages [mV]:" << std::endl;
   sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Dock VBAT VCC" << std::dec
-            << "| -, " << std::setw(4) << std::right << p60dockHkTableDataset.dockVccCurrent << ", "
-            << std::setw(5) << p60dockHkTableDataset.dockVbatVoltageValue << std::endl;
+            << "| -, " << std::setw(4) << std::right << auxHk.dockVccCurrent << ", " << std::setw(5)
+            << auxHk.dockVbatVoltageValue << std::endl;
   sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "BATT" << std::dec << "| -, "
-            << std::setw(4) << std::right << p60dockHkTableDataset.batteryCurrent.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.batteryVoltage.value << std::endl;
+            << std::setw(4) << std::right << coreHk.batteryCurrent.value << ", " << std::setw(5)
+            << coreHk.batteryVoltage.value << std::endl;
 
   auto genericPrintoutHandler = [&](std::string name, uint8_t idx) {
     sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << name << std::dec << "| "
-              << unsigned(p60dockHkTableDataset.outputEnables[idx]) << ", " << std::setw(4)
-              << std::right << p60dockHkTableDataset.currents[idx] << ", " << std::setw(5)
-              << p60dockHkTableDataset.voltages[idx] << std::endl;
+              << unsigned(coreHk.outputEnables[idx]) << ", " << std::setw(4) << std::right
+              << coreHk.currents[idx] << ", " << std::setw(5) << coreHk.voltages[idx] << std::endl;
   };
 
   genericPrintoutHandler("ACU VCC", hk::ACU_VCC);
@@ -328,12 +318,21 @@ void P60DockHandler::printHkTableSwitchIV() {
   genericPrintoutHandler("Stack 5V", hk::STACK_5V);
 }
 
+LocalPoolDataSetBase *P60DockHandler::getDataSetHandle(sid_t sid) {
+  if (sid == coreHk.getSid()) {
+    return &coreHk;
+  } else if (sid == auxHk.getSid()) {
+    return &auxHk;
+  }
+  return nullptr;
+}
+
 void P60DockHandler::printHkTableLatchups() {
   using namespace P60Dock;
   sif::info << "P60 Latchup Information" << std::endl;
   auto genericPrintoutHandler = [&](std::string name, uint8_t idx) {
     sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << name << std::dec << "| "
-              << std::setw(4) << std::right << p60dockHkTableDataset.latchups[idx] << std::endl;
+              << std::setw(4) << std::right << auxHk.latchups[idx] << std::endl;
   };
   genericPrintoutHandler("ACU VCC", hk::ACU_VCC);
   genericPrintoutHandler("ACU VBAT", hk::ACU_VBAT);
diff --git a/mission/devices/P60DockHandler.h b/mission/devices/P60DockHandler.h
index b86f37bb..47484680 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/devices/P60DockHandler.h
@@ -31,12 +31,14 @@ class P60DockHandler : public GomspaceDeviceHandler {
    * @return
    */
   ReturnValue_t printStatus(DeviceCommandId_t cmd) override;
+  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
 
   void printHkTableSwitchIV();
   void printHkTableLatchups();
 
  private:
-  P60Dock::HkTableDataset p60dockHkTableDataset;
+  P60Dock::CoreHkSet coreHk;
+  P60Dock::HkTableDataset auxHk;
   static constexpr uint8_t MAX_CHANNEL_STR_WIDTH = 16;
 
   PoolEntry<int16_t> hkCurrents = PoolEntry<int16_t>(P60Dock::hk::CHNLS_LEN);
diff --git a/mission/devices/PDU1Handler.cpp b/mission/devices/PDU1Handler.cpp
index e0c369a3..be26d984 100644
--- a/mission/devices/PDU1Handler.cpp
+++ b/mission/devices/PDU1Handler.cpp
@@ -7,8 +7,7 @@
 
 PDU1Handler::PDU1Handler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie)
     : GomspaceDeviceHandler(objectId, comIF, comCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
-                            PDU::MAX_HKTABLE_ADDRESS, PDU::HK_TABLE_REPLY_SIZE,
-                            &pdu1HkTableDataset),
+                            PDU::MAX_HKTABLE_ADDRESS, PDU::HK_TABLE_REPLY_SIZE),
       pdu1HkTableDataset(this) {}
 
 PDU1Handler::~PDU1Handler() {}
@@ -430,6 +429,13 @@ ReturnValue_t PDU1Handler::initializeLocalDataPool(localpool::DataPool &localDat
   return HasReturnvaluesIF::RETURN_OK;
 }
 
+LocalPoolDataSetBase *PDU1Handler::getDataSetHandle(sid_t sid) {
+  if (sid == pdu1HkTableDataset.getSid()) {
+    return &pdu1HkTableDataset;
+  }
+  return nullptr;
+}
+
 ReturnValue_t PDU1Handler::printStatus(DeviceCommandId_t cmd) {
   ReturnValue_t result = RETURN_OK;
   switch (cmd) {
diff --git a/mission/devices/PDU1Handler.h b/mission/devices/PDU1Handler.h
index 732c38d2..67afc922 100644
--- a/mission/devices/PDU1Handler.h
+++ b/mission/devices/PDU1Handler.h
@@ -36,7 +36,7 @@ class PDU1Handler : public GomspaceDeviceHandler {
   virtual ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t* id) override;
   virtual void letChildHandleHkReply(DeviceCommandId_t id, const uint8_t* packet) override;
   ReturnValue_t printStatus(DeviceCommandId_t cmd) override;
-
+  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
   ReturnValue_t setParamCallback(SetParamMessageUnpacker& unpacker, bool afterExectuion) override;
 
  private:
diff --git a/mission/devices/PDU2Handler.cpp b/mission/devices/PDU2Handler.cpp
index 48e7f90e..69a8f3fd 100644
--- a/mission/devices/PDU2Handler.cpp
+++ b/mission/devices/PDU2Handler.cpp
@@ -7,8 +7,7 @@
 
 PDU2Handler::PDU2Handler(object_id_t objectId, object_id_t comIF, CookieIF *comCookie)
     : GomspaceDeviceHandler(objectId, comIF, comCookie, PDU::MAX_CONFIGTABLE_ADDRESS,
-                            PDU::MAX_HKTABLE_ADDRESS, PDU::HK_TABLE_REPLY_SIZE,
-                            &pdu2HkTableDataset),
+                            PDU::MAX_HKTABLE_ADDRESS, PDU::HK_TABLE_REPLY_SIZE),
       pdu2HkTableDataset(this) {}
 
 PDU2Handler::~PDU2Handler() {}
@@ -54,6 +53,13 @@ void PDU2Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, vo
   this->hookArgs = args;
 }
 
+LocalPoolDataSetBase *PDU2Handler::getDataSetHandle(sid_t sid) {
+  if (sid == pdu2HkTableDataset.getSid()) {
+    return &pdu2HkTableDataset;
+  }
+  return nullptr;
+}
+
 void PDU2Handler::parseHkTableReply(const uint8_t *packet) {
   uint16_t dataOffset = 0;
   pdu2HkTableDataset.read();
diff --git a/mission/devices/PDU2Handler.h b/mission/devices/PDU2Handler.h
index ca639568..ab113dda 100644
--- a/mission/devices/PDU2Handler.h
+++ b/mission/devices/PDU2Handler.h
@@ -36,6 +36,7 @@ class PDU2Handler : public GomspaceDeviceHandler {
   virtual void letChildHandleHkReply(DeviceCommandId_t id, const uint8_t* packet) override;
   ReturnValue_t printStatus(DeviceCommandId_t cmd) override;
   ReturnValue_t setParamCallback(SetParamMessageUnpacker& unpacker, bool afterExecution) override;
+  LocalPoolDataSetBase* getDataSetHandle(sid_t sid) override;
 
  private:
   static constexpr uint8_t MAX_CHANNEL_STR_WIDTH = 24;
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index 3a66ca69..4b277b40 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -351,7 +351,9 @@ static const uint16_t MAX_CONFIGTABLE_ADDRESS = 408;
 static const uint16_t MAX_HKTABLE_ADDRESS = 187;
 static const uint16_t HK_TABLE_SIZE = 188;
 
-static const uint8_t HK_TABLE_DATA_SET_ID = 0x3;
+static constexpr uint32_t CORE_TABLE_SET_ID = 0x3;
+static constexpr uint32_t AUX_TABLE_DATA_SET_ID = 0x4;
+
 static const uint8_t HK_TABLE_ENTRIES = 100;
 
 /**
@@ -360,18 +362,11 @@ static const uint8_t HK_TABLE_ENTRIES = 100;
  */
 static const uint16_t HK_TABLE_REPLY_SIZE = 407;
 
-/**
- * @brief   This class defines a dataset for the hk table of the P60 Dock.
- * @details
- * The GS port and X3 are not required for EIVE. X3 is another slot on the P60 dock and
- * GS is required for a module from Gomspace which is not used.
- */
-class HkTableDataset : public StaticLocalDataSet<HK_TABLE_ENTRIES> {
+class CoreHkSet : public StaticLocalDataSet<16> {
  public:
-  HkTableDataset(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, HK_TABLE_DATA_SET_ID) {}
+  CoreHkSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, CORE_TABLE_SET_ID) {}
 
-  HkTableDataset(object_id_t objectId)
-      : StaticLocalDataSet(sid_t(objectId, HK_TABLE_DATA_SET_ID)) {}
+  CoreHkSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, CORE_TABLE_SET_ID)) {}
 
   /** Measured output currents */
   lp_vec_t<int16_t, P60Dock::hk::Index::CHNLS_LEN> currents =
@@ -387,22 +382,42 @@ class HkTableDataset : public StaticLocalDataSet<HK_TABLE_ENTRIES> {
   lp_vec_t<uint8_t, P60Dock::hk::Index::CHNLS_LEN> outputEnables =
       lp_vec_t<uint8_t, P60Dock::hk::Index::CHNLS_LEN>(sid.objectId, P60System::pool::OUTPUT_ENABLE,
                                                        this);
+  lp_var_t<uint32_t> bootCount =
+      lp_var_t<uint32_t>(sid.objectId, P60System::pool::P60DOCK_BOOT_CNT, this);
+  lp_var_t<uint8_t> battMode =
+      lp_var_t<uint8_t>(sid.objectId, P60System::pool::P60DOCK_BATT_MODE, this);
+
+  // Difference between charge and discharge current
+  lp_var_t<int16_t> batteryCurrent =
+      lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_BATTERY_CURRENT, this);
+  lp_var_t<uint16_t> batteryVoltage =
+      lp_var_t<uint16_t>(sid.objectId, P60System::pool::P60DOCK_BATTERY_VOLTAGE, this);
 
   lp_var_t<int16_t> temperature1 =
       lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_TEMPERATURE_1, this);
   lp_var_t<int16_t> temperature2 =
       lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_TEMPERATURE_2, this);
+};
+/**
+ * @brief   This class defines a dataset for the hk table of the P60 Dock.
+ * @details
+ * The GS port and X3 are not required for EIVE. X3 is another slot on the P60 dock and
+ * GS is required for a module from Gomspace which is not used.
+ */
+class HkTableDataset : public StaticLocalDataSet<32> {
+ public:
+  HkTableDataset(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, AUX_TABLE_DATA_SET_ID) {}
+
+  HkTableDataset(object_id_t objectId)
+      : StaticLocalDataSet(sid_t(objectId, AUX_TABLE_DATA_SET_ID)) {}
 
   lp_var_t<uint32_t> bootcause =
       lp_var_t<uint32_t>(sid.objectId, P60System::pool::P60DOCK_BOOT_CAUSE, this);
-  lp_var_t<uint32_t> bootCount =
-      lp_var_t<uint32_t>(sid.objectId, P60System::pool::P60DOCK_BOOT_CNT, this);
   lp_var_t<uint32_t> uptime =
       lp_var_t<uint32_t>(sid.objectId, P60System::pool::P60DOCK_UPTIME, this);
   lp_var_t<uint16_t> resetcause =
       lp_var_t<uint16_t>(sid.objectId, P60System::pool::P60DOCK_RESETCAUSE, this);
-  lp_var_t<uint8_t> battMode =
-      lp_var_t<uint8_t>(sid.objectId, P60System::pool::P60DOCK_BATT_MODE, this);
+
   /** Battery heater control only possible on BP4 packs */
   lp_var_t<uint8_t> heaterOn =
       lp_var_t<uint8_t>(sid.objectId, P60System::pool::P60DOCK_HEATER_ON, this);
@@ -418,11 +433,6 @@ class HkTableDataset : public StaticLocalDataSet<HK_TABLE_ENTRIES> {
       lp_var_t<uint16_t>(sid.objectId, P60System::pool::P60DOCK_DOCK_VBAT, this);
   lp_var_t<int16_t> dockVccCurrent =
       lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_DOCK_VCC_CURRENT, this);
-  // Difference between charge and discharge current
-  lp_var_t<int16_t> batteryCurrent =
-      lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_BATTERY_CURRENT, this);
-  lp_var_t<uint16_t> batteryVoltage =
-      lp_var_t<uint16_t>(sid.objectId, P60System::pool::P60DOCK_BATTERY_VOLTAGE, this);
 
   lp_var_t<int16_t> batteryTemperature1 =
       lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_BATTERY_TEMPERATURE_1, this);
diff --git a/mission/utility/compileTime.h b/mission/utility/compileTime.h
index c55673f6..0e367248 100644
--- a/mission/utility/compileTime.h
+++ b/mission/utility/compileTime.h
@@ -5,14 +5,17 @@
  * Authors:
  *
  * Assembled from the code released on Stackoverflow by:
- *   Dennis (instructable.com/member/nqtronix)    |   https://stackoverflow.com/questions/23032002/c-c-how-to-get-integer-unix-timestamp-of-build-time-not-string
+ *   Dennis (instructable.com/member/nqtronix)    |
+ * https://stackoverflow.com/questions/23032002/c-c-how-to-get-integer-unix-timestamp-of-build-time-not-string
  * and
- *   Alexis Wilke                                 |   https://stackoverflow.com/questions/10538444/do-you-know-of-a-c-macro-to-compute-unix-time-and-date
+ *   Alexis Wilke                                 |
+ * https://stackoverflow.com/questions/10538444/do-you-know-of-a-c-macro-to-compute-unix-time-and-date
  *
  * Assembled by Jean Rabault
  *
- * UNIX_TIMESTAMP gives the UNIX timestamp (unsigned long integer of seconds since 1st Jan 1970) of compilation from macros using the compiler defined __TIME__ macro.
- * This should include Gregorian calendar leap days, in particular the 29ths of February, 100 and 400 years modulo leaps.
+ * UNIX_TIMESTAMP gives the UNIX timestamp (unsigned long integer of seconds since 1st Jan 1970) of
+ * compilation from macros using the compiler defined __TIME__ macro. This should include Gregorian
+ * calendar leap days, in particular the 29ths of February, 100 and 400 years modulo leaps.
  *
  * Careful: __TIME__ is the local time of the computer, NOT the UTC time in general!
  *
@@ -22,76 +25,66 @@
 #define COMPILE_TIME_H_
 
 // Some definitions for calculation
-#define SEC_PER_MIN             60UL
-#define SEC_PER_HOUR            3600UL
-#define SEC_PER_DAY             86400UL
-#define SEC_PER_YEAR            (SEC_PER_DAY*365)
+#define SEC_PER_MIN 60UL
+#define SEC_PER_HOUR 3600UL
+#define SEC_PER_DAY 86400UL
+#define SEC_PER_YEAR (SEC_PER_DAY * 365)
 
 // extracts 1..4 characters from a string and interprets it as a decimal value
-#define CONV_STR2DEC_1(str, i)  (str[i]>'0'?str[i]-'0':0)
-#define CONV_STR2DEC_2(str, i)  (CONV_STR2DEC_1(str, i)*10 + str[i+1]-'0')
-#define CONV_STR2DEC_3(str, i)  (CONV_STR2DEC_2(str, i)*10 + str[i+2]-'0')
-#define CONV_STR2DEC_4(str, i)  (CONV_STR2DEC_3(str, i)*10 + str[i+3]-'0')
+#define CONV_STR2DEC_1(str, i) (str[i] > '0' ? str[i] - '0' : 0)
+#define CONV_STR2DEC_2(str, i) (CONV_STR2DEC_1(str, i) * 10 + str[i + 1] - '0')
+#define CONV_STR2DEC_3(str, i) (CONV_STR2DEC_2(str, i) * 10 + str[i + 2] - '0')
+#define CONV_STR2DEC_4(str, i) (CONV_STR2DEC_3(str, i) * 10 + str[i + 3] - '0')
 
 // Custom "glue logic" to convert the month name to a usable number
-#define GET_MONTH(str, i)      (str[i]=='J' && str[i+1]=='a' && str[i+2]=='n' ? 1 :     \
-                                str[i]=='F' && str[i+1]=='e' && str[i+2]=='b' ? 2 :     \
-                                str[i]=='M' && str[i+1]=='a' && str[i+2]=='r' ? 3 :     \
-                                str[i]=='A' && str[i+1]=='p' && str[i+2]=='r' ? 4 :     \
-                                str[i]=='M' && str[i+1]=='a' && str[i+2]=='y' ? 5 :     \
-                                str[i]=='J' && str[i+1]=='u' && str[i+2]=='n' ? 6 :     \
-                                str[i]=='J' && str[i+1]=='u' && str[i+2]=='l' ? 7 :     \
-                                str[i]=='A' && str[i+1]=='u' && str[i+2]=='g' ? 8 :     \
-                                str[i]=='S' && str[i+1]=='e' && str[i+2]=='p' ? 9 :     \
-                                str[i]=='O' && str[i+1]=='c' && str[i+2]=='t' ? 10 :    \
-                                str[i]=='N' && str[i+1]=='o' && str[i+2]=='v' ? 11 :    \
-                                str[i]=='D' && str[i+1]=='e' && str[i+2]=='c' ? 12 : 0)
+#define GET_MONTH(str, i)                                         \
+  (str[i] == 'J' && str[i + 1] == 'a' && str[i + 2] == 'n'   ? 1  \
+   : str[i] == 'F' && str[i + 1] == 'e' && str[i + 2] == 'b' ? 2  \
+   : str[i] == 'M' && str[i + 1] == 'a' && str[i + 2] == 'r' ? 3  \
+   : str[i] == 'A' && str[i + 1] == 'p' && str[i + 2] == 'r' ? 4  \
+   : str[i] == 'M' && str[i + 1] == 'a' && str[i + 2] == 'y' ? 5  \
+   : str[i] == 'J' && str[i + 1] == 'u' && str[i + 2] == 'n' ? 6  \
+   : str[i] == 'J' && str[i + 1] == 'u' && str[i + 2] == 'l' ? 7  \
+   : str[i] == 'A' && str[i + 1] == 'u' && str[i + 2] == 'g' ? 8  \
+   : str[i] == 'S' && str[i + 1] == 'e' && str[i + 2] == 'p' ? 9  \
+   : str[i] == 'O' && str[i + 1] == 'c' && str[i + 2] == 't' ? 10 \
+   : str[i] == 'N' && str[i + 1] == 'o' && str[i + 2] == 'v' ? 11 \
+   : str[i] == 'D' && str[i + 1] == 'e' && str[i + 2] == 'c' ? 12 \
+                                                             : 0)
 
 // extract the information from the time string given by __TIME__ and __DATE__
-#define __TIME_SECONDS__        CONV_STR2DEC_2(__TIME__, 6)
-#define __TIME_MINUTES__        CONV_STR2DEC_2(__TIME__, 3)
-#define __TIME_HOURS__          CONV_STR2DEC_2(__TIME__, 0)
-#define __TIME_DAYS__           CONV_STR2DEC_2(__DATE__, 4)
-#define __TIME_MONTH__          GET_MONTH(__DATE__, 0)
-#define __TIME_YEARS__          CONV_STR2DEC_4(__DATE__, 7)
+#define __TIME_SECONDS__ CONV_STR2DEC_2(__TIME__, 6)
+#define __TIME_MINUTES__ CONV_STR2DEC_2(__TIME__, 3)
+#define __TIME_HOURS__ CONV_STR2DEC_2(__TIME__, 0)
+#define __TIME_DAYS__ CONV_STR2DEC_2(__DATE__, 4)
+#define __TIME_MONTH__ GET_MONTH(__DATE__, 0)
+#define __TIME_YEARS__ CONV_STR2DEC_4(__DATE__, 7)
 
 // Days in February
 #define _UNIX_TIMESTAMP_FDAY(year) \
-    (((year) % 400) == 0UL ? 29UL : \
-        (((year) % 100) == 0UL ? 28UL : \
-            (((year) % 4) == 0UL ? 29UL : \
-                28UL)))
+  (((year) % 400) == 0UL ? 29UL    \
+                         : (((year) % 100) == 0UL ? 28UL : (((year) % 4) == 0UL ? 29UL : 28UL)))
 
 // Days in the year
-#define _UNIX_TIMESTAMP_YDAY(year, month, day) \
-    ( \
-        /* January */    day \
-        /* February */ + (month >=  2 ? 31UL : 0UL) \
-        /* March */    + (month >=  3 ? _UNIX_TIMESTAMP_FDAY(year) : 0UL) \
-        /* April */    + (month >=  4 ? 31UL : 0UL) \
-        /* May */      + (month >=  5 ? 30UL : 0UL) \
-        /* June */     + (month >=  6 ? 31UL : 0UL) \
-        /* July */     + (month >=  7 ? 30UL : 0UL) \
-        /* August */   + (month >=  8 ? 31UL : 0UL) \
-        /* September */+ (month >=  9 ? 31UL : 0UL) \
-        /* October */  + (month >= 10 ? 30UL : 0UL) \
-        /* November */ + (month >= 11 ? 31UL : 0UL) \
-        /* December */ + (month >= 12 ? 30UL : 0UL) \
-    )
+#define _UNIX_TIMESTAMP_YDAY(year, month, day)                                             \
+  (/* January */ day /* February */ + (month >= 2 ? 31UL : 0UL) /* March */ +              \
+   (month >= 3 ? _UNIX_TIMESTAMP_FDAY(year) : 0UL) /* April */ +                           \
+   (month >= 4 ? 31UL : 0UL) /* May */ + (month >= 5 ? 30UL : 0UL) /* June */ +            \
+   (month >= 6 ? 31UL : 0UL) /* July */ + (month >= 7 ? 30UL : 0UL) /* August */ +         \
+   (month >= 8 ? 31UL : 0UL) /* September */ + (month >= 9 ? 31UL : 0UL) /* October */ +   \
+   (month >= 10 ? 30UL : 0UL) /* November */ + (month >= 11 ? 31UL : 0UL) /* December */ + \
+   (month >= 12 ? 30UL : 0UL))
 
 // get the UNIX timestamp from a digits representation
-#define _UNIX_TIMESTAMP(year, month, day, hour, minute, second) \
-    ( /* time */ second \
-                + minute * SEC_PER_MIN \
-                + hour * SEC_PER_HOUR \
-    + /* year day (month + day) */ (_UNIX_TIMESTAMP_YDAY(year, month, day) - 1) * SEC_PER_DAY \
-    + /* year */ (year - 1970UL) * SEC_PER_YEAR \
-                + ((year - 1969UL) / 4UL) * SEC_PER_DAY \
-                - ((year - 1901UL) / 100UL) * SEC_PER_DAY \
-                + ((year - 1601UL) / 400UL) * SEC_PER_DAY \
-    )
+#define _UNIX_TIMESTAMP(year, month, day, hour, minute, second)                              \
+  (/* time */ second + minute * SEC_PER_MIN + hour * SEC_PER_HOUR +                          \
+   /* year day (month + day) */ (_UNIX_TIMESTAMP_YDAY(year, month, day) - 1) * SEC_PER_DAY + \
+   /* year */ (year - 1970UL) * SEC_PER_YEAR + ((year - 1969UL) / 4UL) * SEC_PER_DAY -       \
+   ((year - 1901UL) / 100UL) * SEC_PER_DAY + ((year - 1601UL) / 400UL) * SEC_PER_DAY)
 
 // the UNIX timestamp
-#define UNIX_TIMESTAMP (_UNIX_TIMESTAMP(__TIME_YEARS__, __TIME_MONTH__, __TIME_DAYS__, __TIME_HOURS__, __TIME_MINUTES__, __TIME_SECONDS__))
+#define UNIX_TIMESTAMP                                                            \
+  (_UNIX_TIMESTAMP(__TIME_YEARS__, __TIME_MONTH__, __TIME_DAYS__, __TIME_HOURS__, \
+                   __TIME_MINUTES__, __TIME_SECONDS__))
 
 #endif

From 5e4c3728edb3abab62e0ac68b2e0ec9ff1a553db Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 12:53:51 +0200
Subject: [PATCH 02/12] split up p60 hk packets

---
 mission/devices/PCDUHandler.cpp               | 10 ++--
 .../devicedefinitions/GomspaceDefinitions.h   | 55 ++++++++++---------
 tmtc                                          |  2 +-
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/mission/devices/PCDUHandler.cpp b/mission/devices/PCDUHandler.cpp
index 44b9181a..c819b223 100644
--- a/mission/devices/PCDUHandler.cpp
+++ b/mission/devices/PCDUHandler.cpp
@@ -51,7 +51,8 @@ ReturnValue_t PCDUHandler::initialize() {
     return RETURN_FAILED;
   }
   result = pdu2Handler->getSubscriptionInterface()->subscribeForSetUpdateMessage(
-      PDU2::HK_TABLE_DATA_SET_ID, this->getObjectId(), commandQueue->getId(), true);
+      static_cast<uint32_t>(P60System::SetIds::PDU_2), this->getObjectId(), commandQueue->getId(),
+      true);
   if (result != RETURN_OK) {
     sif::error << "PCDUHandler::initialize: Failed to subscribe for set update messages from "
                << "PDU2Handler" << std::endl;
@@ -66,7 +67,8 @@ ReturnValue_t PCDUHandler::initialize() {
     return RETURN_FAILED;
   }
   result = pdu1Handler->getSubscriptionInterface()->subscribeForSetUpdateMessage(
-      PDU1::HK_TABLE_DATA_SET_ID, this->getObjectId(), commandQueue->getId(), true);
+      static_cast<uint32_t>(P60System::SetIds::PDU_1), this->getObjectId(), commandQueue->getId(),
+      true);
   if (result != RETURN_OK) {
     sif::error << "PCDUHandler::initialize: Failed to subscribe for set update messages from "
                << "PDU1Handler" << std::endl;
@@ -101,10 +103,10 @@ void PCDUHandler::readCommandQueue() {
 MessageQueueId_t PCDUHandler::getCommandQueue() const { return commandQueue->getId(); }
 
 void PCDUHandler::handleChangedDataset(sid_t sid, store_address_t storeId, bool* clearMessage) {
-  if (sid == sid_t(objects::PDU2_HANDLER, PDU2::HK_TABLE_DATA_SET_ID)) {
+  if (sid == sid_t(objects::PDU2_HANDLER, static_cast<uint32_t>(P60System::SetIds::PDU_2))) {
     updateHkTableDataset(storeId, &pdu2HkTableDataset, &timeStampPdu2HkDataset);
     updatePdu2SwitchStates();
-  } else if (sid == sid_t(objects::PDU1_HANDLER, PDU1::HK_TABLE_DATA_SET_ID)) {
+  } else if (sid == sid_t(objects::PDU1_HANDLER, static_cast<uint32_t>(P60System::SetIds::PDU_1))) {
     updateHkTableDataset(storeId, &pdu1HkTableDataset, &timeStampPdu1HkDataset);
     updatePdu1SwitchStates();
   } else {
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index 4b277b40..93fe9e6b 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -43,6 +43,8 @@ static const DeviceCommandId_t PRINT_LATCHUPS = 33;
 
 namespace P60System {
 
+enum class SetIds : uint32_t { PDU_1 = 1, PDU_2 = 2, P60_CORE = 3, P60_AUX = 4, ACU = 5 };
+
 namespace pool {
 
 enum Ids : lp_id_t {
@@ -351,9 +353,6 @@ static const uint16_t MAX_CONFIGTABLE_ADDRESS = 408;
 static const uint16_t MAX_HKTABLE_ADDRESS = 187;
 static const uint16_t HK_TABLE_SIZE = 188;
 
-static constexpr uint32_t CORE_TABLE_SET_ID = 0x3;
-static constexpr uint32_t AUX_TABLE_DATA_SET_ID = 0x4;
-
 static const uint8_t HK_TABLE_ENTRIES = 100;
 
 /**
@@ -364,9 +363,11 @@ static const uint16_t HK_TABLE_REPLY_SIZE = 407;
 
 class CoreHkSet : public StaticLocalDataSet<16> {
  public:
-  CoreHkSet(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, CORE_TABLE_SET_ID) {}
+  CoreHkSet(HasLocalDataPoolIF* owner)
+      : StaticLocalDataSet(owner, static_cast<uint32_t>(::P60System::SetIds::P60_CORE)) {}
 
-  CoreHkSet(object_id_t objectId) : StaticLocalDataSet(sid_t(objectId, CORE_TABLE_SET_ID)) {}
+  CoreHkSet(object_id_t objectId)
+      : StaticLocalDataSet(sid_t(objectId, static_cast<uint32_t>(::P60System::SetIds::P60_CORE))) {}
 
   /** Measured output currents */
   lp_vec_t<int16_t, P60Dock::hk::Index::CHNLS_LEN> currents =
@@ -406,10 +407,16 @@ class CoreHkSet : public StaticLocalDataSet<16> {
  */
 class HkTableDataset : public StaticLocalDataSet<32> {
  public:
-  HkTableDataset(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, AUX_TABLE_DATA_SET_ID) {}
+  HkTableDataset(HasLocalDataPoolIF* owner)
+      : StaticLocalDataSet(owner, static_cast<uint32_t>(::P60System::SetIds::P60_AUX)) {}
 
   HkTableDataset(object_id_t objectId)
-      : StaticLocalDataSet(sid_t(objectId, AUX_TABLE_DATA_SET_ID)) {}
+      : StaticLocalDataSet(sid_t(objectId, static_cast<uint32_t>(::P60System::SetIds::P60_AUX))) {}
+
+  /** Number of detected latchups on each output channel */
+  lp_vec_t<uint16_t, P60Dock::hk::Index::CHNLS_LEN> latchups =
+      lp_vec_t<uint16_t, P60Dock::hk::Index::CHNLS_LEN>(sid.objectId, P60System::pool::LATCHUPS,
+                                                        this);
 
   lp_var_t<uint32_t> bootcause =
       lp_var_t<uint32_t>(sid.objectId, P60System::pool::P60DOCK_BOOT_CAUSE, this);
@@ -424,11 +431,6 @@ class HkTableDataset : public StaticLocalDataSet<32> {
   lp_var_t<uint8_t> converter5VStatus =
       lp_var_t<uint8_t>(sid.objectId, P60System::pool::P60DOCK_CONV_5V_ENABLE_STATUS, this);
 
-  /** Number of detected latchups on each output channel */
-  lp_vec_t<uint16_t, P60Dock::hk::Index::CHNLS_LEN> latchups =
-      lp_vec_t<uint16_t, P60Dock::hk::Index::CHNLS_LEN>(sid.objectId, P60System::pool::LATCHUPS,
-                                                        this);
-
   lp_var_t<uint16_t> dockVbatVoltageValue =
       lp_var_t<uint16_t>(sid.objectId, P60System::pool::P60DOCK_DOCK_VBAT, this);
   lp_var_t<int16_t> dockVccCurrent =
@@ -439,11 +441,6 @@ class HkTableDataset : public StaticLocalDataSet<32> {
   lp_var_t<int16_t> batteryTemperature2 =
       lp_var_t<int16_t>(sid.objectId, P60System::pool::P60DOCK_BATTERY_TEMPERATURE_2, this);
 
-  lp_vec_t<uint8_t, P60Dock::NUM_DEVS> devicesType =
-      lp_vec_t<uint8_t, P60Dock::NUM_DEVS>(sid.objectId, P60System::pool::DEVICES_TYPE, this);
-  lp_vec_t<uint8_t, P60Dock::NUM_DEVS> devicesStatus =
-      lp_vec_t<uint8_t, P60Dock::NUM_DEVS>(sid.objectId, P60System::pool::DEVICES_STATUS, this);
-
   lp_var_t<uint8_t> dearmStatus =
       lp_var_t<uint8_t>(sid.objectId, P60System::pool::P60DOCK_DEARM_STATUS, this);
 
@@ -477,6 +474,11 @@ class HkTableDataset : public StaticLocalDataSet<32> {
       lp_var_t<int8_t>(sid.objectId, P60System::pool::P60DOCK_ANT6_DEPL, this);
   lp_var_t<int8_t> ar6Depl =
       lp_var_t<int8_t>(sid.objectId, P60System::pool::P60DOCK_AR6_DEPL, this);
+
+  lp_vec_t<uint8_t, P60Dock::NUM_DEVS> devicesType =
+      lp_vec_t<uint8_t, P60Dock::NUM_DEVS>(sid.objectId, P60System::pool::DEVICES_TYPE, this);
+  lp_vec_t<uint8_t, P60Dock::NUM_DEVS> devicesStatus =
+      lp_vec_t<uint8_t, P60Dock::NUM_DEVS>(sid.objectId, P60System::pool::DEVICES_STATUS, this);
 };
 }  // namespace P60Dock
 
@@ -494,7 +496,6 @@ static const uint8_t HK_TABLE_ENTRIES = 73;
 }  // namespace PDU
 
 namespace PDU1 {
-static const uint32_t HK_TABLE_DATA_SET_ID = 0x1;  // hk table has table id 4
 
 enum SwitchChannels : uint8_t {
   TCS_BOARD_3V3 = 0,
@@ -527,10 +528,11 @@ static const uint16_t CONFIG_ADDRESS_OUT_EN_CHANNEL8 = 0x50;
  */
 class PDU1HkTableDataset : public StaticLocalDataSet<PDU::HK_TABLE_ENTRIES> {
  public:
-  PDU1HkTableDataset(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, HK_TABLE_DATA_SET_ID) {}
+  PDU1HkTableDataset(HasLocalDataPoolIF* owner)
+      : StaticLocalDataSet(owner, static_cast<uint32_t>(::P60System::SetIds::PDU_1)) {}
 
   PDU1HkTableDataset(object_id_t objectId)
-      : StaticLocalDataSet(sid_t(objectId, HK_TABLE_DATA_SET_ID)) {}
+      : StaticLocalDataSet(sid_t(objectId, static_cast<uint32_t>(::P60System::SetIds::PDU_1))) {}
 
   /** Measured output currents */
   lp_var_t<int16_t> currentOutTCSBoard3V3 =
@@ -698,7 +700,6 @@ class PDU1HkTableDataset : public StaticLocalDataSet<PDU::HK_TABLE_ENTRIES> {
 }  // namespace PDU1
 
 namespace PDU2 {
-static const uint32_t HK_TABLE_DATA_SET_ID = 0x2;
 
 enum SwitchChannels : uint8_t {
   Q7S = 0,
@@ -731,10 +732,11 @@ static const uint16_t CONFIG_ADDRESS_OUT_EN_PAYLOAD_CAMERA = 0x50;
  */
 class PDU2HkTableDataset : public StaticLocalDataSet<PDU::HK_TABLE_ENTRIES> {
  public:
-  PDU2HkTableDataset(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, HK_TABLE_DATA_SET_ID) {}
+  PDU2HkTableDataset(HasLocalDataPoolIF* owner)
+      : StaticLocalDataSet(owner, static_cast<uint32_t>(::P60System::SetIds::PDU_2)) {}
 
   PDU2HkTableDataset(object_id_t objectId)
-      : StaticLocalDataSet(sid_t(objectId, HK_TABLE_DATA_SET_ID)) {}
+      : StaticLocalDataSet(sid_t(objectId, static_cast<uint32_t>(::P60System::SetIds::PDU_2))) {}
 
   /** Measured output currents */
   lp_var_t<int16_t> currentOutQ7S =
@@ -903,8 +905,6 @@ class PDU2HkTableDataset : public StaticLocalDataSet<PDU::HK_TABLE_ENTRIES> {
 
 namespace ACU {
 
-static const uint32_t HK_TABLE_DATA_SET_ID = 0x4;
-
 /* When receiving full housekeeping (telemetry) table */
 static const uint16_t MAX_REPLY_LENGTH = 262;
 static const uint16_t MAX_CONFIGTABLE_ADDRESS = 26;
@@ -917,10 +917,11 @@ static const uint16_t HK_TABLE_REPLY_SIZE = 262;
  */
 class HkTableDataset : public StaticLocalDataSet<HK_TABLE_ENTRIES> {
  public:
-  HkTableDataset(HasLocalDataPoolIF* owner) : StaticLocalDataSet(owner, HK_TABLE_DATA_SET_ID) {}
+  HkTableDataset(HasLocalDataPoolIF* owner)
+      : StaticLocalDataSet(owner, static_cast<uint32_t>(::P60System::SetIds::ACU)) {}
 
   HkTableDataset(object_id_t objectId)
-      : StaticLocalDataSet(sid_t(objectId, HK_TABLE_DATA_SET_ID)) {}
+      : StaticLocalDataSet(sid_t(objectId, static_cast<uint32_t>(::P60System::SetIds::ACU))) {}
 
   lp_var_t<int16_t> currentInChannel0 =
       lp_var_t<int16_t>(sid.objectId, P60System::pool::ACU_CURRENT_IN_CHANNEL0, this);
diff --git a/tmtc b/tmtc
index 8f2ff303..ab5cca85 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 8f2ff3034fff627b807f32c02fd9e676126bae5f
+Subproject commit ab5cca85bfb71875ba0c49e8ed6ef575f851c0c5

From 64b3afae22c835e8d19ecd5822d2bd31d7e6f301 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 13:07:28 +0200
Subject: [PATCH 03/12] new event for battery mode: broadcast and changed

---
 common/config/commonSubsystemIds.h                  |  4 ++++
 mission/devices/P60DockHandler.cpp                  | 13 ++++++++++++-
 mission/devices/P60DockHandler.h                    |  9 +++++++++
 .../devices/devicedefinitions/GomspaceDefinitions.h |  2 ++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/common/config/commonSubsystemIds.h b/common/config/commonSubsystemIds.h
index a93986a1..f7a8ee3a 100644
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@@ -24,6 +24,10 @@ enum: uint8_t {
 	ACS_BOARD_ASS = 123,
 	SUS_BOARD_ASS = 124,
 	TCS_BOARD_ASS = 125,
+	P60_DOCK_HANDLER = 126,
+	PDU1_HANDLER = 127,
+	PDU2_HANDLER = 128,
+	ACU_HANDLER = 129,
 	COMMON_SUBSYSTEM_ID_END
 };
 }
diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index 9a337687..b7a84159 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -116,8 +116,16 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
                  *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
   dataOffset += 6;
   auxHk.resetcause = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+
   dataOffset += 4;
-  coreHk.battMode = *(packet + dataOffset);
+  uint8_t newBattMode = packet[dataOffset];
+  if (firstHk) {
+    triggerEvent(BATT_MODE, newBattMode);
+  } else if (newBattMode != coreHk.battMode.value) {
+    triggerEvent(BATT_MODE_CHANGED, coreHk.battMode.value, newBattMode);
+  }
+  coreHk.battMode = newBattMode;
+
   dataOffset += 3;
   auxHk.heaterOn = *(packet + dataOffset);
   /* + 13 because here begins a new gomspace csp data field */
@@ -195,6 +203,9 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   auxHk.ant6Depl = *(packet + dataOffset);
   dataOffset += 3;
   auxHk.ar6Depl = *(packet + dataOffset);
+  if (firstHk) {
+    firstHk = false;
+  }
   coreHk.setValidity(true, true);
   auxHk.setValidity(true, true);
 }
diff --git a/mission/devices/P60DockHandler.h b/mission/devices/P60DockHandler.h
index 47484680..feb52edc 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/devices/P60DockHandler.h
@@ -4,6 +4,7 @@
 #include <mission/devices/devicedefinitions/GomspaceDefinitions.h>
 
 #include "GomspaceDeviceHandler.h"
+#include "commonSubsystemIds.h"
 
 /**
  * @brief   Device handler for the P60Dock. The P60Dock serves as carrier for the ACU, PDU1 and
@@ -11,6 +12,13 @@
  */
 class P60DockHandler : public GomspaceDeviceHandler {
  public:
+  static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::P60_DOCK_HANDLER;
+
+  //! [EXPORT] : [COMMENT] Battery mode is broadcasted at startup. P1: Mode
+  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
+  //! [EXPORT] : [COMMENT] Battery mode has changed. P1: Old mode. P2: New mode
+  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
+
   P60DockHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
   virtual ~P60DockHandler();
 
@@ -39,6 +47,7 @@ class P60DockHandler : public GomspaceDeviceHandler {
  private:
   P60Dock::CoreHkSet coreHk;
   P60Dock::HkTableDataset auxHk;
+  bool firstHk = true;
   static constexpr uint8_t MAX_CHANNEL_STR_WIDTH = 16;
 
   PoolEntry<int16_t> hkCurrents = PoolEntry<int16_t>(P60Dock::hk::CHNLS_LEN);
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index 93fe9e6b..8b19c909 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -43,6 +43,8 @@ static const DeviceCommandId_t PRINT_LATCHUPS = 33;
 
 namespace P60System {
 
+enum class BatteryModes : uint8_t { CRITICAL = 1, SAFE = 2, NORMAL = 3, FULL = 4 };
+
 enum class SetIds : uint32_t { PDU_1 = 1, PDU_2 = 2, P60_CORE = 3, P60_AUX = 4, ACU = 5 };
 
 namespace pool {

From d570b5c4608cdaea8092c7a72eeff5dd5cb30267 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 13:08:20 +0200
Subject: [PATCH 04/12] use different severities

---
 mission/devices/P60DockHandler.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mission/devices/P60DockHandler.h b/mission/devices/P60DockHandler.h
index feb52edc..4f5589b6 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/devices/P60DockHandler.h
@@ -15,9 +15,9 @@ class P60DockHandler : public GomspaceDeviceHandler {
   static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::P60_DOCK_HANDLER;
 
   //! [EXPORT] : [COMMENT] Battery mode is broadcasted at startup. P1: Mode
-  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
+  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 0, severity::INFO);
   //! [EXPORT] : [COMMENT] Battery mode has changed. P1: Old mode. P2: New mode
-  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
+  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 1, severity::MEDIUM);
 
   P60DockHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
   virtual ~P60DockHandler();

From 0e7cd7de6f2915ec57e2c65f674e088cb4cc5d24 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 13:11:20 +0200
Subject: [PATCH 05/12] add p60 boot count broadcast

---
 mission/devices/P60DockHandler.cpp | 3 +++
 mission/devices/P60DockHandler.h   | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mission/devices/P60DockHandler.cpp b/mission/devices/P60DockHandler.cpp
index b7a84159..d37673fc 100644
--- a/mission/devices/P60DockHandler.cpp
+++ b/mission/devices/P60DockHandler.cpp
@@ -111,6 +111,9 @@ void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
   dataOffset += 6;
   coreHk.bootCount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  if(firstHk) {
+    triggerEvent(P60_BOOT_COUNT, coreHk.bootCount.value);
+  }
   dataOffset += 6;
   auxHk.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
                  *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
diff --git a/mission/devices/P60DockHandler.h b/mission/devices/P60DockHandler.h
index 4f5589b6..d08a46e0 100644
--- a/mission/devices/P60DockHandler.h
+++ b/mission/devices/P60DockHandler.h
@@ -14,10 +14,12 @@ class P60DockHandler : public GomspaceDeviceHandler {
  public:
   static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::P60_DOCK_HANDLER;
 
+  //! [EXPORT] : [COMMENT] P60 boot count is broadcasted once at SW startup. P1: Boot count
+  static constexpr Event P60_BOOT_COUNT = event::makeEvent(SUBSYSTEM_ID, 0, severity::INFO);
   //! [EXPORT] : [COMMENT] Battery mode is broadcasted at startup. P1: Mode
-  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 0, severity::INFO);
+  static constexpr Event BATT_MODE = event::makeEvent(SUBSYSTEM_ID, 1, severity::INFO);
   //! [EXPORT] : [COMMENT] Battery mode has changed. P1: Old mode. P2: New mode
-  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 1, severity::MEDIUM);
+  static constexpr Event BATT_MODE_CHANGED = event::makeEvent(SUBSYSTEM_ID, 2, severity::MEDIUM);
 
   P60DockHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
   virtual ~P60DockHandler();

From 796b814b49b07d9b38199356f105a7cfa36fa7de Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 17:23:50 +0200
Subject: [PATCH 06/12] Add time file handling

---
 bsp_q7s/core/CoreController.cpp               | 74 +++++++++++++++++++
 bsp_q7s/core/CoreController.h                 | 10 +++
 common/config/commonSubsystemIds.h            | 38 +++++-----
 fsfw                                          |  2 +-
 linux/devices/GPSHyperionLinuxController.cpp  |  6 +-
 linux/devices/GPSHyperionLinuxController.h    |  3 +
 .../devicedefinitions/GPSDefinitions.h        | 13 ++++
 tmtc                                          |  2 +-
 8 files changed, 127 insertions(+), 21 deletions(-)

diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index b0b7213c..c39caa12 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -8,6 +8,7 @@
 #include "fsfw/timemanager/Stopwatch.h"
 #include "fsfw/version.h"
 #include "watchdogConf.h"
+#include <algorithm>
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #else
@@ -57,6 +58,16 @@ ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) {
 }
 
 void CoreController::performControlOperation() {
+  EventMessage event;
+  for (ReturnValue_t result = eventQueue->receiveMessage(&event); result == RETURN_OK;
+       result = eventQueue->receiveMessage(&event)) {
+    switch (event.getEvent()) {
+    case(GpsHyperion::GPS_FIX_CHANGE): {
+      gpsFix = static_cast<GpsHyperion::FixMode>(event.getParameter2());
+      break;
+    }
+    }
+  }
   performWatchdogControlOperation();
   sdStateMachine();
   performMountedSdCardOperations();
@@ -91,6 +102,17 @@ ReturnValue_t CoreController::initialize() {
   sdStateMachine();
 
   triggerEvent(REBOOT_SW, CURRENT_CHIP, CURRENT_COPY);
+  EventManagerIF* eventManager = ObjectManager::instance()->get<EventManagerIF>(
+      objects::EVENT_MANAGER);
+  result = eventManager->registerListener(eventQueue->getId());
+  if(result != HasReturnvaluesIF::RETURN_OK) {
+    sif::warning << "CoreController::initialize: Registering as event listener failed" << std::endl;
+  }
+  result = eventManager->subscribeToEvent(this->getCommandQueue(),
+      event::getEventId(GpsHyperion::GPS_FIX_CHANGE));
+  if(result != HasReturnvaluesIF::RETURN_OK) {
+    sif::warning << "Subscribing for GPS GPS_FIX_CHANGE event failed" << std::endl;
+  }
   return ExtendedControllerBase::initialize();
 }
 
@@ -1211,6 +1233,7 @@ void CoreController::performMountedSdCardOperations() {
       doPerformMountedSdCardOps = false;
     }
   }
+  timeFileHandler();
 }
 
 void CoreController::performRebootFileHandling(bool recreateFile) {
@@ -1657,6 +1680,51 @@ void CoreController::setRebootMechanismLock(bool lock, xsc::Chip tgtChip, xsc::C
   rewriteRebootFile(rebootFile);
 }
 
+ReturnValue_t CoreController::timeFileHandler() {
+  if(gpsFix == GpsHyperion::FixMode::FIX_2D or gpsFix == GpsHyperion::FixMode::FIX_3D) {
+    // It is assumed that the system time is set from the GPS time
+    timeval currentTime = {};
+    ReturnValue_t result = Clock::getClock_timeval(&currentTime);
+    if(result != HasReturnvaluesIF::RETURN_OK) {
+      return result;
+    }
+    std::ofstream timeFile(TIME_FILE);
+    timeFile << "UNIX SECONDS: " << currentTime.tv_sec;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t CoreController::initClockFromTimeFile() {
+  using namespace GpsHyperion;
+  using namespace std;
+  if ((gpsFix == FixMode::UNKNOWN or gpsFix == FixMode::NOT_SEEN) and
+      std::filesystem::exists(TIME_FILE)) {
+
+    ifstream timeFile(TIME_FILE);
+    string nextWord;
+    getline(timeFile, nextWord);
+    istringstream iss(nextWord);
+    iss >> nextWord;
+    if(iss.bad() or nextWord != "UNIX") {
+      return RETURN_FAILED;
+    }
+    iss >> nextWord;
+    if(iss.bad() or nextWord != "SECONDS:") {
+      return RETURN_FAILED;
+    }
+    iss >> nextWord;
+    timeval currentTime = {};
+    char* checkPtr;
+    currentTime.tv_sec = strtol(nextWord.c_str(), &checkPtr, 10);
+    if(iss.bad() or *checkPtr) {
+      return RETURN_FAILED;
+    }
+    Clock::setClock(&currentTime);
+    return RETURN_OK;
+  }
+  return RETURN_OK;
+}
+
 void CoreController::readHkData() {
   ReturnValue_t result = RETURN_OK;
   result = hkSet.read(TIMEOUT_TYPE, MUTEX_TIMEOUT);
@@ -1690,3 +1758,9 @@ void CoreController::readHkData() {
     return;
   }
 }
+
+bool CoreController::isNumber(const std::string& s)
+{
+    return !s.empty() && std::find_if(s.begin(),
+        s.end(), [](unsigned char c) { return !std::isdigit(c); }) == s.end();
+}
diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index e31378ef..05ec6315 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -7,6 +7,7 @@
 #include <cstddef>
 
 #include "CoreDefinitions.h"
+#include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "bsp_q7s/memory/SdCardManager.h"
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
@@ -53,10 +54,13 @@ class CoreController : public ExtendedControllerBase {
   static constexpr char CONF_FOLDER[] = "conf";
   static constexpr char VERSION_FILE_NAME[] = "version.txt";
   static constexpr char REBOOT_FILE_NAME[] = "reboot.txt";
+  static constexpr char TIME_FILE_NAME[] = "time.txt";
   const std::string VERSION_FILE =
       "/" + std::string(CONF_FOLDER) + "/" + std::string(VERSION_FILE_NAME);
   const std::string REBOOT_FILE =
       "/" + std::string(CONF_FOLDER) + "/" + std::string(REBOOT_FILE_NAME);
+  const std::string TIME_FILE =
+      "/" + std::string(CONF_FOLDER) + "/" + std::string(TIME_FILE_NAME);
 
   static constexpr ActionId_t LIST_DIRECTORY_INTO_FILE = 0;
   static constexpr ActionId_t SWITCH_REBOOT_FILE_HANDLING = 5;
@@ -126,6 +130,7 @@ class CoreController : public ExtendedControllerBase {
   // Designated value for rechecking FIFO open
   static constexpr int RETRY_FIFO_OPEN = -2;
   int watchdogFifoFd = 0;
+  GpsHyperion::FixMode gpsFix = GpsHyperion::FixMode::UNKNOWN;
 
   // States for SD state machine, which is used in non-blocking mode
   enum class SdStates {
@@ -151,6 +156,7 @@ class CoreController : public ExtendedControllerBase {
   static constexpr bool BLOCKING_SD_INIT = false;
 
   SdCardManager* sdcMan = nullptr;
+  MessageQueueIF* eventQueue = nullptr;
 
   struct SdInfo {
     sd::SdCard pref = sd::SdCard::NONE;
@@ -192,6 +198,9 @@ class CoreController : public ExtendedControllerBase {
   ReturnValue_t checkModeCommand(Mode_t mode, Submode_t submode, uint32_t* msToReachTheMode);
   void performMountedSdCardOperations();
   ReturnValue_t initVersionFile();
+
+  ReturnValue_t initClockFromTimeFile();
+  ReturnValue_t timeFileHandler();
   ReturnValue_t initBootCopy();
   ReturnValue_t initWatchdogFifo();
   ReturnValue_t initSdCardBlocking();
@@ -226,6 +235,7 @@ class CoreController : public ExtendedControllerBase {
   bool parseRebootFile(std::string path, RebootFile& file);
   void rewriteRebootFile(RebootFile file);
   void readHkData();
+  bool isNumber(const std::string& s);
 };
 
 #endif /* BSP_Q7S_CORE_CORECONTROLLER_H_ */
diff --git a/common/config/commonSubsystemIds.h b/common/config/commonSubsystemIds.h
index a93986a1..aa86aae2 100644
--- a/common/config/commonSubsystemIds.h
+++ b/common/config/commonSubsystemIds.h
@@ -6,24 +6,26 @@
 namespace SUBSYSTEM_ID {
 enum: uint8_t {
 	COMMON_SUBSYSTEM_ID_START = FW_SUBSYSTEM_ID_RANGE,
-	PCDU_HANDLER = 108,
-	HEATER_HANDLER = 109,
-	SA_DEPL_HANDLER = 110,
-	PLOC_MPSOC_HANDLER = 111,
-	IMTQ_HANDLER = 112,
-	RW_HANDLER = 113,
-	STR_HANDLER = 114,
-	PLOC_SUPERVISOR_HANDLER = 115,
-	FILE_SYSTEM = 116,
-	PLOC_UPDATER = 117,
-	PLOC_MEMORY_DUMPER = 118,
-	PDEC_HANDLER = 119,
-	STR_HELPER = 120,
-	PLOC_MPSOC_HELPER = 121,
-	PL_PCDU_HANDLER = 122,
-	ACS_BOARD_ASS = 123,
-	SUS_BOARD_ASS = 124,
-	TCS_BOARD_ASS = 125,
+	ACS_SUBSYSTEM = 112,
+	PCDU_HANDLER = 113,
+	HEATER_HANDLER = 114,
+	SA_DEPL_HANDLER = 115,
+	PLOC_MPSOC_HANDLER = 116,
+	IMTQ_HANDLER = 117,
+	RW_HANDLER = 118,
+	STR_HANDLER = 119,
+	PLOC_SUPERVISOR_HANDLER = 120,
+	FILE_SYSTEM = 121,
+	PLOC_UPDATER = 122,
+	PLOC_MEMORY_DUMPER = 123,
+	PDEC_HANDLER = 124,
+	STR_HELPER = 125,
+	PLOC_MPSOC_HELPER = 126,
+	PL_PCDU_HANDLER = 127,
+	ACS_BOARD_ASS = 128,
+	SUS_BOARD_ASS = 129,
+	TCS_BOARD_ASS = 130,
+	GPS_HANDLER = 131,
 	COMMON_SUBSYSTEM_ID_END
 };
 }
diff --git a/fsfw b/fsfw
index a11d7455..5bda877d 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit a11d7455dfaf2e736f73f6c4dda1f8c06b9f1234
+Subproject commit 5bda877d97b41e82bf36d939c9f367cef611446a
diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 34e02001..6d19d274 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -132,7 +132,11 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   }
 
   // 0: Not seen, 1: No fix, 2: 2D-Fix, 3: 3D-Fix
-  gpsSet.fixMode.value = gps->fix.mode;
+  int newFixMode = gps->fix.mode;
+  if(gpsSet.fixMode.value != newFixMode) {
+    triggerEvent(GpsHyperion::GPS_FIX_CHANGE, gpsSet.fixMode.value, newFixMode);
+  }
+  gpsSet.fixMode.value = newFixMode;
   if (gps->fix.mode == 0 or gps->fix.mode == 1) {
     if (modeCommanded and maxTimeToReachFix.hasTimedOut()) {
       // We are supposed to be on and functioning, but not fix was found
diff --git a/linux/devices/GPSHyperionLinuxController.h b/linux/devices/GPSHyperionLinuxController.h
index 46acb5fc..ac8a4735 100644
--- a/linux/devices/GPSHyperionLinuxController.h
+++ b/linux/devices/GPSHyperionLinuxController.h
@@ -2,6 +2,7 @@
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
 #include "fsfw/FSFW.h"
+#include "commonSubsystemIds.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
@@ -22,6 +23,8 @@
 class GPSHyperionLinuxController : public ExtendedControllerBase {
  public:
   static constexpr uint32_t MAX_SECONDS_TO_REACH_FIX = 60 * 60 * 5;
+
+
   GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId,
                              bool debugHyperionGps = false);
   virtual ~GPSHyperionLinuxController();
diff --git a/mission/devices/devicedefinitions/GPSDefinitions.h b/mission/devices/devicedefinitions/GPSDefinitions.h
index 5a565fea..bf3fbe52 100644
--- a/mission/devices/devicedefinitions/GPSDefinitions.h
+++ b/mission/devices/devicedefinitions/GPSDefinitions.h
@@ -6,6 +6,19 @@
 
 namespace GpsHyperion {
 
+enum class FixMode: uint8_t {
+  NOT_SEEN = 0,
+  NO_FIX = 1,
+  FIX_2D = 2,
+  FIX_3D = 3,
+  UNKNOWN = 4
+};
+
+static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::GPS_HANDLER;
+//! [EXPORT] : [COMMENT] Fix has changed. P1: Old fix. P2: New fix
+//! 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix
+static constexpr Event GPS_FIX_CHANGE = event::makeEvent(SUBSYSTEM_ID, 0, severity::INFO);
+
 static constexpr DeviceCommandId_t GPS_REPLY = 0;
 static constexpr DeviceCommandId_t TRIGGER_RESET_PIN = 5;
 
diff --git a/tmtc b/tmtc
index 8f2ff303..25bab108 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 8f2ff3034fff627b807f32c02fd9e676126bae5f
+Subproject commit 25bab108df76045e10af2efc26a0397f78574f9c

From 45007d726dde08e7ffba3eea2d6ed6a6633f9506 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 7 Apr 2022 17:28:58 +0200
Subject: [PATCH 07/12] update translation files

---
 generators/bsp_q7s_events.csv                 | 198 +++---
 generators/bsp_q7s_returnvalues.csv           | 600 +++++++++---------
 generators/events/translateEvents.cpp         | 318 +++++-----
 generators/objects/translateObjects.cpp       |   2 +-
 linux/fsfwconfig/events/translateEvents.cpp   | 318 +++++-----
 linux/fsfwconfig/objects/translateObjects.cpp |   2 +-
 tmtc                                          |   2 +-
 7 files changed, 727 insertions(+), 713 deletions(-)

diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv
index 994e7517..e66bc16d 100644
--- a/generators/bsp_q7s_events.csv
+++ b/generators/bsp_q7s_events.csv
@@ -77,104 +77,106 @@
 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
-10800;0x2a30;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
-10801;0x2a31;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
-10802;0x2a32;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-10900;0x2a94;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
-10901;0x2a95;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
-10902;0x2a96;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
-10903;0x2a97;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
-10904;0x2a98;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h
-11000;0x2af8;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11001;0x2af9;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11002;0x2afa;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11003;0x2afb;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11004;0x2afc;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11101;0x2b5d;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
-11102;0x2b5e;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
-11103;0x2b5f;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
-11104;0x2b60;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
-11105;0x2b61;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
-11201;0x2bc1;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
-11202;0x2bc2;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
-11203;0x2bc3;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
-11204;0x2bc4;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
-11205;0x2bc5;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
-11206;0x2bc6;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
-11207;0x2bc7;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
-11208;0x2bc8;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
-11301;0x2c25;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/RwHandler.h
-11401;0x2c89;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
-11402;0x2c8a;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
-11501;0x2ced;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
-11502;0x2cee;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
-11503;0x2cef;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report;linux/devices/ploc/PlocSupervisorHandler.h
-11504;0x2cf0;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
-11600;0x2d50;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
-11601;0x2d51;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
-11700;0x2db4;UPDATE_FILE_NOT_EXISTS;LOW;;linux/devices/ploc/PlocUpdater.h
-11701;0x2db5;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
-11702;0x2db6;UPDATE_AVAILABLE_FAILED;LOW;Supervisor handler replied action message indicating a command execution failure of the update available command;linux/devices/ploc/PlocUpdater.h
-11703;0x2db7;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
-11704;0x2db8;UPDATE_VERIFY_FAILED;LOW;Supervisor failed to execute the update verify command.;linux/devices/ploc/PlocUpdater.h
-11705;0x2db9;UPDATE_FINISHED;INFO;MPSoC update successful completed;linux/devices/ploc/PlocUpdater.h
-11800;0x2e18;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
-11801;0x2e19;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
-11802;0x2e1a;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
-11901;0x2e7d;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
-11902;0x2e7e;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
-11903;0x2e7f;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
-11904;0x2e80;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
-12000;0x2ee0;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
-12001;0x2ee1;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
-12002;0x2ee2;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
-12003;0x2ee3;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
-12004;0x2ee4;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
-12005;0x2ee5;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
-12006;0x2ee6;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
-12007;0x2ee7;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
-12008;0x2ee8;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
-12009;0x2ee9;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
-12010;0x2eea;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
-12011;0x2eeb;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
-12012;0x2eec;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
-12013;0x2eed;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
-12014;0x2eee;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
-12015;0x2eef;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12016;0x2ef0;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12100;0x2f44;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
-12101;0x2f45;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
-12102;0x2f46;SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
-12103;0x2f47;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
-12104;0x2f48;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
-12105;0x2f49;MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12106;0x2f4a;MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12107;0x2f4b;ACK_FAILURE_REPORT;LOW;Received acknowledgement failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12108;0x2f4c;EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12109;0x2f4d;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
-12110;0x2f4e;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
-12111;0x2f4f;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
-12200;0x2fa8;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
-12201;0x2fa9;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12202;0x2faa;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12203;0x2fab;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12204;0x2fac;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12205;0x2fad;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12206;0x2fae;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12207;0x2faf;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12208;0x2fb0;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12209;0x2fb1;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12210;0x2fb2;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12211;0x2fb3;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12300;0x300c;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12301;0x300d;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12302;0x300e;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-12303;0x300f;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
-12400;0x3070;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
-12401;0x3071;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
-12402;0x3072;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
-12403;0x3073;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
-12500;0x30d4;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.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
+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
 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
diff --git a/generators/bsp_q7s_returnvalues.csv b/generators/bsp_q7s_returnvalues.csv
index 01b2f676..4d68f062 100644
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
@@ -1,13 +1,12 @@
 0x0;OK;System-wide code for ok.;RETURN_OK;HasReturnvaluesIF.h;HasReturnvaluesIF
 0x1;Failed;Unspecified system-wide code for failed.;RETURN_FAILED;HasReturnvaluesIF.h;HasReturnvaluesIF
 0x62a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;0xA0;mission/tmtc/CCSDSHandler.h;CCSDS_HANDLER
-0x68a0;SADPL_CommandNotSupported;;0xA0;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x68a1;SADPL_DeploymentAlreadyExecuting;;0xA1;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x68a2;SADPL_MainSwitchTimeoutFailure;;0xA2;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x68a3;SADPL_SwitchingDeplSa1Failed;;0xA3;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x68a4;SADPL_SwitchingDeplSa2Failed;;0xA4;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x5aa0;SUSS_ErrorUnlockMutex;;0xA0;mission/devices/SusHandler.h;SUS_HANDLER
-0x5aa1;SUSS_ErrorLockMutex;;0xA1;mission/devices/SusHandler.h;SUS_HANDLER
+0x5f00;GOMS_PacketTooLong;;0;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x5f01;GOMS_InvalidTableId;;1;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x5f02;GOMS_InvalidAddress;;2;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x5f03;GOMS_InvalidParamSize;;3;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x5f04;GOMS_InvalidPayloadSize;;4;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x5f05;GOMS_UnknownReplyId;;5;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
 0x55b0;RWHA_SpiWriteFailure;;0xB0;mission/devices/RwHandler.h;RW_HANDLER
 0x55b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;0xB1;mission/devices/RwHandler.h;RW_HANDLER
 0x55b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;0xB2;mission/devices/RwHandler.h;RW_HANDLER
@@ -20,6 +19,13 @@
 0x55a2;RWHA_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;0xA2;mission/devices/RwHandler.h;RW_HANDLER
 0x55a3;RWHA_ExecutionFailed;Command execution failed;0xA3;mission/devices/RwHandler.h;RW_HANDLER
 0x55a4;RWHA_CrcError;Reaction wheel reply has invalid crc;0xA4;mission/devices/RwHandler.h;RW_HANDLER
+0x52a1;HEATER_CommandNotSupported;;0xA1;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a2;HEATER_InitFailed;;0xA2;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a3;HEATER_InvalidSwitchNr;;0xA3;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a4;HEATER_MainSwitchSetTimeout;;0xA4;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a5;HEATER_CommandAlreadyWaiting;;0xA5;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x5aa0;SUSS_ErrorUnlockMutex;;0xA0;mission/devices/SusHandler.h;SUS_HANDLER
+0x5aa1;SUSS_ErrorLockMutex;;0xA1;mission/devices/SusHandler.h;SUS_HANDLER
 0x54a0;IMTQ_InvalidCommandCode;;0xA0;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a1;IMTQ_ParameterMissing;;0xA1;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a2;IMTQ_ParameterInvalid;;0xA2;mission/devices/IMTQHandler.h;IMTQ_HANDLER
@@ -28,17 +34,6 @@
 0x54a5;IMTQ_RejectedWithoutReason;;0xA5;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a6;IMTQ_CmdErrUnknown;;0xA6;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;0xA7;mission/devices/IMTQHandler.h;IMTQ_HANDLER
-0x52a1;HEATER_CommandNotSupported;;0xA1;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a2;HEATER_InitFailed;;0xA2;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a3;HEATER_InvalidSwitchNr;;0xA3;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a4;HEATER_MainSwitchSetTimeout;;0xA4;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a5;HEATER_CommandAlreadyWaiting;;0xA5;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x5f00;GOMS_PacketTooLong;;0;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5f01;GOMS_InvalidTableId;;1;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5f02;GOMS_InvalidAddress;;2;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5f03;GOMS_InvalidParamSize;;3;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5f04;GOMS_InvalidPayloadSize;;4;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5f05;GOMS_UnknownReplyId;;5;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
 0x53a0;SYRLINKS_CrcFailure;;0xA0;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a1;SYRLINKS_UartFraminOrParityErrorAck;;0xA1;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a2;SYRLINKS_BadCharacterAck;;0xA2;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
@@ -48,10 +43,15 @@
 0x53a6;SYRLINKS_BadCrcAck;;0xA6;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a7;SYRLINKS_ReplyWrongSize;;0xA7;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a8;SYRLINKS_MissingStartFrameCharacter;;0xA8;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
+0x68a0;SADPL_CommandNotSupported;;0xA0;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x68a1;SADPL_DeploymentAlreadyExecuting;;0xA1;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x68a2;SADPL_MainSwitchTimeoutFailure;;0xA2;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x68a3;SADPL_SwitchingDeplSa1Failed;;0xA3;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x68a4;SADPL_SwitchingDeplSa2Failed;;0xA4;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
 0x65a0;NVMB_KeyNotExists;Specified key does not exist in json file;0xA0;mission/memory/NVMParameterBase.h;NVM_PARAM_BASE
-0x4300; HSPI_OpeningFileFailed;;0;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
-0x4301; HSPI_FullDuplexTransferFailed;;1;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
-0x4302; HSPI_HalfDuplexTransferFailed;;2;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
+0x4300; HSPI_HalTimeoutRetval;;0;fsfw/hal/src/fsfw_hal/stm32h7/spi/spiDefinitions.h;HAL_SPI
+0x4301; HSPI_HalBusyRetval;;1;fsfw/hal/src/fsfw_hal/stm32h7/spi/spiDefinitions.h;HAL_SPI
+0x4302; HSPI_HalErrorRetval;;2;fsfw/hal/src/fsfw_hal/stm32h7/spi/spiDefinitions.h;HAL_SPI
 0x4401; HURT_UartReadFailure;;1;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
 0x4402; HURT_UartReadSizeMissmatch;;2;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
 0x4403; HURT_UartRxBufferTooSmall;;3;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
@@ -66,119 +66,36 @@
 0x4203; UXOS_CommandError;Command execution failed;3;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
 0x4204; UXOS_NoCommandLoadedOrPending;;4;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
 0x4206; UXOS_PcloseCallError;;6;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x3b00; LPIF_PoolEntryNotFound;;0x00;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
-0x3b01; LPIF_PoolEntryTypeConflict;;0x01;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
-0x3d00; HKM_QueueOrDestinationInvalid;;0;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d01; HKM_WrongHkPacketType;;1;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d02; HKM_ReportingStatusUnchanged;;2;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d03; HKM_PeriodicHelperInvalid;;3;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d04; HKM_PoolobjectNotFound;;4;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d05; HKM_DatasetNotFound;;5;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3501; CFDP_InvalidTlvType;;1;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3502; CFDP_InvalidDirectiveFields;;2;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3503; CFDP_InvalidPduDatafieldLen;;3;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3504; CFDP_InvalidAckDirectiveFields;;4;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3505; CFDP_MetadataCantParseOptions;;5;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3506; CFDP_FinishedCantParseFsResponses;;6;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3508; CFDP_FilestoreRequiresSecondFile;;8;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3509; CFDP_FilestoreResponseCantParseFsMessage;;9;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3101; CF_ObjectHasNoFunctions;;1;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
-0x3102; CF_AlreadyCommanding;;2;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
-0x3201; HF_IsBusy;;1;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3202; HF_InvalidParameters;;2;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3203; HF_ExecutionFinished;;3;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3204; HF_InvalidActionId;;4;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x2d01; HPA_InvalidIdentifierId;;0x01;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2d02; HPA_InvalidDomainId;;0x02;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2d03; HPA_InvalidValue;;0x03;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2d05; HPA_ReadOnly;;0x05;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2c01; PAW_UnknownDatatype;;0x01;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c02; PAW_DatatypeMissmatch;;0x02;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c03; PAW_Readonly;;0x03;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c04; PAW_TooBig;;0x04;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c05; PAW_SourceNotSet;;0x05;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c06; PAW_OutOfBounds;;0x06;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c07; PAW_NotSet;;0x07;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c08; PAW_ColumnOrRowsZero;;0x08;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x1701; HHI_ObjectNotHealthy;;1;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
-0x1702; HHI_InvalidHealthState;;2;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
-0x2701; SM_DataTooLarge;;1;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x2702; SM_DataStorageFull;;2;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x2703; SM_IllegalStorageId;;3;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x2704; SM_DataDoesNotExist;;4;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x2705; SM_IllegalAddress;;5;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x2706; SM_PoolTooLarge;;6;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x2301; MT_TooDetailedRequest;;1;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2302; MT_TooGeneralRequest;;2;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2303; MT_NoMatch;;3;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2304; MT_Full;;4;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2305; MT_NewNodeCreated;;5;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x3e01; DLEE_StreamTooShort;;0x01;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
-0x3e02; DLEE_DecodingError;;0x02;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
-0x2e01; ASC_TooLongForTargetType;;1;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
-0x2e02; ASC_InvalidCharacters;;2;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
-0x2e03; ASC_BufferTooSmall;;0x3;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
-0x1c01; TCD_PacketLost;;1;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
-0x1c02; TCD_DestinationNotFound;;2;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
-0x1c03; TCD_ServiceIdAlreadyExists;;3;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
-0x1b00; TCC_IllegalApid;;0;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b01; TCC_IncompletePacket;;1;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b02; TCC_IncorrectChecksum;;2;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b03; TCC_IllegalPacketType;;3;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b04; TCC_IllegalPacketSubtype;;4;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b05; TCC_IncorrectPrimaryHeader;;5;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b06; TCC_IncorrectSecondaryHeader;;6;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x3901; MQI_Empty;;1;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0x3902; MQI_Full;No space left for more messages;2;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0x3903; MQI_NoReplyPartner;Returned if a reply method was called without partner;3;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0x3904; MQI_DestinationInvalid;Returned if the target destination is invalid.;4;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0xf01; CM_UnknownCommand;;1;fsfw/src/fsfw/ipc/CommandMessageIF.h;COMMAND_MESSAGE
-0x3801; MUX_NotEnoughResources;;1;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3802; MUX_InsufficientMemory;;2;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3803; MUX_NoPrivilege;;3;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3804; MUX_WrongAttributeSetting;;4;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3805; MUX_MutexAlreadyLocked;;5;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3806; MUX_MutexNotFound;;6;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3807; MUX_MutexMaxLocks;;7;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3808; MUX_CurrThreadAlreadyOwnsMutex;;8;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3809; MUX_CurrThreadDoesNotOwnMutex;;9;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x380a; MUX_MutexTimeout;;10;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x380b; MUX_MutexInvalidId;;11;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x380c; MUX_MutexDestroyedWhileWaiting;;12;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x2801; TC_InvalidTargetState;;1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
-0x28f1; TC_AboveOperationalLimit;;0xF1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
-0x28f2; TC_BelowOperationalLimit;;0xF2;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
-0x801; DPS_InvalidParameterDefinition;;1;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x802; DPS_SetWasAlreadyRead;;2;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x803; DPS_CommitingWithoutReading;;3;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x804; DPS_DataSetUninitialised;;4;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x805; DPS_DataSetFull;;5;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x806; DPS_PoolVarNull;;6;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x3ca0; PVA_InvalidReadWriteMode;;0xA0;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
-0x3ca1; PVA_InvalidPoolEntry;;0xA1;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
-0xc02; MS_InvalidEntry;;0x02;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
-0xc03; MS_TooManyElements;;0x03;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
-0xc04; MS_CantStoreEmpty;;0x04;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
-0xd01; SS_SequenceAlreadyExists;;0x01;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd02; SS_TableAlreadyExists;;0x02;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd03; SS_TableDoesNotExist;;0x03;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd04; SS_TableOrSequenceLengthInvalid;;0x04;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd05; SS_SequenceDoesNotExist;;0x05;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd06; SS_TableContainsInvalidObjectId;;0x06;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd07; SS_FallbackSequenceDoesNotExist;;0x07;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd08; SS_NoTargetTable;;0x08;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd09; SS_SequenceOrTableTooLong;;0x09;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd0b; SS_IsFallbackSequence;;0x0B;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd0c; SS_AccessDenied;;0x0C;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xd0e; SS_TableInUse;;0x0E;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xda1; SS_TargetTableNotReached;;0xA1;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xda2; SS_TableCheckFailed;;0xA2;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0xb01; SB_ChildNotFound;;0x01;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb02; SB_ChildInfoUpdated;;0x02;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb03; SB_ChildDoesntHaveModes;;0x03;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb04; SB_CouldNotInsertChild;;0x04;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb05; SB_TableContainsInvalidObjectId;;0x05;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb00; SB_ConnBroken;;0;fsfw/src/fsfw/osal/common/TcpTmTcServer.h;SUBSYSTEM_BASE
+0x2b01; CCS_BcIsSetVrCommand;;0x01;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2b02; CCS_BcIsUnlockCommand;;0x02;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bb0; CCS_BcIllegalCommand;;0xB0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bb1; CCS_BoardReadingNotFinished;;0xB1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bf0; CCS_NsPositiveW;;0xF0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bf1; CCS_NsNegativeW;;0xF1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bf2; CCS_NsLockout;;0xF2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bf3; CCS_FarmInLockout;;0xF3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bf4; CCS_FarmInWait;;0xF4;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be0; CCS_WrongSymbol;;0xE0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be1; CCS_DoubleStart;;0xE1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be2; CCS_StartSymbolMissed;;0xE2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be3; CCS_EndWithoutStart;;0xE3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be4; CCS_TooLarge;;0xE4;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be5; CCS_TooShort;;0xE5;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be6; CCS_WrongTfVersion;;0xE6;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be7; CCS_WrongSpacecraftId;;0xE7;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be8; CCS_NoValidFrameType;;0xE8;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2be9; CCS_CrcFailed;;0xE9;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bea; CCS_VcNotFound;;0xEA;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2beb; CCS_ForwardingFailed;;0xEB;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bec; CCS_ContentTooLarge;;0xEC;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bed; CCS_ResidualData;;0xED;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bee; CCS_DataCorrupted;;0xEE;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bef; CCS_IllegalSegmentationFlag;;0xEF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bd0; CCS_IllegalFlagCombination;;0xD0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bd1; CCS_ShorterThanHeader;;0xD1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bd2; CCS_TooShortBlockedPacket;;0xD2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2bd3; CCS_TooShortMapExtraction;;0xD3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x3a00; SPH_ConnBroken;;0;fsfw/src/fsfw/osal/common/TcpTmTcServer.h;SEMAPHORE_IF
 0x2901; IEC_NoConfigurationTable;;0x01;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
 0x2902; IEC_NoCpuTable;;0x02;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
 0x2903; IEC_InvalidWorkspaceAddress;;0x03;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
@@ -200,26 +117,69 @@
 0x2913; IEC_ImplementationBlockingOperationCancel;;0x13;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
 0x2914; IEC_MutexObtainFromBadState;;0x14;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
 0x2915; IEC_UnlimitedAndMaximumIs0;;0x15;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x1401; SE_BufferTooShort;;1;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
-0x1402; SE_StreamTooShort;;2;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
-0x1403; SE_TooManyElements;;3;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
-0x4a00; SPPA_NoPacketFound;;0x00;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
-0x4a01; SPPA_SplitPacket;;0x01;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
-0x1d01; PUS_ActivityStarted;;1;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d02; PUS_InvalidSubservice;;2;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d03; PUS_IllegalApplicationData;;3;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d04; PUS_SendTmFailed;;4;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d05; PUS_Timeout;;5;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1f01; CSB_ExecutionComplete;;1;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f02; CSB_NoStepMessage;;2;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f03; CSB_ObjectBusy;;3;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f04; CSB_Busy;;4;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f05; CSB_InvalidTc;;5;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f06; CSB_InvalidObject;;6;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f07; CSB_InvalidReply;;7;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0xe01; HM_InvalidMode;;0x01;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0xe02; HM_TransNotAllowed;;0x02;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0xe03; HM_InTransition;;0x03;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0xe04; HM_InvalidSubmode;;0x04;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0x2d01; HPA_InvalidIdentifierId;;0x01;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2d02; HPA_InvalidDomainId;;0x02;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2d03; HPA_InvalidValue;;0x03;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2d05; HPA_ReadOnly;;0x05;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2c01; PAW_UnknownDatatype;;0x01;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c02; PAW_DatatypeMissmatch;;0x02;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c03; PAW_Readonly;;0x03;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c04; PAW_TooBig;;0x04;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c05; PAW_SourceNotSet;;0x05;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c06; PAW_OutOfBounds;;0x06;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c07; PAW_NotSet;;0x07;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c08; PAW_ColumnOrRowsZero;;0x08;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x3101; CF_ObjectHasNoFunctions;;1;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
+0x3102; CF_AlreadyCommanding;;2;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
+0x3201; HF_IsBusy;;1;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x3202; HF_InvalidParameters;;2;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x3203; HF_ExecutionFinished;;3;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x3204; HF_InvalidActionId;;4;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x201; OM_InsertionFailed;;1;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x202; OM_NotFound;;2;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x203; OM_ChildInitFailed;;3;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x204; OM_InternalErrReporterUninit;;4;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
 0x2500; FDI_YourFault;;0;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
 0x2501; FDI_MyFault;;1;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
 0x2502; FDI_ConfirmLater;;2;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
+0x2101; TMF_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2102; TMF_LastPacketFound;;2;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2103; TMF_StopFetch;;3;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2104; TMF_Timeout;;4;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2105; TMF_TmChannelFull;;5;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2106; TMF_NotStored;;6;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2107; TMF_AllDeleted;;7;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2108; TMF_InvalidData;;8;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2109; TMF_NotReady;;9;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2001; TMB_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2002; TMB_Full;;2;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2003; TMB_Empty;;3;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2004; TMB_NullRequested;;4;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2005; TMB_TooLarge;;5;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2006; TMB_NotReady;;6;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2007; TMB_DumpError;;7;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2008; TMB_CrcError;;8;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2009; TMB_Timeout;;9;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200a; TMB_IdlePacketFound;;10;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200b; TMB_TelecommandFound;;11;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200c; TMB_NoPusATm;;12;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200d; TMB_TooSmall;;13;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200e; TMB_BlockNotFound;;14;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200f; TMB_InvalidRequest;;15;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x1c01; TCD_PacketLost;;1;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
+0x1c02; TCD_DestinationNotFound;;2;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
+0x1c03; TCD_ServiceIdAlreadyExists;;3;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
+0x1b00; TCC_IllegalApid;;0;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b01; TCC_IncompletePacket;;1;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b02; TCC_IncorrectChecksum;;2;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b03; TCC_IllegalPacketType;;3;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b04; TCC_IllegalPacketSubtype;;4;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b05; TCC_IncorrectPrimaryHeader;;5;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b06; TCC_IncorrectSecondaryHeader;;6;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
 0x4e1; RMP_CommandNoDescriptorsAvailable;;0xE1;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x4e2; RMP_CommandBufferFull;;0xE2;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x4e3; RMP_CommandChannelOutOfRange;;0xE3;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
@@ -260,35 +220,12 @@
 0x40a; RMP_ReplyCommandNotImplementedOrNotAuthorised;;10;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x40b; RMP_ReplyRmwDataLengthError;;11;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x40c; RMP_ReplyInvalidTargetLogicalAddress;;12;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
-0x2b01; CCS_BcIsSetVrCommand;;0x01;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2b02; CCS_BcIsUnlockCommand;;0x02;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bb0; CCS_BcIllegalCommand;;0xB0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bb1; CCS_BoardReadingNotFinished;;0xB1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bf0; CCS_NsPositiveW;;0xF0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bf1; CCS_NsNegativeW;;0xF1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bf2; CCS_NsLockout;;0xF2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bf3; CCS_FarmInLockout;;0xF3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bf4; CCS_FarmInWait;;0xF4;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be0; CCS_WrongSymbol;;0xE0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be1; CCS_DoubleStart;;0xE1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be2; CCS_StartSymbolMissed;;0xE2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be3; CCS_EndWithoutStart;;0xE3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be4; CCS_TooLarge;;0xE4;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be5; CCS_TooShort;;0xE5;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be6; CCS_WrongTfVersion;;0xE6;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be7; CCS_WrongSpacecraftId;;0xE7;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be8; CCS_NoValidFrameType;;0xE8;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2be9; CCS_CrcFailed;;0xE9;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bea; CCS_VcNotFound;;0xEA;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2beb; CCS_ForwardingFailed;;0xEB;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bec; CCS_ContentTooLarge;;0xEC;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bed; CCS_ResidualData;;0xED;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bee; CCS_DataCorrupted;;0xEE;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bef; CCS_IllegalSegmentationFlag;;0xEF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bd0; CCS_IllegalFlagCombination;;0xD0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bd1; CCS_ShorterThanHeader;;0xD1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bd2; CCS_TooShortBlockedPacket;;0xD2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x2bd3; CCS_TooShortMapExtraction;;0xD3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
+0x2701; SM_DataTooLarge;;1;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
+0x2702; SM_DataStorageFull;;2;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
+0x2703; SM_IllegalStorageId;;3;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
+0x2704; SM_DataDoesNotExist;;4;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
+0x2705; SM_IllegalAddress;;5;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
+0x2706; SM_PoolTooLarge;;6;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
 0x37a1; SGP4_InvalidEccentricity;;0xA1;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
 0x37a2; SGP4_InvalidMeanMotion;;0xA2;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
 0x37a3; SGP4_InvalidPerturbationElements;;0xA3;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
@@ -297,10 +234,142 @@
 0x37a6; SGP4_SatelliteHasDecayed;;0xA6;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
 0x37b1; SGP4_TleTooOld;;0xB1;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
 0x37b2; SGP4_TleNotInitialized;;0xB2;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x13e0; MH_UnknownCmd;;0xE0;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x13e1; MH_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x13e2; MH_InvalidSize;;0xE2;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x13e3; MH_StateMismatch;;0xE3;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x2301; MT_TooDetailedRequest;;1;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2302; MT_TooGeneralRequest;;2;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2303; MT_NoMatch;;3;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2304; MT_Full;;4;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2305; MT_NewNodeCreated;;5;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x3e01; DLEE_StreamTooShort;;0x01;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
+0x3e02; DLEE_DecodingError;;0x02;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
+0x2e01; ASC_TooLongForTargetType;;1;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
+0x2e02; ASC_InvalidCharacters;;2;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
+0x2e03; ASC_BufferTooSmall;;0x3;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
+0xf01; CM_UnknownCommand;;1;fsfw/src/fsfw/ipc/CommandMessageIF.h;COMMAND_MESSAGE
+0x3901; MQI_Empty;;1;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3902; MQI_Full;No space left for more messages;2;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3903; MQI_NoReplyPartner;Returned if a reply method was called without partner;3;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3904; MQI_DestinationInvalid;Returned if the target destination is invalid.;4;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3801; MUX_NotEnoughResources;;1;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3802; MUX_InsufficientMemory;;2;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3803; MUX_NoPrivilege;;3;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3804; MUX_WrongAttributeSetting;;4;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3805; MUX_MutexAlreadyLocked;;5;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3806; MUX_MutexNotFound;;6;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3807; MUX_MutexMaxLocks;;7;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3808; MUX_CurrThreadAlreadyOwnsMutex;;8;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3809; MUX_CurrThreadDoesNotOwnMutex;;9;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x380a; MUX_MutexTimeout;;10;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x380b; MUX_MutexInvalidId;;11;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x380c; MUX_MutexDestroyedWhileWaiting;;12;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
+0x3a01; SPH_SemaphoreTimeout;;1;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x3a02; SPH_SemaphoreNotOwned;;2;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x3a03; SPH_SemaphoreInvalid;;3;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x3501; CFDP_InvalidTlvType;;1;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3502; CFDP_InvalidDirectiveFields;;2;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3503; CFDP_InvalidPduDatafieldLen;;3;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3504; CFDP_InvalidAckDirectiveFields;;4;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3505; CFDP_MetadataCantParseOptions;;5;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3506; CFDP_FinishedCantParseFsResponses;;6;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3508; CFDP_FilestoreRequiresSecondFile;;8;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3509; CFDP_FilestoreResponseCantParseFsMessage;;9;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x2801; TC_InvalidTargetState;;1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
+0x28f1; TC_AboveOperationalLimit;;0xF1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
+0x28f2; TC_BelowOperationalLimit;;0xF2;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
+0xc02; MS_InvalidEntry;;0x02;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
+0xc03; MS_TooManyElements;;0x03;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
+0xc04; MS_CantStoreEmpty;;0x04;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
+0xd01; SS_SequenceAlreadyExists;;0x01;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd02; SS_TableAlreadyExists;;0x02;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd03; SS_TableDoesNotExist;;0x03;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd04; SS_TableOrSequenceLengthInvalid;;0x04;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd05; SS_SequenceDoesNotExist;;0x05;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd06; SS_TableContainsInvalidObjectId;;0x06;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd07; SS_FallbackSequenceDoesNotExist;;0x07;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd08; SS_NoTargetTable;;0x08;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd09; SS_SequenceOrTableTooLong;;0x09;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd0b; SS_IsFallbackSequence;;0x0B;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd0c; SS_AccessDenied;;0x0C;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xd0e; SS_TableInUse;;0x0E;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xda1; SS_TargetTableNotReached;;0xA1;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xda2; SS_TableCheckFailed;;0xA2;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
+0xb01; SB_ChildNotFound;;0x01;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb02; SB_ChildInfoUpdated;;0x02;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb03; SB_ChildDoesntHaveModes;;0x03;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb04; SB_CouldNotInsertChild;;0x04;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb05; SB_TableContainsInvalidObjectId;;0x05;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0x3d00; HKM_QueueOrDestinationInvalid;;0;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d01; HKM_WrongHkPacketType;;1;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d02; HKM_ReportingStatusUnchanged;;2;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d03; HKM_PeriodicHelperInvalid;;3;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d04; HKM_PoolobjectNotFound;;4;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d05; HKM_DatasetNotFound;;5;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3b00; LPIF_PoolEntryNotFound;;0x00;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
+0x3b01; LPIF_PoolEntryTypeConflict;;0x01;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
+0x3ca0; PVA_InvalidReadWriteMode;;0xA0;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
+0x3ca1; PVA_InvalidPoolEntry;;0xA1;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
+0x801; DPS_InvalidParameterDefinition;;1;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x802; DPS_SetWasAlreadyRead;;2;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x803; DPS_CommitingWithoutReading;;3;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x804; DPS_DataSetUninitialised;;4;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x805; DPS_DataSetFull;;5;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x806; DPS_PoolVarNull;;6;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x1000; TIM_UnsupportedTimeFormat;;0;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1001; TIM_NotEnoughInformationForTargetFormat;;1;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1002; TIM_LengthMismatch;;2;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1003; TIM_InvalidTimeFormat;;3;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1004; TIM_InvalidDayOfYear;;4;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1005; TIM_TimeDoesNotFitFormat;;5;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x3601; TSI_BadTimestamp;;1;fsfw/src/fsfw/timemanager/TimeStamperIF.h;TIME_STAMPER_IF
+0x1d01; PUS_ActivityStarted;;1;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d02; PUS_InvalidSubservice;;2;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d03; PUS_IllegalApplicationData;;3;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d04; PUS_SendTmFailed;;4;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d05; PUS_Timeout;;5;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x4a00; SPPA_NoPacketFound;;0x00;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
+0x4a01; SPPA_SplitPacket;;0x01;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
+0x1f01; CSB_ExecutionComplete;;1;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f02; CSB_NoStepMessage;;2;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f03; CSB_ObjectBusy;;3;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f04; CSB_Busy;;4;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f05; CSB_InvalidTc;;5;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f06; CSB_InvalidObject;;6;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f07; CSB_InvalidReply;;7;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1101; AL_Full;;0x01;fsfw/src/fsfw/container/ArrayList.h;ARRAY_LIST
+0x1801; FF_Full;;1;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
+0x1802; FF_Empty;;2;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
+0x1601; FMM_MapFull;;0x01;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
+0x1602; FMM_KeyDoesNotExist;;0x02;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
+0x1501; FM_KeyAlreadyExists;;0x01;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
+0x1502; FM_MapFull;;0x02;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
+0x1503; FM_KeyDoesNotExist;;0x03;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
+0x2401; EV_ListenerNotFound;;1;fsfw/src/fsfw/events/EventManagerIF.h;EVENT_MANAGER_IF
+0x1701; HHI_ObjectNotHealthy;;1;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
+0x1702; HHI_InvalidHealthState;;2;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
+0x2f01; POS_InPowerTransition;;1;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
+0x2f02; POS_SwitchStateMismatch;;2;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
+0x501; PS_SwitchOn;;1;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x500; PS_SwitchOff;;0;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x502; PS_SwitchTimeout;;2;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x503; PS_FuseOn;;3;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x504; PS_FuseOff;;4;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x1a01; TRC_NotEnoughSensors;;1;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a02; TRC_LowestValueOol;;2;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a03; TRC_HighestValueOol;;3;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a04; TRC_BothValuesOol;;4;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a05; TRC_DuplexOol;;5;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x3001; LIM_Unchecked;;1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3002; LIM_Invalid;;2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3003; LIM_Unselected;;3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3004; LIM_BelowLowLimit;;4;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3005; LIM_AboveHighLimit;;5;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3006; LIM_UnexpectedValue;;6;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3007; LIM_OutOfRange;;7;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30a0; LIM_FirstSample;;0xA0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e0; LIM_InvalidSize;;0xE0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e1; LIM_WrongType;;0xE1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e2; LIM_WrongPid;;0xE2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e3; LIM_WrongLimitId;;0xE3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30ee; LIM_MonitorNotFound;;0xEE;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
 0x4100; FILS_GenericFileError;;0;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
 0x4101; FILS_IsBusy;;1;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
 0x4102; FILS_InvalidParameters;;2;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
@@ -326,60 +395,16 @@
 0x6e2; PP_InvalidContent;;0xE2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
 0x6e3; PP_UnalignedAccess;;0xE3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
 0x6e4; PP_WriteProtected;;0xE4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x201; OM_InsertionFailed;;1;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x202; OM_NotFound;;2;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x203; OM_ChildInitFailed;;3;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x204; OM_InternalErrReporterUninit;;4;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x501; PS_SwitchOn;;1;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x500; PS_SwitchOff;;0;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x502; PS_SwitchTimeout;;2;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x503; PS_FuseOn;;3;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x504; PS_FuseOff;;4;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x2f01; POS_InPowerTransition;;1;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
-0x2f02; POS_SwitchStateMismatch;;2;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
-0x1000; TIM_UnsupportedTimeFormat;;0;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1001; TIM_NotEnoughInformationForTargetFormat;;1;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1002; TIM_LengthMismatch;;2;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1003; TIM_InvalidTimeFormat;;3;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1004; TIM_InvalidDayOfYear;;4;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1005; TIM_TimeDoesNotFitFormat;;5;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x3601; TSI_BadTimestamp;;1;fsfw/src/fsfw/timemanager/TimeStamperIF.h;TIME_STAMPER_IF
-0x2101; TMF_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2102; TMF_LastPacketFound;;2;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2103; TMF_StopFetch;;3;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2104; TMF_Timeout;;4;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2105; TMF_TmChannelFull;;5;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2106; TMF_NotStored;;6;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2107; TMF_AllDeleted;;7;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2108; TMF_InvalidData;;8;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2109; TMF_NotReady;;9;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2001; TMB_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2002; TMB_Full;;2;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2003; TMB_Empty;;3;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2004; TMB_NullRequested;;4;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2005; TMB_TooLarge;;5;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2006; TMB_NotReady;;6;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2007; TMB_DumpError;;7;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2008; TMB_CrcError;;8;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2009; TMB_Timeout;;9;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200a; TMB_IdlePacketFound;;10;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200b; TMB_TelecommandFound;;11;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200c; TMB_NoPusATm;;12;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200d; TMB_TooSmall;;13;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200e; TMB_BlockNotFound;;14;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200f; TMB_InvalidRequest;;15;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0xe01; HM_InvalidMode;;0x01;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0xe02; HM_TransNotAllowed;;0x02;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0xe03; HM_InTransition;;0x03;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0xe04; HM_InvalidSubmode;;0x04;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0x1501; FM_KeyAlreadyExists;;0x01;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
-0x1502; FM_MapFull;;0x02;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
-0x1503; FM_KeyDoesNotExist;;0x03;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
-0x1101; AL_Full;;0x01;fsfw/src/fsfw/container/ArrayList.h;ARRAY_LIST
-0x1601; FMM_MapFull;;0x01;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
-0x1602; FMM_KeyDoesNotExist;;0x02;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
-0x1801; FF_Full;;1;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
-0x1802; FF_Empty;;2;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
+0x13e0; MH_UnknownCmd;;0xE0;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x13e1; MH_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x13e2; MH_InvalidSize;;0xE2;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x13e3; MH_StateMismatch;;0xE3;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x1201; AB_NeedSecondStep;;0x01;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
+0x1202; AB_NeedToReconfigure;;0x02;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
+0x1203; AB_ModeFallback;;0x03;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
+0x1204; AB_ChildNotCommandable;;0x04;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
+0x1205; AB_NeedToChangeHealth;;0x05;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
+0x12a1; AB_NotEnoughChildrenInCorrectState;;0xa1;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
 0x3a0; DHB_InvalidChannel;;0xA0;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
 0x3b0; DHB_AperiodicReply;;0xB0;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
 0x3b1; DHB_IgnoreReplyData;;0xB1;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
@@ -389,12 +414,12 @@
 0x3d0; DHB_NoSwitch;;0xD0;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
 0x3e0; DHB_ChildTimeout;;0xE0;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
 0x3e1; DHB_SwitchFailed;;0xE1;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
-0x1201; AB_NeedSecondStep;;0x01;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
-0x1202; AB_NeedToReconfigure;;0x02;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
-0x1203; AB_ModeFallback;;0x03;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
-0x1204; AB_ChildNotCommandable;;0x04;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
-0x1205; AB_NeedToChangeHealth;;0x05;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
-0x12a1; AB_NotEnoughChildrenInCorrectState;;0xa1;fsfw/src/fsfw/devicehandlers/AssemblyBase.h;ASSEMBLY_BASE
+0x3301; DC_NoReplyReceived;;0x01;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3302; DC_ProtocolError;;0x02;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3303; DC_Nullpointer;;0x03;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3304; DC_InvalidCookieType;;0x04;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3305; DC_NotActive;;0x05;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3306; DC_TooMuchData;;0x06;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
 0x26a0; DHI_NoCommandData;;0xA0;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
 0x26a1; DHI_CommandNotSupported;;0xA1;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
 0x26a2; DHI_CommandAlreadySent;;0xA2;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
@@ -416,34 +441,11 @@
 0x26c3; DHI_DeviceReplyInvalid;;0xC3;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
 0x26d0; DHI_InvalidCommandParameter;;0xD0;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
 0x26d1; DHI_InvalidNumberOrLengthOfParameters;;0xD1;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
-0x3301; DC_NoReplyReceived;;0x01;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3302; DC_ProtocolError;;0x02;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3303; DC_Nullpointer;;0x03;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3304; DC_InvalidCookieType;;0x04;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3305; DC_NotActive;;0x05;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3306; DC_TooMuchData;;0x06;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x2401; EV_ListenerNotFound;;1;fsfw/src/fsfw/events/EventManagerIF.h;EVENT_MANAGER_IF
-0x1a01; TRC_NotEnoughSensors;;1;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a02; TRC_LowestValueOol;;2;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a03; TRC_HighestValueOol;;3;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a04; TRC_BothValuesOol;;4;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a05; TRC_DuplexOol;;5;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x3001; LIM_Unchecked;;1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3002; LIM_Invalid;;2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3003; LIM_Unselected;;3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3004; LIM_BelowLowLimit;;4;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3005; LIM_AboveHighLimit;;5;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3006; LIM_UnexpectedValue;;6;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3007; LIM_OutOfRange;;7;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30a0; LIM_FirstSample;;0xA0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e0; LIM_InvalidSize;;0xE0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e1; LIM_WrongType;;0xE1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e2; LIM_WrongPid;;0xE2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e3; LIM_WrongLimitId;;0xE3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30ee; LIM_MonitorNotFound;;0xEE;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3a01; SPH_SemaphoreTimeout;;1;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
-0x3a02; SPH_SemaphoreNotOwned;;2;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
-0x3a03; SPH_SemaphoreInvalid;;3;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x1401; SE_BufferTooShort;;1;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
+0x1402; SE_StreamTooShort;;2;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
+0x1403; SE_TooManyElements;;3;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
+0x66a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;0xA0;bsp_q7s/memory/FilesystemHelper.h;FILE_SYSTEM_HELPER
+0x66a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;bsp_q7s/memory/FilesystemHelper.h;FILE_SYSTEM_HELPER
 0x7000; SDMA_OpOngoing;;0;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
 0x7001; SDMA_AlreadyOn;;1;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
 0x7002; SDMA_AlreadyMounted;;2;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
@@ -455,26 +457,6 @@
 0x700e; SDMA_SystemCallError;;14;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
 0x700f; SDMA_PopenCallError;;15;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
 0x7100; SCBU_KeyNotFound;;0;bsp_q7s/memory/scratchApi.h;SCRATCH_BUFFER
-0x66a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;0xA0;bsp_q7s/memory/FilesystemHelper.h;FILE_SYSTEM_HELPER
-0x66a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;bsp_q7s/memory/FilesystemHelper.h;FILE_SYSTEM_HELPER
-0x69a0;MPSOCRTVIF_CrcFailure;Space Packet received from PLOC has invalid CRC;0xA0;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a1;MPSOCRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC;0xA1;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a2;MPSOCRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC;0xA2;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a3;MPSOCRTVIF_InvalidApid;Received space packet with invalid APID from PLOC;0xA3;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a4;MPSOCRTVIF_InvalidLength;Received command with invalid length;0xA4;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a5;MPSOCRTVIF_FilenameTooLong;Filename of file in OBC filesystem is too long;0xA5;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a6;MPSOCRTVIF_MpsocHelperExecuting;MPSoC helper is currently executing a command;0xA6;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a7;MPSOCRTVIF_MpsocFilenameTooLong;Filename of MPSoC file is to long (max. 256 bytes);0xA7;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a8;MPSOCRTVIF_InvalidParameter;Command has invalid parameter;0xA8;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x57e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);0xE0;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
-0x57e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);0xE1;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
-0x60a0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
-0x60a1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;0xA1;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
-0x67a0; PLMPHLP_FileClosedAccidentally;File accidentally close;0xA0;linux/devices/ploc/PlocMPSoCHelper.h;PLOC_MPSOC_HELPER
-0x5da0;PLUD_UpdaterBusy;Updater is already performing an update;0xA0;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
-0x5da1;PLUD_NameTooLong;Received update command with invalid path string (too long).;0xA1;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
-0x5da2;PLUD_SdNotMounted;Received command to initiate update but SD card with update image not mounted.;0xA2;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
-0x5da3;PLUD_FileNotExists;Update file received with update command does not exist.;0xA3;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
 0x59a0;PLSV_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;0xA0;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
 0x59a1;PLSV_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;0xA1;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
 0x59a2;PLSV_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;0xA2;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
@@ -490,13 +472,19 @@
 0x59ac;PLSV_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;0xAC;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
 0x59ad;PLSV_PathDoesNotExist;Path to PLOC directory on SD card does not exist;0xAD;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
 0x59ae;PLSV_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;0xAE;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x59d0;PLSV_NameTooLong;Received command has file string with invalid length;0xD0;linux/devices/ploc/PlocMPSoCHandler.h;PLOC_SUPERVISOR_HANDLER
-0x6401;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
-0x6402;JSONBASE_SetNotExists;Requested set does not exist in json file;2;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
-0x6403;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
+0x67a0; PLMPHLP_FileClosedAccidentally;File accidentally close;0xA0;linux/devices/ploc/PlocMPSoCHelper.h;PLOC_MPSOC_HELPER
+0x60a0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
+0x60a1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;0xA1;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
+0x5da0;PLUD_UpdaterBusy;Updater is already performing an update;0xA0;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
+0x5da1;PLUD_NameTooLong;Received update command with invalid path string (too long).;0xA1;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
+0x5da2;PLUD_SdNotMounted;Received command to initiate update but SD card with update image not mounted.;0xA2;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
+0x5da3;PLUD_FileNotExists;Update file received with update command does not exist.;0xA3;linux/devices/ploc/PlocUpdater.h;PLOC_UPDATER
 0x56a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;0xA0;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a1;STRH_PingFailed;Ping command failed;0xA1;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a2;STRH_VersionReqFailed;Status in version reply signals error;0xA2;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
+0x6401;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
+0x6402;JSONBASE_SetNotExists;Requested set does not exist in json file;2;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
+0x6403;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
 0x56a3;STRH_InterfaceReqFailed;Status in interface reply signals error;0xA3;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a4;STRH_PowerReqFailed;Status in power reply signals error;0xA4;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a5;STRH_SetParamFailed;Status of reply to parameter set command signals error;0xA5;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
@@ -528,12 +516,20 @@
 0x5ea6;STRHLP_LengthMismatch;Length in flash write/read reply does not match expected length;0xA6;linux/devices/startracker/StrHelper.h;STR_HELPER
 0x5ea7;STRHLP_StatusError;Status field in reply signals error;0xA7;linux/devices/startracker/StrHelper.h;STR_HELPER
 0x5ea8;STRHLP_InvalidTypeId;Reply has invalid type ID (should be of action reply type);0xA8;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x69a0;MPSOCRTVIF_CrcFailure;Space Packet received from PLOC has invalid CRC;0xA0;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a1;MPSOCRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC;0xA1;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a2;MPSOCRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC;0xA2;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a3;MPSOCRTVIF_InvalidApid;Received space packet with invalid APID from PLOC;0xA3;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a4;MPSOCRTVIF_InvalidLength;Received command with invalid length;0xA4;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a5;MPSOCRTVIF_FilenameTooLong;Filename of file in OBC filesystem is too long;0xA5;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a6;MPSOCRTVIF_MpsocHelperExecuting;MPSoC helper is currently executing a command;0xA6;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a7;MPSOCRTVIF_MpsocFilenameTooLong;Filename of MPSoC file is to long (max. 256 bytes);0xA7;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a8;MPSOCRTVIF_InvalidParameter;Command has invalid parameter;0xA8;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x69a9;MPSOCRTVIF_NameTooLong;Received command has file string with invalid length;0xA9;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x57e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);0xE0;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
+0x57e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);0xE1;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
 0x5ba0;IPCI_PapbBusy;;0xA0;linux/obc/PapbVcInterface.h;CCSDS_IP_CORE_BRIDGE
 0x5ca0;PTME_UnknownVcId;;0xA0;linux/obc/Ptme.h;PTME
-0x63a0;RS_RateNotSupported;The commanded rate is not supported by the current FPGA design;0xA0;linux/obc/PtmeConfig.h;RATE_SETTER
-0x63a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);0xA1;linux/obc/PtmeConfig.h;RATE_SETTER
-0x63a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;0xA2;linux/obc/PtmeConfig.h;RATE_SETTER
-0x63a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;0xA3;linux/obc/PtmeConfig.h;RATE_SETTER
 0x61a0;PDEC_AbandonedCltu;;0xA0;linux/obc/PdecHandler.h;PDEC_HANDLER
 0x61a1;PDEC_FrameDirty;;0xA1;linux/obc/PdecHandler.h;PDEC_HANDLER
 0x61a2;PDEC_FrameIllegalMultipleReasons;;0xA2;linux/obc/PdecHandler.h;PDEC_HANDLER
@@ -549,3 +545,7 @@
 0x61ab;PDEC_InvalidVcIdLsb;;0xAB;linux/obc/PdecHandler.h;PDEC_HANDLER
 0x61ac;PDEC_NsNotZero;;0xAC;linux/obc/PdecHandler.h;PDEC_HANDLER
 0x61ae;PDEC_InvalidBcCc;;0xAE;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x63a0;RS_RateNotSupported;The commanded rate is not supported by the current FPGA design;0xA0;linux/obc/PtmeConfig.h;RATE_SETTER
+0x63a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);0xA1;linux/obc/PtmeConfig.h;RATE_SETTER
+0x63a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;0xA2;linux/obc/PtmeConfig.h;RATE_SETTER
+0x63a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;0xA3;linux/obc/PtmeConfig.h;RATE_SETTER
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index ece0bf14..7112fa87 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 181 translations.
+ * @brief    Auto-generated event translation file. Contains 183 translations.
  * @details
- * Generated on: 2022-03-28 12:48:26
+ * Generated on: 2022-04-07 17:27:42
  */
 #include "translateEvents.h"
 
@@ -102,6 +102,7 @@ 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_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";
 const char *SELF_TEST_ADC_FAILURE_STRING = "SELF_TEST_ADC_FAILURE";
@@ -178,6 +179,7 @@ const char *NOT_ENOUGH_DEVICES_DUAL_MODE_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE"
 const char *POWER_STATE_MACHINE_TIMEOUT_STRING = "POWER_STATE_MACHINE_TIMEOUT";
 const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
+const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -343,194 +345,198 @@ const char *translateEvents(Event event) {
       return TEST_STRING;
     case (10600):
       return CHANGE_OF_SETUP_PARAMETER_STRING;
-    case (10800):
+    case (11300):
       return SWITCH_CMD_SENT_STRING;
-    case (10801):
-      return SWITCH_HAS_CHANGED_STRING;
-    case (10802):
-      return SWITCHING_Q7S_DENIED_STRING;
-    case (10900):
-      return GPIO_PULL_HIGH_FAILED_STRING;
-    case (10901):
-      return GPIO_PULL_LOW_FAILED_STRING;
-    case (10902):
-      return SWITCH_ALREADY_ON_STRING;
-    case (10903):
-      return SWITCH_ALREADY_OFF_STRING;
-    case (10904):
-      return MAIN_SWITCH_TIMEOUT_STRING;
-    case (11000):
-      return MAIN_SWITCH_ON_TIMEOUT_STRING;
-    case (11001):
-      return MAIN_SWITCH_OFF_TIMEOUT_STRING;
-    case (11002):
-      return DEPLOYMENT_FAILED_STRING;
-    case (11003):
-      return DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING;
-    case (11004):
-      return DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING;
-    case (11101):
-      return MEMORY_READ_RPT_CRC_FAILURE_STRING;
-    case (11102):
-      return ACK_FAILURE_STRING;
-    case (11103):
-      return EXE_FAILURE_STRING;
-    case (11104):
-      return MPSOC_HANDLER_CRC_FAILURE_STRING;
-    case (11105):
-      return MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING;
-    case (11201):
-      return SELF_TEST_I2C_FAILURE_STRING;
-    case (11202):
-      return SELF_TEST_SPI_FAILURE_STRING;
-    case (11203):
-      return SELF_TEST_ADC_FAILURE_STRING;
-    case (11204):
-      return SELF_TEST_PWM_FAILURE_STRING;
-    case (11205):
-      return SELF_TEST_TC_FAILURE_STRING;
-    case (11206):
-      return SELF_TEST_MTM_RANGE_FAILURE_STRING;
-    case (11207):
-      return SELF_TEST_COIL_CURRENT_FAILURE_STRING;
-    case (11208):
-      return INVALID_ERROR_BYTE_STRING;
     case (11301):
-      return ERROR_STATE_STRING;
+      return SWITCH_HAS_CHANGED_STRING;
+    case (11302):
+      return SWITCHING_Q7S_DENIED_STRING;
+    case (11400):
+      return GPIO_PULL_HIGH_FAILED_STRING;
     case (11401):
-      return BOOTING_FIRMWARE_FAILED_STRING;
+      return GPIO_PULL_LOW_FAILED_STRING;
     case (11402):
-      return BOOTING_BOOTLOADER_FAILED_STRING;
+      return SWITCH_ALREADY_ON_STRING;
+    case (11403):
+      return SWITCH_ALREADY_OFF_STRING;
+    case (11404):
+      return MAIN_SWITCH_TIMEOUT_STRING;
+    case (11500):
+      return MAIN_SWITCH_ON_TIMEOUT_STRING;
     case (11501):
-      return SUPV_MEMORY_READ_RPT_CRC_FAILURE_STRING;
+      return MAIN_SWITCH_OFF_TIMEOUT_STRING;
     case (11502):
-      return SUPV_ACK_FAILURE_STRING;
+      return DEPLOYMENT_FAILED_STRING;
     case (11503):
-      return SUPV_EXE_FAILURE_STRING;
+      return DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING;
     case (11504):
-      return SUPV_CRC_FAILURE_EVENT_STRING;
-    case (11600):
-      return SANITIZATION_FAILED_STRING;
+      return DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING;
     case (11601):
-      return MOUNTED_SD_CARD_STRING;
-    case (11700):
-      return UPDATE_FILE_NOT_EXISTS_STRING;
+      return MEMORY_READ_RPT_CRC_FAILURE_STRING;
+    case (11602):
+      return ACK_FAILURE_STRING;
+    case (11603):
+      return EXE_FAILURE_STRING;
+    case (11604):
+      return MPSOC_HANDLER_CRC_FAILURE_STRING;
+    case (11605):
+      return MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING;
+    case (11606):
+      return MPSOC_SHUTDOWN_FAILED_STRING;
     case (11701):
-      return ACTION_COMMANDING_FAILED_STRING;
+      return SELF_TEST_I2C_FAILURE_STRING;
     case (11702):
-      return UPDATE_AVAILABLE_FAILED_STRING;
+      return SELF_TEST_SPI_FAILURE_STRING;
     case (11703):
-      return UPDATE_TRANSFER_FAILED_STRING;
+      return SELF_TEST_ADC_FAILURE_STRING;
     case (11704):
-      return UPDATE_VERIFY_FAILED_STRING;
+      return SELF_TEST_PWM_FAILURE_STRING;
     case (11705):
-      return UPDATE_FINISHED_STRING;
-    case (11800):
-      return SEND_MRAM_DUMP_FAILED_STRING;
+      return SELF_TEST_TC_FAILURE_STRING;
+    case (11706):
+      return SELF_TEST_MTM_RANGE_FAILURE_STRING;
+    case (11707):
+      return SELF_TEST_COIL_CURRENT_FAILURE_STRING;
+    case (11708):
+      return INVALID_ERROR_BYTE_STRING;
     case (11801):
-      return MRAM_DUMP_FAILED_STRING;
-    case (11802):
-      return MRAM_DUMP_FINISHED_STRING;
+      return ERROR_STATE_STRING;
     case (11901):
-      return INVALID_TC_FRAME_STRING;
+      return BOOTING_FIRMWARE_FAILED_STRING;
     case (11902):
-      return INVALID_FAR_STRING;
-    case (11903):
-      return CARRIER_LOCK_STRING;
-    case (11904):
-      return BIT_LOCK_PDEC_STRING;
-    case (12000):
-      return IMAGE_UPLOAD_FAILED_STRING;
+      return BOOTING_BOOTLOADER_FAILED_STRING;
     case (12001):
-      return IMAGE_DOWNLOAD_FAILED_STRING;
+      return SUPV_MEMORY_READ_RPT_CRC_FAILURE_STRING;
     case (12002):
-      return IMAGE_UPLOAD_SUCCESSFUL_STRING;
+      return SUPV_ACK_FAILURE_STRING;
     case (12003):
-      return IMAGE_DOWNLOAD_SUCCESSFUL_STRING;
+      return SUPV_EXE_FAILURE_STRING;
     case (12004):
-      return FLASH_WRITE_SUCCESSFUL_STRING;
-    case (12005):
-      return FLASH_READ_SUCCESSFUL_STRING;
-    case (12006):
-      return FLASH_READ_FAILED_STRING;
-    case (12007):
-      return FIRMWARE_UPDATE_SUCCESSFUL_STRING;
-    case (12008):
-      return FIRMWARE_UPDATE_FAILED_STRING;
-    case (12009):
-      return STR_HELPER_READING_REPLY_FAILED_STRING;
-    case (12010):
-      return STR_HELPER_COM_ERROR_STRING;
-    case (12011):
-      return STR_HELPER_NO_REPLY_STRING;
-    case (12012):
-      return STR_HELPER_DEC_ERROR_STRING;
-    case (12013):
-      return POSITION_MISMATCH_STRING;
-    case (12014):
-      return STR_HELPER_FILE_NOT_EXISTS_STRING;
-    case (12015):
-      return STR_HELPER_SENDING_PACKET_FAILED_STRING;
-    case (12016):
-      return STR_HELPER_REQUESTING_MSG_FAILED_STRING;
+      return SUPV_CRC_FAILURE_EVENT_STRING;
     case (12100):
-      return MPSOC_FLASH_WRITE_FAILED_STRING;
+      return SANITIZATION_FAILED_STRING;
     case (12101):
-      return MPSOC_FLASH_WRITE_SUCCESSFUL_STRING;
-    case (12102):
-      return SENDING_COMMAND_FAILED_STRING;
-    case (12103):
-      return MPSOC_HELPER_REQUESTING_REPLY_FAILED_STRING;
-    case (12104):
-      return MPSOC_HELPER_READING_REPLY_FAILED_STRING;
-    case (12105):
-      return MISSING_ACK_STRING;
-    case (12106):
-      return MISSING_EXE_STRING;
-    case (12107):
-      return ACK_FAILURE_REPORT_STRING;
-    case (12108):
-      return EXE_FAILURE_REPORT_STRING;
-    case (12109):
-      return ACK_INVALID_APID_STRING;
-    case (12110):
-      return EXE_INVALID_APID_STRING;
-    case (12111):
-      return MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING;
+      return MOUNTED_SD_CARD_STRING;
     case (12200):
-      return TRANSITION_BACK_TO_OFF_STRING;
+      return UPDATE_FILE_NOT_EXISTS_STRING;
     case (12201):
-      return NEG_V_OUT_OF_BOUNDS_STRING;
+      return ACTION_COMMANDING_FAILED_STRING;
     case (12202):
-      return U_DRO_OUT_OF_BOUNDS_STRING;
+      return UPDATE_AVAILABLE_FAILED_STRING;
     case (12203):
-      return I_DRO_OUT_OF_BOUNDS_STRING;
+      return UPDATE_TRANSFER_FAILED_STRING;
     case (12204):
-      return U_X8_OUT_OF_BOUNDS_STRING;
+      return UPDATE_VERIFY_FAILED_STRING;
     case (12205):
-      return I_X8_OUT_OF_BOUNDS_STRING;
-    case (12206):
-      return U_TX_OUT_OF_BOUNDS_STRING;
-    case (12207):
-      return I_TX_OUT_OF_BOUNDS_STRING;
-    case (12208):
-      return U_MPA_OUT_OF_BOUNDS_STRING;
-    case (12209):
-      return I_MPA_OUT_OF_BOUNDS_STRING;
-    case (12210):
-      return U_HPA_OUT_OF_BOUNDS_STRING;
-    case (12211):
-      return I_HPA_OUT_OF_BOUNDS_STRING;
+      return UPDATE_FINISHED_STRING;
     case (12300):
-      return TRANSITION_OTHER_SIDE_FAILED_STRING;
+      return SEND_MRAM_DUMP_FAILED_STRING;
     case (12301):
-      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
+      return MRAM_DUMP_FAILED_STRING;
     case (12302):
-      return POWER_STATE_MACHINE_TIMEOUT_STRING;
-    case (12303):
-      return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
+      return MRAM_DUMP_FINISHED_STRING;
+    case (12401):
+      return INVALID_TC_FRAME_STRING;
+    case (12402):
+      return INVALID_FAR_STRING;
+    case (12403):
+      return CARRIER_LOCK_STRING;
+    case (12404):
+      return BIT_LOCK_PDEC_STRING;
     case (12500):
+      return IMAGE_UPLOAD_FAILED_STRING;
+    case (12501):
+      return IMAGE_DOWNLOAD_FAILED_STRING;
+    case (12502):
+      return IMAGE_UPLOAD_SUCCESSFUL_STRING;
+    case (12503):
+      return IMAGE_DOWNLOAD_SUCCESSFUL_STRING;
+    case (12504):
+      return FLASH_WRITE_SUCCESSFUL_STRING;
+    case (12505):
+      return FLASH_READ_SUCCESSFUL_STRING;
+    case (12506):
+      return FLASH_READ_FAILED_STRING;
+    case (12507):
+      return FIRMWARE_UPDATE_SUCCESSFUL_STRING;
+    case (12508):
+      return FIRMWARE_UPDATE_FAILED_STRING;
+    case (12509):
+      return STR_HELPER_READING_REPLY_FAILED_STRING;
+    case (12510):
+      return STR_HELPER_COM_ERROR_STRING;
+    case (12511):
+      return STR_HELPER_NO_REPLY_STRING;
+    case (12512):
+      return STR_HELPER_DEC_ERROR_STRING;
+    case (12513):
+      return POSITION_MISMATCH_STRING;
+    case (12514):
+      return STR_HELPER_FILE_NOT_EXISTS_STRING;
+    case (12515):
+      return STR_HELPER_SENDING_PACKET_FAILED_STRING;
+    case (12516):
+      return STR_HELPER_REQUESTING_MSG_FAILED_STRING;
+    case (12600):
+      return MPSOC_FLASH_WRITE_FAILED_STRING;
+    case (12601):
+      return MPSOC_FLASH_WRITE_SUCCESSFUL_STRING;
+    case (12602):
+      return 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;
+    case (12606):
+      return MISSING_EXE_STRING;
+    case (12607):
+      return ACK_FAILURE_REPORT_STRING;
+    case (12608):
+      return EXE_FAILURE_REPORT_STRING;
+    case (12609):
+      return ACK_INVALID_APID_STRING;
+    case (12610):
+      return EXE_INVALID_APID_STRING;
+    case (12611):
+      return MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING;
+    case (12700):
+      return TRANSITION_BACK_TO_OFF_STRING;
+    case (12701):
+      return NEG_V_OUT_OF_BOUNDS_STRING;
+    case (12702):
+      return U_DRO_OUT_OF_BOUNDS_STRING;
+    case (12703):
+      return I_DRO_OUT_OF_BOUNDS_STRING;
+    case (12704):
+      return U_X8_OUT_OF_BOUNDS_STRING;
+    case (12705):
+      return I_X8_OUT_OF_BOUNDS_STRING;
+    case (12706):
+      return U_TX_OUT_OF_BOUNDS_STRING;
+    case (12707):
+      return I_TX_OUT_OF_BOUNDS_STRING;
+    case (12708):
+      return U_MPA_OUT_OF_BOUNDS_STRING;
+    case (12709):
+      return I_MPA_OUT_OF_BOUNDS_STRING;
+    case (12710):
+      return U_HPA_OUT_OF_BOUNDS_STRING;
+    case (12711):
+      return I_HPA_OUT_OF_BOUNDS_STRING;
+    case (12800):
+      return TRANSITION_OTHER_SIDE_FAILED_STRING;
+    case (12801):
+      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
+    case (12802):
+      return POWER_STATE_MACHINE_TIMEOUT_STRING;
+    case (12803):
+      return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
+    case (13000):
       return CHILDREN_LOST_MODE_STRING;
+    case (13100):
+      return GPS_FIX_CHANGE_STRING;
     case (13600):
       return ALLOC_FAILURE_STRING;
     case (13601):
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index 32799af0..78113fd9 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-03-28 12:48:33
+ * Generated on: 2022-04-07 17:27:42
  */
 #include "translateObjects.h"
 
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index ece0bf14..7112fa87 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 181 translations.
+ * @brief    Auto-generated event translation file. Contains 183 translations.
  * @details
- * Generated on: 2022-03-28 12:48:26
+ * Generated on: 2022-04-07 17:27:42
  */
 #include "translateEvents.h"
 
@@ -102,6 +102,7 @@ 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_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";
 const char *SELF_TEST_ADC_FAILURE_STRING = "SELF_TEST_ADC_FAILURE";
@@ -178,6 +179,7 @@ const char *NOT_ENOUGH_DEVICES_DUAL_MODE_STRING = "NOT_ENOUGH_DEVICES_DUAL_MODE"
 const char *POWER_STATE_MACHINE_TIMEOUT_STRING = "POWER_STATE_MACHINE_TIMEOUT";
 const char *SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING = "SIDE_SWITCH_TRANSITION_NOT_ALLOWED";
 const char *CHILDREN_LOST_MODE_STRING = "CHILDREN_LOST_MODE";
+const char *GPS_FIX_CHANGE_STRING = "GPS_FIX_CHANGE";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -343,194 +345,198 @@ const char *translateEvents(Event event) {
       return TEST_STRING;
     case (10600):
       return CHANGE_OF_SETUP_PARAMETER_STRING;
-    case (10800):
+    case (11300):
       return SWITCH_CMD_SENT_STRING;
-    case (10801):
-      return SWITCH_HAS_CHANGED_STRING;
-    case (10802):
-      return SWITCHING_Q7S_DENIED_STRING;
-    case (10900):
-      return GPIO_PULL_HIGH_FAILED_STRING;
-    case (10901):
-      return GPIO_PULL_LOW_FAILED_STRING;
-    case (10902):
-      return SWITCH_ALREADY_ON_STRING;
-    case (10903):
-      return SWITCH_ALREADY_OFF_STRING;
-    case (10904):
-      return MAIN_SWITCH_TIMEOUT_STRING;
-    case (11000):
-      return MAIN_SWITCH_ON_TIMEOUT_STRING;
-    case (11001):
-      return MAIN_SWITCH_OFF_TIMEOUT_STRING;
-    case (11002):
-      return DEPLOYMENT_FAILED_STRING;
-    case (11003):
-      return DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING;
-    case (11004):
-      return DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING;
-    case (11101):
-      return MEMORY_READ_RPT_CRC_FAILURE_STRING;
-    case (11102):
-      return ACK_FAILURE_STRING;
-    case (11103):
-      return EXE_FAILURE_STRING;
-    case (11104):
-      return MPSOC_HANDLER_CRC_FAILURE_STRING;
-    case (11105):
-      return MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING;
-    case (11201):
-      return SELF_TEST_I2C_FAILURE_STRING;
-    case (11202):
-      return SELF_TEST_SPI_FAILURE_STRING;
-    case (11203):
-      return SELF_TEST_ADC_FAILURE_STRING;
-    case (11204):
-      return SELF_TEST_PWM_FAILURE_STRING;
-    case (11205):
-      return SELF_TEST_TC_FAILURE_STRING;
-    case (11206):
-      return SELF_TEST_MTM_RANGE_FAILURE_STRING;
-    case (11207):
-      return SELF_TEST_COIL_CURRENT_FAILURE_STRING;
-    case (11208):
-      return INVALID_ERROR_BYTE_STRING;
     case (11301):
-      return ERROR_STATE_STRING;
+      return SWITCH_HAS_CHANGED_STRING;
+    case (11302):
+      return SWITCHING_Q7S_DENIED_STRING;
+    case (11400):
+      return GPIO_PULL_HIGH_FAILED_STRING;
     case (11401):
-      return BOOTING_FIRMWARE_FAILED_STRING;
+      return GPIO_PULL_LOW_FAILED_STRING;
     case (11402):
-      return BOOTING_BOOTLOADER_FAILED_STRING;
+      return SWITCH_ALREADY_ON_STRING;
+    case (11403):
+      return SWITCH_ALREADY_OFF_STRING;
+    case (11404):
+      return MAIN_SWITCH_TIMEOUT_STRING;
+    case (11500):
+      return MAIN_SWITCH_ON_TIMEOUT_STRING;
     case (11501):
-      return SUPV_MEMORY_READ_RPT_CRC_FAILURE_STRING;
+      return MAIN_SWITCH_OFF_TIMEOUT_STRING;
     case (11502):
-      return SUPV_ACK_FAILURE_STRING;
+      return DEPLOYMENT_FAILED_STRING;
     case (11503):
-      return SUPV_EXE_FAILURE_STRING;
+      return DEPL_SA1_GPIO_SWTICH_ON_FAILED_STRING;
     case (11504):
-      return SUPV_CRC_FAILURE_EVENT_STRING;
-    case (11600):
-      return SANITIZATION_FAILED_STRING;
+      return DEPL_SA2_GPIO_SWTICH_ON_FAILED_STRING;
     case (11601):
-      return MOUNTED_SD_CARD_STRING;
-    case (11700):
-      return UPDATE_FILE_NOT_EXISTS_STRING;
+      return MEMORY_READ_RPT_CRC_FAILURE_STRING;
+    case (11602):
+      return ACK_FAILURE_STRING;
+    case (11603):
+      return EXE_FAILURE_STRING;
+    case (11604):
+      return MPSOC_HANDLER_CRC_FAILURE_STRING;
+    case (11605):
+      return MPSOC_HANDLER_SEQ_CNT_MISMATCH_STRING;
+    case (11606):
+      return MPSOC_SHUTDOWN_FAILED_STRING;
     case (11701):
-      return ACTION_COMMANDING_FAILED_STRING;
+      return SELF_TEST_I2C_FAILURE_STRING;
     case (11702):
-      return UPDATE_AVAILABLE_FAILED_STRING;
+      return SELF_TEST_SPI_FAILURE_STRING;
     case (11703):
-      return UPDATE_TRANSFER_FAILED_STRING;
+      return SELF_TEST_ADC_FAILURE_STRING;
     case (11704):
-      return UPDATE_VERIFY_FAILED_STRING;
+      return SELF_TEST_PWM_FAILURE_STRING;
     case (11705):
-      return UPDATE_FINISHED_STRING;
-    case (11800):
-      return SEND_MRAM_DUMP_FAILED_STRING;
+      return SELF_TEST_TC_FAILURE_STRING;
+    case (11706):
+      return SELF_TEST_MTM_RANGE_FAILURE_STRING;
+    case (11707):
+      return SELF_TEST_COIL_CURRENT_FAILURE_STRING;
+    case (11708):
+      return INVALID_ERROR_BYTE_STRING;
     case (11801):
-      return MRAM_DUMP_FAILED_STRING;
-    case (11802):
-      return MRAM_DUMP_FINISHED_STRING;
+      return ERROR_STATE_STRING;
     case (11901):
-      return INVALID_TC_FRAME_STRING;
+      return BOOTING_FIRMWARE_FAILED_STRING;
     case (11902):
-      return INVALID_FAR_STRING;
-    case (11903):
-      return CARRIER_LOCK_STRING;
-    case (11904):
-      return BIT_LOCK_PDEC_STRING;
-    case (12000):
-      return IMAGE_UPLOAD_FAILED_STRING;
+      return BOOTING_BOOTLOADER_FAILED_STRING;
     case (12001):
-      return IMAGE_DOWNLOAD_FAILED_STRING;
+      return SUPV_MEMORY_READ_RPT_CRC_FAILURE_STRING;
     case (12002):
-      return IMAGE_UPLOAD_SUCCESSFUL_STRING;
+      return SUPV_ACK_FAILURE_STRING;
     case (12003):
-      return IMAGE_DOWNLOAD_SUCCESSFUL_STRING;
+      return SUPV_EXE_FAILURE_STRING;
     case (12004):
-      return FLASH_WRITE_SUCCESSFUL_STRING;
-    case (12005):
-      return FLASH_READ_SUCCESSFUL_STRING;
-    case (12006):
-      return FLASH_READ_FAILED_STRING;
-    case (12007):
-      return FIRMWARE_UPDATE_SUCCESSFUL_STRING;
-    case (12008):
-      return FIRMWARE_UPDATE_FAILED_STRING;
-    case (12009):
-      return STR_HELPER_READING_REPLY_FAILED_STRING;
-    case (12010):
-      return STR_HELPER_COM_ERROR_STRING;
-    case (12011):
-      return STR_HELPER_NO_REPLY_STRING;
-    case (12012):
-      return STR_HELPER_DEC_ERROR_STRING;
-    case (12013):
-      return POSITION_MISMATCH_STRING;
-    case (12014):
-      return STR_HELPER_FILE_NOT_EXISTS_STRING;
-    case (12015):
-      return STR_HELPER_SENDING_PACKET_FAILED_STRING;
-    case (12016):
-      return STR_HELPER_REQUESTING_MSG_FAILED_STRING;
+      return SUPV_CRC_FAILURE_EVENT_STRING;
     case (12100):
-      return MPSOC_FLASH_WRITE_FAILED_STRING;
+      return SANITIZATION_FAILED_STRING;
     case (12101):
-      return MPSOC_FLASH_WRITE_SUCCESSFUL_STRING;
-    case (12102):
-      return SENDING_COMMAND_FAILED_STRING;
-    case (12103):
-      return MPSOC_HELPER_REQUESTING_REPLY_FAILED_STRING;
-    case (12104):
-      return MPSOC_HELPER_READING_REPLY_FAILED_STRING;
-    case (12105):
-      return MISSING_ACK_STRING;
-    case (12106):
-      return MISSING_EXE_STRING;
-    case (12107):
-      return ACK_FAILURE_REPORT_STRING;
-    case (12108):
-      return EXE_FAILURE_REPORT_STRING;
-    case (12109):
-      return ACK_INVALID_APID_STRING;
-    case (12110):
-      return EXE_INVALID_APID_STRING;
-    case (12111):
-      return MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING;
+      return MOUNTED_SD_CARD_STRING;
     case (12200):
-      return TRANSITION_BACK_TO_OFF_STRING;
+      return UPDATE_FILE_NOT_EXISTS_STRING;
     case (12201):
-      return NEG_V_OUT_OF_BOUNDS_STRING;
+      return ACTION_COMMANDING_FAILED_STRING;
     case (12202):
-      return U_DRO_OUT_OF_BOUNDS_STRING;
+      return UPDATE_AVAILABLE_FAILED_STRING;
     case (12203):
-      return I_DRO_OUT_OF_BOUNDS_STRING;
+      return UPDATE_TRANSFER_FAILED_STRING;
     case (12204):
-      return U_X8_OUT_OF_BOUNDS_STRING;
+      return UPDATE_VERIFY_FAILED_STRING;
     case (12205):
-      return I_X8_OUT_OF_BOUNDS_STRING;
-    case (12206):
-      return U_TX_OUT_OF_BOUNDS_STRING;
-    case (12207):
-      return I_TX_OUT_OF_BOUNDS_STRING;
-    case (12208):
-      return U_MPA_OUT_OF_BOUNDS_STRING;
-    case (12209):
-      return I_MPA_OUT_OF_BOUNDS_STRING;
-    case (12210):
-      return U_HPA_OUT_OF_BOUNDS_STRING;
-    case (12211):
-      return I_HPA_OUT_OF_BOUNDS_STRING;
+      return UPDATE_FINISHED_STRING;
     case (12300):
-      return TRANSITION_OTHER_SIDE_FAILED_STRING;
+      return SEND_MRAM_DUMP_FAILED_STRING;
     case (12301):
-      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
+      return MRAM_DUMP_FAILED_STRING;
     case (12302):
-      return POWER_STATE_MACHINE_TIMEOUT_STRING;
-    case (12303):
-      return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
+      return MRAM_DUMP_FINISHED_STRING;
+    case (12401):
+      return INVALID_TC_FRAME_STRING;
+    case (12402):
+      return INVALID_FAR_STRING;
+    case (12403):
+      return CARRIER_LOCK_STRING;
+    case (12404):
+      return BIT_LOCK_PDEC_STRING;
     case (12500):
+      return IMAGE_UPLOAD_FAILED_STRING;
+    case (12501):
+      return IMAGE_DOWNLOAD_FAILED_STRING;
+    case (12502):
+      return IMAGE_UPLOAD_SUCCESSFUL_STRING;
+    case (12503):
+      return IMAGE_DOWNLOAD_SUCCESSFUL_STRING;
+    case (12504):
+      return FLASH_WRITE_SUCCESSFUL_STRING;
+    case (12505):
+      return FLASH_READ_SUCCESSFUL_STRING;
+    case (12506):
+      return FLASH_READ_FAILED_STRING;
+    case (12507):
+      return FIRMWARE_UPDATE_SUCCESSFUL_STRING;
+    case (12508):
+      return FIRMWARE_UPDATE_FAILED_STRING;
+    case (12509):
+      return STR_HELPER_READING_REPLY_FAILED_STRING;
+    case (12510):
+      return STR_HELPER_COM_ERROR_STRING;
+    case (12511):
+      return STR_HELPER_NO_REPLY_STRING;
+    case (12512):
+      return STR_HELPER_DEC_ERROR_STRING;
+    case (12513):
+      return POSITION_MISMATCH_STRING;
+    case (12514):
+      return STR_HELPER_FILE_NOT_EXISTS_STRING;
+    case (12515):
+      return STR_HELPER_SENDING_PACKET_FAILED_STRING;
+    case (12516):
+      return STR_HELPER_REQUESTING_MSG_FAILED_STRING;
+    case (12600):
+      return MPSOC_FLASH_WRITE_FAILED_STRING;
+    case (12601):
+      return MPSOC_FLASH_WRITE_SUCCESSFUL_STRING;
+    case (12602):
+      return 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;
+    case (12606):
+      return MISSING_EXE_STRING;
+    case (12607):
+      return ACK_FAILURE_REPORT_STRING;
+    case (12608):
+      return EXE_FAILURE_REPORT_STRING;
+    case (12609):
+      return ACK_INVALID_APID_STRING;
+    case (12610):
+      return EXE_INVALID_APID_STRING;
+    case (12611):
+      return MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING;
+    case (12700):
+      return TRANSITION_BACK_TO_OFF_STRING;
+    case (12701):
+      return NEG_V_OUT_OF_BOUNDS_STRING;
+    case (12702):
+      return U_DRO_OUT_OF_BOUNDS_STRING;
+    case (12703):
+      return I_DRO_OUT_OF_BOUNDS_STRING;
+    case (12704):
+      return U_X8_OUT_OF_BOUNDS_STRING;
+    case (12705):
+      return I_X8_OUT_OF_BOUNDS_STRING;
+    case (12706):
+      return U_TX_OUT_OF_BOUNDS_STRING;
+    case (12707):
+      return I_TX_OUT_OF_BOUNDS_STRING;
+    case (12708):
+      return U_MPA_OUT_OF_BOUNDS_STRING;
+    case (12709):
+      return I_MPA_OUT_OF_BOUNDS_STRING;
+    case (12710):
+      return U_HPA_OUT_OF_BOUNDS_STRING;
+    case (12711):
+      return I_HPA_OUT_OF_BOUNDS_STRING;
+    case (12800):
+      return TRANSITION_OTHER_SIDE_FAILED_STRING;
+    case (12801):
+      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
+    case (12802):
+      return POWER_STATE_MACHINE_TIMEOUT_STRING;
+    case (12803):
+      return SIDE_SWITCH_TRANSITION_NOT_ALLOWED_STRING;
+    case (13000):
       return CHILDREN_LOST_MODE_STRING;
+    case (13100):
+      return GPS_FIX_CHANGE_STRING;
     case (13600):
       return ALLOC_FAILURE_STRING;
     case (13601):
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index 32799af0..78113fd9 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-03-28 12:48:33
+ * Generated on: 2022-04-07 17:27:42
  */
 #include "translateObjects.h"
 
diff --git a/tmtc b/tmtc
index 25bab108..aa25b400 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 25bab108df76045e10af2efc26a0397f78574f9c
+Subproject commit aa25b400706ae580621f835b778d57546f2a7c04

From 4a6840f0987bc895d8e1fb808b763b83bf2fd40e Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Apr 2022 11:22:16 +0200
Subject: [PATCH 08/12] bugfixes and improvements

- Tests finished
---
 bsp_q7s/core/CoreController.cpp               |  87 ++++++++------
 bsp_q7s/core/CoreController.h                 |   6 +-
 generators/events/translateEvents.cpp         |   2 +-
 generators/objects/translateObjects.cpp       |   2 +-
 linux/devices/GPSHyperionLinuxController.cpp  |  19 ++-
 linux/devices/GPSHyperionLinuxController.h    |   4 +-
 linux/fsfwconfig/events/translateEvents.cpp   |   2 +-
 linux/fsfwconfig/objects/translateObjects.cpp |   2 +-
 linux/utility/utility.cpp                     |  13 ++
 linux/utility/utility.h                       |   4 +-
 .../devicedefinitions/GPSDefinitions.h        |   8 +-
 mission/utility/compileTime.h                 | 113 ++++++++----------
 12 files changed, 144 insertions(+), 118 deletions(-)

diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index c39caa12..ef6e4fa0 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -1,6 +1,9 @@
 #include "CoreController.h"
 
 #include <fsfw/events/EventManager.h>
+#include <fsfw/ipc/QueueFactory.h>
+
+#include <algorithm>
 
 #include "OBSWConfig.h"
 #include "OBSWVersion.h"
@@ -8,7 +11,6 @@
 #include "fsfw/timemanager/Stopwatch.h"
 #include "fsfw/version.h"
 #include "watchdogConf.h"
-#include <algorithm>
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #else
@@ -22,6 +24,7 @@
 #include "bsp_q7s/memory/SdCardManager.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "bsp_q7s/xadc/Xadc.h"
+#include "linux/utility/utility.h"
 
 xsc::Chip CoreController::CURRENT_CHIP = xsc::Chip::NO_CHIP;
 xsc::Copy CoreController::CURRENT_COPY = xsc::Copy::NO_COPY;
@@ -51,6 +54,7 @@ CoreController::CoreController(object_id_t objectId)
   } catch (const std::filesystem::filesystem_error &e) {
     sif::error << "CoreController::CoreController: Failed with exception " << e.what() << std::endl;
   }
+  eventQueue = QueueFactory::instance()->createMessageQueue(5, EventMessage::MAX_MESSAGE_SIZE);
 }
 
 ReturnValue_t CoreController::handleCommandMessage(CommandMessage *message) {
@@ -62,10 +66,10 @@ void CoreController::performControlOperation() {
   for (ReturnValue_t result = eventQueue->receiveMessage(&event); result == RETURN_OK;
        result = eventQueue->receiveMessage(&event)) {
     switch (event.getEvent()) {
-    case(GpsHyperion::GPS_FIX_CHANGE): {
-      gpsFix = static_cast<GpsHyperion::FixMode>(event.getParameter2());
-      break;
-    }
+      case (GpsHyperion::GPS_FIX_CHANGE): {
+        gpsFix = static_cast<GpsHyperion::FixMode>(event.getParameter2());
+        break;
+      }
     }
   }
   performWatchdogControlOperation();
@@ -90,8 +94,10 @@ LocalPoolDataSetBase *CoreController::getDataSetHandle(sid_t sid) {
 }
 
 ReturnValue_t CoreController::initialize() {
-  ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
-
+  ReturnValue_t result = ExtendedControllerBase::initialize();
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    sif::warning << "CoreController::initialize: Base init failed" << std::endl;
+  }
   result = scratch::writeNumber(scratch::ALLOC_FAILURE_COUNT, 0);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "CoreController::initialize: Setting up alloc failure "
@@ -102,18 +108,23 @@ ReturnValue_t CoreController::initialize() {
   sdStateMachine();
 
   triggerEvent(REBOOT_SW, CURRENT_CHIP, CURRENT_COPY);
-  EventManagerIF* eventManager = ObjectManager::instance()->get<EventManagerIF>(
-      objects::EVENT_MANAGER);
+  EventManagerIF *eventManager =
+      ObjectManager::instance()->get<EventManagerIF>(objects::EVENT_MANAGER);
+  if (eventManager == nullptr or eventQueue == nullptr) {
+    sif::warning << "CoreController::initialize: No valid event manager found or "
+                    "queue invalid"
+                 << std::endl;
+  }
   result = eventManager->registerListener(eventQueue->getId());
-  if(result != HasReturnvaluesIF::RETURN_OK) {
+  if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "CoreController::initialize: Registering as event listener failed" << std::endl;
   }
-  result = eventManager->subscribeToEvent(this->getCommandQueue(),
-      event::getEventId(GpsHyperion::GPS_FIX_CHANGE));
-  if(result != HasReturnvaluesIF::RETURN_OK) {
+  result = eventManager->subscribeToEvent(eventQueue->getId(),
+                                          event::getEventId(GpsHyperion::GPS_FIX_CHANGE));
+  if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::warning << "Subscribing for GPS GPS_FIX_CHANGE event failed" << std::endl;
   }
-  return ExtendedControllerBase::initialize();
+  return RETURN_OK;
 }
 
 ReturnValue_t CoreController::initializeAfterTaskCreation() {
@@ -661,8 +672,7 @@ ReturnValue_t CoreController::initVersionFile() {
   fsfw::FSFW_VERSION.getVersion(versionString, sizeof(versionString));
   std::string fullFsfwVersionString = "FSFW: v" + std::string(versionString);
   std::string systemString = "System: " + unameLine;
-  std::string mountPrefix = SdCardManager::instance()->getCurrentMountPrefix();
-  std::string versionFilePath = mountPrefix + VERSION_FILE;
+  std::string versionFilePath = currMntPrefix + VERSION_FILE;
   std::fstream versionFile;
 
   if (not std::filesystem::exists(versionFilePath)) {
@@ -1220,15 +1230,17 @@ void CoreController::performWatchdogControlOperation() {
 }
 
 void CoreController::performMountedSdCardOperations() {
+  currMntPrefix = sdcMan->getCurrentMountPrefix();
   if (doPerformMountedSdCardOps) {
     bool sdCardMounted = false;
     sdCardMounted = sdcMan->isSdCardMounted(sdInfo.pref);
     if (sdCardMounted) {
-      std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + "/" + CONF_FOLDER;
+      std::string path = currMntPrefix + "/" + CONF_FOLDER;
       if (not std::filesystem::exists(path)) {
         std::filesystem::create_directory(path);
       }
       initVersionFile();
+      initClockFromTimeFile();
       performRebootFileHandling(false);
       doPerformMountedSdCardOps = false;
     }
@@ -1238,7 +1250,7 @@ void CoreController::performMountedSdCardOperations() {
 
 void CoreController::performRebootFileHandling(bool recreateFile) {
   using namespace std;
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = currMntPrefix + REBOOT_FILE;
   if (not std::filesystem::exists(path) or recreateFile) {
 #if OBSW_VERBOSE_LEVEL >= 1
     sif::info << "CoreController::performRebootFileHandling: Recreating reboot file" << std::endl;
@@ -1617,7 +1629,7 @@ bool CoreController::parseRebootFile(std::string path, RebootFile &rf) {
 }
 
 void CoreController::resetRebootCount(xsc::Chip tgtChip, xsc::Copy tgtCopy) {
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = currMntPrefix + REBOOT_FILE;
   // Disable the reboot file mechanism
   parseRebootFile(path, rebootFile);
   if (tgtChip == xsc::ALL_CHIP and tgtCopy == xsc::ALL_COPY) {
@@ -1644,7 +1656,7 @@ void CoreController::resetRebootCount(xsc::Chip tgtChip, xsc::Copy tgtCopy) {
 }
 
 void CoreController::rewriteRebootFile(RebootFile file) {
-  std::string path = sdcMan->getCurrentMountPrefix(sdInfo.pref) + REBOOT_FILE;
+  std::string path = currMntPrefix + REBOOT_FILE;
   std::ofstream rebootFile(path);
   if (rebootFile.is_open()) {
     // Initiate reboot file first. Reboot handling will be on on initialization
@@ -1681,15 +1693,15 @@ void CoreController::setRebootMechanismLock(bool lock, xsc::Chip tgtChip, xsc::C
 }
 
 ReturnValue_t CoreController::timeFileHandler() {
-  if(gpsFix == GpsHyperion::FixMode::FIX_2D or gpsFix == GpsHyperion::FixMode::FIX_3D) {
+  if (gpsFix == GpsHyperion::FixMode::FIX_2D or gpsFix == GpsHyperion::FixMode::FIX_3D) {
     // It is assumed that the system time is set from the GPS time
     timeval currentTime = {};
     ReturnValue_t result = Clock::getClock_timeval(&currentTime);
-    if(result != HasReturnvaluesIF::RETURN_OK) {
+    if (result != HasReturnvaluesIF::RETURN_OK) {
       return result;
     }
-    std::ofstream timeFile(TIME_FILE);
-    timeFile << "UNIX SECONDS: " << currentTime.tv_sec;
+    std::ofstream timeFile(currMntPrefix + TIME_FILE);
+    timeFile << "UNIX SECONDS: " << currentTime.tv_sec << std::endl;
   }
   return RETURN_OK;
 }
@@ -1697,30 +1709,30 @@ ReturnValue_t CoreController::timeFileHandler() {
 ReturnValue_t CoreController::initClockFromTimeFile() {
   using namespace GpsHyperion;
   using namespace std;
-  if ((gpsFix == FixMode::UNKNOWN or gpsFix == FixMode::NOT_SEEN) and
-      std::filesystem::exists(TIME_FILE)) {
-
-    ifstream timeFile(TIME_FILE);
+  std::string fileName = currMntPrefix + TIME_FILE;
+  if (std::filesystem::exists(fileName) and
+      ((gpsFix == FixMode::UNKNOWN or gpsFix == FixMode::NOT_SEEN) or
+       not utility::timeSanityCheck())) {
+    ifstream timeFile(fileName);
     string nextWord;
     getline(timeFile, nextWord);
     istringstream iss(nextWord);
     iss >> nextWord;
-    if(iss.bad() or nextWord != "UNIX") {
+    if (iss.bad() or nextWord != "UNIX") {
       return RETURN_FAILED;
     }
     iss >> nextWord;
-    if(iss.bad() or nextWord != "SECONDS:") {
+    if (iss.bad() or nextWord != "SECONDS:") {
       return RETURN_FAILED;
     }
     iss >> nextWord;
     timeval currentTime = {};
-    char* checkPtr;
+    char *checkPtr;
     currentTime.tv_sec = strtol(nextWord.c_str(), &checkPtr, 10);
-    if(iss.bad() or *checkPtr) {
+    if (iss.bad() or *checkPtr) {
       return RETURN_FAILED;
     }
-    Clock::setClock(&currentTime);
-    return RETURN_OK;
+    return Clock::setClock(&currentTime);
   }
   return RETURN_OK;
 }
@@ -1759,8 +1771,7 @@ void CoreController::readHkData() {
   }
 }
 
-bool CoreController::isNumber(const std::string& s)
-{
-    return !s.empty() && std::find_if(s.begin(),
-        s.end(), [](unsigned char c) { return !std::isdigit(c); }) == s.end();
+bool CoreController::isNumber(const std::string &s) {
+  return !s.empty() && std::find_if(s.begin(), s.end(),
+                                    [](unsigned char c) { return !std::isdigit(c); }) == s.end();
 }
diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index 05ec6315..b5e4e511 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -7,10 +7,10 @@
 #include <cstddef>
 
 #include "CoreDefinitions.h"
-#include "mission/devices/devicedefinitions/GPSDefinitions.h"
 #include "bsp_q7s/memory/SdCardManager.h"
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
+#include "mission/devices/devicedefinitions/GPSDefinitions.h"
 
 class Timer;
 class SdCardManager;
@@ -59,8 +59,7 @@ class CoreController : public ExtendedControllerBase {
       "/" + std::string(CONF_FOLDER) + "/" + std::string(VERSION_FILE_NAME);
   const std::string REBOOT_FILE =
       "/" + std::string(CONF_FOLDER) + "/" + std::string(REBOOT_FILE_NAME);
-  const std::string TIME_FILE =
-      "/" + std::string(CONF_FOLDER) + "/" + std::string(TIME_FILE_NAME);
+  const std::string TIME_FILE = "/" + std::string(CONF_FOLDER) + "/" + std::string(TIME_FILE_NAME);
 
   static constexpr ActionId_t LIST_DIRECTORY_INTO_FILE = 0;
   static constexpr ActionId_t SWITCH_REBOOT_FILE_HANDLING = 5;
@@ -179,6 +178,7 @@ class CoreController : public ExtendedControllerBase {
     sd::SdState commandedState = sd::SdState::OFF;
   } sdInfo;
   RebootFile rebootFile = {};
+  std::string currMntPrefix;
   bool doPerformMountedSdCardOps = true;
 
   /**
diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp
index 7112fa87..aeebd2cb 100644
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 183 translations.
  * @details
- * Generated on: 2022-04-07 17:27:42
+ * Generated on: 2022-04-08 11:21:58
  */
 #include "translateEvents.h"
 
diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp
index 78113fd9..bed40c70 100644
--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-04-07 17:27:42
+ * Generated on: 2022-04-08 11:21:58
  */
 #include "translateObjects.h"
 
diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 2b49e0d0..22f3affd 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -3,7 +3,7 @@
 #include "OBSWConfig.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
-
+#include "linux/utility/utility.h"
 #include "mission/utility/compileTime.h"
 
 #if FSFW_DEV_HYPERION_GPS_CREATE_NMEA_CSV == 1
@@ -127,9 +127,14 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
     return;
   }
 
+  bool validFix = false;
+  static_cast<void>(validFix);
   // 0: Not seen, 1: No fix, 2: 2D-Fix, 3: 3D-Fix
   int newFixMode = gps->fix.mode;
-  if(gpsSet.fixMode.value != newFixMode) {
+  if (newFixMode == 2 or newFixMode == 3) {
+    validFix = true;
+  }
+  if (gpsSet.fixMode.value != newFixMode) {
     triggerEvent(GpsHyperion::GPS_FIX_CHANGE, gpsSet.fixMode.value, newFixMode);
   }
   gpsSet.fixMode.value = newFixMode;
@@ -185,11 +190,19 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   } else {
     timeIsConstantCounter = 0;
   }
+  if (timeInit) {
+    if (not utility::timeSanityCheck()) {
+      sif::info << "Setting init clock in gps ctrl" << std::endl;
+      // For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb..
+      Clock::setClock(&time);
+    }
+    timeInit = false;
+  }
   // If the received time does not change anymore for whatever reason, do not set it here
   // to avoid stale times. Also, don't do it too often often to avoid jumping times
   if (timeIsConstantCounter < 20 and timeUpdateCd.hasTimedOut()) {
     // Update the system time here for now. NTP seems to be unable to do so for whatever reason.
-    // Further tests have shown that the time seems to be set by NTPD after sme time..
+    // Further tests have shown that the time seems to be set by NTPD after some time..
     // Clock::setClock(&time);
     timeUpdateCd.resetTimer();
   }
diff --git a/linux/devices/GPSHyperionLinuxController.h b/linux/devices/GPSHyperionLinuxController.h
index ac8a4735..dedd782c 100644
--- a/linux/devices/GPSHyperionLinuxController.h
+++ b/linux/devices/GPSHyperionLinuxController.h
@@ -1,8 +1,8 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
-#include "fsfw/FSFW.h"
 #include "commonSubsystemIds.h"
+#include "fsfw/FSFW.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
@@ -24,7 +24,6 @@ class GPSHyperionLinuxController : public ExtendedControllerBase {
  public:
   static constexpr uint32_t MAX_SECONDS_TO_REACH_FIX = 60 * 60 * 5;
 
-
   GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId,
                              bool debugHyperionGps = false);
   virtual ~GPSHyperionLinuxController();
@@ -52,6 +51,7 @@ class GPSHyperionLinuxController : public ExtendedControllerBase {
   GpsPrimaryDataset gpsSet;
   Countdown maxTimeToReachFix = Countdown(MAX_SECONDS_TO_REACH_FIX * 1000);
   bool modeCommanded = true;
+  bool timeInit = true;
   gpsmm myGpsmm;
   bool debugHyperionGps = false;
   uint32_t timeIsConstantCounter = 0;
diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp
index 7112fa87..aeebd2cb 100644
--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@@ -1,7 +1,7 @@
 /**
  * @brief    Auto-generated event translation file. Contains 183 translations.
  * @details
- * Generated on: 2022-04-07 17:27:42
+ * Generated on: 2022-04-08 11:21:58
  */
 #include "translateEvents.h"
 
diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp
index 78113fd9..bed40c70 100644
--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-04-07 17:27:42
+ * Generated on: 2022-04-08 11:21:58
  */
 #include "translateObjects.h"
 
diff --git a/linux/utility/utility.cpp b/linux/utility/utility.cpp
index cd0d47ef..fb58109b 100644
--- a/linux/utility/utility.cpp
+++ b/linux/utility/utility.cpp
@@ -1,3 +1,4 @@
+
 #include "utility.h"
 
 #include <cstring>
@@ -5,6 +6,7 @@
 #include "FSFWConfig.h"
 #include "OBSWConfig.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw/timemanager/Clock.h"
 
 void utility::handleSystemError(int retcode, std::string function) {
 #if OBSW_VERBOSE_LEVEL >= 1
@@ -12,3 +14,14 @@ void utility::handleSystemError(int retcode, std::string function) {
                << strerror(retcode) << std::endl;
 #endif
 }
+
+bool utility::timeSanityCheck() {
+  timeval currentTime = {};
+  Clock::getUptime(&currentTime);
+  Clock::TimeOfDay_t currTimeOfDay = {};
+  Clock::convertTimevalToTimeOfDay(&currentTime, &currTimeOfDay);
+  if (currTimeOfDay.year == 2000) {
+    return false;
+  }
+  return true;
+}
diff --git a/linux/utility/utility.h b/linux/utility/utility.h
index 8f7df04f..b4c4fe8b 100644
--- a/linux/utility/utility.h
+++ b/linux/utility/utility.h
@@ -9,6 +9,8 @@ namespace utility {
 
 void handleSystemError(int retcode, std::string function);
 
-}
+bool timeSanityCheck();
+
+}  // namespace utility
 
 #endif /* LINUX_UTILITY_UTILITY_H_ */
diff --git a/mission/devices/devicedefinitions/GPSDefinitions.h b/mission/devices/devicedefinitions/GPSDefinitions.h
index bf3fbe52..f953da22 100644
--- a/mission/devices/devicedefinitions/GPSDefinitions.h
+++ b/mission/devices/devicedefinitions/GPSDefinitions.h
@@ -6,13 +6,7 @@
 
 namespace GpsHyperion {
 
-enum class FixMode: uint8_t {
-  NOT_SEEN = 0,
-  NO_FIX = 1,
-  FIX_2D = 2,
-  FIX_3D = 3,
-  UNKNOWN = 4
-};
+enum class FixMode : uint8_t { NOT_SEEN = 0, NO_FIX = 1, FIX_2D = 2, FIX_3D = 3, UNKNOWN = 4 };
 
 static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::GPS_HANDLER;
 //! [EXPORT] : [COMMENT] Fix has changed. P1: Old fix. P2: New fix
diff --git a/mission/utility/compileTime.h b/mission/utility/compileTime.h
index c55673f6..0e367248 100644
--- a/mission/utility/compileTime.h
+++ b/mission/utility/compileTime.h
@@ -5,14 +5,17 @@
  * Authors:
  *
  * Assembled from the code released on Stackoverflow by:
- *   Dennis (instructable.com/member/nqtronix)    |   https://stackoverflow.com/questions/23032002/c-c-how-to-get-integer-unix-timestamp-of-build-time-not-string
+ *   Dennis (instructable.com/member/nqtronix)    |
+ * https://stackoverflow.com/questions/23032002/c-c-how-to-get-integer-unix-timestamp-of-build-time-not-string
  * and
- *   Alexis Wilke                                 |   https://stackoverflow.com/questions/10538444/do-you-know-of-a-c-macro-to-compute-unix-time-and-date
+ *   Alexis Wilke                                 |
+ * https://stackoverflow.com/questions/10538444/do-you-know-of-a-c-macro-to-compute-unix-time-and-date
  *
  * Assembled by Jean Rabault
  *
- * UNIX_TIMESTAMP gives the UNIX timestamp (unsigned long integer of seconds since 1st Jan 1970) of compilation from macros using the compiler defined __TIME__ macro.
- * This should include Gregorian calendar leap days, in particular the 29ths of February, 100 and 400 years modulo leaps.
+ * UNIX_TIMESTAMP gives the UNIX timestamp (unsigned long integer of seconds since 1st Jan 1970) of
+ * compilation from macros using the compiler defined __TIME__ macro. This should include Gregorian
+ * calendar leap days, in particular the 29ths of February, 100 and 400 years modulo leaps.
  *
  * Careful: __TIME__ is the local time of the computer, NOT the UTC time in general!
  *
@@ -22,76 +25,66 @@
 #define COMPILE_TIME_H_
 
 // Some definitions for calculation
-#define SEC_PER_MIN             60UL
-#define SEC_PER_HOUR            3600UL
-#define SEC_PER_DAY             86400UL
-#define SEC_PER_YEAR            (SEC_PER_DAY*365)
+#define SEC_PER_MIN 60UL
+#define SEC_PER_HOUR 3600UL
+#define SEC_PER_DAY 86400UL
+#define SEC_PER_YEAR (SEC_PER_DAY * 365)
 
 // extracts 1..4 characters from a string and interprets it as a decimal value
-#define CONV_STR2DEC_1(str, i)  (str[i]>'0'?str[i]-'0':0)
-#define CONV_STR2DEC_2(str, i)  (CONV_STR2DEC_1(str, i)*10 + str[i+1]-'0')
-#define CONV_STR2DEC_3(str, i)  (CONV_STR2DEC_2(str, i)*10 + str[i+2]-'0')
-#define CONV_STR2DEC_4(str, i)  (CONV_STR2DEC_3(str, i)*10 + str[i+3]-'0')
+#define CONV_STR2DEC_1(str, i) (str[i] > '0' ? str[i] - '0' : 0)
+#define CONV_STR2DEC_2(str, i) (CONV_STR2DEC_1(str, i) * 10 + str[i + 1] - '0')
+#define CONV_STR2DEC_3(str, i) (CONV_STR2DEC_2(str, i) * 10 + str[i + 2] - '0')
+#define CONV_STR2DEC_4(str, i) (CONV_STR2DEC_3(str, i) * 10 + str[i + 3] - '0')
 
 // Custom "glue logic" to convert the month name to a usable number
-#define GET_MONTH(str, i)      (str[i]=='J' && str[i+1]=='a' && str[i+2]=='n' ? 1 :     \
-                                str[i]=='F' && str[i+1]=='e' && str[i+2]=='b' ? 2 :     \
-                                str[i]=='M' && str[i+1]=='a' && str[i+2]=='r' ? 3 :     \
-                                str[i]=='A' && str[i+1]=='p' && str[i+2]=='r' ? 4 :     \
-                                str[i]=='M' && str[i+1]=='a' && str[i+2]=='y' ? 5 :     \
-                                str[i]=='J' && str[i+1]=='u' && str[i+2]=='n' ? 6 :     \
-                                str[i]=='J' && str[i+1]=='u' && str[i+2]=='l' ? 7 :     \
-                                str[i]=='A' && str[i+1]=='u' && str[i+2]=='g' ? 8 :     \
-                                str[i]=='S' && str[i+1]=='e' && str[i+2]=='p' ? 9 :     \
-                                str[i]=='O' && str[i+1]=='c' && str[i+2]=='t' ? 10 :    \
-                                str[i]=='N' && str[i+1]=='o' && str[i+2]=='v' ? 11 :    \
-                                str[i]=='D' && str[i+1]=='e' && str[i+2]=='c' ? 12 : 0)
+#define GET_MONTH(str, i)                                         \
+  (str[i] == 'J' && str[i + 1] == 'a' && str[i + 2] == 'n'   ? 1  \
+   : str[i] == 'F' && str[i + 1] == 'e' && str[i + 2] == 'b' ? 2  \
+   : str[i] == 'M' && str[i + 1] == 'a' && str[i + 2] == 'r' ? 3  \
+   : str[i] == 'A' && str[i + 1] == 'p' && str[i + 2] == 'r' ? 4  \
+   : str[i] == 'M' && str[i + 1] == 'a' && str[i + 2] == 'y' ? 5  \
+   : str[i] == 'J' && str[i + 1] == 'u' && str[i + 2] == 'n' ? 6  \
+   : str[i] == 'J' && str[i + 1] == 'u' && str[i + 2] == 'l' ? 7  \
+   : str[i] == 'A' && str[i + 1] == 'u' && str[i + 2] == 'g' ? 8  \
+   : str[i] == 'S' && str[i + 1] == 'e' && str[i + 2] == 'p' ? 9  \
+   : str[i] == 'O' && str[i + 1] == 'c' && str[i + 2] == 't' ? 10 \
+   : str[i] == 'N' && str[i + 1] == 'o' && str[i + 2] == 'v' ? 11 \
+   : str[i] == 'D' && str[i + 1] == 'e' && str[i + 2] == 'c' ? 12 \
+                                                             : 0)
 
 // extract the information from the time string given by __TIME__ and __DATE__
-#define __TIME_SECONDS__        CONV_STR2DEC_2(__TIME__, 6)
-#define __TIME_MINUTES__        CONV_STR2DEC_2(__TIME__, 3)
-#define __TIME_HOURS__          CONV_STR2DEC_2(__TIME__, 0)
-#define __TIME_DAYS__           CONV_STR2DEC_2(__DATE__, 4)
-#define __TIME_MONTH__          GET_MONTH(__DATE__, 0)
-#define __TIME_YEARS__          CONV_STR2DEC_4(__DATE__, 7)
+#define __TIME_SECONDS__ CONV_STR2DEC_2(__TIME__, 6)
+#define __TIME_MINUTES__ CONV_STR2DEC_2(__TIME__, 3)
+#define __TIME_HOURS__ CONV_STR2DEC_2(__TIME__, 0)
+#define __TIME_DAYS__ CONV_STR2DEC_2(__DATE__, 4)
+#define __TIME_MONTH__ GET_MONTH(__DATE__, 0)
+#define __TIME_YEARS__ CONV_STR2DEC_4(__DATE__, 7)
 
 // Days in February
 #define _UNIX_TIMESTAMP_FDAY(year) \
-    (((year) % 400) == 0UL ? 29UL : \
-        (((year) % 100) == 0UL ? 28UL : \
-            (((year) % 4) == 0UL ? 29UL : \
-                28UL)))
+  (((year) % 400) == 0UL ? 29UL    \
+                         : (((year) % 100) == 0UL ? 28UL : (((year) % 4) == 0UL ? 29UL : 28UL)))
 
 // Days in the year
-#define _UNIX_TIMESTAMP_YDAY(year, month, day) \
-    ( \
-        /* January */    day \
-        /* February */ + (month >=  2 ? 31UL : 0UL) \
-        /* March */    + (month >=  3 ? _UNIX_TIMESTAMP_FDAY(year) : 0UL) \
-        /* April */    + (month >=  4 ? 31UL : 0UL) \
-        /* May */      + (month >=  5 ? 30UL : 0UL) \
-        /* June */     + (month >=  6 ? 31UL : 0UL) \
-        /* July */     + (month >=  7 ? 30UL : 0UL) \
-        /* August */   + (month >=  8 ? 31UL : 0UL) \
-        /* September */+ (month >=  9 ? 31UL : 0UL) \
-        /* October */  + (month >= 10 ? 30UL : 0UL) \
-        /* November */ + (month >= 11 ? 31UL : 0UL) \
-        /* December */ + (month >= 12 ? 30UL : 0UL) \
-    )
+#define _UNIX_TIMESTAMP_YDAY(year, month, day)                                             \
+  (/* January */ day /* February */ + (month >= 2 ? 31UL : 0UL) /* March */ +              \
+   (month >= 3 ? _UNIX_TIMESTAMP_FDAY(year) : 0UL) /* April */ +                           \
+   (month >= 4 ? 31UL : 0UL) /* May */ + (month >= 5 ? 30UL : 0UL) /* June */ +            \
+   (month >= 6 ? 31UL : 0UL) /* July */ + (month >= 7 ? 30UL : 0UL) /* August */ +         \
+   (month >= 8 ? 31UL : 0UL) /* September */ + (month >= 9 ? 31UL : 0UL) /* October */ +   \
+   (month >= 10 ? 30UL : 0UL) /* November */ + (month >= 11 ? 31UL : 0UL) /* December */ + \
+   (month >= 12 ? 30UL : 0UL))
 
 // get the UNIX timestamp from a digits representation
-#define _UNIX_TIMESTAMP(year, month, day, hour, minute, second) \
-    ( /* time */ second \
-                + minute * SEC_PER_MIN \
-                + hour * SEC_PER_HOUR \
-    + /* year day (month + day) */ (_UNIX_TIMESTAMP_YDAY(year, month, day) - 1) * SEC_PER_DAY \
-    + /* year */ (year - 1970UL) * SEC_PER_YEAR \
-                + ((year - 1969UL) / 4UL) * SEC_PER_DAY \
-                - ((year - 1901UL) / 100UL) * SEC_PER_DAY \
-                + ((year - 1601UL) / 400UL) * SEC_PER_DAY \
-    )
+#define _UNIX_TIMESTAMP(year, month, day, hour, minute, second)                              \
+  (/* time */ second + minute * SEC_PER_MIN + hour * SEC_PER_HOUR +                          \
+   /* year day (month + day) */ (_UNIX_TIMESTAMP_YDAY(year, month, day) - 1) * SEC_PER_DAY + \
+   /* year */ (year - 1970UL) * SEC_PER_YEAR + ((year - 1969UL) / 4UL) * SEC_PER_DAY -       \
+   ((year - 1901UL) / 100UL) * SEC_PER_DAY + ((year - 1601UL) / 400UL) * SEC_PER_DAY)
 
 // the UNIX timestamp
-#define UNIX_TIMESTAMP (_UNIX_TIMESTAMP(__TIME_YEARS__, __TIME_MONTH__, __TIME_DAYS__, __TIME_HOURS__, __TIME_MINUTES__, __TIME_SECONDS__))
+#define UNIX_TIMESTAMP                                                            \
+  (_UNIX_TIMESTAMP(__TIME_YEARS__, __TIME_MONTH__, __TIME_DAYS__, __TIME_HOURS__, \
+                   __TIME_MINUTES__, __TIME_SECONDS__))
 
 #endif

From 351920aa7bb52450c7d93f11923a17d4bdc552a5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Apr 2022 11:31:29 +0200
Subject: [PATCH 09/12] some tweaks

---
 bsp_q7s/core/CoreController.cpp              | 4 +---
 linux/devices/GPSHyperionLinuxController.cpp | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index ef6e4fa0..f89230b3 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -3,8 +3,6 @@
 #include <fsfw/events/EventManager.h>
 #include <fsfw/ipc/QueueFactory.h>
 
-#include <algorithm>
-
 #include "OBSWConfig.h"
 #include "OBSWVersion.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
@@ -18,7 +16,7 @@
 #endif
 #include <fcntl.h>
 #include <unistd.h>
-
+#include <algorithm>
 #include <filesystem>
 
 #include "bsp_q7s/memory/SdCardManager.h"
diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 22f3affd..4dbb8f9c 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -190,7 +190,7 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   } else {
     timeIsConstantCounter = 0;
   }
-  if (timeInit) {
+  if (timeInit and validFix) {
     if (not utility::timeSanityCheck()) {
       sif::info << "Setting init clock in gps ctrl" << std::endl;
       // For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb..

From 6ae9e539a61c9d9fce28d70b9948f3fbeb8f142d Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Apr 2022 11:40:35 +0200
Subject: [PATCH 10/12] more useful printout

---
 bsp_q7s/core/CoreController.cpp              | 7 +++++++
 linux/devices/GPSHyperionLinuxController.cpp | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index f89230b3..42ba4307 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -16,6 +16,7 @@
 #endif
 #include <fcntl.h>
 #include <unistd.h>
+
 #include <algorithm>
 #include <filesystem>
 
@@ -1730,6 +1731,12 @@ ReturnValue_t CoreController::initClockFromTimeFile() {
     if (iss.bad() or *checkPtr) {
       return RETURN_FAILED;
     }
+#if OBSW_VERBOSE_LEVEL >= 1
+    time_t timeRaw = currentTime.tv_sec;
+    std::tm *time = std::gmtime(&timeRaw);
+    sif::info << "Setting system time from time files: " << std::put_time(time, "%c %Z")
+              << std::endl;
+#endif
     return Clock::setClock(&currentTime);
   }
   return RETURN_OK;
diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 4dbb8f9c..0947e396 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -192,7 +192,12 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   }
   if (timeInit and validFix) {
     if (not utility::timeSanityCheck()) {
-      sif::info << "Setting init clock in gps ctrl" << std::endl;
+#if OBSW_VERBOSE_LEVEL >= 1
+      time_t timeRaw = time.tv_sec;
+      std::tm *time = std::gmtime(&timeRaw);
+      sif::info << "Setting invalid system time from GPS data directly: "
+                << std::put_time(time, "%c %Z") << std::endl;
+#endif
       // For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb..
       Clock::setClock(&time);
     }

From c83efd149ec8e8f8ddb46f4c6bcfe10742d4cc81 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Apr 2022 11:41:17 +0200
Subject: [PATCH 11/12] small tweak

---
 linux/devices/GPSHyperionLinuxController.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index 0947e396..20860211 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -194,9 +194,9 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
     if (not utility::timeSanityCheck()) {
 #if OBSW_VERBOSE_LEVEL >= 1
       time_t timeRaw = time.tv_sec;
-      std::tm *time = std::gmtime(&timeRaw);
+      std::tm *timeTm = std::gmtime(&timeRaw);
       sif::info << "Setting invalid system time from GPS data directly: "
-                << std::put_time(time, "%c %Z") << std::endl;
+                << std::put_time(timeTm, "%c %Z") << std::endl;
 #endif
       // For some reason, the clock needs to be somewhat correct for NTP to work. Really dumb..
       Clock::setClock(&time);

From a9419cd3288e8c8855203094b7e1337e4eb78b4f Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 8 Apr 2022 14:51:47 +0200
Subject: [PATCH 12/12] tmtc update

---
 tmtc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtc b/tmtc
index 5189b20b..3a1c7c62 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 5189b20b0e732c0a504bd0d1278eef8653b10293
+Subproject commit 3a1c7c62887eb377c498bd9cdac47b93f40c85ba