From 88f319bed4bdeb07e2803da93d1fb5ac4e0a59da Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 27 May 2022 14:29:56 +0200
Subject: [PATCH 01/19] syrlinks HK procedure

---
 pus_tc/devs/star_tracker.py        |  6 +++++-
 pus_tc/devs/syrlinks_hk_handler.py | 10 ++++++----
 pus_tc/system/proc.py              | 30 ++++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/pus_tc/devs/star_tracker.py b/pus_tc/devs/star_tracker.py
index d8c9a94..bbe3c2c 100644
--- a/pus_tc/devs/star_tracker.py
+++ b/pus_tc/devs/star_tracker.py
@@ -85,6 +85,10 @@ class StarTrackerActionIds:
     FIRMWARE_UPDATE = 84
 
 
+class OpCodes:
+    NORMAL = ["2", "nml"]
+
+
 class SetIds:
     TEMPERATURE = 25
 
@@ -172,7 +176,7 @@ def pack_star_tracker_commands(object_id: bytearray, tc_queue: TcQueueT, op_code
         command = pack_mode_data(object_id, Modes.ON, Submode.FIRMWARE)
         command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "2":
+    if op_code in OpCodes.NORMAL:
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Normal"))
         command = pack_mode_data(object_id, Modes.NORMAL, 0)
         command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
diff --git a/pus_tc/devs/syrlinks_hk_handler.py b/pus_tc/devs/syrlinks_hk_handler.py
index 48adbcd..6937bd6 100644
--- a/pus_tc/devs/syrlinks_hk_handler.py
+++ b/pus_tc/devs/syrlinks_hk_handler.py
@@ -19,6 +19,10 @@ class SetIds:
     TX_REGISTERS_DATASET = 2
 
 
+class OpCodes:
+    NORMAL = ["2", "nml"]
+
+
 class CommandIds:
     READ_RX_STATUS_REGISTERS = 2
     SET_TX_MODE_STANDBY = 3
@@ -37,9 +41,7 @@ class CommandIds:
     DISABLE_DEBUG = 21
 
 
-def pack_syrlinks_command(
-    object_id: bytearray, tc_queue: TcQueueT, op_code: str
-) -> TcQueueT:
+def pack_syrlinks_command(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     tc_queue.appendleft(
         (
             QueueCommands.PRINT,
@@ -57,7 +59,7 @@ def pack_syrlinks_command(
         command = pack_mode_data(object_id, Modes.ON, 0)
         command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "2":
+    if op_code in OpCodes.NORMAL:
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Mode Normal"))
         command = pack_mode_data(object_id, Modes.NORMAL, 0)
         command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py
index 7c6a4b6..64df168 100644
--- a/pus_tc/system/proc.py
+++ b/pus_tc/system/proc.py
@@ -30,6 +30,9 @@ from pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
 from pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
 from pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2
 from pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3
+from pus_tc.devs.syrlinks_hk_handler import OpCodes as SyrlinksOpCodes
+from pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds
+from pus_tc.devs.star_tracker import OpCodes as StrOpCodes
 from pus_tc.devs.gps import SetIds as GpsSetIds
 from pus_tc.devs.imtq import ImtqSetIds
 from pus_tc.devs.sus import SetIds
@@ -57,6 +60,7 @@ class OpCodes:
     STR_FT = ["str-ft"]
     RW_FT_ONE_RW = ["rw-ft-one-rw"]
     RW_FT_TWO_RWS = ["rw-ft-two-rws"]
+    SYRLINKS_FT = ["syrlinks-ft"]
     TV_TEARDOWN_TCS_FT_OFF = ["teardown", "tcs-ft-off"]
 
 
@@ -67,6 +71,7 @@ class KeyAndInfo:
     BAT_FT = ["BPX Battery", "battery functional test"]
     CORE_FT = ["OBC", "OBC functional test"]
     PCDU_FT = ["PCDU", "PCDU functional test"]
+    SYRLINKS_FT = ["Syrlinks", "Syrlinks functional test"]
     RAD_SEN_FT = ["Radiation Sensor", "Radiation Sensor functional test"]
     ACS_FT = ["ACS", "ACS functional test"]
     MGT_FT = ["MGT", "MGT functional test"]
@@ -85,7 +90,12 @@ PROC_INFO_DICT = {
     KAI.CORE_FT[0]: [OpCodes.CORE_FT, KAI.CORE_FT[1], 120.0, 10.0],
     KAI.PCDU_FT[0]: [OpCodes.PCDU_FT, KAI.PCDU_FT[1], 120.0, 10.0],
     KAI.RAD_SEN_FT[0]: [OpCodes.RAD_SEN_FT, KAI.RAD_SEN_FT[1], 120.0, 10.0],
-    KAI.TCS_FT_ON[0]: [OpCodes.TV_SETUP_TCS_FT_ON, KAI.TCS_FT_ON[1], 120.0, 10.0],
+    KAI.TV_SETUP_TCS_FT_ON[0]: [
+        OpCodes.TV_SETUP_TCS_FT_ON,
+        KAI.TV_SETUP_TCS_FT_ON[1],
+        120.0,
+        10.0,
+    ],
     KAI.TV_TEARDOWN_TCS_FT_OFF[0]: [
         OpCodes.TV_TEARDOWN_TCS_FT_OFF,
         KAI.TV_TEARDOWN_TCS_FT_OFF[1],
@@ -474,11 +484,27 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str):
 
         pack_acs_command(tc_queue=tc_queue, op_code="sus-off")
 
+    if op_code in OpCodes.SYRLINKS_FT:
+        key = KAI.SYRLINKS_FT[0]
+        sid_list = [
+            make_sid(oids.SYRLINKS_HANDLER_ID, SyrlinksSetIds.RX_REGISTERS_DATASET),
+            make_sid(oids.SYRLINKS_HANDLER_ID, SyrlinksSetIds.TX_REGISTERS_DATASET),
+        ]
+        # HK listening
+        pack_generic_hk_listening_cmds(
+            tc_queue=tc_queue,
+            proc_key=key,
+            sid_list=sid_list,
+            diag=False,
+            cfg=GenericHkListeningCfg.default(),
+        )
     if op_code in OpCodes.STR_FT:
         key = KAI.STR_FT[0]
 
         pack_star_tracker_commands(
-            object_id=oids.STAR_TRACKER_ID, tc_queue=tc_queue, op_code="2"
+            object_id=oids.STAR_TRACKER_ID,
+            tc_queue=tc_queue,
+            op_code=StrOpCodes.NORMAL[0],
         )
 
         # STR

From 85a113986ec560a6ca812ab90b683d3171027338 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 24 Aug 2022 11:19:49 +0200
Subject: [PATCH 02/19] update power cmds

---
 .run/PLOC_SUPV.run.xml         |  2 +-
 deps/tmtccmd                   |  2 +-
 gomspace/gomspace_common.py    | 39 ++++++++++++++++++++++++++++------
 pus_tc/devs/acu.py             | 27 ++++++-----------------
 pus_tc/devs/common_power.py    | 31 ++++++++++++++++++++++++++-
 pus_tc/devs/pdu1.py            | 18 ++++++----------
 pus_tc/devs/pdu2.py            | 13 ++++++------
 pus_tc/devs/power.py           | 36 ++++++++++++++++---------------
 pus_tm/action_reply_handler.py | 37 ++++++++------------------------
 9 files changed, 111 insertions(+), 94 deletions(-)

diff --git a/.run/PLOC_SUPV.run.xml b/.run/PLOC_SUPV.run.xml
index 62c49bb..472a471 100644
--- a/.run/PLOC_SUPV.run.xml
+++ b/.run/PLOC_SUPV.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PLOC SUPV" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PLOC SUPV" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/deps/tmtccmd b/deps/tmtccmd
index 87a430e..acaea6d 160000
--- a/deps/tmtccmd
+++ b/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 87a430eb5cfea01d8265c3b327269799954c64ee
+Subproject commit acaea6d9b6fe1d31283604e44c0977365c97040e
diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index eb08ca4..958eed5 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -11,7 +11,8 @@ import struct
 from typing import Union
 
 from spacepackets.ecss import PusTelecommand
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 
 
@@ -28,18 +29,19 @@ class GomspaceDeviceActionIds(enum.IntEnum):
 
 class GomspaceOpCodes:
     # Request HK
-    REQUEST_CORE_HK_ONCE = ["hk-core", "128"]
-    REQUEST_AUX_HK_ONCE = ["hk-aux", "129"]
+    REQUEST_CORE_HK_ONCE = ["hk_core", "128"]
+    REQUEST_AUX_HK_ONCE = ["hk_aux", "129"]
     PRINT_SWITCH_V_I = ["print-switch-vi", "130"]
     PRINT_LATCHUPS = ["print-latchups", "131"]
-    GET_PARAM = ["get-param", "132"]
-    SET_PARAM = ["set-param", "133"]
+    GET_PARAM = ["get_param", "132"]
+    SET_PARAM = ["set_param", "133"]
 
 
 class GsInfo:
     REQUEST_CORE_HK_ONCE = "Requesting Core HK once"
     REQUEST_AUX_HK_ONCE = "Requesting Aux HK once"
     PRINT_SWITCH_V_I = "Print Switch V I Info"
+    PRINT_LATCHUPS = "Print latchups"
     GET_PARAMETER = "Get parameter"
     SET_PARAMETER = "Set parameter"
 
@@ -135,8 +137,31 @@ def pack_set_param_command(
         app_data.append(byte_two)
         app_data.append(byte_three)
         app_data.append(byte_four)
-    return generate_action_command(
-        object_id=object_id, action_id=action_id, app_data=app_data, ssc=ssc
+    return make_fsfw_action_cmd(
+        object_id=object_id, action_id=action_id, user_data=app_data
+    )
+
+
+def prompt_and_pack_get_param_command(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
+    table_id = int(input("Specify table ID: "))
+    memory_address = int(input("Specify memory address: 0x"), 16)
+    parameter_size = int(input("Specify parameter size: "))
+    q.add_pus_tc(
+        pack_get_param_command(
+            object_id.as_bytes, table_id, memory_address, parameter_size
+        )
+    )
+
+
+def prompt_and_pack_set_param_command(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
+    memory_address = int(input("Specify memory address: 0x"), 16)
+    memory_address = struct.pack("!H", memory_address)
+    parameter_size = int(input("Specify parameter size: "))
+    parameter = int(input("Specify parameter: "))
+    q.add_pus_tc(
+        pack_set_param_command(
+            object_id.as_bytes, memory_address, parameter_size, parameter
+        )
     )
 
 
diff --git a/pus_tc/devs/acu.py b/pus_tc/devs/acu.py
index 9f846c9..01d0237 100644
--- a/pus_tc/devs/acu.py
+++ b/pus_tc/devs/acu.py
@@ -91,34 +91,19 @@ def pack_acu_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
             )
         )
     if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        q.add_log_cmd(f"PDU1: {GsInfo.REQUEST_CORE_HK_ONCE}")
+        q.add_log_cmd(f"ACU: {GsInfo.REQUEST_CORE_HK_ONCE}")
         hk_sid = make_sid(object_id=object_id.as_bytes, set_id=gs.SetIds.ACU_CORE)
         q.add_pus_tc(generate_one_diag_command(sid=hk_sid))
     if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        q.add_log_cmd(f"PDU1: {GsInfo.REQUEST_AUX_HK_ONCE}")
+        q.add_log_cmd(f"ACU: {GsInfo.REQUEST_AUX_HK_ONCE}")
         hk_sid = make_sid(object_id=object_id.as_bytes, set_id=gs.SetIds.ACU_AUX)
         q.add_pus_tc(generate_one_hk_command(sid=hk_sid))
     if op_code in GomspaceOpCodes.GET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.GET_PARAMETER}")
-        table_id = int(input("Specify table ID: "))
-        memory_address = int(input("Specify memory address: 0x"), 16)
-        parameter_size = int(input("Specify parameter size: "))
-        q.add_pus_tc(
-            gs.pack_get_param_command(
-                object_id.as_bytes, table_id, memory_address, parameter_size
-            )
-        )
+        q.add_log_cmd(f"ACU: {GsInfo.GET_PARAMETER}")
+        gs.prompt_and_pack_get_param_command(q, object_id)
     if op_code in GomspaceOpCodes.SET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.SET_PARAMETER}")
-        memory_address = int(input("Specify memory address: 0x"), 16)
-        memory_address = struct.pack("!H", memory_address)
-        parameter_size = int(input("Specify parameter size: "))
-        parameter = int(input("Specify parameter: "))
-        q.add_pus_tc(
-            gs.pack_set_param_command(
-                object_id.as_bytes, memory_address, parameter_size, parameter
-            )
-        )
+        q.add_log_cmd(f"ACU: {GsInfo.SET_PARAMETER}")
+        gs.prompt_and_pack_set_param_command(q, object_id)
     pack_test_cmds(object_id=object_id, q=q)
 
 
diff --git a/pus_tc/devs/common_power.py b/pus_tc/devs/common_power.py
index 0e5741e..122561a 100644
--- a/pus_tc/devs/common_power.py
+++ b/pus_tc/devs/common_power.py
@@ -1,4 +1,5 @@
 import enum
+import struct
 
 from config.object_ids import PDU_1_HANDLER_ID, PDU_2_HANDLER_ID
 from gomspace.gomspace_common import (
@@ -6,9 +7,10 @@ from gomspace.gomspace_common import (
     Channel,
     GomspaceOpCodes,
     GsInfo,
-    SetIds,
+    SetIds, GomspaceDeviceActionIds,
 )
 from gomspace.gomspace_pdu_definitions import PDU_CONFIG_LIST
+from pus_tm.defs import PrintWrapper
 from tmtccmd.config import OpCodeEntry
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import (
@@ -16,6 +18,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_diag_command,
     generate_one_hk_command,
 )
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
 class Pdu1ChIndex(enum.IntEnum):
@@ -440,3 +443,29 @@ def generic_off_cmd(
             Channel.off,
         )
     )
+
+
+def handle_get_param_data_reply(
+    action_id: int, pw: PrintWrapper, custom_data: bytearray
+):
+    if action_id == GomspaceDeviceActionIds.PARAM_GET:
+        header_list = [
+            "Gomspace action ID",
+            "Table ID",
+            "Memory Address",
+            "Payload length",
+            "Payload",
+        ]
+        fmt_str = "!BBHH"
+        (action, table_id, address, payload_length) = struct.unpack(
+            fmt_str, custom_data[:6]
+        )
+        content_list = [
+            action,
+            table_id,
+            hex(address),
+            payload_length,
+            "0x" + custom_data[6:].hex(),
+        ]
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")
diff --git a/pus_tc/devs/pdu1.py b/pus_tc/devs/pdu1.py
index 4662b0e..3d21d8d 100644
--- a/pus_tc/devs/pdu1.py
+++ b/pus_tc/devs/pdu1.py
@@ -53,6 +53,12 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
             )
         )
+    if op_code in GomspaceOpCodes.SET_PARAM:
+        q.add_log_cmd(f"PDU1: {GsInfo.SET_PARAMETER}")
+        prompt_and_pack_set_param_command(q, object_id)
+    if op_code in GomspaceOpCodes.GET_PARAM:
+        q.add_log_cmd(f"PDU1: {GsInfo.GET_PARAMETER}")
+        gs.prompt_and_pack_get_param_command(q, object_id)
     if PDU1TestProcedure.all or PDU1TestProcedure.ping:
         q.add_log_cmd("PDU1: Ping Test")
         ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
@@ -107,14 +113,4 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
                 Channel.off,
             )
         )
-    if op_code in GomspaceOpCodes.SET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.SET_PARAMETER}")
-        memory_address = int(input("Specify memory address: 0x"), 16)
-        memory_address = struct.pack("!H", memory_address)
-        parameter_size = int(input("Specify parameter size: "))
-        parameter = int(input("Specify parameter: "))
-        q.add_pus_tc(
-            gs.pack_set_param_command(
-                object_id.as_bytes, memory_address, parameter_size, parameter
-            )
-        )
+
diff --git a/pus_tc/devs/pdu2.py b/pus_tc/devs/pdu2.py
index 6ccd49d..af08fbc 100644
--- a/pus_tc/devs/pdu2.py
+++ b/pus_tc/devs/pdu2.py
@@ -6,16 +6,9 @@
 @author J. Meier
 @date   17.12.2020
 """
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    generate_one_hk_command,
-    generate_one_diag_command,
-    make_sid,
-)
 from pus_tc.devs.common_power import pdu2_cmds, pdu2_req_hk_cmds
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
-from config.object_ids import PDU_2_HANDLER_ID
 
 
 class PDU2TestProcedure:
@@ -64,6 +57,12 @@ def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
             )
         )
+    if op_code in GomspaceOpCodes.SET_PARAM:
+        q.add_log_cmd(f"PDU1: {GsInfo.SET_PARAMETER}")
+        prompt_and_pack_set_param_command(q, object_id)
+    if op_code in GomspaceOpCodes.GET_PARAM:
+        q.add_log_cmd(f"PDU1: {GsInfo.GET_PARAMETER}")
+        prompt_and_pack_get_param_command(q, object_id)
     if PDU2TestProcedure.all or PDU2TestProcedure.reboot:
         q.add_log_cmd("PDU2: Reboot")
         q.add_pus_tc(pack_reboot_command(object_id))
diff --git a/pus_tc/devs/power.py b/pus_tc/devs/power.py
index 0b8de91..a05c0d2 100644
--- a/pus_tc/devs/power.py
+++ b/pus_tc/devs/power.py
@@ -50,13 +50,7 @@ def add_p60_cmds(defs: TmtcDefinitionWrapper):
     oce.add(keys=P60OpCodes.STACK_3V3_OFF, info=P60Info.STACK_3V3_OFF)
     oce.add(keys=P60OpCodes.STACK_5V_ON, info=P60Info.STACK_5V_ON)
     oce.add(keys=P60OpCodes.STACK_5V_OFF, info=P60Info.STACK_5V_OFF)
-    oce.add(keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE, info=GsInfo.REQUEST_CORE_HK_ONCE)
-    oce.add(keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE, info=GsInfo.REQUEST_AUX_HK_ONCE)
-    oce.add(
-        keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
-        info="P60 Dock: Print Switches, Voltages, Currents",
-    )
-    oce.add(keys=GomspaceOpCodes.PRINT_LATCHUPS, info="P60 Dock: Print Latchups")
+    add_gomspace_cmds(oce)
     oce.add(keys=P60OpCodes.TEST, info="P60 Tests")
     defs.add_service(
         name=CustomServiceList.P60DOCK.value, info="P60 Device", op_code_entry=oce
@@ -82,14 +76,15 @@ def add_power_cmd_defs(defs: TmtcDefinitionWrapper):
 def add_pdu1_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_pdu1_common_defs(oce)
+    add_gomspace_cmds(oce)
     oce.add(keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE, info=GsInfo.REQUEST_CORE_HK_ONCE)
     oce.add(keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE, info=GsInfo.REQUEST_AUX_HK_ONCE)
     oce.add(
         keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
         info="PDU1: Print Switches, Voltages, Currents",
     )
-    oce.add(keys=GomspaceOpCodes.PRINT_LATCHUPS, info="PDU1: Print Latchups")
-    oce.add(keys=GomspaceOpCodes.SET_PARAM, info="Set parameter")
+    oce.add(keys=GomspaceOpCodes.GET_PARAM, info=GsInfo.GET_PARAMETER)
+
     defs.add_service(
         name=CustomServiceList.PDU1.value,
         info="PDU1 Device",
@@ -101,14 +96,7 @@ def add_pdu1_cmds(defs: TmtcDefinitionWrapper):
 def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_pdu2_common_defs(oce)
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
-    )
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
-    )
+    add_gomspace_cmds(oce)
     oce.add(
         keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
         info="PDU2: Print Switches, Voltages, Currents",
@@ -124,6 +112,20 @@ def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
     )
 
 
+def add_gomspace_cmds(oce: OpCodeEntry):
+    oce.add(
+        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
+        info=GsInfo.REQUEST_CORE_HK_ONCE,
+    )
+    oce.add(
+        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
+        info=GsInfo.REQUEST_AUX_HK_ONCE,
+    )
+    oce.add(keys=GomspaceOpCodes.GET_PARAM, info=GsInfo.GET_PARAMETER)
+    oce.add(keys=GomspaceOpCodes.PRINT_LATCHUPS, info=GsInfo.PRINT_LATCHUPS)
+    oce.add(keys=GomspaceOpCodes.SET_PARAM, info=GsInfo.SET_PARAMETER)
+
+
 def add_pcdu_cmds(defs: TmtcDefinitionWrapper):
     add_p60_cmds(defs)
     add_pdu1_cmds(defs)
diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
index 3497912..09c526d 100644
--- a/pus_tm/action_reply_handler.py
+++ b/pus_tm/action_reply_handler.py
@@ -1,6 +1,8 @@
 import struct
 from config.object_ids import *
+from pus_tc.devs.common_power import handle_get_param_data_reply
 from pus_tc.devs.imtq import ImtqActionIds
+from pus_tm.defs import PrintWrapper
 from tmtc.ploc_mpsoc import PlocReplyIds
 from tmtc.ploc_supervisor import SupvActionIds
 from pus_tc.devs.star_tracker import StarTrackerActionIds
@@ -21,13 +23,13 @@ def handle_action_reply(
     tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm)
     printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
     object_id = obj_id_dict.get(tm_packet.source_object_id_as_bytes)
+    pw = PrintWrapper(printer)
     custom_data = tm_packet.custom_data
     action_id = tm_packet.action_id
     generic_print_str = printer.generic_action_packet_tm_print(
         packet=tm_packet, obj_id=object_id
     )
-    print(generic_print_str)
-    printer.file_logger.info(generic_print_str)
+    pw.dlog(generic_print_str)
     if object_id.as_bytes == IMTQ_HANDLER_ID:
         return handle_imtq_replies(action_id, printer, custom_data)
     elif object_id.as_bytes == PLOC_MPSOC_ID:
@@ -36,8 +38,11 @@ def handle_action_reply(
         return handle_supervisor_replies(action_id, printer, custom_data)
     elif object_id.as_bytes == STAR_TRACKER_ID:
         return handle_startracker_replies(action_id, printer, custom_data)
-    elif object_id.as_bytes == ACU_HANDLER_ID:
-        return handle_acu_replies(action_id, printer, custom_data)
+    elif object_id.as_bytes in [ACU_HANDLER_ID, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, P60_DOCK_HANDLER]:
+        return handle_get_param_data_reply(action_id, pw, custom_data)
+    else:
+        pw.dlog(f"No dedicated action reply handler found for reply from {object_id}")
+        pw.dlog(f"Raw Data: {tm_packet.custom_data.hex(sep=',')}")
 
 
 def handle_imtq_replies(
@@ -123,27 +128,3 @@ def handle_startracker_replies(
         print(content_list)
         printer.file_logger.info(header_list)
         printer.file_logger.info(content_list)
-
-
-def handle_acu_replies(
-    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
-):
-    if action_id == GomspaceDeviceActionIds.PARAM_GET:
-        header_list = [
-            "Gomspace action ID" "Table ID",
-            "Memory Address",
-            "Payload length" "Payload",
-        ]
-        fmt_str = "!BBHH"
-        (action, table_id, address, payload_length) = struct.unpack(
-            fmt_str, custom_data[:6]
-        )
-        content_list = [
-            action,
-            table_id,
-            "0x" + hex(address),
-            payload_length,
-            "0x" + custom_data[6:].hex(),
-        ]
-        print(header_list)
-        print(content_list)

From 71aa79528e356e554efeac4d49b10ddf6861b39e Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 24 Aug 2022 11:24:25 +0200
Subject: [PATCH 03/19] update power commands

---
 gomspace/gomspace_common.py    | 14 +++++++-------
 pus_tc/devs/acu.py             |  4 ++--
 pus_tc/devs/bpx_batt.py        |  8 ++++----
 pus_tc/devs/common_power.py    |  3 ++-
 pus_tc/devs/heater.py          |  4 ++--
 pus_tc/devs/p60dock.py         |  6 +++---
 pus_tc/devs/pdu1.py            |  5 ++---
 pus_tc/devs/pdu2.py            |  4 ++--
 pus_tc/devs/scex.py            | 18 ++++++++----------
 pus_tc/system/core.py          | 20 ++++++++++----------
 pus_tm/action_reply_handler.py |  7 ++++++-
 11 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index 958eed5..e760849 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -97,10 +97,10 @@ def pack_get_param_command(
     else:
         app_data += memory_address
     app_data += struct.pack("!B", parameter_size)
-    return generate_action_command(
+    return make_fsfw_action_cmd(
         object_id=object_id,
         action_id=GomspaceDeviceActionIds.PARAM_GET,
-        app_data=app_data,
+        user_data=app_data,
     )
 
 
@@ -173,10 +173,10 @@ def pack_ping_command(object_id: ObjectIdU32, data: bytearray) -> PusTelecommand
     @note   The ping request sends the specified data to a gompsace device. These
             data are simply copied by the device and then sent back.
     """
-    return generate_action_command(
+    return make_fsfw_action_cmd(
         object_id=object_id.as_bytes,
         action_id=GomspaceDeviceActionIds.PING,
-        app_data=data,
+        user_data=data,
     )
 
 
@@ -184,7 +184,7 @@ def pack_gnd_wdt_reset_command(object_id: ObjectIdU32) -> PusTelecommand:
     """ " Function to generate the command to reset the watchdog of a gomspace device.
     @param object_id    Object Id of the gomspace device handler.
     """
-    return generate_action_command(
+    return make_fsfw_action_cmd(
         object_id=object_id.as_bytes, action_id=GomspaceDeviceActionIds.WDT_RESET
     )
 
@@ -193,7 +193,7 @@ def pack_reboot_command(object_id: ObjectIdU32) -> PusTelecommand:
     """Function to generate the command which triggers a reboot of a gomspace device
     @param object_id    The object id of the gomspace device handler.
     """
-    return generate_action_command(
+    return make_fsfw_action_cmd(
         object_id=object_id.as_bytes, action_id=GomspaceDeviceActionIds.REBOOT
     )
 
@@ -203,6 +203,6 @@ def pack_request_full_hk_table_command(object_id: ObjectIdU32) -> PusTelecommand
         device.
     @param object_id    The object id of the gomspace device handler.
     """
-    return generate_action_command(
+    return make_fsfw_action_cmd(
         object_id=object_id.as_bytes, action_id=GomspaceDeviceActionIds.REQUEST_HK_TABLE
     )
diff --git a/pus_tc/devs/acu.py b/pus_tc/devs/acu.py
index 01d0237..1070598 100644
--- a/pus_tc/devs/acu.py
+++ b/pus_tc/devs/acu.py
@@ -20,7 +20,7 @@ from gomspace.gomspace_common import GomspaceOpCodes
 from gomspace.gomspace_common import GsInfo as GsInfo
 from config.object_ids import ACU_HANDLER_ID
 from pus_tc.devs.p60dock import P60DockConfigTable
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 
 
@@ -85,7 +85,7 @@ def pack_acu_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
         q.add_log_cmd("ACU: Print channel stats")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=object_id.as_bytes,
                 action_id=gs.GomspaceDeviceActionIds.PRINT_SWITCH_V_I,
             )
diff --git a/pus_tc/devs/bpx_batt.py b/pus_tc/devs/bpx_batt.py
index b331b7a..108b02a 100644
--- a/pus_tc/devs/bpx_batt.py
+++ b/pus_tc/devs/bpx_batt.py
@@ -3,7 +3,7 @@ from config.object_ids import BPX_HANDLER_ID
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 from tmtccmd.tc import DefaultPusQueueHelper, service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 
 
@@ -38,14 +38,14 @@ def pack_bpx_commands(p: ServiceProviderParams):
     if op_code in BpxOpCodes.RST_BOOT_CNT:
         q.add_log_cmd("Resetting reboot counters")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=BPX_HANDLER_ID, action_id=BpxActionIds.RESET_COUNTERS
             )
         )
     if op_code in BpxOpCodes.REQUEST_CFG:
         q.add_log_cmd("Requesting configuration struct")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=BPX_HANDLER_ID, action_id=BpxActionIds.GET_CFG
             )
         )
@@ -56,7 +56,7 @@ def pack_bpx_commands(p: ServiceProviderParams):
     if op_code in BpxOpCodes.REBOOT:
         q.add_log_cmd("Rebooting BPX battery")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=BPX_HANDLER_ID, action_id=BpxActionIds.REBOOT
             )
         )
diff --git a/pus_tc/devs/common_power.py b/pus_tc/devs/common_power.py
index 122561a..cf49e81 100644
--- a/pus_tc/devs/common_power.py
+++ b/pus_tc/devs/common_power.py
@@ -7,7 +7,8 @@ from gomspace.gomspace_common import (
     Channel,
     GomspaceOpCodes,
     GsInfo,
-    SetIds, GomspaceDeviceActionIds,
+    SetIds,
+    GomspaceDeviceActionIds,
 )
 from gomspace.gomspace_pdu_definitions import PDU_CONFIG_LIST
 from pus_tm.defs import PrintWrapper
diff --git a/pus_tc/devs/heater.py b/pus_tc/devs/heater.py
index 5d00185..be3e5bb 100644
--- a/pus_tc/devs/heater.py
+++ b/pus_tc/devs/heater.py
@@ -16,7 +16,7 @@ from tmtccmd.tc.pus_201_fsfw_health import (
     FsfwHealth,
     Subservices,
 )
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
 
 
@@ -200,6 +200,6 @@ def pack_switch_heater_command(
     command.append(switch_nr)
     command.append(switch_action)
     command.append(COMMAND_SOURCE_PARAM_EXTERNAL)
-    return generate_action_command(
+    return make_fsfw_action_cmd(
         object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command
     )
diff --git a/pus_tc/devs/p60dock.py b/pus_tc/devs/p60dock.py
index 5783f06..e460862 100644
--- a/pus_tc/devs/p60dock.py
+++ b/pus_tc/devs/p60dock.py
@@ -22,7 +22,7 @@ from gomspace.gomspace_common import (
     SetIds,
 )
 from config.object_ids import P60_DOCK_HANDLER
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 
 
@@ -150,14 +150,14 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
         q.add_log_cmd("P60 Dock: Print Switches, Voltages, Currents")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
             )
         )
     if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
         q.add_log_cmd("P60 Dock: Print Latchups")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
             )
         )
diff --git a/pus_tc/devs/pdu1.py b/pus_tc/devs/pdu1.py
index 3d21d8d..15d428b 100644
--- a/pus_tc/devs/pdu1.py
+++ b/pus_tc/devs/pdu1.py
@@ -42,14 +42,14 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
         q.add_log_cmd("PDU1: Print Switches, Voltages, Currents")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
             )
         )
     if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
         q.add_log_cmd("PDU1: Print Latchups")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
             )
         )
@@ -113,4 +113,3 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
                 Channel.off,
             )
         )
-
diff --git a/pus_tc/devs/pdu2.py b/pus_tc/devs/pdu2.py
index af08fbc..33a3792 100644
--- a/pus_tc/devs/pdu2.py
+++ b/pus_tc/devs/pdu2.py
@@ -46,14 +46,14 @@ def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
         q.add_log_cmd(f"PDU2: {GsInfo.PRINT_SWITCH_V_I}")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
             )
         )
     if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
         q.add_log_cmd("PDU2: Print Latchups")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
             )
         )
diff --git a/pus_tc/devs/scex.py b/pus_tc/devs/scex.py
index f02e30c..355beec 100644
--- a/pus_tc/devs/scex.py
+++ b/pus_tc/devs/scex.py
@@ -6,7 +6,7 @@ from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper, service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
 from config.object_ids import SCEX_HANDLER_ID
 
@@ -71,25 +71,23 @@ def pack_scex_cmds(p: ServiceProviderParams):
     if op_code in OpCodes.PING:
         q.add_log_cmd(Info.PING)
         app_data = bytes([0])
-        q.add_pus_tc(generate_action_command(SCEX_HANDLER_ID, ActionIds.PING, app_data))
+        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.PING, app_data))
     if op_code in OpCodes.ION_CMD:
         q.add_log_cmd(Info.ION_CMD)
         app_data = bytes([0])
-        q.add_pus_tc(
-            generate_action_command(SCEX_HANDLER_ID, ActionIds.ION_CMD, app_data)
-        )
+        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.ION_CMD, app_data))
     if op_code in OpCodes.TEMP_CMD:
         q.add_log_cmd(Info.TEMP_CMD)
         app_data = bytes([0])
         q.add_pus_tc(
-            generate_action_command(SCEX_HANDLER_ID, ActionIds.TEMP_CMD, app_data)
+            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.TEMP_CMD, app_data)
         )
 
     if op_code in OpCodes.EXP_STATUS_CMD:
         q.add_log_cmd(Info.EXP_STATUS_CMD)
         app_data = bytes([0])
         q.add_pus_tc(
-            generate_action_command(SCEX_HANDLER_ID, ActionIds.EXP_STATUS_CMD, app_data)
+            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.EXP_STATUS_CMD, app_data)
         )
 
     # one cell
@@ -137,7 +135,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
         app_data.append(dac_weight3[cn])
 
         q.add_pus_tc(
-            generate_action_command(SCEX_HANDLER_ID, ActionIds.ONE_CELLS_CMD, app_data)
+            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.ONE_CELLS_CMD, app_data)
         )
 
     if op_code in OpCodes.ALL_CELLS_CMD:
@@ -169,13 +167,13 @@ def pack_scex_cmds(p: ServiceProviderParams):
         app_data.append(dac_weight3[cn])
 
         q.add_pus_tc(
-            generate_action_command(SCEX_HANDLER_ID, ActionIds.ALL_CELLS_CMD, app_data)
+            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.ALL_CELLS_CMD, app_data)
         )
 
     if op_code in OpCodes.FRAM:
         q.add_log_cmd(Info.FRAM)
         app_data = bytes([0])
-        q.add_pus_tc(generate_action_command(SCEX_HANDLER_ID, ActionIds.FRAM, app_data))
+        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.FRAM, app_data))
 
 
 def append_16_bit_val(packet: bytearray, val: int):
diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py
index 112fae7..21c4b77 100644
--- a/pus_tc/system/core.py
+++ b/pus_tc/system/core.py
@@ -4,7 +4,7 @@ from config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_8_funccmd import generate_action_command
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
@@ -125,7 +125,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCodes.REBOOT_FULL:
         q.add_log_cmd(f"Core Command: {Info.REBOOT_FULL}")
         q.add_pus_tc(
-            generate_action_command(
+            make_fsfw_action_cmd(
                 object_id=CORE_CONTROLLER_ID, action_id=ActionIds.FULL_REBOOT
             )
         )
@@ -156,7 +156,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCodes.DISABLE_REBOOT_FILE_HANDLING:
         q.add_log_cmd("Disabling reboot file handling")
         app_data = bytearray([0])
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING,
             app_data=app_data,
@@ -164,34 +164,34 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCodes.ENABLE_REBOOT_FILE_HANDLING:
         q.add_log_cmd("Enabling reboot file handling")
         app_data = bytearray([1])
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING,
             app_data=app_data,
         )
     if op_code in OpCodes.RESET_ALL_REBOOT_COUNTERS:
         q.add_log_cmd("Resetting all reboot counters")
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID, action_id=ActionIds.RESET_ALL_REBOOT_COUNTERS
         )
     if op_code in OpCodes.RESET_REBOOT_COUNTER_00:
         q.add_log_cmd("Resetting reboot counter 0 0")
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID, action_id=ActionIds.RESET_REBOOT_COUNTER_00
         )
     if op_code in OpCodes.RESET_REBOOT_COUNTER_01:
         q.add_log_cmd("Resetting reboot counter 0 1")
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID, action_id=ActionIds.RESET_REBOOT_COUNTER_01
         )
     if op_code in OpCodes.RESET_REBOOT_COUNTER_10:
         q.add_log_cmd("Resetting reboot counter 1 0")
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID, action_id=ActionIds.RESET_REBOOT_COUNTER_10
         )
     if op_code in OpCodes.RESET_REBOOT_COUNTER_11:
         q.add_log_cmd("Resetting reboot counter 1 1")
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID, action_id=ActionIds.RESET_REBOOT_COUNTER_11
         )
     if op_code in OpCodes.GET_HK:
@@ -247,7 +247,7 @@ def perform_reboot_cmd(
         tc_data.append(copy)
         q.add_log_cmd(f"Packing reboot command for chip {chip} and copy {copy}")
     q.add_pus_tc(
-        generate_action_command(
+        make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.XSC_REBOOT,
             app_data=tc_data,
diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
index 09c526d..dbded5d 100644
--- a/pus_tm/action_reply_handler.py
+++ b/pus_tm/action_reply_handler.py
@@ -38,7 +38,12 @@ def handle_action_reply(
         return handle_supervisor_replies(action_id, printer, custom_data)
     elif object_id.as_bytes == STAR_TRACKER_ID:
         return handle_startracker_replies(action_id, printer, custom_data)
-    elif object_id.as_bytes in [ACU_HANDLER_ID, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, P60_DOCK_HANDLER]:
+    elif object_id.as_bytes in [
+        ACU_HANDLER_ID,
+        PDU_1_HANDLER_ID,
+        PDU_2_HANDLER_ID,
+        P60_DOCK_HANDLER,
+    ]:
         return handle_get_param_data_reply(action_id, pw, custom_data)
     else:
         pw.dlog(f"No dedicated action reply handler found for reply from {object_id}")

From 1cdd0bf3fed6306b5aa9f8f59bc462620c305074 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 24 Aug 2022 11:24:57 +0200
Subject: [PATCH 04/19] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a47bafd..b02aa1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ list yields a list of all related PRs for each release.
 - Major Update for `tmtccmd` and `spacepackets` dependencies which improves user API significantly.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/102
 - Add commands to request MGM HK or enable/disable periodic HK for it
+- Update power commands: Extend param get and set to all
+  gomspace devices
 
 # [v1.12.0] 05.07.2022
 

From 254f980d53aacdc36a7dc17e63ddd414bbaa7d87 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 24 Aug 2022 11:27:51 +0200
Subject: [PATCH 05/19] some minor replacements

---
 deps/tmtccmd                   | 2 +-
 pus_tc/devs/heater.py          | 2 +-
 pus_tc/system/core.py          | 7 +++----
 pus_tm/action_reply_handler.py | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/deps/tmtccmd b/deps/tmtccmd
index acaea6d..77c940a 160000
--- a/deps/tmtccmd
+++ b/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit acaea6d9b6fe1d31283604e44c0977365c97040e
+Subproject commit 77c940a5a71e57aabc341e77e5b5d415043e9c9b
diff --git a/pus_tc/devs/heater.py b/pus_tc/devs/heater.py
index be3e5bb..b7e9cde 100644
--- a/pus_tc/devs/heater.py
+++ b/pus_tc/devs/heater.py
@@ -201,5 +201,5 @@ def pack_switch_heater_command(
     command.append(switch_action)
     command.append(COMMAND_SOURCE_PARAM_EXTERNAL)
     return make_fsfw_action_cmd(
-        object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command
+        object_id=object_id, action_id=ActionIds.SWITCH_HEATER, user_data=command
     )
diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py
index 21c4b77..30a93c2 100644
--- a/pus_tc/system/core.py
+++ b/pus_tc/system/core.py
@@ -159,7 +159,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
         make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING,
-            app_data=app_data,
+            user_data=app_data,
         )
     if op_code in OpCodes.ENABLE_REBOOT_FILE_HANDLING:
         q.add_log_cmd("Enabling reboot file handling")
@@ -167,7 +167,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
         make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING,
-            app_data=app_data,
+            user_data=app_data,
         )
     if op_code in OpCodes.RESET_ALL_REBOOT_COUNTERS:
         q.add_log_cmd("Resetting all reboot counters")
@@ -250,7 +250,6 @@ def perform_reboot_cmd(
         make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.XSC_REBOOT,
-            app_data=tc_data,
-            ssc=0,
+            user_data=tc_data
         )
     )
diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
index dbded5d..b7077b3 100644
--- a/pus_tm/action_reply_handler.py
+++ b/pus_tm/action_reply_handler.py
@@ -6,7 +6,6 @@ from pus_tm.defs import PrintWrapper
 from tmtc.ploc_mpsoc import PlocReplyIds
 from tmtc.ploc_supervisor import SupvActionIds
 from pus_tc.devs.star_tracker import StarTrackerActionIds
-from gomspace.gomspace_common import GomspaceDeviceActionIds
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tm import Service8FsfwTm
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

From 3321123581380e20e069ab0d281a8b226ad66eee Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 25 Aug 2022 08:59:02 +0200
Subject: [PATCH 06/19] merge conflict

---
 gomspace/gomspace_common.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index c2e91dc..e760849 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -138,7 +138,6 @@ def pack_set_param_command(
         app_data.append(byte_three)
         app_data.append(byte_four)
     return make_fsfw_action_cmd(
-<<<<<<< HEAD
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -163,9 +162,6 @@ def prompt_and_pack_set_param_command(q: DefaultPusQueueHelper, object_id: Objec
         pack_set_param_command(
             object_id.as_bytes, memory_address, parameter_size, parameter
         )
-=======
-        object_id=object_id, action_id=action_id, user_data=app_data, ssc=ssc
->>>>>>> origin/main
     )
 
 

From 4f5559c50fce2f044359df89fff1bcbba1807291 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 25 Aug 2022 09:55:34 +0200
Subject: [PATCH 07/19] small fix

---
 pus_tc/devs/pdu2.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pus_tc/devs/pdu2.py b/pus_tc/devs/pdu2.py
index 33a3792..367b791 100644
--- a/pus_tc/devs/pdu2.py
+++ b/pus_tc/devs/pdu2.py
@@ -58,10 +58,10 @@ def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
             )
         )
     if op_code in GomspaceOpCodes.SET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.SET_PARAMETER}")
+        q.add_log_cmd(f"PDU2: {GsInfo.SET_PARAMETER}")
         prompt_and_pack_set_param_command(q, object_id)
     if op_code in GomspaceOpCodes.GET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.GET_PARAMETER}")
+        q.add_log_cmd(f"PDU2: {GsInfo.GET_PARAMETER}")
         prompt_and_pack_get_param_command(q, object_id)
     if PDU2TestProcedure.all or PDU2TestProcedure.reboot:
         q.add_log_cmd("PDU2: Reboot")

From df5d68315b5956a6d773c79a34376d8c5710375c Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 25 Aug 2022 16:14:21 +0200
Subject: [PATCH 08/19] move power module

---
 pus_tc/devs/__init__.py                     |  2 +-
 pus_tc/procedure_packer.py                  | 12 +++++-------
 pus_tc/system/core.py                       |  2 +-
 pus_tm/action_reply_handler.py              |  2 +-
 pus_tm/hk_handling.py                       |  2 +-
 tmtc/power/__init__.py                      |  0
 {pus_tc/devs => tmtc/power}/acu.py          |  3 +--
 {pus_tc/devs => tmtc/power}/common_power.py |  0
 {pus_tc/devs => tmtc/power}/p60dock.py      |  0
 {pus_tc/devs => tmtc/power}/pdu1.py         |  9 +--------
 {pus_tc/devs => tmtc/power}/pdu2.py         |  2 +-
 {pus_tc/devs => tmtc/power}/power.py        |  6 +++---
 pus_tm/system/power.py => tmtc/power/tm.py  |  0
 13 files changed, 15 insertions(+), 25 deletions(-)
 create mode 100644 tmtc/power/__init__.py
 rename {pus_tc/devs => tmtc/power}/acu.py (99%)
 rename {pus_tc/devs => tmtc/power}/common_power.py (100%)
 rename {pus_tc/devs => tmtc/power}/p60dock.py (100%)
 rename {pus_tc/devs => tmtc/power}/pdu1.py (93%)
 rename {pus_tc/devs => tmtc/power}/pdu2.py (98%)
 rename {pus_tc/devs => tmtc/power}/power.py (96%)
 rename pus_tm/system/power.py => tmtc/power/tm.py (100%)

diff --git a/pus_tc/devs/__init__.py b/pus_tc/devs/__init__.py
index bc05547..8b13789 100644
--- a/pus_tc/devs/__init__.py
+++ b/pus_tc/devs/__init__.py
@@ -1 +1 @@
-from . import power
+
diff --git a/pus_tc/procedure_packer.py b/pus_tc/procedure_packer.py
index 9fe7a06..5bf3bd7 100644
--- a/pus_tc/procedure_packer.py
+++ b/pus_tc/procedure_packer.py
@@ -2,7 +2,7 @@
 """
 from typing import cast
 
-from pus_tc.devs.power import pack_power_commands
+from tmtc.power.power import pack_power_commands
 from pus_tc.devs.rtd import pack_rtd_commands
 from pus_tc.devs.scex import pack_scex_cmds
 from pus_tc.system.controllers import (
@@ -23,14 +23,13 @@ from tmtccmd.tc.pus_5_event import (
 from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
 
 from pus_tc.service_200_mode import pack_service_200_test_into
-from pus_tc.devs.p60dock import pack_p60dock_cmds
-from pus_tc.devs.pdu2 import pack_pdu2_commands
-from pus_tc.devs.pdu1 import pack_pdu1_commands
-from pus_tc.devs.acu import pack_acu_commands
+from tmtc.power.p60dock import pack_p60dock_cmds
+from tmtc.power.pdu2 import pack_pdu2_commands
+from tmtc.power.pdu1 import pack_pdu1_commands
+from tmtc.power.acu import pack_acu_commands
 from pus_tc.devs.solar_array_deployment import pack_solar_array_deployment_test_into
 from pus_tc.devs.imtq import pack_imtq_test_into
 from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from tmtc.ploc_mpsoc import pack_ploc_mpsoc_commands
 from pus_tc.devs.heater import pack_heater_cmds
 from pus_tc.devs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds
 from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
@@ -55,7 +54,6 @@ from config.object_ids import (
     TMP_1075_2_HANDLER_ID,
     HEATER_ID,
     IMTQ_HANDLER_ID,
-    PLOC_MPSOC_ID,
     RW1_ID,
     RW2_ID,
     RW3_ID,
diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py
index 30a93c2..565f7e0 100644
--- a/pus_tc/system/core.py
+++ b/pus_tc/system/core.py
@@ -250,6 +250,6 @@ def perform_reboot_cmd(
         make_fsfw_action_cmd(
             object_id=CORE_CONTROLLER_ID,
             action_id=ActionIds.XSC_REBOOT,
-            user_data=tc_data
+            user_data=tc_data,
         )
     )
diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
index b7077b3..5f52858 100644
--- a/pus_tm/action_reply_handler.py
+++ b/pus_tm/action_reply_handler.py
@@ -1,6 +1,6 @@
 import struct
 from config.object_ids import *
-from pus_tc.devs.common_power import handle_get_param_data_reply
+from tmtc.power.common_power import handle_get_param_data_reply
 from pus_tc.devs.imtq import ImtqActionIds
 from pus_tm.defs import PrintWrapper
 from tmtc.ploc_mpsoc import PlocReplyIds
diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index 395f274..b84e430 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -23,7 +23,7 @@ from pus_tm.devs.imtq_mgt import (
     handle_calibrated_mtm_measurement,
     handle_raw_mtm_measurement,
 )
-from pus_tm.system.power import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data
+from tmtc.power.tm import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data
 from pus_tm.devs.syrlinks import handle_syrlinks_hk_data
 from pus_tc.devs.imtq import ImtqSetIds
 from pus_tm.devs.reaction_wheels import handle_rw_hk_data
diff --git a/tmtc/power/__init__.py b/tmtc/power/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/pus_tc/devs/acu.py b/tmtc/power/acu.py
similarity index 99%
rename from pus_tc/devs/acu.py
rename to tmtc/power/acu.py
index 1070598..a36e7d1 100644
--- a/pus_tc/devs/acu.py
+++ b/tmtc/power/acu.py
@@ -3,7 +3,6 @@
 @author J. Meier, R. Mueller
 @date   21.12.2020
 """
-import struct
 
 from config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
@@ -19,7 +18,7 @@ import gomspace.gomspace_common as gs
 from gomspace.gomspace_common import GomspaceOpCodes
 from gomspace.gomspace_common import GsInfo as GsInfo
 from config.object_ids import ACU_HANDLER_ID
-from pus_tc.devs.p60dock import P60DockConfigTable
+from tmtc.power.p60dock import P60DockConfigTable
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 
diff --git a/pus_tc/devs/common_power.py b/tmtc/power/common_power.py
similarity index 100%
rename from pus_tc/devs/common_power.py
rename to tmtc/power/common_power.py
diff --git a/pus_tc/devs/p60dock.py b/tmtc/power/p60dock.py
similarity index 100%
rename from pus_tc/devs/p60dock.py
rename to tmtc/power/p60dock.py
diff --git a/pus_tc/devs/pdu1.py b/tmtc/power/pdu1.py
similarity index 93%
rename from pus_tc/devs/pdu1.py
rename to tmtc/power/pdu1.py
index 15d428b..9b7e36f 100644
--- a/pus_tc/devs/pdu1.py
+++ b/tmtc/power/pdu1.py
@@ -4,17 +4,10 @@
 @date   17.12.2020
 """
 import gomspace.gomspace_common as gs
-from pus_tc.devs.common_power import pdu1_cmds, pdu1_req_hk_cmds
+from tmtc.power.common_power import pdu1_cmds, pdu1_req_hk_cmds
 
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    generate_one_hk_command,
-    make_sid,
-    generate_one_diag_command,
-)
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
-from config.object_ids import PDU_1_HANDLER_ID
 
 
 class PDU1TestProcedure:
diff --git a/pus_tc/devs/pdu2.py b/tmtc/power/pdu2.py
similarity index 98%
rename from pus_tc/devs/pdu2.py
rename to tmtc/power/pdu2.py
index 367b791..4963b7c 100644
--- a/pus_tc/devs/pdu2.py
+++ b/tmtc/power/pdu2.py
@@ -6,7 +6,7 @@
 @author J. Meier
 @date   17.12.2020
 """
-from pus_tc.devs.common_power import pdu2_cmds, pdu2_req_hk_cmds
+from tmtc.power.common_power import pdu2_cmds, pdu2_req_hk_cmds
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
 
diff --git a/pus_tc/devs/power.py b/tmtc/power/power.py
similarity index 96%
rename from pus_tc/devs/power.py
rename to tmtc/power/power.py
index a05c0d2..a4af7b5 100644
--- a/pus_tc/devs/power.py
+++ b/tmtc/power/power.py
@@ -1,5 +1,5 @@
 from gomspace.gomspace_common import GsInfo
-from pus_tc.devs.common_power import (
+from tmtc.power.common_power import (
     PowerOpCodes,
     add_pdu1_common_defs,
     add_pdu2_common_defs,
@@ -13,8 +13,8 @@ from config.definitions import CustomServiceList
 from tmtccmd import get_console_logger
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 
-from pus_tc.devs.p60dock import P60OpCodes, GomspaceOpCodes, P60Info
-from pus_tc.devs.acu import add_acu_cmds
+from tmtc.power.p60dock import P60OpCodes, GomspaceOpCodes, P60Info
+from tmtc.power.acu import add_acu_cmds
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 
diff --git a/pus_tm/system/power.py b/tmtc/power/tm.py
similarity index 100%
rename from pus_tm/system/power.py
rename to tmtc/power/tm.py

From d61af604fec53b6a0af8d54e7c01792fc9a68790 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 25 Aug 2022 18:13:37 +0200
Subject: [PATCH 09/19] update pcdu reply handling

---
 pus_tm/action_reply_handler.py |  2 +-
 tmtc/power/common_power.py     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
index 5f52858..d9fc381 100644
--- a/pus_tm/action_reply_handler.py
+++ b/pus_tm/action_reply_handler.py
@@ -43,7 +43,7 @@ def handle_action_reply(
         PDU_2_HANDLER_ID,
         P60_DOCK_HANDLER,
     ]:
-        return handle_get_param_data_reply(action_id, pw, custom_data)
+        return handle_get_param_data_reply(object_id, action_id, pw, custom_data)
     else:
         pw.dlog(f"No dedicated action reply handler found for reply from {object_id}")
         pw.dlog(f"Raw Data: {tm_packet.custom_data.hex(sep=',')}")
diff --git a/tmtc/power/common_power.py b/tmtc/power/common_power.py
index cf49e81..9987543 100644
--- a/tmtc/power/common_power.py
+++ b/tmtc/power/common_power.py
@@ -19,6 +19,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_diag_command,
     generate_one_hk_command,
 )
+from tmtccmd.util import ObjectIdU32, ObjectIdBase
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
@@ -447,26 +448,27 @@ def generic_off_cmd(
 
 
 def handle_get_param_data_reply(
-    action_id: int, pw: PrintWrapper, custom_data: bytearray
+    obj_id: ObjectIdBase, action_id: int, pw: PrintWrapper, custom_data: bytearray
 ):
     if action_id == GomspaceDeviceActionIds.PARAM_GET:
+        pw.dlog(f"Parameter Get Request received for object {obj_id}")
         header_list = [
-            "Gomspace action ID",
+            "Gomspace Request Code",
             "Table ID",
             "Memory Address",
             "Payload length",
             "Payload",
         ]
         fmt_str = "!BBHH"
-        (action, table_id, address, payload_length) = struct.unpack(
+        (gs_request_code, table_id, address, payload_length) = struct.unpack(
             fmt_str, custom_data[:6]
         )
         content_list = [
-            action,
+            hex(gs_request_code),
             table_id,
             hex(address),
             payload_length,
-            "0x" + custom_data[6:].hex(),
+            f"0x[{custom_data[6:].hex(sep=',')}]"
         ]
         pw.dlog(f"{header_list}")
         pw.dlog(f"{content_list}")

From 079a0f94727dc3f35578dc412aa01c871ae1ac6a Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 26 Aug 2022 13:42:32 +0200
Subject: [PATCH 10/19] fixes in TM handling

---
 pus_tc/devs/p60dock.py | 4 ++--
 pus_tm/system/power.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pus_tc/devs/p60dock.py b/pus_tc/devs/p60dock.py
index e460862..f1a7815 100644
--- a/pus_tc/devs/p60dock.py
+++ b/pus_tc/devs/p60dock.py
@@ -6,7 +6,7 @@
 @date   13.12.2020
 """
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
+from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid, generate_one_diag_command
 from gomspace.gomspace_common import (
     GsInfo,
     GomspaceOpCodes,
@@ -142,7 +142,7 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
     if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
         q.add_log_cmd("P60 Dock: Requesting HK Core HK Once")
         hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_CORE)
-        q.add_pus_tc(generate_one_hk_command(sid=hk_sid))
+        q.add_pus_tc(generate_one_diag_command(sid=hk_sid))
     if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
         q.add_log_cmd("P60 Dock: Requesting HK Aux HK Once")
         hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_AUX)
diff --git a/pus_tm/system/power.py b/pus_tm/system/power.py
index dd5f8e4..4cc33d8 100644
--- a/pus_tm/system/power.py
+++ b/pus_tm/system/power.py
@@ -244,7 +244,7 @@ def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
                 f"{voltage_list[idx]:05} | {current_list[idx]:04}"
             )
             pw.dlog(content_line)
-        fmt_str = "!IBhHhh"
+        fmt_str = "!IBhHff"
         inc_len = struct.calcsize(fmt_str)
         (
             boot_count,
@@ -259,7 +259,7 @@ def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
             f"Batt: Mode {batt_mode} | Boot Count {boot_count} | "
             f"Charge current {batt_current} | Voltage {batt_voltage}"
         )
-        temps = f"In C: Temp 0 {temp_0 / 10.0} | Temp 1 {temp_1 / 10.0} | "
+        temps = f"In C: Temp 0 {temp_0} | Temp 1 {temp_1} | "
         pw.dlog(temps)
         pw.dlog(batt_info)
         printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=9)
@@ -361,7 +361,7 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         current_idx, powers = gen_six_entry_u16_list(
             hk_data=hk_data, current_idx=current_idx
         )
-        fmt_str = "!HHHIIHH"
+        fmt_str = "!fffIIHH"
         inc_len = struct.calcsize(fmt_str)
         (tmp0, tmp1, tmp2, bootcnt, uptime, mppt_time, mppt_period) = struct.unpack(
             fmt_str, hk_data[current_idx : current_idx + inc_len]
@@ -379,7 +379,7 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
                 f"{str(vboosts[i]).ljust(4)} | {str(powers[i]).ljust(2)}"
             )
         pw.dlog(
-            f"Temperatures in C: Ch0 {tmp0/10.0} | Ch1 {tmp1/10.0} | Ch2 {tmp2/10.0}"
+            f"Temperatures in C: Ch0 {tmp0} | Ch1 {tmp1} | Ch2 {tmp2}"
         )
         pw.dlog(
             f"Boot Count {bootcnt} | Uptime {uptime} sec | "

From 0f9aed4ee26c0a882ceb54c3366e1e64206a0645 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 26 Aug 2022 23:39:39 +0200
Subject: [PATCH 11/19] new command to request config table

---
 gomspace/gomspace_common.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index e760849..4483c62 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -23,6 +23,7 @@ class GomspaceDeviceActionIds(enum.IntEnum):
     PARAM_SET = 255
     WDT_RESET = 9
     REQUEST_HK_TABLE = 16
+    REQUEST_CONFIG_TABLE = 17,
     PRINT_SWITCH_V_I = 32
     PRINT_LATCHUPS = 33
 
@@ -77,6 +78,15 @@ class Channel:
     off = 0
 
 
+def pack_request_config_command(
+    object_id: bytes
+) -> PusTelecommand:
+    return make_fsfw_action_cmd(
+        object_id=object_id,
+        action_id=GomspaceDeviceActionIds.REQUEST_CONFIG_TABLE
+    )
+
+
 def pack_get_param_command(
     object_id: bytes,
     table_id: int,

From 6c59fb95d3e72848e3fa1d926fb4a5d1951409fa Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 26 Aug 2022 23:52:47 +0200
Subject: [PATCH 12/19] clean up and extend power TMTC handling

---
 deps/tmtccmd                   |  2 +-
 gomspace/gomspace_common.py    | 30 ++++++--------
 pus_tm/action_reply_handler.py |  2 +-
 tmtc/power/acu.py              | 24 +----------
 tmtc/power/common_power.py     | 76 +++++++++++++++++++++-------------
 tmtc/power/p60dock.py          | 30 ++++----------
 tmtc/power/pdu1.py             | 23 +---------
 tmtc/power/pdu2.py             | 23 +---------
 tmtc/power/power.py            | 21 ++--------
 tmtc/power/tm.py               | 34 +++++++++++++--
 10 files changed, 108 insertions(+), 157 deletions(-)

diff --git a/deps/tmtccmd b/deps/tmtccmd
index 77c940a..30129ee 160000
--- a/deps/tmtccmd
+++ b/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 77c940a5a71e57aabc341e77e5b5d415043e9c9b
+Subproject commit 30129ee38f0d1627ae0cb1a327a39ab4e3e2795f
diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index 4483c62..571e28f 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -23,19 +23,20 @@ class GomspaceDeviceActionIds(enum.IntEnum):
     PARAM_SET = 255
     WDT_RESET = 9
     REQUEST_HK_TABLE = 16
-    REQUEST_CONFIG_TABLE = 17,
+    REQUEST_CONFIG_TABLE = 17
     PRINT_SWITCH_V_I = 32
     PRINT_LATCHUPS = 33
 
 
 class GomspaceOpCodes:
     # Request HK
-    REQUEST_CORE_HK_ONCE = ["hk_core", "128"]
-    REQUEST_AUX_HK_ONCE = ["hk_aux", "129"]
-    PRINT_SWITCH_V_I = ["print-switch-vi", "130"]
-    PRINT_LATCHUPS = ["print-latchups", "131"]
-    GET_PARAM = ["get_param", "132"]
-    SET_PARAM = ["set_param", "133"]
+    REQUEST_CORE_HK_ONCE = ["hk_core"]
+    REQUEST_AUX_HK_ONCE = ["hk_aux"]
+    PRINT_SWITCH_V_I = ["print_switch_vi"]
+    PRINT_LATCHUPS = ["print_latchups"]
+    GET_PARAM = ["get_param"]
+    SET_PARAM = ["set_param"]
+    REQUEST_CONFIG_TABLE = ["cfg_table"]
 
 
 class GsInfo:
@@ -45,6 +46,7 @@ class GsInfo:
     PRINT_LATCHUPS = "Print latchups"
     GET_PARAMETER = "Get parameter"
     SET_PARAMETER = "Set parameter"
+    REQUEST_CONFIG_TABLE = "Request Config Table"
 
 
 class SetIds:
@@ -78,12 +80,9 @@ class Channel:
     off = 0
 
 
-def pack_request_config_command(
-    object_id: bytes
-) -> PusTelecommand:
+def pack_request_config_command(object_id: bytes) -> PusTelecommand:
     return make_fsfw_action_cmd(
-        object_id=object_id,
-        action_id=GomspaceDeviceActionIds.REQUEST_CONFIG_TABLE
+        object_id=object_id, action_id=GomspaceDeviceActionIds.REQUEST_CONFIG_TABLE
     )
 
 
@@ -115,11 +114,7 @@ def pack_get_param_command(
 
 
 def pack_set_param_command(
-    object_id: bytes,
-    memory_address: bytes,
-    parameter_size: int,
-    parameter: int,
-    ssc: int = 0,
+    object_id: bytes, memory_address: bytes, parameter_size: int, parameter: int
 ) -> PusTelecommand:
     """Function to generate a command to set a parameter
     :param object_id:   The object id of the gomspace device handler.
@@ -127,7 +122,6 @@ def pack_set_param_command(
     :param parameter: The parameter value to set.
     :param parameter_size:  Size of the value to set. There are uint8_t, uint16_t and uint32_t
     in the device tables.
-    :param ssc:
     :return:    The command as bytearray.
     """
     action_id = GomspaceDeviceActionIds.PARAM_SET
diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
index d9fc381..520ae26 100644
--- a/pus_tm/action_reply_handler.py
+++ b/pus_tm/action_reply_handler.py
@@ -1,11 +1,11 @@
 import struct
 from config.object_ids import *
-from tmtc.power.common_power import handle_get_param_data_reply
 from pus_tc.devs.imtq import ImtqActionIds
 from pus_tm.defs import PrintWrapper
 from tmtc.ploc_mpsoc import PlocReplyIds
 from tmtc.ploc_supervisor import SupvActionIds
 from pus_tc.devs.star_tracker import StarTrackerActionIds
+from tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tm import Service8FsfwTm
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
diff --git a/tmtc/power/acu.py b/tmtc/power/acu.py
index a36e7d1..5f130e0 100644
--- a/tmtc/power/acu.py
+++ b/tmtc/power/acu.py
@@ -5,6 +5,7 @@
 """
 
 from config.definitions import CustomServiceList
+from tmtc.power.common_power import add_gomspace_cmds
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
@@ -81,28 +82,7 @@ def add_acu_cmds(defs: TmtcDefinitionWrapper):
 
 def pack_acu_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
     q.add_log_cmd("Handling ACU command")
-    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
-        q.add_log_cmd("ACU: Print channel stats")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=object_id.as_bytes,
-                action_id=gs.GomspaceDeviceActionIds.PRINT_SWITCH_V_I,
-            )
-        )
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        q.add_log_cmd(f"ACU: {GsInfo.REQUEST_CORE_HK_ONCE}")
-        hk_sid = make_sid(object_id=object_id.as_bytes, set_id=gs.SetIds.ACU_CORE)
-        q.add_pus_tc(generate_one_diag_command(sid=hk_sid))
-    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        q.add_log_cmd(f"ACU: {GsInfo.REQUEST_AUX_HK_ONCE}")
-        hk_sid = make_sid(object_id=object_id.as_bytes, set_id=gs.SetIds.ACU_AUX)
-        q.add_pus_tc(generate_one_hk_command(sid=hk_sid))
-    if op_code in GomspaceOpCodes.GET_PARAM:
-        q.add_log_cmd(f"ACU: {GsInfo.GET_PARAMETER}")
-        gs.prompt_and_pack_get_param_command(q, object_id)
-    if op_code in GomspaceOpCodes.SET_PARAM:
-        q.add_log_cmd(f"ACU: {GsInfo.SET_PARAMETER}")
-        gs.prompt_and_pack_set_param_command(q, object_id)
+    add_gomspace_cmds("ACU", object_id, q, op_code)
     pack_test_cmds(object_id=object_id, q=q)
 
 
diff --git a/tmtc/power/common_power.py b/tmtc/power/common_power.py
index 9987543..f57f738 100644
--- a/tmtc/power/common_power.py
+++ b/tmtc/power/common_power.py
@@ -1,5 +1,4 @@
 import enum
-import struct
 
 from config.object_ids import PDU_1_HANDLER_ID, PDU_2_HANDLER_ID
 from gomspace.gomspace_common import (
@@ -9,9 +8,11 @@ from gomspace.gomspace_common import (
     GsInfo,
     SetIds,
     GomspaceDeviceActionIds,
+    prompt_and_pack_set_param_command,
+    prompt_and_pack_get_param_command,
+    pack_request_config_command,
 )
 from gomspace.gomspace_pdu_definitions import PDU_CONFIG_LIST
-from pus_tm.defs import PrintWrapper
 from tmtccmd.config import OpCodeEntry
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import (
@@ -19,8 +20,8 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_diag_command,
     generate_one_hk_command,
 )
-from tmtccmd.util import ObjectIdU32, ObjectIdBase
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.util import ObjectIdU32
 
 
 class Pdu1ChIndex(enum.IntEnum):
@@ -187,6 +188,35 @@ def add_pdu2_common_defs(oce: OpCodeEntry):
     oce.add(keys=PowerOpCodes.PL_CAM_OFF, info=info_off_pdu2(Pdu2InfoBase.PL_CAM))
 
 
+def add_gomspace_cmds(
+    prefix: str, object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
+):
+    objb = object_id.as_bytes
+    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
+        q.add_log_cmd(f"{prefix}: {GsInfo.PRINT_SWITCH_V_I}")
+        q.add_pus_tc(
+            make_fsfw_action_cmd(
+                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
+            )
+        )
+    if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
+        q.add_log_cmd(f"{prefix}: {GsInfo.PRINT_LATCHUPS}")
+        q.add_pus_tc(
+            make_fsfw_action_cmd(
+                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
+            )
+        )
+    if op_code in GomspaceOpCodes.SET_PARAM:
+        q.add_log_cmd(f"{prefix}: {GsInfo.SET_PARAMETER}")
+        prompt_and_pack_set_param_command(q, object_id)
+    if op_code in GomspaceOpCodes.GET_PARAM:
+        q.add_log_cmd(f"{prefix}: {GsInfo.GET_PARAMETER}")
+        prompt_and_pack_get_param_command(q, object_id)
+    if op_code in GomspaceOpCodes.REQUEST_CONFIG_TABLE:
+        q.add_log_cmd(f"{prefix}: {GsInfo.REQUEST_CONFIG_TABLE}")
+        q.add_pus_tc(pack_request_config_command(object_id.as_bytes))
+
+
 def pdu1_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in PowerOpCodes.TCS_ON:
         tcs_on_cmd(q)
@@ -447,28 +477,16 @@ def generic_off_cmd(
     )
 
 
-def handle_get_param_data_reply(
-    obj_id: ObjectIdBase, action_id: int, pw: PrintWrapper, custom_data: bytearray
-):
-    if action_id == GomspaceDeviceActionIds.PARAM_GET:
-        pw.dlog(f"Parameter Get Request received for object {obj_id}")
-        header_list = [
-            "Gomspace Request Code",
-            "Table ID",
-            "Memory Address",
-            "Payload length",
-            "Payload",
-        ]
-        fmt_str = "!BBHH"
-        (gs_request_code, table_id, address, payload_length) = struct.unpack(
-            fmt_str, custom_data[:6]
-        )
-        content_list = [
-            hex(gs_request_code),
-            table_id,
-            hex(address),
-            payload_length,
-            f"0x[{custom_data[6:].hex(sep=',')}]"
-        ]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+def add_gomspace_cmd_defs(oce: OpCodeEntry):
+    oce.add(
+        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
+        info=GsInfo.REQUEST_CORE_HK_ONCE,
+    )
+    oce.add(
+        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
+        info=GsInfo.REQUEST_AUX_HK_ONCE,
+    )
+    oce.add(keys=GomspaceOpCodes.GET_PARAM, info=GsInfo.GET_PARAMETER)
+    oce.add(keys=GomspaceOpCodes.PRINT_LATCHUPS, info=GsInfo.PRINT_LATCHUPS)
+    oce.add(keys=GomspaceOpCodes.SET_PARAM, info=GsInfo.SET_PARAMETER)
+    oce.add(keys=GomspaceOpCodes.REQUEST_CONFIG_TABLE, info=GsInfo.REQUEST_CONFIG_TABLE)
diff --git a/tmtc/power/p60dock.py b/tmtc/power/p60dock.py
index f1a7815..e8cd5c5 100644
--- a/tmtc/power/p60dock.py
+++ b/tmtc/power/p60dock.py
@@ -5,8 +5,13 @@
 @author J. Meier
 @date   13.12.2020
 """
+from tmtc.power.common_power import add_gomspace_cmds
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid, generate_one_diag_command
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    generate_one_hk_command,
+    make_sid,
+    generate_one_diag_command,
+)
 from gomspace.gomspace_common import (
     GsInfo,
     GomspaceOpCodes,
@@ -139,28 +144,7 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
                 Channel.off,
             )
         )
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        q.add_log_cmd("P60 Dock: Requesting HK Core HK Once")
-        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_CORE)
-        q.add_pus_tc(generate_one_diag_command(sid=hk_sid))
-    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        q.add_log_cmd("P60 Dock: Requesting HK Aux HK Once")
-        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_AUX)
-        q.add_pus_tc(generate_one_hk_command(sid=hk_sid))
-    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
-        q.add_log_cmd("P60 Dock: Print Switches, Voltages, Currents")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
-            )
-        )
-    if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
-        q.add_log_cmd("P60 Dock: Print Latchups")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
-            )
-        )
+    add_gomspace_cmds("P60 Dock", object_id, q, op_code)
     if P60DockTestProcedure.all or P60DockTestProcedure.reboot:
         q.add_log_cmd("P60 Dock: Reboot")
         q.add_pus_tc(pack_reboot_command(object_id))
