OOF3

2023-11-22 13:51:33 +01:00
parent 02d9d6adfc
commit d640d547bd
15 changed files with 300 additions and 347 deletions
--- a/eive_tmtc/tmtc/power/pwr_ctrl.py
+++ b/eive_tmtc/tmtc/power/pwr_ctrl.py
@ -3,32 +3,26 @@ import enum
 import logging
 import struct

-from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.config.object_ids import PWR_CONTROLLER
-from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.config.tmtc import (
-    tmtc_definitions_provider,
-    TmtcDefinitionWrapper,
-    OpCodeEntry,
-)
-from tmtccmd.tmtc import service_provider
-from tmtccmd.tmtc.queue import DefaultPusQueueHelper
-from tmtccmd.pus.s200_fsfw_mode import Mode, pack_mode_command
-from tmtccmd.tmtc.decorator import ServiceProviderParams
-from tmtccmd.pus.tc.s3_fsfw_hk import (
-    generate_one_hk_command,
-    make_sid,
-    enable_periodic_hk_command_with_interval,
-    disable_periodic_hk_command,
+    CmdTreeNode,
 )
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
-
 from tmtccmd.pus.s20_fsfw_param import create_load_param_cmd
-
 from tmtccmd.pus.s20_fsfw_param_defs import (
-    create_scalar_float_parameter,
    create_scalar_double_parameter,
+    create_scalar_float_parameter,
 )
+from tmtccmd.pus.s200_fsfw_mode import Mode, pack_mode_command
+from tmtccmd.pus.tc.s3_fsfw_hk import (
+    disable_periodic_hk_command,
+    enable_periodic_hk_command_with_interval,
+    generate_one_hk_command,
+    make_sid,
+)
+from tmtccmd.tmtc.queue import DefaultPusQueueHelper
+
+from eive_tmtc.config.object_ids import PWR_CONTROLLER
+from eive_tmtc.pus_tm.defs import PrintWrapper

 _LOGGER = logging.getLogger(__name__)

@ -51,17 +45,17 @@ class ParamId(enum.IntEnum):
    HIGHER_MODES_LIMIT = 6


-class OpCodes:
-    OFF = ["mode_off"]
-    ON = ["mode_on"]
-    NML = ["mode_normal"]
-    SET_PARAMETER = ["set_parameter"]
-    REQUEST_CORE_HK = ["core_hk"]
-    ENABLE_CORE_HK = ["core_enable_hk"]
-    DISABLE_CORE_HK = ["core_disable_hk"]
-    REQUEST_ENABLE_PL_HK = ["enable_pl_hk"]
-    ENABLE_ENABLE_PL_HK = ["enable_pl_enable_hk"]
-    DISABLE_ENABLE_PL_HK = ["enable_pl_disable_hk"]
+class OpCode:
+    OFF = "off"
+    ON = "on"
+    NML = "normal"
+    SET_PARAMETER = "set_parameter"
+    REQUEST_CORE_HK = "core_hk"
+    ENABLE_CORE_HK = "core_enable_hk"
+    DISABLE_CORE_HK = "core_disable_hk"
+    REQUEST_ENABLE_PL_HK = "enable_pl_hk"
+    ENABLE_ENABLE_PL_HK = "enable_pl_enable_hk"
+    DISABLE_ENABLE_PL_HK = "enable_pl_disable_hk"


 class Info:
@ -77,46 +71,37 @@ class Info:
    DISABLE_ENABLE_PL_HK = "Disable Enable PL HK Data Generation"


