From 5574fe91c7873df128d35c62851a530bb067025d Mon Sep 17 00:00:00 2001
From: "Jakob.Meier" <–meierj@irs.uni-stuttgart.de>
Date: Tue, 17 Aug 2021 11:49:37 +0200
Subject: [PATCH] turn on stack 3V3

---
 ...k_Test_UDP.xml => P60_Dock_Commanding.xml} |  2 +-
 .../{PDU1_Test.xml => PDU1_Commanding.xml}    |  2 +-
 ...{PDU2_Test_UDP.xml => PDU2_Commanding.xml} |  2 +-
 config/hook_implementations.py                |  4 ++
 pus_tc/p60dock.py                             | 37 ++++++++++++++---
 pus_tc/pdu2.py                                | 41 +++++++++++--------
 pus_tc/tc_packer_hook.py                      |  9 ++--
 7 files changed, 67 insertions(+), 30 deletions(-)
 rename .idea/runConfigurations/{P60_Dock_Test_UDP.xml => P60_Dock_Commanding.xml} (87%)
 rename .idea/runConfigurations/{PDU1_Test.xml => PDU1_Commanding.xml} (88%)
 rename .idea/runConfigurations/{PDU2_Test_UDP.xml => PDU2_Commanding.xml} (87%)

diff --git a/.idea/runConfigurations/P60_Dock_Test_UDP.xml b/.idea/runConfigurations/P60_Dock_Commanding.xml
similarity index 87%
rename from .idea/runConfigurations/P60_Dock_Test_UDP.xml
rename to .idea/runConfigurations/P60_Dock_Commanding.xml
index 8e873b7..0b80151 100644
--- a/.idea/runConfigurations/P60_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/P60_Dock_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="P60 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="P60 Dock Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/PDU1_Test.xml b/.idea/runConfigurations/PDU1_Commanding.xml
similarity index 88%
rename from .idea/runConfigurations/PDU1_Test.xml
rename to .idea/runConfigurations/PDU1_Commanding.xml
index 2ad5775..f88e80d 100644
--- a/.idea/runConfigurations/PDU1_Test.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/PDU2_Test_UDP.xml b/.idea/runConfigurations/PDU2_Commanding.xml
similarity index 87%
rename from .idea/runConfigurations/PDU2_Test_UDP.xml
rename to .idea/runConfigurations/PDU2_Commanding.xml
index fbf8adf..469e4d3 100644
--- a/.idea/runConfigurations/PDU2_Test_UDP.xml
+++ b/.idea/runConfigurations/PDU2_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU2 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 032a865..261b39d 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -47,6 +47,8 @@ class EiveHookObject(TmTcHookBase):
 
         op_code_dict_srv_p60 = {
             "0": ("P60 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("P60 Dock: Turn stack 3V3 on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("P60 Dock: Turn stack 3V3 off", {OpCodeDictKeys.TIMEOUT: 2.0}),
         }
         service_p60_tuple = ("P60 Device", op_code_dict_srv_p60)
 
@@ -64,6 +66,8 @@ class EiveHookObject(TmTcHookBase):
 
         op_code_dict_srv_pdu2 = {
             "0": ("PDU2 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("PDU1: Turn ACS Side B on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("PDU1: Turn ACS Side B off", {OpCodeDictKeys.TIMEOUT: 2.0}),
         }
         service_pdu2_tuple = ("PDU2 Device", op_code_dict_srv_pdu2)
 
diff --git a/pus_tc/p60dock.py b/pus_tc/p60dock.py
index 9b1bef8..ba19e0a 100644
--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@@ -33,10 +33,19 @@ class P60DockTestProcedure:
 
 
 class P60DockConfigTable:
-    out_en_0 = TableEntry(bytearray([0x00, 0x68]), TableEntry.uint8_size)  # ACU
-    out_en_1 = TableEntry(bytearray([0x00, 0x69]), TableEntry.uint8_size)  # PDU1
-    out_en_2 = TableEntry(bytearray([0x00, 0x6A]), TableEntry.uint8_size)
-    out_en_3 = TableEntry(bytearray([0x00, 0x6B]), TableEntry.uint8_size)  # PDU2
+    out_en_0 = TableEntry(bytearray([0x00, 0x68]), TableEntry.uint8_size)  # ACU VCC
+    out_en_1 = TableEntry(bytearray([0x00, 0x69]), TableEntry.uint8_size)  # PDU1 VCC
+    out_en_2 = TableEntry(bytearray([0x00, 0x6A]), TableEntry.uint8_size)  # unused
+    out_en_3 = TableEntry(bytearray([0x00, 0x6B]), TableEntry.uint8_size)  # PDU2 VCC
+    out_en_4 = TableEntry(bytearray([0x00, 0x6C]), TableEntry.uint8_size)  # ACU VBAT
+    out_en_5 = TableEntry(bytearray([0x00, 0x6D]), TableEntry.uint8_size)  # unused
+    out_en_6 = TableEntry(bytearray([0x00, 0x6E]), TableEntry.uint8_size)  # PDU1 VBAT
+    out_en_7 = TableEntry(bytearray([0x00, 0x6F]), TableEntry.uint8_size)  # PDU2 VBAT
+    out_en_8 = TableEntry(bytearray([0x00, 0x70]), TableEntry.uint8_size)  # Stack VBAT
+    out_en_9 = TableEntry(bytearray([0x00, 0x71]), TableEntry.uint8_size)  # Stack 3V3
+    out_en_10 = TableEntry(bytearray([0x00, 0x72]), TableEntry.uint8_size)  # Stack 5V
+    out_en_11 = TableEntry(bytearray([0x00, 0x73]), TableEntry.uint8_size)  # GS 3V3 (unused)
+    out_en_12 = TableEntry(bytearray([0x00, 0x74]), TableEntry.uint8_size)  # GS 5V (unused)
     # When channel consumes more than cur_lu_lim, channel is turned of immediately
     cur_lu_lim_0 = TableEntry(bytearray([0x00, 0xF8]), TableEntry.uint16_size)
 
@@ -48,7 +57,25 @@ class P60DockHkTable:
     wdt_gnd_left = TableEntry(bytearray([0x00, 0xA8]), TableEntry.uint32_size)
 
 
-def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 3V3 on"))
+        parameter = 0  # set channel off
+        command = pack_set_param_command(object_id, P60DockConfigTable.out_en_9.parameter_address,
+                                         P60DockConfigTable.out_en_9.parameter_size, Channel.off)
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+        return tc_queue
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 3V3 off"))
+        parameter = 0  # set channel off
+        command = pack_set_param_command(object_id, P60DockConfigTable.out_en_9.parameter_address,
+                                         P60DockConfigTable.out_en_9.parameter_size, Channel.off)
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+        return tc_queue
+
     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/pdu2.py b/pus_tc/pdu2.py
index 6ea1f04..ca7123f 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -36,70 +36,79 @@ class PDU2TestProcedure:
     request_hk_table = False
 
 
-def pack_pdu2_test_into(pdu2_object_id: bytearray, p60dock_object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_pdu2_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
     tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU2"))
 
-    tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling PDU2"))
-    command = pack_set_param_command(p60dock_object_id, P60DockConfigTable.out_en_3.parameter_address,
-                                     P60DockConfigTable.out_en_3.parameter_size, Channel.on)
-    command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
-    tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn ACS Side B on"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_7.parameter_address,
+                                         PDUConfigTable.out_en_7.parameter_size, Channel.on)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+        return tc_queue
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn ACS Side B off"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_7.parameter_address,
+                                         PDUConfigTable.out_en_7.parameter_size, Channel.off)
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+        return tc_queue
 
     if PDU2TestProcedure.all or PDU2TestProcedure.reboot:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reboot"))
-        command = pack_reboot_command(pdu2_object_id)
+        command = pack_reboot_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.read_gnd_wdt:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reading ground watchdog timer value"))
-        command = pack_get_param_command(pdu2_object_id, TableIds.hk, PDUHkTable.wdt_gnd_left.parameter_address,
+        command = pack_get_param_command(object_id, TableIds.hk, PDUHkTable.wdt_gnd_left.parameter_address,
                                          PDUHkTable.wdt_gnd_left.parameter_size)
         command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.gnd_wdt_reset:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing ground watchdog reset"))
-        command = pack_gnd_wdt_reset_command(pdu2_object_id)
+        command = pack_gnd_wdt_reset_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.ping:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Ping Test"))
         ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
-        command = pack_ping_command(pdu2_object_id, ping_data)
+        command = pack_ping_command(object_id, ping_data)
         command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.channel_2_on:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing setting output channel 2 on (TCS Heater)"))
-        command = pack_set_param_command(pdu2_object_id, PDUConfigTable.out_en_2.parameter_address,
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_2.parameter_address,
                                          PDUConfigTable.out_en_2.parameter_size, Channel.on)
         command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.read_temperature:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing  temperature reading"))
-        command = pack_get_param_command(pdu2_object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
+        command = pack_get_param_command(object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
                                          PDUHkTable.temperature.parameter_size)
         command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.read_channel_2_state:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reading output channel 2 state (TCS Heater)"))
-        command = pack_get_param_command(pdu2_object_id, TableIds.config, PDUConfigTable.out_en_2.parameter_address,
+        command = pack_get_param_command(object_id, TableIds.config, PDUConfigTable.out_en_2.parameter_address,
                                          PDUConfigTable.out_en_2.parameter_size)
         command = PusTelecommand(service=8, subservice=128, ssc=25, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.read_cur_lu_lim_0:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reading current limit value of  output channel 0 (OBC)"))
-        command = pack_get_param_command(pdu2_object_id, TableIds.config, PDUConfigTable.cur_lu_lim_0.parameter_address,
+        command = pack_get_param_command(object_id, TableIds.config, PDUConfigTable.cur_lu_lim_0.parameter_address,
                                          PDUConfigTable.cur_lu_lim_0.parameter_size)
         command = PusTelecommand(service=8, subservice=128, ssc=26, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.channel_2_off:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing setting output channel 2 off"))
-        command = pack_set_param_command(pdu2_object_id, PDUConfigTable.out_en_2.parameter_address,
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_2.parameter_address,
                                          PDUConfigTable.out_en_2.parameter_size, Channel.off)
         command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.request_hk_table:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Requesting housekeeping table"))
-        command = pack_request_full_hk_table_command(pdu2_object_id)
+        command = pack_request_full_hk_table_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index ffe5cb8..f7022ff 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -47,16 +47,13 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
         return pack_service200_test_into(tc_queue=service_queue)
     if service == CustomServiceList.P60DOCK.value:
         object_id = P60_DOCK_HANDLER
-        return pack_p60dock_test_into(object_id=object_id, tc_queue=service_queue)
+        return pack_p60dock_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.PDU1.value:
         object_id = PDU_1_HANDLER_ID
         return pack_pdu1_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.PDU2.value:
-        pdu2_object_id = PDU_2_HANDLER_ID
-        p60dock_object_id = P60_DOCK_HANDLER
-        return pack_pdu2_test_into(
-            pdu2_object_id=pdu2_object_id, p60dock_object_id=p60dock_object_id, tc_queue=service_queue
-        )
+        object_id = PDU_2_HANDLER_ID
+        return pack_pdu2_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.ACU.value:
         object_id = ACU_HANDLER_ID
         return pack_acu_test_into(object_id=object_id, tc_queue=service_queue)