diff --git a/tmtc/power/pdu1.py b/tmtc/power/pdu1.py
index 9b7e36f..363660e 100644
--- a/tmtc/power/pdu1.py
+++ b/tmtc/power/pdu1.py
@@ -4,7 +4,7 @@
 @date   17.12.2020
 """
 import gomspace.gomspace_common as gs
-from tmtc.power.common_power import pdu1_cmds, pdu1_req_hk_cmds
+from tmtc.power.common_power import pdu1_cmds, pdu1_req_hk_cmds, add_gomspace_cmds
 
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
@@ -32,26 +32,7 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
     objb = object_id.as_bytes
     pdu1_cmds(q, op_code)
     pdu1_req_hk_cmds(q, op_code)
-    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
-        q.add_log_cmd("PDU1: Print Switches, Voltages, Currents")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
-            )
-        )
-    if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
-        q.add_log_cmd("PDU1: Print Latchups")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
-            )
-        )
-    if op_code in GomspaceOpCodes.SET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.SET_PARAMETER}")
-        prompt_and_pack_set_param_command(q, object_id)
-    if op_code in GomspaceOpCodes.GET_PARAM:
-        q.add_log_cmd(f"PDU1: {GsInfo.GET_PARAMETER}")
-        gs.prompt_and_pack_get_param_command(q, object_id)
+    add_gomspace_cmds("PDU1", object_id, q, op_code)
     if PDU1TestProcedure.all or PDU1TestProcedure.ping:
         q.add_log_cmd("PDU1: Ping Test")
         ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
diff --git a/tmtc/power/pdu2.py b/tmtc/power/pdu2.py
index 4963b7c..4929974 100644
--- a/tmtc/power/pdu2.py
+++ b/tmtc/power/pdu2.py
@@ -6,7 +6,7 @@
 @author J. Meier
 @date   17.12.2020
 """
