From 21a38ae76a582f57d075400188907eec45eec58c Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 22 Nov 2023 18:39:12 +0100 Subject: [PATCH] use new the new leaf suppression feature --- eive_tmtc/config/hook.py | 3 +-- eive_tmtc/tmtc/acs/subsystem.py | 2 +- eive_tmtc/tmtc/com/ccsds_handler.py | 1 - eive_tmtc/tmtc/com/subsystem.py | 2 +- eive_tmtc/tmtc/core.py | 1 + 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/eive_tmtc/config/hook.py b/eive_tmtc/config/hook.py index 658d2f3..b499a30 100644 --- a/eive_tmtc/config/hook.py +++ b/eive_tmtc/config/hook.py @@ -7,7 +7,7 @@ from tmtccmd.util import ObjectIdDictT, RetvalDictT from eive_tmtc.config.definitions import SPACE_PACKET_IDS from eive_tmtc.config.retvals import get_retval_dict -from eive_tmtc.tmtc.core import create_core_node +from eive_tmtc.tmtc.core import create_core_node from eive_tmtc.tmtc.acs.subsystem import create_acs_subsystem_node from eive_tmtc.tmtc.com.ccsds_handler import create_ccsds_node from eive_tmtc.tmtc.com.subsystem import create_com_subsystem_node @@ -124,7 +124,6 @@ class EiveHookObject(HookBase): obdh_node = CmdTreeNode("obdh", "OBDH Subsystem") xiphos_wdt = CmdTreeNode("wdt", "Xiphos WDT") - core_ctrl = CmdTreeNode("core", "Core Controller") obdh_node.add_child(xiphos_wdt) obdh_node.add_child(create_core_node()) obdh_node.add_child(create_time_node()) diff --git a/eive_tmtc/tmtc/acs/subsystem.py b/eive_tmtc/tmtc/acs/subsystem.py index f250344..b1a1c97 100644 --- a/eive_tmtc/tmtc/acs/subsystem.py +++ b/eive_tmtc/tmtc/acs/subsystem.py @@ -73,7 +73,7 @@ def build_acs_subsystem_cmd(q: DefaultPusQueueHelper, cmd_path: str): def create_acs_subsystem_node() -> CmdTreeNode: - node = CmdTreeNode("acs", "ACS Subsystem") + node = CmdTreeNode("acs", "ACS Subsystem", hide_children_which_are_leaves=True) 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)) diff --git a/eive_tmtc/tmtc/com/ccsds_handler.py b/eive_tmtc/tmtc/com/ccsds_handler.py index 0e25134..4d59ee5 100644 --- a/eive_tmtc/tmtc/com/ccsds_handler.py +++ b/eive_tmtc/tmtc/com/ccsds_handler.py @@ -118,7 +118,6 @@ def pack_ccsds_handler_command( # noqa C901 q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command)) - def create_ccsds_node() -> CmdTreeNode: op_code_strs = [ getattr(OpCode, key) for key in dir(OpCode) if not key.startswith("__") diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py index ba8c098..7e784a9 100644 --- a/eive_tmtc/tmtc/com/subsystem.py +++ b/eive_tmtc/tmtc/com/subsystem.py @@ -134,7 +134,7 @@ def create_com_subsystem_node() -> CmdTreeNode: ] 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("com", "COM Subsystem") + node = CmdTreeNode("com", "COM Subsystem", hide_children_which_are_leaves=True) for op_code, info in combined_dict.items(): node.add_child(CmdTreeNode(op_code, info)) return node diff --git a/eive_tmtc/tmtc/core.py b/eive_tmtc/tmtc/core.py index 988e568..23a018f 100644 --- a/eive_tmtc/tmtc/core.py +++ b/eive_tmtc/tmtc/core.py @@ -187,6 +187,7 @@ def create_core_node() -> CmdTreeNode: node.add_child(CmdTreeNode(op_code, info)) return node + @tmtc_definitions_provider def add_core_controller_definitions(defs: TmtcDefinitionWrapper): oce = OpCodeEntry()