From 84656b90fc44ab72fb95518410fea3373d1fdf18 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 11 Aug 2021 15:52:56 +0200
Subject: [PATCH 01/28] tmtccmd update

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index 9497851..d1312fc 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 94978512deb6c91a6a1456ae3a1182bf679f063a
+Subproject commit d1312fce4bbd40b0b594a519b98cb51e61bc784f
-- 
2.43.0


From 5713bf080697369a711167b6154e80e0cc61126f Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 11 Aug 2021 19:16:08 +0200
Subject: [PATCH 02/28] gps data handler function

---
 ...ner_Mode.xml => tmtccmd_Listener_Mode.xml} |  2 +-
 config/object_ids.py                          |  2 +
 pus_tm/hk_handling.py                         | 74 ++++++++-----------
 tmtccmd                                       |  2 +-
 4 files changed, 35 insertions(+), 45 deletions(-)
 rename .idea/runConfigurations/{tmtcc_Listener_Mode.xml => tmtccmd_Listener_Mode.xml} (87%)

diff --git a/.idea/runConfigurations/tmtcc_Listener_Mode.xml b/.idea/runConfigurations/tmtccmd_Listener_Mode.xml
similarity index 87%
rename from .idea/runConfigurations/tmtcc_Listener_Mode.xml
rename to .idea/runConfigurations/tmtccmd_Listener_Mode.xml
index e67c129..37174c9 100644
--- a/.idea/runConfigurations/tmtcc_Listener_Mode.xml
+++ b/.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" />
diff --git a/config/object_ids.py b/config/object_ids.py
index 33ee78c..b550df0 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -19,6 +19,8 @@ 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])
+GPS_HANDLER_0_ID = bytes([0x44, 0x13, 0x00, 0x45])
+GPS_HANDLER_1_ID = bytes([0x44, 0x13, 0x01, 0x46])
 RW1_ID = bytes([0x44, 0x12, 0x00, 0x1])
 RW2_ID = bytes([0x44, 0x12, 0x00, 0x2])
 RW3_ID = bytes([0x44, 0x12, 0x00, 0x3])
diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index f81a042..efdacb5 100644
--- a/pus_tm/hk_handling.py
+++ b/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,19 @@ 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):
+    LOGGER.info('Received GPS data')
diff --git a/tmtccmd b/tmtccmd
index d1312fc..51619f4 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit d1312fce4bbd40b0b594a519b98cb51e61bc784f
+Subproject commit 51619f4724b443a1ce0b5949dd1c1eb9c9eaead0
-- 
2.43.0


From 25f8543a8d5e578d40f589019ed065cc50f5074b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 11 Aug 2021 19:26:40 +0200
Subject: [PATCH 03/28] need to return something as well

---
 pus_tm/hk_handling.py | 5 +++--
 tmtccmd               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index efdacb5..4f00116 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -28,7 +28,7 @@ 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
+    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.")
@@ -141,5 +141,6 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     return hk_header, hk_content, validity_buffer, len(hk_header)
 
 
-def handle_gps_data(hk_data: bytearray):
+def handle_gps_data(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
     LOGGER.info('Received GPS data')
+    return [], [], bytearray(), 0
diff --git a/tmtccmd b/tmtccmd
index 51619f4..87af3df 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 51619f4724b443a1ce0b5949dd1c1eb9c9eaead0
+Subproject commit 87af3df9fb9860bf12b70bf2eff503a468a893de
-- 
2.43.0


From 387a076a2180c14da8de086d690a2ebb5ad63649 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 11 Aug 2021 19:32:51 +0200
Subject: [PATCH 04/28] printing length as well

---
 pus_tm/hk_handling.py | 2 +-
 tmtccmd               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index 4f00116..d53033b 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -142,5 +142,5 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
 
 
 def handle_gps_data(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
-    LOGGER.info('Received GPS data')
+    LOGGER.info(f'Received GPS data, HK data length {len(hk_data)}')
     return [], [], bytearray(), 0
diff --git a/tmtccmd b/tmtccmd
index 87af3df..006b7e5 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 87af3df9fb9860bf12b70bf2eff503a468a893de
+Subproject commit 006b7e5a7c1c5cf46434358f7b4b10e4ca0331b5
-- 
2.43.0


From 0a2f1b3feb4d804ffad7f7b3357733c521d20b71 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 16 Aug 2021 14:20:22 +0200
Subject: [PATCH 05/28] removed some functions

---
 config/hook_implementations.py | 12 ++----------
 tmtccmd                        |  2 +-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 2dfb5e2..b82ab0c 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -164,16 +164,12 @@ class EiveHookObject(TmTcHookBase):
         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 +194,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()
diff --git a/tmtccmd b/tmtccmd
index 006b7e5..8b8bf68 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 006b7e5a7c1c5cf46434358f7b4b10e4ca0331b5
+Subproject commit 8b8bf6847a950914db5f4f1d268f8638993d207c
-- 
2.43.0


From 5c6091463879488c7bb495a98f506720620d6198 Mon Sep 17 00:00:00 2001
From: IRS Cleanroom Laptop <robin.mueller.m@gmail.com>
Date: Tue, 17 Aug 2021 16:07:22 +0200
Subject: [PATCH 06/28] tmtccmd update

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index 006b7e5..46b4b39 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 006b7e5a7c1c5cf46434358f7b4b10e4ca0331b5
+Subproject commit 46b4b39f91756ba8f8dcf6806fada6e243dc3156
-- 
2.43.0


From 28e527b8f9002a8baa03d90f1e5693796cd1e237 Mon Sep 17 00:00:00 2001
From: IRS Cleanroom Laptop <robin.mueller.m@gmail.com>
Date: Tue, 17 Aug 2021 16:35:27 +0200
Subject: [PATCH 07/28] lowered timeout

---
 .idea/runConfigurations/PDU1_Commanding.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.idea/runConfigurations/PDU1_Commanding.xml
index f88e80d..e6a848b 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@@ -6,14 +6,14 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <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 -t 6" />
+    <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" />
-- 
2.43.0


From 261eef449e309549644d8566c8d1034c5696335d Mon Sep 17 00:00:00 2001
From: IRS Cleanroom Laptop <robin.mueller.m@gmail.com>
Date: Tue, 17 Aug 2021 19:48:55 +0200
Subject: [PATCH 08/28] updated object ID

---
 config/object_ids.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/object_ids.py b/config/object_ids.py
index 59e3185..48a55cd 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -21,10 +21,10 @@ IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
 PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
 GPS_HANDLER_0_ID = bytes([0x44, 0x13, 0x00, 0x45])
 GPS_HANDLER_1_ID = bytes([0x44, 0x13, 0x01, 0x46])
-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])
+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])
-- 
2.43.0


From 28c2d2015c30bff91f63a7acac8db0a517c76f3a Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 19 Aug 2021 10:16:40 +0200
Subject: [PATCH 09/28] tmtccmd update

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index 46b4b39..e7df305 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 46b4b39f91756ba8f8dcf6806fada6e243dc3156
+Subproject commit e7df305143120985da11236b8d75f8a5387d95e5
-- 
2.43.0


From 9e15d2bce2d1eacd3b89f8a991b4bd09a6f6c3d1 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 6 Sep 2021 11:34:55 +0200
Subject: [PATCH 10/28] .xml file fixes

---
 .idea/runConfigurations/PDU2_Commanding.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/PDU2_Commanding.xml b/.idea/runConfigurations/PDU2_Commanding.xml
index 469e4d3..9dea172 100644
--- a/.idea/runConfigurations/PDU2_Commanding.xml
+++ b/.idea/runConfigurations/PDU2_Commanding.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="-s pdu2 -l -t 4" />
+    <option name="PARAMETERS" value="-s pdu2 -l -t 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
-- 
2.43.0


From b04a3361e7d4bce6f787a68db9037e06db68fe58 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 6 Sep 2021 13:17:23 +0200
Subject: [PATCH 11/28] form stuff

---
 pus_tm/hk_handling.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index d53033b..add4b27 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -71,16 +71,19 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     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]"
+        "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]
@@ -130,12 +133,14 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
     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
+        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)
-- 
2.43.0


From 0f09809d21ceec9878396fb80b645868a0286c2a Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 6 Sep 2021 14:52:41 +0200
Subject: [PATCH 12/28] HK handling for GPS packet added

