diff --git a/pus_tc/devs/plpcdu.py b/pus_tc/devs/plpcdu.py index 2ff3946..1728753 100644 --- a/pus_tc/devs/plpcdu.py +++ b/pus_tc/devs/plpcdu.py @@ -29,16 +29,15 @@ LOGGER = get_console_logger() class OpCodes: - SWITCH_ON = ["0", "on"] - SWITCH_OFF = ["1", "off"] - NORMAL_SSR = ["2", "nml-ssr"] - NORMAL_DRO = ["3", "nml-dro"] - NORMAL_X8 = ["4", "nml-x8"] - NORMAL_TX = ["5", "nml-tx"] - NORMAL_MPA = ["6", "nml-mpa"] - NORMAL_HPA = ["7", "nml-hpa"] - - SWITCH_HPA_ON_PROC = ["12", "proc-hpa"] + SWITCH_HPA_ON_PROC = ["0", "proc-hpa"] + SWITCH_ON = ["2", "on"] + SWITCH_OFF = ["3", "off"] + NORMAL_SSR = ["4", "nml-ssr"] + NORMAL_DRO = ["5", "nml-dro"] + NORMAL_X8 = ["6", "nml-x8"] + NORMAL_TX = ["7", "nml-tx"] + NORMAL_MPA = ["8", "nml-mpa"] + NORMAL_HPA = ["9", "nml-hpa"] INJECT_SSR_TO_DRO_FAILURE = ["15", "inject-ssr-dro-fault"] INJECT_DRO_TO_X8_FAILURE = ["16", "inject-dro-x8-fault"] @@ -111,9 +110,17 @@ class ParamIds(enum.IntEnum): def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): op_code_dict = dict() + add_op_code_entry( + op_code_dict=op_code_dict, + keys=OpCodes.SWITCH_HPA_ON_PROC, + info=Info.SWITCH_HPA_ON_PROC, + ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.SWITCH_ON, info=Info.SWITCH_ON ) + add_op_code_entry( + op_code_dict=op_code_dict, keys=OpCodes.SWITCH_OFF, info=Info.SWITCH_OFF + ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.NORMAL_SSR, @@ -144,14 +151,6 @@ def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): keys=OpCodes.NORMAL_HPA, info=Info.NORMAL_HPA, ) - add_op_code_entry( - op_code_dict=op_code_dict, - keys=OpCodes.SWITCH_HPA_ON_PROC, - info=Info.SWITCH_HPA_ON_PROC, - ) - add_op_code_entry( - op_code_dict=op_code_dict, keys=OpCodes.SWITCH_OFF, info=Info.SWITCH_OFF - ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_SSR_TO_DRO_FAILURE, @@ -245,7 +244,6 @@ def pack_pl_pcdu_commands(tc_queue: TcQueueT, op_code: str): ) if op_code in OpCodes.SWITCH_HPA_ON_PROC: hpa_on_procedure(tc_queue) - if op_code in OpCodes.INJECT_ALL_ON_FAILURE: pack_failure_injection_cmd( tc_queue=tc_queue, diff --git a/spacepackets b/spacepackets index d0c3f4a..9ee7922 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit d0c3f4a802c3cddc5be2919af763b08fe6a6b05c +Subproject commit 9ee7922bf7b7a678f8e5ebd5926001defac9a3d4