-from tmtc.power.common_power import pdu2_cmds, pdu2_req_hk_cmds
+from tmtc.power.common_power import pdu2_cmds, pdu2_req_hk_cmds, add_gomspace_cmds
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
 
@@ -43,26 +43,7 @@ def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
     objb = object_id.as_bytes
     pdu2_cmds(q, op_code)
     pdu2_req_hk_cmds(q, op_code)
-    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
-        q.add_log_cmd(f"PDU2: {GsInfo.PRINT_SWITCH_V_I}")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
-            )
-        )
-    if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
-        q.add_log_cmd("PDU2: Print Latchups")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
-            )
-        )
-    if op_code in GomspaceOpCodes.SET_PARAM:
-        q.add_log_cmd(f"PDU2: {GsInfo.SET_PARAMETER}")
-        prompt_and_pack_set_param_command(q, object_id)
-    if op_code in GomspaceOpCodes.GET_PARAM:
-        q.add_log_cmd(f"PDU2: {GsInfo.GET_PARAMETER}")
-        prompt_and_pack_get_param_command(q, object_id)
+    add_gomspace_cmds("PDU2", object_id, q, op_code)
     if PDU2TestProcedure.all or PDU2TestProcedure.reboot:
         q.add_log_cmd("PDU2: Reboot")
         q.add_pus_tc(pack_reboot_command(object_id))