---
 pus_tm/hk_handling.py | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index add4b27..62deda9 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -10,8 +10,10 @@ from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID, GPS_HANDLER_0_I
 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]:
+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.
     """
     if object_id == SYRLINKS_HANDLER:
@@ -148,4 +150,36 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
 
 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
+    var_index = 0
+    header_array = []
+    content_array = []
+    latitude = struct.unpack('!d', hk_data[0:8])[0]
+    header_array.append('Latitude')
+    content_array.append(latitude)
+    longitude = struct.unpack('!d', hk_data[8:16])[0]
+    header_array.append('Longitude')
+    content_array.append(longitude)
+    altitude = struct.unpack('!d', hk_data[16:24])[0]
+    header_array.append('Altitude')
+    content_array.append(altitude)
+    fix_mode = hk_data[24]
+    header_array.append('Fix Mode')
+    content_array.append(fix_mode)
+    sat_in_use = hk_data[25]
+    header_array.append('Sats in Use')
+    content_array.append(sat_in_use)
+    year = struct.unpack('!H', hk_data[26:28])[0]
+    month = hk_data[28]
+    day = hk_data[29]
+    hours = hk_data[30]
+    minutes = hk_data[31]
+    seconds = hk_data[32]
+    header_array.append('Date')
+    content_array.append(f'{day}.{month}.{year} {hours}:{minutes}:{seconds}')
+    unix_seconds = struct.unpack('!I', hk_data[33:37])[0]
+    header_array.append('Unix Seconds')
+    content_array.append(unix_seconds)
+    var_index += 13
+    validity_buffer = hk_data[37:39]
+
+    return header_array, content_array, validity_buffer, var_index
-- 
2.43.0


From 4e4d69f6d6f6e55b40e90804b3b8ecdba10d96f5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 6 Sep 2021 18:26:56 +0200
Subject: [PATCH 13/28] export gps to logger

---
 pus_tm/hk_handling.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index 62deda9..ab54564 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -1,5 +1,7 @@
 """HK Handling for EIVE OBSW"""
 import struct
+import os
+import datetime
 from typing import Tuple
 
 from tmtccmd.tm.service_3_housekeeping import Service3Base
@@ -175,11 +177,22 @@ def handle_gps_data(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
     minutes = hk_data[31]
     seconds = hk_data[32]
     header_array.append('Date')
-    content_array.append(f'{day}.{month}.{year} {hours}:{minutes}:{seconds}')
+    date_string = f'{day}.{month}.{year} {hours}:{minutes}:{seconds}'
+    content_array.append(date_string)
     unix_seconds = struct.unpack('!I', hk_data[33:37])[0]
     header_array.append('Unix Seconds')
     content_array.append(unix_seconds)
     var_index += 13
+    if not os.path.isfile('gps_log.txt'):
+        with open("gps_log.txt", "w") as gps_file:
+            gps_file.write(
+                'Time, Latitude [deg], Longitude [deg], Altitude [m], Fix Mode, Sats in Use, '
+                'Date, Unix Seconds\n'
+            )
+    with open("gps_log.txt", "a") as gps_file:
+        gps_file.write(
+            f'{datetime.datetime.now()}, {latitude}, {longitude}, {altitude}, '
+            f'{fix_mode}, {sat_in_use}, {date_string}, {unix_seconds}\n'
+        )
     validity_buffer = hk_data[37:39]
-
     return header_array, content_array, validity_buffer, var_index
-- 
2.43.0


From c72eabca3ed3899b4fec785cbf908ec5a56b8e1e Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 6 Sep 2021 19:58:39 +0200
Subject: [PATCH 14/28] update tmtccmd

---
 pus_tm/factory_hook.py | 14 +++++++-------
 tmtccmd                |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 559b212..0bdca81 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -27,16 +27,16 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
     service_type = raw_tm_packet[7]
     tm_packet = None
     if service_type == 1:
-        tm_packet = Service1TM(raw_tm_packet)
+        tm_packet = Service1TM.unpack(raw_telemetry=raw_tm_packet)
     if service_type == 3:
-        tm_packet = Service3TM(raw_tm_packet)
+        tm_packet = Service3TM.unpack(raw_telemetry=raw_tm_packet, custom_hk_handling=False)
     if service_type == 5:
-        tm_packet = Service5TM(raw_tm_packet)
+        tm_packet = Service5TM.unpack(raw_telemetry=raw_tm_packet)
     if service_type == 8:
-        tm_packet = Service8TM(raw_tm_packet)
+        tm_packet = Service8TM.unpack(raw_telemetry=raw_tm_packet)
     if service_type == 17:
-        tm_packet = Service17TM(raw_tm_packet)
+        tm_packet = Service17TM.unpack(raw_telemetry=raw_tm_packet)
     if tm_packet is None:
         LOGGER.info(f'The service {service_type} is not implemented in Telemetry Factory')
-        tm_packet = PusTelemetry(raw_tm_packet)
-    tmtc_printer.print_telemetry(packet=tm_packet)
+        tm_packet = PusTelemetry.unpack(raw_telemetry=raw_tm_packet)
+    tmtc_printer.print_telemetry(packet_if=tm_packet, info_if=tm_packet, print_raw_tm=False)
diff --git a/tmtccmd b/tmtccmd
index e7df305..24fdc47 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit e7df305143120985da11236b8d75f8a5387d95e5
+Subproject commit 24fdc4738e1f6079116618e60feb7afd7da9c28f
-- 
2.43.0


From 246a5eef5f9a83679b63ba07367b0750d987a564 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 6 Sep 2021 20:00:02 +0200
Subject: [PATCH 15/28] updaste submodule URL

---
 .gitmodules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 0605528..8c20967 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "tmtccmd"]
 	path = tmtccmd
-	url = https://github.com/rmspacefish/tmtccmd.git
+	url = https://github.com/robamu-org/tmtccmd.git
+
-- 
2.43.0


From 90b42e7de172fee8e6b41d21ee3de13334ec9e53 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 7 Sep 2021 09:45:35 +0200
Subject: [PATCH 16/28] tmtccmd update to v1.8.0

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index 24fdc47..ee3a887 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 24fdc4738e1f6079116618e60feb7afd7da9c28f
+Subproject commit ee3a887a7d7d00cabd1a3868bba27004f880248a
-- 
2.43.0


From 0360f625341ebf67649c2eeb4f8e3ff5bc508cdd Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 7 Sep 2021 13:28:36 +0200
Subject: [PATCH 17/28] ignore gps log

---
 .gitignore                     |   9 +-
 config/hook_implementations.py | 346 +++++++++++++++++----------------
 pus_tc/pdu1.py                 |  30 ++-
 3 files changed, 201 insertions(+), 184 deletions(-)

diff --git a/.gitignore b/.gitignore
index ec6e113..cc672c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,10 @@
 __pycache__
 log
+/gps_log.txt
 
 .idea/*
 !.idea/runConfigurations
 
 *.json
 
-/Lib
-/Scripts
-/pyvenv.cfg
-/bin
-/lib
-/lib64
-/share
-
 /venv
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 38e48c3..8ad0729 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -20,173 +20,7 @@ class EiveHookObject(TmTcHookBase):
     def get_service_op_code_dictionary(self) -> ServiceOpCodeDictT:
         from tmtccmd.config.globals import get_default_service_op_code_dict
         service_op_code_dict = get_default_service_op_code_dict()
-        op_code_dict = {
-            'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
-            'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
-            'reboot_0_0': ('Reboot 0 0', {OpCodeDictKeys.TIMEOUT: 4.0}),
-            'reboot_0_1': ('Reboot 0 1', {OpCodeDictKeys.TIMEOUT: 4.0}),
-            'reboot_1_0': ('Reboot 1 0', {OpCodeDictKeys.TIMEOUT: 4.0}),
-            'reboot_1_1': ('Reboot 1 1', {OpCodeDictKeys.TIMEOUT: 4.0}),
-        }
-        service_tuple = ('Core Controller', op_code_dict)
-        service_op_code_dict[CustomServiceList.CORE.value] = service_tuple
-
-        op_code_dict = {
-            "0": ("ACU Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        service_tuple = ("ACU Devices", op_code_dict)
-        service_op_code_dict[CustomServiceList.ACU.value] = service_tuple
-
-        op_code_dict = {
-            "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
-        }
-        service_tuple = ("TMP1075 1", op_code_dict)
-        service_op_code_dict[CustomServiceList.TMP1075_1.value] = service_tuple
-        service_tuple = ("TMP1075 2", op_code_dict)
-        service_op_code_dict[CustomServiceList.TMP1075_2.value] = service_tuple
-
-        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)
-
-        op_code_dict_srv_heater = {
-            "0": ("Heater Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        service_heater_tuple = ("Heater Device", op_code_dict_srv_heater)
-
-        op_code_dict_srv_imtq = {
-            "0": ("IMTQ Tests All", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "1": ("IMTQ perform pos X self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "2": ("IMTQ perform neg X self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "3": ("IMTQ perform pos Y self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "4": ("IMTQ perform neg Y self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "5": ("IMTQ perform pos Z self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "6": ("IMTQ perform neg Z self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "7": ("IMTQ command dipole", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "8": ("IMTQ get commanded dipole", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        service_imtq_tuple = ("IMTQ Device", op_code_dict_srv_imtq)
-
-        op_code_dict_srv_rw = {
-            "0": ("Reaction Wheel: Run all commands", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "1": ("Reaction Wheel: Set speed", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "2": ("Reaction Wheel: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "3": ("Reaction Wheel: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "4": ("Reaction Wheel: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "5": ("Reaction Wheel: Send get-telemetry-command", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        service_rw_tuple = ("Reaction Wheel", op_code_dict_srv_rw)
-
-        op_code_dict_srv_rad_sensor = {
-            "0": ("Radiation Sensor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "1": ("Radiation Sensor: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "2": ("Radiation Sensor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        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}),
-            "2": ("PLOC Supervisor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "3": ("PLOC Supervisor: Get HK Report", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "4": ("PLOC Supervisor: Restart MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "5": ("PLOC Supervisor: Start MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "6": ("PLOC Supervisor: Shutdown MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "7": ("PLOC Supervisor: Select MPSoC boot image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "8": ("PLOC Supervisor: Set max restart tries", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "9": ("PLOC Supervisor: Reset MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "10": ("PLOC Supervisor: Set time reference", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "11": ("PLOC Supervisor: Set boot timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "12": ("PLOC Supervisor: Disable Hk", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "13": ("PLOC Supervisor: Request boot status report", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "14": ("PLOC Supervisor: Update available", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "15": ("PLOC Supervisor: Watchdogs enable", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "16": ("PLOC Supervisor: Watchdog Configure Timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "17": ("PLOC Supervisor: Enable latchup alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "18": ("PLOC Supervisor: Disable latchup alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "19": ("PLOC Supervisor: Auto calibrate alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "20": ("PLOC Supervisor: Set alert limit", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "21": ("PLOC Supervisor: Set alert irq filter", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "22": ("PLOC Supervisor: Set ADC sweep period", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "23": ("PLOC Supervisor: Set ADC enabled channels", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "24": ("PLOC Supervisor: Set ADC window and stride", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "25": ("PLOC Supervisor: Set ADC threshold", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "26": ("PLOC Supervisor: Request latchup status report", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "27": ("PLOC Supervisor: Copy ADC data to MRAM", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "28": ("PLOC Supervisor: Enable/Disable NVM0/1/3", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "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}),
-            "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}),
-            "36": ("PLOC Supervisor: Read GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "37": ("PLOC Supervisor: Restart supervisor", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "38": ("PLOC Supervisor: Factory reset clear all", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "39": ("PLOC Supervisor: Factory reset clear mirror entries", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "40": ("PLOC Supervisor: Factory reset clear circular entries", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
-
-        op_code_dict_srv_ploc_updater = {
-            "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.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
-        service_op_code_dict[CustomServiceList.REACTION_WHEEL_2.value] = service_rw_tuple
-        service_op_code_dict[CustomServiceList.REACTION_WHEEL_3.value] = service_rw_tuple
-        service_op_code_dict[CustomServiceList.REACTION_WHEEL_4.value] = service_rw_tuple
-        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
+        get_eive_service_op_code_dict(service_op_code_dict=service_op_code_dict)
         return service_op_code_dict
 
     def get_json_config_file_path(self) -> str:
@@ -250,3 +84,181 @@ class EiveHookObject(TmTcHookBase):
             if event_id == 1:
                 return ""
         return ""
+
+
+def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
+    from pus_tc.pdu1 import Pdu1OpCodes
+    op_code_dict = {
+        'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
+        'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
+        'reboot_0_0': ('Reboot 0 0', {OpCodeDictKeys.TIMEOUT: 4.0}),
+        'reboot_0_1': ('Reboot 0 1', {OpCodeDictKeys.TIMEOUT: 4.0}),
+        'reboot_1_0': ('Reboot 1 0', {OpCodeDictKeys.TIMEOUT: 4.0}),
+        'reboot_1_1': ('Reboot 1 1', {OpCodeDictKeys.TIMEOUT: 4.0}),
+    }
+    service_tuple = ('Core Controller', op_code_dict)
+    service_op_code_dict[CustomServiceList.CORE.value] = service_tuple
+
+    op_code_dict = {
+        "0": ("ACU Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_tuple = ("ACU Devices", op_code_dict)
+    service_op_code_dict[CustomServiceList.ACU.value] = service_tuple
+
+    op_code_dict = {
+        "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
+    }
+    service_tuple = ("TMP1075 1", op_code_dict)
+    service_op_code_dict[CustomServiceList.TMP1075_1.value] = service_tuple
+    service_tuple = ("TMP1075 2", op_code_dict)
+    service_op_code_dict[CustomServiceList.TMP1075_2.value] = service_tuple
+
+    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}),
+        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}),
+        "3": ("PDU1: Turn SUS nominal on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.STAR_TRACKER_OFF.value:
+            ("PDU1: Turn star tracker off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("PDU1: Turn SUS nominal off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.ACS_A_SIDE_ON.value:
+            ("PDU1: Turn ACS Side A on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.ACS_A_SIDE_OFF.value:
+            ("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)
+
+    op_code_dict_srv_heater = {
+        "0": ("Heater Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_heater_tuple = ("Heater Device", op_code_dict_srv_heater)
+
+    op_code_dict_srv_imtq = {
+        "0": ("IMTQ Tests All", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("IMTQ perform pos X self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("IMTQ perform neg X self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("IMTQ perform pos Y self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("IMTQ perform neg Y self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("IMTQ perform pos Z self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("IMTQ perform neg Z self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "7": ("IMTQ command dipole", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": ("IMTQ get commanded dipole", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_imtq_tuple = ("IMTQ Device", op_code_dict_srv_imtq)
+
+    op_code_dict_srv_rw = {
+        "0": ("Reaction Wheel: Run all commands", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("Reaction Wheel: Set speed", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Reaction Wheel: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Reaction Wheel: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Reaction Wheel: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Reaction Wheel: Send get-telemetry-command", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_rw_tuple = ("Reaction Wheel", op_code_dict_srv_rw)
+
+    op_code_dict_srv_rad_sensor = {
+        "0": ("Radiation Sensor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("Radiation Sensor: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Radiation Sensor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    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}),
+        "2": ("PLOC Supervisor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("PLOC Supervisor: Get HK Report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("PLOC Supervisor: Restart MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("PLOC Supervisor: Start MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("PLOC Supervisor: Shutdown MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "7": ("PLOC Supervisor: Select MPSoC boot image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": ("PLOC Supervisor: Set max restart tries", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "9": ("PLOC Supervisor: Reset MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "10": ("PLOC Supervisor: Set time reference", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "11": ("PLOC Supervisor: Set boot timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "12": ("PLOC Supervisor: Disable Hk", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "13": ("PLOC Supervisor: Request boot status report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "14": ("PLOC Supervisor: Update available", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "15": ("PLOC Supervisor: Watchdogs enable", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "16": ("PLOC Supervisor: Watchdog Configure Timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "17": ("PLOC Supervisor: Enable latchup alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "18": ("PLOC Supervisor: Disable latchup alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "19": ("PLOC Supervisor: Auto calibrate alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "20": ("PLOC Supervisor: Set alert limit", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "21": ("PLOC Supervisor: Set alert irq filter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "22": ("PLOC Supervisor: Set ADC sweep period", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "23": ("PLOC Supervisor: Set ADC enabled channels", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "24": ("PLOC Supervisor: Set ADC window and stride", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "25": ("PLOC Supervisor: Set ADC threshold", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "26": ("PLOC Supervisor: Request latchup status report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "27": ("PLOC Supervisor: Copy ADC data to MRAM", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "28": ("PLOC Supervisor: Enable/Disable NVM0/1/3", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "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}),
+        "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}),
+        "36": ("PLOC Supervisor: Read GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "37": ("PLOC Supervisor: Restart supervisor", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "38": ("PLOC Supervisor: Factory reset clear all", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "39": ("PLOC Supervisor: Factory reset clear mirror entries",
+               {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "40": ("PLOC Supervisor: Factory reset clear circular entries",
+               {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
+
+    op_code_dict_srv_ploc_updater = {
+        "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.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
+    service_op_code_dict[CustomServiceList.REACTION_WHEEL_2.value] = service_rw_tuple
+    service_op_code_dict[CustomServiceList.REACTION_WHEEL_3.value] = service_rw_tuple
+    service_op_code_dict[CustomServiceList.REACTION_WHEEL_4.value] = service_rw_tuple
+    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
\ No newline at end of file
diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index 503849c..bdf174c 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -6,6 +6,7 @@
 @author J. Meier
 @date   17.12.2020
 """
