OOF3

eive_tmtc/tmtc/acs/subsystem.py

@@ -1,22 +1,19 @@
 import enum
-from typing import Tuple, Dict
+from typing import Dict, Tuple
 
-from eive_tmtc.tmtc.acs.defs import AcsMode, SafeSubmode
 from spacepackets.ecss import PusTelecommand
-from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
-from eive_tmtc.config.object_ids import ACS_SUBSYSTEM_ID
-from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config.tmtc import (
-    tmtc_definitions_provider,
-    TmtcDefinitionWrapper,
-    OpCodeEntry,
+    CmdTreeNode,
 )
 from tmtccmd.pus.s200_fsfw_mode import Subservice as ModeSubservices
-from tmtccmd.tmtc import service_provider
-from tmtccmd.tmtc.decorator import ServiceProviderParams
+from tmtccmd.tmtc import DefaultPusQueueHelper
+
+from eive_tmtc.config.object_ids import ACS_SUBSYSTEM_ID
+from eive_tmtc.tmtc.acs.defs import AcsMode, SafeSubmode
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
 
 
-class OpCode(str, enum.Enum):
+class CmdStr(str, enum.Enum):
     OFF = "off"
     SAFE = "safe"
     DETUMBLE = "detumble"
@@ -41,23 +38,20 @@ class Info(str, enum.Enum):
 
 
 HANDLER_LIST: Dict[str, Tuple[int, int, str]] = {
-    OpCode.OFF: (AcsMode.OFF, 0, Info.OFF),
-    OpCode.SAFE: (AcsMode.SAFE, SafeSubmode.DEFAULT, Info.SAFE),
-    OpCode.DETUMBLE: (AcsMode.SAFE, SafeSubmode.DETUMBLE, Info.DETUMBLE),
-    OpCode.IDLE: (AcsMode.IDLE, 0, Info.IDLE),
-    OpCode.PTG_TARGET: (AcsMode.PTG_TARGET, 0, Info.PTG_TARGET),
-    OpCode.PTG_TARGET_GS: (AcsMode.PTG_TARGET_GS, 0, Info.PTG_TARGET_GS),
-    OpCode.PTG_TARGET_NADIR: (AcsMode.PTG_NADIR, 0, Info.PTG_TARGET_NADIR),
-    OpCode.PTG_TARGET_INERTIAL: (AcsMode.PTG_INERTIAL, 0, Info.PTG_TARGET_INERTIAL),
+    CmdStr.OFF: (AcsMode.OFF, 0, Info.OFF),
+    CmdStr.SAFE: (AcsMode.SAFE, SafeSubmode.DEFAULT, Info.SAFE),
+    CmdStr.DETUMBLE: (AcsMode.SAFE, SafeSubmode.DETUMBLE, Info.DETUMBLE),
+    CmdStr.IDLE: (AcsMode.IDLE, 0, Info.IDLE),
+    CmdStr.PTG_TARGET: (AcsMode.PTG_TARGET, 0, Info.PTG_TARGET),
+    CmdStr.PTG_TARGET_GS: (AcsMode.PTG_TARGET_GS, 0, Info.PTG_TARGET_GS),
+    CmdStr.PTG_TARGET_NADIR: (AcsMode.PTG_NADIR, 0, Info.PTG_TARGET_NADIR),
+    CmdStr.PTG_TARGET_INERTIAL: (AcsMode.PTG_INERTIAL, 0, Info.PTG_TARGET_INERTIAL),
 }
 
 
-@service_provider(CustomServiceList.ACS_SS.value)
-def build_acs_subsystem_cmd(p: ServiceProviderParams):
-    op_code = p.op_code
-    q = p.queue_helper
+def build_acs_subsystem_cmd(q: DefaultPusQueueHelper, cmd_path: str):
     info_prefix = "ACS Subsystem"
-    if op_code in OpCode.REPORT_ALL_MODES:
+    if cmd_path in CmdStr.REPORT_ALL_MODES:
         q.add_log_cmd(f"{info_prefix}: {Info.REPORT_ALL_MODES}")
         q.add_pus_tc(
             PusTelecommand(
@@ -66,7 +60,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
                 app_data=ACS_SUBSYSTEM_ID,
             )
         )
-    mode_info_tup = HANDLER_LIST.get(op_code)
+    mode_info_tup = HANDLER_LIST.get(cmd_path)
     if mode_info_tup is None:
         return
     pack_mode_cmd_with_info(
@@ -78,10 +72,9 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
     )
 
 
-@tmtc_definitions_provider
-def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    for op_code, (_, _, info) in HANDLER_LIST.items():
-        oce.add(op_code, info)
-    oce.add(OpCode.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
-    defs.add_service(CustomServiceList.ACS_SS, "ACS Subsystem", oce)
+def create_acs_subsystem_node() -> CmdTreeNode:
+    node = CmdTreeNode("acs", "ACS Subsystem")
+    for cmd_str, (_, _, info) in HANDLER_LIST.items():
+        node.add_child(CmdTreeNode(cmd_str, info))
+    node.add_child(CmdTreeNode(CmdStr.REPORT_ALL_MODES, Info.REPORT_ALL_MODES))
+    return node