From a14ca283cc4afab35990b82d4becdaf0c6241b5b Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 12 Apr 2022 16:36:04 +0200
Subject: [PATCH] using vector for convert enables

---
 linux/devices/GPSHyperionLinuxController.cpp       |  1 -
 mission/devices/GomspaceDeviceHandler.cpp          | 14 +++++---------
 mission/devices/PDU1Handler.cpp                    |  2 +-
 mission/devices/PDU2Handler.cpp                    |  2 +-
 .../devicedefinitions/GomspaceDefinitions.h        | 12 +++---------
 tmtc                                               |  2 +-
 6 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/linux/devices/GPSHyperionLinuxController.cpp b/linux/devices/GPSHyperionLinuxController.cpp
index d1ef7d1b..20860211 100644
--- a/linux/devices/GPSHyperionLinuxController.cpp
+++ b/linux/devices/GPSHyperionLinuxController.cpp
@@ -3,7 +3,6 @@
 #include "OBSWConfig.h"
 #include "fsfw/datapool/PoolReadGuard.h"
 #include "fsfw/timemanager/Clock.h"
-
 #include "linux/utility/utility.h"
 #include "mission/utility/compileTime.h"
 
diff --git a/mission/devices/GomspaceDeviceHandler.cpp b/mission/devices/GomspaceDeviceHandler.cpp
index fd11a8a2..d24abfe3 100644
--- a/mission/devices/GomspaceDeviceHandler.cpp
+++ b/mission/devices/GomspaceDeviceHandler.cpp
@@ -366,9 +366,7 @@ ReturnValue_t GomspaceDeviceHandler::initializePduPool(
   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_1, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN_2, new PoolEntry<uint8_t>({0}));
-  localDataPoolMap.emplace(P60System::pool::PDU_CONV_EN_3, new PoolEntry<uint8_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()));
@@ -476,12 +474,10 @@ ReturnValue_t GomspaceDeviceHandler::parsePduHkTable(PDU::PduCoreHk& coreHk, PDU
   coreHk.temperature = *(packet + dataOffset) << 8 | *(packet + dataOffset + 1);
   dataOffset += 4;
 
-  auxHk.converterEnable1 = *(packet + dataOffset);
-  dataOffset += 3;
-  auxHk.converterEnable2 = *(packet + dataOffset);
-  dataOffset += 3;
-  auxHk.converterEnable3 = *(packet + dataOffset);
-  dataOffset += 3;
+  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];
diff --git a/mission/devices/PDU1Handler.cpp b/mission/devices/PDU1Handler.cpp
index 0f7bbfe1..a466375f 100644
--- a/mission/devices/PDU1Handler.cpp
+++ b/mission/devices/PDU1Handler.cpp
@@ -85,7 +85,7 @@ void PDU1Handler::parseHkTableReply(const uint8_t *packet) {
 ReturnValue_t PDU1Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                    LocalDataPoolManager &poolManager) {
   initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU1);
-  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, false);
+  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, true);
   poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
diff --git a/mission/devices/PDU2Handler.cpp b/mission/devices/PDU2Handler.cpp
index 74b15143..e5d88644 100644
--- a/mission/devices/PDU2Handler.cpp
+++ b/mission/devices/PDU2Handler.cpp
@@ -48,7 +48,7 @@ void PDU2Handler::parseHkTableReply(const uint8_t *packet) {
 ReturnValue_t PDU2Handler::initializeLocalDataPool(localpool::DataPool &localDataPoolMap,
                                                    LocalDataPoolManager &poolManager) {
   initializePduPool(localDataPoolMap, poolManager, pcdu::INIT_SWITCHES_PDU2);
-  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, false);
+  poolManager.subscribeForPeriodicPacket(coreHk.getSid(), false, 10.0, true);
   poolManager.subscribeForPeriodicPacket(auxHk.getSid(), false, 30.0, false);
   return HasReturnvaluesIF::RETURN_OK;
 }
diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index a4a864d3..5c59d3d8 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -107,9 +107,7 @@ enum Ids : lp_id_t {
   PDU_VCC,
   PDU_VBAT,
   PDU_TEMPERATURE,
-  PDU_CONV_EN_1,
-  PDU_CONV_EN_2,
-  PDU_CONV_EN_3,
+  PDU_CONV_EN,
   PDU_OUT_ENABLE,
   PDU_BOOTCAUSE,
   PDU_BOOTCNT,
@@ -430,12 +428,8 @@ class PduAuxHk : public StaticLocalDataSet<36> {
   lp_var_t<int16_t> vbat = lp_var_t<int16_t>(sid.objectId, P60System::pool::PDU_VBAT, this);
 
   /** Output converter enable status */
-  lp_var_t<uint8_t> converterEnable1 =
-      lp_var_t<uint8_t>(sid.objectId, P60System::pool::PDU_CONV_EN_1, this);
-  lp_var_t<uint8_t> converterEnable2 =
-      lp_var_t<uint8_t>(sid.objectId, P60System::pool::PDU_CONV_EN_2, this);
-  lp_var_t<uint8_t> converterEnable3 =
-      lp_var_t<uint8_t>(sid.objectId, P60System::pool::PDU_CONV_EN_3, this);
+  lp_vec_t<uint8_t, 3> converterEnable =
+      lp_vec_t<uint8_t, 3>(sid.objectId, P60System::pool::PDU_CONV_EN, this);
 
   lp_var_t<uint32_t> bootcause =
       lp_var_t<uint32_t>(sid.objectId, P60System::pool::PDU_BOOTCAUSE, this);
diff --git a/tmtc b/tmtc
index c995ca2d..ecb973c3 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit c995ca2ddac4b352bce34071366a8cee7724973a
+Subproject commit ecb973c37fe43954d0be1f19b0735b3546d2ef1b