+import enum
 from tmtccmd.config.definitions import QueueCommands
 
 from tmtccmd.tc.packer import TcQueueT
@@ -15,6 +16,13 @@ from pus_tc.p60dock import P60DockConfigTable
 from gomspace.gomspace_pdu_definitions import *
 
 
+class Pdu1OpCodes(enum.Enum):
+    STAR_TRACKER_ON = "1"
+    STAR_TRACKER_OFF = "4"
+    ACS_A_SIDE_ON = "6"
+    ACS_A_SIDE_OFF = "7"
+
+
 class PDU1TestProcedure:
     """
     @brief  Use this class to define the tests to perform for the PDU2.
@@ -31,10 +39,10 @@ class PDU1TestProcedure:
     turn_channel_3_off = False
 
 
-def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     tc_queue.appendleft((QueueCommands.PRINT, "Commanding PDU1"))
 
-    if op_code == "1":
+    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)
@@ -46,7 +54,7 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
                                          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":
+    if op_code == Pdu1OpCodes.STAR_TRACKER_OFF.value:
         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)
@@ -58,16 +66,20 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
                                          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":
+    if op_code == Pdu1OpCodes.ACS_A_SIDE_ON.value:
         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 = 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":
+    if op_code == Pdu1OpCodes.ACS_A_SIDE_OFF.value:
         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 = 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())
 
-- 
2.43.0


From abe71c02067ed0137b9036558183e05884017b70 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 7 Sep 2021 14:51:50 +0200
Subject: [PATCH 18/28] introduced print switch command

---
 config/hook_implementations.py |   6 +-
 gomspace/gomspace_common.py    | 114 +++++++++++++++++----------------
 pus_tc/pdu1.py                 |  43 +++++++------
 pus_tc/pdu2.py                 |  66 +++++++++++--------
 tmtccmd                        |   2 +-
 5 files changed, 127 insertions(+), 104 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 8ad0729..7b53c10 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -3,7 +3,6 @@ from typing import Union, Dict, Tuple
 
 from tmtccmd.config.definitions import ServiceOpCodeDictT
 from tmtccmd.tm.service_3_base import Service3Base
-from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.core.backend import TmTcHandler
@@ -88,6 +87,7 @@ class EiveHookObject(TmTcHookBase):
 
 def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     from pus_tc.pdu1 import Pdu1OpCodes
+    from pus_tc.pdu2 import Pdu2OpCodes
     op_code_dict = {
         'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
         'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
@@ -133,6 +133,8 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
             ("PDU1: Turn ACS Side A on", {OpCodeDictKeys.TIMEOUT: 2.0}),
         Pdu1OpCodes.ACS_A_SIDE_OFF.value:
             ("PDU1: Turn ACS Side A off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.PRINT_SWITCH_STATE.value:
+            ("PDU1: Print switch states", {OpCodeDictKeys.TIMEOUT: 2.0})
     }
     service_pdu1_tuple = ("PDU1 Device", op_code_dict_srv_pdu1)
 
@@ -140,6 +142,8 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "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}),
+        Pdu2OpCodes.PRINT_SWITCH_STATE.value:
+            ("PDU2: Print switch states", {OpCodeDictKeys.TIMEOUT: 2.0})
     }
     service_pdu2_tuple = ("PDU2 Device", op_code_dict_srv_pdu2)
 
diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index 1b3df79..534c5a9 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -6,15 +6,20 @@
 @author     J. Meier
 @date       17.12.2020
 """