diff --git a/tmtc/power/power.py b/tmtc/power/power.py
index a4af7b5..af74c41 100644
--- a/tmtc/power/power.py
+++ b/tmtc/power/power.py
@@ -8,6 +8,7 @@ from tmtc.power.common_power import (
     pdu2_cmds,
     pdu1_req_hk_cmds,
     pdu2_req_hk_cmds,
+    add_gomspace_cmd_defs,
 )
 from config.definitions import CustomServiceList
 from tmtccmd import get_console_logger
@@ -50,7 +51,7 @@ def add_p60_cmds(defs: TmtcDefinitionWrapper):
     oce.add(keys=P60OpCodes.STACK_3V3_OFF, info=P60Info.STACK_3V3_OFF)
     oce.add(keys=P60OpCodes.STACK_5V_ON, info=P60Info.STACK_5V_ON)
     oce.add(keys=P60OpCodes.STACK_5V_OFF, info=P60Info.STACK_5V_OFF)
-    add_gomspace_cmds(oce)
+    add_gomspace_cmd_defs(oce)
     oce.add(keys=P60OpCodes.TEST, info="P60 Tests")
     defs.add_service(
         name=CustomServiceList.P60DOCK.value, info="P60 Device", op_code_entry=oce
@@ -76,7 +77,7 @@ def add_power_cmd_defs(defs: TmtcDefinitionWrapper):
 def add_pdu1_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_pdu1_common_defs(oce)
-    add_gomspace_cmds(oce)
+    add_gomspace_cmd_defs(oce)
     oce.add(keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE, info=GsInfo.REQUEST_CORE_HK_ONCE)
     oce.add(keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE, info=GsInfo.REQUEST_AUX_HK_ONCE)
     oce.add(
@@ -96,7 +97,7 @@ def add_pdu1_cmds(defs: TmtcDefinitionWrapper):
 def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_pdu2_common_defs(oce)
-    add_gomspace_cmds(oce)
+    add_gomspace_cmd_defs(oce)
     oce.add(
         keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
         info="PDU2: Print Switches, Voltages, Currents",
@@ -112,20 +113,6 @@ def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
     )
 
 
-def add_gomspace_cmds(oce: OpCodeEntry):
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
-    )
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
-    )
-    oce.add(keys=GomspaceOpCodes.GET_PARAM, info=GsInfo.GET_PARAMETER)
-    oce.add(keys=GomspaceOpCodes.PRINT_LATCHUPS, info=GsInfo.PRINT_LATCHUPS)
-    oce.add(keys=GomspaceOpCodes.SET_PARAM, info=GsInfo.SET_PARAMETER)
-
-
 def add_pcdu_cmds(defs: TmtcDefinitionWrapper):
     add_p60_cmds(defs)
     add_pdu1_cmds(defs)