-@tmtc_definitions_provider
-def pwr_cmd_defs(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(keys=OpCodes.OFF, info=Info.OFF)
-    oce.add(keys=OpCodes.ON, info=Info.ON)
-    oce.add(keys=OpCodes.NML, info=Info.NML)
-    oce.add(keys=OpCodes.SET_PARAMETER, info=Info.SET_PARAMETER)
-    oce.add(keys=OpCodes.REQUEST_CORE_HK, info=Info.REQUEST_CORE_HK)
-    oce.add(keys=OpCodes.ENABLE_CORE_HK, info=Info.ENABLE_CORE_HK)
-    oce.add(keys=OpCodes.DISABLE_CORE_HK, info=Info.DISABLE_CORE_HK)
-    oce.add(keys=OpCodes.REQUEST_ENABLE_PL_HK, info=Info.REQUEST_ENABLE_PL_HK)
-    oce.add(keys=OpCodes.ENABLE_ENABLE_PL_HK, info=Info.ENABLE_ENABLE_PL_HK)
-    oce.add(keys=OpCodes.DISABLE_ENABLE_PL_HK, info=Info.DISABLE_ENABLE_PL_HK)
-    defs.add_service(
-        name=CustomServiceList.PWR_CTRL.value, info="PWR Controller", op_code_entry=oce
-    )
+def create_pwr_ctrl_node() -> CmdTreeNode:
+    op_code_strs = [
+        getattr(OpCode, key) for key in dir(OpCode) if not key.startswith("__")
+    ]
+    info_strs = [getattr(Info, key) for key in dir(OpCode) if not key.startswith("__")]
+    combined_dict = dict(zip(op_code_strs, info_strs))
+    node = CmdTreeNode("pwr_ctrl", "Power Controller")
+    for op_code, info in combined_dict.items():
+        node.add_child(CmdTreeNode(op_code, info))
+    return node


-@service_provider(CustomServiceList.PWR_CTRL.value)
-def pack_acs_ctrl_command(p: ServiceProviderParams):
-    op_code = p.op_code
-    q = p.queue_helper
-    if op_code in OpCodes.OFF:
+def pack_acs_ctrl_command(q: DefaultPusQueueHelper, cmd_str: str):
+    if cmd_str == OpCode.OFF:
        q.add_log_cmd(f"{Info.OFF}")
        q.add_pus_tc(pack_mode_command(PWR_CONTROLLER, Mode.OFF, 0))
-    elif op_code in OpCodes.ON:
+    elif cmd_str == OpCode.ON:
        q.add_log_cmd(f"{Info.ON}")
        q.add_pus_tc(pack_mode_command(PWR_CONTROLLER, Mode.ON, 0))
-    elif op_code in OpCodes.NML:
+    elif cmd_str == OpCode.NML:
        q.add_log_cmd(f"{Info.NML}")
        q.add_pus_tc(pack_mode_command(PWR_CONTROLLER, Mode.NORMAL, 0))
-    elif op_code in OpCodes.SET_PARAMETER:
+    elif cmd_str in OpCode.SET_PARAMETER:
        q.add_log_cmd(f"{Info.SET_PARAMETER}")
        set_pwr_ctrl_param(q)
-    elif op_code in OpCodes.REQUEST_CORE_HK:
+    elif cmd_str == OpCode.REQUEST_CORE_HK:
        q.add_log_cmd(Info.REQUEST_CORE_HK)
        q.add_pus_tc(
            generate_one_hk_command(make_sid(PWR_CONTROLLER, SetId.CORE_HK_SET))
        )
-    elif op_code in OpCodes.ENABLE_CORE_HK:
+    elif cmd_str == OpCode.ENABLE_CORE_HK:
        interval = float(input("Please specify interval in floating point seconds: "))
        q.add_log_cmd(Info.ENABLE_CORE_HK)
        cmd_tuple = enable_periodic_hk_command_with_interval(
@ -124,19 +109,19 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
        )
        q.add_pus_tc(cmd_tuple[0])
        q.add_pus_tc(cmd_tuple[1])
-    elif op_code in OpCodes.DISABLE_CORE_HK:
+    elif cmd_str == OpCode.DISABLE_CORE_HK:
        q.add_log_cmd(Info.DISABLE_CORE_HK)
        q.add_pus_tc(
            disable_periodic_hk_command(
                False, make_sid(PWR_CONTROLLER, SetId.CORE_HK_SET)
            )
        )
-    elif op_code in OpCodes.REQUEST_ENABLE_PL_HK:
+    elif cmd_str == OpCode.REQUEST_ENABLE_PL_HK:
        q.add_log_cmd(Info.REQUEST_ENABLE_PL_HK)
        q.add_pus_tc(
            generate_one_hk_command(make_sid(PWR_CONTROLLER, SetId.ENABLE_PL_SET))
        )
-    elif op_code in OpCodes.ENABLE_ENABLE_PL_HK:
+    elif cmd_str == OpCode.ENABLE_ENABLE_PL_HK:
        interval = float(input("Please specify interval in floating point seconds: "))
        q.add_log_cmd(Info.ENABLE_ENABLE_PL_HK)
        cmd_tuple = enable_periodic_hk_command_with_interval(
@ -144,7 +129,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
        )
        q.add_pus_tc(cmd_tuple[0])
        q.add_pus_tc(cmd_tuple[1])
-    elif op_code in OpCodes.DISABLE_ENABLE_PL_HK:
+    elif cmd_str == OpCode.DISABLE_ENABLE_PL_HK:
        q.add_log_cmd(Info.DISABLE_ENABLE_PL_HK)
        q.add_pus_tc(
            disable_periodic_hk_command(