+import enum
+
+from tmtccmd.tc.service_8_functional_cmd import generate_action_command
+from tmtccmd.tc.definitions import PusTelecommand
 
 
-class GomspaceDeviceActions:
-    PING = bytearray([0x0, 0x0, 0x0, 0x1])
-    REBOOT = bytearray([0x0, 0x0, 0x0, 0x4])
-    PARAM_GET = bytearray([0x0, 0x0, 0x0, 0x00])
-    PARAM_SET = bytearray([0x0, 0x0, 0x0, 0xFF])
-    WDT_RESET = bytearray([0x0, 0x0, 0x0, 0x9])
-    REQUEST_HK_TABLE = bytearray([0x0, 0x0, 0x0, 0x10])
+class GomspaceDeviceActionIds(enum.IntEnum):
+    PING = 1
+    REBOOT = 4
+    PARAM_GET = 0
+    PARAM_SET = 255
+    WDT_RESET = 9
+    REQUEST_HK_TABLE = 16
+    PRINT_SWITCH_STATE = 17
 
 
 class TableIds:
@@ -37,8 +42,9 @@ class Channel:
     off = 0
 
 
-def pack_get_param_command(object_id: bytearray, table_id: int, memory_address: bytearray,
-                           parameter_size: int) -> bytearray:
+def pack_get_param_command(
+        object_id: bytearray, table_id: int, memory_address: bytearray, parameter_size: int
+) -> PusTelecommand:
     """ Function to generate a command to retrieve parameters like the temperature from a gomspace device.
     @param object_id:   The object id of the gomspace device handler.
     @param table_id:    The table id of the gomspace device
@@ -46,49 +52,54 @@ def pack_get_param_command(object_id: bytearray, table_id: int, memory_address:
     @param parameter_size:  Size of the value to read. E.g. temperature is uint16_t and thus parameter_size is 2
     @return:    The command as bytearray.
     """
-    action_id = GomspaceDeviceActions.PARAM_GET
-    command = bytearray()
-    command = command + object_id + action_id
-    command.append(table_id)
-    command = command + memory_address
-    command.append(parameter_size)
-    return command
+    app_data = bytearray()
+    app_data.append(table_id)
+    app_data.extend(memory_address)
+    app_data.append(parameter_size)
+    return generate_action_command(
+        object_id=object_id, action_id=GomspaceDeviceActionIds.PARAM_GET, app_data=app_data
+    )
 
 
-def pack_set_param_command(object_id: bytearray, memory_address: bytearray, parameter_size: int,
-                           parameter: int) -> bytearray:
+def pack_set_param_command(
+        object_id: bytearray, memory_address: bytearray, parameter_size: int, parameter: int,
+        ssc: int = 0
+) -> PusTelecommand:
     """ Function to generate a command to set a parameter
-    @param object_id:   The object id of the gomspace device handler.
-    @param memory_address:  Address offset within table of the value to set.
-    @param parameter: The parameter value to set.
-    @param parameter_size:  Size of the value to set. There are uint8_t, uint16_t and uint32_t in the device tables.
-    @return:    The command as bytearray.
+    :param object_id:   The object id of the gomspace device handler.
+    :param memory_address:  Address offset within table of the value to set.
+    :param parameter: The parameter value to set.
+    :param parameter_size:  Size of the value to set. There are uint8_t, uint16_t and uint32_t
+    in the device tables.
+    :param ssc:
+    :return:    The command as bytearray.
     """
-    action_id = GomspaceDeviceActions.PARAM_SET
-    command = bytearray()
-    command = command + object_id + action_id
-    command = command + memory_address
-    command.append(parameter_size)
+    action_id = GomspaceDeviceActionIds.PARAM_SET
+    app_data = bytearray()
+    app_data += memory_address
+    app_data.append(parameter_size)
     if parameter_size == 1:
