curl cant use wildcards

Reviewed-on: #212
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

CMakeLists.txt

@@ -99,10 +99,14 @@ include (${CMAKE_SCRIPT_PATH}/HardwareOsPreConfig.cmake)
 pre_source_hw_os_config()
 
 if(TGT_BSP)
+    set(LIBGPS_VERSION_MAJOR 3)
+    # I assume a newer version than 3.17 will be installed on other Linux board than the Q7S
+    set(LIBGPS_VERSION_MINOR 20)
     if(TGT_BSP MATCHES "arm/q7s" OR TGT_BSP MATCHES "arm/raspberrypi"
         OR TGT_BSP MATCHES "arm/beagleboneblack" OR TGT_BSP MATCHES "arm/egse" 
         OR TGT_BSP MATCHES "arm/te0720-1cfa"
     )
+        find_library(${LIB_GPS} gps)
         set(FSFW_CONFIG_PATH "linux/fsfwconfig")
         if(NOT BUILD_Q7S_SIMPLE_MODE)
             set(EIVE_ADD_LINUX_FILES TRUE)
@@ -133,6 +137,8 @@ if(TGT_BSP)
     if(TGT_BSP MATCHES "arm/q7s")
         # Used by configure file
         set(XIPHOS_Q7S ON)
+        set(LIBGPS_VERSION_MAJOR 3)
+        set(LIBGPS_VERSION_MINOR 17)
     endif()
     
     if(TGT_BSP MATCHES "arm/te0720-1cfa")
@@ -154,8 +160,6 @@ elseif(TGT_BSP MATCHES "arm/raspberrypi" OR TGT_BSP MATCHES "arm/egse")
     configure_file(${BSP_PATH}/boardconfig/rpiConfig.h.in rpiConfig.h)
 endif()
 
-
-
 configure_file(${WATCHDOG_PATH}/watchdogConf.h.in watchdogConf.h)
 
 # Set common config path for FSFW
@@ -310,8 +314,8 @@ target_link_libraries(${OBSW_NAME} PRIVATE
 
 if(TGT_BSP MATCHES "arm/q7s")
     target_link_libraries(${LIB_EIVE_MISSION} PUBLIC
-        ${LIB_ARCSEC}
         ${LIB_GPS}
+        ${LIB_ARCSEC}
     )
 endif()
 
@@ -391,6 +395,8 @@ else()
     endif()
 endif()
 
+install(TARGETS ${OBSW_NAME} RUNTIME DESTINATION bin)
+
 string(CONCAT POST_BUILD_COMMENT
     "Build directory: ${CMAKE_BINARY_DIR}\n"
     "Target OSAL: ${FSFW_OSAL}\n"
@@ -405,6 +411,5 @@ add_custom_command(
    COMMENT ${POST_BUILD_COMMENT}
 )
 
-
 include (${CMAKE_SCRIPT_PATH}/BuildType.cmake)
 set_build_type()

automation/Dockerfile

@@ -8,13 +8,13 @@ RUN apt-get --yes install cmake libgpiod-dev xz-utils nano curl git gcc g++ lcov
 
 # Q7S root filesystem, required for cross-compilation.
 RUN mkdir -p /usr/rootfs; \
-curl https://buggy.irs.uni-stuttgart.de/eive/tools/cortexa9hf-neon-xiphos-linux-gnueabi.tar.gz \
-    | tar -xz -C /usr/rootfs
+curl https://buggy.irs.uni-stuttgart.de/eive/tools/eive-compile-rootfs-v0.1.0-7-gae69838.tar.xz \
+    | tar -xJ -C /usr/rootfs
 
 # Cross compiler
 RUN mkdir -p /usr/tools; \
 curl https://buggy.irs.uni-stuttgart.de/eive/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.gz \
     | tar -xz -C /usr/tools
 
-ENV ZYNQ_7020_SYSROOT="/usr/rootfs/cortexa9hf-neon-xiphos-linux-gnueabi"
+ENV ZYNQ_7020_SYSROOT="/usr/rootfs/eive-compile-rootfs"
 ENV PATH=$PATH:"/usr/tools/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"

automation/Jenkinsfile

@@ -5,7 +5,7 @@ pipeline {
     }
     agent {
         docker {
-            image 'eive-obsw-ci:d2'
+            image 'eive-obsw-ci:d4'
             args '--sysctl fs.mqueue.msg_max=100'
         }
     }

bsp_linux_board/CMakeLists.txt

@@ -1,6 +1,7 @@
 target_sources(${OBSW_NAME} PUBLIC
 	InitMission.cpp
 	main.cpp
+	gpioInit.cpp
 	ObjectFactory.cpp
 )
 

bsp_linux_board/InitMission.cpp

@@ -192,7 +192,7 @@ void initmission::createPstTasks(TaskFactory& factory,
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
 #if OBSW_ADD_SPI_TEST_CODE == 0
   FixedTimeslotTaskIF* spiPst = factory.createFixedTimeslotTask(
-      "SPI_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 3.0, missedDeadlineFunc);
+      "SPI_PST", 70, PeriodicTaskIF::MINIMUM_STACK_SIZE * 4, 1.0, missedDeadlineFunc);
   result = pst::pstSpi(spiPst);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     sif::error << "InitMission::initTasks: Creating PST failed!" << std::endl;

bsp_linux_board/ObjectFactory.cpp

@@ -5,10 +5,13 @@
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "fsfw/datapoollocal/LocalDataPoolManager.h"
+#include "fsfw/power/DummyPowerSwitcher.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/tmtcpacket/pus/tm.h"
 #include "fsfw/tmtcservices/CommandingServiceBase.h"
 #include "fsfw/tmtcservices/PusServiceBase.h"
+#include "gpioInit.h"
+#include "linux/ObjectFactory.h"
 #include "linux/boardtest/LibgpiodTest.h"
 #include "linux/boardtest/SpiTestClass.h"
 #include "linux/boardtest/UartTestClass.h"
@@ -64,37 +67,55 @@ void ObjectFactory::produce(void* args) {
   GpioCookie* gpioCookie = nullptr;
   static_cast<void>(gpioCookie);
 
-  new SpiComIF(objects::SPI_COM_IF, gpioIF);
+  SpiComIF* spiComIF = new SpiComIF(objects::SPI_COM_IF, gpioIF);
+  static_cast<void>(spiComIF);
+  auto pwrSwitcher = new DummyPowerSwitcher(objects::PCDU_HANDLER, 18, 0);
+  static_cast<void>(pwrSwitcher);
 
-  std::string spiDev;
-  SpiCookie* spiCookie = nullptr;
-  static_cast<void>(spiCookie);
+#if OBSW_ADD_ACS_BOARD == 1 && defined(RASPBERRY_PI)
+  createRpiAcsBoard(gpioIF, spiDev);
+#endif
 
-#if OBSW_ADD_ACS_BOARD == 1
-  if (gpioCookie == nullptr) {
-    gpioCookie = new GpioCookie();
-  }
+#if OBSW_ADD_SUN_SENSORS == 1 || defined(OBSW_ADD_RTD_DEVICES)
+#ifdef RASPBERRY_PI
+  rpi::gpio::initSpiCsDecoder(gpioIF);
+#endif
+#endif
+
+#if OBSW_ADD_SUN_SENSORS == 1
+  createSunSensorComponents(gpioIF, spiComIF, pwrSwitcher, spi::DEV);
+#endif
+
+#if OBSW_ADD_RTD_DEVICES == 1
+  createRtdComponents(spi::DEV, gpioIF, pwrSwitcher);
+#endif
+
+#if OBSW_ADD_TEST_CODE == 1
+  createTestTasks();
+#endif /* OBSW_ADD_TEST_CODE == 1 */
+}
+
+void ObjectFactory::createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev) {
+  GpioCookie* gpioCookie = new GpioCookie();
   // TODO: Missing pin for Gyro 2
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::MGM_0_LIS3_CS, gpio::MGM_0_BCM_PIN, "MGM_0_LIS3",
-                            gpio::Direction::OUT, 1);
+                            gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::MGM_1_RM3100_CS, gpio::MGM_1_BCM_PIN,
-                            "MGM_1_RM3100", gpio::Direction::OUT, 1);
+                            "MGM_1_RM3100", gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::MGM_2_LIS3_CS, gpio::MGM_2_BCM_PIN, "MGM_2_LIS3",
-                            gpio::Direction::OUT, 1);
+                            gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::MGM_3_RM3100_CS, gpio::MGM_3_BCM_PIN,
-                            "MGM_3_RM3100", gpio::Direction::OUT, 1);
+                            "MGM_3_RM3100", gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::GYRO_0_ADIS_CS, gpio::GYRO_0_BCM_PIN,
-                            "GYRO_0_ADIS", gpio::Direction::OUT, 1);
+                            "GYRO_0_ADIS", gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::GYRO_1_L3G_CS, gpio::GYRO_1_BCM_PIN, "GYRO_1_L3G",
-                            gpio::Direction::OUT, 1);
+                            gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::GYRO_2_ADIS_CS, gpio::GYRO_2_BCM_PIN,
-                            "GYRO_2_ADIS", gpio::Direction::OUT, 1);
+                            "GYRO_2_ADIS", gpio::Direction::OUT, gpio::Levels::HIGH);
   gpio::createRpiGpioConfig(gpioCookie, gpioIds::GYRO_3_L3G_CS, gpio::GYRO_3_BCM_PIN, "GYRO_3_L3G",
-                            gpio::Direction::OUT, 1);
+                            gpio::Direction::OUT, gpio::Levels::HIGH);
   gpioIF->addGpios(gpioCookie);
-
-  spiDev = "/dev/spidev0.1";
-  spiCookie =
+  SpiCookie* spiCookie =
       new SpiCookie(addresses::MGM_0_LIS3, gpioIds::MGM_0_LIS3_CS, spiDev,
                     MGMLIS3MDL::MAX_BUFFER_SIZE, spi::DEFAULT_LIS3_MODE, spi::DEFAULT_LIS3_SPEED);
   auto mgmLis3Handler =
@@ -136,9 +157,9 @@ void ObjectFactory::produce(void* args) {
 
   spiCookie =
       new SpiCookie(addresses::GYRO_0_ADIS, gpioIds::GYRO_0_ADIS_CS, spiDev,
-                    ADIS16507::MAXIMUM_REPLY_SIZE, spi::DEFAULT_L3G_MODE, spi::DEFAULT_L3G_SPEED);
-  auto adisHandler =
-      new GyroADIS16507Handler(objects::GYRO_0_ADIS_HANDLER, objects::SPI_COM_IF, spiCookie);
+                    ADIS1650X::MAXIMUM_REPLY_SIZE, spi::DEFAULT_L3G_MODE, spi::DEFAULT_L3G_SPEED);
+  auto adisHandler = new GyroADIS1650XHandler(objects::GYRO_0_ADIS_HANDLER, objects::SPI_COM_IF,
+                                              spiCookie, ADIS1650X::Type::ADIS16505);
   adisHandler->setStartUpImmediately();
   spiCookie =
       new SpiCookie(addresses::GYRO_1_L3G, gpioIds::GYRO_1_L3G_CS, spiDev, L3GD20H::MAX_BUFFER_SIZE,
@@ -152,9 +173,9 @@ void ObjectFactory::produce(void* args) {
 
   spiCookie =
       new SpiCookie(addresses::GYRO_2_ADIS, gpioIds::GYRO_2_ADIS_CS, spiDev,
-                    ADIS16507::MAXIMUM_REPLY_SIZE, spi::DEFAULT_L3G_MODE, spi::DEFAULT_L3G_SPEED);
-  adisHandler =
-      new GyroADIS16507Handler(objects::GYRO_2_ADIS_HANDLER, objects::SPI_COM_IF, spiCookie);
+                    ADIS1650X::MAXIMUM_REPLY_SIZE, spi::DEFAULT_L3G_MODE, spi::DEFAULT_L3G_SPEED);
+  adisHandler = new GyroADIS1650XHandler(objects::GYRO_2_ADIS_HANDLER, objects::SPI_COM_IF,
+                                         spiCookie, ADIS1650X::Type::ADIS16505);
   adisHandler->setStartUpImmediately();
 
   spiCookie =
@@ -166,12 +187,6 @@ void ObjectFactory::produce(void* args) {
 #if FSFW_HAL_L3GD20_GYRO_DEBUG == 1
   gyroL3gHandler->setToGoToNormalMode(true);
 #endif
-
-#endif /* RPI_TEST_ACS_BOARD == 1 */
-
-#if OBSW_ADD_TEST_CODE == 1
-  createTestTasks();
-#endif /* OBSW_ADD_TEST_CODE == 1 */
 }
 
 void ObjectFactory::createTestTasks() {

bsp_linux_board/ObjectFactory.h

@@ -1,10 +1,15 @@
 #ifndef BSP_LINUX_OBJECTFACTORY_H_
 #define BSP_LINUX_OBJECTFACTORY_H_
 
+#include <string>
+
+class GpioIF;
+
 namespace ObjectFactory {
 void setStatics();
 void produce(void* args);
 
+void createRpiAcsBoard(GpioIF* gpioIF, std::string spiDev);
 void createTestTasks();
 };  // namespace ObjectFactory
 

bsp_linux_board/boardconfig/rpiConfig.h.in

@@ -17,16 +17,4 @@
 
 #define RPI_ADD_UART_TEST               0
 
-/* Adapt these values accordingly */
-namespace gpio {
-static constexpr uint8_t MGM_0_BCM_PIN = 17;
-static constexpr uint8_t MGM_1_BCM_PIN = 27;
-static constexpr uint8_t MGM_2_BCM_PIN = 22;
-static constexpr uint8_t MGM_3_BCM_PIN = 23;
-static constexpr uint8_t GYRO_0_BCM_PIN = 5;
-static constexpr uint8_t GYRO_1_BCM_PIN = 6;
-static constexpr uint8_t GYRO_2_BCM_PIN = 13;
-static constexpr uint8_t GYRO_3_BCM_PIN = 19;
-}
-
 #endif /* BSP_RPI_BOARDCONFIG_RPI_CONFIG_H_ */

bsp_linux_board/definitions.h

@@ -0,0 +1,37 @@
+#ifndef BSP_LINUX_BOARD_DEFINITIONS_H_
+#define BSP_LINUX_BOARD_DEFINITIONS_H_
+
+#include <cstdint>
+
+#include "OBSWConfig.h"
+
+#ifdef RASPBERRY_PI
+
+namespace spi {
+
+static constexpr char DEV[] = "/dev/spidev0.1";
+
+}
+
+/* Adapt these values accordingly */
+namespace gpio {
+static constexpr uint8_t MGM_0_BCM_PIN = 17;
+static constexpr uint8_t MGM_1_BCM_PIN = 27;
+static constexpr uint8_t MGM_2_BCM_PIN = 22;
+static constexpr uint8_t MGM_3_BCM_PIN = 23;
+static constexpr uint8_t GYRO_0_BCM_PIN = 5;
+static constexpr uint8_t GYRO_1_BCM_PIN = 6;
+static constexpr uint8_t GYRO_2_BCM_PIN = 13;
+static constexpr uint8_t GYRO_3_BCM_PIN = 19;
+
+static constexpr uint8_t SPI_MUX_0_BCM = 17;
+static constexpr uint8_t SPI_MUX_1_BCM = 27;
+static constexpr uint8_t SPI_MUX_2_BCM = 22;
+static constexpr uint8_t SPI_MUX_3_BCM = 23;
+static constexpr uint8_t SPI_MUX_4_BCM = 5;
+static constexpr uint8_t SPI_MUX_5_BCM = 6;
+}  // namespace gpio
+
+#endif
+
+#endif /* BSP_LINUX_BOARD_DEFINITIONS_H_ */

bsp_linux_board/gpioInit.cpp

@@ -0,0 +1,56 @@
+#include "gpioInit.h"
+
+#include <devices/gpioIds.h>
+#include <fsfw/serviceinterface/ServiceInterface.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
+
+#include "definitions.h"
+#include "fsfw_hal/linux/rpi/GpioRPi.h"
+
+#ifdef RASPBERRY_PI
+
+struct MuxInfo {
+  MuxInfo(gpioId_t gpioId, int bcmNum, std::string consumer)
+      : gpioId(gpioId), bcmNum(bcmNum), consumer(consumer) {}
+  gpioId_t gpioId;
+  int bcmNum;
+  std::string consumer;
+};
+
+void rpi::gpio::initSpiCsDecoder(GpioIF* gpioComIF) {
+  using namespace ::gpio;
+  ReturnValue_t result;
+
+  if (gpioComIF == nullptr) {
+    sif::debug << "initSpiCsDecoder: Invalid gpioComIF" << std::endl;
+    return;
+  }
+
+  std::array<::MuxInfo, 6> muxInfo{
+      MuxInfo(gpioIds::SPI_MUX_BIT_0, SPI_MUX_0_BCM, "SPI_MUX_0"),
+      MuxInfo(gpioIds::SPI_MUX_BIT_1, SPI_MUX_1_BCM, "SPI_MUX_1"),
+      MuxInfo(gpioIds::SPI_MUX_BIT_2, SPI_MUX_2_BCM, "SPI_MUX_2"),
+      MuxInfo(gpioIds::SPI_MUX_BIT_3, SPI_MUX_3_BCM, "SPI_MUX_3"),
+      MuxInfo(gpioIds::SPI_MUX_BIT_4, SPI_MUX_4_BCM, "SPI_MUX_4"),
+      MuxInfo(gpioIds::SPI_MUX_BIT_5, SPI_MUX_5_BCM, "SPI_MUX_5"),
+  };
+  GpioCookie* spiMuxGpios = new GpioCookie;
+
+  for (const auto& info : muxInfo) {
+    result = createRpiGpioConfig(spiMuxGpios, info.gpioId, info.bcmNum, info.consumer,
+                                 Direction::OUT, Levels::LOW);
+    if (result != HasReturnvaluesIF::RETURN_OK) {
+      sif::error << "Creating Raspberry Pi SPI Mux GPIO failed with code " << result << std::endl;
+      return;
+    }
+  }
+
+  result = gpioComIF->addGpios(spiMuxGpios);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    sif::error << "initSpiCsDecoder: Failed to add mux bit gpios to gpioComIF" << std::endl;
+    return;
+  }
+}
+
+#endif

bsp_linux_board/gpioInit.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "OBSWConfig.h"
+
+class GpioIF;
+
+#ifdef RASPBERRY_PI
+namespace rpi {
+namespace gpio {
+
+/**
+ * @brief   This function initializes the GPIOs used to control the SN74LVC138APWR decoders on
+ *          the TCS Board and the interface board.
+ */
+void initSpiCsDecoder(GpioIF* gpioComIF);
+
+}  // namespace gpio
+}  // namespace rpi
+
+#endif

bsp_linux_board/main.cpp

@@ -22,7 +22,7 @@ int main(void) {
   std::cout << "-- EIVE OBSW --" << std::endl;
   std::cout << "-- Compiled for Linux board " << BOARD_NAME << " --" << std::endl;
   std::cout << "-- OBSW " << SW_NAME << " v" << SW_VERSION << "." << SW_SUBVERSION << "."
-            << SW_REVISION << ", FSFW v" << fsfw::FSFW_VERSION << "--" << std::endl;
+            << SW_REVISION << ", FSFW v" << fsfw::FSFW_VERSION << " --" << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;
 
   initmission::initMission();

bsp_q7s/boardconfig/busConf.h

@@ -8,7 +8,7 @@ static constexpr char SPI_RW_DEV[] = "/dev/spi-rw";
 
 static constexpr char I2C_DEFAULT_DEV[] = "/dev/i2c-eive";
 
-static constexpr char UART_GNSS_DEV[] = "/dev/ul-gps";
+static constexpr char UART_GNSS_DEV[] = "/dev/gps0";
 static constexpr char UART_PLOC_MPSOC_DEV[] = "/dev/ul-plmpsoc";
 static constexpr char UART_PLOC_SUPERVSIOR_DEV[] = "/dev/ul-plsv";
 static constexpr char UART_SYRLINKS_DEV[] = "/dev/ul-syrlinks";
@@ -84,6 +84,7 @@ static constexpr char RS485_EN_TX_DATA[] = "tx_data_enable_ltc2872";
 static constexpr char RS485_EN_RX_CLOCK[] = "rx_clock_enable_ltc2872";
 static constexpr char RS485_EN_RX_DATA[] = "rx_data_enable_ltc2872";
 static constexpr char PDEC_RESET[] = "pdec_reset";
+static constexpr char SYRLINKS_FAULT[] = "syrlinks_fault";
 
 static constexpr char PL_PCDU_ENABLE_VBAT0[] = "enable_plpcdu_vbat0";
 static constexpr char PL_PCDU_ENABLE_VBAT1[] = "enable_plpcdu_vbat1";

bsp_q7s/boardtest/Q7STestTask.cpp

@@ -246,7 +246,11 @@ void Q7STestTask::testGpsDaemon() {
     sif::warning << "Q7STestTask: Reading GPS data failed" << std::endl;
   }
   sif::info << "-- Q7STestTask: GPS shared memory read test --" << std::endl;
+#if LIBGPS_VERSION_MINOR <= 17
+  time_t timeRaw = gps->fix.time;
+#else
   time_t timeRaw = gps->fix.time.tv_sec;
+#endif
   std::tm* time = gmtime(&timeRaw);
   sif::info << "Time: " << std::put_time(time, "%c %Z") << std::endl;
   sif::info << "Visible satellites: " << gps->satellites_visible << std::endl;
@@ -254,7 +258,11 @@ void Q7STestTask::testGpsDaemon() {
   sif::info << "Fix (0:Not Seen|1:No Fix|2:2D|3:3D): " << gps->fix.mode << std::endl;
   sif::info << "Latitude: " << gps->fix.latitude << std::endl;
   sif::info << "Longitude: " << gps->fix.longitude << std::endl;
+#if LIBGPS_VERSION_MINOR <= 17
+  sif::info << "Altitude(MSL): " << gps->fix.altitude << std::endl;
+#else
   sif::info << "Altitude(MSL): " << gps->fix.altMSL << std::endl;
+#endif
   sif::info << "Speed(m/s): " << gps->fix.speed << std::endl;
 }
 

bsp_q7s/callbacks/CMakeLists.txt

@@ -2,5 +2,5 @@ target_sources(${OBSW_NAME} PRIVATE
 	rwSpiCallback.cpp
 	gnssCallback.cpp
 	pcduSwitchCb.cpp
-	gpioCallbacks.cpp
+	q7sGpioCallbacks.cpp
 )

bsp_q7s/callbacks/gpioCallbacks.cpp

@@ -1,487 +0,0 @@
-#include "gpioCallbacks.h"
-
-#include <devices/gpioIds.h>
-#include <fsfw/serviceinterface/ServiceInterface.h>
-#include <fsfw_hal/common/gpio/GpioCookie.h>
-#include <fsfw_hal/linux/gpio/LinuxLibgpioIF.h>
-
-#include "busConf.h"
-
-namespace gpioCallbacks {
-
-GpioIF* gpioComInterface;
-
-void initSpiCsDecoder(GpioIF* gpioComIF) {
-  using namespace gpio;
-  ReturnValue_t result;
-
-  if (gpioComIF == nullptr) {
-    sif::debug << "initSpiCsDecoder: Invalid gpioComIF" << std::endl;
-    return;
-  }
-
-  gpioComInterface = gpioComIF;
-
-  GpioCookie* spiMuxGpios = new GpioCookie;
-
-  GpiodRegularByLineName* spiMuxBit = nullptr;
-  /** Setting mux bit 1 to low will disable IC21 on the interface board */
-  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_0_PIN, "SPI Mux Bit 1",
-                                         Direction::OUT, Levels::HIGH);
-  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_0, spiMuxBit);
-  /** Setting mux bit 2 to low disables IC1 on the TCS board */
-  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_1_PIN, "SPI Mux Bit 2",
-                                         Direction::OUT, Levels::HIGH);
-  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_1, spiMuxBit);
-  /** Setting mux bit 3 to low disables IC2 on the TCS board and IC22 on the interface board */
-  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_2_PIN, "SPI Mux Bit 3",
-                                         Direction::OUT, Levels::LOW);
-  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_2, spiMuxBit);
-
-  /** The following gpios can take arbitrary initial values */
-  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_3_PIN, "SPI Mux Bit 4",
-                                         Direction::OUT, Levels::LOW);
-  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_3, spiMuxBit);
-  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_4_PIN, "SPI Mux Bit 5",
-                                         Direction::OUT, Levels::LOW);
-  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_4, spiMuxBit);
-  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_5_PIN, "SPI Mux Bit 6",
-                                         Direction::OUT, Levels::LOW);
-  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_5, spiMuxBit);
-  GpiodRegularByLineName* enRwDecoder = new GpiodRegularByLineName(
-      q7s::gpioNames::EN_RW_CS, "EN_RW_CS", Direction::OUT, Levels::HIGH);
-  spiMuxGpios->addGpio(gpioIds::EN_RW_CS, enRwDecoder);
-
-  result = gpioComInterface->addGpios(spiMuxGpios);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::error << "initSpiCsDecoder: Failed to add mux bit gpios to gpioComIF" << std::endl;
-    return;
-  }
-}
-
-void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, gpio::Levels value,
-                          void* args) {
-  using namespace gpio;
-  if (gpioComInterface == nullptr) {
-    sif::debug << "spiCsDecoderCallback: No gpioComIF specified. Call initSpiCsDecoder "
-               << "to specify gpioComIF" << std::endl;
-    return;
-  }
-
-  /* Reading is not supported by the callback function */
-  if (gpioOp == gpio::GpioOperation::READ) {
-    return;
-  }
-
-  if (value == Levels::HIGH) {
-    switch (gpioId) {
-      case (gpioIds::RTD_IC_3): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_4): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_5): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_6): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_7): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_8): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_9): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_10): {
-        disableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_11): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_12): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_13): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_14): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_15): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_16): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_17): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_18): {
-        disableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_0): {
-        disableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_1): {
-        disableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_2): {
-        disableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_3): {
-        disableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_4): {
-        disableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_5): {
-        disableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_6): {
-        disableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_7): {
-        disableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_8): {
-        disableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_9): {
-        disableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_10): {
-        disableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_11): {
-        disableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_RW1): {
-        disableRwDecoder();
-        break;
-      }
-      case (gpioIds::CS_RW2): {
-        disableRwDecoder();
-        break;
-      }
-      case (gpioIds::CS_RW3): {
-        disableRwDecoder();
-        break;
-      }
-      case (gpioIds::CS_RW4): {
-        disableRwDecoder();
-        break;
-      }
-      default:
-        sif::debug << "spiCsDecoderCallback: Invalid gpio id " << gpioId << std::endl;
-    }
-  } else if (value == Levels::LOW) {
-    switch (gpioId) {
-      case (gpioIds::RTD_IC_3): {
-        selectY7();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_4): {
-        selectY6();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_5): {
-        selectY5();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_6): {
-        selectY4();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_7): {
-        selectY3();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_8): {
-        selectY2();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_9): {
-        selectY1();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_10): {
-        selectY0();
-        enableDecoderTcsIc1();
-        break;
-      }
-      case (gpioIds::RTD_IC_11): {
-        selectY7();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_12): {
-        selectY6();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_13): {
-        selectY5();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_14): {
-        selectY4();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_15): {
-        selectY3();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_16): {
-        selectY2();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_17): {
-        selectY1();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::RTD_IC_18): {
-        selectY0();
-        enableDecoderTcsIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_0): {
-        selectY0();
-        enableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_1): {
-        selectY1();
-        enableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_2): {
-        selectY2();
-        enableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_3): {
-        selectY3();
-        enableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_4): {
-        selectY4();
-        enableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_5): {
-        selectY5();
-        enableDecoderInterfaceBoardIc1();
-        break;
-      }
-      case (gpioIds::CS_SUS_6): {
-        selectY0();
-        enableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_7): {
-        selectY1();
-        enableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_8): {
-        selectY2();
-        enableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_9): {
-        selectY3();
-        enableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_10): {
-        selectY4();
-        enableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_SUS_11): {
-        selectY5();
-        enableDecoderInterfaceBoardIc2();
-        break;
-      }
-      case (gpioIds::CS_RW1): {
-        selectY0();
-        enableRwDecoder();
-        break;
-      }
-      case (gpioIds::CS_RW2): {
-        selectY1();
-        enableRwDecoder();
-        break;
-      }
-      case (gpioIds::CS_RW3): {
-        selectY2();
-        enableRwDecoder();
-        break;
-      }
-      case (gpioIds::CS_RW4): {
-        selectY3();
-        enableRwDecoder();
-        break;
-      }
-      default:
-        sif::debug << "spiCsDecoderCallback: Invalid gpio id " << gpioId << std::endl;
-    }
-  } else {
-    sif::debug << "spiCsDecoderCallback: Invalid value. Must be 0 or 1" << std::endl;
-  }
-}
-
-void enableDecoderTcsIc1() {
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-}
-
-void enableDecoderTcsIc2() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_2);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_1);
-}
-
-void enableDecoderInterfaceBoardIc1() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-}
-
-void enableDecoderInterfaceBoardIc2() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_2);
-}
-
-void disableDecoderTcsIc1() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-}
-
-void disableDecoderTcsIc2() {
-  // DO NOT CHANGE THE ORDER HERE
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_1);
-}
-
-void disableDecoderInterfaceBoardIc1() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-}
-
-void disableDecoderInterfaceBoardIc2() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-}
-
-void enableRwDecoder() { gpioComInterface->pullHigh(gpioIds::EN_RW_CS); }
-
-void disableRwDecoder() { gpioComInterface->pullLow(gpioIds::EN_RW_CS); }
-
-void selectY0() {
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY1() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY2() {
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY3() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY4() {
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY5() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY6() {
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_5);
-}
-
-void selectY7() {
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_3);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_4);
-  gpioComInterface->pullHigh(gpioIds::SPI_MUX_BIT_5);
-}
-
-void disableAllDecoder() {
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_2);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_0);
-  gpioComInterface->pullLow(gpioIds::SPI_MUX_BIT_1);
-  gpioComInterface->pullLow(gpioIds::EN_RW_CS);
-}
-
-}  // namespace gpioCallbacks

bsp_q7s/callbacks/pcduSwitchCb.cpp

@@ -10,8 +10,8 @@ void pcdu::switchCallback(GOMSPACE::Pdu pdu, uint8_t channel, bool state, void*
     return;
   }
   if (pdu == GOMSPACE::Pdu::PDU1) {
-    PDU1::SwitchChannels typedChannel = static_cast<PDU1::SwitchChannels>(channel);
-    if (typedChannel == PDU1::SwitchChannels::ACS_A_SIDE) {
+    PDU1::Channels typedChannel = static_cast<PDU1::Channels>(channel);
+    if (typedChannel == PDU1::Channels::ACS_A_SIDE) {
       if (state) {
         gpioComIF->pullHigh(gpioIds::GNSS_0_NRESET);
       } else {
@@ -20,8 +20,8 @@ void pcdu::switchCallback(GOMSPACE::Pdu pdu, uint8_t channel, bool state, void*
     }
 
   } else if (pdu == GOMSPACE::Pdu::PDU2) {
-    PDU2::SwitchChannels typedChannel = static_cast<PDU2::SwitchChannels>(channel);
-    if (typedChannel == PDU2::SwitchChannels::ACS_B_SIDE) {
+    PDU2::Channels typedChannel = static_cast<PDU2::Channels>(channel);
+    if (typedChannel == PDU2::Channels::ACS_B_SIDE) {
       if (state) {
         gpioComIF->pullHigh(gpioIds::GNSS_1_NRESET);
       } else {

bsp_q7s/callbacks/q7sGpioCallbacks.cpp

@@ -0,0 +1,54 @@
+#include "q7sGpioCallbacks.h"
+
+#include <devices/gpioIds.h>
+#include <fsfw/serviceinterface/ServiceInterface.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
+
+#include "busConf.h"
+
+void q7s::gpioCallbacks::initSpiCsDecoder(GpioIF* gpioComIF) {
+  using namespace gpio;
+  ReturnValue_t result;
+
+  if (gpioComIF == nullptr) {
+    sif::debug << "initSpiCsDecoder: Invalid gpioComIF" << std::endl;
+    return;
+  }
+
+  GpioCookie* spiMuxGpios = new GpioCookie;
+
+  GpiodRegularByLineName* spiMuxBit = nullptr;
+  /** Setting mux bit 1 to low will disable IC21 on the interface board */
+  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_0_PIN, "SPI Mux Bit 1",
+                                         Direction::OUT, Levels::HIGH);
+  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_0, spiMuxBit);
+  /** Setting mux bit 2 to low disables IC1 on the TCS board */
+  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_1_PIN, "SPI Mux Bit 2",
+                                         Direction::OUT, Levels::HIGH);
+  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_1, spiMuxBit);
+  /** Setting mux bit 3 to low disables IC2 on the TCS board and IC22 on the interface board */
+  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_2_PIN, "SPI Mux Bit 3",
+                                         Direction::OUT, Levels::LOW);
+  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_2, spiMuxBit);
+
+  /** The following gpios can take arbitrary initial values */
+  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_3_PIN, "SPI Mux Bit 4",
+                                         Direction::OUT, Levels::LOW);
+  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_3, spiMuxBit);
+  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_4_PIN, "SPI Mux Bit 5",
+                                         Direction::OUT, Levels::LOW);
+  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_4, spiMuxBit);
+  spiMuxBit = new GpiodRegularByLineName(q7s::gpioNames::SPI_MUX_BIT_5_PIN, "SPI Mux Bit 6",
+                                         Direction::OUT, Levels::LOW);
+  spiMuxGpios->addGpio(gpioIds::SPI_MUX_BIT_5, spiMuxBit);
+  GpiodRegularByLineName* enRwDecoder = new GpiodRegularByLineName(
+      q7s::gpioNames::EN_RW_CS, "EN_RW_CS", Direction::OUT, Levels::HIGH);
+  spiMuxGpios->addGpio(gpioIds::EN_RW_CS, enRwDecoder);
+
+  result = gpioComIF->addGpios(spiMuxGpios);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    sif::error << "initSpiCsDecoder: Failed to add mux bit gpios to gpioComIF" << std::endl;
+    return;
+  }
+}

bsp_q7s/callbacks/q7sGpioCallbacks.h

@@ -0,0 +1,15 @@
+#pragma once
+
+class GpioIF;
+
+namespace q7s {
+namespace gpioCallbacks {
+
+/**
+ * @brief   This function initializes the GPIOs used to control the SN74LVC138APWR decoders on
+ *          the TCS Board and the interface board.
+ */
+void initSpiCsDecoder(GpioIF* gpioComIF);
+
+}  // namespace gpioCallbacks
+}  // namespace q7s

bsp_q7s/core/CoreController.cpp

@@ -1,13 +1,14 @@
 #include "CoreController.h"
 
 #include <fsfw/events/EventManager.h>
+#include <fsfw/ipc/QueueFactory.h>
 
 #include "OBSWConfig.h"
 #include "OBSWVersion.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "fsfw/timemanager/Stopwatch.h"
 #include "fsfw/version.h"
-#include "watchdogConf.h"
+#include "watchdog/definitions.h"
 #if OBSW_USE_TMTC_TCP_BRIDGE == 0
 #include "fsfw/osal/common/UdpTmTcBridge.h"
 #else
@@ -16,17 +17,22 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <algorithm>
 #include <filesystem>
 
 #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;
 
 CoreController::CoreController(object_id_t objectId)
-    : ExtendedControllerBase(objectId, objects::NO_OBJECT, 5), opDivider(5), hkSet(this) {
+    : ExtendedControllerBase(objectId, objects::NO_OBJECT, 5),
+      opDivider5(5),
+      opDivider10(10),
+      hkSet(this) {
   ReturnValue_t result = HasReturnvaluesIF::RETURN_OK;
   try {
     result = initWatchdogFifo();
@@ -50,6 +56,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) {
@@ -57,10 +64,22 @@ 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();
   readHkData();
+  opDivider5.checkAndIncrement();
+  opDivider10.checkAndIncrement();
 }
 
 ReturnValue_t CoreController::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
@@ -79,8 +98,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 "
@@ -91,7 +112,23 @@ ReturnValue_t CoreController::initialize() {
   sdStateMachine();
 
   triggerEvent(REBOOT_SW, CURRENT_CHIP, CURRENT_COPY);
-  return ExtendedControllerBase::initialize();
+  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) {
+    sif::warning << "CoreController::initialize: Registering as event listener failed" << std::endl;
+  }
+  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 RETURN_OK;
 }
 
 ReturnValue_t CoreController::initializeAfterTaskCreation() {
@@ -109,7 +146,7 @@ ReturnValue_t CoreController::initializeAfterTaskCreation() {
   }
   // Add script folder to path
   char *currentEnvPath = getenv("PATH");
-  std::string updatedEnvPath = std::string(currentEnvPath) + ":/home/root/scripts";
+  std::string updatedEnvPath = std::string(currentEnvPath) + ":/home/root/scripts:/usr/local/bin";
   setenv("PATH", updatedEnvPath.c_str(), true);
   updateProtInfo();
   initPrint();
@@ -639,8 +676,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)) {
@@ -1169,7 +1205,7 @@ ReturnValue_t CoreController::handleProtInfoUpdateLine(std::string nextLine) {
 
 void CoreController::performWatchdogControlOperation() {
   // Only perform each fifth iteration
-  if (watchdogFifoFd != 0 and opDivider.checkAndIncrement()) {
+  if (watchdogFifoFd != 0 and opDivider5.check()) {
     if (watchdogFifoFd == RETRY_FIFO_OPEN) {
       // Open FIFO write only and non-blocking
       watchdogFifoFd = open(watchdog::FIFO_NAME.c_str(), O_WRONLY | O_NONBLOCK);
@@ -1198,24 +1234,27 @@ 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;
     }
   }
+  timeFileHandler();
 }
 
 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;
@@ -1594,7 +1633,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) {
@@ -1621,7 +1660,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
@@ -1657,6 +1696,65 @@ void CoreController::setRebootMechanismLock(bool lock, xsc::Chip tgtChip, xsc::C
   rewriteRebootFile(rebootFile);
 }
 
+ReturnValue_t CoreController::timeFileHandler() {
+  // Always set time. We could only set it if it is updated by GPS, but then the backup time would
+  // become obsolete on GPS problems.
+  if (opDivider10.check()) {
+    // 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::string fileName = currMntPrefix + TIME_FILE;
+    std::ofstream timeFile(fileName);
+    if (not timeFile.good()) {
+      sif::error << "CoreController::timeFileHandler: Error opening time file: " << strerror(errno)
+                 << std::endl;
+      return RETURN_FAILED;
+    }
+    timeFile << "UNIX SECONDS: " << currentTime.tv_sec << std::endl;
+  }
+  return RETURN_OK;
+}
+
+ReturnValue_t CoreController::initClockFromTimeFile() {
+  using namespace GpsHyperion;
+  using namespace std;
+  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") {
+      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;
+    }
+#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;
+}
+
 void CoreController::readHkData() {
   ReturnValue_t result = RETURN_OK;
   result = hkSet.read(TIMEOUT_TYPE, MUTEX_TIMEOUT);
@@ -1690,3 +1788,8 @@ 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();
+}

bsp_q7s/core/CoreController.h

@@ -10,6 +10,7 @@
 #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;
@@ -47,16 +48,18 @@ class CoreController : public ExtendedControllerBase {
   static xsc::Chip CURRENT_CHIP;
   static xsc::Copy CURRENT_COPY;
 
-  static constexpr char CHIP_PROT_SCRIPT[] = "/home/root/scripts/get-chip-prot-status.sh";
+  static constexpr char CHIP_PROT_SCRIPT[] = "get-chip-prot-status.sh";
   static constexpr char CHIP_STATE_FILE[] = "/tmp/chip_prot_status.txt";
   static constexpr char CURR_COPY_FILE[] = "/tmp/curr_copy.txt";
   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 +129,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 +155,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;
@@ -173,6 +178,7 @@ class CoreController : public ExtendedControllerBase {
     sd::SdState commandedState = sd::SdState::OFF;
   } sdInfo;
   RebootFile rebootFile = {};
+  std::string currMntPrefix;
   bool doPerformMountedSdCardOps = true;
 
   /**
@@ -182,7 +188,8 @@ class CoreController : public ExtendedControllerBase {
    * Index 3: Chip 1 Copy 1
    */
   std::array<bool, 4> protArray;
-  PeriodicOperationDivider opDivider;
+  PeriodicOperationDivider opDivider5;
+  PeriodicOperationDivider opDivider10;
 
   core::HkSet hkSet;
 
@@ -192,6 +199,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 +236,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_ */

bsp_q7s/core/InitMission.cpp

@@ -127,12 +127,14 @@ void initmission::initTasks() {
       "SYS_TASK", 40, PeriodicTaskIF::MINIMUM_STACK_SIZE * 2, 0.4, missedDeadlineFunc);
   result = sysTask->addComponent(objects::ACS_BOARD_ASS);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    initmission::printAddObjectError("ACS_ASS", objects::ACS_BOARD_ASS);
+    initmission::printAddObjectError("ACS_BOARD_ASS", objects::ACS_BOARD_ASS);
   }
+#if OBSW_ADD_SUS_BOARD_ASS == 1
   result = sysTask->addComponent(objects::SUS_BOARD_ASS);
   if (result != HasReturnvaluesIF::RETURN_OK) {
-    initmission::printAddObjectError("SUS_ASS", objects::SUS_BOARD_ASS);
+    initmission::printAddObjectError("SUS_BOARD_ASS", objects::SUS_BOARD_ASS);
   }
+#endif
   result = sysTask->addComponent(objects::TCS_BOARD_ASS);
   if (result != HasReturnvaluesIF::RETURN_OK) {
     initmission::printAddObjectError("TCS_BOARD_ASS", objects::TCS_BOARD_ASS);
@@ -221,7 +223,7 @@ void initmission::initTasks() {
 
   fsTask->startTask();
 #if OBSW_ADD_STAR_TRACKER == 1
-  strHelperTask > startTask();
+  strHelperTask->startTask();
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
 #if OBSW_ADD_ACS_HANDLERS == 1
@@ -413,23 +415,23 @@ void initmission::createTestTasks(TaskFactory& factory,
 }
 
 /**
-                   â–„              â–„
-                  ▌▒█           ▄▀▒▌
-                  ▌▒▒█        ▄▀▒▒▒�
-                 �▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒�
-               ▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒�
-             ▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌
-            �▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌
-            ▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒�
-           �░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌
-           ▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌
-          ▌▒▀�▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒�
-          �▒▒�▀�▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
-          �▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒�
-           ▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌
-           â–?â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–’â–‘â–’â–‘â–’â–‘â–’â–’â–„â–’â–’â–?
-            ▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌
-              ▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀
-                ▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀
-                   ▒▒▒▒▒▒▒▒▒▒▀▀
+                   ▄              ▄
+                  ▌▒█           ▄▀▒▌
+                  ▌▒▒█        ▄▀▒▒▒▐
+                 ▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐
+               ▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐
+             ▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌
+            ▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌
+            ▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐
+           ▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌
+           ▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌
+          ▌▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐
+          ▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
+          ▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐
+           ▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌
+           ▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐
+            ▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌
+              ▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀
+                ▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀
+                   ▒▒▒▒▒▒▒▒▒▒▀▀
  **/

bsp_q7s/core/ObjectFactory.cpp

@@ -1,22 +1,10 @@
 #include "ObjectFactory.h"
 
-#include <fsfw/ipc/QueueFactory.h>
-#include <linux/obc/AxiPtmeConfig.h>
-#include <linux/obc/PapbVcInterface.h>
-#include <linux/obc/PdecHandler.h>
-#include <linux/obc/Ptme.h>
-#include <linux/obc/PtmeConfig.h>
-#include <mission/system/AcsBoardFdir.h>
-#include <mission/system/RtdFdir.h>
-#include <mission/system/SusAssembly.h>
-#include <mission/system/SusFdir.h>
-#include <mission/system/TcsBoardAssembly.h>
-
 #include "OBSWConfig.h"
 #include "bsp_q7s/boardtest/Q7STestTask.h"
 #include "bsp_q7s/callbacks/gnssCallback.h"
-#include "bsp_q7s/callbacks/gpioCallbacks.h"
 #include "bsp_q7s/callbacks/pcduSwitchCb.h"
+#include "bsp_q7s/callbacks/q7sGpioCallbacks.h"
 #include "bsp_q7s/callbacks/rwSpiCallback.h"
 #include "bsp_q7s/core/CoreController.h"
 #include "bsp_q7s/memory/FileSystemHandler.h"
@@ -26,9 +14,12 @@
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "devices/powerSwitcherList.h"
+#include "fsfw/ipc/QueueFactory.h"
+#include "linux/ObjectFactory.h"
 #include "linux/boardtest/I2cTestClass.h"
 #include "linux/boardtest/SpiTestClass.h"
 #include "linux/boardtest/UartTestClass.h"
+#include "linux/callbacks/gpioCallbacks.h"
 #include "linux/csp/CspComIF.h"
 #include "linux/csp/CspCookie.h"
 #include "linux/devices/GPSHyperionLinuxController.h"
@@ -41,6 +32,16 @@
 #include "linux/devices/ploc/PlocUpdater.h"
 #include "linux/devices/startracker/StarTrackerHandler.h"
 #include "linux/devices/startracker/StrHelper.h"
+#include "linux/obc/AxiPtmeConfig.h"
+#include "linux/obc/PapbVcInterface.h"
+#include "linux/obc/PdecHandler.h"
+#include "linux/obc/Ptme.h"
+#include "linux/obc/PtmeConfig.h"
+#include "mission/system/AcsBoardFdir.h"
+#include "mission/system/RtdFdir.h"
+#include "mission/system/SusAssembly.h"
+#include "mission/system/SusFdir.h"
+#include "mission/system/TcsBoardAssembly.h"
 #include "tmtc/apid.h"
 #include "tmtc/pusIds.h"
 
@@ -109,7 +110,7 @@ void Factory::setStaticFrameworkObjectIds() {
   CommandingServiceBase::defaultPacketDestination = objects::TM_FUNNEL;
 
   DeviceHandlerBase::powerSwitcherId = objects::PCDU_HANDLER;
-//  DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
+  //  DeviceHandlerBase::powerSwitcherId = objects::NO_OBJECT;
 
 #if OBSW_TM_TO_PTME == 1
   TmFunnel::downlinkDestination = objects::CCSDS_HANDLER;
@@ -138,10 +139,10 @@ void ObjectFactory::produce(void* args) {
   createTmpComponents();
   new CoreController(objects::CORE_CONTROLLER);
 
-  gpioCallbacks::disableAllDecoder();
+  gpioCallbacks::disableAllDecoder(gpioComIF);
   createPcduComponents(gpioComIF, &pwrSwitcher);
   createRadSensorComponent(gpioComIF);
-  createSunSensorComponents(gpioComIF, spiComIF, pwrSwitcher);
+  createSunSensorComponents(gpioComIF, spiComIF, pwrSwitcher, q7s::SPI_DEFAULT_DEV);
 
 #if OBSW_ADD_ACS_BOARD == 1
   createAcsBoardComponents(gpioComIF, uartComIF, pwrSwitcher);
@@ -149,23 +150,23 @@ void ObjectFactory::produce(void* args) {
 
   createHeaterComponents();
   createSolarArrayDeploymentComponents();
-  createPlPcduComponents(gpioComIF, spiComIF);
+  createPlPcduComponents(gpioComIF, spiComIF, pwrSwitcher);
 #if OBSW_ADD_SYRLINKS == 1
   createSyrlinksComponents();
 #endif /* OBSW_ADD_SYRLINKS == 1 */
-  createRtdComponents(gpioComIF, pwrSwitcher);
+  createRtdComponents(q7s::SPI_DEFAULT_DEV, gpioComIF, pwrSwitcher);
   createPayloadComponents(gpioComIF);
 
 #if OBSW_ADD_MGT == 1
   I2cCookie* imtqI2cCookie =
       new I2cCookie(addresses::IMTQ, IMTQ::MAX_REPLY_SIZE, q7s::I2C_DEFAULT_DEV);
-  auto imtqHandler = new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie);
+  auto imtqHandler = new IMTQHandler(objects::IMTQ_HANDLER, objects::I2C_COM_IF, imtqI2cCookie,
+                                     pcdu::Switches::PDU1_CH3_MGT_5V);
+  imtqHandler->setPowerSwitcher(pwrSwitcher);
   static_cast<void>(imtqHandler);
-#if OBSW_DEBUG_IMTQ == 1
+#if OBSW_TEST_IMTQ == 1
   imtqHandler->setStartUpImmediately();
   imtqHandler->setToGoToNormal(true);
-#else
-  (void)imtqHandler;
 #endif
 #endif
   createReactionWheelComponents(gpioComIF);
@@ -174,25 +175,22 @@ void ObjectFactory::produce(void* args) {
   I2cCookie* bpxI2cCookie = new I2cCookie(addresses::BPX_BATTERY, 100, q7s::I2C_DEFAULT_DEV);
   BpxBatteryHandler* bpxHandler =
       new BpxBatteryHandler(objects::BPX_BATT_HANDLER, objects::I2C_COM_IF, bpxI2cCookie);
-#if OBSW_TEST_BPX_BATT == 1
-  bpxHandler->setToGoToNormalMode(true);
   bpxHandler->setStartUpImmediately();
-#else
-  static_cast<void>(bpxHandler);
-#endif
+  bpxHandler->setToGoToNormalMode(true);
 #endif
 
   new FileSystemHandler(objects::FILE_SYSTEM_HANDLER);
 
 #if OBSW_ADD_STAR_TRACKER == 1
   UartCookie* starTrackerCookie =
-      new UartCookie(objects::STAR_TRACKER, q7s::UART_STAR_TRACKER_DEV, UartModes::NON_CANONICAL,
-                     uart::STAR_TRACKER_BAUD, StarTracker::MAX_FRAME_SIZE * 2 + 2);
+      new UartCookie(objects::STAR_TRACKER, q7s::UART_STAR_TRACKER_DEV, uart::STAR_TRACKER_BAUD,
+                     startracker::MAX_FRAME_SIZE * 2 + 2, UartModes::NON_CANONICAL);
   starTrackerCookie->setNoFixedSizeReply();
   StrHelper* strHelper = new StrHelper(objects::STR_HELPER);
-  StarTrackerHandler* starTrackerHandler = new StarTrackerHandler(
-      objects::STAR_TRACKER, objects::UART_COM_IF, starTrackerCookie, strHelper);
-  starTrackerHandler->setStartUpImmediately();
+  auto starTracker =
+      new StarTrackerHandler(objects::STAR_TRACKER, objects::UART_COM_IF, starTrackerCookie,
+                             strHelper, pcdu::PDU1_CH2_STAR_TRACKER_5V);
+  starTracker->setPowerSwitcher(pwrSwitcher);
 
 #endif /* OBSW_ADD_STAR_TRACKER == 1 */
 
@@ -239,7 +237,7 @@ void ObjectFactory::createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, Ua
   *spiComIF = new SpiComIF(objects::SPI_COM_IF, *gpioComIF);
 
   /* Adding gpios for chip select decoding to the gpioComIf */
-  gpioCallbacks::initSpiCsDecoder(*gpioComIF);
+  q7s::gpioCallbacks::initSpiCsDecoder(*gpioComIF);
 }
 
 void ObjectFactory::createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF** pwrSwitcher) {
@@ -252,10 +250,8 @@ void ObjectFactory::createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchI
       new P60DockHandler(objects::P60DOCK_HANDLER, objects::CSP_COM_IF, p60DockCspCookie);
   PDU1Handler* pdu1handler =
       new PDU1Handler(objects::PDU1_HANDLER, objects::CSP_COM_IF, pdu1CspCookie);
-  pdu1handler->assignChannelHookFunction(&pcdu::switchCallback, gpioComIF);
   PDU2Handler* pdu2handler =
       new PDU2Handler(objects::PDU2_HANDLER, objects::CSP_COM_IF, pdu2CspCookie);
-  pdu2handler->assignChannelHookFunction(&pcdu::switchCallback, gpioComIF);
   ACUHandler* acuhandler = new ACUHandler(objects::ACU_HANDLER, objects::CSP_COM_IF, acuCspCookie);
   auto pcduHandler = new PCDUHandler(objects::PCDU_HANDLER, 50);
 
@@ -300,161 +296,6 @@ void ObjectFactory::createRadSensorComponent(LinuxLibgpioIF* gpioComIF) {
 #endif
 }
 
-void ObjectFactory::createSunSensorComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
-                                              PowerSwitchIF* pwrSwitcher) {
-  using namespace gpio;
-  GpioCookie* gpioCookieSus = new GpioCookie();
-  GpioCallback* susgpio = nullptr;
-
-  susgpio = new GpioCallback("Chip select SUS 0", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_0, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 1", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_1, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 2", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_2, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 3", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_3, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 4", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_4, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 5", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_5, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 6", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_6, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 7", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_7, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 8", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_8, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 9", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_9, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 10", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_10, susgpio);
-  susgpio = new GpioCallback("Chip select SUS 11", Direction::OUT, Levels::HIGH,
-                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  gpioCookieSus->addGpio(gpioIds::CS_SUS_11, susgpio);
-
-  gpioComIF->addGpios(gpioCookieSus);
-
-  SusFdir* fdir = nullptr;
-  std::array<SusHandler*, 12> susHandlers = {};
-#if OBSW_ADD_SUN_SENSORS == 1
-  SpiCookie* spiCookie =
-      new SpiCookie(addresses::SUS_0, gpioIds::CS_SUS_0, q7s::SPI_DEFAULT_DEV, SUS::MAX_CMD_SIZE,
-                    spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[0] = new SusHandler(objects::SUS_0, 0, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_0);
-  susHandlers[0]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[0]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_1, gpioIds::CS_SUS_1, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[1] = new SusHandler(objects::SUS_1, 1, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_1);
-  susHandlers[1]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[1]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_2, gpioIds::CS_SUS_2, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[2] = new SusHandler(objects::SUS_2, 2, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_2);
-  susHandlers[2]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[2]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_3, gpioIds::CS_SUS_3, std::string(q7s::SPI_DEFAULT_DEV),
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[3] = new SusHandler(objects::SUS_3, 3, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_3);
-  susHandlers[3]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[3]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_4, gpioIds::CS_SUS_4, std::string(q7s::SPI_DEFAULT_DEV),
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[4] = new SusHandler(objects::SUS_4, 4, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_4);
-  susHandlers[4]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[4]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_5, gpioIds::CS_SUS_5, std::string(q7s::SPI_DEFAULT_DEV),
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[5] = new SusHandler(objects::SUS_5, 5, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_5);
-  susHandlers[5]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[5]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_6, gpioIds::CS_SUS_6, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[6] = new SusHandler(objects::SUS_6, 6, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_6);
-  susHandlers[6]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[6]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_7, gpioIds::CS_SUS_7, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[7] = new SusHandler(objects::SUS_7, 7, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_7);
-  susHandlers[7]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[7]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_8, gpioIds::CS_SUS_8, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[8] = new SusHandler(objects::SUS_8, 8, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_8);
-  susHandlers[8]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[8]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_9, gpioIds::CS_SUS_9, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[9] = new SusHandler(objects::SUS_9, 9, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_9);
-  susHandlers[9]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[9]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_10, gpioIds::CS_SUS_10, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[10] = new SusHandler(objects::SUS_10, 10, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_10);
-  susHandlers[10]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[10]->setCustomFdir(fdir);
-
-  spiCookie = new SpiCookie(addresses::SUS_11, gpioIds::CS_SUS_11, q7s::SPI_DEFAULT_DEV,
-                            SUS::MAX_CMD_SIZE, spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
-  susHandlers[11] = new SusHandler(objects::SUS_11, 11, objects::SPI_COM_IF, spiCookie);
-  fdir = new SusFdir(objects::SUS_11);
-  susHandlers[11]->setParent(objects::SUS_BOARD_ASS);
-  susHandlers[11]->setCustomFdir(fdir);
-
-  for (auto& sus : susHandlers) {
-    if (sus != nullptr) {
-#if OBSW_TEST_SUS == 1
-      sus->setStartUpImmediately();
-      sus->setToGoToNormalMode(true);
-#endif
-#if OBSW_DEBUG_SUS == 1
-      sus->enablePeriodicPrintout(true, 3);
-#endif
-    }
-  }
-  std::array<object_id_t, 12> susIds = {objects::SUS_0, objects::SUS_1,  objects::SUS_2,
-                                        objects::SUS_3, objects::SUS_4,  objects::SUS_5,
-                                        objects::SUS_6, objects::SUS_7,  objects::SUS_8,
-                                        objects::SUS_9, objects::SUS_10, objects::SUS_11};
-  SusAssHelper susAssHelper = SusAssHelper(susIds);
-  auto susAss =
-      new SusAssembly(objects::SUS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher, susAssHelper);
-  static_cast<void>(susAss);
-#endif /* OBSW_ADD_SUN_SENSORS == 1 */
-}
-
 void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
                                              PowerSwitchIF* pwrSwitcher) {
   using namespace gpio;
@@ -713,15 +554,6 @@ void ObjectFactory::createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComI
   auto acsAss = new AcsBoardAssembly(objects::ACS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
                                      acsBoardHelper, gpioComIF);
   static_cast<void>(acsAss);
-#if OBSW_TEST_ACS_BOARD_ASS == 1
-  CommandMessage msg;
-  ModeMessage::setModeMessage(&msg, ModeMessage::CMD_MODE_COMMAND, DeviceHandlerIF::MODE_NORMAL,
-                              duallane::A_SIDE);
-  ReturnValue_t result = MessageQueueSenderIF::sendMessage(acsAss->getCommandQueue(), &msg);
-  if (result != HasReturnvaluesIF::RETURN_OK) {
-    sif::warning << "Sending mode command failed" << std::endl;
-  }
-#endif
 #endif /* OBSW_ADD_ACS_HANDLERS == 1 */
 }
 
@@ -767,7 +599,7 @@ void ObjectFactory::createHeaterComponents() {
   heaterGpiosCookie->addGpio(gpioIds::HEATER_7, gpio);
 
   new HeaterHandler(objects::HEATER_HANDLER, objects::GPIO_IF, heaterGpiosCookie,
-                    objects::PCDU_HANDLER, pcduSwitches::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
+                    objects::PCDU_HANDLER, pcdu::Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V);
 }
 
 void ObjectFactory::createSolarArrayDeploymentComponents() {
@@ -787,127 +619,19 @@ void ObjectFactory::createSolarArrayDeploymentComponents() {
   // TODO: Find out burn time. For now set to 1000 ms.
   new SolarArrayDeploymentHandler(objects::SOLAR_ARRAY_DEPL_HANDLER, objects::GPIO_IF,
                                   solarArrayDeplCookie, objects::PCDU_HANDLER,
-                                  pcduSwitches::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
+                                  pcdu::Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
                                   gpioIds::DEPLSA1, gpioIds::DEPLSA2, 1000);
 }
 
-void ObjectFactory::createSyrlinksComponents() {
+void ObjectFactory::createSyrlinksComponents(PowerSwitchIF* pwrSwitcher) {
   UartCookie* syrlinksUartCookie =
-      new UartCookie(objects::SYRLINKS_HK_HANDLER, q7s::UART_SYRLINKS_DEV, UartModes::NON_CANONICAL,
-                     uart::SYRLINKS_BAUD, SYRLINKS::MAX_REPLY_SIZE);
+      new UartCookie(objects::SYRLINKS_HK_HANDLER, q7s::UART_SYRLINKS_DEV, uart::SYRLINKS_BAUD,
+                     syrlinks::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   syrlinksUartCookie->setParityEven();
 
-  new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF, syrlinksUartCookie);
-}
-
-void ObjectFactory::createRtdComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher) {
-  using namespace gpio;
-  GpioCookie* rtdGpioCookie = new GpioCookie;
-
-  GpioCallback* gpioRtdIc0 = new GpioCallback("Chip select RTD IC0", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_3, gpioRtdIc0);
-  GpioCallback* gpioRtdIc1 = new GpioCallback("Chip select RTD IC1", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_4, gpioRtdIc1);
-  GpioCallback* gpioRtdIc2 = new GpioCallback("Chip select RTD IC2", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_5, gpioRtdIc2);
-  GpioCallback* gpioRtdIc3 = new GpioCallback("Chip select RTD IC3", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_6, gpioRtdIc3);
-  GpioCallback* gpioRtdIc4 = new GpioCallback("Chip select RTD IC4", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_7, gpioRtdIc4);
-  GpioCallback* gpioRtdIc5 = new GpioCallback("Chip select RTD IC5", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_8, gpioRtdIc5);
-  GpioCallback* gpioRtdIc6 = new GpioCallback("Chip select RTD IC6", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_9, gpioRtdIc6);
-  GpioCallback* gpioRtdIc7 = new GpioCallback("Chip select RTD IC7", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_10, gpioRtdIc7);
-  GpioCallback* gpioRtdIc8 = new GpioCallback("Chip select RTD IC8", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_11, gpioRtdIc8);
-  GpioCallback* gpioRtdIc9 = new GpioCallback("Chip select RTD IC9", Direction::OUT, Levels::HIGH,
-                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_12, gpioRtdIc9);
-  GpioCallback* gpioRtdIc10 = new GpioCallback("Chip select RTD IC10", Direction::OUT, Levels::HIGH,
-                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_13, gpioRtdIc10);
-  GpioCallback* gpioRtdIc11 = new GpioCallback("Chip select RTD IC11", Direction::OUT, Levels::HIGH,
-                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_14, gpioRtdIc11);
-  GpioCallback* gpioRtdIc12 = new GpioCallback("Chip select RTD IC12", Direction::OUT, Levels::HIGH,
-                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_15, gpioRtdIc12);
-  GpioCallback* gpioRtdIc13 = new GpioCallback("Chip select RTD IC13", Direction::OUT, Levels::HIGH,
-                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_16, gpioRtdIc13);
-  GpioCallback* gpioRtdIc14 = new GpioCallback("Chip select RTD IC14", Direction::OUT, Levels::HIGH,
-                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_17, gpioRtdIc14);
-  GpioCallback* gpioRtdIc15 = new GpioCallback("Chip select RTD IC15", Direction::OUT, Levels::HIGH,
-                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
-  rtdGpioCookie->addGpio(gpioIds::RTD_IC_18, gpioRtdIc15);
-
-  gpioComIF->addGpios(rtdGpioCookie);
-
-  static constexpr uint8_t NUMBER_RTDS = 16;
-#if OBSW_ADD_RTD_DEVICES == 1
-  std::array<std::pair<address_t, gpioId_t>, NUMBER_RTDS> cookieArgs = {{
-      {addresses::RTD_IC_3, gpioIds::RTD_IC_3},
-      {addresses::RTD_IC_4, gpioIds::RTD_IC_4},
-      {addresses::RTD_IC_5, gpioIds::RTD_IC_5},
-      {addresses::RTD_IC_6, gpioIds::RTD_IC_6},
-      {addresses::RTD_IC_7, gpioIds::RTD_IC_7},
-      {addresses::RTD_IC_8, gpioIds::RTD_IC_8},
-      {addresses::RTD_IC_9, gpioIds::RTD_IC_9},
-      {addresses::RTD_IC_10, gpioIds::RTD_IC_10},
-      {addresses::RTD_IC_11, gpioIds::RTD_IC_11},
-      {addresses::RTD_IC_12, gpioIds::RTD_IC_12},
-      {addresses::RTD_IC_13, gpioIds::RTD_IC_13},
-      {addresses::RTD_IC_14, gpioIds::RTD_IC_14},
-      {addresses::RTD_IC_15, gpioIds::RTD_IC_15},
-      {addresses::RTD_IC_16, gpioIds::RTD_IC_16},
-      {addresses::RTD_IC_17, gpioIds::RTD_IC_17},
-      {addresses::RTD_IC_18, gpioIds::RTD_IC_18},
-  }};
-  std::array<object_id_t, NUMBER_RTDS> rtdIds = {
-      objects::RTD_IC_3,  objects::RTD_IC_4,  objects::RTD_IC_5,  objects::RTD_IC_6,
-      objects::RTD_IC_7,  objects::RTD_IC_8,  objects::RTD_IC_9,  objects::RTD_IC_10,
-      objects::RTD_IC_11, objects::RTD_IC_12, objects::RTD_IC_13, objects::RTD_IC_14,
-      objects::RTD_IC_15, objects::RTD_IC_16, objects::RTD_IC_17, objects::RTD_IC_18};
-  std::array<SpiCookie*, NUMBER_RTDS> rtdCookies = {};
-  std::array<Max31865PT1000Handler*, NUMBER_RTDS> rtds = {};
-  RtdFdir* rtdFdir = nullptr;
-  for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
-    rtdCookies[idx] =
-        new SpiCookie(cookieArgs[idx].first, cookieArgs[idx].second, q7s::SPI_DEFAULT_DEV,
-                      Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
-    rtds[idx] = new Max31865PT1000Handler(rtdIds[idx], objects::SPI_COM_IF, rtdCookies[idx]);
-    rtds[idx]->setParent(objects::TCS_BOARD_ASS);
-    rtdFdir = new RtdFdir(rtdIds[idx]);
-    rtds[idx]->setCustomFdir(rtdFdir);
-    rtds[idx]->setDeviceIdx(idx + 3);
-  }
-
-#if OBSW_TEST_RTD == 1
-  for (auto& rtd : rtds) {
-    if (rtd != nullptr) {
-      rtd->setStartUpImmediately();
-      rtd->setInstantNormal(true);
-    }
-  }
-#endif  // OBSW_TEST_RTD == 1
-  TcsBoardHelper helper(rtdIds);
-  TcsBoardAssembly* tcsBoardAss =
-      new TcsBoardAssembly(objects::TCS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
-                           pcduSwitches::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
-  static_cast<void>(tcsBoardAss);
-#endif  // OBSW_ADD_RTD_DEVICES == 1
+  auto syrlinksHandler = new SyrlinksHkHandler(objects::SYRLINKS_HK_HANDLER, objects::UART_COM_IF,
+                                               syrlinksUartCookie, pcdu::PDU1_CH1_SYRLINKS_12V);
+  syrlinksHandler->setPowerSwitcher(pwrSwitcher);
 }
 
 void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
@@ -915,35 +639,35 @@ void ObjectFactory::createPayloadComponents(LinuxLibgpioIF* gpioComIF) {
   std::stringstream consumer;
 #if OBSW_ADD_PLOC_MPSOC == 1
   consumer << "0x" << std::hex << objects::PLOC_MPSOC_HANDLER;
-  auto gpioConfigMPSoC = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_MPSOC_UART, consumer.str(),
-                                               Direction::OUT, Levels::HIGH);
+  auto gpioConfigMPSoC = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_MPSOC_UART,
+                                                    consumer.str(), Direction::OUT, Levels::HIGH);
   auto mpsocGpioCookie = new GpioCookie;
   mpsocGpioCookie->addGpio(gpioIds::ENABLE_MPSOC_UART, gpioConfigMPSoC);
   gpioComIF->addGpios(mpsocGpioCookie);
   auto mpsocCookie =
-      new UartCookie(objects::PLOC_MPSOC_HANDLER, q7s::UART_PLOC_MPSOC_DEV,
-                     UartModes::NON_CANONICAL, uart::PLOC_MPSOC_BAUD, mpsoc::MAX_REPLY_SIZE);
+      new UartCookie(objects::PLOC_MPSOC_HANDLER, q7s::UART_PLOC_MPSOC_DEV, uart::PLOC_MPSOC_BAUD,
+                     mpsoc::MAX_REPLY_SIZE, UartModes::NON_CANONICAL);
   mpsocCookie->setNoFixedSizeReply();
   auto plocMpsocHelper = new PlocMPSoCHelper(objects::PLOC_MPSOC_HELPER);
-  auto plocMPSoC =
-      new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocCookie,
-                           plocMpsocHelper, Gpio(gpioIds::ENABLE_MPSOC_UART, gpioComIF));
-  plocMPSoC->setStartUpImmediately();
+  new PlocMPSoCHandler(objects::PLOC_MPSOC_HANDLER, objects::UART_COM_IF, mpsocCookie,
+                       plocMpsocHelper, Gpio(gpioIds::ENABLE_MPSOC_UART, gpioComIF),
+                       objects::PLOC_SUPERVISOR_HANDLER);
 #endif /* OBSW_ADD_PLOC_MPSOC == 1 */
 
 #if OBSW_ADD_PLOC_SUPERVISOR == 1
   consumer << "0x" << std::hex << objects::PLOC_SUPERVISOR_HANDLER;
   auto gpioConfigSupv = new GpiodRegularByLineName(q7s::gpioNames::ENABLE_SUPV_UART, consumer.str(),
-                                               Direction::OUT, Levels::HIGH);
+                                                   Direction::OUT, Levels::HIGH);
   auto supvGpioCookie = new GpioCookie;
   supvGpioCookie->addGpio(gpioIds::ENABLE_SUPV_UART, gpioConfigSupv);
   gpioComIF->addGpios(supvGpioCookie);
-  auto supervisorCookie = new UartCookie(
-      objects::PLOC_SUPERVISOR_HANDLER, q7s::UART_PLOC_SUPERVSIOR_DEV, UartModes::NON_CANONICAL,
-      uart::PLOC_SUPERVISOR_BAUD, PLOC_SPV::MAX_PACKET_SIZE * 20);
+  auto supervisorCookie = new UartCookie(objects::PLOC_SUPERVISOR_HANDLER,
+                                         q7s::UART_PLOC_SUPERVSIOR_DEV, uart::PLOC_SUPERVISOR_BAUD,
+                                         supv::MAX_PACKET_SIZE * 20, UartModes::NON_CANONICAL);
   supervisorCookie->setNoFixedSizeReply();
   new PlocSupervisorHandler(objects::PLOC_SUPERVISOR_HANDLER, objects::UART_COM_IF,
-                                supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF));
+                            supervisorCookie, Gpio(gpioIds::ENABLE_SUPV_UART, gpioComIF),
+                            pcdu::PDU1_CH6_PLOC_12V);
 #endif /* OBSW_ADD_PLOC_SUPERVISOR == 1 */
   static_cast<void>(consumer);
 }
@@ -1151,7 +875,8 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
   gpioComIF->addGpios(gpioRS485Chip);
 }
 
-void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF) {
+void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
+                                           PowerSwitchIF* pwrSwitcher) {
   using namespace gpio;
   // Create all GPIO components first
   GpioCookie* plPcduGpios = new GpioCookie;
@@ -1197,9 +922,10 @@ void ObjectFactory::createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF*
                                        q7s::SPI_DEFAULT_DEV, plpcdu::MAX_ADC_REPLY_SIZE,
                                        spi::DEFAULT_MAX_1227_MODE, spi::PL_PCDU_MAX_1227_SPEED);
   // Create device handler components
-  auto plPcduHandler =
-      new PayloadPcduHandler(objects::PLPCDU_HANDLER, objects::SPI_COM_IF, spiCookie, gpioComIF,
-                             SdCardManager::instance(), false);
+  auto plPcduHandler = new PayloadPcduHandler(
+      objects::PLPCDU_HANDLER, objects::SPI_COM_IF, spiCookie, gpioComIF, SdCardManager::instance(),
+      pwrSwitcher, pcdu::Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8,
+      pcdu::Switches::PDU2_CH6_PL_PCDU_BATT_1_14V8, false);
   spiCookie->setCallbackMode(PayloadPcduHandler::extConvAsTwoCallback, plPcduHandler);
 //  plPcduHandler->enablePeriodicPrintout(true, 5);
 //  static_cast<void>(plPcduHandler);
@@ -1224,3 +950,13 @@ void ObjectFactory::createTestComponents(LinuxLibgpioIF* gpioComIF) {
   new UartTestClass(objects::UART_TEST);
 #endif
 }
+
+void ObjectFactory::testAcsBrdAss(AcsBoardAssembly* acsAss) {
+  CommandMessage msg;
+  ModeMessage::setModeMessage(&msg, ModeMessage::CMD_MODE_COMMAND, DeviceHandlerIF::MODE_NORMAL,
+                              duallane::A_SIDE);
+  ReturnValue_t result = MessageQueueSenderIF::sendMessage(acsAss->getCommandQueue(), &msg);
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    sif::warning << "Sending mode command failed" << std::endl;
+  }
+}

bsp_q7s/core/ObjectFactory.h

@@ -6,6 +6,7 @@ class UartComIF;
 class SpiComIF;
 class I2cComIF;
 class PowerSwitchIF;
+class AcsBoardAssembly;
 
 namespace ObjectFactory {
 
@@ -15,22 +16,22 @@ void produce(void* args);
 void createCommunicationInterfaces(LinuxLibgpioIF** gpioComIF, UartComIF** uartComIF,
                                    SpiComIF** spiComIF, I2cComIF** i2cComIF);
 void createPcduComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF** pwrSwitcher);
-void createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF);
+void createPlPcduComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
+                            PowerSwitchIF* pwrSwitcher);
 void createTmpComponents();
 void createRadSensorComponent(LinuxLibgpioIF* gpioComIF);
-void createSunSensorComponents(LinuxLibgpioIF* gpioComIF, SpiComIF* spiComIF,
-                               PowerSwitchIF* pwrSwitcher);
 void createAcsBoardComponents(LinuxLibgpioIF* gpioComIF, UartComIF* uartComIF,
                               PowerSwitchIF* pwrSwitcher);
 void createHeaterComponents();
 void createSolarArrayDeploymentComponents();
-void createSyrlinksComponents();
-void createRtdComponents(LinuxLibgpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher);
+void createSyrlinksComponents(PowerSwitchIF* pwrSwitcher);
 void createPayloadComponents(LinuxLibgpioIF* gpioComIF);
 void createReactionWheelComponents(LinuxLibgpioIF* gpioComIF);
 void createCcsdsComponents(LinuxLibgpioIF* gpioComIF);
 void createTestComponents(LinuxLibgpioIF* gpioComIF);
 
+void testAcsBrdAss(AcsBoardAssembly* assAss);
+
 };  // namespace ObjectFactory
 
 #endif /* BSP_Q7S_OBJECTFACTORY_H_ */

bsp_q7s/core/obsw.cpp

@@ -8,18 +8,14 @@
 #include "OBSWVersion.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/version.h"
-#include "watchdogConf.h"
+#include "watchdog/definitions.h"
 
 static int OBSW_ALREADY_RUNNING = -2;
 
 int obsw::obsw() {
   using namespace fsfw;
   std::cout << "-- EIVE OBSW --" << std::endl;
-#ifdef TE0720_1CFA
   std::cout << "-- Compiled for Linux (Xiphos Q7S) --" << std::endl;
-#else
-  std::cout << "-- Compiled for Linux (TE0720) --" << std::endl;
-#endif
   std::cout << "-- OBSW v" << SW_VERSION << "." << SW_SUBVERSION << "." << SW_REVISION << ", FSFW v"
             << FSFW_VERSION << "--" << std::endl;
   std::cout << "-- " << __DATE__ << " " << __TIME__ << " --" << std::endl;

cmake/HardwareOsPostConfig.cmake

@@ -42,6 +42,7 @@ add_compile_options(
 )
 
 set(STRIPPED_OBSW_NAME ${OBSW_BIN_NAME}-stripped)
+set(STRIPPED_WATCHDOG_NAME eive-watchdog-stripped)
 
 add_custom_command(
 	TARGET ${OBSW_NAME}
@@ -51,4 +52,12 @@ add_custom_command(
 	COMMENT "Generating stripped executable ${STRIPPED_OBSW_NAME}.."
 )
 
+add_custom_command(
+    TARGET ${WATCHDOG_NAME}
+    POST_BUILD
+    COMMAND ${CMAKE_STRIP} --strip-all eive-watchdog -o ${STRIPPED_WATCHDOG_NAME}
+    BYPRODUCTS ${STRIPPED_WATCHDOG_NAME}
+    COMMENT "Generating stripped executable ${STRIPPED_WATCHDOG_NAME}.."
+)
+
 endfunction()

cmake/scripts/Q7S/q7s-env.sh

@@ -2,6 +2,6 @@
 export PATH=$PATH:"$HOME/EIVE/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin"
 export CROSS_COMPILE="arm-linux-gnueabihf"
 
-export ZYNQ_7020_SYSROOT="$HOME/Xilinx/cortexa9hf-neon-xiphos-linux-gnueabi"
+export ZYNQ_7020_SYSROOT="$HOME/Xilinx/eive-compile-rootfs"
 export CONSOLE_PREFIX="[Q7S ENV]"
 /bin/bash

cmake/scripts/Q7S/win-q7s-env.sh

@@ -5,7 +5,7 @@ function help () {
 }
 
 TOOLCHAIN_PATH="/c/Xilinx/Vitis/2019.2/gnu/aarch32/nt/gcc-arm-linux-gnueabi/bin"
-SYSROOT="/c/Users/${USER}/eive-software/cortexa9hf-neon-xiphos-linux-gnueabi"
+SYSROOT="/c/Users/${USER}/eive-software/eive-compile-rootfs"
 
 for i in "$@"; do
   case $i in
@@ -46,4 +46,4 @@ if [ -d "$SYSROOT" ]; then
 else 
 	echo "Sysroot path $SYSROOT does not exist"
 	return
-fi
+fi

common/config/commonSubsystemIds.h

@@ -6,24 +6,30 @@
 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 = 121,
-	ACS_BOARD_ASS = 122,
-	SUS_BOARD_ASS = 123,
-	TCS_BOARD_ASS = 124,
+	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,
+	P60_DOCK_HANDLER = 132,
+	PDU1_HANDLER = 133,
+	PDU2_HANDLER = 134,
+	ACU_HANDLER = 135,
 	COMMON_SUBSYSTEM_ID_END
 };
 }

common/config/devConf.h

@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <fsfw_hal/linux/spi/spiDefinitions.h>
+#include <fsfw_hal/linux/uart/UartCookie.h>
 
 /**
  * SPI configuration will be contained here to let the device handlers remain independent
@@ -49,11 +50,11 @@ static constexpr spi::SpiModes RTD_MODE = spi::SpiModes::MODE_3;
 namespace uart {
 
 static constexpr size_t HYPERION_GPS_REPLY_MAX_BUFFER = 1024;
-static constexpr uint32_t SYRLINKS_BAUD = 38400;
-static constexpr uint32_t GNSS_BAUD = 9600;
-static constexpr uint32_t PLOC_MPSOC_BAUD = 115200;
-static constexpr uint32_t PLOC_SUPERVISOR_BAUD = 115200;
-static constexpr uint32_t STAR_TRACKER_BAUD = 921600;
+static constexpr UartBaudRate SYRLINKS_BAUD = UartBaudRate::RATE_38400;
+static constexpr UartBaudRate GNSS_BAUD = UartBaudRate::RATE_9600;
+static constexpr UartBaudRate PLOC_MPSOC_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate PLOC_SUPERVISOR_BAUD = UartBaudRate::RATE_115200;
+static constexpr UartBaudRate STAR_TRACKER_BAUD = UartBaudRate::RATE_921600;
 
 }
 

common/config/devices/powerSwitcherList.h

@@ -1,69 +1,6 @@
 #ifndef FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 #define FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_
 
-#include "OBSWConfig.h"
-
-#include <array>
-#include <cstdint>
-
-namespace pcduSwitches {
-/* Switches are uint8_t datatype and go from 0 to 255 */
-enum Switches: uint8_t {
-  PDU1_CH0_TCS_BOARD_3V3,
-  PDU1_CH1_SYRLINKS_12V,
-  PDU1_CH2_STAR_TRACKER_5V,
-  PDU1_CH3_MGT_5V,
-  PDU1_CH4_SUS_NOMINAL_3V3,
-  PDU1_CH5_SOLAR_CELL_EXP_5V,
-  PDU1_CH6_PLOC_12V,
-  PDU1_CH7_ACS_A_SIDE_3V3,
-  PDU1_CH8_UNOCCUPIED,
-
-  PDU2_CH0_Q7S,
-  PDU2_CH1_PL_PCDU_BATT_0_14V8,
-  PDU2_CH2_RW_5V,
-  PDU2_CH3_TCS_BOARD_HEATER_IN_8V,
-  PDU2_CH4_SUS_REDUNDANT_3V3,
-  PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
-  PDU2_CH6_PL_PCDU_BATT_1_14V8,
-  PDU2_CH7_ACS_BOARD_SIDE_B_3V3,
-  PDU2_CH8_PAYLOAD_CAMERA,
-  NUMBER_OF_SWITCHES
-};
-
-static const uint8_t ON = 1;
-static const uint8_t OFF = 0;
-
-// Output states after reboot of the PDUs
-
-const std::array<uint8_t, NUMBER_OF_SWITCHES> INIT_SWITCH_STATES = {
-    // PDU 1
-// Because the TE0720 is not connected to the PCDU, this switch is always on
-#ifdef TE0720_1CFA
-    ON,
-#else
-    OFF,
-#endif
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-
-    // PDU 2
-    ON,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF,
-    OFF
-};
-}
+#include "mission/devices/devicedefinitions/GomspaceDefinitions.h"
 
 #endif /* FSFWCONFIG_DEVICES_POWERSWITCHERLIST_H_ */

generators/bsp_q7s_events.csv

@@ -77,92 +77,109 @@
 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_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12201;0x2fa9;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12202;0x2faa;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-12203;0x2fab;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
-12300;0x300c;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
-12301;0x300d;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
-12302;0x300e;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.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/SusAssembly.h
-12400;0x3070;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
+13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
+13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
+13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
 13600;0x3520;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
 13601;0x3521;REBOOT_SW;MEDIUM; Software reboot occured. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 13602;0x3522;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h

generators/bsp_q7s_returnvalues.csv

@@ -1,13 +1,13 @@
 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
+0x65a0;NVMB_KeyNotExists;Specified key does not exist in json file;0xA0;mission/memory/NVMParameterBase.h;NVM_PARAM_BASE
+0x5aa0;SUSS_ErrorUnlockMutex;;0xA0;mission/devices/SusHandler.h;SUS_HANDLER
+0x5aa1;SUSS_ErrorLockMutex;;0xA1;mission/devices/SusHandler.h;SUS_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
 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 +20,12 @@
 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
+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
 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,91 +43,63 @@
 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
-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
-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
-0x4601; HGIO_UnknownGpioId;;1;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4602; HGIO_DriveGpioFailure;;2;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4603; HGIO_GpioTypeFailure;;3;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4604; HGIO_GpioInvalidInstance;;4;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4605; HGIO_GpioDuplicateDetected;;5;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4200; UXOS_ExecutionFinished;Execution of the current command has finished;0;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4201; UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4202; UXOS_BytesRead;Some bytes have been read from the executing process;2;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-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
+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
+0x62a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;0xA0;mission/tmtc/CCSDSHandler.h;CCSDS_HANDLER
 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
+0x601; PP_DoItMyself;;1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x602; PP_PointsToVariable;;2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x603; PP_PointsToMemory;;3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x604; PP_ActivityCompleted;;4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x605; PP_PointsToVectorUint8;;5;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x606; PP_PointsToVectorUint16;;6;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x607; PP_PointsToVectorUint32;;7;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x608; PP_PointsToVectorFloat;;8;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6a0; PP_DumpNotSupported;;0xA0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e0; PP_InvalidSize;;0xE0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e1; PP_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+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
+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
+0x4105; FILS_FileDoesNotExist;;5;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4106; FILS_FileAlreadyExists;;6;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4107; FILS_FileLocked;;7;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410a; FILS_DirectoryDoesNotExist;;10;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410b; FILS_DirectoryAlreadyExists;;11;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410c; FILS_DirectoryNotEmpty;;12;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410f; FILS_SequencePacketMissingWrite;;15;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4110; FILS_SequencePacketMissingRead;;16;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+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
+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
+0x37a4; SGP4_InvalidSemiLatusRectum;;0xA4;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37a5; SGP4_InvalidEpochElements;;0xA5;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+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
+0x1101; AL_Full;;0x01;fsfw/src/fsfw/container/ArrayList.h;ARRAY_LIST
+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
+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
 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
@@ -145,20 +112,23 @@
 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
+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
+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
 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
+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
 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
@@ -173,53 +143,7 @@
 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
-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
-0x2904; IEC_TooLittleWorkspace;;0x04;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2905; IEC_WorkspaceAllocation;;0x05;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2906; IEC_InterruptStackTooSmall;;0x06;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2907; IEC_ThreadExitted;;0x07;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2908; IEC_InconsistentMpInformation;;0x08;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2909; IEC_InvalidNode;;0x09;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290a; IEC_NoMpci;;0x0a;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290b; IEC_BadPacket;;0x0b;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290c; IEC_OutOfPackets;;0x0c;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290d; IEC_OutOfGlobalObjects;;0x0d;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290e; IEC_OutOfProxies;;0x0e;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290f; IEC_InvalidGlobalId;;0x0f;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2910; IEC_BadStackHook;;0x10;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2911; IEC_BadAttributes;;0x11;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2912; IEC_ImplementationKeyCreateInconsistency;;0x12;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-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
-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
+0x2401; EV_ListenerNotFound;;1;fsfw/src/fsfw/events/EventManagerIF.h;EVENT_MANAGER_IF
 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,6 +184,128 @@
 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
+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
+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
+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
+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
+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
+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
+0x2904; IEC_TooLittleWorkspace;;0x04;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2905; IEC_WorkspaceAllocation;;0x05;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2906; IEC_InterruptStackTooSmall;;0x06;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2907; IEC_ThreadExitted;;0x07;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2908; IEC_InconsistentMpInformation;;0x08;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2909; IEC_InvalidNode;;0x09;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290a; IEC_NoMpci;;0x0a;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290b; IEC_BadPacket;;0x0b;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290c; IEC_OutOfPackets;;0x0c;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290d; IEC_OutOfGlobalObjects;;0x0d;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290e; IEC_OutOfProxies;;0x0e;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290f; IEC_InvalidGlobalId;;0x0f;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2910; IEC_BadStackHook;;0x10;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2911; IEC_BadAttributes;;0x11;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2912; IEC_ImplementationKeyCreateInconsistency;;0x12;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+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
+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
+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
+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
+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
+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
+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
+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
+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
 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
@@ -289,97 +335,12 @@
 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
-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
-0x37a4; SGP4_InvalidSemiLatusRectum;;0xA4;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37a5; SGP4_InvalidEpochElements;;0xA5;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-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
-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
-0x4105; FILS_FileDoesNotExist;;5;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4106; FILS_FileAlreadyExists;;6;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4107; FILS_FileLocked;;7;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410a; FILS_DirectoryDoesNotExist;;10;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410b; FILS_DirectoryAlreadyExists;;11;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410c; FILS_DirectoryNotEmpty;;12;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410f; FILS_SequencePacketMissingWrite;;15;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4110; FILS_SequencePacketMissingRead;;16;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x601; PP_DoItMyself;;1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x602; PP_PointsToVariable;;2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x603; PP_PointsToMemory;;3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x604; PP_ActivityCompleted;;4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x605; PP_PointsToVectorUint8;;5;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x606; PP_PointsToVectorUint16;;6;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x607; PP_PointsToVectorUint32;;7;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x608; PP_PointsToVectorFloat;;8;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6a0; PP_DumpNotSupported;;0xA0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e0; PP_InvalidSize;;0xE0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e1; PP_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-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
+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
 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
@@ -416,34 +377,76 @@
 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
+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
+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
+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
+0x3601; TSI_BadTimestamp;;1;fsfw/src/fsfw/timemanager/TimeStamperIF.h;TIME_STAMPER_IF
+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
+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
+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
+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
+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
+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
+0x4601; HGIO_UnknownGpioId;;1;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4602; HGIO_DriveGpioFailure;;2;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4603; HGIO_GpioTypeFailure;;3;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4604; HGIO_GpioInvalidInstance;;4;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4605; HGIO_GpioDuplicateDetected;;5;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+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
+0x4200; UXOS_ExecutionFinished;Execution of the current command has finished;0;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4201; UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4202; UXOS_BytesRead;Some bytes have been read from the executing process;2;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+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
+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
 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
@@ -454,27 +457,7 @@
 0x700d; SDMA_UnmountError;;13;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
 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 +473,39 @@
 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
+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
+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
+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
 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
 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
+0x5ea0;STRHLP_SdNotMounted;SD card specified in path string not mounted;0xA0;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5ea1;STRHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5ea2;STRHLP_PathNotExists;Specified path does not exist;0xA2;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5ea3;STRHLP_FileCreationFailed;Failed to create download image or read flash file;0xA3;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5ea4;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;0xA4;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5ea5;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;0xA5;linux/devices/startracker/StrHelper.h;STR_HELPER
+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
 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
@@ -519,21 +528,7 @@
 0x56b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;0xB6;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56b7;STRH_StartrackerRunningFirmware;Star tracker is in firmware mode but must be in bootloader mode to execute this command;0xB7;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56b8;STRH_StartrackerRunningBootloader;Star tracker is in bootloader mode but must be in firmware mode to execute this command;0xB8;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
-0x5ea0;STRHLP_SdNotMounted;SD card specified in path string not mounted;0xA0;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5ea1;STRHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5ea2;STRHLP_PathNotExists;Specified path does not exist;0xA2;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5ea3;STRHLP_FileCreationFailed;Failed to create download image or read flash file;0xA3;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5ea4;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;0xA4;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5ea5;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;0xA5;linux/devices/startracker/StrHelper.h;STR_HELPER
-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
-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 +544,8 @@
 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
+0x5ba0;IPCI_PapbBusy;;0xA0;linux/obc/PapbVcInterface.h;CCSDS_IP_CORE_BRIDGE

generators/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 169 translations.
+ * @brief    Auto-generated event translation file. Contains 186 translations.
  * @details
- * Generated on: 2022-03-28 09:51:17
+ * Generated on: 2022-04-08 14:13:35
  */
 #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";
@@ -161,11 +162,27 @@ const char *EXE_FAILURE_REPORT_STRING = "EXE_FAILURE_REPORT";
 const char *ACK_INVALID_APID_STRING = "ACK_INVALID_APID";
 const char *EXE_INVALID_APID_STRING = "EXE_INVALID_APID";
 const char *MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING = "MPSOC_HELPER_SEQ_CNT_MISMATCH";
+const char *TRANSITION_BACK_TO_OFF_STRING = "TRANSITION_BACK_TO_OFF";
+const char *NEG_V_OUT_OF_BOUNDS_STRING = "NEG_V_OUT_OF_BOUNDS";
+const char *U_DRO_OUT_OF_BOUNDS_STRING = "U_DRO_OUT_OF_BOUNDS";
+const char *I_DRO_OUT_OF_BOUNDS_STRING = "I_DRO_OUT_OF_BOUNDS";
+const char *U_X8_OUT_OF_BOUNDS_STRING = "U_X8_OUT_OF_BOUNDS";
+const char *I_X8_OUT_OF_BOUNDS_STRING = "I_X8_OUT_OF_BOUNDS";
+const char *U_TX_OUT_OF_BOUNDS_STRING = "U_TX_OUT_OF_BOUNDS";
+const char *I_TX_OUT_OF_BOUNDS_STRING = "I_TX_OUT_OF_BOUNDS";
+const char *U_MPA_OUT_OF_BOUNDS_STRING = "U_MPA_OUT_OF_BOUNDS";
+const char *I_MPA_OUT_OF_BOUNDS_STRING = "I_MPA_OUT_OF_BOUNDS";
+const char *U_HPA_OUT_OF_BOUNDS_STRING = "U_HPA_OUT_OF_BOUNDS";
+const char *I_HPA_OUT_OF_BOUNDS_STRING = "I_HPA_OUT_OF_BOUNDS";
 const char *TRANSITION_OTHER_SIDE_FAILED_STRING = "TRANSITION_OTHER_SIDE_FAILED";
 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 *P60_BOOT_COUNT_STRING = "P60_BOOT_COUNT";
+const char *BATT_MODE_STRING = "BATT_MODE";
+const char *BATT_MODE_CHANGED_STRING = "BATT_MODE_CHANGED";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -331,170 +348,204 @@ 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_OTHER_SIDE_FAILED_STRING;
+      return UPDATE_FILE_NOT_EXISTS_STRING;
     case (12201):
-      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
+      return ACTION_COMMANDING_FAILED_STRING;
     case (12202):
-      return POWER_STATE_MACHINE_TIMEOUT_STRING;
+      return UPDATE_AVAILABLE_FAILED_STRING;
     case (12203):
+      return UPDATE_TRANSFER_FAILED_STRING;
+    case (12204):
+      return UPDATE_VERIFY_FAILED_STRING;
+    case (12205):
+      return UPDATE_FINISHED_STRING;
+    case (12300):
+      return SEND_MRAM_DUMP_FAILED_STRING;
+    case (12301):
+      return MRAM_DUMP_FAILED_STRING;
+    case (12302):
+      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 (12400):
+    case (13000):
       return CHILDREN_LOST_MODE_STRING;
+    case (13100):
+      return GPS_FIX_CHANGE_STRING;
+    case (13200):
+      return P60_BOOT_COUNT_STRING;
+    case (13201):
+      return BATT_MODE_STRING;
+    case (13202):
+      return BATT_MODE_CHANGED_STRING;
     case (13600):
       return ALLOC_FAILURE_STRING;
     case (13601):

generators/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-03-28 09:51:13
+ * Generated on: 2022-04-08 14:13:35
  */
 #include "translateObjects.h"
 

linux/CMakeLists.txt

@@ -1,6 +1,11 @@
 add_subdirectory(csp)
 add_subdirectory(utility)
+add_subdirectory(callbacks)
 add_subdirectory(boardtest)
 add_subdirectory(devices)
 add_subdirectory(fsfwconfig)
-add_subdirectory(obc)
+add_subdirectory(obc)
+
+target_sources(${OBSW_NAME} PUBLIC
+    ObjectFactory.cpp
+)

linux/ObjectFactory.cpp

@@ -0,0 +1,286 @@
+#include "ObjectFactory.h"
+
+#include <fsfw/power/PowerSwitchIF.h>
+#include <fsfw_hal/common/gpio/GpioCookie.h>
+#include <fsfw_hal/common/gpio/GpioIF.h>
+#include <fsfw_hal/common/gpio/gpioDefinitions.h>
+#include <fsfw_hal/linux/spi/SpiComIF.h>
+#include <fsfw_hal/linux/spi/SpiCookie.h>
+#include <linux/callbacks/gpioCallbacks.h>
+#include <mission/devices/Max31865PT1000Handler.h>
+#include <mission/devices/SusHandler.h>
+#include <mission/system/RtdFdir.h>
+#include <mission/system/SusAssembly.h>
+#include <mission/system/SusFdir.h>
+#include <mission/system/TcsBoardAssembly.h>
+
+#include "OBSWConfig.h"
+#include "devConf.h"
+#include "devices/addresses.h"
+#include "devices/gpioIds.h"
+
+void ObjectFactory::createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF,
+                                              PowerSwitchIF* pwrSwitcher, std::string spiDev) {
+  using namespace gpio;
+  GpioCookie* gpioCookieSus = new GpioCookie();
+  GpioCallback* susgpio = nullptr;
+
+  susgpio = new GpioCallback("Chip select SUS 0", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_0, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 1", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_1, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 2", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_2, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 3", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_3, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 4", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_4, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 5", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_5, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 6", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_6, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 7", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_7, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 8", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_8, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 9", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_9, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 10", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_10, susgpio);
+  susgpio = new GpioCallback("Chip select SUS 11", Direction::OUT, Levels::HIGH,
+                             &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  gpioCookieSus->addGpio(gpioIds::CS_SUS_11, susgpio);
+
+  gpioComIF->addGpios(gpioCookieSus);
+
+#if OBSW_ADD_SUN_SENSORS == 1
+  SusFdir* fdir = nullptr;
+  std::array<SusHandler*, 12> susHandlers = {};
+  SpiCookie* spiCookie =
+      new SpiCookie(addresses::SUS_0, gpioIds::CS_SUS_0, spiDev, SUS::MAX_CMD_SIZE,
+                    spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[0] = new SusHandler(objects::SUS_0, 0, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_0);
+  susHandlers[0]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[0]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_1, gpioIds::CS_SUS_1, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[1] = new SusHandler(objects::SUS_1, 1, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_1);
+  susHandlers[1]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[1]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_2, gpioIds::CS_SUS_2, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[2] = new SusHandler(objects::SUS_2, 2, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_2);
+  susHandlers[2]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[2]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_3, gpioIds::CS_SUS_3, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[3] = new SusHandler(objects::SUS_3, 3, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_3);
+  susHandlers[3]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[3]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_4, gpioIds::CS_SUS_4, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[4] = new SusHandler(objects::SUS_4, 4, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_4);
+  susHandlers[4]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[4]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_5, gpioIds::CS_SUS_5, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[5] = new SusHandler(objects::SUS_5, 5, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_5);
+  susHandlers[5]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[5]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_6, gpioIds::CS_SUS_6, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[6] = new SusHandler(objects::SUS_6, 6, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_6);
+  susHandlers[6]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[6]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_7, gpioIds::CS_SUS_7, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[7] = new SusHandler(objects::SUS_7, 7, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_7);
+  susHandlers[7]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[7]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_8, gpioIds::CS_SUS_8, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[8] = new SusHandler(objects::SUS_8, 8, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_8);
+  susHandlers[8]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[8]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_9, gpioIds::CS_SUS_9, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[9] = new SusHandler(objects::SUS_9, 9, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_9);
+  susHandlers[9]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[9]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_10, gpioIds::CS_SUS_10, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[10] = new SusHandler(objects::SUS_10, 10, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_10);
+  susHandlers[10]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[10]->setCustomFdir(fdir);
+
+  spiCookie = new SpiCookie(addresses::SUS_11, gpioIds::CS_SUS_11, spiDev, SUS::MAX_CMD_SIZE,
+                            spi::SUS_MAX_1227_MODE, spi::SUS_MAX1227_SPI_FREQ);
+  susHandlers[11] = new SusHandler(objects::SUS_11, 11, objects::SPI_COM_IF, spiCookie);
+  fdir = new SusFdir(objects::SUS_11);
+  susHandlers[11]->setParent(objects::SUS_BOARD_ASS);
+  susHandlers[11]->setCustomFdir(fdir);
+
+  for (auto& sus : susHandlers) {
+    if (sus != nullptr) {
+#if OBSW_TEST_SUS == 1
+      sus->setStartUpImmediately();
+      sus->setToGoToNormalMode(true);
+#endif
+#if OBSW_DEBUG_SUS == 1
+      sus->enablePeriodicPrintout(true, 3);
+#endif
+    }
+  }
+  std::array<object_id_t, 12> susIds = {objects::SUS_0, objects::SUS_1,  objects::SUS_2,
+                                        objects::SUS_3, objects::SUS_4,  objects::SUS_5,
+                                        objects::SUS_6, objects::SUS_7,  objects::SUS_8,
+                                        objects::SUS_9, objects::SUS_10, objects::SUS_11};
+  SusAssHelper susAssHelper = SusAssHelper(susIds);
+  auto susAss =
+      new SusAssembly(objects::SUS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher, susAssHelper);
+  static_cast<void>(susAss);
+#endif /* OBSW_ADD_SUN_SENSORS == 1 */
+}
+
+void ObjectFactory::createRtdComponents(std::string spiDev, GpioIF* gpioComIF,
+                                        PowerSwitchIF* pwrSwitcher) {
+  using namespace gpio;
+  GpioCookie* rtdGpioCookie = new GpioCookie;
+
+  GpioCallback* gpioRtdIc0 = new GpioCallback("Chip select RTD IC0", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_3, gpioRtdIc0);
+  GpioCallback* gpioRtdIc1 = new GpioCallback("Chip select RTD IC1", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_4, gpioRtdIc1);
+  GpioCallback* gpioRtdIc2 = new GpioCallback("Chip select RTD IC2", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_5, gpioRtdIc2);
+  GpioCallback* gpioRtdIc3 = new GpioCallback("Chip select RTD IC3", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_6, gpioRtdIc3);
+  GpioCallback* gpioRtdIc4 = new GpioCallback("Chip select RTD IC4", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_7, gpioRtdIc4);
+  GpioCallback* gpioRtdIc5 = new GpioCallback("Chip select RTD IC5", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_8, gpioRtdIc5);
+  GpioCallback* gpioRtdIc6 = new GpioCallback("Chip select RTD IC6", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_9, gpioRtdIc6);
+  GpioCallback* gpioRtdIc7 = new GpioCallback("Chip select RTD IC7", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_10, gpioRtdIc7);
+  GpioCallback* gpioRtdIc8 = new GpioCallback("Chip select RTD IC8", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_11, gpioRtdIc8);
+  GpioCallback* gpioRtdIc9 = new GpioCallback("Chip select RTD IC9", Direction::OUT, Levels::HIGH,
+                                              &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_12, gpioRtdIc9);
+  GpioCallback* gpioRtdIc10 = new GpioCallback("Chip select RTD IC10", Direction::OUT, Levels::HIGH,
+                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_13, gpioRtdIc10);
+  GpioCallback* gpioRtdIc11 = new GpioCallback("Chip select RTD IC11", Direction::OUT, Levels::HIGH,
+                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_14, gpioRtdIc11);
+  GpioCallback* gpioRtdIc12 = new GpioCallback("Chip select RTD IC12", Direction::OUT, Levels::HIGH,
+                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_15, gpioRtdIc12);
+  GpioCallback* gpioRtdIc13 = new GpioCallback("Chip select RTD IC13", Direction::OUT, Levels::HIGH,
+                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_16, gpioRtdIc13);
+  GpioCallback* gpioRtdIc14 = new GpioCallback("Chip select RTD IC14", Direction::OUT, Levels::HIGH,
+                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_17, gpioRtdIc14);
+  GpioCallback* gpioRtdIc15 = new GpioCallback("Chip select RTD IC15", Direction::OUT, Levels::HIGH,
+                                               &gpioCallbacks::spiCsDecoderCallback, gpioComIF);
+  rtdGpioCookie->addGpio(gpioIds::RTD_IC_18, gpioRtdIc15);
+
+  gpioComIF->addGpios(rtdGpioCookie);
+
+#if OBSW_ADD_RTD_DEVICES == 1
+  static constexpr uint8_t NUMBER_RTDS = 16;
+  std::array<std::pair<address_t, gpioId_t>, NUMBER_RTDS> cookieArgs = {{
+      {addresses::RTD_IC_3, gpioIds::RTD_IC_3},
+      {addresses::RTD_IC_4, gpioIds::RTD_IC_4},
+      {addresses::RTD_IC_5, gpioIds::RTD_IC_5},
+      {addresses::RTD_IC_6, gpioIds::RTD_IC_6},
+      {addresses::RTD_IC_7, gpioIds::RTD_IC_7},
+      {addresses::RTD_IC_8, gpioIds::RTD_IC_8},
+      {addresses::RTD_IC_9, gpioIds::RTD_IC_9},
+      {addresses::RTD_IC_10, gpioIds::RTD_IC_10},
+      {addresses::RTD_IC_11, gpioIds::RTD_IC_11},
+      {addresses::RTD_IC_12, gpioIds::RTD_IC_12},
+      {addresses::RTD_IC_13, gpioIds::RTD_IC_13},
+      {addresses::RTD_IC_14, gpioIds::RTD_IC_14},
+      {addresses::RTD_IC_15, gpioIds::RTD_IC_15},
+      {addresses::RTD_IC_16, gpioIds::RTD_IC_16},
+      {addresses::RTD_IC_17, gpioIds::RTD_IC_17},
+      {addresses::RTD_IC_18, gpioIds::RTD_IC_18},
+  }};
+  std::array<object_id_t, NUMBER_RTDS> rtdIds = {
+      objects::RTD_IC_3,  objects::RTD_IC_4,  objects::RTD_IC_5,  objects::RTD_IC_6,
+      objects::RTD_IC_7,  objects::RTD_IC_8,  objects::RTD_IC_9,  objects::RTD_IC_10,
+      objects::RTD_IC_11, objects::RTD_IC_12, objects::RTD_IC_13, objects::RTD_IC_14,
+      objects::RTD_IC_15, objects::RTD_IC_16, objects::RTD_IC_17, objects::RTD_IC_18};
+  std::array<SpiCookie*, NUMBER_RTDS> rtdCookies = {};
+  std::array<Max31865PT1000Handler*, NUMBER_RTDS> rtds = {};
+  RtdFdir* rtdFdir = nullptr;
+  for (uint8_t idx = 0; idx < NUMBER_RTDS; idx++) {
+    rtdCookies[idx] =
+        new SpiCookie(cookieArgs[idx].first, cookieArgs[idx].second, spiDev,
+                      Max31865Definitions::MAX_REPLY_SIZE, spi::RTD_MODE, spi::RTD_SPEED);
+    rtds[idx] = new Max31865PT1000Handler(rtdIds[idx], objects::SPI_COM_IF, rtdCookies[idx]);
+    rtds[idx]->setParent(objects::TCS_BOARD_ASS);
+    rtdFdir = new RtdFdir(rtdIds[idx]);
+    rtds[idx]->setCustomFdir(rtdFdir);
+    rtds[idx]->setDeviceIdx(idx + 3);
+  }
+
+#if OBSW_TEST_RTD == 1
+  for (auto& rtd : rtds) {
+    if (rtd != nullptr) {
+      rtd->setStartUpImmediately();
+      rtd->setInstantNormal(true);
+    }
+  }
+#endif  // OBSW_TEST_RTD == 1
+  TcsBoardHelper helper(rtdIds);
+  TcsBoardAssembly* tcsBoardAss =
+      new TcsBoardAssembly(objects::TCS_BOARD_ASS, objects::NO_OBJECT, pwrSwitcher,
+                           pcdu::Switches::PDU1_CH0_TCS_BOARD_3V3, helper);
+  static_cast<void>(tcsBoardAss);
+#endif  // OBSW_ADD_RTD_DEVICES == 1
+}

linux/ObjectFactory.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+
+class GpioIF;
+class SpiComIF;
+class PowerSwitchIF;
+
+namespace ObjectFactory {
+
+void createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF, PowerSwitchIF* pwrSwitcher,
+                               std::string spiDev);
+void createRtdComponents(std::string spiDev, GpioIF* gpioComIF, PowerSwitchIF* pwrSwitcher);
+
+}  // namespace ObjectFactory

linux/boardtest/SpiTestClass.cpp

@@ -408,7 +408,7 @@ void SpiTestClass::max1227RadSensorTest(int fd) {
     transfer(fd, gpioIds::CS_RAD_SENSOR);
     usleep(65);
     spiTransferStruct[0].len = 24;
-    std::memcpy(sendBuffer.data(), sendBuffer.data() + 1, 24);
+    std::memmove(sendBuffer.data(), sendBuffer.data() + 1, 24);
     transfer(fd, gpioIds::CS_RAD_SENSOR);
     int16_t tempRaw = ((recvBuffer[22] & 0x0f) << 8) | recvBuffer[23];
     float temp = max1227::getTemperature(tempRaw);

linux/boardtest/SpiTestClass.h

@@ -3,9 +3,14 @@
 
 #include "OBSWConfig.h"
 
-#if defined(XIPHOS_Q7S)
+#ifdef XIPHOS_Q7S
 #include "busConf.h"
 #endif
+
+#ifdef RASPBERRY_PI
+#include <bsp_linux_board/definitions.h>
+#endif
+
 #include <fsfw_hal/common/gpio/GpioIF.h>
 #include <fsfw_hal/linux/spi/SpiCookie.h>
 #include <test/testtasks/TestTask.h>

linux/callbacks/CMakeLists.txt

@@ -0,0 +1,3 @@
+target_sources(${OBSW_NAME} PRIVATE
+	gpioCallbacks.cpp
+)

linux/callbacks/gpioCallbacks.cpp

@@ -0,0 +1,431 @@
+#include "gpioCallbacks.h"
+
+#include "devices/gpioIds.h"
+#include "fsfw/serviceinterface/ServiceInterface.h"
+#include "fsfw_hal/common/gpio/GpioCookie.h"
+#include "fsfw_hal/common/gpio/GpioIF.h"
+
+void gpioCallbacks::spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp,
+                                         gpio::Levels value, void* args) {
+  GpioIF* gpioIF = reinterpret_cast<GpioIF*>(args);
+  if (gpioIF == nullptr) {
+    sif::debug << "spiCsDecoderCallback: No gpioComIF specified. Call initSpiCsDecoder "
+               << "to specify gpioComIF" << std::endl;
+    return;
+  }
+
+  /* Reading is not supported by the callback function */
+  if (gpioOp == gpio::GpioOperation::READ) {
+    return;
+  }
+
+  if (value == gpio::Levels::HIGH) {
+    switch (gpioId) {
+      case (gpioIds::RTD_IC_3): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_4): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_5): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_6): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_7): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_8): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_9): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_10): {
+        disableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_11): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_12): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_13): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_14): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_15): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_16): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_17): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_18): {
+        disableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_0): {
+        disableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_1): {
+        disableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_2): {
+        disableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_3): {
+        disableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_4): {
+        disableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_5): {
+        disableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_6): {
+        disableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_7): {
+        disableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_8): {
+        disableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_9): {
+        disableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_10): {
+        disableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_11): {
+        disableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW1): {
+        disableRwDecoder(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW2): {
+        disableRwDecoder(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW3): {
+        disableRwDecoder(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW4): {
+        disableRwDecoder(gpioIF);
+        break;
+      }
+      default:
+        sif::debug << "spiCsDecoderCallback: Invalid gpio id " << gpioId << std::endl;
+    }
+  } else if (value == gpio::Levels::LOW) {
+    switch (gpioId) {
+      case (gpioIds::RTD_IC_3): {
+        selectY7(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_4): {
+        selectY6(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_5): {
+        selectY5(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_6): {
+        selectY4(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_7): {
+        selectY3(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_8): {
+        selectY2(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_9): {
+        selectY1(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_10): {
+        selectY0(gpioIF);
+        enableDecoderTcsIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_11): {
+        selectY7(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_12): {
+        selectY6(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_13): {
+        selectY5(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_14): {
+        selectY4(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_15): {
+        selectY3(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_16): {
+        selectY2(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_17): {
+        selectY1(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::RTD_IC_18): {
+        selectY0(gpioIF);
+        enableDecoderTcsIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_0): {
+        selectY0(gpioIF);
+        enableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_1): {
+        selectY1(gpioIF);
+        enableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_2): {
+        selectY2(gpioIF);
+        enableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_3): {
+        selectY3(gpioIF);
+        enableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_4): {
+        selectY4(gpioIF);
+        enableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_5): {
+        selectY5(gpioIF);
+        enableDecoderInterfaceBoardIc1(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_6): {
+        selectY0(gpioIF);
+        enableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_7): {
+        selectY1(gpioIF);
+        enableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_8): {
+        selectY2(gpioIF);
+        enableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_9): {
+        selectY3(gpioIF);
+        enableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_10): {
+        selectY4(gpioIF);
+        enableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_SUS_11): {
+        selectY5(gpioIF);
+        enableDecoderInterfaceBoardIc2(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW1): {
+        selectY0(gpioIF);
+        enableRwDecoder(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW2): {
+        selectY1(gpioIF);
+        enableRwDecoder(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW3): {
+        selectY2(gpioIF);
+        enableRwDecoder(gpioIF);
+        break;
+      }
+      case (gpioIds::CS_RW4): {
+        selectY3(gpioIF);
+        enableRwDecoder(gpioIF);
+        break;
+      }
+      default:
+        sif::debug << "spiCsDecoderCallback: Invalid gpio id " << gpioId << std::endl;
+    }
+  } else {
+    sif::debug << "spiCsDecoderCallback: Invalid value. Must be 0 or 1" << std::endl;
+  }
+}
+
+void gpioCallbacks::enableDecoderTcsIc1(GpioIF* gpioIF) {
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+}
+
+void gpioCallbacks::enableDecoderTcsIc2(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_2);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_1);
+}
+
+void gpioCallbacks::enableDecoderInterfaceBoardIc1(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+}
+
+void gpioCallbacks::enableDecoderInterfaceBoardIc2(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_2);
+}
+
+void gpioCallbacks::disableDecoderTcsIc1(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+}
+
+void gpioCallbacks::disableDecoderTcsIc2(GpioIF* gpioIF) {
+  // DO NOT CHANGE THE ORDER HERE
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_1);
+}
+
+void gpioCallbacks::disableDecoderInterfaceBoardIc1(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+}
+
+void gpioCallbacks::disableDecoderInterfaceBoardIc2(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+}
+
+void gpioCallbacks::enableRwDecoder(GpioIF* gpioIF) { gpioIF->pullHigh(gpioIds::EN_RW_CS); }
+
+void gpioCallbacks::disableRwDecoder(GpioIF* gpioIF) { gpioIF->pullLow(gpioIds::EN_RW_CS); }
+
+void gpioCallbacks::selectY0(GpioIF* gpioIF) {
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY1(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY2(GpioIF* gpioIF) {
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY3(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY4(GpioIF* gpioIF) {
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY5(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY6(GpioIF* gpioIF) {
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::selectY7(GpioIF* gpioIF) {
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_3);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_4);
+  gpioIF->pullHigh(gpioIds::SPI_MUX_BIT_5);
+}
+
+void gpioCallbacks::disableAllDecoder(GpioIF* gpioIF) {
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_2);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_0);
+  gpioIF->pullLow(gpioIds::SPI_MUX_BIT_1);
+  gpioIF->pullLow(gpioIds::EN_RW_CS);
+}

linux/callbacks/gpioCallbacks.h

@@ -1,16 +1,10 @@
-#ifndef LINUX_GPIO_GPIOCALLBACKS_H_
-#define LINUX_GPIO_GPIOCALLBACKS_H_
+#pragma once
 
-#include <fsfw_hal/common/gpio/GpioIF.h>
 #include <fsfw_hal/common/gpio/gpioDefinitions.h>
 
-namespace gpioCallbacks {
+class GpioIF;
 
-/**
- * @brief   This function initializes the GPIOs used to control the SN74LVC138APWR decoders on
- *          the TCS Board and the interface board.
- */
-void initSpiCsDecoder(GpioIF* gpioComIF);
+namespace gpioCallbacks {
 
 /**
  * @brief   This function implements the decoding to multiply gpios by using the decoder
@@ -23,51 +17,50 @@ void spiCsDecoderCallback(gpioId_t gpioId, gpio::GpioOperation gpioOp, gpio::Lev
  * @brief   This function sets mux bits 1-3 to a state which will only enable the decoder
  *          on the TCS board which is named to IC1 in the schematic.
  */
-void enableDecoderTcsIc1();
+void enableDecoderTcsIc1(GpioIF* gpioIF);
 
 /**
  * @brief   This function sets mux bits 1-3 to a state which will only enable the decoder
  *          on the TCS board which is named to IC2 in the schematic.
  */
-void enableDecoderTcsIc2();
+void enableDecoderTcsIc2(GpioIF* gpioIF);
 
 /**
  * @brief   This function sets mux bits 1-3 to a state which will only enable the decoder
  *          on the inteface board board which is named to IC21 in the schematic.
  */
-void enableDecoderInterfaceBoardIc1();
+void enableDecoderInterfaceBoardIc1(GpioIF* gpioIF);
 
 /**
  * @brief   This function sets mux bits 1-3 to a state which will only enable the decoder
  *          on the inteface board board which is named to IC22 in the schematic.
  */
-void enableDecoderInterfaceBoardIc2();
+void enableDecoderInterfaceBoardIc2(GpioIF* gpioIF);
 
-void disableDecoderTcsIc1();
-void disableDecoderTcsIc2();
-void disableDecoderInterfaceBoardIc1();
-void disableDecoderInterfaceBoardIc2();
+void disableDecoderTcsIc1(GpioIF* gpioIF);
+void disableDecoderTcsIc2(GpioIF* gpioIF);
+void disableDecoderInterfaceBoardIc1(GpioIF* gpioIF);
+void disableDecoderInterfaceBoardIc2(GpioIF* gpioIF);
 
 /**
  * @brief   Enables the reaction wheel chip select decoder (IC3).
  */
-void enableRwDecoder();
-void disableRwDecoder();
+void enableRwDecoder(GpioIF* gpioIF);
+void disableRwDecoder(GpioIF* gpioIF);
 
 /**
  * @brief   This function disables all decoder.
  */
-void disableAllDecoder();
+void disableAllDecoder(GpioIF* gpioIF);
 
 /** The following functions enable the appropriate channel of the currently enabled decoder */
-void selectY0();
-void selectY1();
-void selectY2();
-void selectY3();
-void selectY4();
-void selectY5();
-void selectY6();
-void selectY7();
-}  // namespace gpioCallbacks
+void selectY0(GpioIF* gpioIF);
+void selectY1(GpioIF* gpioIF);
+void selectY2(GpioIF* gpioIF);
+void selectY3(GpioIF* gpioIF);
+void selectY4(GpioIF* gpioIF);
+void selectY5(GpioIF* gpioIF);
+void selectY6(GpioIF* gpioIF);
+void selectY7(GpioIF* gpioIF);
 
-#endif /* LINUX_GPIO_GPIOCALLBACKS_H_ */
+}  // namespace gpioCallbacks

linux/csp/CspComIF.cpp

@@ -141,11 +141,12 @@ ReturnValue_t CspComIF::cspTransfer(uint8_t cspAddress, uint8_t cspPort, const u
                                     int cmdLen, uint16_t querySize) {
   uint32_t timeout_ms = 1000;
   uint16_t bytesRead = 0;
-  int32_t expectedSize = (int32_t)querySize;
+  int32_t expectedSize = static_cast<int32_t>(querySize);
   vectorBufferIter iter = cspDeviceMap.find(cspAddress);
   if (iter == cspDeviceMap.end()) {
     sif::error << "CSP device with address " << cspAddress << " no found in"
                << " device map" << std::endl;
+    return RETURN_FAILED;
   }
   uint8_t* replyBuffer = iter->second.data();
 

linux/devices/GPSHyperionLinuxController.cpp

@@ -1,21 +1,26 @@
 #include "GPSHyperionLinuxController.h"
 
 #include "OBSWConfig.h"
+#include "fsfw/FSFW.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
 #include <filesystem>
 #include <fstream>
 #endif
 #include <cmath>
+#include <ctime>
 
 GPSHyperionLinuxController::GPSHyperionLinuxController(object_id_t objectId, object_id_t parentId,
                                                        bool debugHyperionGps)
     : ExtendedControllerBase(objectId, objects::NO_OBJECT),
       gpsSet(this),
-      myGpsmm(GPSD_SHARED_MEMORY, nullptr),
-      debugHyperionGps(debugHyperionGps) {}
+      debugHyperionGps(debugHyperionGps) {
+  timeUpdateCd.resetTimer();
+}
 
 GPSHyperionLinuxController::~GPSHyperionLinuxController() {}
 
@@ -31,6 +36,7 @@ ReturnValue_t GPSHyperionLinuxController::checkModeCommand(Mode_t mode, Submode_
                                                            uint32_t *msToReachTheMode) {
   if (not modeCommanded) {
     if (mode == MODE_ON or mode == MODE_OFF) {
+      gpsNotOpenSwitch = true;
       // 5h time to reach fix
       *msToReachTheMode = MAX_SECONDS_TO_REACH_FIX;
       maxTimeToReachFix.resetTimer();
@@ -76,9 +82,7 @@ ReturnValue_t GPSHyperionLinuxController::initializeLocalDataPool(
   localDataPoolMap.emplace(GpsHyperion::SATS_IN_USE, new PoolEntry<uint8_t>());
   localDataPoolMap.emplace(GpsHyperion::SATS_IN_VIEW, new PoolEntry<uint8_t>());
   localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>());
-#if OBSW_ENABLE_PERIODIC_HK == 1
-  poolManager.subscribeForPeriodicPacket(gpsSet.getSid(), true, 2.0, false);
-#endif
+  poolManager.subscribeForPeriodicPacket(gpsSet.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -102,18 +106,28 @@ ReturnValue_t GPSHyperionLinuxController::handleCommandMessage(CommandMessage *m
 
 #ifdef FSFW_OSAL_LINUX
 void GPSHyperionLinuxController::readGpsDataFromGpsd() {
+  gpsmm myGpsmm(GPSD_SHARED_MEMORY, nullptr);
   // The data from the device will generally be read all at once. Therefore, we
   // can set all field here
   if (not myGpsmm.is_open()) {
-    // Opening failed
-#if FSFW_VERBOSE_LEVEL >= 1
-    sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Opening GPSMM failed" << std::endl;
-#endif
+    if(gpsNotOpenSwitch) {
+      // Opening failed
+  #if FSFW_VERBOSE_LEVEL >= 1
+      sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Opening GPSMM failed | " <<
+          "Error " << errno << " | " << gps_errstr(errno) << std::endl;
+  #endif
+
+      gpsNotOpenSwitch = false;
+    }
+    return;
   }
   gps_data_t *gps = nullptr;
   gps = myGpsmm.read();
   if (gps == nullptr) {
-    sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Reading GPS data failed" << std::endl;
+    if(gpsReadFailedSwitch) {
+      gpsReadFailedSwitch = false;
+      sif::warning << "GPSHyperionHandler::readGpsDataFromGpsd: Reading GPS data failed" << std::endl;
+    }
     return;
   }
   PoolReadGuard pg(&gpsSet);
@@ -124,8 +138,17 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
     return;
   }
 
+  bool validFix = false;
+  static_cast<void>(validFix);
   // 0: Not seen, 1: No fix, 2: 2D-Fix, 3: 3D-Fix
-  gpsSet.fixMode.value = gps->fix.mode;
+  int newFixMode = gps->fix.mode;
+  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;
   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
@@ -168,10 +191,47 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
     gpsSet.speed.setValid(false);
   }
 
+#if LIBGPS_VERSION_MINOR <= 17
+  gpsSet.unixSeconds.value = gps->fix.time;
+#else
   gpsSet.unixSeconds.value = gps->fix.time.tv_sec;
+#endif
   timeval time = {};
   time.tv_sec = gpsSet.unixSeconds.value;
+#if LIBGPS_VERSION_MINOR <= 17
+  double fractionalPart = gps->fix.time - std::floor(gps->fix.time);
+  time.tv_usec = fractionalPart * 1000.0 * 1000.0;
+#else
   time.tv_usec = gps->fix.time.tv_nsec / 1000;
+#endif
+  std::time_t t = std::time(nullptr);
+  if (time.tv_sec == t) {
+    timeIsConstantCounter++;
+  } else {
+    timeIsConstantCounter = 0;
+  }
+  if (timeInit and validFix) {
+    if (not utility::timeSanityCheck()) {
+#if OBSW_VERBOSE_LEVEL >= 1
+      time_t timeRaw = time.tv_sec;
+      std::tm *timeTm = std::gmtime(&timeRaw);
+      sif::info << "Setting invalid system time from GPS data directly: "
+                << 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);
+    }
+    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 some time..
+    // Clock::setClock(&time);
+    timeUpdateCd.resetTimer();
+  }
+
   Clock::TimeOfDay_t timeOfDay = {};
   Clock::convertTimevalToTimeOfDay(&time, &timeOfDay);
   gpsSet.year = timeOfDay.year;
@@ -182,7 +242,11 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
   gpsSet.seconds = timeOfDay.second;
   if (debugHyperionGps) {
     sif::info << "-- Hyperion GPS Data --" << std::endl;
+#if LIBGPS_VERSION_MINOR <= 17
+    time_t timeRaw = gps->fix.time;
+#else
     time_t timeRaw = gps->fix.time.tv_sec;
+#endif
     std::tm *time = gmtime(&timeRaw);
     std::cout << "Time: " << std::put_time(time, "%c %Z") << std::endl;
     std::cout << "Visible satellites: " << gps->satellites_visible << std::endl;
@@ -190,8 +254,15 @@ void GPSHyperionLinuxController::readGpsDataFromGpsd() {
     std::cout << "Fix (0:Not Seen|1:No Fix|2:2D|3:3D): " << gps->fix.mode << std::endl;
     std::cout << "Latitude: " << gps->fix.latitude << std::endl;
     std::cout << "Longitude: " << gps->fix.longitude << std::endl;
+#if LIBGPS_VERSION_MINOR <= 17
+    std::cout << "Altitude(MSL): " << gps->fix.altitude << std::endl;
+#else
     std::cout << "Altitude(MSL): " << gps->fix.altMSL << std::endl;
+#endif
     std::cout << "Speed(m/s): " << gps->fix.speed << std::endl;
+    std::time_t t = std::time(nullptr);
+    std::tm tm = *std::gmtime(&t);
+    std::cout << "C Time: " << std::put_time(&tm, "%c") << std::endl;
   }
 }
 #endif

linux/devices/GPSHyperionLinuxController.h

@@ -1,6 +1,7 @@
 #ifndef MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 #define MISSION_DEVICES_GPSHYPERIONHANDLER_H_
 
+#include "commonSubsystemIds.h"
 #include "fsfw/FSFW.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
@@ -22,6 +23,7 @@
 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();
@@ -49,8 +51,12 @@ class GPSHyperionLinuxController : public ExtendedControllerBase {
   GpsPrimaryDataset gpsSet;
   Countdown maxTimeToReachFix = Countdown(MAX_SECONDS_TO_REACH_FIX * 1000);
   bool modeCommanded = true;
-  gpsmm myGpsmm;
+  bool timeInit = true;
+  bool gpsNotOpenSwitch = true;
+  bool gpsReadFailedSwitch = true;
   bool debugHyperionGps = false;
+  uint32_t timeIsConstantCounter = 0;
+  Countdown timeUpdateCd = Countdown(60);
 
   void readGpsDataFromGpsd();
 };

linux/devices/devicedefinitions/MPSoCReturnValuesIF.h

@@ -25,6 +25,8 @@ class MPSoCReturnValuesIF {
   static const ReturnValue_t MPSOC_FILENAME_TOO_LONG = MAKE_RETURN_CODE(0xA7);
   //! [EXPORT] : [COMMENT] Command has invalid parameter
   static const ReturnValue_t INVALID_PARAMETER = MAKE_RETURN_CODE(0xA8);
+  //! [EXPORT] : [COMMENT] Received command has file string with invalid length
+  static const ReturnValue_t NAME_TOO_LONG = MAKE_RETURN_CODE(0xA9);
 };
 
 #endif /* MPSOC_RETURN_VALUES_IF_H_ */

linux/devices/devicedefinitions/PlocSupervisorDefinitions.h

@@ -8,7 +8,7 @@
 #include <fsfw/timemanager/Clock.h>
 #include <fsfw/tmtcpacket/SpacePacket.h>
 
-namespace PLOC_SPV {
+namespace supv {
 
 /** Command IDs */
 static const DeviceCommandId_t NONE = 0;
@@ -1541,6 +1541,6 @@ class LatchupStatusReport : public StaticLocalDataSet<LATCHUP_RPT_SET_ENTRIES> {
   lp_var_t<uint32_t> isSet =
       lp_var_t<uint32_t>(sid.objectId, PoolIds::LATCHUP_RPT_TIME_IS_SET, this);
 };
-}  // namespace PLOC_SPV
+}  // namespace supv
 
 #endif /* MISSION_DEVICES_DEVICEDEFINITIONS_PLOCSVPDEFINITIONS_H_ */

linux/devices/ploc/PlocMPSoCHandler.cpp

@@ -3,17 +3,22 @@
 #include "OBSWConfig.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/globalfunctions/CRC.h"
+#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 PlocMPSoCHandler::PlocMPSoCHandler(object_id_t objectId, object_id_t uartComIFid,
                                    CookieIF* comCookie, PlocMPSoCHelper* plocMPSoCHelper,
-                                   Gpio uartIsolatorSwitch)
+                                   Gpio uartIsolatorSwitch, object_id_t supervisorHandler)
     : DeviceHandlerBase(objectId, uartComIFid, comCookie),
       plocMPSoCHelper(plocMPSoCHelper),
-      uartIsolatorSwitch(uartIsolatorSwitch) {
+      uartIsolatorSwitch(uartIsolatorSwitch),
+      supervisorHandler(supervisorHandler),
+      commandActionHelper(this) {
   if (comCookie == nullptr) {
     sif::error << "PlocMPSoCHandler: Invalid communication cookie" << std::endl;
   }
   eventQueue = QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 5);
+  commandActionHelperQueue =
+      QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 5);
 }
 
 PlocMPSoCHandler::~PlocMPSoCHandler() {}
@@ -60,6 +65,10 @@ ReturnValue_t PlocMPSoCHandler::initialize() {
   }
   plocMPSoCHelper->setComCookie(comCookie);
   plocMPSoCHelper->setSequenceCount(&sequenceCount);
+  result = commandActionHelper.initialize();
+  if (result != HasReturnvaluesIF::RETURN_OK) {
+    return ObjectManagerIF::CHILD_INIT_FAILED;
+  }
   return result;
 }
 
@@ -77,6 +86,14 @@ void PlocMPSoCHandler::performOperationHook() {
         break;
     }
   }
+  CommandMessage message;
+  for (ReturnValue_t result = commandActionHelperQueue->receiveMessage(&message);
+       result == RETURN_OK; result = commandActionHelperQueue->receiveMessage(&message)) {
+    result = commandActionHelper.handleReply(&message);
+    if (result == RETURN_OK) {
+      continue;
+    }
+  }
 }
 
 ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
@@ -116,17 +133,33 @@ ReturnValue_t PlocMPSoCHandler::executeAction(ActionId_t actionId, MessageQueueI
 }
 
 void PlocMPSoCHandler::doStartUp() {
-#if OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP == 1
-  setMode(MODE_NORMAL);
-#else
-  setMode(_MODE_TO_ON);
-#endif
-  uartIsolatorSwitch.pullHigh();
+  switch (powerState) {
+    case PowerState::OFF:
+      commandActionHelper.commandAction(supervisorHandler, supv::START_MPSOC);
+      powerState = PowerState::BOOTING;
+      break;
+    case PowerState::ON:
+      setMode(_MODE_TO_ON);
+      uartIsolatorSwitch.pullHigh();
+      break;
+    default:
+      break;
+  }
 }
 
 void PlocMPSoCHandler::doShutDown() {
-  uartIsolatorSwitch.pullLow();
-  setMode(_MODE_POWER_DOWN);
+  switch (powerState) {
+    case PowerState::ON:
+      uartIsolatorSwitch.pullLow();
+      commandActionHelper.commandAction(supervisorHandler, supv::SHUTDOWN_MPSOC);
+      powerState = PowerState::SHUTDOWN;
+      break;
+    case PowerState::OFF:
+      setMode(_MODE_POWER_DOWN);
+      break;
+    default:
+      break;
+  }
 }
 
 ReturnValue_t PlocMPSoCHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
@@ -134,7 +167,7 @@ ReturnValue_t PlocMPSoCHandler::buildNormalDeviceCommand(DeviceCommandId_t* id)
 }
 
 ReturnValue_t PlocMPSoCHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
-  return HasReturnvaluesIF::RETURN_OK;
+  return NOTHING_TO_SEND;
 }
 
 ReturnValue_t PlocMPSoCHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
@@ -279,7 +312,7 @@ ReturnValue_t PlocMPSoCHandler::interpretDeviceReply(DeviceCommandId_t id, const
 
 void PlocMPSoCHandler::setNormalDatapoolEntriesInvalid() {}
 
-uint32_t PlocMPSoCHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 500; }
+uint32_t PlocMPSoCHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 5000; }
 
 ReturnValue_t PlocMPSoCHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
                                                         LocalDataPoolManager& poolManager) {
@@ -331,7 +364,7 @@ ReturnValue_t PlocMPSoCHandler::prepareTcMemRead(const uint8_t* commandData,
 ReturnValue_t PlocMPSoCHandler::prepareTcFlashDelete(const uint8_t* commandData,
                                                      size_t commandDataLen) {
   if (commandDataLen > config::MAX_PATH_SIZE + config::MAX_FILENAME_SIZE) {
-    return NAME_TOO_LONG;
+    return MPSoCReturnValuesIF::NAME_TOO_LONG;
   }
   ReturnValue_t result = RETURN_OK;
   sequenceCount++;
@@ -670,6 +703,59 @@ size_t PlocMPSoCHandler::getNextReplyLength(DeviceCommandId_t commandId) {
   return replyLen;
 }
 
+MessageQueueIF* PlocMPSoCHandler::getCommandQueuePtr() { return commandActionHelperQueue; }
+
+void PlocMPSoCHandler::stepSuccessfulReceived(ActionId_t actionId, uint8_t step) { return; }
+
+void PlocMPSoCHandler::stepFailedReceived(ActionId_t actionId, uint8_t step,
+                                          ReturnValue_t returnCode) {
+  switch (actionId) {
+    case supv::START_MPSOC:
+      sif::warning << "PlocMPSoCHandler::stepFailedReceived: Failed to start MPSoC" << std::endl;
+      powerState = PowerState::OFF;
+      break;
+    case supv::SHUTDOWN_MPSOC:
+      triggerEvent(MPSOC_SHUTDOWN_FAILED);
+      sif::warning << "PlocMPSoCHandler::stepFailedReceived: Failed to shutdown MPSoC" << std::endl;
+      // TODO: Setting state to on or off here?
+      powerState = PowerState::ON;
+      break;
+    default:
+      sif::debug << "PlocMPSoCHandler::stepFailedReceived: Received unexpected action reply"
+                 << std::endl;
+      break;
+  }
+}
+
+void PlocMPSoCHandler::dataReceived(ActionId_t actionId, const uint8_t* data, uint32_t size) {
+  return;
+}
+
+void PlocMPSoCHandler::completionSuccessfulReceived(ActionId_t actionId) {
+  if (actionId != supv::EXE_REPORT) {
+    sif::debug << "PlocMPSoCHandler::completionSuccessfulReceived: Did not expect this action "
+               << "ID" << std::endl;
+    return;
+  }
+  switch (powerState) {
+    case PowerState::BOOTING: {
+      powerState = PowerState::ON;
+      break;
+    }
+    case PowerState::SHUTDOWN: {
+      powerState = PowerState::OFF;
+      break;
+    }
+    default: {
+      break;
+    }
+  }
+}
+
+void PlocMPSoCHandler::completionFailedReceived(ActionId_t actionId, ReturnValue_t returnCode) {
+  handleActionCommandFailure(actionId);
+}
+
 void PlocMPSoCHandler::handleDeviceTM(const uint8_t* data, size_t dataSize,
                                       DeviceCommandId_t replyId) {
   ReturnValue_t result = RETURN_OK;
@@ -725,7 +811,7 @@ void PlocMPSoCHandler::disableAllReplies() {
     }
   }
 
-  /* We must always disable the execution report reply here */
+  /* We always need to disable the execution report reply here */
   disableExeReportReply();
   nextReplyId = mpsoc::NONE;
 }
@@ -764,3 +850,32 @@ void PlocMPSoCHandler::printStatus(const uint8_t* data) {
 uint16_t PlocMPSoCHandler::getStatus(const uint8_t* data) {
   return *(data + STATUS_OFFSET) << 8 | *(data + STATUS_OFFSET + 1);
 }
+
+void PlocMPSoCHandler::handleActionCommandFailure(ActionId_t actionId) {
+  switch (actionId) {
+    case supv::ACK_REPORT:
+    case supv::EXE_REPORT:
+      break;
+    default:
+      sif::debug << "PlocMPSoCHandler::handleActionCommandFailure: Did not expect this action ID "
+                 << std::endl;
+      return;
+  }
+  switch (powerState) {
+    case PowerState::BOOTING: {
+      sif::warning << "PlocMPSoCHandler::handleActionCommandFailure: Failed to boot MPSoC"
+                   << std::endl;
+      powerState = PowerState::OFF;
+      break;
+    }
+    case PowerState::SHUTDOWN: {
+      sif::warning << "PlocMPSoCHandler::handleActionCommandFailure: Failed to shutdown MPSoC"
+                   << std::endl;
+      powerState = PowerState::ON;
+      break;
+    }
+    default:
+      break;
+  }
+  return;
+}

linux/devices/ploc/PlocMPSoCHandler.h

@@ -4,11 +4,13 @@
 #include <string>
 
 #include "PlocMPSoCHelper.h"
+#include "fsfw/action/CommandActionHelper.h"
+#include "fsfw/action/CommandsActionsIF.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/ipc/QueueFactory.h"
 #include "fsfw/tmtcservices/SourceSequenceCounter.h"
-#include "fsfw_hal/linux/uart/UartComIF.h"
 #include "fsfw_hal/linux/gpio/Gpio.h"
+#include "fsfw_hal/linux/uart/UartComIF.h"
 #include "linux/devices/devicedefinitions/MPSoCReturnValuesIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
 
@@ -26,15 +28,33 @@
  *
  * @author	J. Meier
  */
-class PlocMPSoCHandler : public DeviceHandlerBase {
+class PlocMPSoCHandler : public DeviceHandlerBase, public CommandsActionsIF {
  public:
+  /**
+   * @brief Constructor
+   *
+   * @param ojectId             Object ID of the MPSoC handler
+   * @param uartcomIFid         Object ID of the UART communication interface
+   * @param comCookie           UART communication cookie
+   * @param plocMPSoCHelper     Pointer to MPSoC helper object
+   * @param uartIsolatorSwitch  Gpio object representing the GPIO connected to the UART isolator
+   *                            module in the programmable logic
+   * @param supervisorHandler   Object ID of the supervisor handler
+   */
   PlocMPSoCHandler(object_id_t objectId, object_id_t uartComIFid, CookieIF* comCookie,
-                   PlocMPSoCHelper* plocMPSoCHelper, Gpio uartIsolatorSwitch);
+                   PlocMPSoCHelper* plocMPSoCHelper, Gpio uartIsolatorSwitch,
+                   object_id_t supervisorHandler);
   virtual ~PlocMPSoCHandler();
   virtual ReturnValue_t initialize() override;
   ReturnValue_t executeAction(ActionId_t actionId, MessageQueueId_t commandedBy,
                               const uint8_t* data, size_t size) override;
   void performOperationHook() override;
+  MessageQueueIF* getCommandQueuePtr() override;
+  void stepSuccessfulReceived(ActionId_t actionId, uint8_t step) override;
+  void stepFailedReceived(ActionId_t actionId, uint8_t step, ReturnValue_t returnCode) override;
+  void dataReceived(ActionId_t actionId, const uint8_t* data, uint32_t size) override;
+  void completionSuccessfulReceived(ActionId_t actionId) override;
+  void completionFailedReceived(ActionId_t actionId, ReturnValue_t returnCode) override;
 
  protected:
   void doStartUp() override;
@@ -74,15 +94,16 @@ class PlocMPSoCHandler : public DeviceHandlerBase {
   //! [EXPORT] : [COMMENT] Packet sequence count in received space packet does not match expected
   //! count P1: Expected sequence count P2: Received sequence count
   static const Event MPSOC_HANDLER_SEQ_CNT_MISMATCH = MAKE_EVENT(5, severity::LOW);
-
-  //! [EXPORT] : [COMMENT] Received command has file string with invalid length
-  static const ReturnValue_t NAME_TOO_LONG = MAKE_RETURN_CODE(0xD0);
+  //! [EXPORT] : [COMMENT] Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and
+  //! thus also to shutdown the supervisor.
+  static const Event MPSOC_SHUTDOWN_FAILED = MAKE_EVENT(6, severity::HIGH);
 
   static const uint16_t APID_MASK = 0x7FF;
   static const uint16_t PACKET_SEQUENCE_COUNT_MASK = 0x3FFF;
   static const uint8_t STATUS_OFFSET = 10;
 
   MessageQueueIF* eventQueue = nullptr;
+  MessageQueueIF* commandActionHelperQueue = nullptr;
 
   SourceSequenceCounter sequenceCount;
 
@@ -99,6 +120,8 @@ class PlocMPSoCHandler : public DeviceHandlerBase {
 
   PlocMPSoCHelper* plocMPSoCHelper = nullptr;
   Gpio uartIsolatorSwitch;
+  object_id_t supervisorHandler = 0;
+  CommandActionHelper commandActionHelper;
 
   // Used to block incoming commands when MPSoC helper class is currently executing a command
   bool plocMPSoCHelperExecuting = false;
@@ -111,6 +134,10 @@ class PlocMPSoCHandler : public DeviceHandlerBase {
 
   TmMemReadReport tmMemReadReport;
 
+  enum class PowerState { OFF, BOOTING, SHUTDOWN, ON };
+
+  PowerState powerState = PowerState::OFF;
+
   /**
    * @brief   Handles events received from the PLOC MPSoC helper
    */
@@ -212,6 +239,8 @@ class PlocMPSoCHandler : public DeviceHandlerBase {
   ReturnValue_t prepareTcModeReplay();
 
   uint16_t getStatus(const uint8_t* data);
+
+  void handleActionCommandFailure(ActionId_t actionId);
 };
 
 #endif /* BSP_Q7S_DEVICES_PLOC_PLOCMPSOCHANDLER_H_ */

linux/devices/ploc/PlocMemoryDumper.cpp

@@ -105,10 +105,10 @@ void PlocMemoryDumper::doStateMachine() {
     case State::IDLE:
       break;
     case State::COMMAND_FIRST_MRAM_DUMP:
-      commandNextMramDump(PLOC_SPV::FIRST_MRAM_DUMP);
+      commandNextMramDump(supv::FIRST_MRAM_DUMP);
       break;
     case State::COMMAND_CONSECUTIVE_MRAM_DUMP:
-      commandNextMramDump(PLOC_SPV::CONSECUTIVE_MRAM_DUMP);
+      commandNextMramDump(supv::CONSECUTIVE_MRAM_DUMP);
       break;
     case State::EXECUTING_MRAM_DUMP:
       break;
@@ -127,8 +127,8 @@ void PlocMemoryDumper::dataReceived(ActionId_t actionId, const uint8_t* data, ui
 
 void PlocMemoryDumper::completionSuccessfulReceived(ActionId_t actionId) {
   switch (pendingCommand) {
-    case (PLOC_SPV::FIRST_MRAM_DUMP):
-    case (PLOC_SPV::CONSECUTIVE_MRAM_DUMP):
+    case (supv::FIRST_MRAM_DUMP):
+    case (supv::CONSECUTIVE_MRAM_DUMP):
       if (mram.endAddress == mram.startAddress) {
         triggerEvent(MRAM_DUMP_FINISHED);
         state = State::IDLE;
@@ -146,8 +146,8 @@ void PlocMemoryDumper::completionSuccessfulReceived(ActionId_t actionId) {
 
 void PlocMemoryDumper::completionFailedReceived(ActionId_t actionId, ReturnValue_t returnCode) {
   switch (pendingCommand) {
-    case (PLOC_SPV::FIRST_MRAM_DUMP):
-    case (PLOC_SPV::CONSECUTIVE_MRAM_DUMP):
+    case (supv::FIRST_MRAM_DUMP):
+    case (supv::CONSECUTIVE_MRAM_DUMP):
       triggerEvent(MRAM_DUMP_FAILED, mram.lastStartAddress);
       break;
     default:

linux/devices/ploc/PlocSupervisorHandler.h

@@ -1,15 +1,14 @@
 #ifndef MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 #define MISSION_DEVICES_PLOCSUPERVISORHANDLER_H_
 
-#include "bsp_q7s/memory/SdCardManager.h"
-#include "fsfw/devicehandlers/DeviceHandlerBase.h"
-#include "fsfw_hal/linux/uart/UartComIF.h"
-#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
-#include "fsfw_hal/linux/gpio/Gpio.h"
-#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
-#include "devices/powerSwitcherList.h"
-
 #include "OBSWConfig.h"
+#include "bsp_q7s/memory/SdCardManager.h"
+#include "devices/powerSwitcherList.h"
+#include "fsfw/devicehandlers/DeviceHandlerBase.h"
+#include "fsfw_hal/linux/gpio/Gpio.h"
+#include "fsfw_hal/linux/gpio/LinuxLibgpioIF.h"
+#include "fsfw_hal/linux/uart/UartComIF.h"
+#include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 /**
  * @brief	This is the device handler for the supervisor of the PLOC which is programmed by
@@ -26,7 +25,7 @@
 class PlocSupervisorHandler : public DeviceHandlerBase {
  public:
   PlocSupervisorHandler(object_id_t objectId, object_id_t uartComIFid, CookieIF* comCookie,
-                        Gpio uartIsolatorSwitch);
+                        Gpio uartIsolatorSwitch, power::Switch_t powerSwitch);
   virtual ~PlocSupervisorHandler();
 
   virtual ReturnValue_t initialize() override;
@@ -106,24 +105,24 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   static const uint16_t APID_MASK = 0x7FF;
   static const uint16_t PACKET_SEQUENCE_COUNT_MASK = 0x3FFF;
 
-  uint8_t commandBuffer[PLOC_SPV::MAX_COMMAND_SIZE];
+  uint8_t commandBuffer[supv::MAX_COMMAND_SIZE];
 
   /**
    * This variable is used to store the id of the next reply to receive. This is necessary
    * because the PLOC sends as reply to each command at least one acknowledgment and execution
    * report.
    */
-  DeviceCommandId_t nextReplyId = PLOC_SPV::NONE;
+  DeviceCommandId_t nextReplyId = supv::NONE;
 
   UartComIF* uartComIf = nullptr;
   LinuxLibgpioIF* gpioComIF = nullptr;
   Gpio uartIsolatorSwitch;
 
-  PLOC_SPV::HkSet hkset;
-  PLOC_SPV::BootStatusReport bootStatusReport;
-  PLOC_SPV::LatchupStatusReport latchupStatusReport;
+  supv::HkSet hkset;
+  supv::BootStatusReport bootStatusReport;
+  supv::LatchupStatusReport latchupStatusReport;
 
-  const power::Switch_t powerSwitch = pcduSwitches::PDU1_CH6_PLOC_12V;
+  const power::Switch_t powerSwitch = power::NO_SWITCH;
 
   /** Number of expected replies following the MRAM dump command */
   uint32_t expectedMramDumpPackets = 0;
@@ -134,7 +133,7 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   uint16_t bufferTop = 0;
 
   /** This buffer is used to concatenate space packets received in two different read steps */
-  uint8_t spacePacketBuffer[PLOC_SPV::MAX_PACKET_SIZE];
+  uint8_t spacePacketBuffer[supv::MAX_PACKET_SIZE];
 
 #ifdef TE0720_1CFA
   SdCardManager* sdcMan = nullptr;
@@ -147,7 +146,7 @@ class PlocSupervisorHandler : public DeviceHandlerBase {
   /** Setting this variable to true will enable direct downlink of MRAM packets */
   bool downlinkMramDump = false;
 
-  ReturnValue_t getSwitches(const uint8_t **switches, uint8_t *numberOfSwitches);
+  ReturnValue_t getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches);
 
   /**
    * @brief   This function checks the crc of the received PLOC reply.

linux/devices/ploc/PlocUpdater.cpp

@@ -123,9 +123,6 @@ void PlocUpdater::readCommandQueue() {
     if (result == HasReturnvaluesIF::RETURN_OK) {
       continue;
     }
-
-    sif::debug << "PlocUpdater::readCommandQueue: Received message with invalid format"
-               << std::endl;
   }
 }
 
@@ -145,7 +142,6 @@ void PlocUpdater::doStateMachine() {
     case State::COMMAND_EXECUTING:
       break;
     default:
-      sif::debug << "PlocUpdater::doStateMachine: Invalid state" << std::endl;
       break;
   }
 }
@@ -199,10 +195,10 @@ void PlocUpdater::dataReceived(ActionId_t actionId, const uint8_t* data, uint32_
 
 void PlocUpdater::completionSuccessfulReceived(ActionId_t actionId) {
   switch (pendingCommand) {
-    case (PLOC_SPV::UPDATE_AVAILABLE):
+    case (supv::UPDATE_AVAILABLE):
       state = State::UPDATE_TRANSFER;
       break;
-    case (PLOC_SPV::UPDATE_IMAGE_DATA):
+    case (supv::UPDATE_IMAGE_DATA):
       if (remainingPackets == 0) {
         packetsSent = 0;  // Reset packets sent variable for next update sequence
         state = State::UPDATE_VERIFY;
@@ -210,14 +206,12 @@ void PlocUpdater::completionSuccessfulReceived(ActionId_t actionId) {
         state = State::UPDATE_TRANSFER;
       }
       break;
-    case (PLOC_SPV::UPDATE_VERIFY):
+    case (supv::UPDATE_VERIFY):
       triggerEvent(UPDATE_FINISHED);
       state = State::IDLE;
-      pendingCommand = PLOC_SPV::NONE;
+      pendingCommand = supv::NONE;
       break;
     default:
-      sif::debug << "PlocUpdater::completionSuccessfulReceived: Invalid pending command"
-                 << std::endl;
       state = State::IDLE;
       break;
   }
@@ -225,20 +219,19 @@ void PlocUpdater::completionSuccessfulReceived(ActionId_t actionId) {
 
 void PlocUpdater::completionFailedReceived(ActionId_t actionId, ReturnValue_t returnCode) {
   switch (pendingCommand) {
-    case (PLOC_SPV::UPDATE_AVAILABLE): {
+    case (supv::UPDATE_AVAILABLE): {
       triggerEvent(UPDATE_AVAILABLE_FAILED);
       break;
     }
-    case (PLOC_SPV::UPDATE_IMAGE_DATA): {
+    case (supv::UPDATE_IMAGE_DATA): {
       triggerEvent(UPDATE_TRANSFER_FAILED, packetsSent);
       break;
     }
-    case (PLOC_SPV::UPDATE_VERIFY): {
+    case (supv::UPDATE_VERIFY): {
       triggerEvent(UPDATE_VERIFY_FAILED);
       break;
     }
     default:
-      sif::debug << "PlocUpdater::completionFailedReceived: Invalid pending command " << std::endl;
       break;
   }
   state = State::IDLE;
@@ -268,23 +261,22 @@ void PlocUpdater::commandUpdateAvailable() {
 
   calcImageCrc();
 
-  PLOC_SPV::UpdateInfo packet(PLOC_SPV::APID_UPDATE_AVAILABLE, static_cast<uint8_t>(image),
-                              static_cast<uint8_t>(partition), imageSize, imageCrc,
-                              numOfUpdatePackets);
+  supv::UpdateInfo packet(supv::APID_UPDATE_AVAILABLE, static_cast<uint8_t>(image),
+                          static_cast<uint8_t>(partition), imageSize, imageCrc, numOfUpdatePackets);
 
-  result = commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER,
-                                             PLOC_SPV::UPDATE_AVAILABLE, packet.getWholeData(),
-                                             packet.getFullSize());
+  result =
+      commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, supv::UPDATE_AVAILABLE,
+                                        packet.getWholeData(), packet.getFullSize());
   if (result != RETURN_OK) {
     sif::warning << "PlocUpdater::commandUpdateAvailable: Failed to send update available"
                  << " packet to supervisor handler" << std::endl;
-    triggerEvent(ACTION_COMMANDING_FAILED, result, PLOC_SPV::UPDATE_AVAILABLE);
+    triggerEvent(ACTION_COMMANDING_FAILED, result, supv::UPDATE_AVAILABLE);
     state = State::IDLE;
-    pendingCommand = PLOC_SPV::NONE;
+    pendingCommand = supv::NONE;
     return;
   }
 
-  pendingCommand = PLOC_SPV::UPDATE_AVAILABLE;
+  pendingCommand = supv::UPDATE_AVAILABLE;
   state = State::COMMAND_EXECUTING;
   return;
 }
@@ -308,56 +300,54 @@ void PlocUpdater::commandUpdatePacket() {
     payloadLength = MAX_SP_DATA;
   }
 
-  PLOC_SPV::UpdatePacket packet(payloadLength);
+  supv::UpdatePacket packet(payloadLength);
   file.read(reinterpret_cast<char*>(packet.getDataFieldPointer()), payloadLength);
   file.close();
   // sequence count of first packet is 1
-  packet.setPacketSequenceCount((packetsSent + 1) & PLOC_SPV::SEQUENCE_COUNT_MASK);
+  packet.setPacketSequenceCount((packetsSent + 1) & supv::SEQUENCE_COUNT_MASK);
   if (numOfUpdatePackets > 1) {
     adjustSequenceFlags(packet);
   }
   packet.makeCrc();
 
-  result = commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER,
-                                             PLOC_SPV::UPDATE_IMAGE_DATA, packet.getWholeData(),
-                                             packet.getFullSize());
+  result =
+      commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, supv::UPDATE_IMAGE_DATA,
+                                        packet.getWholeData(), packet.getFullSize());
 
   if (result != RETURN_OK) {
     sif::warning << "PlocUpdater::commandUpdateAvailable: Failed to send update"
                  << " packet to supervisor handler" << std::endl;
-    triggerEvent(ACTION_COMMANDING_FAILED, result, PLOC_SPV::UPDATE_IMAGE_DATA);
+    triggerEvent(ACTION_COMMANDING_FAILED, result, supv::UPDATE_IMAGE_DATA);
     state = State::IDLE;
-    pendingCommand = PLOC_SPV::NONE;
+    pendingCommand = supv::NONE;
     return;
   }
 
   remainingPackets--;
   packetsSent++;
 
-  pendingCommand = PLOC_SPV::UPDATE_IMAGE_DATA;
+  pendingCommand = supv::UPDATE_IMAGE_DATA;
   state = State::COMMAND_EXECUTING;
 }
 
 void PlocUpdater::commandUpdateVerify() {
   ReturnValue_t result = RETURN_OK;
 
-  PLOC_SPV::UpdateInfo packet(PLOC_SPV::APID_UPDATE_VERIFY, static_cast<uint8_t>(image),
-                              static_cast<uint8_t>(partition), imageSize, imageCrc,
-                              numOfUpdatePackets);
+  supv::UpdateInfo packet(supv::APID_UPDATE_VERIFY, static_cast<uint8_t>(image),
+                          static_cast<uint8_t>(partition), imageSize, imageCrc, numOfUpdatePackets);
 
-  result =
-      commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, PLOC_SPV::UPDATE_VERIFY,
-                                        packet.getWholeData(), packet.getFullSize());
+  result = commandActionHelper.commandAction(objects::PLOC_SUPERVISOR_HANDLER, supv::UPDATE_VERIFY,
+                                             packet.getWholeData(), packet.getFullSize());
   if (result != RETURN_OK) {
     sif::warning << "PlocUpdater::commandUpdateAvailable: Failed to send update available"
                  << " packet to supervisor handler" << std::endl;
-    triggerEvent(ACTION_COMMANDING_FAILED, result, PLOC_SPV::UPDATE_VERIFY);
+    triggerEvent(ACTION_COMMANDING_FAILED, result, supv::UPDATE_VERIFY);
     state = State::IDLE;
-    pendingCommand = PLOC_SPV::NONE;
+    pendingCommand = supv::NONE;
     return;
   }
   state = State::COMMAND_EXECUTING;
-  pendingCommand = PLOC_SPV::UPDATE_VERIFY;
+  pendingCommand = supv::UPDATE_VERIFY;
   return;
 }
 
@@ -384,12 +374,12 @@ void PlocUpdater::calcImageCrc() {
   imageCrc = (remainder ^ FINAL_XOR_VALUE_32);
 }
 
-void PlocUpdater::adjustSequenceFlags(PLOC_SPV::UpdatePacket& packet) {
+void PlocUpdater::adjustSequenceFlags(supv::UpdatePacket& packet) {
   if (packetsSent == 0) {
-    packet.setSequenceFlags(static_cast<uint8_t>(PLOC_SPV::SequenceFlags::FIRST_PKT));
+    packet.setSequenceFlags(static_cast<uint8_t>(supv::SequenceFlags::FIRST_PKT));
   } else if (remainingPackets == 1) {
-    packet.setSequenceFlags(static_cast<uint8_t>(PLOC_SPV::SequenceFlags::LAST_PKT));
+    packet.setSequenceFlags(static_cast<uint8_t>(supv::SequenceFlags::LAST_PKT));
   } else {
-    packet.setSequenceFlags(static_cast<uint8_t>(PLOC_SPV::SequenceFlags::CONTINUED_PKT));
+    packet.setSequenceFlags(static_cast<uint8_t>(supv::SequenceFlags::CONTINUED_PKT));
   }
 }

linux/devices/ploc/PlocUpdater.h

@@ -23,7 +23,7 @@
  *          packets and sent to the PlocSupervisorHandler.
  *
  * @details The MPSoC has two boot memories (NVM0 and NVM1) where each stores two images (Partition
- * A and Partition B)
+ *          A and Partition B)
  *
  * @author  J. Meier
  */
@@ -122,7 +122,7 @@ class PlocUpdater : public SystemObject,
 
   State state = State::IDLE;
 
-  ActionId_t pendingCommand = PLOC_SPV::NONE;
+  ActionId_t pendingCommand = supv::NONE;
 
   enum class Image : uint8_t { NONE, A, B };
 
@@ -168,7 +168,7 @@ class PlocUpdater : public SystemObject,
 
   void calcImageCrc();
 
-  void adjustSequenceFlags(PLOC_SPV::UpdatePacket& packet);
+  void adjustSequenceFlags(supv::UpdatePacket& packet);
 };
 
 #endif /* MISSION_DEVICES_PLOCUPDATER_H_ */

linux/devices/startracker/StarTrackerHandler.cpp

@@ -15,7 +15,7 @@ extern "C" {
 }
 
 StarTrackerHandler::StarTrackerHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
-                                       StrHelper* strHelper)
+                                       StrHelper* strHelper, power::Switch_t powerSwitch)
     : DeviceHandlerBase(objectId, comIF, comCookie),
       temperatureSet(this),
       versionSet(this),
@@ -39,7 +39,8 @@ StarTrackerHandler::StarTrackerHandler(object_id_t objectId, object_id_t comIF,
       subscriptionSet(this),
       logSubscriptionSet(this),
       debugCameraSet(this),
-      strHelper(strHelper) {
+      strHelper(strHelper),
+      powerSwitch(powerSwitch) {
   if (comCookie == nullptr) {
     sif::error << "StarTrackerHandler: Invalid com cookie" << std::endl;
   }
@@ -1223,6 +1224,15 @@ ReturnValue_t StarTrackerHandler::doSendReadHook() {
   return RETURN_OK;
 }
 
+ReturnValue_t StarTrackerHandler::getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) {
+  if (powerSwitch == power::NO_SWITCH) {
+    return DeviceHandlerBase::NO_SWITCH;
+  }
+  *numberOfSwitches = 1;
+  *switches = &powerSwitch;
+  return RETURN_OK;
+}
+
 ReturnValue_t StarTrackerHandler::checkMode(ActionId_t actionId) {
   switch (actionId) {
     case startracker::UPLOAD_IMAGE:

linux/devices/startracker/StarTrackerHandler.h

@@ -7,6 +7,7 @@
 #include "ArcsecJsonParamBase.h"
 #include "OBSWConfig.h"
 #include "StrHelper.h"
+#include "devices/powerSwitcherList.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/src/fsfw/serialize/SerializeAdapter.h"
 #include "fsfw/timemanager/Countdown.h"
@@ -34,7 +35,7 @@ class StarTrackerHandler : public DeviceHandlerBase {
    * 						to high to enable the device.
    */
   StarTrackerHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
-                     StrHelper* strHelper);
+                     StrHelper* strHelper, power::Switch_t powerSwitch);
   virtual ~StarTrackerHandler();
 
   ReturnValue_t initialize() override;
@@ -75,6 +76,7 @@ class StarTrackerHandler : public DeviceHandlerBase {
    */
   virtual size_t getNextReplyLength(DeviceCommandId_t deviceCommand) override;
   virtual ReturnValue_t doSendReadHook() override;
+  ReturnValue_t getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) override;
   virtual void doTransition(Mode_t modeFrom, Submode_t subModeFrom) override;
 
  private:
@@ -161,14 +163,12 @@ class StarTrackerHandler : public DeviceHandlerBase {
   static const uint32_t BOOT_TIMEOUT = 1000;
   static const uint32_t DEFAULT_TRANSITION_DELAY = 15000;
 
-  class FlashReadCmd {
-   public:
+  struct FlashReadCmd {
     // Minimum length of a read command (region, length and filename)
     static const size_t MIN_LENGTH = 7;
   };
 
-  class ChecksumCmd {
-   public:
+  struct ChecksumCmd {
     static const uint8_t ADDRESS_OFFSET = 1;
     static const uint8_t LENGTH_OFFSET = 5;
     // Length of checksum command
@@ -268,6 +268,8 @@ class StarTrackerHandler : public DeviceHandlerBase {
 
   bool strHelperExecuting = false;
 
+  const power::Switch_t powerSwitch = power::NO_SWITCH;
+
   /**
    * @brief   Handles internal state
    */

linux/fsfwconfig/OBSWConfig.h.in

@@ -44,13 +44,14 @@ debugging. */
 #define OBSW_ADD_PLOC_SUPERVISOR                    0
 #define OBSW_ADD_PLOC_MPSOC                         0
 #define OBSW_ADD_SUN_SENSORS                        1
+#define OBSW_ADD_SUS_BOARD_ASS                      1
 #define OBSW_ADD_ACS_BOARD                          1
 #define OBSW_ADD_ACS_HANDLERS                       1
 #define OBSW_ADD_RW                                 0
 #define OBSW_ADD_RTD_DEVICES                        1
 #define OBSW_ADD_TMP_DEVICES                        0
 #define OBSW_ADD_RAD_SENSORS                        1
-#define OBSW_ADD_PL_PCDU                            0
+#define OBSW_ADD_PL_PCDU                            1
 #define OBSW_ADD_SYRLINKS                           0
 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
 #define OBSW_STAR_TRACKER_GROUND_CONFIG             1
@@ -88,10 +89,10 @@ debugging. */
 #define OBSW_ADD_PL_PCDU                            0
 #define OBSW_ADD_SYRLINKS                           0
 #define OBSW_ENABLE_SYRLINKS_TRANSMIT_TIMEOUT       0
-#define OBSW_SYRLINKS_SIMULATED										  1
+#define OBSW_SYRLINKS_SIMULATED                     1
 #define OBSW_STAR_TRACKER_GROUND_CONFIG             1
 #define OBSW_ENABLE_PERIODIC_HK                     0
-#define OBSW_PRINT_CORE_HK													0
+#define OBSW_PRINT_CORE_HK                          0
 #define OBSW_INITIALIZE_SWITCHES                    0
 
 #endif
@@ -115,7 +116,6 @@ debugging. */
 #define OBSW_ADD_UART_TEST_CODE                     0
 
 #define OBSW_TEST_ACS                               0
-#define OBSW_TEST_ACS_BOARD_ASS                     0
 #define OBSW_DEBUG_ACS                              0
 #define OBSW_TEST_SUS                               0
 #define OBSW_DEBUG_SUS                              0
@@ -127,6 +127,8 @@ debugging. */
 #define OBSW_DEBUG_PL_PCDU                          0
 #define OBSW_TEST_BPX_BATT                          0
 #define OBSW_DEBUG_BPX_BATT                         0
+#define OBSW_TEST_IMTQ                              0
+#define OBSW_DEBUG_IMTQ                             0
 
 #define OBSW_TEST_LIBGPIOD                          0
 #define OBSW_TEST_PLOC_HANDLER                      0
@@ -143,9 +145,8 @@ debugging. */
 #define OBSW_DEBUG_GPS                              0
 #define OBSW_DEBUG_ACU                              0
 #define OBSW_DEBUG_SYRLINKS                         0
-#define OBSW_DEBUG_IMTQ                             0
 #define OBSW_DEBUG_RW                               0
-#define OBSW_DEBUG_PDEC_HANDLER	                    0
+#define OBSW_DEBUG_PDEC_HANDLER                     0
 
 #ifdef TE0720_1CFA
 #define OBSW_DEBUG_PLOC_SUPERVISOR                  1
@@ -170,6 +171,7 @@ debugging. */
 #define OBSW_ADD_SUN_SENSORS                        0
 #define OBSW_ADD_MGT                                0
 #define OBSW_ADD_ACS_BOARD                          0
+#define OBSW_ADD_ACS_HANDLERS                       0
 #define OBSW_ADD_GPS_0                              0
 #define OBSW_ADD_GPS_1                              0
 #define OBSW_ADD_RW                                 0
@@ -190,6 +192,9 @@ debugging. */
 /*******************************************************************/
 #cmakedefine EIVE_BUILD_GPSD_GPS_HANDLER
 
+#cmakedefine LIBGPS_VERSION_MAJOR @LIBGPS_VERSION_MAJOR@
+#cmakedefine LIBGPS_VERSION_MINOR @LIBGPS_VERSION_MINOR@
+
 #ifdef RASPBERRY_PI
 #include "rpiConfig.h"
 #elif defined(XIPHOS_Q7S)

linux/fsfwconfig/events/translateEvents.cpp

@@ -1,7 +1,7 @@
 /**
- * @brief    Auto-generated event translation file. Contains 169 translations.
+ * @brief    Auto-generated event translation file. Contains 186 translations.
  * @details
- * Generated on: 2022-03-28 09:51:17
+ * Generated on: 2022-04-08 14:13:35
  */
 #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";
@@ -161,11 +162,27 @@ const char *EXE_FAILURE_REPORT_STRING = "EXE_FAILURE_REPORT";
 const char *ACK_INVALID_APID_STRING = "ACK_INVALID_APID";
 const char *EXE_INVALID_APID_STRING = "EXE_INVALID_APID";
 const char *MPSOC_HELPER_SEQ_CNT_MISMATCH_STRING = "MPSOC_HELPER_SEQ_CNT_MISMATCH";
+const char *TRANSITION_BACK_TO_OFF_STRING = "TRANSITION_BACK_TO_OFF";
+const char *NEG_V_OUT_OF_BOUNDS_STRING = "NEG_V_OUT_OF_BOUNDS";
+const char *U_DRO_OUT_OF_BOUNDS_STRING = "U_DRO_OUT_OF_BOUNDS";
+const char *I_DRO_OUT_OF_BOUNDS_STRING = "I_DRO_OUT_OF_BOUNDS";
+const char *U_X8_OUT_OF_BOUNDS_STRING = "U_X8_OUT_OF_BOUNDS";
+const char *I_X8_OUT_OF_BOUNDS_STRING = "I_X8_OUT_OF_BOUNDS";
+const char *U_TX_OUT_OF_BOUNDS_STRING = "U_TX_OUT_OF_BOUNDS";
+const char *I_TX_OUT_OF_BOUNDS_STRING = "I_TX_OUT_OF_BOUNDS";
+const char *U_MPA_OUT_OF_BOUNDS_STRING = "U_MPA_OUT_OF_BOUNDS";
+const char *I_MPA_OUT_OF_BOUNDS_STRING = "I_MPA_OUT_OF_BOUNDS";
+const char *U_HPA_OUT_OF_BOUNDS_STRING = "U_HPA_OUT_OF_BOUNDS";
+const char *I_HPA_OUT_OF_BOUNDS_STRING = "I_HPA_OUT_OF_BOUNDS";
 const char *TRANSITION_OTHER_SIDE_FAILED_STRING = "TRANSITION_OTHER_SIDE_FAILED";
 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 *P60_BOOT_COUNT_STRING = "P60_BOOT_COUNT";
+const char *BATT_MODE_STRING = "BATT_MODE";
+const char *BATT_MODE_CHANGED_STRING = "BATT_MODE_CHANGED";
 const char *ALLOC_FAILURE_STRING = "ALLOC_FAILURE";
 const char *REBOOT_SW_STRING = "REBOOT_SW";
 const char *REBOOT_MECHANISM_TRIGGERED_STRING = "REBOOT_MECHANISM_TRIGGERED";
@@ -331,170 +348,204 @@ 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_OTHER_SIDE_FAILED_STRING;
+      return UPDATE_FILE_NOT_EXISTS_STRING;
     case (12201):
-      return NOT_ENOUGH_DEVICES_DUAL_MODE_STRING;
+      return ACTION_COMMANDING_FAILED_STRING;
     case (12202):
-      return POWER_STATE_MACHINE_TIMEOUT_STRING;
+      return UPDATE_AVAILABLE_FAILED_STRING;
     case (12203):
+      return UPDATE_TRANSFER_FAILED_STRING;
+    case (12204):
+      return UPDATE_VERIFY_FAILED_STRING;
+    case (12205):
+      return UPDATE_FINISHED_STRING;
+    case (12300):
+      return SEND_MRAM_DUMP_FAILED_STRING;
+    case (12301):
+      return MRAM_DUMP_FAILED_STRING;
+    case (12302):
+      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 (12400):
+    case (13000):
       return CHILDREN_LOST_MODE_STRING;
+    case (13100):
+      return GPS_FIX_CHANGE_STRING;
+    case (13200):
+      return P60_BOOT_COUNT_STRING;
+    case (13201):
+      return BATT_MODE_STRING;
+    case (13202):
+      return BATT_MODE_CHANGED_STRING;
     case (13600):
       return ALLOC_FAILURE_STRING;
     case (13601):

linux/fsfwconfig/objects/translateObjects.cpp

@@ -2,7 +2,7 @@
  * @brief  Auto-generated object translation file.
  * @details
  * Contains 117 translations.
- * Generated on: 2022-03-28 09:51:13
+ * Generated on: 2022-04-08 14:13:35
  */
 #include "translateObjects.h"
 

linux/fsfwconfig/pollingsequence/pollingSequenceFactory.cpp

@@ -177,14 +177,7 @@ ReturnValue_t pst::pstSpi(FixedTimeslotTaskIF *thisSequence) {
   bool addSus9 = true;
   bool addSus10 = true;
   bool addSus11 = true;
-  /**
-   * The sun sensor will be shutdown as soon as the chip select is pulled high. Thus all
-   * requests to a sun sensor must be performed consecutively. Another reason for calling multiple
-   * device handler cycles is that the ADC conversions take some time. Thus first the ADC
-   * conversions are initiated and in a next step the results can be read from the internal FIFO.
-   * One sun sensor communication sequence also blocks the SPI bus. So other devices can not be
-   * inserted between the device handler cycles of one SUS.
-   */
+
   if (addSus0) {
     /* Write setup */
     thisSequence->addSlot(objects::SUS_0, length * 0, DeviceHandlerIF::PERFORM_OPERATION);

linux/obc/AxiPtmeConfig.h

@@ -37,6 +37,8 @@ class AxiPtmeConfig : public SystemObject {
    *            The default implementation of the PTME generates a clock where the high level is
    *            only one bit clock period long. This might be too short to match the setup and hold
    *            times of the S-and transceiver.
+   *            Default: Enables TX clock manipulator
+   *
    */
   ReturnValue_t enableTxclockManipulator();
   ReturnValue_t disableTxclockManipulator();
@@ -47,6 +49,7 @@ class AxiPtmeConfig : public SystemObject {
    *        Enable inversion will update data on falling edge (not the configuration required by the
    *        syrlinks)
    *        Disable clock inversion. Data updated on rising edge.
+   *        Default: Inversion is disabled
    */
   ReturnValue_t enableTxclockInversion();
   ReturnValue_t disableTxclockInversion();
@@ -54,7 +57,7 @@ class AxiPtmeConfig : public SystemObject {
  private:
   // Address of register storing the bitrate configuration parameter
   static const uint32_t CADU_BITRATE_REG = 0x0;
-  // Address to register storing common configuration parameters
+  // Address of register storing common configuration parameters
   static const uint32_t COMMON_CONFIG_REG = 0x4;
   static const uint32_t ADRESS_DIVIDER = 4;
 

linux/obc/PdecHandler.cpp

@@ -326,6 +326,7 @@ void PdecHandler::handleNewTc() {
   printTC(tcLength);
 #endif /* OBSW_DEBUG_PDEC_HANDLER */
 
+#if OBSW_TC_FROM_PDEC == 1
   store_address_t storeId;
   result = tcStore->addData(&storeId, tcSegment + 1, tcLength - 1);
   if (result != RETURN_OK) {
@@ -343,6 +344,7 @@ void PdecHandler::handleNewTc() {
     tcStore->deleteData(storeId);
     return;
   }
+#endif /* OBSW_TC_FROM_PDEC == 1 */
 
   return;
 }

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;
+}

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_ */

misc/eclipse/.cproject

@@ -589,7 +589,7 @@
 		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689" moduleId="org.eclipse.cdt.core.settings" name="eive-q7s-debug">
 				<macros>
-					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_PATH_DIR" value="${HOME}/Xilinx/cortexa9hf-neon-xiphos-linux-gnueabi"/>
+					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_PATH_DIR" value="${HOME}/Xilinx/eive-compile-rootfs"/>
 					<stringMacro name="Q7S_SYSROOT" type="VALUE_TEXT" value="C:\Xilinx\cortexa9hf-neon-xiphos-linux-gnueabi"/>
 				</macros>
 				<externalSettings/>
@@ -603,7 +603,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689" name="eive-q7s-debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.enablement=null,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.image=null,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=null" parent="org.eclipse.cdt.build.core.emptycfg">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689" name="eive-q7s-debug" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.enablement=null,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.connection=null,org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.image=null" parent="org.eclipse.cdt.build.core.emptycfg">
 					<folderInfo id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689." name="/" resourcePath="">
 						<toolChain id="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base.1439714522" name="Arm Cross GCC" superClass="ilg.gnuarmeclipse.managedbuild.cross.toolchain.base">
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.1064018737" name="Architecture" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.architecture" value="ilg.gnuarmeclipse.managedbuild.cross.option.architecture.arm" valueType="enumerated"/>
@@ -687,6 +687,7 @@
 									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S/fsfw}&quot;"/>
 								</option>
 								<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1331264991" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
 							</tool>
@@ -698,6 +699,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/linux/fsfwconfig}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S/fsfw}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1143219558" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LINUX=1"/>
@@ -714,6 +716,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/build-Debug-Q7S/fsfw}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.1199844227" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LINUX=1"/>
@@ -745,7 +748,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="build-Debug-Host|build-Watchdog-Debug" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -755,6 +758,7 @@
 		<cconfiguration id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894" moduleId="org.eclipse.cdt.core.settings" name="eive-q7s-release">
 				<macros>
+					<stringMacro name="Q7S_SYSROOT_UNIX" type="VALUE_TEXT" value="${HOME}/Xilinx/cortexa9hf-neon-xiphos-linux-gnueabi"/>
 					<stringMacro name="Q7S_SYSROOT" type="VALUE_TEXT" value="C:\Xilinx\cortexa9hf-neon-xiphos-linux-gnueabi"/>
 				</macros>
 				<externalSettings/>
@@ -818,8 +822,8 @@
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto.420747124" name="Link-time optimizer (-flto)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.lto"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants.743473065" name="Disable loop invariant move (-fno-move-loop-invariants)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.nomoveloopinvariants"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.other.1937642597" name="Other optimization flags" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.optimization.other"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.2006936773" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="Custom" valueType="string"/>
-							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id.42890232" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id" value="2029746065" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name.2006936773" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.name" value="Linaro ARMv7 Linux GNU EABI HF" valueType="string"/>
+							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id.42890232" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.toolchain.id" value="4014586055" valueType="string"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.syntaxonly.1649131445" name="Check syntax only (-fsyntax-only)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.syntaxonly"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedantic.1978386125" name="Pedantic (-pedantic)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedantic"/>
 							<option id="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedanticerrors.1857256861" name="Pedantic warnings as errors (-pedantic-errors)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.warnings.pedanticerrors"/>
@@ -859,12 +863,11 @@
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.2002501811" name="GNU Arm Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.1810457326" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive_obsw}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/linux/fsfwconfig}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs.1774225921" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LINUX=1"/>
@@ -873,12 +876,11 @@
 							</tool>
 							<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.281959373" name="GNU Arm Cross C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.1282228801" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive_obsw}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${Q7S_SYSROOT_UNIX}/usr/include&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/inc}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/linux/fsfwconfig}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/src}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw/fsfw/hal/src}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/eive-obsw}&quot;"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs.41651526" name="Defined symbols (-D)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.defs" useByScannerDiscovery="true" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="LINUX=1"/>
@@ -910,7 +912,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="build-Debug-Host|build-Watchdog-Debug" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -1533,9 +1535,18 @@
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.447898075;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.447898075.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1522927967;cdt.managedbuild.tool.gnu.cpp.compiler.input.305765911">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.628631287;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.216437361">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1405808772;cdt.managedbuild.tool.gnu.cpp.compiler.input.1960112549">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.;cdt.managedbuild.tool.gnu.c.compiler.base.1946711528;cdt.managedbuild.tool.gnu.c.compiler.input.584209663">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.2044466190;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1551006500">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.2065184927;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.920837857">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
@@ -1551,42 +1562,6 @@
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1775596945;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1775596945.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1154394228;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1228307894">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.1043649249;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.1043649249.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.539225324;cdt.managedbuild.tool.gnu.cpp.compiler.input.1848997248">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.193772074;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.2081570054">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.397223006;cdt.managedbuild.tool.gnu.c.compiler.input.1482659499">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.775472168;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.775472168.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1191599857;cdt.managedbuild.tool.gnu.cpp.compiler.input.1443212512">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1031020513;cdt.managedbuild.toolchain.gnu.mingw.base.1031020513.519944638;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.438317679;cdt.managedbuild.tool.gnu.c.compiler.input.336445831">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.2002501811;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1316209993">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.646655988;cdt.managedbuild.tool.gnu.cpp.compiler.input.1437856797">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1992099127;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.234631061">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.628631287;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.216437361">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.715561087;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1004720080">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.;cdt.managedbuild.tool.gnu.c.compiler.base.1946711528;cdt.managedbuild.tool.gnu.c.compiler.input.584209663">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.2044466190;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1551006500">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1535302916;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.96000231">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
@@ -1599,16 +1574,25 @@
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.364559455;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.364559455.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.1970346305;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.2096585345">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.1043649249;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.1043649249.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.539225324;cdt.managedbuild.tool.gnu.cpp.compiler.input.1848997248">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.447898075;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.447898075.;cdt.managedbuild.tool.gnu.c.compiler.base.623389075;cdt.managedbuild.tool.gnu.c.compiler.input.1382191457">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874.1323243318;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874.1323243318.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1358447993;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1822075528">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.190921171.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.193772074;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.2081570054">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.775472168;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.775472168.;cdt.managedbuild.tool.gnu.c.compiler.base.1565023847;cdt.managedbuild.tool.gnu.c.compiler.input.1227677208">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.397223006;cdt.managedbuild.tool.gnu.c.compiler.input.1482659499">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874.1323243318;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1631077874.1323243318.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.449221513;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1048106331">
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1031020513;cdt.managedbuild.toolchain.gnu.mingw.base.1031020513.519944638;cdt.managedbuild.tool.gnu.c.compiler.mingw.base.438317679;cdt.managedbuild.tool.gnu.c.compiler.input.336445831">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.1707795689.1939781894.;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.2002501811;ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.1316209993">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.646655988;cdt.managedbuild.tool.gnu.cpp.compiler.input.1437856797">
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851;cdt.managedbuild.toolchain.gnu.mingw.base.1455833186.1840876443.2117915473.688890851.;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.1595165802;ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.1925043110">

misc/eclipse/.project

@@ -7,7 +7,7 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
+			<triggers>full,incremental,</triggers>
 			<arguments>
 			</arguments>
 		</buildCommand>

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();
@@ -194,82 +201,84 @@ void ACUHandler::parseHkTableReply(const uint8_t *packet) {
 
 ReturnValue_t ACUHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                   LocalDataPoolManager &poolManager) {
-  localDataPoolMap.emplace(P60System::ACU_CURRENT_IN_CHANNEL0, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_CURRENT_IN_CHANNEL1, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_CURRENT_IN_CHANNEL2, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_CURRENT_IN_CHANNEL3, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_CURRENT_IN_CHANNEL4, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_CURRENT_IN_CHANNEL5, new PoolEntry<int16_t>({0}));
+  using namespace P60System;
+  localDataPoolMap.emplace(pool::ACU_CURRENT_IN_CHANNEL0, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_CURRENT_IN_CHANNEL1, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_CURRENT_IN_CHANNEL2, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_CURRENT_IN_CHANNEL3, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_CURRENT_IN_CHANNEL4, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_CURRENT_IN_CHANNEL5, new PoolEntry<int16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_VOLTAGE_IN_CHANNEL0, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VOLTAGE_IN_CHANNEL1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VOLTAGE_IN_CHANNEL2, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VOLTAGE_IN_CHANNEL3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VOLTAGE_IN_CHANNEL4, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VOLTAGE_IN_CHANNEL5, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VOLTAGE_IN_CHANNEL0, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VOLTAGE_IN_CHANNEL1, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VOLTAGE_IN_CHANNEL2, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VOLTAGE_IN_CHANNEL3, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VOLTAGE_IN_CHANNEL4, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VOLTAGE_IN_CHANNEL5, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VBAT, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VCC, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBAT, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_TEMPERATURE_1, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_TEMPERATURE_2, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_TEMPERATURE_3, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_TEMPERATURE_1, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_TEMPERATURE_2, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_TEMPERATURE_3, new PoolEntry<int16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_MPPT_MODE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_MPPT_MODE, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_VBOOST_CHANNEL0, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VBOOST_CHANNEL1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VBOOST_CHANNEL2, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VBOOST_CHANNEL3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VBOOST_CHANNEL4, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_VBOOST_CHANNEL5, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBOOST_CHANNEL0, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBOOST_CHANNEL1, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBOOST_CHANNEL2, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBOOST_CHANNEL3, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBOOST_CHANNEL4, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_VBOOST_CHANNEL5, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_POWER_CHANNEL0, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_POWER_CHANNEL1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_POWER_CHANNEL2, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_POWER_CHANNEL3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_POWER_CHANNEL4, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_POWER_CHANNEL5, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_POWER_CHANNEL0, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_POWER_CHANNEL1, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_POWER_CHANNEL2, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_POWER_CHANNEL3, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_POWER_CHANNEL4, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_POWER_CHANNEL5, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_DAC_EN_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_EN_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_EN_2, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_EN_0, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_EN_1, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_EN_2, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_DAC_RAW_0, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_RAW_1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_RAW_2, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_RAW_3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_RAW_4, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DAC_RAW_5, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_RAW_0, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_RAW_1, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_RAW_2, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_RAW_3, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_RAW_4, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DAC_RAW_5, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_BOOTCNT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_UPTIME, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_RESET_CAUSE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_MPPT_TIME, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_MPPT_PERIOD, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_BOOTCNT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_UPTIME, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_RESET_CAUSE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_MPPT_TIME, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_MPPT_PERIOD, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_4, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_5, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_7, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_0, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_1, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_2, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_3, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_4, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_5, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_6, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_7, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::ACU_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::ACU_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::ACU_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
 
+  poolManager.subscribeForPeriodicPacket(acuHkTableDataset.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

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;
 

mission/devices/BpxBatteryHandler.cpp

@@ -270,10 +270,7 @@ ReturnValue_t BpxBatteryHandler::initializeLocalDataPool(localpool::DataPool& lo
   localDataPoolMap.emplace(BpxBattery::BATTERY_HEATER_MODE, &battheatMode);
   localDataPoolMap.emplace(BpxBattery::BATTHEAT_LOW_LIMIT, &battheatLow);
   localDataPoolMap.emplace(BpxBattery::BATTHEAT_HIGH_LIMIT, &battheatHigh);
-
-#if OBSW_ENABLE_PERIODIC_HK == 1
-  poolManager.subscribeForPeriodicPacket(hkSet.getSid(), true, 1.0, false);
-#endif
+  poolManager.subscribeForPeriodicPacket(hkSet.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

mission/devices/GPSHyperionHandler.cpp

@@ -169,7 +169,7 @@ ReturnValue_t GPSHyperionHandler::initializeLocalDataPool(localpool::DataPool &l
   localDataPoolMap.emplace(GpsHyperion::UNIX_SECONDS, new PoolEntry<uint32_t>());
   localDataPoolMap.emplace(GpsHyperion::SATS_IN_USE, new PoolEntry<uint8_t>());
   localDataPoolMap.emplace(GpsHyperion::FIX_MODE, new PoolEntry<uint8_t>());
-  poolManager.subscribeForPeriodicPacket(gpsSet.getSid(), true, 2.0, false);
+  poolManager.subscribeForPeriodicPacket(gpsSet.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

mission/devices/GomspaceDeviceHandler.cpp

@@ -1,26 +1,21 @@
 #include "GomspaceDeviceHandler.h"
 
 #include <common/config/commonObjects.h>
+#include <fsfw/datapool/PoolReadGuard.h>
 
 #include "devicedefinitions/GomSpacePackets.h"
 #include "devicedefinitions/powerDefinitions.h"
 
 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() {}
@@ -362,6 +357,44 @@ ReturnValue_t GomspaceDeviceHandler::setParamCallback(SetParamMessageUnpacker& u
   return HasReturnvaluesIF::RETURN_OK;
 }
 
+ReturnValue_t GomspaceDeviceHandler::initializePduPool(
+    localpool::DataPool& localDataPoolMap, LocalDataPoolManager& poolManager,
+    std::array<uint8_t, PDU::CHANNELS_LEN> initOutEnb) {
+  localDataPoolMap.emplace(P60System::pool::PDU_CURRENTS, new PoolEntry<int16_t>(9));
+  localDataPoolMap.emplace(P60System::pool::PDU_VOLTAGES, new PoolEntry<int16_t>(9));
+
+  localDataPoolMap.emplace(P60System::pool::PDU_VCC, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_VBAT, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_TEMPERATURE, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN, new PoolEntry<uint8_t>(3));
+
+  localDataPoolMap.emplace(P60System::pool::PDU_OUT_ENABLE,
+                           new PoolEntry<uint8_t>(initOutEnb.data(), initOutEnb.size()));
+
+  localDataPoolMap.emplace(P60System::pool::PDU_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_BOOTCNT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_UPTIME, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_RESETCAUSE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_BATT_MODE, new PoolEntry<uint8_t>({0}));
+
+  localDataPoolMap.emplace(P60System::pool::PDU_LATCHUPS, new PoolEntry<uint16_t>(9));
+
+  localDataPoolMap.emplace(P60System::pool::PDU_DEVICES, new PoolEntry<uint8_t>(8));
+  localDataPoolMap.emplace(P60System::pool::PDU_STATUSES, new PoolEntry<uint8_t>(8));
+
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CNT_CSP1, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CNT_CSP2, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CSP_LEFT1, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(P60System::pool::PDU_WDT_CSP_LEFT2, new PoolEntry<uint8_t>({0}));
+  return RETURN_OK;
+}
+
 ReturnValue_t GomspaceDeviceHandler::generateResetWatchdogCmd() {
   WatchdogResetCommand watchdogResetCommand;
   size_t cspPacketLen = 0;
@@ -405,17 +438,116 @@ 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) {
   sif::info << "No printHkTable implementation given.." << std::endl;
   return HasReturnvaluesIF::RETURN_OK;
 }
+
+ReturnValue_t GomspaceDeviceHandler::parsePduHkTable(PDU::PduCoreHk& coreHk, PDU::PduAuxHk& auxHk,
+                                                     const uint8_t* packet) {
+  uint16_t dataOffset = 0;
+  PoolReadGuard pg0(&coreHk);
+  PoolReadGuard pg1(&auxHk);
+  if (pg0.getReadResult() != HasReturnvaluesIF::RETURN_OK or
+      pg1.getReadResult() != HasReturnvaluesIF::RETURN_OK) {
+    sif::warning << "Reading PDU1 datasets failed!" << std::endl;
+    return HasReturnvaluesIF::RETURN_FAILED;
+  }
+  /* Fist 10 bytes contain the gomspace header. Each variable is preceded by the 16-bit table
+   * address. */
+  dataOffset += 12;
+  for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
+    coreHk.currents[idx] = (packet[dataOffset] << 8) | packet[dataOffset + 1];
+    dataOffset += 4;
+  }
+  for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
+    coreHk.voltages[idx] = (packet[dataOffset] << 8) | packet[dataOffset + 1];
+    dataOffset += 4;
+  }
+
+  auxHk.vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  dataOffset += 4;
+  auxHk.vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  dataOffset += 4;
+  coreHk.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  dataOffset += 4;
+
+  for (uint8_t idx = 0; idx < 3; idx++) {
+    auxHk.converterEnable[idx] = packet[dataOffset];
+    dataOffset += 3;
+  }
+
+  for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
+    coreHk.outputEnables[idx] = packet[dataOffset];
+    dataOffset += 3;
+  }
+
+  auxHk.bootcause = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  coreHk.bootcount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.resetcause = *(packet + dataOffset + 1) << 8 | *(packet + dataOffset);
+  dataOffset += 4;
+  coreHk.battMode = *(packet + dataOffset);
+  /* +10 because here begins the second gomspace csp packet */
+  dataOffset += 3 + 10;
+
+  for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
+    auxHk.latchups[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    dataOffset += 4;
+  }
+
+  for (uint8_t idx = 0; idx < PDU::DEVICES_NUM; idx++) {
+    auxHk.deviceTypes[idx] = *(packet + dataOffset);
+    dataOffset += 3;
+  }
+  for (uint8_t idx = 0; idx < PDU::DEVICES_NUM; idx++) {
+    auxHk.devicesStatus[idx] = *(packet + dataOffset);
+    dataOffset += 3;
+  }
+
+  auxHk.gndWdtReboots = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                        *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.i2cWdtReboots = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                        *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.canWdtReboots = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                        *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.csp1WdtReboots = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                         *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.csp2WdtReboots = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                         *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.groundWatchdogSecondsLeft = *(packet + dataOffset) << 24 |
+                                    *(packet + dataOffset + 1) << 16 |
+                                    *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.i2cWatchdogSecondsLeft = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.canWatchdogSecondsLeft = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
+                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
+  dataOffset += 6;
+  auxHk.csp1WatchdogPingsLeft = *(packet + dataOffset);
+  dataOffset += 3;
+  auxHk.csp2WatchdogPingsLeft = *(packet + dataOffset);
+
+  coreHk.setChanged(true);
+  if (not coreHk.isValid()) {
+    coreHk.setValidity(true, true);
+  }
+  if (not auxHk.isValid()) {
+    auxHk.setValidity(true, true);
+  }
+  return RETURN_OK;
+}

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.
@@ -110,6 +110,12 @@ class GomspaceDeviceHandler : public DeviceHandlerBase {
   virtual ReturnValue_t childCommandHook(DeviceCommandId_t cmd, const uint8_t *commandData,
                                          size_t commandDataLen);
 
+  ReturnValue_t parsePduHkTable(PDU::PduCoreHk &coreHk, PDU::PduAuxHk &auxHk,
+                                const uint8_t *packet);
+  ReturnValue_t initializePduPool(localpool::DataPool &localDataPoolMap,
+                                  LocalDataPoolManager &poolManager,
+                                  std::array<uint8_t, PDU::CHANNELS_LEN> initOutEnb);
+
  private:
   SetParamMessageUnpacker setParamCacher;
   /**

mission/devices/GyroADIS1650XHandler.cpp

@@ -363,6 +363,7 @@ ReturnValue_t GyroADIS1650XHandler::initializeLocalDataPool(localpool::DataPool
   localDataPoolMap.emplace(ADIS1650X::FILTER_SETTINGS, new PoolEntry<uint8_t>());
   localDataPoolMap.emplace(ADIS1650X::MSC_CTRL_REGISTER, new PoolEntry<uint16_t>());
   localDataPoolMap.emplace(ADIS1650X::DEC_RATE_REGISTER, new PoolEntry<uint16_t>());
+  poolManager.subscribeForPeriodicPacket(primaryDataset.getSid(), false, 5.0, true);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

mission/devices/HeaterHandler.cpp

@@ -134,7 +134,7 @@ ReturnValue_t HeaterHandler::executeAction(ActionId_t actionId, MessageQueueId_t
   return result;
 }
 
-void HeaterHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const {
+ReturnValue_t HeaterHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) {
   ReturnValue_t result;
   store_address_t storeAddress;
   uint8_t commandData[2];
@@ -164,6 +164,7 @@ void HeaterHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) con
                  << "message" << std::endl;
     }
   }
+  return result;
 }
 
 void HeaterHandler::handleActiveCommands() {
@@ -338,7 +339,7 @@ gpioId_t HeaterHandler::getGpioIdFromSwitchNr(int switchNr) {
 
 MessageQueueId_t HeaterHandler::getCommandQueue() const { return commandQueue->getId(); }
 
-void HeaterHandler::sendFuseOnCommand(uint8_t fuseNr) const {}
+ReturnValue_t HeaterHandler::sendFuseOnCommand(uint8_t fuseNr) { return RETURN_OK; }
 
 ReturnValue_t HeaterHandler::getSwitchState(uint8_t switchNr) const { return 0; }
 

mission/devices/HeaterHandler.h

@@ -43,8 +43,8 @@ class HeaterHandler : public ExecutableObjectIF,
 
   virtual ReturnValue_t performOperation(uint8_t operationCode = 0) override;
 
-  virtual void sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const override;
-  virtual void sendFuseOnCommand(uint8_t fuseNr) const override;
+  virtual ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override;
+  virtual ReturnValue_t sendFuseOnCommand(uint8_t fuseNr) override;
   /**
    * @brief	This function will be called from the Heater object to check
    * 			the current switch state.

mission/devices/IMTQHandler.cpp

@@ -7,7 +7,8 @@
 
 #include "OBSWConfig.h"
 
-IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
+IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
+                         power::Switch_t pwrSwitcher)
     : DeviceHandlerBase(objectId, comIF, comCookie),
       engHkDataset(this),
       calMtmMeasurementSet(this),
@@ -17,7 +18,8 @@ IMTQHandler::IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comC
       posYselfTestDataset(this),
       negYselfTestDataset(this),
       posZselfTestDataset(this),
-      negZselfTestDataset(this) {
+      negZselfTestDataset(this),
+      switcher(pwrSwitcher) {
   if (comCookie == NULL) {
     sif::error << "IMTQHandler: Invalid com cookie" << std::endl;
   }
@@ -118,14 +120,17 @@ ReturnValue_t IMTQHandler::buildCommandFromCommand(DeviceCommandId_t deviceComma
     case (IMTQ::START_ACTUATION_DIPOLE): {
       /* IMTQ expects low byte first */
       commandBuffer[0] = IMTQ::CC::START_ACTUATION_DIPOLE;
-      commandBuffer[1] = *(commandData + 1);
-      commandBuffer[2] = *(commandData);
-      commandBuffer[3] = *(commandData + 3);
-      commandBuffer[4] = *(commandData + 2);
-      commandBuffer[5] = *(commandData + 5);
-      commandBuffer[6] = *(commandData + 4);
-      commandBuffer[7] = *(commandData + 7);
-      commandBuffer[8] = *(commandData + 6);
+      if (commandData == nullptr) {
+        return DeviceHandlerIF::INVALID_COMMAND_PARAMETER;
+      }
+      commandBuffer[1] = commandData[1];
+      commandBuffer[2] = commandData[0];
+      commandBuffer[3] = commandData[3];
+      commandBuffer[4] = commandData[2];
+      commandBuffer[5] = commandData[5];
+      commandBuffer[6] = commandData[4];
+      commandBuffer[7] = commandData[7];
+      commandBuffer[8] = commandData[6];
       rawPacket = commandBuffer;
       rawPacketLen = 9;
       return RETURN_OK;
@@ -599,6 +604,8 @@ ReturnValue_t IMTQHandler::initializeLocalDataPool(localpool::DataPool& localDat
   localDataPoolMap.emplace(IMTQ::FINA_NEG_Z_COIL_Y_TEMPERATURE, new PoolEntry<uint16_t>({0}));
   localDataPoolMap.emplace(IMTQ::FINA_NEG_Z_COIL_Z_TEMPERATURE, new PoolEntry<uint16_t>({0}));
 
+  poolManager.subscribeForPeriodicPacket(engHkDataset.getSid(), false, 10.0, true);
+  poolManager.subscribeForPeriodicPacket(calMtmMeasurementSet.getSid(), false, 10.0, true);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -2173,3 +2180,12 @@ std::string IMTQHandler::makeStepString(const uint8_t step) {
   }
   return stepString;
 }
+
+ReturnValue_t IMTQHandler::getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) {
+  if (switcher != power::NO_SWITCH) {
+    *numberOfSwitches = 1;
+    *switches = &switcher;
+    return RETURN_OK;
+  }
+  return DeviceHandlerBase::NO_SWITCH;
+}

mission/devices/IMTQHandler.h

@@ -12,7 +12,8 @@
  */
 class IMTQHandler : public DeviceHandlerBase {
  public:
-  IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
+  IMTQHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
+              power::Switch_t pwrSwitcher);
   virtual ~IMTQHandler();
 
   /**
@@ -36,6 +37,7 @@ class IMTQHandler : public DeviceHandlerBase {
   uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
   ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
                                         LocalDataPoolManager& poolManager) override;
+  ReturnValue_t getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) override;
 
  private:
   static const uint8_t INTERFACE_ID = CLASS_ID::IMTQ_HANDLER;
@@ -111,6 +113,7 @@ class IMTQHandler : public DeviceHandlerBase {
 
   StartupStep startupStep = StartupStep::COMMAND_SELF_TEST;
 
+  power::Switch_t switcher = power::NO_SWITCH;
   bool selfTestPerformed = false;
 
   /**

mission/devices/Max31865PT1000Handler.cpp

@@ -515,8 +515,7 @@ ReturnValue_t Max31865PT1000Handler::initializeLocalDataPool(localpool::DataPool
   localDataPoolMap.emplace(Max31865Definitions::PoolIds::TEMPERATURE_C,
                            new PoolEntry<float>({0}, 1, true));
   localDataPoolMap.emplace(Max31865Definitions::PoolIds::FAULT_BYTE, new PoolEntry<uint8_t>({0}));
-  //    poolManager.subscribeForPeriodicPacket(sensorDatasetSid,
-  //            false, 4.0, false);
+  poolManager.subscribeForPeriodicPacket(sensorDataset.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

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();
@@ -71,376 +71,202 @@ void P60DockHandler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *
 }
 
 void P60DockHandler::parseHkTableReply(const uint8_t *packet) {
+  using namespace P60Dock;
   uint16_t dataOffset = 0;
-  p60dockHkTableDataset.read();
+  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;
+  }
   /**
    * Fist 10 bytes contain the gomspace header. Each variable is preceded by the 16-bit table
    * address.
    */
   dataOffset += 12;
-  p60dockHkTableDataset.currentAcuVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
+    coreHk.currents[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    dataOffset += 4;
+  }
+  for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
+    coreHk.voltages[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    dataOffset += 4;
+  }
+  for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
+    coreHk.outputEnables[idx] = *(packet + dataOffset);
+    dataOffset += 3;
+  }
+
+  coreHk.temperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.currentPdu1Vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentX3IdleVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentPdu2Vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentAcuVbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentPdu1Vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentX3IdleVbat =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentPdu2Vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentStackVbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentStack3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentStack5V = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentGS3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.currentGS5V = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.temperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
-  p60dockHkTableDataset.voltageAcuVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageAcuVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltagePdu1Vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageX3IdleVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltagePdu2Vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageAcuVbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltagePdu1Vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageX3IdleVbat =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltagePdu2Vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageStackVbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageStack3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageStack5V = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.voltageGS3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
+  auxHk.bootcause = *(packet + dataOffset) << 24 |
 
-  p60dockHkTableDataset.outputEnableStateAcuVcc = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStatePdu1Vcc = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateX3IdleVcc = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStatePdu2Vcc = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateAcuVbat = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStatePdu1Vbat = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateX3IdleVbat = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStatePdu2Vbat = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateStackVbat = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateStack3V3 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateStack5V = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateGS3V3 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.outputEnableStateGS5V = *(packet + dataOffset);
-  dataOffset += 3;
-
-  p60dockHkTableDataset.temperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.temperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  p60dockHkTableDataset.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);
+  if (firstHk) {
+    triggerEvent(P60_BOOT_COUNT, coreHk.bootCount.value);
+  }
   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);
+  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;
-  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;
 
-  p60dockHkTableDataset.latchupsAcuVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  for (uint8_t idx = 0; idx < hk::CHNLS_LEN; idx++) {
+    auxHk.latchups[idx] = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+    dataOffset += 4;
+  }
+
+  auxHk.dockVbatVoltageValue = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.latchupsAcuVcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.dockVccCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.latchupsPdu1Vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.batteryCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.latchupsX3IdleVcc =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsPdu2Vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsAcuVbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsPdu1Vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsX3IdleVbat =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsPdu2Vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsStackVbat =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsStack3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsStack5V = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.latchupsGS3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  coreHk.batteryVoltage = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
-  p60dockHkTableDataset.dockVbatVoltageValue =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.batteryTemperature1 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
-  p60dockHkTableDataset.dockVccCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.batteryCurrent = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.batteryVoltage = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
+  auxHk.batteryTemperature2 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
-  p60dockHkTableDataset.batteryTemperature1 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  p60dockHkTableDataset.batteryTemperature2 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
+  for (uint8_t idx = 0; idx < NUM_DEVS; idx++) {
+    auxHk.devicesType[idx] = *(packet + dataOffset);
+    dataOffset += 3;
+  }
+  for (uint8_t idx = 0; idx < NUM_DEVS; idx++) {
+    auxHk.devicesStatus[idx] = *(packet + dataOffset);
+    dataOffset += 3;
+  }
 
-  p60dockHkTableDataset.device0 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device1 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device2 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device3 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device4 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device5 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device6 = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device7 = *(packet + dataOffset);
+  auxHk.dearmStatus = *(packet + dataOffset);
   dataOffset += 3;
 
-  p60dockHkTableDataset.device0Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device1Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device2Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device3Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device4Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device5Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device6Status = *(packet + dataOffset);
-  dataOffset += 3;
-  p60dockHkTableDataset.device7Status = *(packet + dataOffset);
-  dataOffset += 3;
-
-  p60dockHkTableDataset.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.commit();
+  auxHk.ar6Depl = *(packet + dataOffset);
+  if (firstHk) {
+    firstHk = false;
+  }
+  coreHk.setValidity(true, true);
+  auxHk.setValidity(true, true);
 }
 
 ReturnValue_t P60DockHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                       LocalDataPoolManager &poolManager) {
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_ACU_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_PDU1_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_X3_IDLE_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_PDU2_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_ACU_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_PDU1_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_X3_IDLE_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_PDU2_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_STACK_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_STACK_3V3, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_STACK_5V, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_GS3V3, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CURRENT_GS5V, new PoolEntry<int16_t>({0}));
+  using namespace P60System;
+  localDataPoolMap.emplace(pool::P60_CURRENTS, &hkCurrents);
 
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_ACU_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_PDU1_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_X3_IDLE_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_PDU2_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_ACU_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_PDU1_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_X3_IDLE_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_PDU2_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_STACK_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_STACK_3V3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_STACK_5V, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_GS3V3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VOLTAGE_GS5V, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::P60_VOLTAGES, &hkVoltages);
 
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_ACU_VCC, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU1_VCC, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_X3_IDLE_VCC,
-                           new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU2_VCC, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_ACU_VBAT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU1_VBAT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_X3_IDLE_VBAT,
-                           new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_PDU2_VBAT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_STACK_VBAT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_STACK_3V3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_STACK_5V, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_GS3V3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_OUTPUTENABLE_GS5V, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60_OUTPUT_ENABLE, &outputEnables);
 
-  localDataPoolMap.emplace(P60System::P60DOCK_TEMPERATURE_1, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_TEMPERATURE_2, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_TEMPERATURE_1, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_TEMPERATURE_2, new PoolEntry<int16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_BOOT_CAUSE, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_BOOT_CNT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_UPTIME, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_RESETCAUSE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_BATT_MODE, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_HEATER_ON, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_CONV_5V_ENABLE_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BOOT_CAUSE, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BOOT_CNT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_UPTIME, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_RESETCAUSE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATT_MODE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_HEATER_ON, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_CONV_5V_ENABLE_STATUS, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_ACU_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU1_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_X3_IDLE_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU2_VCC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_ACU_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU1_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_X3_IDLE_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_PDU2_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_STACK_VBAT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_STACK_3V3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_STACK_5V, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_GS3V3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_LATCHUP_GS5V, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::LATCHUPS, &latchups);
 
-  localDataPoolMap.emplace(P60System::P60DOCK_VBAT_VALUE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_VCC_CURRENT_VALUE, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_BATTERY_CURRENT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_BATTERY_VOLTAGE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_DOCK_VBAT, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_DOCK_VCC_CURRENT, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATTERY_CURRENT, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATTERY_VOLTAGE, new PoolEntry<uint16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_BATTERY_TEMPERATURE_1, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_BATTERY_TEMPERATURE_2, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATTERY_TEMPERATURE_1, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATTERY_TEMPERATURE_2, new PoolEntry<int16_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_4, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_5, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_7, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::DEVICES_TYPE, &devicesType);
+  localDataPoolMap.emplace(pool::DEVICES_STATUS, &devicesStatus);
 
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_DEARM_STATUS, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_DEARM_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CNT_CSP_1, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CNT_CSP_2, new PoolEntry<uint32_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CNT_CSP_1, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CNT_CSP_2, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CSP_LEFT_1, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_WDT_CSP_LEFT_2, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CSP_LEFT_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_WDT_CSP_LEFT_2, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::P60DOCK_BATT_CHARGE_CURRENT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_BATT_DISCHARGE_CURRENT, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::P60DOCK_ANT6_DEPL, new PoolEntry<int8_t>({0}));
-  localDataPoolMap.emplace(P60System::P60DOCK_AR6_DEPL, new PoolEntry<int8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATT_CHARGE_CURRENT, new PoolEntry<int16_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_BATT_DISCHARGE_CURRENT, new PoolEntry<int16_t>({0}));
 
+  localDataPoolMap.emplace(pool::P60DOCK_ANT6_DEPL, new PoolEntry<int8_t>({0}));
+  localDataPoolMap.emplace(pool::P60DOCK_AR6_DEPL, new PoolEntry<int8_t>({0}));
+  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, false);
+  poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -448,16 +274,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) {
@@ -474,84 +301,64 @@ 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;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "ACU VCC" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStateAcuVcc.value) << ", " << std::setw(4)
-            << std::right << p60dockHkTableDataset.currentAcuVcc.value << ", " << std::setw(5)
-            << p60dockHkTableDataset.voltageAcuVcc.value << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "ACU VBAT" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStateAcuVbat.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentAcuVbat.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltageAcuVbat.value << std::endl;
+            << std::setw(4) << std::right << coreHk.batteryCurrent.value << ", " << std::setw(5)
+            << coreHk.batteryVoltage.value << std::endl;
 
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU1 VCC" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStatePdu1Vcc.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentPdu1Vcc.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltagePdu1Vcc.value << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU1 VBAT" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStatePdu1Vbat.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentPdu1Vbat.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltagePdu1Vbat.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(coreHk.outputEnables[idx]) << ", " << std::setw(4) << std::right
+              << coreHk.currents[idx] << ", " << std::setw(5) << coreHk.voltages[idx] << std::endl;
+  };
 
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU2 VCC" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStatePdu2Vcc.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentPdu2Vcc.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltagePdu2Vcc.value << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU2 VBAT" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStatePdu2Vbat.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentPdu2Vbat.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltagePdu2Vbat.value << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Stack VBAT" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStateStackVbat.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentStackVbat.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltageStackVbat.value << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Stack 3V3" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStateStack3V3.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentStack3V3.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltageStack3V3.value << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Stack 5V" << std::dec << "| "
-            << unsigned(p60dockHkTableDataset.outputEnableStateStack5V.value) << ", "
-            << std::setw(4) << std::right << p60dockHkTableDataset.currentStack5V.value << ", "
-            << std::setw(5) << p60dockHkTableDataset.voltageStack5V.value << std::endl;
+  genericPrintoutHandler("ACU VCC", hk::ACU_VCC);
+  genericPrintoutHandler("ACU VBAT", hk::ACU_VBAT);
+  genericPrintoutHandler("PDU1 VCC", hk::PDU1_VCC);
+  genericPrintoutHandler("PDU1 VBAT", hk::PDU1_VBAT);
+  genericPrintoutHandler("PDU2 VCC", hk::PDU2_VCC);
+  genericPrintoutHandler("PDU2 VBAT", hk::PDU2_VBAT);
+  genericPrintoutHandler("Stack VBAT", hk::STACK_VBAT);
+  genericPrintoutHandler("Stack 3V3", hk::STACK_3V3);
+  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;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "ACU VCC" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsAcuVcc << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "ACU VBAT" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsAcuVbat << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU1 VCC" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsPdu1Vcc << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU1 VBAT" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsPdu1Vbat << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU2 VCC" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsPdu2Vcc << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PDU2 VBAT" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsPdu2Vbat << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Stack 3V3" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsStack3V3 << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Stack 5V" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsStack5V << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "GS 3V3" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsGS3V3 << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "GS 5V" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsGS5V << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "X3 VBAT" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsX3IdleVbat << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "X3 VCC" << std::dec << "| "
-            << std::setw(4) << std::right << p60dockHkTableDataset.latchupsX3IdleVcc << 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 << auxHk.latchups[idx] << std::endl;
+  };
+  genericPrintoutHandler("ACU VCC", hk::ACU_VCC);
+  genericPrintoutHandler("ACU VBAT", hk::ACU_VBAT);
+  genericPrintoutHandler("PDU1 VCC", hk::PDU1_VCC);
+  genericPrintoutHandler("PDU1 VBAT", hk::PDU1_VBAT);
+  genericPrintoutHandler("PDU2 VCC", hk::PDU2_VCC);
+  genericPrintoutHandler("PDU2 VBAT", hk::PDU2_VBAT);
+  genericPrintoutHandler("STACK VBAT", hk::STACK_VBAT);
+  genericPrintoutHandler("STACK 3V3", hk::STACK_3V3);
+  genericPrintoutHandler("STACK 5V", hk::STACK_5V);
+  genericPrintoutHandler("GS 3V3", hk::GS3V3);
+  genericPrintoutHandler("GS 5V", hk::GS5V);
+  genericPrintoutHandler("X3 VBAT", hk::X3_IDLE_VBAT);
+  genericPrintoutHandler("X3 VCC", hk::X3_IDLE_VCC);
 }

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,15 @@
  */
 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, 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, 2, severity::MEDIUM);
+
   P60DockHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
   virtual ~P60DockHandler();
 
@@ -31,14 +41,24 @@ 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;
+  bool firstHk = true;
   static constexpr uint8_t MAX_CHANNEL_STR_WIDTH = 16;
 
+  PoolEntry<int16_t> hkCurrents = PoolEntry<int16_t>(P60Dock::hk::CHNLS_LEN);
+  PoolEntry<uint16_t> hkVoltages = PoolEntry<uint16_t>(P60Dock::hk::CHNLS_LEN);
+  PoolEntry<uint8_t> outputEnables = PoolEntry<uint8_t>(P60Dock::hk::CHNLS_LEN);
+  PoolEntry<uint16_t> latchups = PoolEntry<uint16_t>(P60Dock::hk::CHNLS_LEN);
+
+  PoolEntry<uint8_t> devicesType = PoolEntry<uint8_t>(P60Dock::NUM_DEVS);
+  PoolEntry<uint8_t> devicesStatus = PoolEntry<uint8_t>(P60Dock::NUM_DEVS);
   /**
    * @brief   Function extracts the hk table information from the received csp packet and stores
    *          the values in the p60dockHkTableDataset.

mission/devices/PCDUHandler.cpp

@@ -11,8 +11,9 @@
 PCDUHandler::PCDUHandler(object_id_t setObjectId, size_t cmdQueueSize)
     : SystemObject(setObjectId),
       poolManager(this, nullptr),
-      pdu2HkTableDataset(this),
-      pdu1HkTableDataset(this),
+      pdu1CoreHk(this),
+      pdu2CoreHk(this),
+      switcherSet(this),
       cmdQueueSize(cmdQueueSize) {
   auto mqArgs = MqArgs(setObjectId, static_cast<void*>(this));
   commandQueue = QueueFactory::instance()->createMessageQueue(
@@ -51,7 +52,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_CORE), 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 +68,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_CORE), this->getObjectId(),
+      commandQueue->getId(), true);
   if (result != RETURN_OK) {
     sif::error << "PCDUHandler::initialize: Failed to subscribe for set update messages from "
                << "PDU1Handler" << std::endl;
@@ -77,9 +80,13 @@ ReturnValue_t PCDUHandler::initialize() {
 }
 
 void PCDUHandler::initializeSwitchStates() {
-  using namespace pcduSwitches;
-  for (uint8_t idx = 0; idx < Switches::NUMBER_OF_SWITCHES; idx++) {
-    switchStates[idx] = INIT_SWITCH_STATES[idx];
+  using namespace pcdu;
+  for (uint8_t idx = 0; idx < NUMBER_OF_SWITCHES; idx++) {
+    if (idx < PDU::CHANNELS_LEN) {
+      switchStates[idx] = INIT_SWITCHES_PDU1[idx];
+    } else {
+      switchStates[idx] = INIT_SWITCHES_PDU2[idx];
+    }
   }
 }
 
@@ -101,11 +108,12 @@ 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)) {
-    updateHkTableDataset(storeId, &pdu2HkTableDataset, &timeStampPdu2HkDataset);
+  if (sid == sid_t(objects::PDU2_HANDLER, static_cast<uint32_t>(P60System::SetIds::PDU_2_CORE))) {
+    updateHkTableDataset(storeId, &pdu2CoreHk, &timeStampPdu2HkDataset);
     updatePdu2SwitchStates();
-  } else if (sid == sid_t(objects::PDU1_HANDLER, PDU1::HK_TABLE_DATA_SET_ID)) {
-    updateHkTableDataset(storeId, &pdu1HkTableDataset, &timeStampPdu1HkDataset);
+  } else if (sid ==
+             sid_t(objects::PDU1_HANDLER, static_cast<uint32_t>(P60System::SetIds::PDU_1_CORE))) {
+    updateHkTableDataset(storeId, &pdu1CoreHk, &timeStampPdu1HkDataset);
     updatePdu1SwitchStates();
   } else {
     sif::error << "PCDUHandler::handleChangedDataset: Invalid sid" << std::endl;
@@ -118,21 +126,19 @@ void PCDUHandler::updateHkTableDataset(store_address_t storeId, LocalPoolDataSet
 
   HousekeepingSnapshot packetUpdate(reinterpret_cast<uint8_t*>(datasetTimeStamp),
                                     sizeof(CCSDSTime::CDS_short), dataset);
-  const uint8_t* packet_ptr = NULL;
-  size_t size;
+  const uint8_t* packet_ptr = nullptr;
+  size_t size = 0;
   result = IPCStore->getData(storeId, &packet_ptr, &size);
   if (result != RETURN_OK) {
     sif::error << "PCDUHandler::updateHkTableDataset: Failed to get data from IPCStore."
                << std::endl;
   }
-  dataset->read();
   result = packetUpdate.deSerialize(&packet_ptr, &size, SerializeIF::Endianness::MACHINE);
   if (result != RETURN_OK) {
     sif::error << "PCDUHandler::updateHkTableDataset: Failed to deserialize received packet "
                   "in hk table dataset"
                << std::endl;
   }
-  dataset->commit();
   result = IPCStore->deleteData(storeId);
   if (result != RETURN_OK) {
     sif::error << "PCDUHandler::updateHkTableDataset: Failed to delete data in IPCStore"
@@ -141,29 +147,32 @@ void PCDUHandler::updateHkTableDataset(store_address_t storeId, LocalPoolDataSet
 }
 
 void PCDUHandler::updatePdu2SwitchStates() {
-  using namespace pcduSwitches;
+  using namespace pcdu;
+  using namespace PDU2;
   GOMSPACE::Pdu pdu = GOMSPACE::Pdu::PDU2;
-  PoolReadGuard rg(&pdu2HkTableDataset);
-  if (rg.getReadResult() == RETURN_OK) {
+  PoolReadGuard rg0(&switcherSet);
+  if (rg0.getReadResult() == RETURN_OK) {
+    for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
+      switcherSet.pdu2Switches[idx] = pdu2CoreHk.outputEnables[idx];
+    }
     MutexGuard mg(pwrMutex);
-    checkAndUpdateSwitch(pdu, Switches::PDU2_CH0_Q7S, pdu2HkTableDataset.outEnabledQ7S.value);
+    checkAndUpdateSwitch(pdu, Switches::PDU2_CH0_Q7S, pdu2CoreHk.outputEnables[Channels::Q7S]);
 
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8,
-                         pdu2HkTableDataset.outEnabledPlPCDUCh1.value);
-    checkAndUpdateSwitch(pdu, Switches::PDU2_CH2_RW_5V,
-                         pdu2HkTableDataset.outEnabledReactionWheels.value);
+                         pdu2CoreHk.outputEnables[Channels::PAYLOAD_PCDU_CH1]);
+    checkAndUpdateSwitch(pdu, Switches::PDU2_CH2_RW_5V, pdu2CoreHk.outputEnables[Channels::RW]);
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V,
-                         pdu2HkTableDataset.outEnabledTCSBoardHeaterIn.value);
+                         pdu2CoreHk.outputEnables[Channels::TCS_HEATER_IN]);
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH4_SUS_REDUNDANT_3V3,
-                         pdu2HkTableDataset.outEnabledSUSRedundant.value);
+                         pdu2CoreHk.outputEnables[Channels::SUS_REDUNDANT]);
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V,
-                         pdu2HkTableDataset.outEnabledDeplMechanism.value);
+                         pdu2CoreHk.outputEnables[Channels::DEPY_MECHANISM]);
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH6_PL_PCDU_BATT_1_14V8,
-                         pdu2HkTableDataset.outEnabledPlPCDUCh6.value);
+                         pdu2CoreHk.outputEnables[Channels::PAYLOAD_PCDU_CH6]);
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH7_ACS_BOARD_SIDE_B_3V3,
-                         pdu2HkTableDataset.outEnabledAcsBoardSideB.value);
+                         pdu2CoreHk.outputEnables[Channels::ACS_B_SIDE]);
     checkAndUpdateSwitch(pdu, Switches::PDU2_CH8_PAYLOAD_CAMERA,
-                         pdu2HkTableDataset.outEnabledPayloadCamera.value);
+                         pdu2CoreHk.outputEnables[Channels::PAYLOAD_CAMERA]);
     if (firstSwitchInfoPdu2) {
       firstSwitchInfoPdu2 = false;
     }
@@ -174,27 +183,32 @@ void PCDUHandler::updatePdu2SwitchStates() {
 }
 
 void PCDUHandler::updatePdu1SwitchStates() {
-  using namespace pcduSwitches;
-  PoolReadGuard rg(&pdu1HkTableDataset);
+  using namespace pcdu;
+  using namespace PDU1;
+  PoolReadGuard rg0(&switcherSet);
   GOMSPACE::Pdu pdu = GOMSPACE::Pdu::PDU1;
-  if (rg.getReadResult() == RETURN_OK) {
+  if (rg0.getReadResult() == RETURN_OK) {
+    for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
+      switcherSet.pdu1Switches[idx] = pdu1CoreHk.outputEnables[idx];
+    }
     MutexGuard mg(pwrMutex);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH0_TCS_BOARD_3V3,
-                         pdu1HkTableDataset.outEnabledTCSBoard3V3.value);
+                         pdu1CoreHk.outputEnables[Channels::TCS_BOARD_3V3]);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH1_SYRLINKS_12V,
-                         pdu1HkTableDataset.outEnabledSyrlinks.value);
+                         pdu1CoreHk.outputEnables[Channels::SYRLINKS]);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH2_STAR_TRACKER_5V,
-                         pdu1HkTableDataset.outEnabledStarTracker.value);
-    checkAndUpdateSwitch(pdu, Switches::PDU1_CH3_MGT_5V, pdu1HkTableDataset.outEnabledMGT.value);
+                         pdu1CoreHk.outputEnables[Channels::STR]);
+    checkAndUpdateSwitch(pdu, Switches::PDU1_CH3_MGT_5V, pdu1CoreHk.outputEnables[Channels::MGT]);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH4_SUS_NOMINAL_3V3,
-                         pdu1HkTableDataset.outEnabledSUSNominal.value);
+                         pdu1CoreHk.outputEnables[Channels::SUS_NOMINAL]);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH5_SOLAR_CELL_EXP_5V,
-                         pdu1HkTableDataset.outEnabledSolarCellExp.value);
-    checkAndUpdateSwitch(pdu, Switches::PDU1_CH6_PLOC_12V, pdu1HkTableDataset.outEnabledPLOC.value);
+                         pdu1CoreHk.outputEnables[Channels::SOL_CELL_EXPERIMENT]);
+    checkAndUpdateSwitch(pdu, Switches::PDU1_CH6_PLOC_12V,
+                         pdu1CoreHk.outputEnables[Channels::PLOC]);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH7_ACS_A_SIDE_3V3,
-                         pdu1HkTableDataset.outEnabledAcsBoardSideA.value);
+                         pdu1CoreHk.outputEnables[Channels::ACS_A_SIDE]);
     checkAndUpdateSwitch(pdu, Switches::PDU1_CH8_UNOCCUPIED,
-                         pdu1HkTableDataset.outEnabledChannel8.value);
+                         pdu1CoreHk.outputEnables[Channels::UNUSED]);
     if (firstSwitchInfoPdu1) {
       firstSwitchInfoPdu1 = false;
     }
@@ -205,8 +219,8 @@ void PCDUHandler::updatePdu1SwitchStates() {
 
 LocalDataPoolManager* PCDUHandler::getHkManagerHandle() { return &poolManager; }
 
-void PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const {
-  using namespace pcduSwitches;
+ReturnValue_t PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) {
+  using namespace pcdu;
   ReturnValue_t result;
   uint16_t memoryAddress = 0;
   size_t parameterValueSize = sizeof(uint8_t);
@@ -214,94 +228,94 @@ void PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const
   GomspaceDeviceHandler* pdu = nullptr;
 
   switch (switchNr) {
-    case pcduSwitches::PDU1_CH0_TCS_BOARD_3V3: {
+    case pcdu::PDU1_CH0_TCS_BOARD_3V3: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_TCS_BOARD_3V3;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH1_SYRLINKS_12V: {
+    case pcdu::PDU1_CH1_SYRLINKS_12V: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_SYRLINKS;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH2_STAR_TRACKER_5V: {
+    case pcdu::PDU1_CH2_STAR_TRACKER_5V: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_STAR_TRACKER;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH3_MGT_5V: {
+    case pcdu::PDU1_CH3_MGT_5V: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_MGT;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH4_SUS_NOMINAL_3V3: {
+    case pcdu::PDU1_CH4_SUS_NOMINAL_3V3: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_SUS_NOMINAL;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH5_SOLAR_CELL_EXP_5V: {
+    case pcdu::PDU1_CH5_SOLAR_CELL_EXP_5V: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_SOLAR_CELL_EXP;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH6_PLOC_12V: {
+    case pcdu::PDU1_CH6_PLOC_12V: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_PLOC;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH7_ACS_A_SIDE_3V3: {
+    case pcdu::PDU1_CH7_ACS_A_SIDE_3V3: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_ACS_BOARD_SIDE_A;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
-    case pcduSwitches::PDU1_CH8_UNOCCUPIED: {
+    case pcdu::PDU1_CH8_UNOCCUPIED: {
       memoryAddress = PDU1::CONFIG_ADDRESS_OUT_EN_CHANNEL8;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU1_HANDLER);
       break;
     }
     // This is a dangerous command. Reject/Igore it for now
-    case pcduSwitches::PDU2_CH0_Q7S: {
-      return;
+    case pcdu::PDU2_CH0_Q7S: {
+      return RETURN_FAILED;
       // memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_Q7S;
       // pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       // break;
     }
-    case pcduSwitches::PDU2_CH1_PL_PCDU_BATT_0_14V8: {
+    case pcdu::PDU2_CH1_PL_PCDU_BATT_0_14V8: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_PAYLOAD_PCDU_CH1;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH2_RW_5V: {
+    case pcdu::PDU2_CH2_RW_5V: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_RW;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V: {
+    case pcdu::PDU2_CH3_TCS_BOARD_HEATER_IN_8V: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_TCS_BOARD_HEATER_IN;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH4_SUS_REDUNDANT_3V3: {
+    case pcdu::PDU2_CH4_SUS_REDUNDANT_3V3: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_SUS_REDUNDANT;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V: {
+    case pcdu::PDU2_CH5_DEPLOYMENT_MECHANISM_8V: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_DEPLOYMENT_MECHANISM;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH6_PL_PCDU_BATT_1_14V8: {
+    case pcdu::PDU2_CH6_PL_PCDU_BATT_1_14V8: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_PAYLOAD_PCDU_CH6;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH7_ACS_BOARD_SIDE_B_3V3: {
+    case pcdu::PDU2_CH7_ACS_BOARD_SIDE_B_3V3: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_ACS_BOARD_SIDE_B;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
     }
-    case pcduSwitches::PDU2_CH8_PAYLOAD_CAMERA: {
+    case pcdu::PDU2_CH8_PAYLOAD_CAMERA: {
       memoryAddress = PDU2::CONFIG_ADDRESS_OUT_EN_PAYLOAD_CAMERA;
       pdu = ObjectManager::instance()->get<GomspaceDeviceHandler>(objects::PDU2_HANDLER);
       break;
@@ -309,7 +323,7 @@ void PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const
 
     default: {
       sif::error << "PCDUHandler::sendSwitchCommand: Invalid switch number " << std::endl;
-      return;
+      return RETURN_FAILED;
     }
   }
 
@@ -322,7 +336,7 @@ void PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const
       break;
     default:
       sif::error << "PCDUHandler::sendSwitchCommand: Invalid state commanded" << std::endl;
-      return;
+      return RETURN_FAILED;
   }
 
   GomspaceSetParamMessage setParamMessage(memoryAddress, &parameterValue, parameterValueSize);
@@ -347,12 +361,13 @@ void PCDUHandler::sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const
     // Can't use trigger event because of const function constraint, but this hack seems to work
     this->forwardEvent(power::SWITCH_CMD_SENT, parameterValue, switchNr);
   }
+  return result;
 }
 
-void PCDUHandler::sendFuseOnCommand(uint8_t fuseNr) const {}
+ReturnValue_t PCDUHandler::sendFuseOnCommand(uint8_t fuseNr) { return RETURN_OK; }
 
 ReturnValue_t PCDUHandler::getSwitchState(uint8_t switchNr) const {
-  if (switchNr >= pcduSwitches::NUMBER_OF_SWITCHES) {
+  if (switchNr >= pcdu::NUMBER_OF_SWITCHES) {
     sif::debug << "PCDUHandler::getSwitchState: Invalid switch number" << std::endl;
     return RETURN_FAILED;
   }
@@ -374,223 +389,10 @@ object_id_t PCDUHandler::getObjectId() const { return SystemObject::getObjectId(
 
 ReturnValue_t PCDUHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
                                                    LocalDataPoolManager& poolManager) {
-  using namespace pcduSwitches;
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_Q7S, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_PAYLOAD_PCDU_CH1,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_RW, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_SUS_REDUNDANT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_PAYLOAD_PCDU_CH6,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_ACS_BOARD_SIDE_B,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_PAYLOAD_CAMERA, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_Q7S, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_PAYLOAD_PCDU_CH1,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_RW, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_SUS_REDUNDANT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_PAYLOAD_PCDU_CH6,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_ACS_BOARD_SIDE_B,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_PAYLOAD_CAMERA, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_TEMPERATURE, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CONV_EN_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CONV_EN_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CONV_EN_3, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_Q7S,
-                           new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH0_Q7S]}));
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_PAYLOAD_PCDU_CH1,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH1_PL_PCDU_BATT_0_14V8]}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_RW,
-                           new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH2_RW_5V]}));
-#ifdef TE0720_1CFA
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_TCS_BOARD_HEATER_IN, new PoolEntry<uint8_t>({1}));
-#else
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_TCS_BOARD_HEATER_IN,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH3_TCS_BOARD_HEATER_IN_8V]}));
-#endif
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_SUS_REDUNDANT,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH4_SUS_REDUNDANT_3V3]}));
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_DEPLOYMENT_MECHANISM,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH5_DEPLOYMENT_MECHANISM_8V]}));
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_PAYLOAD_PCDU_CH6,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH6_PL_PCDU_BATT_1_14V8]}));
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_ACS_BOARD_SIDE_B,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH7_ACS_BOARD_SIDE_B_3V3]}));
-  localDataPoolMap.emplace(
-      P60System::PDU2_OUT_EN_PAYLOAD_CAMERA,
-      new PoolEntry<uint8_t>({INIT_SWITCH_STATES[Switches::PDU2_CH8_PAYLOAD_CAMERA]}));
-
-  localDataPoolMap.emplace(P60System::PDU2_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_BOOTCNT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_UPTIME, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_RESETCAUSE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_BATT_MODE, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_Q7S, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_PAYLOAD_PCDU_CH1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_RW, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_SUS_REDUNDANT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_PAYLOAD_PCDU_CH6, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_ACS_BOARD_SIDE_B, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_PAYLOAD_CAMERA, new PoolEntry<uint16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_4, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_5, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_7, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_CSP1, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_CSP2, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CSP_LEFT1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CSP_LEFT2, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_TCS_BOARD_3V3, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_SYRLINKS, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_STAR_TRACKER, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_MGT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_SUS_NOMINAL, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_SOLAR_CELL_EXP, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_PLOC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_ACS_BOARD_SIDE_A,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_CHANNEL8, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_TCS_BOARD_3V3,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH0_TCS_BOARD_3V3]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_SYRLINKS,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH1_SYRLINKS_12V]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_STAR_TRACKER,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH2_STAR_TRACKER_5V]}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_MGT,
-                           new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH3_MGT_5V]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_SUS_NOMINAL,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH4_SUS_NOMINAL_3V3]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_SOLAR_CELL_EXP,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH5_SOLAR_CELL_EXP_5V]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_PLOC,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH6_PLOC_12V]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_ACS_BOARD_SIDE_A,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH7_ACS_A_SIDE_3V3]}));
-  localDataPoolMap.emplace(
-      P60System::PDU1_VOLTAGE_OUT_CHANNEL8,
-      new PoolEntry<int16_t>({INIT_SWITCH_STATES[Switches::PDU1_CH8_UNOCCUPIED]}));
-
-  localDataPoolMap.emplace(P60System::PDU1_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_TEMPERATURE, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CONV_EN_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CONV_EN_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CONV_EN_3, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_TCS_BOARD_3V3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_SYRLINKS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_STAR_TRACKER, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_MGT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_SUS_NOMINAL, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_SOLAR_CELL_EXP, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_PLOC, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_ACS_BOARD_SIDE_A, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_CHANNEL8, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_BOOTCNT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_UPTIME, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_RESETCAUSE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_BATT_MODE, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_TCS_BOARD_3V3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_SYRLINKS, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_STAR_TRACKER, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_MGT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_SUS_NOMINAL, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_SOLAR_CELL_EXP, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_PLOC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_ACS_BOARD_SIDE_A, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_CHANNEL8, new PoolEntry<uint16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_4, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_5, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_7, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_CSP1, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_CSP2, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CSP_LEFT1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CSP_LEFT2, new PoolEntry<uint8_t>({0}));
-
+  using namespace pcdu;
+  localDataPoolMap.emplace(PoolIds::PDU1_SWITCHES, &pdu1Switches);
+  localDataPoolMap.emplace(PoolIds::PDU2_SWITCHES, &pdu2Switches);
+  poolManager.subscribeForPeriodicPacket(switcherSet.getSid(), false, 5.0, true);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -610,17 +412,17 @@ uint32_t PCDUHandler::getPeriodicOperationFrequency() const { return pstInterval
 void PCDUHandler::setTaskIF(PeriodicTaskIF* task) { executingTask = task; }
 
 LocalPoolDataSetBase* PCDUHandler::getDataSetHandle(sid_t sid) {
-  if (sid == pdu2HkTableDataset.getSid()) {
-    return &pdu2HkTableDataset;
+  if (sid == switcherSet.getSid()) {
+    return &switcherSet;
   } else {
     sif::error << "PCDUHandler::getDataSetHandle: Invalid sid" << std::endl;
     return nullptr;
   }
 }
 
-void PCDUHandler::checkAndUpdateSwitch(GOMSPACE::Pdu pdu, pcduSwitches::Switches switchIdx,
+void PCDUHandler::checkAndUpdateSwitch(GOMSPACE::Pdu pdu, pcdu::Switches switchIdx,
                                        uint8_t setValue) {
-  using namespace pcduSwitches;
+  using namespace pcdu;
   if (switchStates[switchIdx] != setValue) {
 #if OBSW_INITIALIZE_SWITCHES == 1
     // This code initializes the switches to the default init switch states on every reboot.

mission/devices/PCDUHandler.h

@@ -2,6 +2,7 @@
 #define MISSION_DEVICES_PCDUHANDLER_H_
 
 #include <devices/powerSwitcherList.h>
+#include <fsfw/datapool/PoolEntry.h>
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>
 #include <fsfw/objectmanager/SystemObject.h>
 #include <fsfw/power/PowerSwitchIF.h>
@@ -33,8 +34,8 @@ class PCDUHandler : public PowerSwitchIF,
                                     store_address_t storeId = storeId::INVALID_STORE_ADDRESS,
                                     bool* clearMessage = nullptr) override;
 
-  virtual void sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) const override;
-  virtual void sendFuseOnCommand(uint8_t fuseNr) const override;
+  virtual ReturnValue_t sendSwitchCommand(uint8_t switchNr, ReturnValue_t onOff) override;
+  virtual ReturnValue_t sendFuseOnCommand(uint8_t fuseNr) override;
   virtual ReturnValue_t getSwitchState(uint8_t switchNr) const override;
   virtual ReturnValue_t getFuseState(uint8_t fuseNr) const override;
   virtual uint32_t getSwitchDelayMs(void) const override;
@@ -56,21 +57,29 @@ class PCDUHandler : public PowerSwitchIF,
   /** Housekeeping manager. Handles updates of local pool variables. */
   LocalDataPoolManager poolManager;
 
+  /** Hk table dataset of PDU1 */
+  PDU1::Pdu1CoreHk pdu1CoreHk;
   /**
    * The dataset holding the hk table of PDU2. This dataset is a copy of the PDU2 HK dataset
    * of the PDU2Handler. Each time the PDU2Handler updates his HK dataset, a copy is sent
    * to this object via a HousekeepingMessage.
    */
-  PDU2::PDU2HkTableDataset pdu2HkTableDataset;
+  PDU2::Pdu2CoreHk pdu2CoreHk;
+
+  pcdu::SwitcherStates switcherSet;
+
+  PoolEntry<uint8_t> pdu1Switches =
+      PoolEntry<uint8_t>(pcdu::INIT_SWITCHES_PDU1.data(), pcdu::INIT_SWITCHES_PDU1.size());
+  PoolEntry<uint8_t> pdu2Switches =
+      PoolEntry<uint8_t>(pcdu::INIT_SWITCHES_PDU2.data(), pcdu::INIT_SWITCHES_PDU2.size());
+
   /** The timeStamp of the current pdu2HkTableDataset */
   CCSDSTime::CDS_short timeStampPdu2HkDataset;
 
-  /** Hk table dataset of PDU1 */
-  PDU1::PDU1HkTableDataset pdu1HkTableDataset;
   /** The timeStamp of the current pdu1HkTableDataset */
   CCSDSTime::CDS_short timeStampPdu1HkDataset;
 
-  uint8_t switchStates[pcduSwitches::NUMBER_OF_SWITCHES];
+  uint8_t switchStates[pcdu::NUMBER_OF_SWITCHES];
   /**
    * Pointer to the IPCStore.
    * This caches the pointer received from the objectManager in the constructor.
@@ -119,7 +128,7 @@ class PCDUHandler : public PowerSwitchIF,
    */
   void updateHkTableDataset(store_address_t storeId, LocalPoolDataSetBase* dataset,
                             CCSDSTime::CDS_short* datasetTimeStamp);
-  void checkAndUpdateSwitch(GOMSPACE::Pdu pdu, pcduSwitches::Switches switchIdx, uint8_t setValue);
+  void checkAndUpdateSwitch(GOMSPACE::Pdu pdu, pcdu::Switches switchIdx, uint8_t setValue);
 };
 
 #endif /* MISSION_DEVICES_PCDUHANDLER_H_ */

mission/devices/PDU1Handler.cpp

@@ -3,13 +3,13 @@
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <mission/devices/devicedefinitions/GomSpacePackets.h>
 
-#include "OBSWConfig.h"
+#include "devices/powerSwitcherList.h"
 
 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),
-      pdu1HkTableDataset(this) {}
+                            PDU::MAX_HKTABLE_ADDRESS, PDU::HK_TABLE_REPLY_SIZE),
+      coreHk(this),
+      auxHk(this) {}
 
 PDU1Handler::~PDU1Handler() {}
 
@@ -20,52 +20,7 @@ ReturnValue_t PDU1Handler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
 
 void PDU1Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *packet) {
   parseHkTableReply(packet);
-  handleDeviceTM(&pdu1HkTableDataset, id, true);
-
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PDU1 == 1
-  pdu1HkTableDataset.read();
-  sif::info << "PDU1 TCS Board voltage: " << pdu1HkTableDataset.voltageOutTCSBoard3V3 << std::endl;
-  sif::info << "PDU1 Syrlinks voltage: " << pdu1HkTableDataset.voltageOutSyrlinks << std::endl;
-  sif::info << "PDU1 star tracker voltage: " << pdu1HkTableDataset.voltageOutStarTracker
-            << std::endl;
-  sif::info << "PDU1 MGT voltage: " << pdu1HkTableDataset.voltageOutMGT << std::endl;
-  sif::info << "PDU1 SUS nominal voltage: " << pdu1HkTableDataset.voltageOutSUSNominal << std::endl;
-  sif::info << "PDU1 solar cell experiment voltage: " << pdu1HkTableDataset.voltageOutSolarCellExp
-            << std::endl;
-  sif::info << "PDU1 PLOC voltage: " << pdu1HkTableDataset.voltageOutPLOC << std::endl;
-  sif::info << "PDU1 ACS Side A voltage: " << pdu1HkTableDataset.voltageOutACSBoardSideA
-            << std::endl;
-  sif::info << "PDU1 channel 8 voltage: " << pdu1HkTableDataset.voltageOutACSBoardSideA
-            << std::endl;
-
-  sif::info << "PDU1 TCS Board current: " << pdu1HkTableDataset.currentOutTCSBoard3V3 << std::endl;
-  sif::info << "PDU1 Syrlinks current: " << pdu1HkTableDataset.currentOutSyrlinks << std::endl;
-  sif::info << "PDU1 star tracker current: " << pdu1HkTableDataset.currentOutStarTracker
-            << std::endl;
-  sif::info << "PDU1 MGT current: " << pdu1HkTableDataset.currentOutMGT << std::endl;
-  sif::info << "PDU1 SUS nominal current: " << pdu1HkTableDataset.currentOutSUSNominal << std::endl;
-  sif::info << "PDU1 solar cell experiment current: " << pdu1HkTableDataset.currentOutSolarCellExp
-            << std::endl;
-  sif::info << "PDU1 PLOC current: " << pdu1HkTableDataset.currentOutPLOC << std::endl;
-  sif::info << "PDU1 ACS Side A current: " << pdu1HkTableDataset.currentOutACSBoardSideA
-            << std::endl;
-  sif::info << "PDU1 channel 8 current: " << pdu1HkTableDataset.currentOutChannel8 << std::endl;
-  printOutputSwitchStates();
-  sif::info << "PDU1 battery mode: " << static_cast<unsigned int>(pdu1HkTableDataset.battMode.value)
-            << std::endl;
-  sif::info << "PDU1 VCC: " << pdu1HkTableDataset.vcc << " mV" << std::endl;
-  float vbat = pdu1HkTableDataset.vbat.value * 0.001;
-  sif::info << "PDU1 VBAT: " << vbat << "V" << std::endl;
-  float temperatureC = pdu1HkTableDataset.temperature.value * 0.1;
-  sif::info << "PDU1 Temperature: " << temperatureC << " °C" << std::endl;
-  sif::info << "PDU1 csp1 watchdog pings before reboot: "
-            << static_cast<unsigned int>(pdu1HkTableDataset.csp1WatchdogPingsLeft.value)
-            << std::endl;
-  sif::info << "PDU1 csp2 watchdog pings before reboot: "
-            << static_cast<unsigned int>(pdu1HkTableDataset.csp2WatchdogPingsLeft.value)
-            << std::endl;
-  pdu1HkTableDataset.commit();
-#endif
+  handleDeviceTM(&coreHk, id, true);
 }
 
 void PDU1Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, void *args) {
@@ -124,305 +79,31 @@ ReturnValue_t PDU1Handler::setParamCallback(SetParamMessageUnpacker &unpacker,
 }
 
 void PDU1Handler::parseHkTableReply(const uint8_t *packet) {
-  uint16_t dataOffset = 0;
-  PoolReadGuard pg(&pdu1HkTableDataset);
-  ReturnValue_t readResult = pg.getReadResult();
-  if (readResult != HasReturnvaluesIF::RETURN_OK) {
-    sif::warning << "Reading PDU1 HK table failed!" << std::endl;
-    return;
-  }
-  /* Fist 10 bytes contain the gomspace header. Each variable is preceded by the 16-bit table
-   * address. */
-  dataOffset += 12;
-  pdu1HkTableDataset.currentOutTCSBoard3V3 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutSyrlinks = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutStarTracker =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutMGT = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutSUSNominal =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutSolarCellExp =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutPLOC = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutACSBoardSideA =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.currentOutChannel8 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu1HkTableDataset.voltageOutTCSBoard3V3 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutSyrlinks = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutStarTracker =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutMGT = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutSUSNominal =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutSolarCellExp =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutPLOC = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutACSBoardSideA =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.voltageOutChannel8 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu1HkTableDataset.vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu1HkTableDataset.converterEnable1 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.converterEnable2 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.converterEnable3 = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu1HkTableDataset.outEnabledTCSBoard3V3 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledSyrlinks = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledStarTracker = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledMGT = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledSUSNominal = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledSolarCellExp = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledPLOC = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledAcsBoardSideA = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.outEnabledChannel8 = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu1HkTableDataset.bootcause = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.bootcount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                              *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.resetcause = *(packet + dataOffset + 1) << 8 | *(packet + dataOffset);
-  dataOffset += 4;
-  pdu1HkTableDataset.battMode = *(packet + dataOffset);
-  /* +10 because here begins the second gomspace csp packet */
-  dataOffset += 3 + 10;
-
-  pdu1HkTableDataset.latchupsTcsBoard3V3 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsSyrlinks = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsStarTracker = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsMgt = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsSusNominal = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsSolarCellExp =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsPloc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsAcsBoardSideA =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu1HkTableDataset.latchupsChannel8 = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu1HkTableDataset.device0 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device1 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device2 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device3 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device4 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device5 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device6 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device7 = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu1HkTableDataset.device0Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device1Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device2Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device3Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device4Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device5Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device6Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.device7Status = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu1HkTableDataset.gndWdtReboots = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.i2cWdtReboots = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.canWdtReboots = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.csp1WdtReboots = *(packet + dataOffset) << 24 |
-                                      *(packet + dataOffset + 1) << 16 |
-                                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.csp2WdtReboots = *(packet + dataOffset) << 24 |
-                                      *(packet + dataOffset + 1) << 16 |
-                                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.groundWatchdogSecondsLeft =
-      *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.i2cWatchdogSecondsLeft =
-      *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.canWatchdogSecondsLeft =
-      *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu1HkTableDataset.csp1WatchdogPingsLeft = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu1HkTableDataset.csp2WatchdogPingsLeft = *(packet + dataOffset);
-
-  pdu1HkTableDataset.setChanged(true);
-  if (not pdu1HkTableDataset.isValid()) {
-    pdu1HkTableDataset.setValidity(true, true);
-  }
+  GomspaceDeviceHandler::parsePduHkTable(coreHk, auxHk, packet);
 }
 
 ReturnValue_t PDU1Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                    LocalDataPoolManager &poolManager) {
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_TCS_BOARD_3V3, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_SYRLINKS, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_STAR_TRACKER, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_MGT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_SUS_NOMINAL, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_SOLAR_CELL_EXP, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_PLOC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_ACS_BOARD_SIDE_A,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CURRENT_OUT_CHANNEL8, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_TCS_BOARD_3V3, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_SYRLINKS, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_STAR_TRACKER, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_MGT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_SUS_NOMINAL, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_SOLAR_CELL_EXP, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_PLOC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_ACS_BOARD_SIDE_A,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VOLTAGE_OUT_CHANNEL8, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_TEMPERATURE, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CONV_EN_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CONV_EN_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_CONV_EN_3, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_TCS_BOARD_3V3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_SYRLINKS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_STAR_TRACKER, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_MGT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_SUS_NOMINAL, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_SOLAR_CELL_EXP, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_PLOC, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_ACS_BOARD_SIDE_A, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_OUT_EN_CHANNEL8, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_BOOTCNT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_UPTIME, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_RESETCAUSE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_BATT_MODE, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_TCS_BOARD_3V3, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_SYRLINKS, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_STAR_TRACKER, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_MGT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_SUS_NOMINAL, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_SOLAR_CELL_EXP, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_PLOC, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_ACS_BOARD_SIDE_A, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_LATCHUP_CHANNEL8, new PoolEntry<uint16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_4, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_5, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_7, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_CSP1, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CNT_CSP2, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CSP_LEFT1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU1_WDT_CSP_LEFT2, new PoolEntry<uint8_t>({0}));
-#if OBSW_ENABLE_PERIODIC_HK == 1
-  poolManager.subscribeForPeriodicPacket(pdu1HkTableDataset.getSid(), false, 0.4, true);
-#endif
+  initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU1);
+  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, true);
+  poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
+LocalPoolDataSetBase *PDU1Handler::getDataSetHandle(sid_t sid) {
+  if (sid == coreHk.getSid()) {
+    return &coreHk;
+  } else if (sid == auxHk.getSid()) {
+    return &auxHk;
+  }
+  return nullptr;
+}
+
 ReturnValue_t PDU1Handler::printStatus(DeviceCommandId_t cmd) {
   ReturnValue_t result = RETURN_OK;
   switch (cmd) {
     case (GOMSPACE::PRINT_SWITCH_V_I): {
-      PoolReadGuard pg(&pdu1HkTableDataset);
+      PoolReadGuard pg(&coreHk);
       result = pg.getReadResult();
       if (result != HasReturnvaluesIF::RETURN_OK) {
         break;
@@ -431,7 +112,7 @@ ReturnValue_t PDU1Handler::printStatus(DeviceCommandId_t cmd) {
       break;
     }
     case (GOMSPACE::PRINT_LATCHUPS): {
-      PoolReadGuard pg(&pdu1HkTableDataset);
+      PoolReadGuard pg(&auxHk);
       result = pg.getReadResult();
       if (result != HasReturnvaluesIF::RETURN_OK) {
         break;
@@ -450,72 +131,46 @@ ReturnValue_t PDU1Handler::printStatus(DeviceCommandId_t cmd) {
 }
 
 void PDU1Handler::printHkTableSwitchVI() {
+  using namespace PDU1;
   sif::info << "PDU1 Info: " << std::endl;
-  sif::info << "Boot Cause: " << pdu1HkTableDataset.bootcause << " | Boot Count: " << std::setw(4)
-            << std::right << pdu1HkTableDataset.bootcount << std::endl;
-  sif::info << "Reset Cause: " << pdu1HkTableDataset.resetcause
-            << " | Battery Mode: " << static_cast<int>(pdu1HkTableDataset.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(30) << std::left << "TCS Board" << std::dec << "| "
-            << unsigned(pdu1HkTableDataset.outEnabledTCSBoard3V3.value) << ", " << std::setw(4)
-            << std::right << pdu1HkTableDataset.currentOutTCSBoard3V3.value << ", " << std::setw(4)
-            << pdu1HkTableDataset.voltageOutTCSBoard3V3.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Syrlinks" << std::dec << "| "
-            << unsigned(pdu1HkTableDataset.outEnabledSyrlinks.value) << ", " << std::setw(4)
-            << std::right << pdu1HkTableDataset.currentOutSyrlinks.value << ", " << std::setw(4)
-            << pdu1HkTableDataset.voltageOutSyrlinks.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Star Tracker" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledStarTracker.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutStarTracker.value << ", "
-            << std::setw(4) << pdu1HkTableDataset.voltageOutStarTracker.value << std::endl;
-  sif::info << std::setw(30) << std::left << "MGT" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledMGT.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutMGT.value << ", "
-            << std::setw(4) << pdu1HkTableDataset.voltageOutMGT.value << std::endl;
-  sif::info << std::setw(30) << std::left << "SuS nominal" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledSUSNominal.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutSUSNominal.value << ", "
-            << std::setw(4) << pdu1HkTableDataset.voltageOutSUSNominal.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Solar Cell Experiment" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledSolarCellExp.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutSolarCellExp.value << ", "
-            << std::setw(4) << pdu1HkTableDataset.voltageOutSolarCellExp.value << std::endl;
-  sif::info << std::setw(30) << std::left << "PLOC" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledPLOC.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutPLOC.value << ", "
-            << std::setw(4) << pdu1HkTableDataset.voltageOutPLOC.value << std::endl;
-  sif::info << std::setw(30) << std::left << "ACS Side A" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledAcsBoardSideA.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutACSBoardSideA.value
-            << ", " << std::setw(4) << pdu1HkTableDataset.voltageOutACSBoardSideA.value
-            << std::endl;
-  sif::info << std::setw(30) << std::left << "Channel 8" << std::dec << "| "
-            << static_cast<unsigned int>(pdu1HkTableDataset.outEnabledChannel8.value) << ", "
-            << std::setw(4) << std::right << pdu1HkTableDataset.currentOutChannel8.value << ", "
-            << std::setw(4) << pdu1HkTableDataset.voltageOutChannel8.value << std::right
-            << std::endl;
+  auto printerHelper = [&](std::string channelStr, Channels idx) {
+    sif::info << std::setw(30) << std::left << channelStr << std::dec << "| "
+              << unsigned(coreHk.outputEnables[idx]) << ", " << std::setw(4) << std::right
+              << coreHk.currents[idx] << ", " << std::setw(4) << coreHk.voltages[idx] << std::endl;
+  };
+
+  printerHelper("TCS Board", Channels::TCS_BOARD_3V3);
+  printerHelper("Syrlinks", Channels::SYRLINKS);
+  printerHelper("Star Tracker", Channels::STR);
+  printerHelper("MGT", Channels::MGT);
+  printerHelper("SUS Nominal", Channels::SUS_NOMINAL);
+  printerHelper("SCEX", Channels::SOL_CELL_EXPERIMENT);
+  printerHelper("PLOC", Channels::PLOC);
+  printerHelper("ACS Board A Side", Channels::ACS_A_SIDE);
+  printerHelper("Channel 8", Channels::UNUSED);
+  printerHelper("Syrlinks", Channels::SYRLINKS);
 }
 
 void PDU1Handler::printHkTableLatchups() {
+  using namespace PDU1;
   sif::info << "PDU1 Latchup Information" << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "TCS Board" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsTcsBoard3V3 << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Syrlinks" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsSyrlinks << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Star Tracker" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsStarTracker << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "MGT" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsMgt << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "SuS Nominal" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsSusNominal << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Solar Cell Experiment" << std::dec
-            << "| " << std::setw(4) << std::right << pdu1HkTableDataset.latchupsSolarCellExp
-            << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "PLOC" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsPloc << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "ACS A Side" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsAcsBoardSideA << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Channel 8" << std::dec << "| "
-            << std::setw(4) << std::right << pdu1HkTableDataset.latchupsChannel8 << std::endl;
+  auto printerHelper = [&](std::string channelStr, Channels idx) {
+    sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "TCS Board" << std::dec << "| "
+              << std::setw(4) << std::right << auxHk.latchups[idx] << std::endl;
+  };
+  printerHelper("TCS Board", Channels::TCS_BOARD_3V3);
+  printerHelper("Syrlinks", Channels::SYRLINKS);
+  printerHelper("Star Tracker", Channels::STR);
+  printerHelper("MGT", Channels::MGT);
+  printerHelper("SUS Nominal", Channels::SUS_NOMINAL);
+  printerHelper("SCEX", Channels::SOL_CELL_EXPERIMENT);
+  printerHelper("PLOC", Channels::PLOC);
+  printerHelper("ACS Board A Side", Channels::ACS_A_SIDE);
+  printerHelper("Channel 8", Channels::UNUSED);
+  printerHelper("Syrlinks", Channels::SYRLINKS);
 }

mission/devices/PDU1Handler.h

@@ -36,14 +36,15 @@ 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:
   static constexpr uint8_t MAX_CHANNEL_STR_WIDTH = 24;
 
   /** Dataset for the housekeeping table of the PDU1 */
-  PDU1::PDU1HkTableDataset pdu1HkTableDataset;
+  PDU1::Pdu1CoreHk coreHk;
+  PDU1::Pdu1AuxHk auxHk;
   GOMSPACE::ChannelSwitchHook channelSwitchHook = nullptr;
   void* hookArgs = nullptr;
 

mission/devices/PDU2Handler.cpp

@@ -3,13 +3,13 @@
 #include <fsfw/datapool/PoolReadGuard.h>
 #include <mission/devices/devicedefinitions/GomSpacePackets.h>
 
-#include "OBSWConfig.h"
+#include "devices/powerSwitcherList.h"
 
 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),
-      pdu2HkTableDataset(this) {}
+                            PDU::MAX_HKTABLE_ADDRESS, PDU::HK_TABLE_REPLY_SIZE),
+      coreHk(this),
+      auxHk(this) {}
 
 PDU2Handler::~PDU2Handler() {}
 
@@ -24,29 +24,7 @@ void PDU2Handler::letChildHandleHkReply(DeviceCommandId_t id, const uint8_t *pac
    * Hk table will be sent to the commander if hk table request was not triggered by the
    * PDU2Handler itself.
    */
-  handleDeviceTM(&pdu2HkTableDataset, id, true);
-
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_PDU2 == 1
-  pdu2HkTableDataset.read();
-  sif::info << "PDU2 Q7S current voltage: " << pdu2HkTableDataset.voltageOutQ7S << " mV"
-            << std::endl;
-  sif::info << "PDU2 VCC: " << pdu2HkTableDataset.vcc << " mV" << std::endl;
-  float vbat = pdu2HkTableDataset.vbat.value * 0.1;
-  sif::info << "PDU2 VBAT: " << vbat << std::endl;
-  float temperatureC = pdu2HkTableDataset.temperature.value * 0.1;
-  sif::info << "PDU2 Temperature: " << temperatureC << " °C" << std::endl;
-  printOutputSwitchStates();
-  sif::info << "PDU2 uptime: " << pdu2HkTableDataset.uptime << " seconds" << std::endl;
-  sif::info << "PDU2 battery mode: " << unsigned(pdu2HkTableDataset.battMode.value) << std::endl;
-  sif::info << "PDU2 ground watchdog reboots: " << pdu2HkTableDataset.gndWdtReboots << std::endl;
-  sif::info << "PDU2 ground watchdog timer seconds left: "
-            << pdu2HkTableDataset.groundWatchdogSecondsLeft << " seconds" << std::endl;
-  sif::info << "PDU2 csp1 watchdog pings before reboot: "
-            << unsigned(pdu2HkTableDataset.csp1WatchdogPingsLeft.value) << std::endl;
-  sif::info << "PDU2 csp2 watchdog pings before reboot: "
-            << unsigned(pdu2HkTableDataset.csp2WatchdogPingsLeft.value) << std::endl;
-  pdu2HkTableDataset.commit();
-#endif
+  handleDeviceTM(&coreHk, id, true);
 }
 
 void PDU2Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, void *args) {
@@ -54,319 +32,24 @@ void PDU2Handler::assignChannelHookFunction(GOMSPACE::ChannelSwitchHook hook, vo
   this->hookArgs = args;
 }
 
+LocalPoolDataSetBase *PDU2Handler::getDataSetHandle(sid_t sid) {
+  if (sid == coreHk.getSid()) {
+    return &coreHk;
+  } else if (sid == auxHk.getSid()) {
+    return &auxHk;
+  }
+  return nullptr;
+}
+
 void PDU2Handler::parseHkTableReply(const uint8_t *packet) {
-  uint16_t dataOffset = 0;
-  pdu2HkTableDataset.read();
-  /**
-   * Fist 10 bytes contain the gomspace header. Each variable is preceded by the 16-bit table
-   * address.
-   */
-  dataOffset += 12;
-  pdu2HkTableDataset.currentOutQ7S = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutPayloadPCDUCh1 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutReactionWheels =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutTCSBoardHeaterIn =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutSUSRedundant =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutDeplMechanism =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutPayloadPCDUCh6 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutACSBoardSideB =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.currentOutPayloadCamera =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu2HkTableDataset.voltageOutQ7S = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutPayloadPCDUCh1 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutReactionWheels =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutTCSBoardHeaterIn =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutSUSRedundant =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutDeplMechanism =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutPayloadPCDUCh6 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutACSBoardSideB =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.voltageOutPayloadCamera =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu2HkTableDataset.vcc = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.vbat = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu2HkTableDataset.converterEnable1 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.converterEnable2 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.converterEnable3 = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu2HkTableDataset.outEnabledQ7S = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledPlPCDUCh1 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledReactionWheels = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledTCSBoardHeaterIn = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledSUSRedundant = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledDeplMechanism = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledPlPCDUCh6 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledAcsBoardSideB = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.outEnabledPayloadCamera = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu2HkTableDataset.bootcause = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.bootcount = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                                 *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.uptime = *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-                              *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.resetcause = *(packet + dataOffset + 1) << 8 | *(packet + dataOffset);
-  dataOffset += 4;
-  pdu2HkTableDataset.battMode = *(packet + dataOffset);
-  /* +10 because here begins the second gomspace csp packet */
-  dataOffset += 3 + 10;
-
-  pdu2HkTableDataset.latchupsQ7S = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsPayloadPcduCh1 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsRw = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsTcsBoardHeaterIn =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsSusRedundant =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsDeplMenchanism =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsPayloadPcduCh6 =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsAcsBoardSideB =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-  pdu2HkTableDataset.latchupsPayloadCamera =
-      *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
-  dataOffset += 4;
-
-  pdu2HkTableDataset.device0 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device1 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device2 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device3 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device4 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device5 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device6 = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device7 = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu2HkTableDataset.device0Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device1Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device2Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device3Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device4Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device5Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device6Status = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.device7Status = *(packet + dataOffset);
-  dataOffset += 3;
-
-  pdu2HkTableDataset.gndWdtReboots = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.i2cWdtReboots = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.canWdtReboots = *(packet + dataOffset) << 24 |
-                                     *(packet + dataOffset + 1) << 16 |
-                                     *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.csp1WdtReboots = *(packet + dataOffset) << 24 |
-                                      *(packet + dataOffset + 1) << 16 |
-                                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.csp2WdtReboots = *(packet + dataOffset) << 24 |
-                                      *(packet + dataOffset + 1) << 16 |
-                                      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.groundWatchdogSecondsLeft =
-      *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.i2cWatchdogSecondsLeft =
-      *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.canWatchdogSecondsLeft =
-      *(packet + dataOffset) << 24 | *(packet + dataOffset + 1) << 16 |
-      *(packet + dataOffset + 2) << 8 | *(packet + dataOffset + 3);
-  dataOffset += 6;
-  pdu2HkTableDataset.csp1WatchdogPingsLeft = *(packet + dataOffset);
-  dataOffset += 3;
-  pdu2HkTableDataset.csp2WatchdogPingsLeft = *(packet + dataOffset);
-
-  pdu2HkTableDataset.commit();
-  pdu2HkTableDataset.setChanged(true);
+  GomspaceDeviceHandler::parsePduHkTable(coreHk, auxHk, packet);
 }
 
 ReturnValue_t PDU2Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                    LocalDataPoolManager &poolManager) {
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_Q7S, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_PAYLOAD_PCDU_CH1,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_RW, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_SUS_REDUNDANT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_PAYLOAD_PCDU_CH6,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_ACS_BOARD_SIDE_B,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CURRENT_OUT_PAYLOAD_CAMERA, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_Q7S, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_PAYLOAD_PCDU_CH1,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_RW, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_SUS_REDUNDANT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_PAYLOAD_PCDU_CH6,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_ACS_BOARD_SIDE_B,
-                           new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VOLTAGE_OUT_PAYLOAD_CAMERA, new PoolEntry<int16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_VCC, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_VBAT, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_TEMPERATURE, new PoolEntry<int16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CONV_EN_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CONV_EN_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_CONV_EN_3, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_Q7S, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_PAYLOAD_PCDU_CH1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_RW, new PoolEntry<uint8_t>({0}));
-#ifdef TE0720_1CFA
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_TCS_BOARD_HEATER_IN, new PoolEntry<uint8_t>({1}));
-#else
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_TCS_BOARD_HEATER_IN, new PoolEntry<uint8_t>({0}));
-#endif
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_SUS_REDUNDANT, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_PAYLOAD_PCDU_CH6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_ACS_BOARD_SIDE_B, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_OUT_EN_PAYLOAD_CAMERA, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_BOOTCAUSE, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_BOOTCNT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_UPTIME, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_RESETCAUSE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_BATT_MODE, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_Q7S, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_PAYLOAD_PCDU_CH1, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_RW, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_TCS_BOARD_HEATER_IN,
-                           new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_SUS_REDUNDANT, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_DEPLOYMENT_MECHANISM,
-                           new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_PAYLOAD_PCDU_CH6, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_ACS_BOARD_SIDE_B, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_LATCHUP_PAYLOAD_CAMERA, new PoolEntry<uint16_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_0, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_3, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_4, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_5, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_6, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_7, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_0_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_1_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_2_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_3_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_4_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_5_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_6_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_DEVICE_7_STATUS, new PoolEntry<uint8_t>({0}));
-
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_GND, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_I2C, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_CAN, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_CSP1, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CNT_CSP2, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_GND_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_I2C_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CAN_LEFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CSP_LEFT1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::PDU2_WDT_CSP_LEFT2, new PoolEntry<uint8_t>({0}));
-#if OBSW_ENABLE_PERIODIC_HK == 1
-  poolManager.subscribeForPeriodicPacket(pdu2HkTableDataset.getSid(), false, 0.4, true);
-#endif
+  initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU2);
+  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, true);
+  poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -374,7 +57,7 @@ ReturnValue_t PDU2Handler::printStatus(DeviceCommandId_t cmd) {
   ReturnValue_t result = RETURN_OK;
   switch (cmd) {
     case (GOMSPACE::PRINT_SWITCH_V_I): {
-      PoolReadGuard pg(&pdu2HkTableDataset);
+      PoolReadGuard pg(&coreHk);
       result = pg.getReadResult();
       if (result != HasReturnvaluesIF::RETURN_OK) {
         break;
@@ -383,7 +66,7 @@ ReturnValue_t PDU2Handler::printStatus(DeviceCommandId_t cmd) {
       break;
     }
     case (GOMSPACE::PRINT_LATCHUPS): {
-      PoolReadGuard pg(&pdu2HkTableDataset);
+      PoolReadGuard pg(&auxHk);
       result = pg.getReadResult();
       if (result != HasReturnvaluesIF::RETURN_OK) {
         break;
@@ -402,77 +85,45 @@ ReturnValue_t PDU2Handler::printStatus(DeviceCommandId_t cmd) {
 }
 
 void PDU2Handler::printHkTableSwitchVI() {
+  using namespace PDU2;
   sif::info << "PDU2 Info:" << std::endl;
-  sif::info << "Boot Cause: " << pdu2HkTableDataset.bootcause << " | Boot Count: " << std::setw(4)
-            << std::right << pdu2HkTableDataset.bootcount << std::endl;
-  sif::info << "Reset Cause: " << pdu2HkTableDataset.resetcause
-            << " | Battery Mode: " << static_cast<int>(pdu2HkTableDataset.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(30) << std::left << "Q7S" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledQ7S.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutQ7S.value << ", " << std::setw(4)
-            << pdu2HkTableDataset.voltageOutQ7S.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Payload PCDU Channel 1" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledPlPCDUCh1.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutPayloadPCDUCh1.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutPayloadPCDUCh1.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Reaction Wheels" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledReactionWheels.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutReactionWheels.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutReactionWheels.value << std::endl;
-  sif::info << std::setw(30) << std::left << "TCS Board Heater Input" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledTCSBoardHeaterIn.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutTCSBoardHeaterIn.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutTCSBoardHeaterIn.value << std::endl;
-  sif::info << std::setw(30) << std::left << "SuS Redundant" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledSUSRedundant.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutSUSRedundant.value << ", " << std::setw(4)
-            << pdu2HkTableDataset.voltageOutSUSRedundant.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Deployment mechanism" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledDeplMechanism.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutDeplMechanism.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutDeplMechanism.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Payload PCDU Channel 6" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledPlPCDUCh6.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutPayloadPCDUCh6.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutPayloadPCDUCh6.value << std::endl;
-  sif::info << std::setw(30) << std::left << "ACS Board Side B" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledAcsBoardSideB.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutACSBoardSideB.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutACSBoardSideB.value << std::endl;
-  sif::info << std::setw(30) << std::left << "Payload Camera" << std::dec << "| "
-            << unsigned(pdu2HkTableDataset.outEnabledPayloadCamera.value) << ", " << std::setw(4)
-            << std::right << pdu2HkTableDataset.currentOutPayloadCamera.value << ", "
-            << std::setw(4) << pdu2HkTableDataset.voltageOutPayloadCamera.value << std::right
-            << std::endl;
+  auto printerHelper = [&](std::string channelStr, Channels idx) {
+    sif::info << std::setw(30) << std::left << channelStr << std::dec << "| "
+              << unsigned(coreHk.outputEnables[idx]) << ", " << std::setw(4) << std::right
+              << coreHk.currents[idx] << ", " << std::setw(4) << coreHk.voltages[idx] << std::endl;
+  };
+  printerHelper("Q7S", Channels::Q7S);
+  printerHelper("PL PCDU CH1", Channels::PAYLOAD_PCDU_CH1);
+  printerHelper("Reaction Wheels", Channels::RW);
+  printerHelper("TCS Board Heater Input", Channels::TCS_HEATER_IN);
+  printerHelper("SUS Redundant", Channels::SUS_REDUNDANT);
+  printerHelper("Deployment Mechanism", Channels::DEPY_MECHANISM);
+  printerHelper("PL PCDU CH6", Channels::PAYLOAD_PCDU_CH6);
+  printerHelper("ACS Board B Side", Channels::ACS_B_SIDE);
+  printerHelper("Payload Camera", Channels::PAYLOAD_CAMERA);
 }
 
 void PDU2Handler::printHkTableLatchups() {
+  using namespace PDU2;
   sif::info << "PDU2 Latchup Information" << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Q7S" << std::dec << "| "
-            << std::setw(4) << std::right << pdu2HkTableDataset.latchupsQ7S << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Payload PCDU Channel 1" << std::dec
-            << "| " << std::setw(4) << std::right << pdu2HkTableDataset.latchupsPayloadPcduCh1
-            << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Reaction Wheels" << std::dec
-            << "| " << std::setw(4) << std::right << pdu2HkTableDataset.latchupsRw << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "TCS Board Heater Input" << std::dec
-            << "| " << std::setw(4) << std::right << pdu2HkTableDataset.latchupsTcsBoardHeaterIn
-            << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "SuS Nominal" << std::dec << "| "
-            << std::setw(4) << std::right << pdu2HkTableDataset.latchupsSusRedundant << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Deployment mechanism" << std::dec
-            << "| " << std::setw(4) << std::right << pdu2HkTableDataset.latchupsDeplMenchanism
-            << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Payload PCDU Channel 6" << std::dec
-            << "| " << std::setw(4) << std::right << pdu2HkTableDataset.latchupsPayloadPcduCh6
-            << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "ACS Board Side B" << std::dec
-            << "| " << std::setw(4) << std::right << pdu2HkTableDataset.latchupsAcsBoardSideB
-            << std::endl;
-  sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "Payload Camera" << std::dec << "| "
-            << std::setw(4) << std::right << pdu2HkTableDataset.latchupsPayloadCamera << std::endl;
+  auto printerHelper = [&](std::string channelStr, Channels idx) {
+    sif::info << std::setw(MAX_CHANNEL_STR_WIDTH) << std::left << "TCS Board" << std::dec << "| "
+              << std::setw(4) << std::right << auxHk.latchups[idx] << std::endl;
+  };
+  printerHelper("Q7S", Channels::Q7S);
+  printerHelper("PL PCDU CH1", Channels::PAYLOAD_PCDU_CH1);
+  printerHelper("Reaction Wheels", Channels::RW);
+  printerHelper("TCS Board Heater Input", Channels::TCS_HEATER_IN);
+  printerHelper("SUS Redundant", Channels::SUS_REDUNDANT);
+  printerHelper("Deployment Mechanism", Channels::DEPY_MECHANISM);
+  printerHelper("PL PCDU CH6", Channels::PAYLOAD_PCDU_CH6);
+  printerHelper("ACS Board B Side", Channels::ACS_B_SIDE);
+  printerHelper("Payload Camera", Channels::PAYLOAD_CAMERA);
 }
 
 ReturnValue_t PDU2Handler::setParamCallback(SetParamMessageUnpacker &unpacker,

mission/devices/PDU2Handler.h

@@ -36,12 +36,14 @@ 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;
 
   /** Dataset for the housekeeping table of the PDU2 */
-  PDU2::PDU2HkTableDataset pdu2HkTableDataset;
+  PDU2::Pdu2CoreHk coreHk;
+  PDU2::Pdu2AuxHk auxHk;
   GOMSPACE::ChannelSwitchHook channelSwitchHook = nullptr;
   void* hookArgs = nullptr;
 

mission/devices/PayloadPcduHandler.cpp

@@ -14,197 +14,138 @@
 
 PayloadPcduHandler::PayloadPcduHandler(object_id_t objectId, object_id_t comIF, CookieIF* cookie,
                                        GpioIF* gpioIF, SdCardMountedIF* sdcMan,
-                                       bool periodicPrintout)
+                                       PowerSwitchIF* pwrSwitcher, power::Switch_t switchA,
+                                       power::Switch_t switchB, bool periodicPrintout)
     : DeviceHandlerBase(objectId, comIF, cookie),
       adcSet(this),
       periodicPrintout(periodicPrintout),
       gpioIF(gpioIF),
-      sdcMan(sdcMan) {}
+      sdcMan(sdcMan),
+      pwrStateMachine(switchA, switchB, pwrSwitcher) {}
 
 void PayloadPcduHandler::doStartUp() {
-  if ((state != States::PCDU_OFF) and (state != States::ON_TRANS_SSR)) {
+  if ((state != States::PL_PCDU_OFF) and (state != States::ON_TRANS_SSR)) {
     // Config error
     sif::error << "PayloadPcduHandler::doStartUp: Invalid state" << std::endl;
   }
-  if (state == States::PCDU_OFF) {
-    // Switch on relays here
-    gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT0);
-    gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT1);
-    state = States::ON_TRANS_SSR;
-    transitionOk = true;
+  if (pwrStateMachine.getState() == power::States::IDLE) {
+    pwrStateMachine.start(MODE_ON, pwrSubmode);
   }
-  if (state == States::ON_TRANS_SSR) {
-    // If necessary, check whether a certain amount of time has elapsed
-    if (transitionOk) {
-      transitionOk = false;
-      state = States::ON_TRANS_ADC_CLOSE_ZERO;
-      // We are now in ON mode
-      startTransition(MODE_NORMAL, 0);
-      adcCountdown.setTimeout(50);
-      adcCountdown.resetTimer();
-      adcState = AdcStates::BOOT_DELAY;
-      // The ADC can now be read. If the values are not close to zero, we should not allow
-      // transition
-      monMode = MonitoringMode::CLOSE_TO_ZERO;
-    }
+  auto opCode = pwrStateMachine.fsm();
+  if (opCode == power::OpCodes::TO_NOT_OFF_DONE or opCode == power::OpCodes::TIMEOUT_OCCURED) {
+    pwrStateMachine.reset();
+    quickTransitionAlreadyCalled = false;
+    state = States::POWER_CHANNELS_ON;
+    setMode(_MODE_TO_ON);
   }
 }
 
-void PayloadPcduHandler::stateMachineToNormal() {
-  using namespace plpcdu;
-  if (adcState == AdcStates::BOOT_DELAY) {
-    if (adcCountdown.hasTimedOut()) {
-      adcState = AdcStates::SEND_SETUP;
-      adcCmdExecuted = false;
-    }
+void PayloadPcduHandler::doShutDown() {
+  if (not quickTransitionAlreadyCalled) {
+    quickTransitionBackToOff(false, false);
+    quickTransitionAlreadyCalled = true;
   }
-  if (adcState == AdcStates::SEND_SETUP) {
-    if (adcCmdExecuted) {
-      adcState = AdcStates::NORMAL;
-      setMode(MODE_NORMAL, NORMAL_ADC_ONLY);
-      adcCountdown.setTimeout(100);
-      adcCountdown.resetTimer();
-      adcCmdExecuted = false;
-    }
+  if (pwrStateMachine.getState() == power::States::IDLE) {
+    pwrStateMachine.start(MODE_OFF, 0);
   }
-  if (submode == plpcdu::NORMAL_ALL_ON) {
-    if (state == States::ON_TRANS_ADC_CLOSE_ZERO) {
-      if (not commandExecuted) {
-        float waitTime = DFT_SSR_TO_DRO_WAIT_TIME;
-        params.getValue(PARAM_KEY_MAP[SSR_TO_DRO_WAIT_TIME], waitTime);
-        countdown.setTimeout(std::round(waitTime * 1000));
-        countdown.resetTimer();
-        commandExecuted = true;
-        // TODO: For now, skip ADC check
-        transitionOk = true;
-      }
-      // ADC values are ok, 5 seconds have elapsed
-      if (transitionOk and countdown.hasTimedOut()) {
-        state = States::ON_TRANS_DRO;
-        // Now start monitoring for negative voltages instead
-        monMode = MonitoringMode::NEGATIVE;
-        commandExecuted = false;
-        transitionOk = false;
-      }
-    }
-    if (state == States::ON_TRANS_DRO) {
-      if (not commandExecuted) {
-        float waitTime = DFT_DRO_TO_X8_WAIT_TIME;
-        params.getValue(PARAM_KEY_MAP[DRO_TO_X8_WAIT_TIME], waitTime);
-        countdown.setTimeout(std::round(waitTime * 1000));
-        countdown.resetTimer();
-#if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU DRO module" << std::endl;
-#endif
-        // Switch on DRO and start monitoring for negative voltages
-        gpioIF->pullHigh(gpioIds::PLPCDU_ENB_DRO);
-        adcCountdown.setTimeout(100);
-        adcCountdown.resetTimer();
-        commandExecuted = true;
-      }
-      // ADC values are ok, 5 seconds have elapsed
-      if (transitionOk and countdown.hasTimedOut()) {
-        state = States::ON_TRANS_X8;
-        commandExecuted = false;
-        transitionOk = false;
-      }
-    }
-    if (state == States::ON_TRANS_X8) {
-      if (not commandExecuted) {
-        float waitTime = DFT_X8_TO_TX_WAIT_TIME;
-        params.getValue(PARAM_KEY_MAP[X8_TO_TX_WAIT_TIME], waitTime);
-        countdown.setTimeout(std::round(waitTime * 1000));
-        countdown.resetTimer();
-#if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU X8 module" << std::endl;
-#endif
-        // Switch on X8
-        gpioIF->pullHigh(gpioIds::PLPCDU_ENB_X8);
-        adcCountdown.setTimeout(100);
-        adcCountdown.resetTimer();
-        commandExecuted = true;
-      }
-      // ADC values are ok, 5 seconds have elapsed
-      if (transitionOk and countdown.hasTimedOut()) {
-        state = States::ON_TRANS_TX;
-        commandExecuted = false;
-        transitionOk = false;
-      }
-    }
-    if (state == States::ON_TRANS_TX) {
-      if (not commandExecuted) {
-        float waitTime = DFT_TX_TO_MPA_WAIT_TIME;
-        params.getValue(PARAM_KEY_MAP[TX_TO_MPA_WAIT_TIME], waitTime);
-        countdown.setTimeout(std::round(waitTime * 1000));
-        countdown.resetTimer();
-#if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU TX module" << std::endl;
-#endif
-        // Switch on TX
-        gpioIF->pullHigh(gpioIds::PLPCDU_ENB_TX);
-        // Wait for 100 ms before checking ADC values
-        adcCountdown.setTimeout(100);
-        adcCountdown.resetTimer();
-        commandExecuted = true;
-      }
-      // ADC values are ok, 5 seconds have elapsed
-      if (transitionOk and countdown.hasTimedOut()) {
-        state = States::ON_TRANS_MPA;
-        commandExecuted = false;
-        transitionOk = false;
-      }
-    }
-    if (state == States::ON_TRANS_MPA) {
-      if (not commandExecuted) {
-        float waitTime = DFT_MPA_TO_HPA_WAIT_TIME;
-        params.getValue(PARAM_KEY_MAP[MPA_TO_HPA_WAIT_TIME], waitTime);
-        countdown.setTimeout(std::round(waitTime * 1000));
-        countdown.resetTimer();
-#if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU MPA module" << std::endl;
-#endif
-        // Switch on MPA
-        gpioIF->pullHigh(gpioIds::PLPCDU_ENB_MPA);
-        // Wait for 100 ms before checking ADC values
-        adcCountdown.setTimeout(100);
-        adcCountdown.resetTimer();
-        commandExecuted = true;
-      }
-      // ADC values are ok, 5 seconds have elapsed
-      if (transitionOk and countdown.hasTimedOut()) {
-        state = States::ON_TRANS_HPA;
-        commandExecuted = false;
-        transitionOk = false;
-      }
-    }
-    if (state == States::ON_TRANS_HPA) {
-      if (not commandExecuted) {
-        // Switch on HPA
-        gpioIF->pullHigh(gpioIds::PLPCDU_ENB_HPA);
-#if OBSW_VERBOSE_LEVEL >= 1
-        sif::info << "Enabling PL PCDU HPA module" << std::endl;
-#endif
-        commandExecuted = true;
-      }
-      // ADC values are ok, 5 seconds have elapsed
-      if (transitionOk and countdown.hasTimedOut()) {
-        state = States::PCDU_ON;
-        setMode(MODE_NORMAL, plpcdu::NORMAL_ALL_ON);
-        countdown.resetTimer();
-        commandExecuted = false;
-        transitionOk = false;
-      }
-    }
+  auto opCode = pwrStateMachine.fsm();
+  if (opCode == power::OpCodes::TO_OFF_DONE or opCode == power::OpCodes::TIMEOUT_OCCURED) {
+    pwrStateMachine.reset();
+    state = States::PL_PCDU_OFF;
+    // No need to set mode _MODE_POWER_DOWN, power switching was already handled
+    setMode(MODE_OFF);
   }
 }
 
 void PayloadPcduHandler::doTransition(Mode_t modeFrom, Submode_t subModeFrom) {
   if (mode == _MODE_TO_NORMAL) {
-    stateMachineToNormal();
+    stateMachineToNormal(modeFrom, subModeFrom);
+    return;
   }
+  DeviceHandlerBase::doTransition(modeFrom, subModeFrom);
 }
 
-void PayloadPcduHandler::doShutDown() { transitionBackToOff(false); }
+ReturnValue_t PayloadPcduHandler::stateMachineToNormal(Mode_t modeFrom, Submode_t subModeFrom) {
+  using namespace plpcdu;
+  bool doFinish = true;
+  if (((submode >> SOLID_STATE_RELAYS_ADC_ON) & 0b1) == 1) {
+    if (state == States::PL_PCDU_OFF) {
+      sif::error << "PayloadPcduHandler::stateMachineToNormal: Unexpected state PL_PCDU_OFF"
+                 << "detected" << std::endl;
+      setMode(MODE_OFF);
+      return HasReturnvaluesIF::RETURN_FAILED;
+    }
+    if (state == States::POWER_CHANNELS_ON) {
+#if OBSW_VERBOSE_LEVEL >= 1
+      sif::info << "Switching on SSR VBAT0 & VBAT1 GPIOs" << std::endl;
+#endif
+      // Switch on relays here
+      gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT0);
+      gpioIF->pullHigh(gpioIds::PLPCDU_ENB_VBAT1);
+      state = States::ON_TRANS_SSR;
+      transitionOk = true;
+      doFinish = false;
+    }
+    if (state == States::ON_TRANS_SSR) {
+      // If necessary, check whether a certain amount of time has elapsed
+      if (transitionOk) {
+        transitionOk = false;
+        state = States::ON_TRANS_ADC_CLOSE_ZERO;
+        adcCountdown.setTimeout(50);
+        adcCountdown.resetTimer();
+        adcState = AdcStates::BOOT_DELAY;
+        doFinish = false;
+        // If the values are not close to zero, we should not allow transition
+        monMode = MonitoringMode::CLOSE_TO_ZERO;
+      }
+    }
+    if (state == States::ON_TRANS_ADC_CLOSE_ZERO) {
+      if (adcState == AdcStates::BOOT_DELAY) {
+        doFinish = false;
+        if (adcCountdown.hasTimedOut()) {
+          adcState = AdcStates::SEND_SETUP;
+          adcCmdExecuted = false;
+        }
+      }
+      if (adcState == AdcStates::SEND_SETUP) {
+        if (adcCmdExecuted) {
+          adcState = AdcStates::NORMAL;
+          doFinish = true;
+          adcCountdown.setTimeout(100);
+          adcCountdown.resetTimer();
+          adcCmdExecuted = false;
+        }
+      }
+    }
+  }
+
+  auto switchHandler = [&](NormalSubmodeBits bit, gpioId_t id, std::string info) {
+    if (((diffMask >> bit) & 1) == 1) {
+      if (((submode >> bit) & 1) == 1) {
+#if OBSW_VERBOSE_LEVEL >= 1
+        sif::info << "Enabling PL PCDU " << info << " module" << std::endl;
+#endif
+        // Switch on DRO and start monitoring for negative voltages
+        updateSwitchGpio(id, gpio::Levels::HIGH);
+      } else {
+#if OBSW_VERBOSE_LEVEL >= 1
+        sif::info << "Disabling PL PCDU " << info << " module" << std::endl;
+#endif
+        updateSwitchGpio(id, gpio::Levels::LOW);
+      }
+    }
+  };
+
+  switchHandler(DRO_ON, gpioIds::PLPCDU_ENB_DRO, "DRO");
+  switchHandler(X8_ON, gpioIds::PLPCDU_ENB_X8, "X8");
+  switchHandler(TX_ON, gpioIds::PLPCDU_ENB_TX, "TX");
+  switchHandler(MPA_ON, gpioIds::PLPCDU_ENB_MPA, "MPA");
+  switchHandler(HPA_ON, gpioIds::PLPCDU_ENB_HPA, "HPA");
+  if (doFinish) {
+    setMode(MODE_NORMAL, submode);
+  }
+  return RETURN_OK;
+}
 
 ReturnValue_t PayloadPcduHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
   switch (adcState) {
@@ -234,6 +175,16 @@ ReturnValue_t PayloadPcduHandler::buildTransitionDeviceCommand(DeviceCommandId_t
   return NOTHING_TO_SEND;
 }
 
+void PayloadPcduHandler::updateSwitchGpio(gpioId_t id, gpio::Levels level) {
+  if (level == gpio::Levels::HIGH) {
+    gpioIF->pullHigh(id);
+  } else {
+    gpioIF->pullLow(id);
+  }
+  adcCountdown.setTimeout(100);
+  adcCountdown.resetTimer();
+}
+
 void PayloadPcduHandler::fillCommandAndReplyMap() {
   insertInCommandAndReplyMap(plpcdu::READ_CMD, 2, &adcSet);
   insertInCommandAndReplyMap(plpcdu::READ_TEMP_EXT, 1, &adcSet);
@@ -342,7 +293,7 @@ ReturnValue_t PayloadPcduHandler::initializeLocalDataPool(localpool::DataPool& l
   localDataPoolMap.emplace(plpcdu::PlPcduPoolIds::CHANNEL_VEC, &channelValues);
   localDataPoolMap.emplace(plpcdu::PlPcduPoolIds::PROCESSED_VEC, &processedValues);
   localDataPoolMap.emplace(plpcdu::PlPcduPoolIds::TEMP, &tempC);
-  poolManager.subscribeForPeriodicPacket(adcSet.getSid(), false, 0.1, true);
+  poolManager.subscribeForPeriodicPacket(adcSet.getSid(), false, 5.0, true);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
@@ -388,7 +339,7 @@ void PayloadPcduHandler::enablePeriodicPrintout(bool enable, uint8_t divider) {
   opDivider.setDivider(divider);
 }
 
-void PayloadPcduHandler::transitionBackToOff(bool notifyFdir) {
+void PayloadPcduHandler::quickTransitionBackToOff(bool startTransitionToOff, bool notifyFdir) {
   States currentState = state;
   gpioIF->pullLow(gpioIds::PLPCDU_ENB_HPA);
   gpioIF->pullLow(gpioIds::PLPCDU_ENB_MPA);
@@ -398,9 +349,11 @@ void PayloadPcduHandler::transitionBackToOff(bool notifyFdir) {
   gpioIF->pullLow(gpioIds::PLPCDU_ENB_TX);
   gpioIF->pullLow(gpioIds::PLPCDU_ENB_VBAT0);
   gpioIF->pullLow(gpioIds::PLPCDU_ENB_VBAT1);
-  state = States::PCDU_OFF;
+  state = States::PL_PCDU_OFF;
   adcState = AdcStates::OFF;
-  setMode(MODE_OFF);
+  if (startTransitionToOff) {
+    startTransition(MODE_OFF, 0);
+  }
   if (notifyFdir) {
     triggerEvent(TRANSITION_BACK_TO_OFF, static_cast<uint32_t>(currentState));
   }
@@ -525,6 +478,8 @@ void PayloadPcduHandler::checkAdcValues() {
     }
     params.getValue(PARAM_KEY_MAP[HPA_I_UPPER_BOUND], upperBound);
     if (not checkCurrent(adcSet.processed[I_HPA], upperBound, I_HPA_OUT_OF_BOUNDS)) {
+      sif::warning << "PayloadPcduHandler::checkCurrent: I HPA exceeded limit: Measured "
+                   << adcSet.processed[I_HPA] << " mA" << std::endl;
       return;
     }
   }
@@ -554,7 +509,8 @@ bool PayloadPcduHandler::checkVoltage(float val, float lowerBound, float upperBo
     serializeFloat(p2, val);
     triggerEvent(event, tooLarge, p2);
     transitionOk = false;
-    transitionBackToOff(true);
+    quickTransitionBackToOff(true, true);
+    quickTransitionAlreadyCalled = true;
     return false;
   }
   return true;
@@ -566,14 +522,45 @@ bool PayloadPcduHandler::checkCurrent(float val, float upperBound, Event event)
     serializeFloat(p2, val);
     triggerEvent(event, true, p2);
     transitionOk = false;
-    transitionBackToOff(true);
+    quickTransitionBackToOff(true, true);
+    quickTransitionAlreadyCalled = true;
     return false;
   }
   return true;
 }
 
 ReturnValue_t PayloadPcduHandler::isModeCombinationValid(Mode_t mode, Submode_t submode) {
-  if (mode == MODE_NORMAL and submode <= 1) {
+  using namespace plpcdu;
+  if (mode == MODE_NORMAL) {
+    diffMask = submode ^ this->submode;
+    // Also deals with the case where the mode is MODE_ON, submode should be 0 here
+    if ((((submode >> SOLID_STATE_RELAYS_ADC_ON) & 0b1) == SOLID_STATE_RELAYS_ADC_ON) and
+        (this->mode == MODE_NORMAL and this->submode != ALL_OFF_SUBMODE)) {
+      return TRANS_NOT_ALLOWED;
+    }
+    if (((((submode >> DRO_ON) & 1) == 1) and
+         ((this->submode & 0b1) != (1 << SOLID_STATE_RELAYS_ADC_ON)))) {
+      return TRANS_NOT_ALLOWED;
+    }
+    if ((((submode >> X8_ON) & 1) == 1) and
+        ((this->submode & 0b11) != ((1 << SOLID_STATE_RELAYS_ADC_ON) | (1 << DRO_ON)))) {
+      return TRANS_NOT_ALLOWED;
+    }
+    if (((((submode >> TX_ON) & 1) == 1) and
+         ((this->submode & 0b111) !=
+          ((1 << X8_ON) | (1 << DRO_ON) | (1 << SOLID_STATE_RELAYS_ADC_ON))))) {
+      return TRANS_NOT_ALLOWED;
+    }
+    if ((((submode >> MPA_ON) & 1) == 1 and
+         ((this->submode & 0b1111) !=
+          ((1 << TX_ON) | (1 << X8_ON) | (1 << DRO_ON) | (1 << SOLID_STATE_RELAYS_ADC_ON))))) {
+      return TRANS_NOT_ALLOWED;
+    }
+    if ((((submode >> HPA_ON) & 1) == 1 and
+         ((this->submode & 0b11111) != ((1 << MPA_ON) | (1 << TX_ON) | (1 << X8_ON) |
+                                        (1 << DRO_ON) | (1 << SOLID_STATE_RELAYS_ADC_ON))))) {
+      return TRANS_NOT_ALLOWED;
+    }
     return HasReturnvaluesIF::RETURN_OK;
   }
   return DeviceHandlerBase::isModeCombinationValid(mode, submode);
@@ -656,7 +643,8 @@ void PayloadPcduHandler::handleFailureInjection(std::string output, Event event)
             << std::endl;
   triggerEvent(event, 0, 0);
   transitionOk = false;
-  transitionBackToOff(true);
+  quickTransitionBackToOff(true, true);
+  quickTransitionAlreadyCalled = true;
   droToX8InjectionRequested = false;
 }
 

mission/devices/PayloadPcduHandler.h

@@ -10,6 +10,8 @@
 #include "fsfw_hal/common/gpio/GpioIF.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
 #include "mission/memory/SdCardMountedIF.h"
+#include "mission/system/DualLanePowerStateMachine.h"
+#include "mission/system/definitions.h"
 
 #ifdef FSFW_OSAL_LINUX
 class SpiComIF;
@@ -60,7 +62,8 @@ class PayloadPcduHandler : public DeviceHandlerBase {
   static constexpr Event I_HPA_OUT_OF_BOUNDS = event::makeEvent(SUBSYSTEM_ID, 11, severity::MEDIUM);
 
   PayloadPcduHandler(object_id_t objectId, object_id_t comIF, CookieIF* cookie, GpioIF* gpioIF,
-                     SdCardMountedIF* sdcMan, bool periodicPrintout);
+                     SdCardMountedIF* sdcMan, PowerSwitchIF* pwrSwitcher, power::Switch_t switchCh0,
+                     power::Switch_t switchCh1, bool periodicPrintout);
 
   void setToGoToNormalModeImmediately(bool enable);
   void enablePeriodicPrintout(bool enable, uint8_t divider);
@@ -75,7 +78,8 @@ class PayloadPcduHandler : public DeviceHandlerBase {
 
  private:
   enum class States : uint8_t {
-    PCDU_OFF,
+    PL_PCDU_OFF,
+    POWER_CHANNELS_ON,
     // Solid State Relay, enable battery voltages VBAT0 and VBAT1. This will also switch on
     // the ADC
     ON_TRANS_SSR,
@@ -92,8 +96,10 @@ class PayloadPcduHandler : public DeviceHandlerBase {
     // Switch on HPA component and monitor voltages for 5 seconds
     ON_TRANS_HPA,
     // All components of the experiment are on
-    PCDU_ON,
-  } state = States::PCDU_OFF;
+    PL_PCDU_ON,
+  } state = States::PL_PCDU_OFF;
+
+  duallane::Submodes pwrSubmode = duallane::Submodes::A_SIDE;
 
   enum class AdcMode { EXT_CONV, INT_CONV } adcMode = AdcMode::INT_CONV;
 
@@ -127,17 +133,22 @@ class PayloadPcduHandler : public DeviceHandlerBase {
   GpioIF* gpioIF;
   SdCardMountedIF* sdcMan;
   plpcdu::PlPcduParameter params;
+  bool quickTransitionAlreadyCalled = true;
+  uint8_t diffMask = 0;
 
   PoolEntry<uint16_t> channelValues = PoolEntry<uint16_t>({0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
   PoolEntry<float> processedValues =
       PoolEntry<float>({0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0});
   PoolEntry<float> tempC = PoolEntry<float>({0.0});
+  DualLanePowerStateMachine pwrStateMachine;
+
+  void updateSwitchGpio(gpioId_t id, gpio::Levels level);
 
   void doTransition(Mode_t modeFrom, Submode_t subModeFrom) override;
   void doStartUp() override;
   void doShutDown() override;
   // Main FDIR function which goes from any PL PCDU state back to all off
-  void transitionBackToOff(bool notifyFdir);
+  void quickTransitionBackToOff(bool startTransitionToOff, bool notifyFdir);
   ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t* id) override;
   ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t* id) override;
   void fillCommandAndReplyMap() override;
@@ -158,7 +169,7 @@ class PayloadPcduHandler : public DeviceHandlerBase {
   void checkAdcValues();
   void handleOutOfBoundsPrintout();
   void checkJsonFileInit();
-  void stateMachineToNormal();
+  ReturnValue_t stateMachineToNormal(Mode_t modeFrom, Submode_t subModeFrom);
   bool checkVoltage(float val, float lowerBound, float upperBound, Event event);
   bool checkCurrent(float val, float upperBound, Event event);
   void handleFailureInjection(std::string output, Event event);

mission/devices/RadiationSensorHandler.cpp

@@ -91,6 +91,16 @@ ReturnValue_t RadiationSensorHandler::buildCommandFromCommand(DeviceCommandId_t
       rawPacketLen = RAD_SENSOR::READ_SIZE;
       return RETURN_OK;
     }
+    case RAD_SENSOR::ENABLE_DEBUG_OUTPUT: {
+      printPeriodicData = true;
+      rawPacketLen = 0;
+      return RETURN_OK;
+    }
+    case RAD_SENSOR::DISABLE_DEBUG_OUTPUT: {
+      rawPacketLen = 0;
+      printPeriodicData = false;
+      return RETURN_OK;
+    }
     default:
       return DeviceHandlerIF::COMMAND_NOT_IMPLEMENTED;
   }
@@ -100,6 +110,8 @@ ReturnValue_t RadiationSensorHandler::buildCommandFromCommand(DeviceCommandId_t
 void RadiationSensorHandler::fillCommandAndReplyMap() {
   this->insertInCommandMap(RAD_SENSOR::WRITE_SETUP);
   this->insertInCommandMap(RAD_SENSOR::START_CONVERSION);
+  this->insertInCommandMap(RAD_SENSOR::ENABLE_DEBUG_OUTPUT);
+  this->insertInCommandMap(RAD_SENSOR::DISABLE_DEBUG_OUTPUT);
   this->insertInCommandAndReplyMap(RAD_SENSOR::READ_CONVERSIONS, 1, &dataset,
                                    RAD_SENSOR::READ_SIZE);
 }
@@ -111,18 +123,23 @@ ReturnValue_t RadiationSensorHandler::scanForReply(const uint8_t *start, size_t
   switch (*foundId) {
     case RAD_SENSOR::START_CONVERSION:
     case RAD_SENSOR::WRITE_SETUP:
+      *foundLen = remainingSize;
       return IGNORE_REPLY_DATA;
     case RAD_SENSOR::READ_CONVERSIONS: {
       ReturnValue_t result = gpioIF->pullLow(gpioIds::ENABLE_RADFET);
       if (result != HasReturnvaluesIF::RETURN_OK) {
 #if OBSW_VERBOSE_LEVEL >= 1
-        sif::warning << "RadiationSensorHandler::buildCommandFromCommand; Pulling RADFET Enale pin "
+        sif::warning << "RadiationSensorHandler::scanForReply; Pulling RADFET Enale pin "
                         "low failed"
                      << std::endl;
 #endif
       }
       break;
     }
+    case RAD_SENSOR::ENABLE_DEBUG_OUTPUT:
+    case RAD_SENSOR::DISABLE_DEBUG_OUTPUT:
+      sif::info << "RadiationSensorHandler::scanForReply: " << remainingSize << std::endl;
+      break;
     default:
       break;
   }
@@ -186,6 +203,7 @@ ReturnValue_t RadiationSensorHandler::initializeLocalDataPool(localpool::DataPoo
   localDataPoolMap.emplace(RAD_SENSOR::AIN5, new PoolEntry<uint16_t>({0}));
   localDataPoolMap.emplace(RAD_SENSOR::AIN6, new PoolEntry<uint16_t>({0}));
   localDataPoolMap.emplace(RAD_SENSOR::AIN7, new PoolEntry<uint16_t>({0}));
+  poolManager.subscribeForPeriodicPacket(dataset.getSid(), false, 20.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

mission/devices/RwHandler.cpp

@@ -30,12 +30,7 @@ void RwHandler::doStartUp() {
   if (gpioComIF->pullHigh(enableGpio) != RETURN_OK) {
     sif::debug << "RwHandler::doStartUp: Failed to pull enable gpio to high";
   }
-
-#if OBSW_SWITCH_TO_NORMAL_MODE_AFTER_STARTUP == 1
-  setMode(MODE_NORMAL);
-#else
   setMode(_MODE_TO_ON);
-#endif
 }
 
 void RwHandler::doShutDown() {
@@ -284,7 +279,9 @@ ReturnValue_t RwHandler::initializeLocalDataPool(localpool::DataPool& localDataP
   localDataPoolMap.emplace(RwDefinitions::SPI_BYTES_READ, new PoolEntry<uint32_t>({0}));
   localDataPoolMap.emplace(RwDefinitions::SPI_REG_OVERRUN_ERRORS, new PoolEntry<uint32_t>({0}));
   localDataPoolMap.emplace(RwDefinitions::SPI_TOTAL_ERRORS, new PoolEntry<uint32_t>({0}));
-
+  poolManager.subscribeForPeriodicPacket(temperatureSet.getSid(), false, 30.0, false);
+  poolManager.subscribeForPeriodicPacket(statusSet.getSid(), false, 5.0, true);
+  poolManager.subscribeForPeriodicPacket(tmDataset.getSid(), false, 30.0, false);
   return RETURN_OK;
 }
 
@@ -472,52 +469,52 @@ void RwHandler::handleGetTelemetryReply(const uint8_t* packet) {
   tmDataset.spiTotalNumOfErrors = *(packet + offset + 3) << 24 | *(packet + offset + 2) << 16 |
                                   *(packet + offset + 1) << 8 | *(packet + offset);
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_RW == 1
-  sif::info << "RwHandler::handleTemperatureReply: Last reset status: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Last reset status: "
             << static_cast<unsigned int>(tmDataset.lastResetStatus.value) << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: MCU temperature: " << tmDataset.mcuTemperature
+  sif::info << "RwHandler::handleGetTelemetryReply: MCU temperature: " << tmDataset.mcuTemperature
             << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Pressure sensor temperature: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Pressure sensor temperature: "
             << tmDataset.pressureSensorTemperature << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Pressure " << tmDataset.pressure << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: State: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Pressure " << tmDataset.pressure << std::endl;
+  sif::info << "RwHandler::handleGetTelemetryReply: State: "
             << static_cast<unsigned int>(tmDataset.rwState.value) << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: CLC mode: "
+  sif::info << "RwHandler::handleGetTelemetryReply: CLC mode: "
             << static_cast<unsigned int>(tmDataset.rwClcMode.value) << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Current speed: " << tmDataset.rwCurrSpeed
+  sif::info << "RwHandler::handleGetTelemetryReply: Current speed: " << tmDataset.rwCurrSpeed
             << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Reference speed: " << tmDataset.rwRefSpeed
+  sif::info << "RwHandler::handleGetTelemetryReply: Reference speed: " << tmDataset.rwRefSpeed
             << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Number of invalid CRC packets: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Number of invalid CRC packets: "
             << tmDataset.numOfInvalidCrcPackets << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Number of invalid length packets: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Number of invalid length packets: "
             << tmDataset.numOfInvalidLenPackets << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Number of invalid command packets: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Number of invalid command packets: "
             << tmDataset.numOfInvalidCmdPackets << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Number of command executed replies: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Number of command executed replies: "
             << tmDataset.numOfCmdExecutedReplies << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: Number of command replies: "
+  sif::info << "RwHandler::handleGetTelemetryReply: Number of command replies: "
             << tmDataset.numOfCmdReplies << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of bytes written: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of bytes written: "
             << tmDataset.uartNumOfBytesWritten << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of bytes read: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of bytes read: "
             << tmDataset.uartNumOfBytesRead << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of parity errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of parity errors: "
             << tmDataset.uartNumOfParityErrors << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of noise errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of noise errors: "
             << tmDataset.uartNumOfNoiseErrors << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of frame errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of frame errors: "
             << tmDataset.uartNumOfFrameErrors << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of register overrun errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of register overrun errors: "
             << tmDataset.uartNumOfRegisterOverrunErrors << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: UART number of total errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: UART number of total errors: "
             << tmDataset.uartTotalNumOfErrors << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: SPI number of bytes written: "
+  sif::info << "RwHandler::handleGetTelemetryReply: SPI number of bytes written: "
             << tmDataset.spiNumOfBytesWritten << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: SPI number of bytes read: "
+  sif::info << "RwHandler::handleGetTelemetryReply: SPI number of bytes read: "
             << tmDataset.spiNumOfBytesRead << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: SPI number of register overrun errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: SPI number of register overrun errors: "
             << tmDataset.spiNumOfRegisterOverrunErrors << std::endl;
-  sif::info << "RwHandler::handleTemperatureReply: SPI number of register total errors: "
+  sif::info << "RwHandler::handleGetTelemetryReply: SPI number of register total errors: "
             << tmDataset.spiTotalNumOfErrors << std::endl;
 #endif
 }

mission/devices/SolarArrayDeploymentHandler.cpp

@@ -7,7 +7,7 @@
 
 SolarArrayDeploymentHandler::SolarArrayDeploymentHandler(
     object_id_t setObjectId_, object_id_t gpioDriverId_, CookieIF* gpioCookie_,
-    object_id_t mainLineSwitcherObjectId_, pcduSwitches::Switches mainLineSwitch_, gpioId_t deplSA1,
+    object_id_t mainLineSwitcherObjectId_, pcdu::Switches mainLineSwitch_, gpioId_t deplSA1,
     gpioId_t deplSA2, uint32_t burnTimeMs)
     : SystemObject(setObjectId_),
       gpioDriverId(gpioDriverId_),

mission/devices/SolarArrayDeploymentHandler.h

@@ -43,8 +43,8 @@ class SolarArrayDeploymentHandler : public ExecutableObjectIF,
    */
   SolarArrayDeploymentHandler(object_id_t setObjectId, object_id_t gpioDriverId,
                               CookieIF* gpioCookie, object_id_t mainLineSwitcherObjectId,
-                              pcduSwitches::Switches mainLineSwitch, gpioId_t deplSA1,
-                              gpioId_t deplSA2, uint32_t burnTimeMs);
+                              pcdu::Switches mainLineSwitch, gpioId_t deplSA1, gpioId_t deplSA2,
+                              uint32_t burnTimeMs);
 
   virtual ~SolarArrayDeploymentHandler();
 

mission/devices/SusHandler.cpp

@@ -32,7 +32,10 @@ void SusHandler::doStartUp() {
   }
 }
 
-void SusHandler::doShutDown() { setMode(_MODE_POWER_DOWN); }
+void SusHandler::doShutDown() {
+  setMode(_MODE_POWER_DOWN);
+  comState = ComStates::IDLE;
+}
 
 ReturnValue_t SusHandler::buildNormalDeviceCommand(DeviceCommandId_t *id) {
   switch (comState) {
@@ -191,12 +194,13 @@ ReturnValue_t SusHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8
   return HasReturnvaluesIF::RETURN_OK;
 }
 
-uint32_t SusHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 2000; }
+uint32_t SusHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) { return 3000; }
 
 ReturnValue_t SusHandler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                   LocalDataPoolManager &poolManager) {
   localDataPoolMap.emplace(SUS::TEMPERATURE_C, &tempC);
   localDataPoolMap.emplace(SUS::CHANNEL_VEC, &channelVec);
+  poolManager.subscribeForPeriodicPacket(dataset.getSid(), false, 5.0, true);
   return HasReturnvaluesIF::RETURN_OK;
 }
 

mission/devices/SyrlinksHkHandler.cpp

@@ -4,18 +4,32 @@
 
 #include "OBSWConfig.h"
 
-SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie)
-    : DeviceHandlerBase(objectId, comIF, comCookie), rxDataset(this), txDataset(this) {
-  if (comCookie == NULL) {
-    sif::error << "SyrlinksHkHandler: Invalid com cookie" << std::endl;
+SyrlinksHkHandler::SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
+                                     power::Switch_t powerSwitch)
+    : DeviceHandlerBase(objectId, comIF, comCookie),
+      rxDataset(this),
+      txDataset(this),
+      temperatureSet(this),
+      powerSwitch(powerSwitch) {
+  if (comCookie == nullptr) {
+    sif::warning << "SyrlinksHkHandler: Invalid com cookie" << std::endl;
   }
 }
 
 SyrlinksHkHandler::~SyrlinksHkHandler() {}
 
 void SyrlinksHkHandler::doStartUp() {
-  if (mode == _MODE_START_UP) {
-    setMode(MODE_ON);
+  switch (startupState) {
+    case StartupState::OFF: {
+      startupState = StartupState::ENABLE_TEMPERATURE_PROTECTION;
+      break;
+    }
+    case StartupState::DONE: {
+      setMode(_MODE_TO_ON);
+      break;
+    }
+    default:
+      break;
   }
 }
 
@@ -23,100 +37,142 @@ void SyrlinksHkHandler::doShutDown() { setMode(_MODE_POWER_DOWN); }
 
 ReturnValue_t SyrlinksHkHandler::buildNormalDeviceCommand(DeviceCommandId_t* id) {
   switch (nextCommand) {
-    case (SYRLINKS::READ_RX_STATUS_REGISTERS):
-      *id = SYRLINKS::READ_RX_STATUS_REGISTERS;
-      nextCommand = SYRLINKS::READ_TX_STATUS;
+    case (syrlinks::READ_RX_STATUS_REGISTERS):
+      *id = syrlinks::READ_RX_STATUS_REGISTERS;
+      nextCommand = syrlinks::READ_TX_STATUS;
       break;
-    case (SYRLINKS::READ_TX_STATUS):
-      *id = SYRLINKS::READ_TX_STATUS;
-      nextCommand = SYRLINKS::READ_TX_WAVEFORM;
+    case (syrlinks::READ_TX_STATUS):
+      *id = syrlinks::READ_TX_STATUS;
+      nextCommand = syrlinks::READ_TX_WAVEFORM;
       break;
-    case (SYRLINKS::READ_TX_WAVEFORM):
-      *id = SYRLINKS::READ_TX_WAVEFORM;
-      nextCommand = SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE;
+    case (syrlinks::READ_TX_WAVEFORM):
+      *id = syrlinks::READ_TX_WAVEFORM;
+      nextCommand = syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE;
       break;
-    case (SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE):
-      *id = SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE;
-      nextCommand = SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE;
+    case (syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE):
+      *id = syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE;
+      nextCommand = syrlinks::READ_TX_AGC_VALUE_LOW_BYTE;
       break;
-    case (SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE):
-      *id = SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE;
-      nextCommand = SYRLINKS::READ_RX_STATUS_REGISTERS;
+    case (syrlinks::READ_TX_AGC_VALUE_LOW_BYTE):
+      *id = syrlinks::READ_TX_AGC_VALUE_LOW_BYTE;
+      nextCommand = syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE;
+      break;
+    case (syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE):
+      *id = syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE;
+      nextCommand = syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE;
+      break;
+    case (syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE):
+      *id = syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE;
+      nextCommand = syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE;
+      break;
+    case (syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE):
+      *id = syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE;
+      nextCommand = syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE;
+      break;
+    case (syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE):
+      *id = syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE;
+      nextCommand = syrlinks::READ_RX_STATUS_REGISTERS;
       break;
     default:
       sif::debug << "SyrlinksHkHandler::buildNormalDeviceCommand: rememberCommandId has invalid"
                  << "command id" << std::endl;
       break;
   }
-  return buildCommandFromCommand(*id, NULL, 0);
+  return buildCommandFromCommand(*id, nullptr, 0);
 }
 
 ReturnValue_t SyrlinksHkHandler::buildTransitionDeviceCommand(DeviceCommandId_t* id) {
-  return HasReturnvaluesIF::RETURN_OK;
+  switch (startupState) {
+    case StartupState::ENABLE_TEMPERATURE_PROTECTION: {
+      *id = syrlinks::WRITE_LCL_CONFIG;
+      return buildCommandFromCommand(*id, nullptr, 0);
+    }
+    default:
+      break;
+  }
+  return NOTHING_TO_SEND;
 }
 
 ReturnValue_t SyrlinksHkHandler::buildCommandFromCommand(DeviceCommandId_t deviceCommand,
                                                          const uint8_t* commandData,
                                                          size_t commandDataLen) {
   switch (deviceCommand) {
-    case (SYRLINKS::RESET_UNIT): {
-      resetCommand.copy(reinterpret_cast<char*>(commandBuffer), resetCommand.size(), 0);
-      rawPacketLen = resetCommand.size();
-      rawPacket = commandBuffer;
+    case (syrlinks::RESET_UNIT): {
+      prepareCommand(resetCommand, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::SET_TX_MODE_STANDBY): {
-      setTxModeStandby.copy(reinterpret_cast<char*>(commandBuffer), setTxModeStandby.size(), 0);
-      rawPacketLen = setTxModeStandby.size();
-      rawPacket = commandBuffer;
+    case (syrlinks::SET_TX_MODE_STANDBY): {
+      prepareCommand(setTxModeStandby, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::SET_TX_MODE_MODULATION): {
-      setTxModeModulation.copy(reinterpret_cast<char*>(commandBuffer), setTxModeModulation.size(),
-                               0);
-      rawPacketLen = setTxModeModulation.size();
-      rawPacket = commandBuffer;
+    case (syrlinks::SET_TX_MODE_MODULATION): {
+      prepareCommand(setTxModeModulation, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::SET_TX_MODE_CW): {
-      setTxModeCw.copy(reinterpret_cast<char*>(commandBuffer), setTxModeCw.size(), 0);
-      rawPacketLen = setTxModeCw.size();
-      rawPacket = commandBuffer;
+    case (syrlinks::SET_TX_MODE_CW): {
+      prepareCommand(setTxModeCw, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::READ_RX_STATUS_REGISTERS): {
-      readRxStatusRegCommand.copy(reinterpret_cast<char*>(commandBuffer),
-                                  readRxStatusRegCommand.size(), 0);
-      rawPacketLen = readRxStatusRegCommand.size();
-      rawPacket = commandBuffer;
+    case (syrlinks::WRITE_LCL_CONFIG): {
+      prepareCommand(writeLclConfig, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::READ_TX_STATUS): {
-      readTxStatus.copy(reinterpret_cast<char*>(commandBuffer), readTxStatus.size(), 0);
-      rawPacketLen = readTxStatus.size();
-      rememberCommandId = SYRLINKS::READ_TX_STATUS;
-      rawPacket = commandBuffer;
+    case (syrlinks::READ_RX_STATUS_REGISTERS): {
+      prepareCommand(readRxStatusRegCommand, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::READ_TX_WAVEFORM): {
-      readTxWaveform.copy(reinterpret_cast<char*>(commandBuffer), readTxStatus.size(), 0);
-      rawPacketLen = readTxWaveform.size();
-      rememberCommandId = SYRLINKS::READ_TX_WAVEFORM;
-      rawPacket = commandBuffer;
+    case (syrlinks::READ_LCL_CONFIG): {
+      prepareCommand(readLclConfig, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE): {
-      readTxAgcValueHighByte.copy(reinterpret_cast<char*>(commandBuffer), readTxStatus.size(), 0);
-      rawPacketLen = readTxAgcValueHighByte.size();
-      rememberCommandId = SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE;
-      rawPacket = commandBuffer;
+    case (syrlinks::READ_TX_STATUS): {
+      prepareCommand(readTxStatus, deviceCommand);
       return RETURN_OK;
     }
-    case (SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE): {
-      readTxAgcValueLowByte.copy(reinterpret_cast<char*>(commandBuffer), readTxStatus.size(), 0);
-      rawPacketLen = readTxAgcValueLowByte.size();
-      rememberCommandId = SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE;
-      rawPacket = commandBuffer;
+    case (syrlinks::READ_TX_WAVEFORM): {
+      prepareCommand(readTxWaveform, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE): {
+      prepareCommand(readTxAgcValueHighByte, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::READ_TX_AGC_VALUE_LOW_BYTE): {
+      prepareCommand(readTxAgcValueLowByte, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE): {
+      prepareCommand(tempPowerAmpBoardHighByte, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE): {
+      prepareCommand(tempPowerAmpBoardLowByte, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE): {
+      prepareCommand(tempBasebandBoardHighByte, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE): {
+      prepareCommand(tempBasebandBoardLowByte, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::CONFIG_BPSK): {
+      prepareCommand(configBPSK, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::CONFIG_OQPSK): {
+      prepareCommand(configOQPSK, deviceCommand);
+      return RETURN_OK;
+    }
+    case (syrlinks::ENABLE_DEBUG): {
+      debug = true;
+      rawPacketLen = 0;
+      return RETURN_OK;
+    }
+    case (syrlinks::DISABLE_DEBUG): {
+      debug = false;
+      rawPacketLen = 0;
       return RETURN_OK;
     }
     default:
@@ -126,24 +182,42 @@ ReturnValue_t SyrlinksHkHandler::buildCommandFromCommand(DeviceCommandId_t devic
 }
 
 void SyrlinksHkHandler::fillCommandAndReplyMap() {
-  this->insertInCommandAndReplyMap(SYRLINKS::RESET_UNIT, 1, nullptr, SYRLINKS::ACK_SIZE, false,
-                                   true, SYRLINKS::ACK_REPLY);
-  this->insertInCommandAndReplyMap(SYRLINKS::SET_TX_MODE_STANDBY, 1, nullptr, SYRLINKS::ACK_SIZE,
-                                   false, true, SYRLINKS::ACK_REPLY);
-  this->insertInCommandAndReplyMap(SYRLINKS::SET_TX_MODE_MODULATION, 1, nullptr, SYRLINKS::ACK_SIZE,
-                                   false, true, SYRLINKS::ACK_REPLY);
-  this->insertInCommandAndReplyMap(SYRLINKS::SET_TX_MODE_CW, 1, nullptr, SYRLINKS::ACK_SIZE, false,
-                                   true, SYRLINKS::ACK_REPLY);
-  this->insertInCommandAndReplyMap(SYRLINKS::READ_TX_STATUS, 1, &txDataset,
-                                   SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
-  this->insertInCommandAndReplyMap(SYRLINKS::READ_TX_WAVEFORM, 1, &txDataset,
-                                   SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
-  this->insertInCommandAndReplyMap(SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE, 1, &txDataset,
-                                   SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
-  this->insertInCommandAndReplyMap(SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE, 1, &txDataset,
-                                   SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
-  this->insertInCommandAndReplyMap(SYRLINKS::READ_RX_STATUS_REGISTERS, 1, &rxDataset,
-                                   SYRLINKS::RX_STATUS_REGISTERS_REPLY_SIZE);
+  this->insertInCommandAndReplyMap(syrlinks::RESET_UNIT, 1, nullptr, syrlinks::ACK_SIZE, false,
+                                   true, syrlinks::ACK_REPLY);
+  this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_STANDBY, 1, nullptr, syrlinks::ACK_SIZE,
+                                   false, true, syrlinks::ACK_REPLY);
+  this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_MODULATION, 1, nullptr, syrlinks::ACK_SIZE,
+                                   false, true, syrlinks::ACK_REPLY);
+  this->insertInCommandAndReplyMap(syrlinks::SET_TX_MODE_CW, 1, nullptr, syrlinks::ACK_SIZE, false,
+                                   true, syrlinks::ACK_REPLY);
+  this->insertInCommandAndReplyMap(syrlinks::WRITE_LCL_CONFIG, 1, nullptr, syrlinks::ACK_SIZE,
+                                   false, true, syrlinks::ACK_REPLY);
+  this->insertInCommandAndReplyMap(syrlinks::CONFIG_BPSK, 1, nullptr, syrlinks::ACK_SIZE, false,
+                                   true, syrlinks::ACK_REPLY);
+  this->insertInCommandAndReplyMap(syrlinks::CONFIG_OQPSK, 1, nullptr, syrlinks::ACK_SIZE, false,
+                                   true, syrlinks::ACK_REPLY);
+  this->insertInCommandMap(syrlinks::ENABLE_DEBUG);
+  this->insertInCommandMap(syrlinks::DISABLE_DEBUG);
+  this->insertInCommandAndReplyMap(syrlinks::READ_LCL_CONFIG, 1, nullptr,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::READ_TX_STATUS, 1, &txDataset,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::READ_TX_WAVEFORM, 1, &txDataset,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE, 1, &txDataset,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::READ_TX_AGC_VALUE_LOW_BYTE, 1, &txDataset,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE, 1, nullptr,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE, 1, nullptr,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE, 1, nullptr,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE, 1, nullptr,
+                                   syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+  this->insertInCommandAndReplyMap(syrlinks::READ_RX_STATUS_REGISTERS, 1, &rxDataset,
+                                   syrlinks::RX_STATUS_REGISTERS_REPLY_SIZE);
 }
 
 ReturnValue_t SyrlinksHkHandler::scanForReply(const uint8_t* start, size_t remainingSize,
@@ -151,25 +225,25 @@ ReturnValue_t SyrlinksHkHandler::scanForReply(const uint8_t* start, size_t remai
   ReturnValue_t result = RETURN_OK;
 
   if (*start != '<') {
-    sif::error << "SyrlinksHkHandler::scanForReply: Missing start frame character" << std::endl;
+    sif::warning << "SyrlinksHkHandler::scanForReply: Missing start frame character" << std::endl;
     return MISSING_START_FRAME_CHARACTER;
   }
 
   switch (*(start + 1)) {
     case ('A'):
-      *foundLen = SYRLINKS::ACK_SIZE;
-      *foundId = SYRLINKS::ACK_REPLY;
+      *foundLen = syrlinks::ACK_SIZE;
+      *foundId = syrlinks::ACK_REPLY;
       break;
     case ('E'):
-      *foundLen = SYRLINKS::RX_STATUS_REGISTERS_REPLY_SIZE;
-      *foundId = SYRLINKS::READ_RX_STATUS_REGISTERS;
+      *foundLen = syrlinks::RX_STATUS_REGISTERS_REPLY_SIZE;
+      *foundId = syrlinks::READ_RX_STATUS_REGISTERS;
       break;
     case ('R'):
       *foundId = rememberCommandId;
-      *foundLen = SYRLINKS::READ_ONE_REGISTER_REPLY_SIE;
+      *foundLen = syrlinks::READ_ONE_REGISTER_REPLY_SIE;
       break;
     default:
-      sif::error << "SyrlinksHkHandler::scanForReply: Unknown reply identifier" << std::endl;
+      sif::warning << "SyrlinksHkHandler::scanForReply: Unknown reply identifier" << std::endl;
       result = IGNORE_REPLY_DATA;
       break;
   }
@@ -177,69 +251,155 @@ ReturnValue_t SyrlinksHkHandler::scanForReply(const uint8_t* start, size_t remai
   return result;
 }
 
+ReturnValue_t SyrlinksHkHandler::getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) {
+  if (powerSwitch == power::NO_SWITCH) {
+    return DeviceHandlerBase::NO_SWITCH;
+  }
+  *numberOfSwitches = 1;
+  *switches = &powerSwitch;
+  return RETURN_OK;
+}
+
 ReturnValue_t SyrlinksHkHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) {
   ReturnValue_t result;
 
   switch (id) {
-    case (SYRLINKS::ACK_REPLY):
-      result = verifyReply(packet, SYRLINKS::ACK_SIZE);
+    case (syrlinks::ACK_REPLY): {
+      result = verifyReply(packet, syrlinks::ACK_SIZE);
       if (result != RETURN_OK) {
-        sif::error << "SyrlinksHkHandler::interpretDeviceReply: Acknowledgement reply has "
-                      "invalid crc"
-                   << std::endl;
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Acknowledgment reply has "
+                        "invalid crc"
+                     << std::endl;
         return CRC_FAILURE;
       }
-      result =
-          parseReplyStatus(reinterpret_cast<const char*>(packet + SYRLINKS::MESSAGE_HEADER_SIZE));
+      result = handleAckReply(packet);
       if (result != RETURN_OK) {
         return result;
       }
       break;
-    case (SYRLINKS::READ_RX_STATUS_REGISTERS):
-      result = verifyReply(packet, SYRLINKS::RX_STATUS_REGISTERS_REPLY_SIZE);
+    }
+    case (syrlinks::READ_RX_STATUS_REGISTERS): {
+      result = verifyReply(packet, syrlinks::RX_STATUS_REGISTERS_REPLY_SIZE);
       if (result != RETURN_OK) {
-        sif::error << "SyrlinksHkHandler::interpretDeviceReply: Read rx status registers reply "
-                   << "has invalid crc" << std::endl;
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read rx status registers reply "
+                     << "has invalid crc" << std::endl;
         return CRC_FAILURE;
       }
       parseRxStatusRegistersReply(packet);
       break;
-    case (SYRLINKS::READ_TX_STATUS):
-      result = verifyReply(packet, SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
+    }
+    case (syrlinks::READ_LCL_CONFIG): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
       if (result != RETURN_OK) {
-        sif::error << "SyrlinksHkHandler::interpretDeviceReply: Read tx status reply "
-                   << "has invalid crc" << std::endl;
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read config lcl reply "
+                     << "has invalid crc" << std::endl;
+        return CRC_FAILURE;
+      }
+      parseLclConfigReply(packet);
+      break;
+    }
+    case (syrlinks::READ_TX_STATUS): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+      if (result != RETURN_OK) {
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read tx status reply "
+                     << "has invalid crc" << std::endl;
         return CRC_FAILURE;
       }
       parseTxStatusReply(packet);
       break;
-    case (SYRLINKS::READ_TX_WAVEFORM):
-      result = verifyReply(packet, SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
+    }
+    case (syrlinks::READ_TX_WAVEFORM): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
       if (result != RETURN_OK) {
-        sif::error << "SyrlinksHkHandler::interpretDeviceReply: Read tx waveform reply "
-                   << "has invalid crc" << std::endl;
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read tx waveform reply "
+                     << "has invalid crc" << std::endl;
         return CRC_FAILURE;
       }
       parseTxWaveformReply(packet);
       break;
-    case (SYRLINKS::READ_TX_AGC_VALUE_HIGH_BYTE):
-      result = verifyReply(packet, SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
+    }
+    case (syrlinks::READ_TX_AGC_VALUE_HIGH_BYTE): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
       if (result != RETURN_OK) {
-        sif::error << "SyrlinksHkHandler::interpretDeviceReply: Read tx AGC high byte reply "
-                   << "has invalid crc" << std::endl;
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read tx AGC high byte reply "
+                     << "has invalid crc" << std::endl;
         return CRC_FAILURE;
       }
       parseAgcHighByte(packet);
       break;
-    case (SYRLINKS::READ_TX_AGC_VALUE_LOW_BYTE):
-      result = verifyReply(packet, SYRLINKS::READ_ONE_REGISTER_REPLY_SIE);
+    }
+    case (syrlinks::READ_TX_AGC_VALUE_LOW_BYTE): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
       if (result != RETURN_OK) {
-        sif::error << "SyrlinksHkHandler::interpretDeviceReply: Read tx AGC low byte reply "
-                   << "has invalid crc" << std::endl;
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read tx AGC low byte reply "
+                     << "has invalid crc" << std::endl;
         return CRC_FAILURE;
       }
       parseAgcLowByte(packet);
       break;
+    }
+    case (syrlinks::TEMP_BASEBAND_BOARD_HIGH_BYTE): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+      if (result != RETURN_OK) {
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read temperature baseband board "
+                     << "high byte reply has invalid crc" << std::endl;
+        return CRC_FAILURE;
+      }
+      rawTempBasebandBoard = convertHexStringToUint8(reinterpret_cast<const char*>(
+                                 packet + syrlinks::MESSAGE_HEADER_SIZE))
+                             << 8;
+      break;
+    }
+    case (syrlinks::TEMP_BASEBAND_BOARD_LOW_BYTE): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+      if (result != RETURN_OK) {
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read temperature baseband board"
+                        " low byte reply has invalid crc"
+                     << std::endl;
+        return CRC_FAILURE;
+      }
+      rawTempBasebandBoard |= convertHexStringToUint8(
+          reinterpret_cast<const char*>(packet + syrlinks::MESSAGE_HEADER_SIZE));
+      tempBasebandBoard = calcTempVal(rawTempBasebandBoard);
+      temperatureSet.temperatureBasebandBoard = tempBasebandBoard;
+      PoolReadGuard rg(&temperatureSet);
+      if (debug) {
+        sif::info << "Syrlinks temperature baseband board: " << tempBasebandBoard << "  °C"
+                  << std::endl;
+      }
+      break;
+    }
+    case (syrlinks::TEMP_POWER_AMPLIFIER_HIGH_BYTE): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+      if (result != RETURN_OK) {
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read temperature power amplifier "
+                     << "board high byte reply has invalid crc" << std::endl;
+        return CRC_FAILURE;
+      }
+      rawTempPowerAmplifier = 0;
+      rawTempPowerAmplifier = convertHexStringToUint8(reinterpret_cast<const char*>(
+                                  packet + syrlinks::MESSAGE_HEADER_SIZE))
+                              << 8;
+      break;
+    }
+    case (syrlinks::TEMP_POWER_AMPLIFIER_LOW_BYTE): {
+      result = verifyReply(packet, syrlinks::READ_ONE_REGISTER_REPLY_SIE);
+      if (result != RETURN_OK) {
+        sif::warning << "SyrlinksHkHandler::interpretDeviceReply: Read temperature power amplifier"
+                     << " board low byte reply has invalid crc" << std::endl;
+        return CRC_FAILURE;
+      }
+      rawTempPowerAmplifier |= convertHexStringToUint8(
+          reinterpret_cast<const char*>(packet + syrlinks::MESSAGE_HEADER_SIZE));
+      tempPowerAmplifier = calcTempVal(rawTempPowerAmplifier);
+      PoolReadGuard rg(&temperatureSet);
+      temperatureSet.temperaturePowerAmplifier = tempPowerAmplifier;
+      if (debug) {
+        sif::info << "Syrlinks temperature power amplifier board: " << tempPowerAmplifier << "  °C"
+                  << std::endl;
+      }
+      break;
+    }
     default: {
       sif::debug << "SyrlinksHkHandler::interpretDeviceReply: Unknown device reply id" << std::endl;
       return DeviceHandlerIF::UNKNOWN_DEVICE_REPLY;
@@ -254,8 +414,10 @@ LocalPoolDataSetBase* SyrlinksHkHandler::getDataSetHandle(sid_t sid) {
     return &rxDataset;
   } else if (sid == txDataset.getSid()) {
     return &txDataset;
+  } else if (sid == temperatureSet.getSid()) {
+    return &temperatureSet;
   } else {
-    sif::error << "SyrlinksHkHandler::getDataSetHandle: Invalid sid" << std::endl;
+    sif::warning << "SyrlinksHkHandler::getDataSetHandle: Invalid sid" << std::endl;
     return nullptr;
   }
 }
@@ -309,7 +471,8 @@ ReturnValue_t SyrlinksHkHandler::parseReplyStatus(const char* status) {
     case '0':
       return RETURN_OK;
     case '1':
-      sif::debug << "SyrlinksHkHandler::parseReplyStatus: Uart faming or parity error" << std::endl;
+      sif::debug << "SyrlinksHkHandler::parseReplyStatus: Uart framing or parity error"
+                 << std::endl;
       return UART_FRAMIN_OR_PARITY_ERROR_ACK;
     case '2':
       sif::debug << "SyrlinksHkHandler::parseReplyStatus: Bad character detected" << std::endl;
@@ -339,11 +502,11 @@ ReturnValue_t SyrlinksHkHandler::verifyReply(const uint8_t* packet, uint8_t size
   int result = 0;
   /* Calculate crc from received packet */
   uint16_t crc =
-      CRC::crc16ccitt(packet, size - SYRLINKS::SIZE_CRC_AND_TERMINATION, CRC_INITIAL_VALUE);
+      CRC::crc16ccitt(packet, size - syrlinks::SIZE_CRC_AND_TERMINATION, CRC_INITIAL_VALUE);
   std::string recalculatedCrc = convertUint16ToHexString(crc);
 
   const char* startOfCrc =
-      reinterpret_cast<const char*>(packet + size - SYRLINKS::SIZE_CRC_AND_TERMINATION);
+      reinterpret_cast<const char*>(packet + size - syrlinks::SIZE_CRC_AND_TERMINATION);
   const char* endOfCrc = reinterpret_cast<const char*>(packet + size - 1);
 
   std::string replyCrc(startOfCrc, endOfCrc);
@@ -357,7 +520,7 @@ ReturnValue_t SyrlinksHkHandler::verifyReply(const uint8_t* packet, uint8_t size
 
 void SyrlinksHkHandler::parseRxStatusRegistersReply(const uint8_t* packet) {
   PoolReadGuard readHelper(&rxDataset);
-  uint16_t offset = SYRLINKS::MESSAGE_HEADER_SIZE;
+  uint16_t offset = syrlinks::MESSAGE_HEADER_SIZE;
   rxDataset.rxStatus = convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
   offset += 2;
   rxDataset.rxSensitivity =
@@ -378,51 +541,68 @@ void SyrlinksHkHandler::parseRxStatusRegistersReply(const uint8_t* packet) {
   rxDataset.rxDataRate = convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
 
 #if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_SYRLINKS == 1
-  sif::info << "Syrlinks RX Status: 0x" << std::hex << (unsigned int)rxDataset.rxStatus.value
-            << std::endl;
-  sif::info << "Syrlinks RX Sensitivity: " << std::dec << rxDataset.rxSensitivity << std::endl;
-  sif::info << "Syrlinks RX Frequency Shift: " << rxDataset.rxFrequencyShift << std::endl;
-  sif::info << "Syrlinks RX IQ Power: " << rxDataset.rxIqPower << std::endl;
-  sif::info << "Syrlinks RX AGC Value: " << rxDataset.rxAgcValue << std::endl;
-  sif::info << "Syrlinks RX Demod Eb: " << rxDataset.rxDemodEb << std::endl;
-  sif::info << "Syrlinks RX Demod N0: " << rxDataset.rxDemodN0 << std::endl;
-  sif::info << "Syrlinks RX Datarate: " << (unsigned int)rxDataset.rxDataRate.value << std::endl;
+  if (debug) {
+    sif::info << "Syrlinks RX Status: 0x" << std::hex << (unsigned int)rxDataset.rxStatus.value
+              << std::endl;
+    sif::info << "Syrlinks RX Sensitivity: " << std::dec << rxDataset.rxSensitivity << std::endl;
+    sif::info << "Syrlinks RX Frequency Shift: " << rxDataset.rxFrequencyShift << std::endl;
+    sif::info << "Syrlinks RX IQ Power: " << rxDataset.rxIqPower << std::endl;
+    sif::info << "Syrlinks RX AGC Value: " << rxDataset.rxAgcValue << std::endl;
+    sif::info << "Syrlinks RX Demod Eb: " << rxDataset.rxDemodEb << std::endl;
+    sif::info << "Syrlinks RX Demod N0: " << rxDataset.rxDemodN0 << std::endl;
+    sif::info << "Syrlinks RX Datarate: " << (unsigned int)rxDataset.rxDataRate.value << std::endl;
+  }
 #endif
 }
 
+void SyrlinksHkHandler::parseLclConfigReply(const uint8_t* packet) {
+  uint16_t offset = syrlinks::MESSAGE_HEADER_SIZE;
+  uint8_t lclConfig = convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
+  if (debug) {
+    sif::info << "SyrlinksHkHandler::parseRxStatusRegistersReply: Lcl config: "
+              << static_cast<unsigned int>(lclConfig) << std::endl;
+  }
+}
+
 void SyrlinksHkHandler::parseTxStatusReply(const uint8_t* packet) {
   PoolReadGuard readHelper(&txDataset);
-  uint16_t offset = SYRLINKS::MESSAGE_HEADER_SIZE;
+  uint16_t offset = syrlinks::MESSAGE_HEADER_SIZE;
   txDataset.txStatus = convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_SYRLINKS == 1
-  sif::info << "Syrlinks TX Status: 0x" << std::hex << (unsigned int)txDataset.txStatus.value
-            << std::endl;
+#if OBSW_DEBUG_SYRLINKS == 1
+  if (debug) {
+    sif::info << "Syrlinks TX Status: 0x" << std::hex << (unsigned int)txDataset.txStatus.value
+              << std::endl;
+  }
 #endif
 }
 
 void SyrlinksHkHandler::parseTxWaveformReply(const uint8_t* packet) {
   PoolReadGuard readHelper(&txDataset);
-  uint16_t offset = SYRLINKS::MESSAGE_HEADER_SIZE;
+  uint16_t offset = syrlinks::MESSAGE_HEADER_SIZE;
   txDataset.txWaveform = convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_SYRLINKS == 1
-  sif::info << "Syrlinks TX Waveform: 0x" << std::hex << (unsigned int)txDataset.txWaveform.value
-            << std::endl;
+#if OBSW_DEBUG_SYRLINKS == 1
+  if (debug) {
+    sif::info << "Syrlinks TX Waveform: 0x" << std::hex << (unsigned int)txDataset.txWaveform.value
+              << std::endl;
+  }
 #endif
 }
 
 void SyrlinksHkHandler::parseAgcLowByte(const uint8_t* packet) {
   PoolReadGuard readHelper(&txDataset);
-  uint16_t offset = SYRLINKS::MESSAGE_HEADER_SIZE;
+  uint16_t offset = syrlinks::MESSAGE_HEADER_SIZE;
   txDataset.txAgcValue = agcValueHighByte << 8 |
                          convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
-#if OBSW_VERBOSE_LEVEL >= 1 && OBSW_DEBUG_SYRLINKS == 1
-  sif::info << "Syrlinks TX AGC Value: " << txDataset.txAgcValue << std::endl;
+#if OBSW_DEBUG_SYRLINKS == 1
+  if (debug) {
+    sif::info << "Syrlinks TX AGC Value: " << txDataset.txAgcValue << std::endl;
+  }
 #endif
 }
 
 void SyrlinksHkHandler::parseAgcHighByte(const uint8_t* packet) {
   PoolReadGuard readHelper(&txDataset);
-  uint16_t offset = SYRLINKS::MESSAGE_HEADER_SIZE;
+  uint16_t offset = syrlinks::MESSAGE_HEADER_SIZE;
   agcValueHighByte = convertHexStringToUint8(reinterpret_cast<const char*>(packet + offset));
 }
 
@@ -432,20 +612,45 @@ uint32_t SyrlinksHkHandler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo)
 
 ReturnValue_t SyrlinksHkHandler::initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
                                                          LocalDataPoolManager& poolManager) {
-  localDataPoolMap.emplace(SYRLINKS::RX_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_SENSITIVITY, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_FREQUENCY_SHIFT, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_IQ_POWER, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_AGC_VALUE, new PoolEntry<uint16_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_DEMOD_EB, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_DEMOD_N0, new PoolEntry<uint32_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::RX_DATA_RATE, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_SENSITIVITY, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_FREQUENCY_SHIFT, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_IQ_POWER, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_AGC_VALUE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_DEMOD_EB, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_DEMOD_N0, new PoolEntry<uint32_t>({0}));
+  localDataPoolMap.emplace(syrlinks::RX_DATA_RATE, new PoolEntry<uint8_t>({0}));
 
-  localDataPoolMap.emplace(SYRLINKS::TX_STATUS, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::TX_WAVEFORM, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(SYRLINKS::TX_AGC_VALUE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(syrlinks::TX_STATUS, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(syrlinks::TX_WAVEFORM, new PoolEntry<uint8_t>({0}));
+  localDataPoolMap.emplace(syrlinks::TX_AGC_VALUE, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(syrlinks::TEMP_BASEBAND_BOARD, new PoolEntry<uint16_t>({0}));
+  localDataPoolMap.emplace(syrlinks::TEMP_POWER_AMPLIFIER, new PoolEntry<uint16_t>({0}));
 
+  poolManager.subscribeForPeriodicPacket(txDataset.getSid(), false, 5.0, true);
+  poolManager.subscribeForPeriodicPacket(rxDataset.getSid(), false, 5.0, true);
+  poolManager.subscribeForPeriodicPacket(temperatureSet.getSid(), false, 10.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
 
 void SyrlinksHkHandler::setModeNormal() { mode = MODE_NORMAL; }
+
+float SyrlinksHkHandler::calcTempVal(uint16_t raw) { return 0.126984 * raw - 67.87; }
+
+ReturnValue_t SyrlinksHkHandler::handleAckReply(const uint8_t* packet) {
+  ReturnValue_t result =
+      parseReplyStatus(reinterpret_cast<const char*>(packet + syrlinks::MESSAGE_HEADER_SIZE));
+  if (rememberCommandId == syrlinks::WRITE_LCL_CONFIG and result != RETURN_OK) {
+    startupState = StartupState::OFF;
+  } else if (rememberCommandId == syrlinks::WRITE_LCL_CONFIG and result == RETURN_OK) {
+    startupState = StartupState::DONE;
+  }
+  return result;
+}
+
+void SyrlinksHkHandler::prepareCommand(std::string command, DeviceCommandId_t commandId) {
+  command.copy(reinterpret_cast<char*>(commandBuffer), command.size(), 0);
+  rawPacketLen = command.size();
+  rememberCommandId = commandId;
+  rawPacket = commandBuffer;
+}

mission/devices/SyrlinksHkHandler.h

@@ -1,10 +1,14 @@
 #ifndef MISSION_DEVICES_SYRLINKSHKHANDLER_H_
 #define MISSION_DEVICES_SYRLINKSHKHANDLER_H_
 
-#include <fsfw/devicehandlers/DeviceHandlerBase.h>
-#include <mission/devices/devicedefinitions/SyrlinksDefinitions.h>
 #include <string.h>
 
+#include "devices/powerSwitcherList.h"
+#include "fsfw/devicehandlers/DeviceHandlerBase.h"
+#include "fsfw/timemanager/Countdown.h"
+#include "fsfw_hal/linux/gpio/Gpio.h"
+#include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
+
 /**
  * @brief	This is the device handler for the syrlinks transceiver. It handles the command
  *          transmission and reading of housekeeping data via the housekeeping interface. The
@@ -15,7 +19,8 @@
  */
 class SyrlinksHkHandler : public DeviceHandlerBase {
  public:
-  SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie);
+  SyrlinksHkHandler(object_id_t objectId, object_id_t comIF, CookieIF* comCookie,
+                    power::Switch_t powerSwitch);
   virtual ~SyrlinksHkHandler();
 
   /**
@@ -28,12 +33,13 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
   void doShutDown() override;
   ReturnValue_t buildNormalDeviceCommand(DeviceCommandId_t* id) override;
   ReturnValue_t buildTransitionDeviceCommand(DeviceCommandId_t* id) override;
-  void fillCommandAndReplyMap() override;
   ReturnValue_t buildCommandFromCommand(DeviceCommandId_t deviceCommand, const uint8_t* commandData,
                                         size_t commandDataLen) override;
+  void fillCommandAndReplyMap() override;
   ReturnValue_t scanForReply(const uint8_t* start, size_t remainingSize, DeviceCommandId_t* foundId,
                              size_t* foundLen) override;
   ReturnValue_t interpretDeviceReply(DeviceCommandId_t id, const uint8_t* packet) override;
+  ReturnValue_t getSwitches(const uint8_t** switches, uint8_t* numberOfSwitches) override;
   void setNormalDatapoolEntriesInvalid() override;
   uint32_t getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) override;
   ReturnValue_t initializeLocalDataPool(localpool::DataPool& localDataPoolMap,
@@ -55,35 +61,59 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
 
   static const uint8_t CRC_INITIAL_VALUE = 0x0;
 
+  // Uses CRC-16/XMODEM
   std::string resetCommand = "<C04:5A5A:FF41>";
   std::string readRxStatusRegCommand = "<E00::825B>";
   std::string setTxModeStandby = "<W04:4000:7E58>";
   /** W - write, 04 - 4 bytes in data field, 01 - value, 40 register to write value */
   std::string setTxModeModulation = "<W04:4001:4D69>";
+  std::string configBPSK = "<W04:4007:E7CF>";
+  std::string configOQPSK = "<W04:400B:1063>";
   std::string setTxModeCw = "<W04:4010:4968>";
+  std::string writeLclConfig = "<W04:0707:3FE4>";
+  std::string setWaveformOQPSK = "<W04:4403:E1FA>";
+  std::string setWaveformBPSK = "<W04:4406:1E0F>";
   std::string readTxStatus = "<R02:40:7555>";
   std::string readTxWaveform = "<R02:44:B991>";
   std::string readTxAgcValueHighByte = "<R02:46:DFF3>";
   std::string readTxAgcValueLowByte = "<R02:47:ECC2>";
+  std::string readLclConfig = "<R02:07:3002>";
+  std::string tempPowerAmpBoardHighByte = "<R02:C0:28CD>";
+  std::string tempPowerAmpBoardLowByte = "<R02:C1:1BFC>";
+  std::string tempBasebandBoardHighByte = "<R02:C2:4EAF>";
+  std::string tempBasebandBoardLowByte = "<R02:C3:7D9E>";
 
   /**
    * In some cases it is not possible to extract from the received reply the information about
    * the associated command. This variable is thus used to remember the command id.
    */
-  DeviceCommandId_t rememberCommandId = SYRLINKS::NONE;
+  DeviceCommandId_t rememberCommandId = syrlinks::NONE;
 
-  SYRLINKS::RxDataset rxDataset;
-  SYRLINKS::TxDataset txDataset;
+  syrlinks::RxDataset rxDataset;
+  syrlinks::TxDataset txDataset;
+  syrlinks::TemperatureSet temperatureSet;
 
-  uint8_t agcValueHighByte;
+  const power::Switch_t powerSwitch = power::NO_SWITCH;
 
-  uint8_t commandBuffer[SYRLINKS::MAX_COMMAND_SIZE];
+  uint8_t agcValueHighByte = 0;
+  uint16_t rawTempPowerAmplifier = 0;
+  uint16_t rawTempBasebandBoard = 0;
+  float tempPowerAmplifier = 0;
+  float tempBasebandBoard = 0;
+
+  uint8_t commandBuffer[syrlinks::MAX_COMMAND_SIZE];
+
+  enum class StartupState { OFF, ENABLE_TEMPERATURE_PROTECTION, DONE };
+
+  StartupState startupState = StartupState::OFF;
+
+  bool debug = false;
 
   /**
    * This object is used to store the id of the next command to execute. This controls the
    * read out of multiple registers which can not be fetched with one single command.
    */
-  DeviceCommandId_t nextCommand = SYRLINKS::READ_RX_STATUS_REGISTERS;
+  DeviceCommandId_t nextCommand = syrlinks::READ_RX_STATUS_REGISTERS;
 
   /**
    * @brief   This function converts an uint16_t into its hexadecimal string representation.
@@ -152,6 +182,8 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
    */
   void parseRxStatusRegistersReply(const uint8_t* packet);
 
+  void parseLclConfigReply(const uint8_t* packet);
+
   /**
    * @brief   This function writes the read tx status register to the txStatusDataset.
    * @param packet    Pointer to the received packet.
@@ -169,6 +201,15 @@ class SyrlinksHkHandler : public DeviceHandlerBase {
    */
   void parseAgcLowByte(const uint8_t* packet);
   void parseAgcHighByte(const uint8_t* packet);
+
+  /**
+   * @brief Calculates temperature in degree celcius form raw value
+   */
+  float calcTempVal(uint16_t);
+
+  ReturnValue_t handleAckReply(const uint8_t* packet);
+
+  void prepareCommand(std::string command, DeviceCommandId_t commandId);
 };
 
 #endif /* MISSION_DEVICES_SYRLINKSHKHANDLER_H_ */

mission/devices/Tmp1075Handler.cpp

@@ -119,6 +119,7 @@ uint32_t Tmp1075Handler::getTransitionDelayMs(Mode_t modeFrom, Mode_t modeTo) {
 
 ReturnValue_t Tmp1075Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                       LocalDataPoolManager &poolManager) {
-  localDataPoolMap.emplace(TMP1075::TEMPERATURE_C_TMP1075_1, new PoolEntry<float>({0.0}));
+  localDataPoolMap.emplace(TMP1075::TEMPERATURE_C_TMP1075, new PoolEntry<float>({0.0}));
+  poolManager.subscribeForPeriodicPacket(dataset.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }

mission/devices/devicedefinitions/GPSDefinitions.h

@@ -6,6 +6,13 @@
 
 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;