diff --git a/eive_tmtc/tmtc/acs/reaction_wheels.py b/eive_tmtc/tmtc/acs/reaction_wheels.py index e83bc2b..94f2036 100644 --- a/eive_tmtc/tmtc/acs/reaction_wheels.py +++ b/eive_tmtc/tmtc/acs/reaction_wheels.py @@ -10,8 +10,7 @@ from typing import List, Tuple from eive_tmtc.pus_tm.defs import PrintWrapper from eive_tmtc.config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID -from tmtccmd.config import CmdTreeNode, TmtcDefinitionWrapper, OpCodeEntry -from tmtccmd.config.tmtc import tmtc_definitions_provider +from tmtccmd.config import CmdTreeNode from tmtccmd.tmtc import DefaultPusQueueHelper from tmtccmd.pus.tc.s3_fsfw_hk import ( generate_one_hk_command, @@ -23,7 +22,6 @@ from tmtccmd.pus.tc.s3_fsfw_hk import ( from tmtccmd.pus.s8_fsfw_action import create_action_cmd from spacepackets.ecss.tc import PusTelecommand from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode, Subservice -from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.util import ObjectIdU32 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter @@ -134,51 +132,6 @@ def create_reaction_wheel_assembly_node() -> CmdTreeNode: return node -@tmtc_definitions_provider -def add_rw_cmds(defs: TmtcDefinitionWrapper): - oce = OpCodeEntry() - oce.add(info=InfoDev.SPEED, keys=OpCodesDev.SPEED) - oce.add(info=InfoDev.ON, keys=OpCodesDev.ON) - oce.add(info=InfoDev.OFF, keys=OpCodesDev.OFF) - oce.add(info=InfoDev.NML, keys=OpCodesDev.NML) - oce.add(info=InfoDev.REQ_TM, keys=OpCodesDev.REQ_TM) - oce.add(info=InfoDev.GET_STATUS, keys=OpCodesDev.GET_STATUS) - oce.add(info=InfoDev.GET_TM, keys=OpCodesDev.GET_TM) - oce.add(info=InfoDev.ENABLE_STATUS_HK, keys=OpCodesDev.ENABLE_STATUS_HK) - oce.add(info=InfoDev.DISABLE_STATUS_HK, keys=OpCodesDev.DISABLE_STATUS_HK) - defs.add_service( - name=CustomServiceList.REACTION_WHEEL_1.value, - info="Reaction Wheel 1", - op_code_entry=oce, - ) - defs.add_service( - name=CustomServiceList.REACTION_WHEEL_2.value, - info="Reaction Wheel 2", - op_code_entry=oce, - ) - defs.add_service( - name=CustomServiceList.REACTION_WHEEL_3.value, - info="Reaction Wheel 3", - op_code_entry=oce, - ) - defs.add_service( - name=CustomServiceList.REACTION_WHEEL_4.value, - info="Reaction Wheel 4", - op_code_entry=oce, - ) - oce = OpCodeEntry() - oce.add(info=InfoAss.ON, keys=OpCodesAss.ON) - oce.add(info=InfoAss.NML, keys=OpCodesAss.NML) - oce.add(info=InfoAss.OFF, keys=OpCodesAss.OFF) - oce.add(info=InfoAss.ALL_SPEED_UP, keys=OpCodesAss.ALL_SPEED_UP) - oce.add(info=InfoAss.ALL_SPEED_OFF, keys=OpCodesAss.ALL_SPEED_OFF) - defs.add_service( - name=CustomServiceList.RW_ASSEMBLY.value, - info="Reaction Wheel Assembly", - op_code_entry=oce, - ) - - def create_single_rw_cmd( # noqa C901: Complexity is okay here. object_id: bytes, rw_idx: int, q: DefaultPusQueueHelper, cmd_str: str ):