From 2251c8cbf441e31e35c1ae6703d47ef2046f9b17 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 14 Mar 2022 14:46:00 +0100 Subject: [PATCH] add latchup print commands --- gomspace/gomspace_common.py | 2 ++ pus_tc/cmd_definitions.py | 5 +++++ pus_tc/devs/p60dock.py | 9 ++++++++- pus_tc/devs/pdu1.py | 8 ++++++++ pus_tc/devs/pdu2.py | 9 ++++++++- 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py index 54d80bf..4130665 100644 --- a/gomspace/gomspace_common.py +++ b/gomspace/gomspace_common.py @@ -20,12 +20,14 @@ class GomspaceDeviceActionIds(enum.IntEnum): WDT_RESET = 9 REQUEST_HK_TABLE = 16 PRINT_SWITCH_V_I = 32 + PRINT_LATCHUPS = 33 class GomspaceOpCodes(enum.Enum): # Request HK REQUEST_HK_ONCE = "128" PRINT_SWITCH_V_I = "129" + PRINT_LATCHUPS = "130" class SetIds: diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py index 21019a9..02ccd01 100644 --- a/pus_tc/cmd_definitions.py +++ b/pus_tc/cmd_definitions.py @@ -197,6 +197,11 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): keys=GomspaceOpCodes.PRINT_SWITCH_V_I.value, info="P60 Dock: Print Switches, Voltages, Currents", ) + add_op_code_entry( + op_code_dict=op_code_dict, + keys=GomspaceOpCodes.PRINT_LATCHUPS.value, + info="P60 Dock: Print Latchups", + ) add_service_op_code_entry( srv_op_code_dict=cmd_dict, name=CustomServiceList.P60DOCK.value, diff --git a/pus_tc/devs/p60dock.py b/pus_tc/devs/p60dock.py index 1d48504..a0ff436 100644 --- a/pus_tc/devs/p60dock.py +++ b/pus_tc/devs/p60dock.py @@ -125,7 +125,14 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I ) tc_queue.appendleft(command.pack_command_tuple()) - return + if op_code == GomspaceOpCodes.PRINT_LATCHUPS.value: + tc_queue.appendleft( + (QueueCommands.PRINT, "P60 Dock: Print Latchups") + ) + command = generate_action_command( + object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS + ) + tc_queue.appendleft(command.pack_command_tuple()) if P60DockTestProcedure.all or P60DockTestProcedure.reboot: tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Reboot")) command = pack_reboot_command(object_id) diff --git a/pus_tc/devs/pdu1.py b/pus_tc/devs/pdu1.py index 893eb7d..d0e5ed2 100644 --- a/pus_tc/devs/pdu1.py +++ b/pus_tc/devs/pdu1.py @@ -203,6 +203,14 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str): object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I ) tc_queue.appendleft(command.pack_command_tuple()) + if op_code == GomspaceOpCodes.PRINT_LATCHUPS: + tc_queue.appendleft( + (QueueCommands.PRINT, "PDU1: Print Latchups") + ) + command = generate_action_command( + object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS + ) + tc_queue.appendleft(command.pack_command_tuple()) if PDU1TestProcedure.all or PDU1TestProcedure.ping: tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Ping Test")) ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]) diff --git a/pus_tc/devs/pdu2.py b/pus_tc/devs/pdu2.py index 27ef4bc..4e60ea2 100644 --- a/pus_tc/devs/pdu2.py +++ b/pus_tc/devs/pdu2.py @@ -133,7 +133,14 @@ def pack_pdu2_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str): object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I ) tc_queue.appendleft(command.pack_command_tuple()) - + if op_code == GomspaceOpCodes.PRINT_LATCHUPS: + tc_queue.appendleft( + (QueueCommands.PRINT, "PDU2: Print Latchups") + ) + command = generate_action_command( + object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS + ) + tc_queue.appendleft(command.pack_command_tuple()) if PDU2TestProcedure.all or PDU2TestProcedure.reboot: tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reboot")) command = pack_reboot_command(object_id)