From 423f1fbb2c9f93f6eb3f3ae8ecbbdbfa30002596 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 12 Oct 2021 17:50:20 +0200 Subject: [PATCH] added tcs board commands --- config/hook_implementations.py | 9 ++++++--- pus_tc/pdu1.py | 33 ++++++++++++++++++++++++++------- tmtccmd | 2 +- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/config/hook_implementations.py b/config/hook_implementations.py index d80ab19..ab3c1c0 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -138,13 +138,16 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT): op_code_dict_srv_pdu1 = { "0": ("PDU1 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}), + Pdu1OpCodes.TCS_BOARD_ON.value: + ("PDU1: Turn TCS board on", {OpCodeDictKeys.TIMEOUT: 2.0}), + Pdu1OpCodes.TCS_BOARD_OFF.value: + ("PDU1: Turn TCS board off", {OpCodeDictKeys.TIMEOUT: 2.0}), Pdu1OpCodes.STAR_TRACKER_ON.value: ("PDU1: Turn star tracker on", {OpCodeDictKeys.TIMEOUT: 2.0}), - "2": ("PDU1: Get switch state of star tracker", {OpCodeDictKeys.TIMEOUT: 2.0}), - Pdu1OpCodes.SUS_NOMINAL_ON.value: - ("PDU1: Turn SUS nominal on", {OpCodeDictKeys.TIMEOUT: 2.0}), Pdu1OpCodes.STAR_TRACKER_OFF.value: ("PDU1: Turn star tracker off", {OpCodeDictKeys.TIMEOUT: 2.0}), + Pdu1OpCodes.SUS_NOMINAL_ON.value: + ("PDU1: Turn SUS nominal on", {OpCodeDictKeys.TIMEOUT: 2.0}), Pdu1OpCodes.SUS_NOMINAL_OFF.value: ("PDU1: Turn SUS nominal off", {OpCodeDictKeys.TIMEOUT: 2.0}), Pdu1OpCodes.ACS_A_SIDE_ON.value: diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py index 0a713cc..d5ee2ec 100644 --- a/pus_tc/pdu1.py +++ b/pus_tc/pdu1.py @@ -14,12 +14,15 @@ from gomspace.gomspace_pdu_definitions import * class Pdu1OpCodes(enum.Enum): - STAR_TRACKER_ON = "1" - SUS_NOMINAL_ON = "3" + TESTS = "0" + TCS_BOARD_ON = "1" + TCS_BOARD_OFF = "2" + STAR_TRACKER_ON = "3" STAR_TRACKER_OFF = "4" - SUS_NOMINAL_OFF = "5" - ACS_A_SIDE_ON = "6" - ACS_A_SIDE_OFF = "7" + SUS_NOMINAL_ON = "5" + SUS_NOMINAL_OFF = "6" + ACS_A_SIDE_ON = "7" + ACS_A_SIDE_OFF = "8" class PDU1TestProcedure: @@ -41,10 +44,26 @@ class PDU1TestProcedure: def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str): tc_queue.appendleft((QueueCommands.PRINT, "Commanding PDU1")) + if op_code == Pdu1OpCodes.TCS_BOARD_ON.value: + tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn TCS board on")) + command = pack_set_param_command( + object_id, PDUConfigTable.out_en_0.parameter_address, + PDUConfigTable.out_en_2.parameter_size, Channel.on + ) + tc_queue.appendleft(command.pack_command_tuple()) + if op_code == Pdu1OpCodes.TCS_BOARD_OFF.value: + tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn TCS board off")) + command = pack_set_param_command( + object_id, PDUConfigTable.out_en_0.parameter_address, + PDUConfigTable.out_en_2.parameter_size, Channel.off + ) + tc_queue.appendleft(command.pack_command_tuple()) if op_code == Pdu1OpCodes.STAR_TRACKER_ON.value: tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn star tracker on")) - command = pack_set_param_command(object_id, PDUConfigTable.out_en_2.parameter_address, - PDUConfigTable.out_en_2.parameter_size, Channel.on) + command = pack_set_param_command( + object_id, PDUConfigTable.out_en_2.parameter_address, + PDUConfigTable.out_en_2.parameter_size, Channel.on + ) tc_queue.appendleft(command.pack_command_tuple()) if op_code == Pdu1OpCodes.SUS_NOMINAL_ON.value: tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn SUS nominal on")) diff --git a/tmtccmd b/tmtccmd index fa913b2..6776dfc 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit fa913b2fa58433db81e3c974392ae67862719ccc +Subproject commit 6776dfcde91293b09d341deb4e9d309ee4617bc7