some more fixes and improvements

.run/PDU1.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PDU1" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s pdu1" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/PDU2.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PDU2" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s pdu2" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

tmtc/power/common_power.py

@@ -285,6 +285,13 @@ def generic_off_cmd(
     )
 
 
+def add_common_power_defs(oce: OpCodeEntry):
+    oce.add(keys=PowerOpCodes.REQUEST_CORE_HK_ONCE, info=PowerInfo.REQUEST_CORE_HK_ONCE)
+    oce.add(keys=PowerOpCodes.REQUEST_AUX_HK_ONCE, info=PowerInfo.REQUEST_AUX_HK_ONCE)
+    oce.add(keys=PowerOpCodes.ENABLE_INFO_HK, info=PowerInfo.ENABLE_INFO_HK)
+    oce.add(keys=PowerOpCodes.DISABLE_INFO_HK, info=PowerInfo.DISABLE_INFO_HK)
+
+
 def add_gomspace_cmd_defs(oce: OpCodeEntry):
     oce.add(
         keys=PowerOpCodes.REQUEST_CORE_HK_ONCE,

tmtc/power/p60dock.py

@@ -9,6 +9,7 @@ from tmtc.power.common_power import (
     pack_common_gomspace_cmds,
     req_hk_cmds,
     pack_common_power_cmds,
+    SetIds,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
 from gomspace.gomspace_common import (
@@ -21,7 +22,6 @@ from gomspace.gomspace_common import (
     pack_reboot_command,
     pack_set_u8_param_command,
     pack_set_u16_param_command,
-    SetIds,
 )
 from config.object_ids import P60_DOCK_HANDLER
 from tmtccmd.util import ObjectIdU32
@@ -238,6 +238,4 @@ def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code:
 
 
 def p60_dock_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds(
+    req_hk_cmds("P60 Dock", q, op_code, P60_DOCK_HANDLER, [SetIds.CORE, SetIds.AUX])
-        "P60 Dock", q, op_code, P60_DOCK_HANDLER, [SetIds.P60_CORE, SetIds.P60_AUX]
-    )

tmtc/power/pdu1.py

@@ -16,6 +16,8 @@ from tmtc.power.common_power import (
     GomspaceOpCodes,
     GsInfo,
     PowerInfo,
+    add_common_power_defs,
+    SetIds,
 )
 
 from gomspace.gomspace_common import *
@@ -87,9 +89,7 @@ def pack_pdu1_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
 
 
 def pdu1_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds(
+    req_hk_cmds("PDU1", q, op_code, PDU_1_HANDLER_ID, [SetIds.CORE, SetIds.AUX])
-        "PDU1", q, op_code, PDU_1_HANDLER_ID, [SetIds.PDU_1_CORE, SetIds.PDU_1_AUX]
-    )
 
 
 def info_on_pdu1(base: str) -> str:
@@ -158,9 +158,8 @@ def add_pdu1_common_defs(oce: OpCodeEntry):
 def add_pdu1_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_pdu1_common_defs(oce)
+    add_common_power_defs(oce)
     add_gomspace_cmd_defs(oce)
-    oce.add(keys=PowerOpCodes.REQUEST_CORE_HK_ONCE, info=PowerInfo.REQUEST_CORE_HK_ONCE)
-    oce.add(keys=PowerOpCodes.REQUEST_AUX_HK_ONCE, info=PowerInfo.REQUEST_AUX_HK_ONCE)
     oce.add(
         keys=PowerOpCodes.PRINT_SWITCH_V_I,
         info="PDU1: Print Switches, Voltages, Currents",

tmtc/power/pdu2.py

@@ -15,6 +15,8 @@ from tmtc.power.common_power import (
     generic_off_cmd,
     add_gomspace_cmd_defs,
     pack_common_power_cmds,
+    SetIds,
+    add_common_power_defs,
 )
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
@@ -138,6 +140,7 @@ def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code
 def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_pdu2_common_defs(oce)
+    add_common_power_defs(oce)
     add_gomspace_cmd_defs(oce)
     oce.add(
         keys=PowerOpCodes.PRINT_SWITCH_V_I,
@@ -235,9 +238,7 @@ def add_pdu2_common_defs(oce: OpCodeEntry):
 
 
 def pdu2_req_hk_cmds(q: DefaultPusQueueHelper, op_code: str):
-    req_hk_cmds(
+    req_hk_cmds("PDU2", q, op_code, PDU_2_HANDLER_ID, [SetIds.CORE, SetIds.AUX])
-        "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):

tmtc/power/tm.py

@@ -146,7 +146,7 @@ def handle_pdu_data(
     pw = PrintWrapper(printer=printer)
     current_idx = 0
     priv_idx = pdu_idx - 1
-    if set_id == SetIds.PDU_1_AUX or set_id == SetIds.PDU_2_AUX:
+    if set_id == SetIds.AUX or set_id == SetIds.AUX:
         fmt_str = "!hhBBBIIH"
         inc_len = struct.calcsize(fmt_str)
         (
@@ -183,7 +183,7 @@ def handle_pdu_data(
         wdt.print()
         pw.dlog(f"PDU Device Types: 0:FRAM|1:ADC|2:ADC|3:TempSens|4,5,6,7:Reserved")
         dev_parser.print(pw=pw)
-    if set_id == SetIds.PDU_1_CORE or set_id == SetIds.PDU_2_CORE:
+    if set_id == SetIds.CORE or set_id == SetIds.CORE:
         pw.dlog(f"Received PDU HK from PDU {pdu_idx}")
         current_list = []
         for idx in range(len(PDU1_CHANNELS_NAMES)):
@@ -224,7 +224,7 @@ def handle_pdu_data(
 
 def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
     pw = PrintWrapper(printer=printer)
-    if set_id == SetIds.P60_CORE:
+    if set_id == SetIds.CORE:
         pw.dlog("Received P60 Core HK. Voltages in mV, currents in mA")
         current_idx = 0
         current_list = []
@@ -271,7 +271,7 @@ def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         pw.dlog(temps)
         pw.dlog(batt_info)
         printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=9)
-    if set_id == SetIds.P60_AUX:
+    if set_id == SetIds.AUX:
         pw.dlog("Received P60 AUX HK. Voltages in mV, currents in mA")
         current_idx = 0
         latchup_list = []
@@ -350,7 +350,7 @@ def gen_six_entry_u16_list(hk_data: bytes, current_idx: int) -> Tuple[int, List[
 
 def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
     pw = PrintWrapper(printer=printer)
-    if set_id == SetIds.ACU_CORE:
+    if set_id == SetIds.CORE:
         mppt_mode = hk_data[0]
         current_idx = 1
         current_idx, currents = gen_six_entry_u16_list(
@@ -394,7 +394,7 @@ 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=12
         )
-    if set_id == SetIds.ACU_AUX:
+    if set_id == SetIds.AUX:
         current_idx = 0
         fmt_str = "!BBB"
         inc_len = struct.calcsize(fmt_str)