only tmtc defs remaining

pus_tc/cmd_definitions.py

@@ -1,12 +1,4 @@
 from pus_tc.system.proc import add_proc_cmds
-from tmtccmd.config import (
-    add_op_code_entry,
-    add_service_op_code_entry,
-    generate_op_code_options,
-    ServiceOpCodeDictT,
-    OpCodeDictKeys,
-)
-from tmtccmd.config.globals import get_default_service_op_code_dict
 
 from pus_tc.devs.gps import add_gps_cmds
 from pus_tc.devs.pcdu import add_pcdu_cmds
@@ -19,34 +11,36 @@ from pus_tc.devs.reaction_wheels import add_rw_cmds
 from pus_tc.devs.bpx_batt import BpxOpCodes
 
 from config.definitions import CustomServiceList
+from tmtccmd.config import TmTcDefWrapper
+from tmtccmd.config.globals import get_default_tmtc_defs
 
 
-def get_eive_service_op_code_dict() -> ServiceOpCodeDictT:
-    service_op_code_dict = get_default_service_op_code_dict()
-    add_bpx_cmd_definitions(cmd_dict=service_op_code_dict)
-    add_core_controller_definitions(cmd_dict=service_op_code_dict)
-    add_pl_pcdu_cmds(cmd_dict=service_op_code_dict)
-    add_pcdu_cmds(cmd_dict=service_op_code_dict)
-    specify_rtd_cmds(cmd_dict=service_op_code_dict)
-    add_imtq_cmds(cmd_dict=service_op_code_dict)
-    add_rad_sens_cmds(cmd_dict=service_op_code_dict)
-    add_rw_cmds(cmd_dict=service_op_code_dict)
-    add_ploc_mpsoc_cmds(cmd_dict=service_op_code_dict)
-    add_ploc_supv_cmds(cmd_dict=service_op_code_dict)
-    add_system_cmds(cmd_dict=service_op_code_dict)
-    add_time_cmds(cmd_dict=service_op_code_dict)
-    add_syrlinks_cmds(cmd_dict=service_op_code_dict)
-    add_gps_cmds(cmd_dict=service_op_code_dict)
-    add_str_cmds(cmd_dict=service_op_code_dict)
-    add_ccsds_cmds(cmd_dict=service_op_code_dict)
-    add_pdec_cmds(cmd_dict=service_op_code_dict)
-    add_heater_cmds(cmd_dict=service_op_code_dict)
-    add_tmp_sens_cmds(cmd_dict=service_op_code_dict)
-    add_proc_cmds(cmd_dict=service_op_code_dict)
-    return service_op_code_dict
+def get_eive_service_op_code_dict() -> TmTcDefWrapper:
+    def_wrapper = get_default_tmtc_defs()
+    add_bpx_cmd_definitions(cmd_dict=def_wrapper)
+    add_core_controller_definitions(defs=def_wrapper)
+    add_pl_pcdu_cmds(cmd_dict=def_wrapper)
+    add_pcdu_cmds(cmd_dict=def_wrapper)
+    specify_rtd_cmds(cmd_dict=def_wrapper)
+    add_imtq_cmds(cmd_dict=def_wrapper)
+    add_rad_sens_cmds(cmd_dict=def_wrapper)
+    add_rw_cmds(cmd_dict=def_wrapper)
+    add_ploc_mpsoc_cmds(cmd_dict=def_wrapper)
+    add_ploc_supv_cmds(cmd_dict=def_wrapper)
+    add_system_cmds(cmd_dict=def_wrapper)
+    add_time_cmds(cmd_dict=def_wrapper)
+    add_syrlinks_cmds(cmd_dict=def_wrapper)
+    add_gps_cmds(cmd_dict=def_wrapper)
+    add_str_cmds(cmd_dict=def_wrapper)
+    add_ccsds_cmds(cmd_dict=def_wrapper)
+    add_pdec_cmds(cmd_dict=def_wrapper)
+    add_heater_cmds(cmd_dict=def_wrapper)
+    add_tmp_sens_cmds(cmd_dict=def_wrapper)
+    add_proc_cmds(cmd_dict=def_wrapper)
+    return def_wrapper
 
 
-def add_tmp_sens_cmds(cmd_dict: ServiceOpCodeDictT):
+def add_tmp_sens_cmds(defs: TmTcDefWrapper):
     op_code_dict = {
         "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
     }

pus_tc/system/core.py

@@ -1,9 +1,7 @@
 import enum
 
 from config.definitions import CustomServiceList
-from tmtccmd.config import add_op_code_entry, add_service_op_code_entry
-from tmtccmd.config.definitions import QueueCommands, ServiceOpCodeDictT
-from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.config import TmTcDefWrapper
 
 from tmtccmd.tc import QueueHelper
 from tmtccmd.tc.pus_8_funccmd import generate_action_command
@@ -67,7 +65,7 @@ class Copy(enum.IntEnum):
     NONE = 2
 
 
-def add_core_controller_definitions(cmd_dict: ServiceOpCodeDictT):
+def add_core_controller_definitions(defs: TmTcDefWrapper):
     od = dict()
     add_op_code_entry(op_code_dict=od, keys=OpCodes.REBOOT_XSC, info=Info.REBOOT_XSC)
     add_op_code_entry(op_code_dict=od, keys=OpCodes.REBOOT_FULL, info=Info.REBOOT_FULL)
@@ -117,7 +115,7 @@ def add_core_controller_definitions(cmd_dict: ServiceOpCodeDictT):
         info="Reset reboot counter 1 1",
     )
     add_service_op_code_entry(
-        srv_op_code_dict=cmd_dict,
+        srv_op_code_dict=defs,
         name=CustomServiceList.CORE.value,
         info="Core Controller",
         op_code_entry=od,