From 23625b24963dc2a3d7fd85b47bfbcb6568f7e948 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 31 May 2023 09:53:13 +0200
Subject: [PATCH 1/3] move 2 pool variables

---
 mission/power/gsDefs.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mission/power/gsDefs.h b/mission/power/gsDefs.h
index d42cabd2..00bdf589 100644
--- a/mission/power/gsDefs.h
+++ b/mission/power/gsDefs.h
@@ -404,6 +404,11 @@ class PduCoreHk : public StaticLocalDataSet<9> {
   /** Battery mode: 1 = Critical, 2 = Safe, 3 = Normal, 4 = Full */
   lp_var_t<uint8_t> battMode = lp_var_t<uint8_t>(sid.objectId, pool::PDU_BATT_MODE, this);
   lp_var_t<float> temperature = lp_var_t<float>(sid.objectId, pool::PDU_TEMPERATURE, this);
+
+  /** Measured VCC */
+  lp_var_t<int16_t> vcc = lp_var_t<int16_t>(sid.objectId, pool::PDU_VCC, this);
+  /** Measured VBAT */
+  lp_var_t<int16_t> vbat = lp_var_t<int16_t>(sid.objectId, pool::PDU_VBAT, this);
 };
 
 class PduConfig : public StaticLocalDataSet<32> {
@@ -451,11 +456,6 @@ class PduAuxHk : public StaticLocalDataSet<36> {
 
   PduAuxHk(object_id_t objectId, uint32_t setId) : StaticLocalDataSet(sid_t(objectId, setId)) {}
 
-  /** Measured VCC */
-  lp_var_t<int16_t> vcc = lp_var_t<int16_t>(sid.objectId, pool::PDU_VCC, this);
-  /** Measured VBAT */
-  lp_var_t<int16_t> vbat = lp_var_t<int16_t>(sid.objectId, pool::PDU_VBAT, this);
-
   /** Output converter enable status */
   lp_vec_t<uint8_t, 3> converterEnable =
       lp_vec_t<uint8_t, 3>(sid.objectId, pool::PDU_CONV_EN, this);
-- 
2.43.0


From f4523c8396e1d3684079e3d5b26c9afb948cba12 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 31 May 2023 10:39:56 +0200
Subject: [PATCH 2/3] that should fix some issues

---
 mission/power/GomspaceDeviceHandler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mission/power/GomspaceDeviceHandler.cpp b/mission/power/GomspaceDeviceHandler.cpp
index 89fca8ee..c20ac4e9 100644
--- a/mission/power/GomspaceDeviceHandler.cpp
+++ b/mission/power/GomspaceDeviceHandler.cpp
@@ -595,8 +595,8 @@ ReturnValue_t GomspaceDeviceHandler::parsePduHkTable(PDU::PduCoreHk& coreHk, PDU
   for (uint8_t idx = 0; idx < PDU::CHANNELS_LEN; idx++) {
     coreHk.voltages[idx] = as<uint16_t>(packet + 0x12 + (idx * 2));
   }
-  auxHk.vcc.value = as<int16_t>(packet + 0x24);
-  auxHk.vbat.value = as<int16_t>(packet + 0x26);
+  coreHk.vcc.value = as<int16_t>(packet + 0x24);
+  coreHk.vbat.value = as<int16_t>(packet + 0x26);
   coreHk.temperature = as<int16_t>(packet + 0x28) * 0.1;
 
   for (uint8_t idx = 0; idx < 3; idx++) {
-- 
2.43.0


From c1f8512b013eb4f5b0946cc49ec993dd5fcceb13 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 9 Jun 2023 13:10:29 +0200
Subject: [PATCH 3/3] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a2af1ca..937df112 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,7 @@ will consitute of a breaking change warranting a new major release:
   only be used to cancel a transfer.
 - Handling of multiple RWs in the ACS Controller is improved and can be changed by parameter
   commands.
+- Moved PDU `vcc` and `vbat` variable from auxiliary dataset to core dataset.
 
 ## Added
 
-- 
2.43.0