Merge remote-tracking branch 'origin/develop' into mueller/master

Reviewed-on: #20

.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" />

.idea/runConfigurations/PDU1_Commanding.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Test UDP" 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" />
@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s pdu1 -l" />
+    <option name="PARAMETERS" value="-s pdu1 -l -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />

.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" />

.idea/runConfigurations/PLOC_SUPV_Test.xml

@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-c udp -s ploc_supv -l -t 6 --hk" />
+    <option name="PARAMETERS" value="-s ploc_supv -l -t 6 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

.idea/runConfigurations/tmtccmd_Listener_Mode.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Listener Mode" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="tmtccmd Listener Mode" type="PythonConfigurationType" factoryName="Python">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

config/definitions.py

@@ -30,4 +30,6 @@ class CustomServiceList(enum.Enum):
     RAD_SENSOR = "rad_sensor"
     PLOC_SUPV = "ploc_supv"
     PLOC_UPDATER = "ploc_updater"
+    PLOC_MEMORY_DUMPER = "ploc_memory_dumper"
     CORE = 'core'
+    STAR_TRACKER = 'star_tracker'

config/hook_implementations.py

@@ -47,16 +47,27 @@ 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)
 
         op_code_dict_srv_pdu1 = {
             "0": ("PDU1 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("PDU1: Turn star tracker on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("PDU1: Get switch state of star tracker", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "3": ("PDU1: Turn SUS nominal on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "4": ("PDU1: Turn star tracker off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "5": ("PDU1: Turn SUS nominal off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "6": ("PDU1: Turn ACS Side A on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "7": ("PDU1: Turn ACS Side A off", {OpCodeDictKeys.TIMEOUT: 2.0}),
         }
         service_pdu1_tuple = ("PDU1 Device", op_code_dict_srv_pdu1)
 
         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)
 
@@ -95,6 +106,11 @@ class EiveHookObject(TmTcHookBase):
         }
         service_rad_sensor_tuple = ("Radiation Sensor", op_code_dict_srv_rad_sensor)
 
+        op_code_dict_ploc_mem_dumper = {
+            "0": ("PLOC Memory Dumper: MRAM dump", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_ploc_memory_dumper_tuple = ("Radiation Sensor", op_code_dict_ploc_mem_dumper)
+
         op_code_dict_srv_ploc_supv = {
             "0": ("PLOC Supervisor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
             "1": ("PLOC Supervisor: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
@@ -128,7 +144,6 @@ class EiveHookObject(TmTcHookBase):
             "29": ("PLOC Supervisor: Select NVM", {OpCodeDictKeys.TIMEOUT: 2.0}),
             "30": ("PLOC Supervisor: Run auto EM tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
             "31": ("PLOC Supervisor: MRAM Wipe", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "32": ("PLOC Supervisor: MRAM Dump", {OpCodeDictKeys.TIMEOUT: 2.0}),
             "33": ("PLOC Supervisor: Print CPU stats", {OpCodeDictKeys.TIMEOUT: 2.0}),
             "34": ("PLOC Supervisor: Set debug verbosity", {OpCodeDictKeys.TIMEOUT: 2.0}),
             "35": ("PLOC Supervisor: Set GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
@@ -142,16 +157,25 @@ class EiveHookObject(TmTcHookBase):
         service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
 
         op_code_dict_srv_ploc_updater = {
-            "0": ("Ploc Updater: Update partion A on NVM0", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "1": ("Ploc Updater: Update partion B on NVM0", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "2": ("Ploc Updater: Update partion A on NVM1", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "3": ("Ploc Updater: Update partion B on NVM1", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "0": ("Ploc Updater: Update uboot on partition A", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("Ploc Updater: Update bitstream on partition A", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("Ploc Updater: Update linux on partition A", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "3": ("Ploc Updater: Update application on partition A", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "4": ("Ploc Updater: Update uboot on partition B", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "5": ("Ploc Updater: Update bitstream on partition B", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "6": ("Ploc Updater: Update linux on partition B", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "7": ("Ploc Updater: Update application on partition B", {OpCodeDictKeys.TIMEOUT: 2.0}),
         }
         service_ploc_updater_tuple = ("Ploc Updater", op_code_dict_srv_ploc_updater)
 
+        op_code_dict_srv_star_tracker = {
+            "0": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
+
         service_op_code_dict[CustomServiceList.P60DOCK.value] = service_p60_tuple
         service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu1_tuple
-        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu2_tuple
+        service_op_code_dict[CustomServiceList.PDU2.value] = service_pdu2_tuple
         service_op_code_dict[CustomServiceList.HEATER.value] = service_heater_tuple
         service_op_code_dict[CustomServiceList.IMTQ.value] = service_imtq_tuple
         service_op_code_dict[CustomServiceList.REACTION_WHEEL_1.value] = service_rw_tuple
@@ -161,19 +185,17 @@ class EiveHookObject(TmTcHookBase):
         service_op_code_dict[CustomServiceList.RAD_SENSOR.value] = service_rad_sensor_tuple
         service_op_code_dict[CustomServiceList.PLOC_SUPV.value] = service_ploc_supv_tuple
         service_op_code_dict[CustomServiceList.PLOC_UPDATER.value] = service_ploc_updater_tuple
+        service_op_code_dict[CustomServiceList.STAR_TRACKER.value] = service_star_tracker_tuple
+        service_op_code_dict[CustomServiceList.PLOC_MEMORY_DUMPER.value] = service_ploc_memory_dumper_tuple
         return service_op_code_dict
 
     def get_json_config_file_path(self) -> str:
-        """
-        The user can specify a path and filename for the JSON configuration file by overriding this function.
+        """The user can specify a path and filename for the JSON configuration file by overriding
+        this function.
         :return:
         """
         return "config/tmtc_config.json"
 
-    def get_version(self) -> str:
-        from config.version import SW_NAME, VERSION_MAJOR, VERSION_MINOR, VERSION_SUBMINOR
-        return f"{SW_NAME} {VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_SUBMINOR}"
-
     def add_globals_pre_args_parsing(self, gui: bool = False):
         from config.globals_config import set_globals_pre_args_parsing
         set_globals_pre_args_parsing(gui=gui)
@@ -198,10 +220,6 @@ class EiveHookObject(TmTcHookBase):
         from pus_tc.tc_packer_hook import pack_service_queue_user
         pack_service_queue_user(service=service, op_code=op_code, service_queue=service_queue)
 
-    def tm_user_factory_hook(self, raw_tm_packet: bytearray) -> PusTelemetry:
-        from pus_tm.factory_hook import tm_user_factory_hook
-        return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)
-
     def get_object_ids(self) -> Dict[bytes, list]:
         from config.object_ids import get_object_ids
         return get_object_ids()

config/object_ids.py

@@ -19,15 +19,18 @@ SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x10, 0xA2])
 SYRLINKS_HANDLER = bytes([0x44, 0x53, 0x00, 0xA3])
 IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
 PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
-RW1_ID = bytes([0x44, 0x12, 0x00, 0x1])
-RW2_ID = bytes([0x44, 0x12, 0x00, 0x2])
-RW3_ID = bytes([0x44, 0x12, 0x00, 0x3])
-RW4_ID = bytes([0x44, 0x12, 0x00, 0x4])
-START_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])
+GPS_HANDLER_0_ID = bytes([0x44, 0x13, 0x00, 0x45])
+GPS_HANDLER_1_ID = bytes([0x44, 0x13, 0x01, 0x46])
+RW1_ID = bytes([0x44, 0x12, 0x00, 0x47])
+RW2_ID = bytes([0x44, 0x12, 0x01, 0x48])
+RW3_ID = bytes([0x44, 0x12, 0x02, 0x49])
+RW4_ID = bytes([0x44, 0x12, 0x03, 0x50])
+STAR_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])
 RAD_SENSOR_ID = bytes([0x44, 0x32, 0x00, 0xA5])
 PLOC_SUPV_ID = bytes([0x44, 0x33, 0x00, 0x16])
 PLOC_UPDATER_ID = bytes([0x44, 0x33, 0x00, 0x00])
 CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
+PLOC_MEMORY_DUMPER_ID = bytes([0x44, 0x33, 0x00, 0x01])
 
 
 def get_object_ids() -> Dict[bytes, list]:

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.on)
+        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)

pus_tc/pdu1.py

@@ -2,6 +2,7 @@
 """
 @file   tmtcc_tc_pdu1.py
 @brief  PDU2 tests
+@details PDU2 is mounted on the X4 slot of the P60 dock
 @author J. Meier
 @date   17.12.2020
 """
@@ -27,49 +28,84 @@ class PDU1TestProcedure:
     turn_channel_2_on = False    # Star Tracker connected to this channel (5V)
     turn_channel_2_off = False
     turn_channel_3_on = False  # MTQ connected to this channel (5V)
-    turn_channel_3_off = True
+    turn_channel_3_off = False
 
 
-def pack_pdu1_test_into(
-        pdu1_object_id: bytearray, p60dock_object_id: bytearray, tc_queue: TcQueueT
-):
-    tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU1"))
+def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft((QueueCommands.PRINT, "Commanding PDU1"))
+
+    if op_code == "1":
+        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 = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn SUS nominal on"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_4.parameter_address,
+                                         PDUConfigTable.out_en_4.parameter_size, Channel.on)
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn star tracker off"))
+        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=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn SUS nominal off"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_4.parameter_address,
+                                         PDUConfigTable.out_en_4.parameter_size, Channel.off)
+        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn ACS Side A 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=34, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "7":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn ACS Side A 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=35, app_data=command)
+        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])
-        command = pack_ping_command(pdu1_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 PDU1TestProcedure.all or PDU1TestProcedure.read_temperature:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Testing  temperature reading"))
         command = pack_get_param_command(
-            pdu1_object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
+            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 PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_on:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 on (Star Tracker)"))
-        command = pack_set_param_command(pdu1_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=30, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_off:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 off (Star Tracker)"))
-        command = pack_set_param_command(pdu1_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=31, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_3_on:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 3 on (MTQ)"))
-        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_3.parameter_address,
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_3.parameter_address,
                                          PDUConfigTable.out_en_3.parameter_size, Channel.on)
         command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_3_off:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 3 off (MTQ)"))
-        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_3.parameter_address,
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_3.parameter_address,
                                          PDUConfigTable.out_en_3.parameter_size, Channel.off)
         command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())

pus_tc/pdu2.py

@@ -2,6 +2,7 @@
 """
 @file   tmtcc_tc_pdu2.py
 @brief  PDU2 tests
+@details PDU2 is mounted on the X2 slot of the P60 dock
 @author J. Meier
 @date   17.12.2020
 """
@@ -35,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())
 

pus_tc/ploc_memory_dumper.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+"""
+@file   ploc_memory_dumper.py
+@brief  This file implements the command to dump memory sectors of the PLOC. Memories of the PLOC which can be dumped
+        are one MRAM, two flash memories and the SRAM.
+@author J. Meier
+@date   31.08.2021
+"""
+import struct
+
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+
+
+class ActionIds:
+    DUMP_MRAM = 1
+
+
+def pack_ploc_memory_dumper_cmd(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing PLOC memory dumper with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Dump MRAM"))
+        command = pack_mram_dump_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+
+def pack_mram_dump_cmd(object_id: bytearray) -> bytearray:
+    start = int(input("Start address: 0x"), 16)
+    end = int(input("End address: 0x"), 16)
+    command = bytearray()
+    command = object_id + struct.pack('!I', ActionIds.DUMP_MRAM)
+    command = command + struct.pack('!I', start)
+    command = command + struct.pack('!I', end)
+    return command

pus_tc/ploc_supervisor.py

@@ -232,11 +232,6 @@ def pack_ploc_supv_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code:
         command = pack_mram_wipe_cmd(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=46, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    elif op_code == "32":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Dump MRAM"))
-        command = pack_mram_dump_cmd(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=47, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "33":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Print CPU stats"))
         command = pack_print_cpu_stats_cmd(object_id)
@@ -408,7 +403,7 @@ def pack_set_alert_limit_cmd(object_id: bytearray) -> bytearray:
     latchup_id = get_latchup_id()
     dutycycle = int(input("Specify dutycycle:"))
     command = bytearray()
-    command = object_id + struct.pack('!I', SupvActionIds.AUTO_CALIBRATE_ALERT)
+    command = object_id + struct.pack('!I', SupvActionIds.SET_ALERT_LIMIT)
     command = command + struct.pack('!B', latchup_id)
     command = command + struct.pack('!I', dutycycle)
     return command
@@ -420,8 +415,8 @@ def pack_set_alert_irq_filter_cmd(object_id: bytearray) -> bytearray:
     @param object_id    The object id of the PLOC supervisor handler.
     """
     latchup_id = get_latchup_id()
-    tp = int(input("Specify TP:"))
-    div = int(input("Specify DIV:"))
+    tp = int(input("Specify filter type (TP):"))
+    div = int(input("Specify clock divider (DIV):"))
     command = bytearray()
     command = object_id + struct.pack('!I', SupvActionIds.SET_ALERT_IRQ_FILTER)
     command = command + struct.pack('!B', latchup_id)
@@ -508,16 +503,6 @@ def pack_mram_wipe_cmd(object_id: bytearray) -> bytearray:
     return command
 
 
-def pack_mram_dump_cmd(object_id: bytearray) -> bytearray:
-    start = int(input("Start address: 0x"), 16)
-    stop = int(input("Stop address: 0x"), 16)
-    command = bytearray()
-    command = object_id + struct.pack('!I', SupvActionIds.DUMP_MRAM)
-    command = command + struct.pack('!I', start)
-    command = command + struct.pack('!I', stop)
-    return command
-
-
 def pack_print_cpu_stats_cmd(object_id: bytearray) -> bytearray:
     en = 1
     command = bytearray()

pus_tc/ploc_upater.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-@file   ploc_supervisor.py
-@brief  Tests for commanding the supervisor of the PLOC.
+@file   ploc_udpater.py
+@brief  Commands to initiate update transfer to ploc supervisor. This only updates the software of the MPSoC, it is not
+        possible to update the software of the supervisor.
         The supervisor is programmed by Thales.
 @author J. Meier
 @date   10.07.2021
@@ -12,9 +13,7 @@ from tmtccmd.config.definitions import QueueCommands
 
 from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.utility.logger import get_console_logger
 
-LOGGER = get_console_logger()
 
 latchup_id_dict = {
     "0": "0.85V",
@@ -28,17 +27,25 @@ latchup_id_dict = {
 
 
 class UpdaterActionIds:
-    UPDATE_NVM0_A = 0
-    UPDATE_NVM0_B = 1
-    UPDATE_NVM1_A = 2
-    UPDATE_NVM1_B = 3
+    UPDATE_A_UBOOT = 0
+    UPDATE_A_BITSTREAM = 1
+    UPDATE_A_LINUX = 2
+    UPDATE_A_APP_SW = 3
+    UPDATE_B_UBOOT = 4
+    UPDATE_B_BITSTREAM = 5
+    UPDATE_B_LINUX = 6
+    UPDATE_B_LINUX = 7
 
 
 class ImagePathDefs:
-    imageNvm0A = "/mnt/sd0/ploc/updateNvm0A.bin"
-    imageNvm0B = "/mnt/sd0/ploc/updateNvm0B.bin"
-    imageNvm1A = "/mnt/sd0/ploc/updateNvm1A.bin"
-    imageNvm1B = "/mnt/sd0/ploc/updateNvm1B.bin"
+    imageAuboot = "/mnt/sd0/ploc/updateAuboot.bin"
+    imageAbitsream = "/mnt/sd0/ploc/updateAbitstream.bin"
+    imageAlinux = "/mnt/sd0/ploc/updateAlinux.bin"
+    imageAappsw = "/mnt/sd0/ploc/updateAappsw.bin"
+    imageBuboot = "/mnt/sd0/ploc/updateBuboot.bin"
+    imageBbitsream = "/mnt/sd0/ploc/updateBbitstream.bin"
+    imageBlinux = "/mnt/sd0/ploc/updateBlinux.bin"
+    imageBappsw = "/mnt/sd0/ploc/updateBappsw.bin"
 
 
 def pack_ploc_updater_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
@@ -48,26 +55,50 @@ def pack_ploc_updater_test_into(object_id: bytearray, tc_queue: TcQueueT, op_cod
     )
 
     if op_code == "0":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition A on NVM0"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM0_A) + \
-                  bytearray(ImagePathDefs.imageNvm0A, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update uboot on partition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_UBOOT) + \
+                  bytearray(ImagePathDefs.imageAuboot, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "1":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition B on NVM0"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM0_B) + \
-                  bytearray(ImagePathDefs.imageNvm0B, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update bitstream on parition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_BITSTREAM) + \
+                  bytearray(ImagePathDefs.imageAbitsream, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "2":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition A on NVM1"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM1_A) + \
-                  bytearray(ImagePathDefs.imageNvm1A, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update linux on partition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_LINUX) + \
+                  bytearray(ImagePathDefs.imageAlinux, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "3":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition B on NVM1"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM1_B) + \
-                  bytearray(ImagePathDefs.imageNvm1B, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update application on partition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_APP_SW) + \
+                  bytearray(ImagePathDefs.imageAappsw, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update uboot on partition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_UBOOT) + \
+                  bytearray(ImagePathDefs.imageBuboot, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update bitstream on parition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_BITSTREAM) + \
+                  bytearray(ImagePathDefs.imageBbitsream, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update linux on partition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_LINUX) + \
+                  bytearray(ImagePathDefs.imageBlinux, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "7":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update application on partition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_APP_SW) + \
+                  bytearray(ImagePathDefs.imageBappsw, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())

pus_tc/star_tracker.py

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""
+@file   star_tracker.py
+@brief  Star tracker commanding
+@author J. Meier
+@date   14.08.2021
+"""
+import struct
+
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+
+
+class StarTrackerActionIds:
+    PING = 0
+    REQ_TEMPERATURE = 25
+
+
+def pack_star_tracker_commands_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Generate command for star tracker with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Ping"))
+        command = pack_ping_command(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+
+def pack_ping_command(object_id: bytearray) -> bytearray:
+    data = int(input("Specify ping data: "))
+    command = bytearray()
+    command = object_id + struct.pack('!I', StarTrackerActionIds.PING)
+    command = command + struct.pack('!I', data)
+    return command

pus_tc/tc_packer_hook.py

@@ -27,11 +27,13 @@ from pus_tc.heater import pack_heater_test_into
 from pus_tc.reaction_wheels import pack_single_rw_test_into
 from pus_tc.rad_sensor import pack_rad_sensor_test_into
 from pus_tc.ploc_upater import pack_ploc_updater_test_into
+from pus_tc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
 from pus_tc.core import pack_core_commands
+from pus_tc.star_tracker import pack_star_tracker_commands_into
 from config.definitions import CustomServiceList
 from config.object_ids import P60_DOCK_HANDLER, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, ACU_HANDLER_ID, \
     TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID, IMTQ_HANDLER_ID, PLOC_MPSOC_ID, RW1_ID, RW2_ID, RW3_ID, RW4_ID, \
-    RAD_SENSOR_ID, PLOC_SUPV_ID, PLOC_UPDATER_ID
+    RAD_SENSOR_ID, PLOC_SUPV_ID, PLOC_UPDATER_ID, STAR_TRACKER_ID, PLOC_MEMORY_DUMPER_ID
 
 
 LOGGER = get_console_logger()
@@ -46,19 +48,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:
-        pdu1_object_id = PDU_1_HANDLER_ID
-        p60dock_object_id = P60_DOCK_HANDLER
-        return pack_pdu1_test_into(
-            pdu1_object_id=pdu1_object_id, p60dock_object_id=p60dock_object_id, tc_queue=service_queue
-        )
+        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)
@@ -98,8 +94,14 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
     if service == CustomServiceList.PLOC_UPDATER.value:
         object_id = PLOC_UPDATER_ID
         return pack_ploc_updater_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.STAR_TRACKER.value:
+        object_id = STAR_TRACKER_ID
+        return pack_star_tracker_commands_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.CORE.value:
         return pack_core_commands(tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.PLOC_MEMORY_DUMPER.value:
+        object_id = PLOC_MEMORY_DUMPER_ID
+        return pack_ploc_memory_dumper_cmd(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     LOGGER.warning("Invalid Service !")
 
 

pus_tm/hk_handling.py

@@ -1,9 +1,4 @@
-"""
-@brief      This file transfers control of housekeeping handling (PUS service 3) to the
-            developer
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
+"""HK Handling for EIVE OBSW"""
 import struct
 from typing import Tuple
 
@@ -11,30 +6,13 @@ from tmtccmd.tm.service_3_housekeeping import Service3Base
 from tmtccmd.utility.logger import get_console_logger
 from pus_tc.syrlinks_hk_handler import SetIds
 from pus_tc.imtq import ImtqSetIds
-from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID
+from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID, GPS_HANDLER_0_ID, GPS_HANDLER_1_ID
 LOGGER = get_console_logger()
 
 
 def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray,
                           service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]:
-    """
-    This function is called when a Service 3 Housekeeping packet is received.
-
-    Please note that the object IDs should be compared by value because direct comparison of
-    enumerations does not work in Python. For example use:
-
-        if object_id.value == ObjectIds.TEST_OBJECT.value
-
-    to test equality based on the object ID list.
-
-    @param object_id:
-    @param set_id:
-    @param hk_data:
-    @param service3_packet:
-    @return: Expects a tuple, consisting of two lists, a bytearray and an integer
-    The first list contains the header columns, the second list the list with
-    the corresponding values. The bytearray is the validity buffer, which is usually appended
-    at the end of the housekeeping packet. The last value is the number of parameters.
+    """This function is called when a Service 3 Housekeeping packet is received.
     """
     if object_id == SYRLINKS_HANDLER:
         if set_id == SetIds.RX_REGISTERS_DATASET:
@@ -50,6 +28,8 @@ def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray,
         else:
             LOGGER.info("Serive 3 TM: Syrlinks handler reply with unknown set id")
             return [], [], bytearray(), 0
+    elif object_id == GPS_HANDLER_0_ID or object_id == GPS_HANDLER_1_ID:
+        return handle_gps_data(hk_data=hk_data)
     else:
         LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.")
         return [], [], bytearray(), 0
@@ -90,16 +70,18 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     hk_header = []
     hk_content = []
     validity_buffer = bytearray()
-    hk_header = ["Init Err", "Init Raw Mag X [nT]", "Init Raw Mag Y [nT]", "Init Raw Mag Z [nT]", "Init Cal Mag X [nT]",
-                 "Init Cal Mag Y [nT]", "Init Cal Mag Z [nT]", "Init Coil X Current [mA]", "Init Coil Y Current [mA]",
-                 "Init Coil Z Current [mA]", "Init Coil X Temperature [°C]", "Init Coil Y Temperature [°C]",
-                 "Init Coil Z Temperature [°C]", "Err", "Raw Mag X [nT]", "Raw Mag Y [nT]", "Raw Mag Z [nT]",
-                 "Cal Mag X [nT]", "Cal Mag Y [nT]", "Cal Mag Z [nT]", "Coil X Current [mA]", "Coil Y Current [mA]",
-                 "Coil Z Current [mA]", "Coil X Temperature [°C]", "Coil Y Temperature [°C]", "Coil Z Temperature [°C]",
-                 "Fina Err", "Fina Raw Mag X [nT]", "Fina Raw Mag Y [nT]", "Fina Raw Mag Z [nT]", "Fina Cal Mag X [nT]",
-                 "Fina Cal Mag Y [nT]", "Fina Cal Mag Z [nT]", "Fina Coil X Current [mA]", "Fina Coil Y Current [mA]",
-                 "Fina Coil Z Current [mA]", "Fina Coil X Temperature [°C]", "Fina Coil Y Temperature [°C]",
-                 "Fina Coil Z Temperature [°C]"]
+    hk_header = [
+        "Init Err", "Init Raw Mag X [nT]", "Init Raw Mag Y [nT]", "Init Raw Mag Z [nT]", "Init Cal Mag X [nT]",
+         "Init Cal Mag Y [nT]", "Init Cal Mag Z [nT]", "Init Coil X Current [mA]", "Init Coil Y Current [mA]",
+         "Init Coil Z Current [mA]", "Init Coil X Temperature [°C]", "Init Coil Y Temperature [°C]",
+         "Init Coil Z Temperature [°C]", "Err", "Raw Mag X [nT]", "Raw Mag Y [nT]", "Raw Mag Z [nT]",
+         "Cal Mag X [nT]", "Cal Mag Y [nT]", "Cal Mag Z [nT]", "Coil X Current [mA]", "Coil Y Current [mA]",
+         "Coil Z Current [mA]", "Coil X Temperature [°C]", "Coil Y Temperature [°C]", "Coil Z Temperature [°C]",
+         "Fina Err", "Fina Raw Mag X [nT]", "Fina Raw Mag Y [nT]", "Fina Raw Mag Z [nT]", "Fina Cal Mag X [nT]",
+         "Fina Cal Mag Y [nT]", "Fina Cal Mag Z [nT]", "Fina Coil X Current [mA]", "Fina Coil Y Current [mA]",
+         "Fina Coil Z Current [mA]", "Fina Coil X Temperature [°C]", "Fina Coil Y Temperature [°C]",
+         "Fina Coil Z Temperature [°C]"
+    ]
     # INIT step (no coil actuation)
     init_err = hk_data[0]
     init_raw_mag_x = struct.unpack('!f', hk_data[1:5])[0]
@@ -145,13 +127,20 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     fina_coil_y_temperature = struct.unpack('!H', hk_data[125:127])[0]
     fina_coil_z_temperature = struct.unpack('!H', hk_data[127:129])[0]
 
-    hk_content = [init_err, init_raw_mag_x, init_raw_mag_y, init_raw_mag_z, init_cal_mag_x, init_cal_mag_y,
-                  init_cal_mag_z, init_coil_x_current, init_coil_y_current, init_coil_z_current,
-                  init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err, raw_mag_x,
-                  init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z, coil_x_current, coil_y_current,
-                  coil_z_current, coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err, fina_raw_mag_x,
-                  fina_raw_mag_y, fina_raw_mag_z, fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z, fina_coil_x_current,
-                  fina_coil_y_current, fina_coil_z_current, fina_coil_x_temperature, fina_coil_y_temperature,
-                  fina_coil_z_temperature]
+    hk_content = [
+        init_err, init_raw_mag_x, init_raw_mag_y, init_raw_mag_z, init_cal_mag_x, init_cal_mag_y,
+        init_cal_mag_z, init_coil_x_current, init_coil_y_current, init_coil_z_current,
+        init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err, raw_mag_x,
+        init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z, coil_x_current, coil_y_current,
+        coil_z_current, coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err, fina_raw_mag_x,
+        fina_raw_mag_y, fina_raw_mag_z, fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z, fina_coil_x_current,
+        fina_coil_y_current, fina_coil_z_current, fina_coil_x_temperature, fina_coil_y_temperature,
+        fina_coil_z_temperature
+    ]
 
     return hk_header, hk_content, validity_buffer, len(hk_header)
+
+
+def handle_gps_data(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
+    LOGGER.info(f'Received GPS data, HK data length {len(hk_data)}')
+    return [], [], bytearray(), 0