-        command.append(parameter)
+        app_data.append(parameter)
     elif parameter_size == 2:
         byte_one = 0xFF00 & parameter >> 8
         byte_two = 0xFF & parameter
-        command.append(byte_one)
-        command.append(byte_two)
+        app_data.append(byte_one)
+        app_data.append(byte_two)
     elif parameter_size == 4:
         byte_one = 0xFF000000 & parameter >> 24
         byte_two = 0xFF0000 & parameter >> 16
         byte_three = 0xFF00 & parameter >> 8
         byte_four = 0xFF & parameter
-        command.append(byte_one)
-        command.append(byte_two)
-        command.append(byte_three)
-        command.append(byte_four)
-    return command
+        app_data.append(byte_one)
+        app_data.append(byte_two)
+        app_data.append(byte_three)
+        app_data.append(byte_four)
+    return generate_action_command(
+        object_id=object_id, action_id=action_id, app_data=app_data, ssc=ssc
+    )
 
 
-def pack_ping_command(object_id: bytearray, data: bytearray) -> bytearray:
+def pack_ping_command(object_id: bytearray, data: bytearray) -> PusTelecommand:
     """" Function to generate the command to ping a gomspace device
     @param object_id    Object Id of the gomspace device handler.
     @param data Bytearray containing the bytes to send to the gomspace device. For now the on board software
@@ -96,37 +107,30 @@ def pack_ping_command(object_id: bytearray, data: bytearray) -> bytearray:
     @note   The ping request sends the specified data to a gompsace device. These
             data are simply copied by the device and then sent back.
     """
-    action_id = GomspaceDeviceActions.PING
-    command = object_id + action_id + data
-    return command
+    return generate_action_command(
+        object_id=object_id, action_id=GomspaceDeviceActionIds.PING, app_data=data
+    )
 
 
-def pack_gnd_wdt_reset_command(object_id: bytearray) -> bytearray:
+def pack_gnd_wdt_reset_command(object_id: bytearray) -> PusTelecommand:
     """" Function to generate the command to reset the watchdog of a gomspace device.
     @param object_id    Object Id of the gomspace device handler.
     """
-    action_id = GomspaceDeviceActions.WDT_RESET
-    command = bytearray()
-    command += object_id + action_id
-    return command
+    return generate_action_command(object_id=object_id, action_id=GomspaceDeviceActionIds.WDT_RESET)
 
 
-def pack_reboot_command(object_id: bytearray) -> bytearray:
+def pack_reboot_command(object_id: bytearray) -> PusTelecommand:
     """ Function to generate the command which triggers a reboot of a gomspace device
     @param object_id    The object id of the gomspace device handler.
     """
-    action_id = GomspaceDeviceActions.REBOOT
-    command = bytearray()
-    command += object_id + action_id
-    return command
+    return generate_action_command(object_id=object_id, action_id=GomspaceDeviceActionIds.REBOOT)
 
 
-def pack_request_full_hk_table_command(object_id: bytearray) -> bytearray:
+def pack_request_full_hk_table_command(object_id: bytearray) -> PusTelecommand:
     """ Function to generate the command to request the full housekeeping table from a gomspace
         device.
     @param object_id    The object id of the gomspace device handler.
     """
-    action_id = GomspaceDeviceActions.REQUEST_HK_TABLE
-    command = bytearray()
-    command = object_id + action_id
-    return command
+    return generate_action_command(
+        object_id=object_id, action_id=GomspaceDeviceActionIds.REQUEST_HK_TABLE
+    )
diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index bdf174c..22f9c8e 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -21,6 +21,7 @@ class Pdu1OpCodes(enum.Enum):
     STAR_TRACKER_OFF = "4"
     ACS_A_SIDE_ON = "6"
     ACS_A_SIDE_OFF = "7"
+    PRINT_SWITCH_STATE = "17"
 
 
 class PDU1TestProcedure:
@@ -46,25 +47,21 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
         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 == Pdu1OpCodes.STAR_TRACKER_OFF.value:
         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 == Pdu1OpCodes.ACS_A_SIDE_ON.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn ACS Side A on"))
@@ -72,7 +69,6 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             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 == Pdu1OpCodes.ACS_A_SIDE_OFF.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn ACS Side A off"))
@@ -80,14 +76,18 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             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 op_code == Pdu1OpCodes.PRINT_SWITCH_STATE.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Print Switch Status"))
+        command = generate_action_command(
+            object_id=object_id, action_id=int(Pdu1OpCodes.PRINT_SWITCH_STATE.value)
+        )
         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(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"))
@@ -95,29 +95,32 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             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(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)
+        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 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(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)
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_2.parameter_address,
+            PDUConfigTable.out_en_2.parameter_size, Channel.off
+        )
         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(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)
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_3.parameter_address,
+            PDUConfigTable.out_en_3.parameter_size, Channel.on
+        )
         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(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)
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_3.parameter_address,
+            PDUConfigTable.out_en_3.parameter_size, Channel.off
+        )
         tc_queue.appendleft(command.pack_command_tuple())
diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py
index ca7123f..56f657e 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -8,10 +8,14 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
-from pus_tc.p60dock import P60DockConfigTable
+
+
+class Pdu2OpCodes(enum.Enum):
+    ACS_SIDE_B_ON = "1"
+    ACS_SIDE_B_OFF = "2"
+    PRINT_SWITCH_STATE = "17"
 
 
 class PDU2TestProcedure:
@@ -39,77 +43,85 @@ class PDU2TestProcedure:
 def pack_pdu2_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
     tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU2"))
 
-    if op_code == "1":
+    if op_code == Pdu2OpCodes.ACS_SIDE_B_ON.value:
         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":
+    if op_code == Pdu2OpCodes.ACS_SIDE_B_OFF.value:
         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 op_code == Pdu2OpCodes.PRINT_SWITCH_STATE.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Print Switch Status"))
+        command = generate_action_command(
+            object_id=object_id, action_id=int(Pdu2OpCodes.PRINT_SWITCH_STATE.value)
+        )
+        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)
-        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(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)
+        command = pack_get_param_command(
+            object_id, TableIds.hk, PDUHkTable.wdt_gnd_left.parameter_address,
+            PDUHkTable.wdt_gnd_left.parameter_size
+        )
         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(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(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)"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Testing setting output channel 2 on (TCS Heater)")