diff --git a/tmtc/power/tm.py b/tmtc/power/tm.py
index 4cc33d8..7407c85 100644
--- a/tmtc/power/tm.py
+++ b/tmtc/power/tm.py
@@ -1,9 +1,10 @@
 import struct
 from typing import List, Tuple
 
+from tmtccmd.util import ObjectIdBase
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from pus_tm.defs import PrintWrapper
-from gomspace.gomspace_common import SetIds
+from gomspace.gomspace_common import SetIds, GomspaceDeviceActionIds
 
 P60_INDEX_LIST = [
     "ACU VCC",
@@ -378,9 +379,7 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
                 f"{i} | {str(voltages[i]).ljust(4)} | {str(currents[i]).ljust(4)} | "
                 f"{str(vboosts[i]).ljust(4)} | {str(powers[i]).ljust(2)}"
             )
-        pw.dlog(
-            f"Temperatures in C: Ch0 {tmp0} | Ch1 {tmp1} | Ch2 {tmp2}"
-        )
+        pw.dlog(f"Temperatures in C: Ch0 {tmp0} | Ch1 {tmp1} | Ch2 {tmp2}")
         pw.dlog(
             f"Boot Count {bootcnt} | Uptime {uptime} sec | "
             f"MPPT Time {mppt_time} msec | MPPT Period {mppt_period} msec"
@@ -423,3 +422,30 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         )
         dev_parser.print(pw=pw)
         printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=8)
+
+
+def handle_get_param_data_reply(
+    obj_id: ObjectIdBase, action_id: int, pw: PrintWrapper, custom_data: bytearray
+):
+    if action_id == GomspaceDeviceActionIds.PARAM_GET:
+        pw.dlog(f"Parameter Get Request received for object {obj_id}")
+        header_list = [
+            "Gomspace Request Code",
+            "Table ID",
+            "Memory Address",
+            "Payload length",
+            "Payload",
+        ]
+        fmt_str = "!BBHH"
+        (gs_request_code, table_id, address, payload_length) = struct.unpack(
+            fmt_str, custom_data[:6]
+        )
+        content_list = [
+            hex(gs_request_code),
+            table_id,
+            hex(address),
+            payload_length,
+            f"0x[{custom_data[6:].hex(sep=',')}]",
+        ]
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")

From efc8e3b4b2078d070a39efe5338ea89ba56cd248 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 27 Aug 2022 01:01:04 +0200
Subject: [PATCH 13/19] basic pdu config parsing

---
 tmtc/power/acu.py | 23 ++-----------------
 tmtc/power/tm.py  | 58 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/tmtc/power/acu.py b/tmtc/power/acu.py
index 5f130e0..7930c2d 100644
--- a/tmtc/power/acu.py
+++ b/tmtc/power/acu.py
@@ -5,7 +5,7 @@
 """
 
 from config.definitions import CustomServiceList
-from tmtc.power.common_power import add_gomspace_cmds
+from tmtc.power.common_power import add_gomspace_cmds, add_gomspace_cmd_defs
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
@@ -52,26 +52,7 @@ class Info:
 @tmtc_definitions_provider
 def add_acu_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
-    )
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
-    )
-    oce.add(
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
-    )
-    oce.add(
-        keys=GomspaceOpCodes.GET_PARAM,
-        info=GsInfo.GET_PARAMETER,
-    )
-    oce.add(
-        keys=GomspaceOpCodes.SET_PARAM,
-        info=GsInfo.SET_PARAMETER,
-    )
+    add_gomspace_cmd_defs(oce)
     oce.add(keys=OpCodes.TEST, info=Info.TEST)
     defs.add_service(
         name=CustomServiceList.ACU.value,
diff --git a/tmtc/power/tm.py b/tmtc/power/tm.py
index 7407c85..bda8012 100644
--- a/tmtc/power/tm.py
+++ b/tmtc/power/tm.py
@@ -5,6 +5,12 @@ from tmtccmd.util import ObjectIdBase
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from pus_tm.defs import PrintWrapper
 from gomspace.gomspace_common import SetIds, GomspaceDeviceActionIds
+from config.object_ids import (
+    PDU_1_HANDLER_ID,
+    PDU_2_HANDLER_ID,
+    P60_DOCK_HANDLER,
+    ACU_HANDLER_ID,
+)
 
 P60_INDEX_LIST = [
     "ACU VCC",
@@ -424,6 +430,9 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=8)
 
 
+OBC_ENDIANNESS = "<"
+
+
 def handle_get_param_data_reply(
     obj_id: ObjectIdBase, action_id: int, pw: PrintWrapper, custom_data: bytearray
 ):
@@ -449,3 +458,52 @@ def handle_get_param_data_reply(
         ]
         pw.dlog(f"{header_list}")
         pw.dlog(f"{content_list}")
+    elif action_id == GomspaceDeviceActionIds.REQUEST_CONFIG_TABLE:
+        print(f"Received config table with size {len(custom_data)} for object {obj_id}")
+        if obj_id.as_bytes == PDU_1_HANDLER_ID or obj_id.as_bytes == PDU_2_HANDLER_ID:
+            out_on_cnt = unpack_array_in_data(custom_data, 0x52, 2, 9, "H")
+            out_off_cnt = unpack_array_in_data(custom_data, 0x64, 2, 9, "H")
+            init_out_norm = unpack_array_in_data(custom_data, 0x76, 1, 9, "B")
+            init_out_safe = unpack_array_in_data(custom_data, 0x80, 1, 9, "B")
+            init_on_dly = unpack_array_in_data(custom_data, 0x8A, 2, 9, "H")
+            init_off_dly = unpack_array_in_data(custom_data, 0x9C, 2, 9, "H")
+            safe_off_dly = unpack_array_in_data(custom_data, 0xAE, 1, 9, "B")
+            batt_hwmax = struct.unpack(
+                f"{OBC_ENDIANNESS}H", custom_data[0x11C : 0x11C + 2]
+            )[0]
+            batt_max = struct.unpack(
+                f"{OBC_ENDIANNESS}H", custom_data[0x11E : 0x11E + 2]
+            )[0]
+            batt_norm = struct.unpack(
+                f"{OBC_ENDIANNESS}H", custom_data[0x120 : 0x120 + 2]
+            )[0]
+            batt_safe = struct.unpack(
+                f"{OBC_ENDIANNESS}H", custom_data[0x122 : 0x122 + 2]
+            )[0]
+            batt_crit = struct.unpack(
+                f"{OBC_ENDIANNESS}H", custom_data[0x124 : 0x124 + 2]
+            )[0]
+            pw.dlog(f"{'out_on_cnt'.ljust(15)}: {out_on_cnt}")
+            pw.dlog(f"{'out_off_cnt'.ljust(15)}: {out_off_cnt}")
+            pw.dlog(f"{'init_out_norm'.ljust(15)}: {init_out_norm}")
+            pw.dlog(f"{'init_out_safe'.ljust(15)}: {init_out_safe}")
+            pw.dlog(f"{'init_on_dly'.ljust(15)}: {init_on_dly}")
+            pw.dlog(f"{'init_off_dly'.ljust(15)}: {init_off_dly}")
+            pw.dlog(f"{'safe_off_dly'.ljust(15)}: {safe_off_dly}")
+            pw.dlog(f"{'batt_hwmax'.ljust(15)}: {batt_hwmax}")
+            pw.dlog(f"{'batt_max'.ljust(15)}: {batt_max}")
+            pw.dlog(f"{'batt_norm'.ljust(15)}: {batt_norm}")
+            pw.dlog(f"{'batt_safe'.ljust(15)}: {batt_safe}")
+            pw.dlog(f"{'batt_crit'.ljust(15)}: {batt_crit}")
+
+
+def unpack_array_in_data(
+    data: bytes, start_addr: int, width: int, entries: int, struct_spec: str
+) -> List:
+    return [
+        struct.unpack(
+            f"{OBC_ENDIANNESS}{struct_spec}",
+            data[start_addr + (i * width) : start_addr + ((i + 1) * width)],
+        )[0]
+        for i in range(entries)
+    ]

From ce837353cac8a6238a5383220b636a6e033de889 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 27 Aug 2022 16:28:33 +0200
Subject: [PATCH 14/19] somoe more restructuring

---
 tmtc/power/acu.py          |  14 +-
 tmtc/power/common_power.py | 357 ++-----------------------------------
 tmtc/power/p60dock.py      |  20 +--
 tmtc/power/pdu1.py         | 165 ++++++++++++++++-
 tmtc/power/pdu2.py         | 194 +++++++++++++++++++-
 tmtc/power/power.py        |  12 +-
 6 files changed, 393 insertions(+), 369 deletions(-)

diff --git a/tmtc/power/acu.py b/tmtc/power/acu.py
index 7930c2d..12fe28b 100644
--- a/tmtc/power/acu.py
+++ b/tmtc/power/acu.py
@@ -5,7 +5,11 @@
 """
 
 from config.definitions import CustomServiceList
-from tmtc.power.common_power import add_gomspace_cmds, add_gomspace_cmd_defs
+from tmtc.power.common_power import (
+    add_gomspace_cmds,
+    add_gomspace_cmd_defs,
+    req_hk_cmds,
+)
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
@@ -53,6 +57,7 @@ class Info:
 def add_acu_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_gomspace_cmd_defs(oce)
