From 0b1aff220c6f6cc77b454a0c59e21744952501d6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 7 Jun 2023 17:25:51 +0200
Subject: [PATCH] moved 2 parameters

---
 eive_tmtc/tmtc/power/tm.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/eive_tmtc/tmtc/power/tm.py b/eive_tmtc/tmtc/power/tm.py
index 7dc236a..dd93cf6 100644
--- a/eive_tmtc/tmtc/power/tm.py
+++ b/eive_tmtc/tmtc/power/tm.py
@@ -150,11 +150,9 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
     current_idx = 0
     priv_idx = pdu_idx - 1
     if set_id == SetId.AUX or set_id == SetId.AUX:
-        fmt_str = "!hhBBBIIH"
+        fmt_str = "!BBBIIH"
         inc_len = struct.calcsize(fmt_str)
         (
-            vcc,
-            vbat,
             conv_enb_0,
             conv_enb_1,
             conv_enb_2,
@@ -162,7 +160,6 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
             uptime,
             reset_cause,
         ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-        pw.dlog(f"VCC {vcc} mV | VBAT {vbat} mV")
         pw.dlog(f"Converter Enables [{conv_enb_0},{conv_enb_1},{conv_enb_2}]")
         pw.dlog(
             f"Boot Cause {boot_cause} | Uptime {uptime} | Reset Cause {reset_cause}",
@@ -213,14 +210,14 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
                 f"{voltage_list[idx]:05} | {current_list[idx]:04}"
             )
             pw.dlog(content_line)
-        fmt_str = "!IBf"
+        fmt_str = "!IBfhh"
         inc_len = struct.calcsize(fmt_str)
-        (boot_count, batt_mode, temperature) = struct.unpack(
+        (boot_count, batt_mode, temperature, vcc, vbat) = struct.unpack(
             fmt_str, hk_data[current_idx : current_idx + inc_len]
         )
         info = (
             f"Boot Count {boot_count} | Battery Mode {batt_mode} | "
-            f"Temperature {temperature}"
+            f"Temperature {temperature} | VCC {vcc} | VBAT {vbat}"
         )
         pw.dlog(info)