+        )
         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(object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
-                                         PDUHkTable.temperature.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
+        command = pack_get_param_command(
+            object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
+            PDUHkTable.temperature.parameter_size
+        )
         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(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(
+            (QueueCommands.PRINT, "PDU2: Reading output channel 2 state (TCS Heater)")
+        )
+        command = pack_get_param_command(
+            object_id, TableIds.config, PDUConfigTable.out_en_2.parameter_address,
+            PDUConfigTable.out_en_2.parameter_size
+        )
         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(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(
+            (QueueCommands.PRINT, "PDU2: Reading current limit value of  output channel 0 (OBC)")
+        )
+        command = pack_get_param_command(
+            object_id, TableIds.config, PDUConfigTable.cur_lu_lim_0.parameter_address,
+            PDUConfigTable.cur_lu_lim_0.parameter_size
+        )
         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(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(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
diff --git a/tmtccmd b/tmtccmd
index ee3a887..e02559d 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit ee3a887a7d7d00cabd1a3868bba27004f880248a
+Subproject commit e02559d2d18fa17a119144ee240423b0c7d90e2d
-- 
2.43.0


From 96346461b4602bbfb15c9f44afec8479f3e149e8 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 7 Sep 2021 15:45:05 +0200
Subject: [PATCH 19/28] format stuff

---
 pus_tc/pdu2.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py
index 56f657e..dc4832e 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -45,14 +45,18 @@ def pack_pdu2_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
 
     if op_code == Pdu2OpCodes.ACS_SIDE_B_ON.value:
         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 = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_7.parameter_address,
+            PDUConfigTable.out_en_7.parameter_size, Channel.on
+        )
         tc_queue.appendleft(command.pack_command_tuple())
         return tc_queue
     if op_code == Pdu2OpCodes.ACS_SIDE_B_OFF.value:
         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 = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_7.parameter_address,
+            PDUConfigTable.out_en_7.parameter_size, Channel.off
+        )
         tc_queue.appendleft(command.pack_command_tuple())
         return tc_queue
     if op_code == Pdu2OpCodes.PRINT_SWITCH_STATE.value:
-- 
2.43.0


From eb8d52607b49b091764940f7d909b7e525238d1c Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 7 Sep 2021 16:10:40 +0200
Subject: [PATCH 20/28] improvement

---
 pus_tc/pdu1.py | 2 +-
 pus_tc/pdu2.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index 22f9c8e..e512607 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -80,7 +80,7 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     if op_code == Pdu1OpCodes.PRINT_SWITCH_STATE.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Print Switch Status"))
         command = generate_action_command(
-            object_id=object_id, action_id=int(Pdu1OpCodes.PRINT_SWITCH_STATE.value)
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_STATE
         )
         tc_queue.appendleft(command.pack_command_tuple())
 
diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py
index dc4832e..2c08137 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -62,7 +62,7 @@ def pack_pdu2_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
     if op_code == Pdu2OpCodes.PRINT_SWITCH_STATE.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Print Switch Status"))
         command = generate_action_command(
-            object_id=object_id, action_id=int(Pdu2OpCodes.PRINT_SWITCH_STATE.value)
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_STATE
         )
         tc_queue.appendleft(command.pack_command_tuple())
 
-- 
2.43.0


From b1e89d40467b269774ac8c707c122a7524c90f39 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Sep 2021 13:20:22 +0200
Subject: [PATCH 21/28] added GPS command

---
 config/definitions.py    |  2 ++
 pus_tc/acu.py            | 24 ++++++++++------------
 pus_tc/gps.py            | 22 ++++++++++++++++++++
 pus_tc/p60dock.py        | 44 ++++++++++++++++++++++------------------
 pus_tc/tc_packer_hook.py | 32 +++++++++++++++++++++--------
 5 files changed, 83 insertions(+), 41 deletions(-)
 create mode 100644 pus_tc/gps.py

diff --git a/config/definitions.py b/config/definitions.py
index 50f4577..70765d5 100644
--- a/config/definitions.py
+++ b/config/definitions.py
@@ -30,6 +30,8 @@ class CustomServiceList(enum.Enum):
     RAD_SENSOR = "rad_sensor"
     PLOC_SUPV = "ploc_supv"
     PLOC_UPDATER = "ploc_updater"
+    GPS_0 = "gps0"
+    GPS_1 = "gps1"
     PLOC_MEMORY_DUMPER = "ploc_memory_dumper"
     CORE = 'core'
     STAR_TRACKER = 'star_tracker'
diff --git a/pus_tc/acu.py b/pus_tc/acu.py
index d31cba6..7ffe438 100644
--- a/pus_tc/acu.py
+++ b/pus_tc/acu.py
@@ -5,9 +5,7 @@
 @author J. Meier
 @date   21.12.2020
 """
-
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.config.definitions import QueueCommands
 from gomspace.gomspace_common import *
 from pus_tc.p60dock import P60DockConfigTable
@@ -64,13 +62,13 @@ def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT):
         p60dock_object_id, P60DockConfigTable.out_en_0.parameter_address,
         P60DockConfigTable.out_en_0.parameter_size, Channel.on
     )
-    command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+    # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
     tc_queue.appendleft(command.pack_command_tuple())
 
     if ACUTestProcedure.all or ACUTestProcedure.reboot:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reboot"))
         command = pack_reboot_command(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.read_gnd_wdt:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading ground watchdog timer value"))
@@ -78,54 +76,54 @@ def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT):
             object_id, TableIds.hk, ACUHkTable.wdt_gnd_left.parameter_address,
             ACUHkTable.wdt_gnd_left.parameter_size
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.gnd_wdt_reset:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Testing ground watchdog reset"))
         command = pack_gnd_wdt_reset_command(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.ping:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Ping Test"))
         ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
         command = pack_ping_command(object_id, ping_data)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.read_temperature3:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading temperature 3"))
         command = pack_get_param_command(object_id, TableIds.hk, ACUHkTable.temperature3.parameter_address,
                                          ACUHkTable.temperature3.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.read_vboost:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading vboost value"))
         command = pack_get_param_command(object_id, TableIds.config, ACUConfigTable.vboost.parameter_address,
                                          ACUConfigTable.vboost.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.read_vbat_max_hi:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading vbat_max_hi"))
         command = pack_get_param_command(object_id, TableIds.config, ACUConfigTable.vbat_max_hi.parameter_address,
                                          ACUConfigTable.vbat_max_hi.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.read_vbat_max_lo:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading vbat_max_lo"))
         command = pack_get_param_command(object_id, TableIds.config, ACUConfigTable.vbat_max_lo.parameter_address,
                                          ACUConfigTable.vbat_max_lo.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if ACUTestProcedure.all or ACUTestProcedure.read_ov_mode:
         tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading ov_mode"))
         command = pack_get_param_command(object_id, TableIds.config, ACUConfigTable.ov_mode.parameter_address,
                                          ACUConfigTable.ov_mode.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 
     tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning off ACU"))
     command = pack_set_param_command(p60dock_object_id, P60DockConfigTable.out_en_0.parameter_address,
                                      P60DockConfigTable.out_en_0.parameter_size, Channel.off)
-    command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+    # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
     tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
diff --git a/pus_tc/gps.py b/pus_tc/gps.py
new file mode 100644
index 0000000..42b136d
--- /dev/null
+++ b/pus_tc/gps.py
@@ -0,0 +1,22 @@
+import enum
+
+from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_8_functional_cmd import generate_action_command
+
+
+from config.object_ids import GPS_HANDLER_1_ID, GPS_HANDLER_0_ID
+
+
+class GpsOpCodes(enum.Enum):
+    RESET_GNSS = "5"
+
+
+def pack_gps_command(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+    if op_code == GpsOpCodes.RESET_GNSS.value:
+        if object_id == GPS_HANDLER_0_ID:
+            tc_queue.appendleft((QueueCommands.PRINT, "Resetting GPS device 0"))
+        elif object_id == GPS_HANDLER_1_ID:
+            tc_queue.appendleft((QueueCommands.PRINT, "Resetting GPS device 1"))
+        cmd = generate_action_command(object_id=object_id, action_id=int(op_code))
+        tc_queue.appendleft(cmd.pack_command_tuple())
diff --git a/pus_tc/p60dock.py b/pus_tc/p60dock.py
index 6c9ed46..60ebe42 100644
--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@@ -62,24 +62,28 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
     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)
+        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)
+        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)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.read_gnd_wdt:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Reading ground watchdog timer value"))
@@ -87,25 +91,25 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             object_id, TableIds.hk, P60DockHkTable.wdt_gnd_left.parameter_address,
             P60DockHkTable.wdt_gnd_left.parameter_size
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.gnd_wdt_reset:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Testing ground watchdog reset"))
         command = pack_gnd_wdt_reset_command(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.ping:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Ping"))
         ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
         command = pack_ping_command(object_id, ping_data)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.channel_3_off:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Testing setting output channel 3 off"))
         parameter = 0  # set channel off
         command = pack_set_param_command(object_id, P60DockConfigTable.out_en_3.parameter_address,
                                          P60DockConfigTable.out_en_3.parameter_size, parameter)
-        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.read_temperature1:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Testing  temperature reading"))
@@ -113,14 +117,14 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             object_id, TableIds.hk, P60DockHkTable.temperature1.parameter_address,
             P60DockHkTable.temperature1.parameter_size
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.channel_3_on:
         tc_queue.appendleft((QueueCommands.PRINT,
                              "P60 Dock: Testing  Output Channel 3 state (PDU2)"))
         command = pack_get_param_command(object_id, TableIds.config, P60DockConfigTable.out_en_3.parameter_address,
                                          P60DockConfigTable.out_en_3.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=25, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=25, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.read_cur_lu_lim_0:
         tc_queue.appendleft((QueueCommands.PRINT,
@@ -129,14 +133,14 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             object_id, TableIds.config, P60DockConfigTable.cur_lu_lim_0.parameter_address,
             P60DockConfigTable.cur_lu_lim_0.parameter_size
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=26, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=26, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.channel_3_on:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Testing setting output channel 3 on"))
         parameter = 1  # set channel on
         command = pack_set_param_command(object_id, P60DockConfigTable.out_en_3.parameter_address,
                                          P60DockConfigTable.out_en_3.parameter_size, parameter)
-        command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.invalid_table_id_test:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Testing invalid table id handling"))
@@ -145,7 +149,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             object_id, table_id_invalid, P60DockHkTable.temperature1.parameter_address,
             P60DockHkTable.temperature1.parameter_size
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.invalid_address_test:
         tc_queue.appendleft((QueueCommands.PRINT,
@@ -153,7 +157,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
         invalid_address = bytearray([0x01, 0xF4])
         command = pack_get_param_command(object_id, TableIds.hk, invalid_address,
                                          P60DockHkTable.temperature1.parameter_size)
-        command = PusTelecommand(service=8, subservice=128, ssc=29, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=29, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
         tc_queue.appendleft((QueueCommands.PRINT,
                              "P60 Dock: Testing invalid address handling in set param command"))
@@ -161,7 +165,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
         parameter_size = 2
         parameter = 1
         command = pack_set_param_command(object_id, invalid_address, parameter_size, parameter)
-        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.invalid_parameter_size_test:
         tc_queue.appendleft(
@@ -172,7 +176,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
         command = pack_get_param_command(
             object_id, TableIds.hk, P60DockHkTable.temperature1.parameter_address, invalid_size
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
         tc_queue.appendleft(
             (QueueCommands.PRINT,
@@ -182,7 +186,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
         command = pack_set_param_command(
             object_id, P60DockConfigTable.out_en_3.parameter_address, invalid_size, parameter
         )
-        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        # command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index d88c966..1717d79 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -30,10 +30,12 @@ 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 pus_tc.gps import pack_gps_command
 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, STAR_TRACKER_ID, PLOC_MEMORY_DUMPER_ID
+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, \
+    STAR_TRACKER_ID, PLOC_MEMORY_DUMPER_ID, GPS_HANDLER_0_ID, GPS_HANDLER_1_ID
 
 
 LOGGER = get_console_logger()
@@ -87,21 +89,35 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
         return pack_single_rw_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.RAD_SENSOR.value:
         object_id = RAD_SENSOR_ID
-        return pack_rad_sensor_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+        return pack_rad_sensor_test_into(
+            object_id=object_id, tc_queue=service_queue, op_code=op_code
+        )
     if service == CustomServiceList.PLOC_SUPV.value:
         object_id = PLOC_SUPV_ID
-        return pack_ploc_supv_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+        return pack_ploc_supv_test_into(
+            object_id=object_id, tc_queue=service_queue, op_code=op_code
+        )
     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)
+        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)
+        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)
+        return pack_ploc_memory_dumper_cmd(
+            object_id=object_id, tc_queue=service_queue, op_code=op_code
+        )
+    if service == CustomServiceList.GPS_0.value:
+        return pack_gps_command(object_id=GPS_HANDLER_0_ID, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.GPS_1.value:
+        return pack_gps_command(object_id=GPS_HANDLER_1_ID, tc_queue=service_queue, op_code=op_code)
     LOGGER.warning("Invalid Service !")
 
 
-- 
2.43.0


From d84c6a7e70e68f28dcfb21ccfdaae6a0300eab40 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Sep 2021 13:40:06 +0200
Subject: [PATCH 22/28] pdu1 timeout lower

---
 .idea/runConfigurations/PDU1_Commanding.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.idea/runConfigurations/PDU1_Commanding.xml
index e6a848b..ac77bc5 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.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="-s pdu1 -l -t 4" />
+    <option name="PARAMETERS" value="-s pdu1 -l -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
-- 
2.43.0


From b2feb05fa9245f6fb24596611c4f89ac3c141cd5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Sep 2021 13:43:47 +0200
Subject: [PATCH 23/28] disable read temp test by default

---
 pus_tc/pdu1.py | 2 +-
 pus_tc/pdu2.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index e512607..d65cfe7 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -90,7 +90,7 @@ def pack_pdu1_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
         command = pack_ping_command(object_id, ping_data)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU1TestProcedure.all or PDU1TestProcedure.read_temperature:
-        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Testing  temperature reading"))
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Testing temperature reading"))
         command = pack_get_param_command(
             object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
             PDUHkTable.temperature.parameter_size
diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py
index 2c08137..61b603a 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -30,7 +30,7 @@ class PDU2TestProcedure:
     gnd_wdt_reset = False
     ping = False
     channel_2_off = False  # Reaction wheels 5V
-    read_temperature = True
+    read_temperature = False
     read_channel_2_state = False  # Reaction wheels 5V
     read_cur_lu_lim_0 = False  # OBC
     channel_2_on = False  # Reaction wheels 5V
@@ -94,7 +94,7 @@ def pack_pdu2_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str)
                                          PDUConfigTable.out_en_2.parameter_size, Channel.on)
         tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.read_temperature:
-        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing  temperature reading"))
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing temperature reading"))
         command = pack_get_param_command(
             object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
             PDUHkTable.temperature.parameter_size
-- 
2.43.0


From 27e5e6c7ae75ec94460d5703e7243e7fa1819658 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Sep 2021 14:34:09 +0200
Subject: [PATCH 24/28] removed unused parameters

---
 pus_tc/p60dock.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pus_tc/p60dock.py b/pus_tc/p60dock.py
index 60ebe42..88e6e73 100644
--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@@ -61,7 +61,6 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
 
     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
@@ -71,7 +70,6 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
         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
-- 
2.43.0


From 2f6681e3a08275afc6dcd8b31b3e53c583b41e4c Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Sep 2021 14:47:33 +0200
Subject: [PATCH 25/28] somethings now working

---
 .idea/runConfigurations/PDU1_Commanding.xml | 2 +-
 .idea/runConfigurations/PDU2_Commanding.xml | 2 +-
 config/hook_implementations.py              | 8 ++++++++
 config/object_ids.py                        | 2 ++
 pus_tc/gps.py                               | 2 +-
 tmtccmd                                     | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.idea/runConfigurations/PDU1_Commanding.xml
index ac77bc5..ccd6e1a 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Core">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/PDU2_Commanding.xml b/.idea/runConfigurations/PDU2_Commanding.xml
index 9dea172..58fd207 100644
--- a/.idea/runConfigurations/PDU2_Commanding.xml
+++ b/.idea/runConfigurations/PDU2_Commanding.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Core">
     <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 7b53c10..5633f33 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -88,6 +88,7 @@ class EiveHookObject(TmTcHookBase):
 def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     from pus_tc.pdu1 import Pdu1OpCodes
     from pus_tc.pdu2 import Pdu2OpCodes
+    from pus_tc.gps import GpsOpCodes
     op_code_dict = {
         'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
         'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
@@ -99,6 +100,13 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     service_tuple = ('Core Controller', op_code_dict)
     service_op_code_dict[CustomServiceList.CORE.value] = service_tuple
 
+    op_code_dict = {
+        GpsOpCodes.RESET_GNSS.value: ('Reset GPS', {OpCodeDictKeys.TIMEOUT: 2.0})
+    }
+    service_tuple = ('GPS 0', op_code_dict)
+    service_op_code_dict[CustomServiceList.GPS_0.value] = service_tuple
+    service_op_code_dict[CustomServiceList.GPS_1.value] = service_tuple
+
     op_code_dict = {
         "0": ("ACU Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
diff --git a/config/object_ids.py b/config/object_ids.py
index ff34b95..5a67a92 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -50,6 +50,8 @@ def get_object_ids() -> Dict[bytes, list]:
          RW2_ID: "Reaction Wheel 2",
          RW3_ID: "Reaction Wheel 3",
          RW4_ID: "Reaction Wheel 4",
+         GPS_HANDLER_0_ID: "GPS 0",
+         GPS_HANDLER_1_ID: "GPS 1",
          RAD_SENSOR_ID: "Radiation Sensor",
          PLOC_SUPV_ID: "PLOC Supervisor",
          CORE_CONTROLLER_ID: "Core Controller",
diff --git a/pus_tc/gps.py b/pus_tc/gps.py
index 42b136d..5297530 100644
--- a/pus_tc/gps.py
+++ b/pus_tc/gps.py
@@ -12,7 +12,7 @@ class GpsOpCodes(enum.Enum):
     RESET_GNSS = "5"
 
 
-def pack_gps_command(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+def pack_gps_command(object_id: bytes, tc_queue: TcQueueT, op_code: str):
     if op_code == GpsOpCodes.RESET_GNSS.value:
         if object_id == GPS_HANDLER_0_ID:
             tc_queue.appendleft((QueueCommands.PRINT, "Resetting GPS device 0"))
diff --git a/tmtccmd b/tmtccmd
index e02559d..8191b67 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit e02559d2d18fa17a119144ee240423b0c7d90e2d
+Subproject commit 8191b67fd9a51f78caaa9b0b7546650679914f3e
-- 
2.43.0


From cce04cc163c769136b7d6e3effa381a72d6f4c16 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 8 Sep 2021 16:03:01 +0200
Subject: [PATCH 26/28] tmtccmd update

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index 8191b67..0d858a8 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 8191b67fd9a51f78caaa9b0b7546650679914f3e
+Subproject commit 0d858a8e96398f46f054f63c1d2d4225c192b330
-- 
2.43.0


From 90f85b7dae63e93a3c5686fab9dd0d4a8147e96b Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Wed, 8 Sep 2021 18:11:46 +0200
Subject: [PATCH 27/28] gps run configs

---
 .../{ACU_Test_UDP.xml => ACU_Test.xml}        |  2 +-
 .idea/runConfigurations/GPS_0.xml             | 24 +++++++++++++++++++
 .idea/runConfigurations/GPS_1.xml             | 24 +++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 rename .idea/runConfigurations/{ACU_Test_UDP.xml => ACU_Test.xml} (87%)
 create mode 100644 .idea/runConfigurations/GPS_0.xml
 create mode 100644 .idea/runConfigurations/GPS_1.xml

diff --git a/.idea/runConfigurations/ACU_Test_UDP.xml b/.idea/runConfigurations/ACU_Test.xml
similarity index 87%
rename from .idea/runConfigurations/ACU_Test_UDP.xml
rename to .idea/runConfigurations/ACU_Test.xml
index e44f65c..490fabd 100644
--- a/.idea/runConfigurations/ACU_Test_UDP.xml
+++ b/.idea/runConfigurations/ACU_Test.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ACU Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="ACU Test" 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/GPS_0.xml b/.idea/runConfigurations/GPS_0.xml
new file mode 100644
index 0000000..aa85e09
--- /dev/null
+++ b/.idea/runConfigurations/GPS_0.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="GPS 0" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <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 gps0 -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/GPS_1.xml b/.idea/runConfigurations/GPS_1.xml
new file mode 100644
index 0000000..5b3217e
--- /dev/null
+++ b/.idea/runConfigurations/GPS_1.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="GPS 1" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <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 gps1 -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
-- 
2.43.0


From d9968031d641249ca0ad62e7c1c19ed22390078c Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Mon, 13 Sep 2021 18:06:25 +0200
Subject: [PATCH 28/28] object ids cleaned up

---
 config/definitions.py    |  1 +
 config/object_ids.py     | 37 +++++++++++++++++++++++++++++--------
 pus_tc/acs.py            | 25 +++++++++++++++++++++++++
 pus_tc/tc_packer_hook.py |  9 ++++-----
 tmtccmd                  |  2 +-
 5 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 pus_tc/acs.py

diff --git a/config/definitions.py b/config/definitions.py
index 70765d5..65d130f 100644
--- a/config/definitions.py
+++ b/config/definitions.py
@@ -16,6 +16,7 @@ class CustomServiceList(enum.Enum):
     PDU1 = "pdu1"
     PDU2 = "pdu2"
     ACU = "acu"
+    ACS = "acs"
     TMP1075_1 = "tmp1075_1"
     TMP1075_2 = "tmp1075_2"
     HEATER = "heater"
diff --git a/config/object_ids.py b/config/object_ids.py
index 5a67a92..95b3f64 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -5,32 +5,53 @@
 """
 from typing import Dict
 
-PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
-TEST_DEVICE_ID = bytes([0x54, 0x00, 0xAF, 0xFE])
+# Core Object IDs
+CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
+SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x10, 0xA2])
+
+# Power Object IDs
+PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
 P60_DOCK_HANDLER = bytes([0x44, 0x25, 0x00, 0x00])
 PDU_1_HANDLER_ID = bytes([0x44, 0x25, 0x00, 0x01])
 PDU_2_HANDLER_ID = bytes([0x44, 0x25, 0x00, 0x02])
 ACU_HANDLER_ID = bytes([0x44, 0x25, 0x00, 0x03])
+
+# Thermal Object IDs
+HEATER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
 TMP_1075_1_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x04])
 TMP_1075_2_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x05])