+
     oce.add(keys=OpCodes.TEST, info=Info.TEST)
     defs.add_service(
         name=CustomServiceList.ACU.value,
@@ -64,9 +69,16 @@ def add_acu_cmds(defs: TmtcDefinitionWrapper):
 def pack_acu_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
     q.add_log_cmd("Handling ACU command")
     add_gomspace_cmds("ACU", object_id, q, op_code)
+    acu_req_hk_cmds(q, op_code)
     pack_test_cmds(object_id=object_id, q=q)
 
 
+def acu_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
+    req_hk_cmds(
+        "ACU", q, op_code, ACU_HANDLER_ID, [gs.SetIds.ACU_CORE, gs.SetIds.ACU_AUX]
+    )
+
+
 class ACUTestProcedure:
     """
     @brief  Use this class to define the tests to perform for the ACU.
diff --git a/tmtc/power/common_power.py b/tmtc/power/common_power.py
index f57f738..3b45874 100644
--- a/tmtc/power/common_power.py
+++ b/tmtc/power/common_power.py
@@ -1,12 +1,8 @@
-import enum
-
-from config.object_ids import PDU_1_HANDLER_ID, PDU_2_HANDLER_ID
 from gomspace.gomspace_common import (
     pack_set_param_command,
     Channel,
     GomspaceOpCodes,
     GsInfo,
-    SetIds,
     GomspaceDeviceActionIds,
     prompt_and_pack_set_param_command,
     prompt_and_pack_get_param_command,
@@ -24,56 +20,12 @@ from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 
 
-class Pdu1ChIndex(enum.IntEnum):
-    TCS = 0
-    SYRLINKS = 1
-    STR = 2
-    MGT = 3
-    SUS_N = 4
-    SCEX = 5
-    PLOC = 6
-    ACS_A = 7
-
-
-class Pdu1InfoBase:
-    TCS = "Switch TCS Board"
-    SYRLINKS = "Switch Syrlinks (COM)"
-    STR = "Switch Startracker"
-    MGT = "Switch Magnetorquer"
-    SUS_N = "Switch Sun Sensor Board Nominal"
-    SCEX = "Switch Solar Cell Experiment"
-    PLOC = "Switch Payload On-Board Computer"
-    ACS_A = "Switch ACS Board A-Side"
-
-
-class Pdu2InfoBase:
-    PL_PCDU_BAT_NOM = "Switch PL PCDU Nominal Battery Channel"
-    RW = "Switch Reaction Wheel"
-    HEATER = "Switch Heater"
-    SUS_R = "Switch Sun Sensor Board Redundant"
-    SOLAR_ARRAY_DEPL = "Switch Solar Array Deployment"
-    PL_PCDU_BAT_RED = "Switch PL PCDU Redundant Battery Channel"
-    ACS_B = "Switch ACS Board B-Side"
-    PL_CAM = "Switch Payload Camera"
-
-
 class PowerInfo:
     INFO_CORE = "Core Information"
     INFO_AUX = "Auxiliary Information"
     INFO_ALL = "All Information"
 
 
-class Pdu2ChIndex(enum.IntEnum):
-    PL_PCDU_BAT_NOM = 1
-    RW = 2
-    HEATER = 3
-    SUS_R = 4
-    SOLAR_ARRAY_DEPL = 5
-    PL_PCDU_BAT_RED = 6
-    ACS_B = 7
-    PL_CAM = 8
-
-
 class PowerOpCodes:
     # PDU 1
     TCS_ON = ["tcs-on"]
@@ -116,78 +68,6 @@ class PowerOpCodes:
     INFO_ALL = ["info-all"]
 
 
-def info_on_pdu1(base: str) -> str:
-    return "PDU1: " + base + " on"
-
-
-def info_off_pdu1(base: str) -> str:
-    return "PDU1: " + base + " off"
-
-
-def info_on_pdu2(base: str) -> str:
-    return "PDU2: " + base + " on"
-
-
-def info_off_pdu2(base: str) -> str:
-    return "PDU2: " + base + " off"
-
-
-def add_pdu1_common_defs(oce: OpCodeEntry):
-    oce.add(keys=PowerOpCodes.TCS_ON, info=info_on_pdu1(Pdu1InfoBase.TCS))
-    oce.add(keys=PowerOpCodes.TCS_OFF, info=info_off_pdu1(Pdu1InfoBase.TCS))
-    oce.add(keys=PowerOpCodes.STAR_TRACKER_ON, info=info_on_pdu1(Pdu1InfoBase.STR))
-    oce.add(keys=PowerOpCodes.STAR_TRACKER_OFF, info=info_off_pdu1(Pdu1InfoBase.STR))
-    oce.add(keys=PowerOpCodes.SUS_N_ON, info=info_on_pdu1(Pdu1InfoBase.SUS_N))
-    oce.add(keys=PowerOpCodes.SUS_N_OFF, info=info_off_pdu1(Pdu1InfoBase.SUS_N))
-    oce.add(keys=PowerOpCodes.ACS_A_ON, info=info_on_pdu1(Pdu1InfoBase.ACS_A))
-    oce.add(keys=PowerOpCodes.ACS_A_OFF, info=info_off_pdu1(Pdu1InfoBase.ACS_A))
-    oce.add(keys=PowerOpCodes.SYRLINKS_ON, info=info_on_pdu1(Pdu1InfoBase.SYRLINKS))
-    oce.add(keys=PowerOpCodes.SYRLINKS_OFF, info=info_off_pdu1(Pdu1InfoBase.SYRLINKS))
-    oce.add(keys=PowerOpCodes.MGT_ON, info=info_on_pdu1(Pdu1InfoBase.MGT))
-    oce.add(keys=PowerOpCodes.MGT_OFF, info=info_off_pdu1(Pdu1InfoBase.MGT))
-    oce.add(keys=PowerOpCodes.PLOC_ON, info=info_on_pdu1(Pdu1InfoBase.PLOC))
-    oce.add(keys=PowerOpCodes.PLOC_OFF, info=info_off_pdu1(Pdu1InfoBase.PLOC))
-    oce.add(keys=PowerOpCodes.SCEX_ON, info=info_on_pdu1(Pdu1InfoBase.SCEX))
-    oce.add(keys=PowerOpCodes.SCEX_OFF, info=info_off_pdu1(Pdu1InfoBase.SCEX))
-
-
-def add_pdu2_common_defs(oce: OpCodeEntry):
-    oce.add(keys=PowerOpCodes.ACS_B_ON, info=info_on_pdu2(Pdu2InfoBase.ACS_B))
-    oce.add(keys=PowerOpCodes.ACS_B_OFF, info=info_off_pdu2(Pdu2InfoBase.ACS_B))
-    oce.add(keys=PowerOpCodes.SUS_R_ON, info=info_on_pdu2(Pdu2InfoBase.SUS_R))
-    oce.add(keys=PowerOpCodes.SUS_R_OFF, info=info_off_pdu2(Pdu2InfoBase.SUS_R))
-    oce.add(keys=PowerOpCodes.RW_ON, info=info_on_pdu2(Pdu2InfoBase.RW))
-    oce.add(keys=PowerOpCodes.RW_OFF, info=info_off_pdu2(Pdu2InfoBase.RW))
-    oce.add(
-        keys=PowerOpCodes.PL_PCDU_VBAT_NOM_ON,
-        info=info_on_pdu2(Pdu2InfoBase.PL_PCDU_BAT_NOM),
-    )
-    oce.add(
-        keys=PowerOpCodes.PL_PCDU_VBAT_NOM_OFF,
-        info=info_off_pdu2(Pdu2InfoBase.PL_PCDU_BAT_NOM),
-    )
-    oce.add(
-        keys=PowerOpCodes.PL_PCDU_VBAT_RED_ON,
-        info=info_on_pdu2(Pdu2InfoBase.PL_PCDU_BAT_RED),
-    )
-    oce.add(
-        keys=PowerOpCodes.PL_PCDU_VBAT_RED_OFF,
-        info=info_off_pdu2(Pdu2InfoBase.PL_PCDU_BAT_RED),
-    )
-    oce.add(keys=PowerOpCodes.HEATER_ON, info=info_on_pdu2(Pdu2InfoBase.HEATER))
-    oce.add(keys=PowerOpCodes.HEATER_OFF, info=info_off_pdu2(Pdu2InfoBase.HEATER))
-    oce.add(
-        keys=PowerOpCodes.SOLAR_ARRAY_DEPL_ON,
-        info=info_on_pdu2(Pdu2InfoBase.SOLAR_ARRAY_DEPL),
-    )
-    oce.add(
-        keys=PowerOpCodes.SOLAR_ARRAY_DEPL_OFF,
-        info=info_off_pdu2(Pdu2InfoBase.SOLAR_ARRAY_DEPL),
-    )
-    oce.add(keys=PowerOpCodes.PL_CAM_ON, info=info_on_pdu2(Pdu2InfoBase.PL_CAM))
-    oce.add(keys=PowerOpCodes.PL_CAM_OFF, info=info_off_pdu2(Pdu2InfoBase.PL_CAM))
-
-
 def add_gomspace_cmds(
     prefix: str, object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
@@ -217,238 +97,23 @@ def add_gomspace_cmds(
         q.add_pus_tc(pack_request_config_command(object_id.as_bytes))
 
 
-def pdu1_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in PowerOpCodes.TCS_ON:
-        tcs_on_cmd(q)
-    elif op_code in PowerOpCodes.TCS_OFF:
-        tcs_off_cmd(q)
-    elif op_code in PowerOpCodes.SYRLINKS_ON:
-        syrlinks_on_cmd(q)
-    elif op_code in PowerOpCodes.SYRLINKS_OFF:
-        syrlinks_off_cmd(q)
-    elif op_code in PowerOpCodes.STAR_TRACKER_ON:
-        startracker_on_cmd(q)
-    elif op_code in PowerOpCodes.STAR_TRACKER_OFF:
-        startracker_off_cmd(q)
-    elif op_code in PowerOpCodes.MGT_ON:
-        mgt_on_cmd(q)
-    elif op_code in PowerOpCodes.MGT_OFF:
-        mgt_off_cmd(q)
-    elif op_code in PowerOpCodes.SUS_N_ON:
-        sun_sensor_nominal_on_cmd(q)
-    elif op_code in PowerOpCodes.SUS_N_OFF:
-        sun_sensor_nominal_off_cmd(q)
-    elif op_code in PowerOpCodes.SCEX_ON:
-        solar_cell_experiment_on_cmd(q)
-    elif op_code in PowerOpCodes.SCEX_OFF:
-        solar_cell_experiment_off_cmd(q)
-    elif op_code in PowerOpCodes.PLOC_ON:
-        ploc_on_cmd(q)
-    elif op_code in PowerOpCodes.PLOC_OFF:
-        ploc_off_cmd(q)
-    elif op_code in PowerOpCodes.ACS_A_ON:
-        acs_board_a_on_cmd(q)
-    elif op_code in PowerOpCodes.ACS_A_OFF:
-        acs_board_a_off_cmd(q)
-
-
-def pdu2_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_ON:
-        pl_pcdu_bat_nom_on_cmd(q)
-    elif op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_OFF:
-        pl_pcdu_bat_nom_off_cmd(q)
-    elif op_code in PowerOpCodes.RW_ON:
-        reaction_wheel_on_cmd(q)
-    elif op_code in PowerOpCodes.RW_OFF:
-        reaction_wheel_off_cmd(q)
-    elif op_code in PowerOpCodes.HEATER_ON:
-        heater_on_cmd(q)
-    elif op_code in PowerOpCodes.HEATER_OFF:
-        heater_off_cmd(q)
-    elif op_code in PowerOpCodes.SUS_R_ON:
-        sus_red_on_cmd(q)
-    elif op_code in PowerOpCodes.SUS_R_OFF:
-        sus_red_off_cmd(q)
-    elif op_code in PowerOpCodes.SOLAR_ARRAY_DEPL_ON:
-        solar_array_deployment_on_cmd(q)
-    elif op_code in PowerOpCodes.SOLAR_ARRAY_DEPL_OFF:
-        solar_array_deployment_off_cmd(q)
-    elif op_code in PowerOpCodes.PL_PCDU_VBAT_RED_ON:
-        pl_pcdu_bat_red_on_cmd(q)
-    elif op_code in PowerOpCodes.PL_PCDU_VBAT_RED_OFF:
-        pl_pcdu_bat_nom_off_cmd(q)
-    elif op_code in PowerOpCodes.ACS_B_ON:
-        acs_board_b_side_on_cmd(q)
-    elif op_code in PowerOpCodes.ACS_B_OFF:
-        acs_board_b_side_off_cmd(q)
-    elif op_code in PowerOpCodes.PL_CAM_ON:
-        payload_camera_on_cmd(q)
-    elif op_code in PowerOpCodes.PL_CAM_OFF:
-        payload_camera_off_cmd(q)
-
-
-def pdu1_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
+def req_hk_cmds(
+    prefix: str,
+    q: DefaultPusQueueHelper,
+    op_code: str,
+    obj_id: bytes,
+    set_id_pair: [int, int],
+):
     if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        q.add_log_cmd(f"PDU1: {GsInfo.REQUEST_CORE_HK_ONCE}")
-        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1_CORE)
+        q.add_log_cmd(f"{prefix}: {GsInfo.REQUEST_CORE_HK_ONCE}")
+        hk_sid = make_sid(object_id=obj_id, set_id=set_id_pair[0])
         q.add_pus_tc(generate_one_diag_command(sid=hk_sid))
     if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        q.add_log_cmd(f"PDU1: {GsInfo.REQUEST_AUX_HK_ONCE}")
-        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1_AUX)
+        q.add_log_cmd(f"{prefix}: {GsInfo.REQUEST_AUX_HK_ONCE}")
+        hk_sid = make_sid(object_id=obj_id, set_id=set_id_pair[1])
         q.add_pus_tc(generate_one_hk_command(sid=hk_sid))
 
 
-def pdu2_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        q.add_log_cmd(f"PDU2: {GsInfo.REQUEST_CORE_HK_ONCE}")
-        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2_CORE)
-        q.add_pus_tc(generate_one_diag_command(sid=hk_sid))
-    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        q.add_log_cmd(f"PDU2: {GsInfo.REQUEST_AUX_HK_ONCE}")
-        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2_AUX)
-        q.add_pus_tc(generate_one_hk_command(sid=hk_sid))
-
-
-def tcs_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.TCS, Pdu1ChIndex.TCS)
-
-
-def tcs_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.TCS, Pdu1ChIndex.TCS)
-
-
-def syrlinks_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SYRLINKS, Pdu1ChIndex.SYRLINKS)
-
-
-def syrlinks_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SYRLINKS, Pdu1ChIndex.SYRLINKS)
-
-
-def startracker_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.STR, Pdu1ChIndex.STR)
-
-
-def startracker_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.STR, Pdu1ChIndex.STR)
-
-
-def mgt_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.MGT, Pdu1ChIndex.MGT)
-
-
-def mgt_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.MGT, Pdu1ChIndex.MGT)
-
-
-def sun_sensor_nominal_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SUS_N, Pdu1ChIndex.SUS_N)
-
-
-def sun_sensor_nominal_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SUS_N, Pdu1ChIndex.SUS_N)
-
-
-def solar_cell_experiment_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SCEX, Pdu1ChIndex.SCEX)
-
-
-def solar_cell_experiment_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SCEX, Pdu1ChIndex.SCEX)
-
-
-def ploc_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.PLOC, Pdu1ChIndex.PLOC)
-
-
-def ploc_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.PLOC, Pdu1ChIndex.PLOC)
-
-
-def acs_board_a_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.ACS_A, Pdu1ChIndex.ACS_A)
-
-
-def acs_board_a_off_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.ACS_A, Pdu1ChIndex.ACS_A)
-
-
-def pl_pcdu_bat_nom_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(
-        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_NOM, Pdu2ChIndex.PL_PCDU_BAT_NOM
-    )
-
-
-def pl_pcdu_bat_nom_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(
-        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_NOM, Pdu2ChIndex.PL_PCDU_BAT_NOM
-    )
-
-
-def reaction_wheel_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.RW, Pdu2ChIndex.RW)
-
-
-def reaction_wheel_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.RW, Pdu2ChIndex.RW)
-
-
-def heater_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.HEATER, Pdu2ChIndex.HEATER)
-
-
-def heater_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.HEATER, Pdu2ChIndex.HEATER)
-
-
-def sus_red_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.SUS_R, Pdu2ChIndex.SUS_R)
-
-
-def sus_red_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.SUS_R, Pdu2ChIndex.SUS_R)
-
-
-def solar_array_deployment_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(
-        PDU_2_HANDLER_ID, q, Pdu2InfoBase.SOLAR_ARRAY_DEPL, Pdu2ChIndex.SOLAR_ARRAY_DEPL
-    )
-
-
-def solar_array_deployment_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(
-        PDU_2_HANDLER_ID, q, Pdu2InfoBase.SOLAR_ARRAY_DEPL, Pdu2ChIndex.SOLAR_ARRAY_DEPL
-    )
-
-
-def pl_pcdu_bat_red_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(
-        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_RED, Pdu2ChIndex.PL_PCDU_BAT_RED
-    )
-
-
-def pl_pcdu_bat_red_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(
-        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_RED, Pdu2ChIndex.PL_PCDU_BAT_RED
-    )
-
-
-def acs_board_b_side_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.ACS_B, Pdu2ChIndex.ACS_B)
-
-
-def acs_board_b_side_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.ACS_B, Pdu2ChIndex.ACS_B)
-
-
-def payload_camera_on_cmd(q: DefaultPusQueueHelper):
-    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_CAM, Pdu2ChIndex.PL_CAM)
-
-
-def payload_camera_off_cmd(q: DefaultPusQueueHelper):
-    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_CAM, Pdu2ChIndex.PL_CAM)
-
-
 def generic_on_cmd(
     object_id: bytes, q: DefaultPusQueueHelper, info_str: str, out_idx: int
 ):
diff --git a/tmtc/power/p60dock.py b/tmtc/power/p60dock.py
index e8cd5c5..d4bcc01 100644
--- a/tmtc/power/p60dock.py
+++ b/tmtc/power/p60dock.py
@@ -5,16 +5,9 @@
 @author J. Meier
 @date   13.12.2020
 """
-from tmtc.power.common_power import add_gomspace_cmds
+from tmtc.power.common_power import add_gomspace_cmds, req_hk_cmds
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    generate_one_hk_command,
-    make_sid,
-    generate_one_diag_command,
-)
 from gomspace.gomspace_common import (
-    GsInfo,
-    GomspaceOpCodes,
     TableEntry,
     Channel,
     pack_set_param_command,
@@ -22,12 +15,10 @@ from gomspace.gomspace_common import (
     pack_get_param_command,
     pack_gnd_wdt_reset_command,
     pack_ping_command,
-    GomspaceDeviceActionIds,
     pack_reboot_command,
     SetIds,
 )
 from config.object_ids import P60_DOCK_HANDLER
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32
 
 
@@ -104,6 +95,8 @@ class P60DockHkTable:
 
 def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
     objb = object_id.as_bytes
+    add_gomspace_cmds("P60 Dock", object_id, q, op_code)
+    p60_dock_req_hk_cmds(q, op_code)
     if op_code in P60OpCodes.STACK_3V3_ON:
         q.add_log_cmd(P60Info.STACK_3V3_ON)
         q.add_pus_tc(
@@ -144,7 +137,6 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
                 Channel.off,
             )
         )
-    add_gomspace_cmds("P60 Dock", object_id, q, op_code)
     if P60DockTestProcedure.all or P60DockTestProcedure.reboot:
         q.add_log_cmd("P60 Dock: Reboot")
         q.add_pus_tc(pack_reboot_command(object_id))
@@ -271,3 +263,9 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
                 parameter,
             )
         )
