clean up power module a bit

tmtc/power/common_power.py

@@ -1,8 +1,6 @@
 from gomspace.gomspace_common import (
     pack_set_u8_param_command,
     Channel,
-    GomspaceOpCodes,
-    GsInfo,
     GomspaceDeviceActionIds,
     prompt_and_pack_set_integer_param_command,
     prompt_and_pack_get_param_command,
@@ -23,11 +21,37 @@ from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
 
+class GomspaceOpCodes:
+    GET_PARAM = ["get_param"]
+    SET_INTEGER_PARAM = ["set_int_param"]
+    SAVE_TABLE = ["save_table"]
+    RESET_GND_WATCHDOG = ["reset_gnd_wdt"]
+    SAVE_TABLE_DEFAULT = ["save_table_default"]
+    LOAD_TABLE = ["load_table"]
+    REQUEST_CONFIG_TABLE = ["cfg_table"]
+
+
+class GsInfo:
+    GET_PARAMETER = "Get parameter"
+    SET_PARAMETER = "Set  integer parameter"
+    REQUEST_CONFIG_TABLE = "Request Config Table"
+    RESET_GND_WATCHDOG = "Reset GND watchdog"
+    SAVE_TABLE = "Save table non-volatile (file)"
+    SAVE_TABLE_DEFAULT = "Save table non-volatile (default)"
+    LOAD_TABLE = "Load Table"
+
+
 class PowerInfo:
     INFO_CORE = "Core Information"
     INFO_AUX = "Auxiliary Information"
     INFO_ALL = "All Information"
+    ENABLE_INFO_HK = "Enable Core Info HK"
+    DISABLE_INFO_HK = "Disable Core Info HK"
     RESET_ALL_GND_WDTS = "Reset all Ground Watchdogs"
+    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"
 
 
 class PowerOpCodes:
@@ -68,24 +92,39 @@ class PowerOpCodes:
     PL_CAM_OFF = ["cam_off"]
 
     INFO_CORE = ["info"]
+    ENABLE_INFO_HK = ["info_hk_on"]
+    DISABLE_INFO_HK = ["info_hk_off"]
     INFO_AUX = ["info_aux"]
     INFO_ALL = ["info_all"]
     RESET_ALL_GND_WDTS = ["reset_gnd_wdts"]
+    # Request HK
+    REQUEST_CORE_HK_ONCE = ["hk_core"]
+    REQUEST_AUX_HK_ONCE = ["hk_aux"]
+    PRINT_SWITCH_V_I = ["print_switch_vi"]
+    PRINT_LATCHUPS = ["print_latchups"]
 
 
-def pack_gomspace_cmds(
+def pack_common_power_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}")
+    if op_code in PowerOpCodes.ENABLE_INFO_HK:
+        pass
+
+
+def pack_common_gomspace_cmds(
+    prefix: str, object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
+):
+    objb = object_id.as_bytes
+    if op_code in PowerOpCodes.PRINT_SWITCH_V_I:
+        q.add_log_cmd(f"{prefix}: {PowerInfo.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}")
+    if op_code in PowerOpCodes.PRINT_LATCHUPS:
+        q.add_log_cmd(f"{prefix}: {PowerInfo.PRINT_LATCHUPS}")
         q.add_pus_tc(
             make_fsfw_action_cmd(
                 object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
@@ -189,12 +228,12 @@ def req_hk_cmds(
     obj_id: bytes,
     set_id_pair: [int, int],
 ):
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        q.add_log_cmd(f"{prefix}: {GsInfo.REQUEST_CORE_HK_ONCE}")
+    if op_code in PowerOpCodes.REQUEST_CORE_HK_ONCE:
+        q.add_log_cmd(f"{prefix}: {PowerInfo.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"{prefix}: {GsInfo.REQUEST_AUX_HK_ONCE}")
+    if op_code in PowerOpCodes.REQUEST_AUX_HK_ONCE:
+        q.add_log_cmd(f"{prefix}: {PowerInfo.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))
 
@@ -231,15 +270,15 @@ def generic_off_cmd(
 
 def add_gomspace_cmd_defs(oce: OpCodeEntry):
     oce.add(
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
+        keys=PowerOpCodes.REQUEST_CORE_HK_ONCE,
+        info=PowerInfo.REQUEST_CORE_HK_ONCE,
     )
     oce.add(
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
+        keys=PowerOpCodes.REQUEST_AUX_HK_ONCE,
+        info=PowerInfo.REQUEST_AUX_HK_ONCE,
     )
+    oce.add(keys=PowerOpCodes.PRINT_LATCHUPS, info=PowerInfo.PRINT_LATCHUPS)
     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_INTEGER_PARAM, info=GsInfo.SET_PARAMETER)
     oce.add(keys=GomspaceOpCodes.REQUEST_CONFIG_TABLE, info=GsInfo.REQUEST_CONFIG_TABLE)
     oce.add(keys=GomspaceOpCodes.SAVE_TABLE, info=GsInfo.SAVE_TABLE)