-HEATER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
-PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
-SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x10, 0xA2])
+
+# Communication Object IDs
 SYRLINKS_HANDLER = bytes([0x44, 0x53, 0x00, 0xA3])
-IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
-PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
+
+# ACS Object IDs
+MGM_0_HANDLER_ID = bytes([0x44, 0x12, 0x00, 0x06])
+MGM_1_HANDLER_ID = bytes([0x44, 0x12, 0x01, 0x07])
+MGM_2_HANDLER_ID = bytes([0x44, 0x12, 0x02, 0x08])
+MGM_3_HANDLER_ID = bytes([0x44, 0x12, 0x03, 0x09])
+GYRO_0_HANDLER_ID = bytes([0x44, 0x12, 0x00, 0x10])
+GYRO_1_HANDLER_ID = bytes([0x44, 0x12, 0x01, 0x11])
+GYRO_2_HANDLER_ID = bytes([0x44, 0x12, 0x02, 0x12])
+GYRO_3_HANDLER_ID = bytes([0x44, 0x12, 0x03, 0x13])
 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])
+IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
+
+# Misc Object IDs
+PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
+TEST_DEVICE_ID = bytes([0x54, 0x00, 0xAF, 0xFE])
+
+# Payload Object IDs
 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])
+PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
 
 
 def get_object_ids() -> Dict[bytes, list]:
diff --git a/pus_tc/acs.py b/pus_tc/acs.py
new file mode 100644
index 0000000..abe1431
--- /dev/null
+++ b/pus_tc/acs.py
@@ -0,0 +1,25 @@
+import enum
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.pus.service_list import PusServices
+from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
+from tmtccmd.tc.packer import PusTelecommand
+from config.object_ids import MGM_0_HANDLER_ID, MGM_1_HANDLER_ID, MGM_2_HANDLER_ID, MGM_3_HANDLER_ID
+
+
+class AcsOpCodes(enum.Enum):
+    # Switch on A side
+    ON_MGM_0 = "0"
+    ON_MGM_1 = "1"
+    ON_GYRO_0 = "2"
+    ON_GYRO_1 = "3"
+    # Switch on B side
+    ON_MGM_2 = "4"
+    ON_MGM_3 = "5"
+    ON_GYRO_2 = "6"
+    ON_GYRO_3 = "7"
+
+
+def pack_acs_command(tc_queue: TcQueueT, op_code: str):
+    if op_code == AcsOpCodes.ON_MGM_0.value:
+        app_data = pack_mode_data(object_id=MGM_0_HANDLER_ID, mode=Modes.ON, submode=0)
+        # return PusTelecommand(service=PusServices.SERVICE_200_MODE, subservice=)
\ No newline at end of file
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index 1717d79..5e093e3 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -1,9 +1,5 @@
+"""Hook function which packs telecommands based on service and operation code string
 """
-@brief      This file transfers control of TC packing to the user
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-
 import os
 from collections import deque
 from typing import Union
@@ -31,6 +27,7 @@ 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 pus_tc.gps import pack_gps_command
+from pus_tc.acs import pack_acs_command
 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, \
@@ -114,6 +111,8 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
         return pack_ploc_memory_dumper_cmd(
             object_id=object_id, tc_queue=service_queue, op_code=op_code
         )
+    if service == CustomServiceList.ACS.value:
+        return pack_acs_command(tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.GPS_0.value:
         return pack_gps_command(object_id=GPS_HANDLER_0_ID, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.GPS_1.value:
diff --git a/tmtccmd b/tmtccmd
index 0d858a8..38be11c 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 0d858a8e96398f46f054f63c1d2d4225c192b330
+Subproject commit 38be11cab16c036fb0968f01d46d198be4cd058f
-- 
2.43.0