+
+
+def p60_dock_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
+    req_hk_cmds(
+        "P60 Dock", q, op_code, P60_DOCK_HANDLER, [SetIds.P60_CORE, SetIds.P60_AUX]
+    )
diff --git a/tmtc/power/pdu1.py b/tmtc/power/pdu1.py
index 363660e..c846a1c 100644
--- a/tmtc/power/pdu1.py
+++ b/tmtc/power/pdu1.py
@@ -3,11 +3,40 @@
 @author J. Meier
 @date   17.12.2020
 """
-import gomspace.gomspace_common as gs
-from tmtc.power.common_power import pdu1_cmds, pdu1_req_hk_cmds, add_gomspace_cmds
+from config.object_ids import PDU_1_HANDLER_ID
+from tmtc.power.common_power import (
+    add_gomspace_cmds,
+    req_hk_cmds,
+    PowerOpCodes,
+    generic_on_cmd,
+    generic_off_cmd,
+)
 
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
+from tmtccmd.config import OpCodeEntry
+
+
+class Pdu1InfoBase:
+    TCS = "Switch TCS Board"
+    SYRLINKS = "Switch Syrlinks (COM)"
+    STR = "Switch Startracker"
+    MGT = "Switch Magnetorquer"
+    SUS_N = "Switch Sun Sensor Board Nominal"
+    SCEX = "Switch Solar Cell Experiment"
+    PLOC = "Switch Payload On-Board Computer"
+    ACS_A = "Switch ACS Board A-Side"
+
+
+class Pdu1ChIndex(enum.IntEnum):
+    TCS = 0
+    SYRLINKS = 1
+    STR = 2
+    MGT = 3
+    SUS_N = 4
+    SCEX = 5
+    PLOC = 6
+    ACS_A = 7
 
 
 class PDU1TestProcedure:
@@ -87,3 +116,135 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
                 Channel.off,
             )
         )
+
+
+def pdu1_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
+    req_hk_cmds(
+        "PDU1", q, op_code, PDU_1_HANDLER_ID, [SetIds.PDU_1_CORE, SetIds.PDU_1_AUX]
+    )
+
+
+def info_on_pdu1(base: str) -> str:
+    return "PDU1: " + base + " on"
+
+
+def info_off_pdu1(base: str) -> str:
+    return "PDU1: " + base + " off"
+
+
+def pdu1_cmds(q: DefaultPusQueueHelper, op_code: str):
+    if op_code in PowerOpCodes.TCS_ON:
+        tcs_on_cmd(q)
+    elif op_code in PowerOpCodes.TCS_OFF:
+        tcs_off_cmd(q)
+    elif op_code in PowerOpCodes.SYRLINKS_ON:
+        syrlinks_on_cmd(q)
+    elif op_code in PowerOpCodes.SYRLINKS_OFF:
+        syrlinks_off_cmd(q)
+    elif op_code in PowerOpCodes.STAR_TRACKER_ON:
+        startracker_on_cmd(q)
+    elif op_code in PowerOpCodes.STAR_TRACKER_OFF:
+        startracker_off_cmd(q)
+    elif op_code in PowerOpCodes.MGT_ON:
+        mgt_on_cmd(q)
+    elif op_code in PowerOpCodes.MGT_OFF:
+        mgt_off_cmd(q)
+    elif op_code in PowerOpCodes.SUS_N_ON:
+        sun_sensor_nominal_on_cmd(q)
+    elif op_code in PowerOpCodes.SUS_N_OFF:
+        sun_sensor_nominal_off_cmd(q)
+    elif op_code in PowerOpCodes.SCEX_ON:
+        solar_cell_experiment_on_cmd(q)
+    elif op_code in PowerOpCodes.SCEX_OFF:
+        solar_cell_experiment_off_cmd(q)
+    elif op_code in PowerOpCodes.PLOC_ON:
+        ploc_on_cmd(q)
+    elif op_code in PowerOpCodes.PLOC_OFF:
+        ploc_off_cmd(q)
+    elif op_code in PowerOpCodes.ACS_A_ON:
+        acs_board_a_on_cmd(q)
+    elif op_code in PowerOpCodes.ACS_A_OFF:
+        acs_board_a_off_cmd(q)
+
+
+def add_pdu1_common_defs(oce: OpCodeEntry):
+    oce.add(keys=PowerOpCodes.TCS_ON, info=info_on_pdu1(Pdu1InfoBase.TCS))
+    oce.add(keys=PowerOpCodes.TCS_OFF, info=info_off_pdu1(Pdu1InfoBase.TCS))
+    oce.add(keys=PowerOpCodes.STAR_TRACKER_ON, info=info_on_pdu1(Pdu1InfoBase.STR))
+    oce.add(keys=PowerOpCodes.STAR_TRACKER_OFF, info=info_off_pdu1(Pdu1InfoBase.STR))
+    oce.add(keys=PowerOpCodes.SUS_N_ON, info=info_on_pdu1(Pdu1InfoBase.SUS_N))
+    oce.add(keys=PowerOpCodes.SUS_N_OFF, info=info_off_pdu1(Pdu1InfoBase.SUS_N))
+    oce.add(keys=PowerOpCodes.ACS_A_ON, info=info_on_pdu1(Pdu1InfoBase.ACS_A))
+    oce.add(keys=PowerOpCodes.ACS_A_OFF, info=info_off_pdu1(Pdu1InfoBase.ACS_A))
+    oce.add(keys=PowerOpCodes.SYRLINKS_ON, info=info_on_pdu1(Pdu1InfoBase.SYRLINKS))
+    oce.add(keys=PowerOpCodes.SYRLINKS_OFF, info=info_off_pdu1(Pdu1InfoBase.SYRLINKS))
+    oce.add(keys=PowerOpCodes.MGT_ON, info=info_on_pdu1(Pdu1InfoBase.MGT))
+    oce.add(keys=PowerOpCodes.MGT_OFF, info=info_off_pdu1(Pdu1InfoBase.MGT))
+    oce.add(keys=PowerOpCodes.PLOC_ON, info=info_on_pdu1(Pdu1InfoBase.PLOC))
+    oce.add(keys=PowerOpCodes.PLOC_OFF, info=info_off_pdu1(Pdu1InfoBase.PLOC))
+    oce.add(keys=PowerOpCodes.SCEX_ON, info=info_on_pdu1(Pdu1InfoBase.SCEX))
+    oce.add(keys=PowerOpCodes.SCEX_OFF, info=info_off_pdu1(Pdu1InfoBase.SCEX))
+
+
+def tcs_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.TCS, Pdu1ChIndex.TCS)
+
+
+def tcs_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.TCS, Pdu1ChIndex.TCS)
+
+
+def syrlinks_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SYRLINKS, Pdu1ChIndex.SYRLINKS)
+
+
+def syrlinks_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SYRLINKS, Pdu1ChIndex.SYRLINKS)
+
+
+def startracker_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.STR, Pdu1ChIndex.STR)
+
+
+def startracker_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.STR, Pdu1ChIndex.STR)
+
+
+def mgt_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.MGT, Pdu1ChIndex.MGT)
+
+
+def mgt_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.MGT, Pdu1ChIndex.MGT)
+
+
+def sun_sensor_nominal_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SUS_N, Pdu1ChIndex.SUS_N)
+
+
+def sun_sensor_nominal_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SUS_N, Pdu1ChIndex.SUS_N)
+
+
+def solar_cell_experiment_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SCEX, Pdu1ChIndex.SCEX)
+
+
+def solar_cell_experiment_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.SCEX, Pdu1ChIndex.SCEX)
+
+
+def ploc_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.PLOC, Pdu1ChIndex.PLOC)
+
+
+def ploc_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.PLOC, Pdu1ChIndex.PLOC)
+
+
+def acs_board_a_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.ACS_A, Pdu1ChIndex.ACS_A)
+
+
+def acs_board_a_off_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_1_HANDLER_ID, q, Pdu1InfoBase.ACS_A, Pdu1ChIndex.ACS_A)
diff --git a/tmtc/power/pdu2.py b/tmtc/power/pdu2.py
index 4929974..ef90352 100644
--- a/tmtc/power/pdu2.py
+++ b/tmtc/power/pdu2.py
@@ -6,9 +6,39 @@
 @author J. Meier
 @date   17.12.2020
 """
-from tmtc.power.common_power import pdu2_cmds, pdu2_req_hk_cmds, add_gomspace_cmds
+from config.object_ids import PDU_2_HANDLER_ID
+from tmtc.power.common_power import (
+    add_gomspace_cmds,
+    req_hk_cmds,
+    PowerOpCodes,
+    generic_on_cmd,
+    generic_off_cmd,
+)
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
+from tmtccmd.config import OpCodeEntry
+
+
+class Pdu2InfoBase:
+    PL_PCDU_BAT_NOM = "Switch PL PCDU Nominal Battery Channel"
+    RW = "Switch Reaction Wheel"
+    HEATER = "Switch Heater"
+    SUS_R = "Switch Sun Sensor Board Redundant"
+    SOLAR_ARRAY_DEPL = "Switch Solar Array Deployment"
+    PL_PCDU_BAT_RED = "Switch PL PCDU Redundant Battery Channel"
+    ACS_B = "Switch ACS Board B-Side"
+    PL_CAM = "Switch Payload Camera"
+
+
+class Pdu2ChIndex(enum.IntEnum):
+    PL_PCDU_BAT_NOM = 1
+    RW = 2
+    HEATER = 3
+    SUS_R = 4
+    SOLAR_ARRAY_DEPL = 5
+    PL_PCDU_BAT_RED = 6
+    ACS_B = 7
+    PL_CAM = 8
 
 
 class PDU2TestProcedure:
@@ -117,3 +147,165 @@ def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
     if PDU2TestProcedure.all or PDU2TestProcedure.request_hk_table:
         q.add_log_cmd("PDU2: Requesting housekeeping table")
         q.add_pus_tc(pack_request_full_hk_table_command(object_id))
+
+
+def pdu2_cmds(q: DefaultPusQueueHelper, op_code: str):
+    if op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_ON:
+        pl_pcdu_bat_nom_on_cmd(q)
+    elif op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_OFF:
+        pl_pcdu_bat_nom_off_cmd(q)
+    elif op_code in PowerOpCodes.RW_ON:
+        reaction_wheel_on_cmd(q)
+    elif op_code in PowerOpCodes.RW_OFF:
+        reaction_wheel_off_cmd(q)
+    elif op_code in PowerOpCodes.HEATER_ON:
+        heater_on_cmd(q)
+    elif op_code in PowerOpCodes.HEATER_OFF:
+        heater_off_cmd(q)
+    elif op_code in PowerOpCodes.SUS_R_ON:
+        sus_red_on_cmd(q)
+    elif op_code in PowerOpCodes.SUS_R_OFF:
+        sus_red_off_cmd(q)
+    elif op_code in PowerOpCodes.SOLAR_ARRAY_DEPL_ON:
+        solar_array_deployment_on_cmd(q)
+    elif op_code in PowerOpCodes.SOLAR_ARRAY_DEPL_OFF:
+        solar_array_deployment_off_cmd(q)
+    elif op_code in PowerOpCodes.PL_PCDU_VBAT_RED_ON:
+        pl_pcdu_bat_red_on_cmd(q)
+    elif op_code in PowerOpCodes.PL_PCDU_VBAT_RED_OFF:
+        pl_pcdu_bat_nom_off_cmd(q)
+    elif op_code in PowerOpCodes.ACS_B_ON:
+        acs_board_b_side_on_cmd(q)
+    elif op_code in PowerOpCodes.ACS_B_OFF:
+        acs_board_b_side_off_cmd(q)
+    elif op_code in PowerOpCodes.PL_CAM_ON:
+        payload_camera_on_cmd(q)
+    elif op_code in PowerOpCodes.PL_CAM_OFF:
+        payload_camera_off_cmd(q)
+
+
+def info_on_pdu2(base: str) -> str:
+    return "PDU2: " + base + " on"
+
+
+def info_off_pdu2(base: str) -> str:
+    return "PDU2: " + base + " off"
+
+
+def add_pdu2_common_defs(oce: OpCodeEntry):
+    oce.add(keys=PowerOpCodes.ACS_B_ON, info=info_on_pdu2(Pdu2InfoBase.ACS_B))
+    oce.add(keys=PowerOpCodes.ACS_B_OFF, info=info_off_pdu2(Pdu2InfoBase.ACS_B))
+    oce.add(keys=PowerOpCodes.SUS_R_ON, info=info_on_pdu2(Pdu2InfoBase.SUS_R))
+    oce.add(keys=PowerOpCodes.SUS_R_OFF, info=info_off_pdu2(Pdu2InfoBase.SUS_R))
+    oce.add(keys=PowerOpCodes.RW_ON, info=info_on_pdu2(Pdu2InfoBase.RW))
+    oce.add(keys=PowerOpCodes.RW_OFF, info=info_off_pdu2(Pdu2InfoBase.RW))
+    oce.add(
+        keys=PowerOpCodes.PL_PCDU_VBAT_NOM_ON,
+        info=info_on_pdu2(Pdu2InfoBase.PL_PCDU_BAT_NOM),
+    )
+    oce.add(
+        keys=PowerOpCodes.PL_PCDU_VBAT_NOM_OFF,
+        info=info_off_pdu2(Pdu2InfoBase.PL_PCDU_BAT_NOM),
+    )
+    oce.add(
+        keys=PowerOpCodes.PL_PCDU_VBAT_RED_ON,
+        info=info_on_pdu2(Pdu2InfoBase.PL_PCDU_BAT_RED),
+    )
+    oce.add(
+        keys=PowerOpCodes.PL_PCDU_VBAT_RED_OFF,
+        info=info_off_pdu2(Pdu2InfoBase.PL_PCDU_BAT_RED),
+    )
+    oce.add(keys=PowerOpCodes.HEATER_ON, info=info_on_pdu2(Pdu2InfoBase.HEATER))
+    oce.add(keys=PowerOpCodes.HEATER_OFF, info=info_off_pdu2(Pdu2InfoBase.HEATER))
+    oce.add(
+        keys=PowerOpCodes.SOLAR_ARRAY_DEPL_ON,
+        info=info_on_pdu2(Pdu2InfoBase.SOLAR_ARRAY_DEPL),
+    )
+    oce.add(
+        keys=PowerOpCodes.SOLAR_ARRAY_DEPL_OFF,
+        info=info_off_pdu2(Pdu2InfoBase.SOLAR_ARRAY_DEPL),
+    )
+    oce.add(keys=PowerOpCodes.PL_CAM_ON, info=info_on_pdu2(Pdu2InfoBase.PL_CAM))
+    oce.add(keys=PowerOpCodes.PL_CAM_OFF, info=info_off_pdu2(Pdu2InfoBase.PL_CAM))
+
+
+def pdu2_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
+    req_hk_cmds(
+        "PDU2", q, op_code, PDU_2_HANDLER_ID, [SetIds.PDU_2_CORE, SetIds.PDU_2_AUX]
+    )
+
+
+def pl_pcdu_bat_nom_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(
+        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_NOM, Pdu2ChIndex.PL_PCDU_BAT_NOM
+    )
+
+
+def pl_pcdu_bat_nom_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(
+        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_NOM, Pdu2ChIndex.PL_PCDU_BAT_NOM
+    )
+
+
+def reaction_wheel_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.RW, Pdu2ChIndex.RW)
+
+
+def reaction_wheel_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.RW, Pdu2ChIndex.RW)
+
+
+def heater_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.HEATER, Pdu2ChIndex.HEATER)
+
+
+def heater_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.HEATER, Pdu2ChIndex.HEATER)
+
+
+def sus_red_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.SUS_R, Pdu2ChIndex.SUS_R)
+
+
+def sus_red_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.SUS_R, Pdu2ChIndex.SUS_R)
+
+
+def solar_array_deployment_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(
+        PDU_2_HANDLER_ID, q, Pdu2InfoBase.SOLAR_ARRAY_DEPL, Pdu2ChIndex.SOLAR_ARRAY_DEPL
+    )
+
+
+def solar_array_deployment_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(
+        PDU_2_HANDLER_ID, q, Pdu2InfoBase.SOLAR_ARRAY_DEPL, Pdu2ChIndex.SOLAR_ARRAY_DEPL
+    )
+
+
+def pl_pcdu_bat_red_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(
+        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_RED, Pdu2ChIndex.PL_PCDU_BAT_RED
+    )
+
+
+def pl_pcdu_bat_red_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(
+        PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_PCDU_BAT_RED, Pdu2ChIndex.PL_PCDU_BAT_RED
+    )
+
+
+def acs_board_b_side_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.ACS_B, Pdu2ChIndex.ACS_B)
+
+
+def acs_board_b_side_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.ACS_B, Pdu2ChIndex.ACS_B)
+
+
+def payload_camera_on_cmd(q: DefaultPusQueueHelper):
+    generic_on_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_CAM, Pdu2ChIndex.PL_CAM)
+
+
+def payload_camera_off_cmd(q: DefaultPusQueueHelper):
+    generic_off_cmd(PDU_2_HANDLER_ID, q, Pdu2InfoBase.PL_CAM, Pdu2ChIndex.PL_CAM)
diff --git a/tmtc/power/power.py b/tmtc/power/power.py
index af74c41..2ce9643 100644
--- a/tmtc/power/power.py
+++ b/tmtc/power/power.py
@@ -1,20 +1,16 @@
-from gomspace.gomspace_common import GsInfo
+from gomspace.gomspace_common import GsInfo, GomspaceOpCodes
 from tmtc.power.common_power import (
     PowerOpCodes,
-    add_pdu1_common_defs,
-    add_pdu2_common_defs,
     PowerInfo,
-    pdu1_cmds,
-    pdu2_cmds,
-    pdu1_req_hk_cmds,
-    pdu2_req_hk_cmds,
     add_gomspace_cmd_defs,
 )
 from config.definitions import CustomServiceList
+from tmtc.power.pdu1 import pdu1_req_hk_cmds, pdu1_cmds, add_pdu1_common_defs
+from tmtc.power.pdu2 import pdu2_req_hk_cmds, add_pdu2_common_defs, pdu2_cmds
 from tmtccmd import get_console_logger
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 
-from tmtc.power.p60dock import P60OpCodes, GomspaceOpCodes, P60Info
+from tmtc.power.p60dock import P60OpCodes, P60Info
 from tmtc.power.acu import add_acu_cmds
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper

From cd21267796df1d6f90315ad1a6bd437b7fcd8699 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 27 Aug 2022 16:45:35 +0200
Subject: [PATCH 15/19] acu hk parsing

---
 tmtc/power/tm.py | 83 ++++++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 34 deletions(-)

