diff --git a/.idea/runConfigurations/IMTQ_Neg_X_Test.xml b/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
index eec3e30..91f9735 100644
--- a/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.idea/runConfigurations/PDU1_Commanding.xml
index ccd6e1a..76cde0b 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Service_3.xml b/.idea/runConfigurations/tmtcc_Service_3.xml
index 686dd13..ed450c6 100644
--- a/.idea/runConfigurations/tmtcc_Service_3.xml
+++ b/.idea/runConfigurations/tmtcc_Service_3.xml
@@ -13,7 +13,7 @@
-
+
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/spacepackets b/spacepackets
index 559e42f..aeb778d 160000
--- a/spacepackets
+++ b/spacepackets
@@ -1 +1 @@
-Subproject commit 559e42f03b51cfb673e46cd3b25e68348c33fc21
+Subproject commit aeb778d8d413e29c7eb6fe4c1ba7900800555a53
diff --git a/tmtccmd b/tmtccmd
index a7299e7..81be253 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit a7299e7a68936ce7fa1fdf004a6c2dd2c8073711
+Subproject commit 81be25388c3920870ab93f015435b933f5ed828d