diff --git a/tmtc/power/tm.py b/tmtc/power/tm.py
index bda8012..80819ff 100644
--- a/tmtc/power/tm.py
+++ b/tmtc/power/tm.py
@@ -461,40 +461,55 @@ def handle_get_param_data_reply(
     elif action_id == GomspaceDeviceActionIds.REQUEST_CONFIG_TABLE:
         print(f"Received config table with size {len(custom_data)} for object {obj_id}")
         if obj_id.as_bytes == PDU_1_HANDLER_ID or obj_id.as_bytes == PDU_2_HANDLER_ID:
-            out_on_cnt = unpack_array_in_data(custom_data, 0x52, 2, 9, "H")
-            out_off_cnt = unpack_array_in_data(custom_data, 0x64, 2, 9, "H")
-            init_out_norm = unpack_array_in_data(custom_data, 0x76, 1, 9, "B")
-            init_out_safe = unpack_array_in_data(custom_data, 0x80, 1, 9, "B")
-            init_on_dly = unpack_array_in_data(custom_data, 0x8A, 2, 9, "H")
-            init_off_dly = unpack_array_in_data(custom_data, 0x9C, 2, 9, "H")
-            safe_off_dly = unpack_array_in_data(custom_data, 0xAE, 1, 9, "B")
-            batt_hwmax = struct.unpack(
-                f"{OBC_ENDIANNESS}H", custom_data[0x11C : 0x11C + 2]
-            )[0]
-            batt_max = struct.unpack(
-                f"{OBC_ENDIANNESS}H", custom_data[0x11E : 0x11E + 2]
-            )[0]
-            batt_norm = struct.unpack(
-                f"{OBC_ENDIANNESS}H", custom_data[0x120 : 0x120 + 2]
-            )[0]
-            batt_safe = struct.unpack(
-                f"{OBC_ENDIANNESS}H", custom_data[0x122 : 0x122 + 2]
-            )[0]
-            batt_crit = struct.unpack(
-                f"{OBC_ENDIANNESS}H", custom_data[0x124 : 0x124 + 2]
-            )[0]
-            pw.dlog(f"{'out_on_cnt'.ljust(15)}: {out_on_cnt}")
-            pw.dlog(f"{'out_off_cnt'.ljust(15)}: {out_off_cnt}")
-            pw.dlog(f"{'init_out_norm'.ljust(15)}: {init_out_norm}")
-            pw.dlog(f"{'init_out_safe'.ljust(15)}: {init_out_safe}")
-            pw.dlog(f"{'init_on_dly'.ljust(15)}: {init_on_dly}")
-            pw.dlog(f"{'init_off_dly'.ljust(15)}: {init_off_dly}")
-            pw.dlog(f"{'safe_off_dly'.ljust(15)}: {safe_off_dly}")
-            pw.dlog(f"{'batt_hwmax'.ljust(15)}: {batt_hwmax}")
-            pw.dlog(f"{'batt_max'.ljust(15)}: {batt_max}")
-            pw.dlog(f"{'batt_norm'.ljust(15)}: {batt_norm}")
-            pw.dlog(f"{'batt_safe'.ljust(15)}: {batt_safe}")
-            pw.dlog(f"{'batt_crit'.ljust(15)}: {batt_crit}")
+            pdu_config_table_handler(pw, custom_data)
+        elif obj_id.as_bytes == ACU_HANDLER_ID:
+            acu_config_table_handler(pw, custom_data)
+
+
+def pdu_config_table_handler(pw: PrintWrapper, custom_data: bytes):
+    out_on_cnt = unpack_array_in_data(custom_data, 0x52, 2, 9, "H")
+    out_off_cnt = unpack_array_in_data(custom_data, 0x64, 2, 9, "H")
+    init_out_norm = unpack_array_in_data(custom_data, 0x76, 1, 9, "B")
+    init_out_safe = unpack_array_in_data(custom_data, 0x80, 1, 9, "B")
+    init_on_dly = unpack_array_in_data(custom_data, 0x8A, 2, 9, "H")
+    init_off_dly = unpack_array_in_data(custom_data, 0x9C, 2, 9, "H")
+    safe_off_dly = unpack_array_in_data(custom_data, 0xAE, 1, 9, "B")
+    batt_hwmax = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x11C : 0x11C + 2])[0]
+    batt_max = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x11E : 0x11E + 2])[0]
+    batt_norm = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x120 : 0x120 + 2])[0]
+    batt_safe = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x122 : 0x122 + 2])[0]
+    batt_crit = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x124 : 0x124 + 2])[0]
+    pw.dlog(f"{'out_on_cnt'.ljust(15)}: {out_on_cnt}")
+    pw.dlog(f"{'out_off_cnt'.ljust(15)}: {out_off_cnt}")
+    pw.dlog(f"{'init_out_norm'.ljust(15)}: {init_out_norm}")
+    pw.dlog(f"{'init_out_safe'.ljust(15)}: {init_out_safe}")
+    pw.dlog(f"{'init_on_dly'.ljust(15)}: {init_on_dly}")
+    pw.dlog(f"{'init_off_dly'.ljust(15)}: {init_off_dly}")
+    pw.dlog(f"{'safe_off_dly'.ljust(15)}: {safe_off_dly}")
+    pw.dlog(f"{'batt_hwmax'.ljust(15)}: {batt_hwmax}")
+    pw.dlog(f"{'batt_max'.ljust(15)}: {batt_max}")
+    pw.dlog(f"{'batt_norm'.ljust(15)}: {batt_norm}")
+    pw.dlog(f"{'batt_safe'.ljust(15)}: {batt_safe}")
+    pw.dlog(f"{'batt_crit'.ljust(15)}: {batt_crit}")
+
+
+def acu_config_table_handler(pw: PrintWrapper, custom_data: bytes):
+    mppt_mode = custom_data[0]
+    mppt_delta_mode = custom_data[1]
+    vboost_list = unpack_array_in_data(custom_data, 0x02, 2, 6, "H")
+    vbat_max_hi = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x10 : 0x10 + 2])[0]
+    vbat_max_lo = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x12 : 0x12 + 2])[0]
+    mppt_period = struct.unpack(f"{OBC_ENDIANNESS}I", custom_data[0x14 : 0x14 + 4])[0]
+    max_dv = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x18 : 0x18 + 2])[0]
+    ov_mode = custom_data[0x1A]
+    pw.dlog(f"{'mppt_mode'.ljust(15)}: {mppt_mode}")
+    pw.dlog(f"{'mppt_delta_mode'.ljust(15)}: {mppt_delta_mode}")
+    pw.dlog(f"{'vboost_list'.ljust(15)}: {vboost_list}")
+    pw.dlog(f"{'vbat_max_hi'.ljust(15)}: {vbat_max_hi}")
+    pw.dlog(f"{'vbat_max_lo'.ljust(15)}: {vbat_max_lo}")
+    pw.dlog(f"{'mppt_period'.ljust(15)}: {mppt_period}")
+    pw.dlog(f"{'max_dv'.ljust(15)}: {max_dv}")
+    pw.dlog(f"{'ov_mode'.ljust(15)}: {ov_mode}")
 
 
 def unpack_array_in_data(

From 602e2cf4a88ca7a7b4eb89197110d836adec8ff7 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sat, 27 Aug 2022 17:17:48 +0200
Subject: [PATCH 16/19] basic p60 dock param parsing

---
 tmtc/power/tm.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tmtc/power/tm.py b/tmtc/power/tm.py
index 80819ff..e48d7e4 100644
--- a/tmtc/power/tm.py
+++ b/tmtc/power/tm.py
@@ -464,6 +464,8 @@ def handle_get_param_data_reply(
             pdu_config_table_handler(pw, custom_data)
         elif obj_id.as_bytes == ACU_HANDLER_ID:
             acu_config_table_handler(pw, custom_data)
+        elif obj_id.as_bytes == P60_DOCK_HANDLER:
+            p60_dock_config_table_handler(pw, custom_data)
 
 
 def pdu_config_table_handler(pw: PrintWrapper, custom_data: bytes):
@@ -512,6 +514,42 @@ def acu_config_table_handler(pw: PrintWrapper, custom_data: bytes):
     pw.dlog(f"{'ov_mode'.ljust(15)}: {ov_mode}")
 
 
+def p60_dock_config_table_handler(pw: PrintWrapper, custom_data: bytes):
+    ch_names = parse_name_list(custom_data[0:0x68], 13)
+    out_on_cnt = unpack_array_in_data(custom_data, 0x76, 2, 13, "H")
+    out_off_cnt = unpack_array_in_data(custom_data, 0x90, 2, 13, "H")
+    init_out_norm = unpack_array_in_data(custom_data, 0xAA, 1, 13, "B")
+    init_out_safe = unpack_array_in_data(custom_data, 0xB7, 1, 13, "B")
+    init_on_dly = unpack_array_in_data(custom_data, 0xC4, 2, 13, "H")
+    init_off_dly = unpack_array_in_data(custom_data, 0xDE, 2, 13, "H")
+    pw.dlog(f"Ch Names: {ch_names}")
+    pw.dlog(f"{'out_on_cnt'.ljust(15)}: {out_on_cnt}")
+    pw.dlog(f"{'out_off_cnt'.ljust(15)}: {out_off_cnt}")
+    pw.dlog(f"{'init_out_norm'.ljust(15)}: {init_out_norm}")
+    pw.dlog(f"{'init_out_safe'.ljust(15)}: {init_out_safe}")
+    pw.dlog(f"{'init_on_dly'.ljust(15)}: {init_on_dly}")
+    pw.dlog(f"{'init_off_dly'.ljust(15)}: {init_off_dly}")
+
+
+def parse_name_list(data: bytes, name_len: int):
+    ch_list = []
+    idx = 0
+    while len(ch_list) < name_len:
+        next_byte = data[idx]
+        if next_byte != 0:
+            string_end_found = False
+            string_end_idx = idx
+            while not string_end_found:
+                string_end_idx += 1
+                if data[string_end_idx] == 0:
+                    string_end_found = True
+            name = data[idx:string_end_idx].decode()
+            ch_list.append(name)
+            idx += len(name)
+        idx += 1
+    return ch_list
+
+
 def unpack_array_in_data(
     data: bytes, start_addr: int, width: int, entries: int, struct_spec: str
 ) -> List:

From e402b456bf64faa7d50180c900b7e8cf61dcfed3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 11:56:26 +0200
Subject: [PATCH 17/19] bump tmtccmd

---
 .run/tmtccli.run.xml | 2 +-
 deps/tmtccmd         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.run/tmtccli.run.xml b/.run/tmtccli.run.xml
index 1a86d29..2fb62fa 100644
--- a/.run/tmtccli.run.xml
+++ b/.run/tmtccli.run.xml
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-d 6" />
+    <option name="PARAMETERS" value="tmtc -d 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/deps/tmtccmd b/deps/tmtccmd
index 30129ee..5583005 160000
--- a/deps/tmtccmd
+++ b/deps/tmtccmd
@@ -1 +1 @@
-Subproject commit 30129ee38f0d1627ae0cb1a327a39ab4e3e2795f
+Subproject commit 5583005cd57fce94ac718fd5ad35f639623fcac6

From 729e9450139a79a3fa55aec8d109088093ba8410 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 13:20:44 +0200
Subject: [PATCH 18/19] extend power commands

---
 tmtc/power/common_power.py |  4 ++--
 tmtc/power/power.py        | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/tmtc/power/common_power.py b/tmtc/power/common_power.py
index 3b45874..bb4db5e 100644
--- a/tmtc/power/common_power.py
+++ b/tmtc/power/common_power.py
@@ -64,8 +64,8 @@ class PowerOpCodes:
     PL_CAM_OFF = ["cam-off"]
 
     INFO_CORE = ["info"]
-    INFO_AUX = ["info-aux"]
-    INFO_ALL = ["info-all"]
+    INFO_AUX = ["info_aux"]
+    INFO_ALL = ["info_all"]
 
 
 def add_gomspace_cmds(
diff --git a/tmtc/power/power.py b/tmtc/power/power.py
index 2ce9643..9a2b1bd 100644
--- a/tmtc/power/power.py
+++ b/tmtc/power/power.py
@@ -10,8 +10,8 @@ from tmtc.power.pdu2 import pdu2_req_hk_cmds, add_pdu2_common_defs, pdu2_cmds
 from tmtccmd import get_console_logger
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 
-from tmtc.power.p60dock import P60OpCodes, P60Info
-from tmtc.power.acu import add_acu_cmds
+from tmtc.power.p60dock import P60OpCodes, P60Info, p60_dock_req_hk_cmds
+from tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 
@@ -25,17 +25,25 @@ def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
     if op_code in PowerOpCodes.INFO_CORE:
         pdu1_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
         pdu2_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
-        q.add_wait_seconds(3.0)
+        p60_dock_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
+        acu_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
+        q.add_wait_seconds(8.0)
     elif op_code in PowerOpCodes.INFO_AUX:
         pdu1_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
         pdu2_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
-        q.add_wait_seconds(3.0)
+        p60_dock_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
+        acu_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
+        q.add_wait_seconds(8.0)
     elif op_code in PowerOpCodes.INFO_ALL:
         pdu1_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
         pdu2_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
         pdu1_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
         pdu2_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
-        q.add_wait_seconds(3.0)
+        p60_dock_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
+        p60_dock_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
+        acu_req_hk_cmds(q, GomspaceOpCodes.REQUEST_CORE_HK_ONCE[0])
+        acu_req_hk_cmds(q, GomspaceOpCodes.REQUEST_AUX_HK_ONCE[0])
+        q.add_wait_seconds(8.0)
     if q.empty():
         LOGGER.info(f"Queue is empty, no stack for op code {op_code}")
 

From 05dd17386070b9f333977f1f2b9f5651f9053b65 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 29 Aug 2022 15:43:29 +0200
Subject: [PATCH 19/19] fix for reboot commands

---
 ...{Reboot_0_0.run.xml => Reboot 0 0.run.xml} |  4 +--
 ...{Reboot_0_1.run.xml => Reboot 0 1.run.xml} |  2 +-
 ...{Reboot_1_0.run.xml => Reboot 1 0.run.xml} |  2 +-
 ...{Reboot_1_1.run.xml => Reboot 1 1.run.xml} |  2 +-
 pus_tc/system/core.py                         | 32 +++++++++----------
 5 files changed, 21 insertions(+), 21 deletions(-)
 rename .run/{Reboot_0_0.run.xml => Reboot 0 0.run.xml} (86%)
 rename .run/{Reboot_0_1.run.xml => Reboot 0 1.run.xml} (92%)
 rename .run/{Reboot_1_0.run.xml => Reboot 1 0.run.xml} (92%)
 rename .run/{Reboot_1_1.run.xml => Reboot 1 1.run.xml} (92%)

diff --git a/.run/Reboot_0_0.run.xml b/.run/Reboot 0 0.run.xml
similarity index 86%
rename from .run/Reboot_0_0.run.xml
rename to .run/Reboot 0 0.run.xml
index 0d694a6..7dcb8c9 100644
--- a/.run/Reboot_0_0.run.xml
+++ b/.run/Reboot 0 0.run.xml	
@@ -12,8 +12,8 @@
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s core -o reboot_0_0 -d 4" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_00 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.run/Reboot_0_1.run.xml b/.run/Reboot 0 1.run.xml
similarity index 92%
rename from .run/Reboot_0_1.run.xml
rename to .run/Reboot 0 1.run.xml
index 4caf0e3..9e981a2 100644
--- a/.run/Reboot_0_1.run.xml
+++ b/.run/Reboot 0 1.run.xml	
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s core -o reboot_0_1 -d 4" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_01 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.run/Reboot_1_0.run.xml b/.run/Reboot 1 0.run.xml
similarity index 92%
rename from .run/Reboot_1_0.run.xml
rename to .run/Reboot 1 0.run.xml
index a187704..6fb49d8 100644
--- a/.run/Reboot_1_0.run.xml
+++ b/.run/Reboot 1 0.run.xml	
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s core -o reboot_1_0 -d 4" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_10 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.run/Reboot_1_1.run.xml b/.run/Reboot 1 1.run.xml
similarity index 92%
rename from .run/Reboot_1_1.run.xml
rename to .run/Reboot 1 1.run.xml
index 1d1cbfa..f796895 100644
--- a/.run/Reboot_1_1.run.xml
+++ b/.run/Reboot 1 1.run.xml	
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s core -o reboot_1_1 -d 4" />
+    <option name="PARAMETERS" value="tmtc -s core -o reboot_11 -d 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py
index 565f7e0..a7a2e92 100644
--- a/pus_tc/system/core.py
+++ b/pus_tc/system/core.py
@@ -32,22 +32,22 @@ class SetIds(enum.IntEnum):
 
 
 class OpCodes:
-    REBOOT_XSC = ["0", "reboot-xsc"]
-    XSC_REBOOT_SELF = ["1", "reboot-self"]
-    XSC_REBOOT_0_0 = ["2", "reboot-00"]
-    XSC_REBOOT_0_1 = ["3", "reboot-01"]
-    XSC_REBOOT_1_0 = ["4", "reboot-10"]
-    XSC_REBOOT_1_1 = ["5", "reboot-11"]
-    REBOOT_FULL = ["6", "reboot-regular"]
-    GET_HK = ["7", "get-hk"]
-    ENABLE_REBOOT_FILE_HANDLING = ["32", "rbh-off"]
-    DISABLE_REBOOT_FILE_HANDLING = ["33", "rbh-on"]
-    RESET_ALL_REBOOT_COUNTERS = ["34", "rbh-reset-a"]
-    RESET_REBOOT_COUNTER_00 = ["35", "rbh-reset-00"]
-    RESET_REBOOT_COUNTER_01 = ["36", "rbh-reset-01"]
-    RESET_REBOOT_COUNTER_10 = ["37", "rbh-reset-10"]
-    RESET_REBOOT_COUNTER_11 = ["38", "rbh-reset-11"]
-    SET_MAX_REBOOT_CNT = ["39", "rbh-max-cnt"]
+    REBOOT_XSC = ["0", "reboot_xsc"]
+    XSC_REBOOT_SELF = ["1", "reboot_self"]
+    XSC_REBOOT_0_0 = ["2", "reboot_00"]
+    XSC_REBOOT_0_1 = ["3", "reboot_01"]
+    XSC_REBOOT_1_0 = ["4", "reboot_10"]
+    XSC_REBOOT_1_1 = ["5", "reboot_11"]
+    REBOOT_FULL = ["6", "reboot_regular"]
+    GET_HK = ["7", "get_hk"]
+    ENABLE_REBOOT_FILE_HANDLING = ["32", "rbh_off"]
+    DISABLE_REBOOT_FILE_HANDLING = ["33", "rbh_on"]
+    RESET_ALL_REBOOT_COUNTERS = ["34", "rbh_reset_a"]
+    RESET_REBOOT_COUNTER_00 = ["35", "rbh_reset_00"]
+    RESET_REBOOT_COUNTER_01 = ["36", "rbh_reset_01"]
+    RESET_REBOOT_COUNTER_10 = ["37", "rbh_reset_10"]
+    RESET_REBOOT_COUNTER_11 = ["38", "rbh_reset_11"]
+    SET_MAX_REBOOT_CNT = ["39", "rbh_max_cnt"]
 
 
 class Info: