update submodules

Merge pull request 'meier/ccsds' (#28 ) from meier/ccsds into develop
Reviewed-on: #28
2021-12-15 09:55:43 +01:00 · 2021-11-24 18:45:10 +01:00 · 2021-11-24 15:56:57 +01:00 · 2021-11-24 15:56:25 +01:00 · 2021-11-19 16:54:58 +01:00 · 2021-11-19 16:54:44 +01:00
47 changed files with 1172 additions and 481 deletions
--- 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
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,7 @@
 [submodule "tmtccmd"]
 	path = tmtccmd
-	url = https://github.com/rmspacefish/tmtccmd.git
+	url = https://github.com/robamu-org/tmtccmd.git
+
+[submodule "spacepackets"]
+	path = spacepackets
+	url = https://github.com/robamu-org/py-spacepackets.git
--- a/.idea/runConfigurations/ACU_Test_UDP.xml
+++ b/.idea/runConfigurations/ACU_Test_UDP.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" />
--- a/.idea/runConfigurations/PDU1_Test_UDP.xml
+++ b/.idea/runConfigurations/PDU1_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="GPS 0" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s pdu1 -l" />
+    <option name="PARAMETERS" value="-s gps0 -l" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/.idea/runConfigurations/PDU2_Test_UDP.xml
+++ b/.idea/runConfigurations/PDU2_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU2 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="GPS 1" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s pdu2 -l -t 4" />
+    <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" />
--- a/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-c udp -s imtq -o 2 -l -t 4 --hk" />
+    <option name="PARAMETERS" value="-s imtq -o 2 -l -t 4 --hk" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/.idea/runConfigurations/P60_Dock_Commanding.xml
+++ b/.idea/runConfigurations/P60_Dock_Commanding.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="P60 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="P60 Dock Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Core">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.idea/runConfigurations/PDU1_Commanding.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <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" />
+    <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 pdu1 -l -t 4" />
+    <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>
--- a/.idea/runConfigurations/PDU2_Commanding.xml
+++ b/.idea/runConfigurations/PDU2_Commanding.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <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" />
+    <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 pdu2 -l -t 6" />
+    <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>
--- a/.idea/runConfigurations/PLOC_SUPV_Test.xml
+++ b/.idea/runConfigurations/PLOC_SUPV_Test.xml
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-c udp -s ploc_supv -l -t 6 --hk" />
+    <option name="PARAMETERS" value="-s ploc_supv -l -t 6 --hk" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="false" />
    <option name="MODULE_MODE" value="false" />
--- a/.idea/runConfigurations/tmtcc_Service_17.xml
+++ b/.idea/runConfigurations/tmtcc_Service_17.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 17" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="Ping Command" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/Unittests_in_spacepackets.xml
+++ b/.idea/runConfigurations/Unittests_in_spacepackets.xml
@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unittests in spacepackets" type="tests" factoryName="Unittests">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/spacepackets/tests" />
+    <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="_new_pattern" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_target" value="&quot;$PROJECT_DIR$/spacepackets/tests&quot;" />
+    <option name="_new_targetType" value="&quot;PATH&quot;" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Unittests_in_tmtccmd.xml
+++ b/.idea/runConfigurations/Unittests_in_tmtccmd.xml
@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unittests in tmtccmd" type="tests" factoryName="Unittests">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tmtccmd/src" />
+    <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="_new_pattern" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_target" value="&quot;$PROJECT_DIR$/tmtccmd/src/tests&quot;" />
+    <option name="_new_targetType" value="&quot;PATH&quot;" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/tmtcc_Service_3.xml
+++ b/.idea/runConfigurations/tmtcc_Service_3.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 3 -p --hk" />
+    <option name="PARAMETERS" value="-s 3 --hk" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/.idea/runConfigurations/tmtccmd_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" />
--- a/config/custom_hooks.py
+++ b/config/custom_hooks.py
@ -3,7 +3,7 @@
@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
            it to your needs.
 """
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand


 def command_preparation_hook() -> PusTelecommand:
--- 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"
@ -30,4 +31,10 @@ 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'
+    CCSDS_HANDLER = 'ccsds_handler'
+    PDEC_HANDLER = 'pdec_handler'
--- a/config/globals_config.py
+++ b/config/globals_config.py
@ -26,7 +26,7 @@ class CustomGlobalIds(enum.Enum):

 def set_globals_pre_args_parsing(gui: bool = False):
    set_default_globals_pre_args_parsing(
-        gui=gui, apid=PUS_APID, com_if_id=CoreComInterfaces.TCPIP_UDP.value)
+        gui=gui, tc_apid=PUS_APID, tm_apid=PUS_APID, com_if_id=CoreComInterfaces.TCPIP_UDP.value)


 def add_globals_post_args_parsing(args: argparse.Namespace, json_cfg_path: str):
--- 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
@ -20,160 +19,18 @@ 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
+        get_eive_service_op_code_dict(service_op_code_dict=service_op_code_dict)

-        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}),
-        }
-        service_p60_tuple = ("P60 Device", op_code_dict_srv_p60)
-
-        op_code_dict_srv_pdu1 = {
-            "0": ("PDU1 Tests", {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}),
-        }
-        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_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}),
-            "32": ("PLOC Supervisor: MRAM Dump", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "33": ("PLOC Supervisor: Print CPU stats", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "34": ("PLOC Supervisor: Set debug verbosity", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "35": ("PLOC Supervisor: Set GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "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 partion A on NVM0", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "1": ("Ploc Updater: Update partion B on NVM0", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "2": ("Ploc Updater: Update partion A on NVM1", {OpCodeDictKeys.TIMEOUT: 2.0}),
-            "3": ("Ploc Updater: Update partion B on NVM1", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        }
-        service_ploc_updater_tuple = ("Ploc Updater", op_code_dict_srv_ploc_updater)
-
-        service_op_code_dict[CustomServiceList.P60DOCK.value] = service_p60_tuple
-        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu1_tuple
-        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu2_tuple
-        service_op_code_dict[CustomServiceList.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
        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)
@ -187,7 +44,7 @@ class EiveHookObject(TmTcHookBase):
        from tmtccmd.config.com_if import create_communication_interface_default
        return create_communication_interface_default(
            com_if_key=com_if_key, tmtc_printer=tmtc_printer,
-            json_cfg_path=self.get_json_config_file_path(), space_packet_id=0x0865
+            json_cfg_path=self.get_json_config_file_path(), space_packet_ids=(0x0865,)
        )

    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
@ -198,10 +55,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()
@ -232,3 +85,229 @@ 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
+    from pus_tc.pdu2 import Pdu2OpCodes
+    from pus_tc.p60dock import P60OpCodes
+    from gomspace.gomspace_common import GomspaceOpCodes
+    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}),
+        '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 = {
+        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}),
+    }
+    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}),
+        P60OpCodes.STACK_3V3_ON.value:
+            ("P60 Dock: Turn stack 3V3 on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        P60OpCodes.STACK_3V3_OFF.value:
+            ("P60 Dock: Turn stack 3V3 off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+            ("P60 Dock: Print Switches, Voltages, Currents", {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.TCS_BOARD_ON.value:
+            ("PDU1: Turn TCS board on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.TCS_BOARD_OFF.value:
+            ("PDU1: Turn TCS board off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.STAR_TRACKER_ON.value:
+            ("PDU1: Turn star tracker on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.STAR_TRACKER_OFF.value:
+            ("PDU1: Turn star tracker off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.SUS_NOMINAL_ON.value:
+            ("PDU1: Turn SUS nominal on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.SUS_NOMINAL_OFF.value:
+            ("PDU1: Turn SUS nominal off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu1OpCodes.ACS_A_SIDE_ON.value:
+            ("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}),
+        GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+            ("PDU1: Print Switches, Voltages, Currents", {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}),
+        Pdu2OpCodes.ACS_SIDE_B_ON.value:
+            ("PDU2: Turn ACS Side B on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu2OpCodes.ACS_SIDE_B_OFF.value:
+            ("PDU2: Turn ACS Side B off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu2OpCodes.SUS_REDUNDANT_ON.value:
+            ("PDU2: Turn SUS redundant on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu2OpCodes.SUS_REDUNDANT_OFF.value:
+            ("PDU2: Turn SUS redundant off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu2OpCodes.RW_ON.value:
+            ("PDU2: Turn reaction wheels on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        Pdu2OpCodes.RW_OFF.value:
+            ("PDU2: Turn reaction wheels off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+            ("PDU1: Print Switches, Voltages, Currents", {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)
+
+    op_code_dict_srv_ccsds_handler = {
+        "0": ("CCSDS Handler: Set low rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("CCSDS Handler: Set high rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("CCSDS Handler: Enable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("CCSDS Handler: Disable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_ccsds_handler_tuple = ("CCSDS Handler", op_code_dict_srv_ccsds_handler)
+
+    op_code_dict_srv_pdec_handler = {
+        "0": ("PDEC Handler: Print CLCW", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_pdec_handler_tuple = ("PDEC Handler", op_code_dict_srv_pdec_handler)
+
+    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
+    service_op_code_dict[CustomServiceList.CCSDS_HANDLER.value] = service_ccsds_handler_tuple
+    service_op_code_dict[CustomServiceList.PDEC_HANDLER.value] = service_pdec_handler_tuple
--- a/config/object_ids.py
+++ b/config/object_ids.py
@ -5,29 +5,55 @@
 """
 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])
+
+# 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])
-PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
-RW1_ID = bytes([0x44, 0x12, 0x00, 0x1])
-RW2_ID = bytes([0x44, 0x12, 0x00, 0x2])
-RW3_ID = bytes([0x44, 0x12, 0x00, 0x3])
-RW4_ID = bytes([0x44, 0x12, 0x00, 0x4])
-START_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])
+
+# Misc Object IDs
+PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
+TEST_DEVICE_ID = bytes([0x54, 0x00, 0xAF, 0xFE])
+CCSDS_HANDLER_ID = bytes([0x50, 0x00, 0x08, 0x00])
+PDEC_HANDLER_ID = bytes([0x50, 0x00, 0x07, 0x04])
+
+# 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]:
@ -47,8 +73,11 @@ 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",
+         CORE_CONTROLLER_ID: "CCSDS Handler",
    })
    return object_id_dict
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@ -6,15 +6,24 @@
@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_V_I = 32
+
+
+class GomspaceOpCodes(enum.Enum):
+    PRINT_SWITCH_V_I = "32"


 class TableIds:
@ -37,8 +46,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 +56,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 +111,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
+    )
--- a/pus_tc/acs.py
+++ b/pus_tc/acs.py
@ -0,0 +1,33 @@
+import enum
+from tmtccmd.tc.definitions import TcQueueT
+from spacepackets.ecss.definitions 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
+from pus_tc.pdu1 import pack_pdu1_commands, Pdu1OpCodes
+from pus_tc.pdu2 import pack_pdu2_commands, Pdu2OpCodes
+
+
+class AcsOpCodes(enum.Enum):
+    ALL_ON = "0"
+    ALL_OFF = "1"
+    POWER_CYCLE = "2"
+    # Switch on A side
+    ON_MGM_0 = "12"
+    ON_MGM_1 = "13"
+    ON_GYRO_0 = "14"
+    ON_GYRO_1 = "15"
+    # Switch on B side
+    ON_MGM_2 = "16"
+    ON_MGM_3 = "17"
+    ON_GYRO_2 = "18"
+    ON_GYRO_3 = "19"
+
+
+def pack_acs_command(tc_queue: TcQueueT, op_code: str):
+    if op_code == AcsOpCodes.ALL_ON:
+        pass
+    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=)
--- 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
--- a/pus_tc/ccsds_handler.py
+++ b/pus_tc/ccsds_handler.py
@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+"""
+@file   ccsds_handler.py
+@brief  Test commanding of CCSDS Handler
+@author J. Meier
+@date   20.11.2021
+"""
+from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.tc.packer import TcQueueT
+from spacepackets.ecss.tc import PusTelecommand
+
+
+class CommandIds:
+    # Configures input rate of syrlinks to 400 Khz (results in downlink rate of 200 kbps)
+    SET_LOW_RATE = bytearray([0x0, 0x0, 0x0, 0x0])
+    # Configures input rate of syrlinks to 2000 Khz (results in downlink rate of 1000 kbps)
+    SET_HIGH_RATE = bytearray([0x0, 0x0, 0x0, 0x1])
+    # Enables the syrlinks transmitter (by using RS485 enables lines)
+    EN_TRANSMITTER = bytearray([0x0, 0x0, 0x0, 0x2])
+    # Disables the syrlinks transmitter (by using RS485 enables lines)
+    DIS_TRANSMITTER = bytearray([0x0, 0x0, 0x0, 0x3])
+
+
+def pack_ccsds_handler_test(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing ccsds handler with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Set low rate"))
+        command = object_id + CommandIds.SET_LOW_RATE
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Set high rate"))
+        command = object_id + CommandIds.SET_HIGH_RATE
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Enables the transmitter"))
+        command = object_id + CommandIds.EN_TRANSMITTER
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "CCSDS Handler: Disables the transmitter"))
+        command = object_id + CommandIds.DIS_TRANSMITTER
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    return tc_queue
--- a/pus_tc/gps.py
+++ 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: 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"))
+        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())
--- a/pus_tc/heater.py
+++ b/pus_tc/heater.py
@ -7,7 +7,7 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand


 class SwitchNumbers:
--- a/pus_tc/imtq.py
+++ b/pus_tc/imtq.py
@ -8,7 +8,7 @@
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command


--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@ -7,10 +7,15 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *


+class P60OpCodes(enum.Enum):
+    TEST = "0"
+    STACK_3V3_ON = "1"
+    STACK_3V3_OFF = "2"
+
+
 class P60DockTestProcedure:
    """
    @brief  Use this class to define the tests to perform for the P60Dock.
@ -33,10 +38,19 @@ class P60DockTestProcedure:


 class P60DockConfigTable:
-    out_en_0 = TableEntry(bytearray([0x00, 0x68]), TableEntry.uint8_size)  # ACU
-    out_en_1 = TableEntry(bytearray([0x00, 0x69]), TableEntry.uint8_size)  # PDU1
-    out_en_2 = TableEntry(bytearray([0x00, 0x6A]), TableEntry.uint8_size)
-    out_en_3 = TableEntry(bytearray([0x00, 0x6B]), TableEntry.uint8_size)  # PDU2
+    out_en_0 = TableEntry(bytearray([0x00, 0x68]), TableEntry.uint8_size)  # ACU VCC
+    out_en_1 = TableEntry(bytearray([0x00, 0x69]), TableEntry.uint8_size)  # PDU1 VCC
+    out_en_2 = TableEntry(bytearray([0x00, 0x6A]), TableEntry.uint8_size)  # unused
+    out_en_3 = TableEntry(bytearray([0x00, 0x6B]), TableEntry.uint8_size)  # PDU2 VCC
+    out_en_4 = TableEntry(bytearray([0x00, 0x6C]), TableEntry.uint8_size)  # ACU VBAT
+    out_en_5 = TableEntry(bytearray([0x00, 0x6D]), TableEntry.uint8_size)  # unused
+    out_en_6 = TableEntry(bytearray([0x00, 0x6E]), TableEntry.uint8_size)  # PDU1 VBAT
+    out_en_7 = TableEntry(bytearray([0x00, 0x6F]), TableEntry.uint8_size)  # PDU2 VBAT
+    out_en_8 = TableEntry(bytearray([0x00, 0x70]), TableEntry.uint8_size)  # Stack VBAT
+    out_en_9 = TableEntry(bytearray([0x00, 0x71]), TableEntry.uint8_size)  # Stack 3V3
+    out_en_10 = TableEntry(bytearray([0x00, 0x72]), TableEntry.uint8_size)  # Stack 5V
+    out_en_11 = TableEntry(bytearray([0x00, 0x73]), TableEntry.uint8_size)  # GS 3V3 (unused)
+    out_en_12 = TableEntry(bytearray([0x00, 0x74]), TableEntry.uint8_size)  # GS 5V (unused)
    # When channel consumes more than cur_lu_lim, channel is turned of immediately
    cur_lu_lim_0 = TableEntry(bytearray([0x00, 0xF8]), TableEntry.uint16_size)

@ -48,11 +62,34 @@ class P60DockHkTable:
    wdt_gnd_left = TableEntry(bytearray([0x00, 0xA8]), TableEntry.uint32_size)


-def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+    if op_code == P60OpCodes.STACK_3V3_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 3V3 on"))
+        command = pack_set_param_command(
+            object_id, P60DockConfigTable.out_en_9.parameter_address,
+            P60DockConfigTable.out_en_9.parameter_size, Channel.on
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+        return
+    if op_code == P60OpCodes.STACK_3V3_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 3V3 off"))
+        command = pack_set_param_command(
+            object_id, P60DockConfigTable.out_en_9.parameter_address,
+            P60DockConfigTable.out_en_9.parameter_size, Channel.off
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+        return
+    if op_code == GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Print Switches, Voltages, Currents"))
+        command = generate_action_command(
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+        return
    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"))
@ -60,25 +97,25 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
            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"))
@ -86,14 +123,14 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
            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,
@ -102,14 +139,14 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
            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"))
@ -118,7 +155,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
            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,
@ -126,7 +163,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
        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"))
@ -134,7 +171,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
        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(
@ -145,7 +182,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
        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,
@ -155,7 +192,7 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT
        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
--- a/pus_tc/pdec_handler.py
+++ b/pus_tc/pdec_handler.py
@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+"""
+@file   pdec_handler.py
+@brief  Test commanding of PDEC Handler
+@author J. Meier
+@date   22.11.2021
+"""
+from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.tc.packer import TcQueueT
+from spacepackets.ecss.tc import PusTelecommand
+
+
+class CommandIds:
+    # prints the clcw to the console. Useful for debugging
+    PRINT_CLCW = bytearray([0x0, 0x0, 0x0, 0x0])
+
+
+def pack_pdec_handler_test(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing PDEC handler with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "PDEC Handler: Print CLCW"))
+        command = object_id + CommandIds.PRINT_CLCW
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@ -1,19 +1,30 @@
 # -*- coding: utf-8 -*-
-"""
-@file   tmtcc_tc_pdu1.py
-@brief  PDU2 tests
+"""PDU2 is mounted on the X4 slot of the P60 dock
@author J. Meier
@date   17.12.2020
 """
+import enum
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 from pus_tc.p60dock import P60DockConfigTable
 from gomspace.gomspace_pdu_definitions import *


+class Pdu1OpCodes(enum.Enum):
+    TESTS = "0"
+    TCS_BOARD_ON = "1"
+    TCS_BOARD_OFF = "2"
+    STAR_TRACKER_ON = "3"
+    STAR_TRACKER_OFF = "4"
+    SUS_NOMINAL_ON = "5"
+    SUS_NOMINAL_OFF = "6"
+    ACS_A_SIDE_ON = "7"
+    ACS_A_SIDE_OFF = "8"
+
+
 class PDU1TestProcedure:
    """
    @brief  Use this class to define the tests to perform for the PDU2.
@ -27,49 +38,122 @@ class PDU1TestProcedure:
    turn_channel_2_on = False    # Star Tracker connected to this channel (5V)
    turn_channel_2_off = False
    turn_channel_3_on = False  # MTQ connected to this channel (5V)
-    turn_channel_3_off = True
+    turn_channel_3_off = False


-def pack_pdu1_test_into(
-        pdu1_object_id: bytearray, p60dock_object_id: bytearray, tc_queue: TcQueueT
-):
-    tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU1"))
+def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+    tc_queue.appendleft((QueueCommands.PRINT, "Commanding PDU1"))
+
+    if op_code == Pdu1OpCodes.TCS_BOARD_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn TCS board on"))
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_0.parameter_address,
+            PDUConfigTable.out_en_2.parameter_size, Channel.on
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.TCS_BOARD_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn TCS board off"))
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_0.parameter_address,
+            PDUConfigTable.out_en_2.parameter_size, Channel.off
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.STAR_TRACKER_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn star tracker on"))
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_2.parameter_address,
+            PDUConfigTable.out_en_2.parameter_size, Channel.on
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.SUS_NOMINAL_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn SUS nominal on"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_4.parameter_address,
+                                         PDUConfigTable.out_en_4.parameter_size, Channel.on)
+        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)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.SUS_NOMINAL_OFF.value:
+        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
+        )
+        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"))
+        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())
+    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
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.SUS_NOMINAL_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn SUS nominal on"))
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_4.parameter_address,
+            PDUConfigTable.out_en_4.parameter_size, Channel.on
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.SUS_NOMINAL_OFF.value:
+        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
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Print Switches, Voltages, Currents"))
+        command = generate_action_command(
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
+        )
+        tc_queue.appendleft(command.pack_command_tuple())

    if PDU1TestProcedure.all or PDU1TestProcedure.ping:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Ping Test"))
        ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
-        command = pack_ping_command(pdu1_object_id, ping_data)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        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(
-            pdu1_object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
+            object_id, TableIds.hk, PDUHkTable.temperature.parameter_address,
            PDUHkTable.temperature.parameter_size
        )
-        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
    if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_on:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 on (Star Tracker)"))
-        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_2.parameter_address,
-                                         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(pdu1_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(pdu1_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(pdu1_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())
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@ -2,15 +2,23 @@
 """
@file   tmtcc_tc_pdu2.py
@brief  PDU2 tests
+@details PDU2 is mounted on the X2 slot of the P60 dock
@author J. Meier
@date   17.12.2020
 """
 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"
+    SUS_REDUNDANT_ON = "3"
+    SUS_REDUNDANT_OFF = "4"
+    RW_ON = "5"
+    RW_OFF = "6"


 class PDU2TestProcedure:
@ -25,7 +33,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
@ -35,71 +43,114 @@ class PDU2TestProcedure:
    request_hk_table = False


-def pack_pdu2_test_into(pdu2_object_id: bytearray, p60dock_object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_pdu2_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
    tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU2"))

-    tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling PDU2"))
-    command = pack_set_param_command(p60dock_object_id, P60DockConfigTable.out_en_3.parameter_address,
-                                     P60DockConfigTable.out_en_3.parameter_size, Channel.on)
-    command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
-    tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == 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
+        )
+        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
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+        return tc_queue
+    if op_code == Pdu2OpCodes.SUS_REDUNDANT_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn SUS redundant on"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_4.parameter_address,
+                                         PDUConfigTable.out_en_4.parameter_size, Channel.on)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.SUS_REDUNDANT_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn SUS redundant off"))
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_4.parameter_address,
+                                         PDUConfigTable.out_en_4.parameter_size, Channel.off)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.RW_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn reaction wheels on"))
+        command = pack_set_param_command(
+            object_id, PDUConfigTable.out_en_2.parameter_address,
+            PDUConfigTable.out_en_2.parameter_size, Channel.on
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.RW_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn reaction wheels off"))
+        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 op_code == GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Print Switches, Currents, Voltahes"))
+        command = generate_action_command(
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
+        )
+        tc_queue.appendleft(command.pack_command_tuple())

    if PDU2TestProcedure.all or PDU2TestProcedure.reboot:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reboot"))
-        command = pack_reboot_command(pdu2_object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        command = pack_reboot_command(object_id)
        tc_queue.appendleft(command.pack_command_tuple())
    if PDU2TestProcedure.all or PDU2TestProcedure.read_gnd_wdt:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reading ground watchdog timer value"))
-        command = pack_get_param_command(pdu2_object_id, TableIds.hk, PDUHkTable.wdt_gnd_left.parameter_address,
-                                         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(pdu2_object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        command = pack_gnd_wdt_reset_command(object_id)
        tc_queue.appendleft(command.pack_command_tuple())
    if PDU2TestProcedure.all or PDU2TestProcedure.ping:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Ping Test"))
        ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
-        command = pack_ping_command(pdu2_object_id, ping_data)
-        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        command = pack_ping_command(object_id, ping_data)
        tc_queue.appendleft(command.pack_command_tuple())
    if PDU2TestProcedure.all or PDU2TestProcedure.channel_2_on:
-        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Testing setting output channel 2 on (TCS Heater)"))
-        command = pack_set_param_command(pdu2_object_id, PDUConfigTable.out_en_2.parameter_address,
+        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(pdu2_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((QueueCommands.PRINT, "PDU2: Testing temperature reading"))
+        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(pdu2_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(pdu2_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(pdu2_object_id, PDUConfigTable.out_en_2.parameter_address,
+        command = pack_set_param_command(object_id, PDUConfigTable.out_en_2.parameter_address,
                                         PDUConfigTable.out_en_2.parameter_size, Channel.off)
-        command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
    if PDU2TestProcedure.all or PDU2TestProcedure.request_hk_table:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Requesting housekeeping table"))
-        command = pack_request_full_hk_table_command(pdu2_object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
+        command = pack_request_full_hk_table_command(object_id)
        tc_queue.appendleft(command.pack_command_tuple())

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

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand


 class PlocTestProcedure:
--- a/pus_tc/ploc_supervisor.py
+++ b/pus_tc/ploc_supervisor.py
@ -11,7 +11,7 @@ import struct
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.utility.logger import get_console_logger

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


-def pack_mram_dump_cmd(object_id: bytearray) -> bytearray:
-    start = int(input("Start address: 0x"), 16)
-    stop = int(input("Stop address: 0x"), 16)
-    command = bytearray()
-    command = object_id + struct.pack('!I', SupvActionIds.DUMP_MRAM)
-    command = command + struct.pack('!I', start)
-    command = command + struct.pack('!I', stop)
-    return command
-
-
 def pack_print_cpu_stats_cmd(object_id: bytearray) -> bytearray:
    en = 1
    command = bytearray()
--- a/pus_tc/ploc_upater.py
+++ b/pus_tc/ploc_upater.py
@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 """
-@file   ploc_supervisor.py
-@brief  Tests for commanding the supervisor of the PLOC.
+@file   ploc_udpater.py
+@brief  Commands to initiate update transfer to ploc supervisor. This only updates the software of the MPSoC, it is not
+        possible to update the software of the supervisor.
        The supervisor is programmed by Thales.
@author J. Meier
@date   10.07.2021
@ -11,10 +12,8 @@ import struct
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.utility.logger import get_console_logger
+from spacepackets.ecss.tc import PusTelecommand

-LOGGER = get_console_logger()

 latchup_id_dict = {
    "0": "0.85V",
@ -28,17 +27,25 @@ latchup_id_dict = {


 class UpdaterActionIds:
-    UPDATE_NVM0_A = 0
-    UPDATE_NVM0_B = 1
-    UPDATE_NVM1_A = 2
-    UPDATE_NVM1_B = 3
+    UPDATE_A_UBOOT = 0
+    UPDATE_A_BITSTREAM = 1
+    UPDATE_A_LINUX = 2
+    UPDATE_A_APP_SW = 3
+    UPDATE_B_UBOOT = 4
+    UPDATE_B_BITSTREAM = 5
+    UPDATE_B_LINUX = 6
+    UPDATE_B_LINUX = 7


 class ImagePathDefs:
-    imageNvm0A = "/mnt/sd0/ploc/updateNvm0A.bin"
-    imageNvm0B = "/mnt/sd0/ploc/updateNvm0B.bin"
-    imageNvm1A = "/mnt/sd0/ploc/updateNvm1A.bin"
-    imageNvm1B = "/mnt/sd0/ploc/updateNvm1B.bin"
+    imageAuboot = "/mnt/sd0/ploc/updateAuboot.bin"
+    imageAbitsream = "/mnt/sd0/ploc/updateAbitstream.bin"
+    imageAlinux = "/mnt/sd0/ploc/updateAlinux.bin"
+    imageAappsw = "/mnt/sd0/ploc/updateAappsw.bin"
+    imageBuboot = "/mnt/sd0/ploc/updateBuboot.bin"
+    imageBbitsream = "/mnt/sd0/ploc/updateBbitstream.bin"
+    imageBlinux = "/mnt/sd0/ploc/updateBlinux.bin"
+    imageBappsw = "/mnt/sd0/ploc/updateBappsw.bin"


 def pack_ploc_updater_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
@ -48,26 +55,50 @@ def pack_ploc_updater_test_into(object_id: bytearray, tc_queue: TcQueueT, op_cod
    )

    if op_code == "0":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition A on NVM0"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM0_A) + \
-                  bytearray(ImagePathDefs.imageNvm0A, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update uboot on partition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_UBOOT) + \
+                  bytearray(ImagePathDefs.imageAuboot, 'utf-8')
        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
    if op_code == "1":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition B on NVM0"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM0_B) + \
-                  bytearray(ImagePathDefs.imageNvm0B, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update bitstream on parition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_BITSTREAM) + \
+                  bytearray(ImagePathDefs.imageAbitsream, 'utf-8')
        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
    if op_code == "2":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition A on NVM1"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM1_A) + \
-                  bytearray(ImagePathDefs.imageNvm1A, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update linux on partition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_LINUX) + \
+                  bytearray(ImagePathDefs.imageAlinux, 'utf-8')
        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
    if op_code == "3":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition B on NVM1"))
-        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM1_B) + \
-                  bytearray(ImagePathDefs.imageNvm1B, 'utf-8')
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update application on partition A"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_A_APP_SW) + \
+                  bytearray(ImagePathDefs.imageAappsw, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update uboot on partition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_UBOOT) + \
+                  bytearray(ImagePathDefs.imageBuboot, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update bitstream on parition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_BITSTREAM) + \
+                  bytearray(ImagePathDefs.imageBbitsream, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update linux on partition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_LINUX) + \
+                  bytearray(ImagePathDefs.imageBlinux, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "7":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update application on partition B"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_B_APP_SW) + \
+                  bytearray(ImagePathDefs.imageBappsw, 'utf-8')
        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
--- a/pus_tc/rad_sensor.py
+++ b/pus_tc/rad_sensor.py
@ -9,7 +9,7 @@ import struct
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data


--- a/pus_tc/reaction_wheels.py
+++ b/pus_tc/reaction_wheels.py
@ -9,7 +9,7 @@ import struct
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data


--- a/pus_tc/service_200_mode.py
+++ b/pus_tc/service_200_mode.py
@ -6,7 +6,7 @@
@date   02.05.2020
 """
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.tc.service_200_mode import pack_mode_data
 from config.object_ids import TEST_DEVICE_ID
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+"""
+@file   star_tracker.py
+@brief  Star tracker commanding
+@author J. Meier
+@date   14.08.2021
+"""
+import struct
+
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from spacepackets.ecss.tc import PusTelecommand
+
+
+class StarTrackerActionIds:
+    PING = 0
+    REQ_TEMPERATURE = 25
+
+
+def pack_star_tracker_commands_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Generate command for star tracker with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Ping"))
+        command = pack_ping_command(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+
+def pack_ping_command(object_id: bytearray) -> bytearray:
+    data = int(input("Specify ping data: "))
+    command = bytearray()
+    command = object_id + struct.pack('!I', StarTrackerActionIds.PING)
+    command = command + struct.pack('!I', data)
+    return command
--- 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
@ -12,12 +8,12 @@ from tmtccmd.config.definitions import CoreServiceList
 from tmtccmd.utility.logger import get_console_logger
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_5_event import pack_generic_service5_test_into
-from tmtccmd.tc.service_17_test import pack_service17_ping_command
+from tmtccmd.pus.service_17_test import pack_service_17_ping_command

 from pus_tc.service_200_mode import pack_service200_test_into
 from pus_tc.p60dock import pack_p60dock_test_into
-from pus_tc.pdu2 import pack_pdu2_test_into
-from pus_tc.pdu1 import pack_pdu1_test_into
+from pus_tc.pdu2 import pack_pdu2_commands
+from pus_tc.pdu1 import pack_pdu1_commands
 from pus_tc.acu import pack_acu_test_into
 from pus_tc.imtq import pack_imtq_test_into
 from pus_tc.tmp1075 import pack_tmp1075_test_into
@ -27,11 +23,18 @@ from pus_tc.heater import pack_heater_test_into
 from pus_tc.reaction_wheels import pack_single_rw_test_into
 from pus_tc.rad_sensor import pack_rad_sensor_test_into
 from pus_tc.ploc_upater import pack_ploc_updater_test_into
+from pus_tc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
+from pus_tc.ccsds_handler import pack_ccsds_handler_test
 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, PLOC_MPSOC_ID, RW1_ID, RW2_ID, RW3_ID, RW4_ID, \
-    RAD_SENSOR_ID, PLOC_SUPV_ID, PLOC_UPDATER_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, CCSDS_HANDLER_ID, \
+    PDEC_HANDLER_ID


 LOGGER = get_console_logger()
@ -41,24 +44,18 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
    if service == CoreServiceList.SERVICE_5.value:
        return pack_generic_service5_test_into(tc_queue=service_queue)
    if service == CoreServiceList.SERVICE_17.value:
-        return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
+        return service_queue.appendleft(pack_service_17_ping_command(ssc=1700).pack_command_tuple())
    if service == CoreServiceList.SERVICE_200.value:
        return pack_service200_test_into(tc_queue=service_queue)
    if service == CustomServiceList.P60DOCK.value:
        object_id = P60_DOCK_HANDLER
-        return pack_p60dock_test_into(object_id=object_id, tc_queue=service_queue)
+        return pack_p60dock_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
    if service == CustomServiceList.PDU1.value:
-        pdu1_object_id = PDU_1_HANDLER_ID
-        p60dock_object_id = P60_DOCK_HANDLER
-        return pack_pdu1_test_into(
-            pdu1_object_id=pdu1_object_id, p60dock_object_id=p60dock_object_id, tc_queue=service_queue
-        )
+        object_id = PDU_1_HANDLER_ID
+        return pack_pdu1_commands(object_id=object_id, tc_queue=service_queue, op_code=op_code)
    if service == CustomServiceList.PDU2.value:
-        pdu2_object_id = PDU_2_HANDLER_ID
-        p60dock_object_id = P60_DOCK_HANDLER
-        return pack_pdu2_test_into(
-            pdu2_object_id=pdu2_object_id, p60dock_object_id=p60dock_object_id, tc_queue=service_queue
-        )
+        object_id = PDU_2_HANDLER_ID
+        return pack_pdu2_commands(object_id=object_id, tc_queue=service_queue, op_code=op_code)
    if service == CustomServiceList.ACU.value:
        object_id = ACU_HANDLER_ID
        return pack_acu_test_into(object_id=object_id, tc_queue=service_queue)
@ -91,15 +88,41 @@ 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
+        )
    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
+        )
+    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:
+        return pack_gps_command(object_id=GPS_HANDLER_1_ID, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.CCSDS_HANDLER.value:
+        return pack_ccsds_handler_test(object_id=CCSDS_HANDLER_ID, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.PDEC_HANDLER.value:
+        return pack_ccsds_handler_test(object_id=PDEC_HANDLER_ID, tc_queue=service_queue, op_code=op_code)
    LOGGER.warning("Invalid Service !")


@ -108,5 +131,5 @@ def create_total_tc_queue_user() -> TcQueueT:
        os.mkdir("log")
    tc_queue = deque()
    pack_generic_service5_test_into(tc_queue)
-    tc_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
+    tc_queue.appendleft(pack_service_17_ping_command(ssc=1700).pack_command_tuple())
    return tc_queue
--- a/pus_tc/tmp1075.py
+++ b/pus_tc/tmp1075.py
@ -8,7 +8,7 @@
 from tmtccmd.config.definitions import QueueCommands

 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.ecss.tc import PusTelecommand
+from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data


--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@ -4,13 +4,13 @@
            it to your needs.
 """
 from tmtccmd.tm.service_8_functional_cmd import Service8TM
-from tmtccmd.ecss.tm import PusTelemetry
+from spacepackets.ecss.tm import PusTelemetry
 from tmtccmd.utility.logger import get_console_logger

-from tmtccmd.tm.service_1_verification import Service1TM
+from tmtccmd.pus.service_1_verification import Service1TMExtended
+from tmtccmd.pus.service_17_test import Service17TMExtended
 from tmtccmd.tm.service_3_housekeeping import Service3TM
 from tmtccmd.tm.service_5_event import Service5TM
-from tmtccmd.tm.service_17_test import Service17TM
 from tmtccmd.utility.tmtc_printer import TmTcPrinter

 from config.definitions import PUS_APID
@ -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 = Service1TMExtended.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 = Service17TMExtended.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)
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@ -1,40 +1,22 @@
-"""
-@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
+import os
+import datetime
 from typing import Tuple

 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.
+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:
        if set_id == SetIds.RX_REGISTERS_DATASET:
@ -50,6 +32,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 +74,21 @@ 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 +134,65 @@ def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, in
    fina_coil_y_temperature = struct.unpack('!H', hk_data[125:127])[0]
    fina_coil_z_temperature = struct.unpack('!H', hk_data[127:129])[0]

-    hk_content = [init_err, init_raw_mag_x, init_raw_mag_y, init_raw_mag_z, init_cal_mag_x, init_cal_mag_y,
-                  init_cal_mag_z, init_coil_x_current, init_coil_y_current, init_coil_z_current,
-                  init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err, raw_mag_x,
-                  init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z, coil_x_current, coil_y_current,
-                  coil_z_current, coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err, fina_raw_mag_x,
-                  fina_raw_mag_y, fina_raw_mag_z, fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z, fina_coil_x_current,
-                  fina_coil_y_current, fina_coil_z_current, fina_coil_x_temperature, fina_coil_y_temperature,
-                  fina_coil_z_temperature]
+    hk_content = [
+        init_err, init_raw_mag_x, init_raw_mag_y, init_raw_mag_z, init_cal_mag_x, init_cal_mag_y,
+        init_cal_mag_z, init_coil_x_current, init_coil_y_current, init_coil_z_current,
+        init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err,
+        raw_mag_x, init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z,
+        coil_x_current, coil_y_current, coil_z_current,
+        coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err,
+        fina_raw_mag_x, fina_raw_mag_y, fina_raw_mag_z,
+        fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z,
+        fina_coil_x_current, fina_coil_y_current, fina_coil_z_current,
+        fina_coil_x_temperature, fina_coil_y_temperature, fina_coil_z_temperature
+    ]

    return hk_header, hk_content, validity_buffer, len(hk_header)
+
+
+def handle_gps_data(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
+    LOGGER.info(f'Received GPS data, HK data length {len(hk_data)}')
+    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')
+    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
--- a/1
+++ b/1
--- a/tmtc_client_cli.py
+++ b/tmtc_client_cli.py
@ -27,26 +27,43 @@ limitations under the License.
@author     R. Mueller
 """
 import sys
+try:
+    from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler
+    from tmtccmd.ccsds.handler import CcsdsTmHandler
+    from tmtccmd.utility.logger import TMTC_LOGGER_NAME
+except ImportError as error:
+    run_tmtc_commander = None
+    initialize_tmtc_commander = None
+    print(error)
+    print('Python tmtccmd submodule could not be imported')
+    print(
+        'Install with \"cd tmtccmd && python3 -m pip '
+        'install -e .[gui]\" for interactive installation'
+    )
+    sys.exit(1)
+
+try:
+    import spacepackets
+    from spacepackets.log import set_custom_console_logger_name
+except ImportError as error:
+    print(error)
+    print('Python spacepackets module could not be imported')
+    print(
+        'Install with \"cd spacepackets && python3 -m pip intall -e .\" for interative installation'
+    )
+    sys.exit(1)

 from config.hook_implementations import EiveHookObject
 from config.version import __version__
 from config.definitions import PUS_APID
 from pus_tm.factory_hook import ccsds_tm_handler
-try:
-    from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler
-    from tmtccmd.ccsds.handler import CcsdsTmHandler
-except ImportError as error:
-    run_tmtc_commander = None
-    initialize_tmtc_commander = None
-    print(error)
-    print("Python tmtccmd submodule could not be imported")
-    print("Install with \"cd tmtccmd && python3 -m pip install -e .\" for interactive installation")
-    sys.exit(0)


 def main():
    hook_obj = EiveHookObject()
-    print(f"-- eive tmtc version {__version__}")
+    print(f'-- eive tmtc version {__version__} --')
+    print(f'-- spacepackets version {spacepackets.__version__} --')
+    set_custom_console_logger_name(logger_name=TMTC_LOGGER_NAME)
    initialize_tmtc_commander(hook_object=hook_obj)
    ccsds_handler = CcsdsTmHandler()
    ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50)
--- a/tmtc_client_gui.py
+++ b/tmtc_client_gui.py
@ -35,6 +35,7 @@ from pus_tm.factory_hook import ccsds_tm_handler
 try:
    from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler
    from tmtccmd.ccsds.handler import CcsdsTmHandler
+    import spacepackets
 except ImportError as error:
    run_tmtc_commander = None
    initialize_tmtc_commander = None
@ -47,6 +48,7 @@ except ImportError as error:
 def main():
    hook_obj = EiveHookObject()
    print(f"-- eive tmtc version {__version__}")
+    print(f'-- spacepackets version {spacepackets.__version__} --')
    initialize_tmtc_commander(hook_object=hook_obj)
    ccsds_handler = CcsdsTmHandler()
    ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50)
--- a/2
+++ b/2
Author	SHA1	Message	Date
Robin Mueller	f6a3f79220	update submodules	2021-12-15 09:55:43 +01:00
Robin Müller	1d374230b3	Merge pull request 'meier/ccsds' (#28 ) from meier/ccsds into develop Reviewed-on: #28	2021-11-24 18:45:10 +01:00
Jakob Meier	aabbb129a6	Merge branch 'develop' into meier/ccsds	2021-11-24 15:56:57 +01:00
Jakob Meier	904dc74075	commands for ccsds and pdec handler	2021-11-24 15:56:25 +01:00
Robin Mueller	46d7a15edf	Merge branch 'mueller/master' into develop	2021-11-19 16:54:58 +01:00
Robin Mueller	15ee13fa99	tmtccmd update	2021-11-19 16:54:44 +01:00
Robin Mueller	9068ebbfc0	Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master	2021-11-19 13:22:14 +01:00
Robin Mueller	6209bcc71e	spacepackets update	2021-11-19 13:21:58 +01:00
Robin Mueller	28082dca88	renamed command, update spacepackets	2021-11-18 18:53:39 +01:00
Robin Mueller	edcaf2e9c3	submodule updates	2021-10-18 18:15:26 +02:00
Jakob.Meier	223ef1b833	Merge pull request 'TCS Board Command' (#27 ) from mueller/tcs-board-cmd into develop Reviewed-on: #27	2021-10-13 17:08:59 +02:00
Robin Müller	8c05b4127b	Merge branch 'develop' into mueller/tcs-board-cmd	2021-10-13 15:47:16 +02:00
Robin Mueller	b2cc2354d4	submodule updates	2021-10-13 13:19:52 +02:00
Robin Mueller	72653e7f57	submodule updates	2021-10-13 12:48:11 +02:00
Robin Mueller	5976e65735	higher timeout for pdu1 cmd	2021-10-12 18:24:45 +02:00
Robin Mueller	423f1fbb2c	added tcs board commands	2021-10-12 17:50:20 +02:00
Robin Mueller	56f1ca2ef8	spacepackets update	2021-10-12 16:29:17 +02:00
Robin Mueller	ae5a788f49	submodule update	2021-10-12 09:59:02 +02:00
Robin Mueller	4325b8ccaa	spacepackets update	2021-10-11 17:08:54 +02:00
Jakob.Meier	fc60231575	Merge pull request 'Update tmtc' (#26 ) from mueller/master into develop Reviewed-on: #26	2021-10-11 11:36:06 +02:00
Robin Müller	28429e3382	Merge branch 'develop' into mueller/master	2021-10-11 11:25:06 +02:00
Robin Mueller	7b49babb1f	spacepackets update	2021-10-11 10:25:29 +02:00
Robin Mueller	56717935e6	spacepackets update	2021-10-09 13:24:57 +02:00
Robin Mueller	ed7188e2ba	check both imports	2021-10-06 18:19:23 +02:00
Robin Mueller	726935f77b	set custom logger	2021-10-06 18:00:34 +02:00
Jakob.Meier	1a17658288	Merge pull request 'TMTC Update' (#25 ) from mueller/tmtc-update into develop Reviewed-on: #25	2021-10-06 17:48:49 +02:00
Robin Mueller	3b2caa7326	update spacepackets and tmtccmd	2021-10-05 12:23:28 +02:00
Robin Mueller	706f79a1f2	submodule updates	2021-10-05 01:28:12 +02:00
Robin Mueller	6d442f47e6	slight adaption of tmtccmd	2021-10-05 00:52:12 +02:00
Robin Mueller	ba866a5f0a	updated submodules	2021-10-04 11:30:30 +02:00
Robin Mueller	12a4a52d54	printing out version string of spacepackets	2021-10-04 10:06:40 +02:00
Robin Mueller	ee780738f9	fixed for updated core	2021-10-04 10:03:28 +02:00
Robin Mueller	47dbb62ebb	submodule updates	2021-10-04 09:58:09 +02:00
Robin Mueller	90865496f5	changes in submodules	2021-10-04 01:33:03 +02:00
Robin Mueller	38e00b405a	bumped submodules	2021-10-02 13:32:13 +02:00
Robin Mueller	28ab1316ce	added spacepackets submodule	2021-10-02 12:17:21 +02:00
Robin Mueller	d968bb9125	updated includes	2021-10-01 10:55:56 +02:00
Jakob.Meier	62052c0d6c	Merge pull request 'Update tmtccmd' (#24 ) from mueller/master into develop Reviewed-on: #24	2021-09-29 15:46:15 +02:00
Robin Müller	f065f11f52	Merge branch 'develop' into mueller/master	2021-09-29 12:51:33 +02:00
Robin Mueller	4bf23fb764	tmtccmd update	2021-09-29 12:31:13 +02:00
Robin Mueller	af1e83cd66	update tmtccmd	2021-09-29 12:30:52 +02:00
Robin Mueller	82495ad785	tmtccmd update	2021-09-28 10:58:54 +02:00
Jakob.Meier	bad6a42af7	Merge pull request 'Rework switch / Voltage / Current commands' (#23 ) from mueller/rework-switch-cmds into develop Reviewed-on: #23	2021-09-24 17:29:04 +02:00
Robin Müller	d59433b66f	Merge branch 'develop' into mueller/rework-switch-cmds	2021-09-20 13:16:57 +02:00
Robin Mueller	53bf650838	p60 print command	2021-09-20 11:47:04 +02:00
Robin Mueller	f3a2e755fd	cleaned up PDU1 print commands	2021-09-20 11:21:53 +02:00
Robin Mueller	58da80cb9e	typo	2021-09-17 16:52:51 +02:00
Robin Mueller	3f29dff606	added stubs for new commands	2021-09-17 13:06:53 +02:00
Robin Mueller	a5d9fedc64	bugfix	2021-09-16 17:24:50 +02:00
Robin Mueller	5c65390a8b	fix for new commands	2021-09-16 15:00:16 +02:00
Robin Mueller	6da94c73d0	more print commands for PCDU	2021-09-16 14:51:24 +02:00
Jakob.Meier	9cdba610cd	Merge pull request 'More Switch Commands' (#22 ) from mueller/update-tmtc into develop Reviewed-on: #22	2021-09-16 14:11:11 +02:00
Robin Mueller	9d1cae0809	minor fix	2021-09-16 11:50:25 +02:00
Robin Mueller	b3bc1fe28c	fixes for new commands	2021-09-15 18:48:28 +02:00
Jakob Meier	dff569e93f	fixed merge conflicts	2021-09-15 15:09:13 +02:00
Jakob.Meier	ef2bfe3347	Merge pull request 'Update tmtccmd' (#21 ) from mueller/master into develop Reviewed-on: #21	2021-09-15 14:59:38 +02:00
Jakob Meier	b0c0a186a0	commands to switch on/off sus nominal, sus redundant and reaction wheels	2021-09-15 14:16:44 +02:00
Robin Mueller	d9968031d6	object ids cleaned up	2021-09-13 18:06:25 +02:00
Robin Mueller	90f85b7dae	gps run configs	2021-09-08 18:11:46 +02:00
Robin Mueller	cce04cc163	tmtccmd update	2021-09-08 16:03:01 +02:00
Robin Mueller	2f6681e3a0	somethings now working	2021-09-08 14:47:33 +02:00
Robin Mueller	27e5e6c7ae	removed unused parameters	2021-09-08 14:34:09 +02:00
Robin Mueller	b2feb05fa9	disable read temp test by default	2021-09-08 13:43:47 +02:00
Robin Mueller	d84c6a7e70	pdu1 timeout lower	2021-09-08 13:40:06 +02:00
Robin Mueller	b1e89d4046	added GPS command	2021-09-08 13:20:22 +02:00
Robin Mueller	eb8d52607b	improvement	2021-09-07 16:10:40 +02:00
Robin Mueller	96346461b4	format stuff	2021-09-07 15:45:05 +02:00
Robin Mueller	abe71c0206	introduced print switch command	2021-09-07 14:51:50 +02:00
Robin Mueller	0360f62534	ignore gps log	2021-09-07 13:28:36 +02:00
Robin Mueller	90b42e7de1	tmtccmd update to v1.8.0	2021-09-07 09:45:35 +02:00
Robin Mueller	246a5eef5f	updaste submodule URL	2021-09-06 20:00:02 +02:00
Robin Mueller	c72eabca3e	update tmtccmd	2021-09-06 19:58:39 +02:00
Robin Mueller	4e4d69f6d6	export gps to logger	2021-09-06 18:26:56 +02:00
Robin Mueller	0f09809d21	HK handling for GPS packet added	2021-09-06 14:52:41 +02:00
Robin Mueller	b04a3361e7	form stuff	2021-09-06 13:17:23 +02:00
Robin Mueller	9e15d2bce2	.xml file fixes	2021-09-06 11:34:55 +02:00
Robin Mueller	03d0cf6e09	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-09-06 11:12:20 +02:00
Robin Müller	48d781aaf1	Merge pull request 'commands for ploc memory dumper' (#20 ) from meier/plocMemoryDumper into develop Reviewed-on: #20	2021-09-02 09:17:59 +02:00
Jakob.Meier	9b176aebfa	commands for ploc memory dumper	2021-08-31 11:17:01 +02:00
Robin Mueller	d2093dca5e	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-20 15:12:07 +02:00
Robin Müller	ce5596f566	Merge pull request 'meier/plocUpdater' (#19 ) from meier/plocUpdater into develop Reviewed-on: #19	2021-08-20 09:42:14 +02:00
Robin Müller	ccf38bbbef	Merge branch 'develop' into meier/plocUpdater	2021-08-20 09:40:46 +02:00
Jakob.Meier	a0d586d753	supervisor update commanding	2021-08-20 08:40:18 +02:00
Robin Mueller	a7f1ed904c	Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master	2021-08-19 17:03:18 +02:00
Robin Mueller	28c2d2015c	tmtccmd update	2021-08-19 10:16:40 +02:00
Jakob.Meier	c125a62612	ploc commanding tcp	2021-08-18 08:27:07 +02:00
IRS Cleanroom Laptop	261eef449e	updated object ID	2021-08-17 19:48:55 +02:00
Robin Müller	573d2dca52	Merge pull request 'meier/pcduSwitchCommanding' (#18 ) from meier/pcduSwitchCommanding into develop Reviewed-on: #18	2021-08-17 17:04:04 +02:00
IRS Cleanroom Laptop	28e527b8f9	lowered timeout	2021-08-17 16:35:27 +02:00
IRS Cleanroom Laptop	5c60914638	tmtccmd update	2021-08-17 16:07:22 +02:00
IRS Cleanroom Laptop	72b743f5ee	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-17 16:07:10 +02:00
Jakob.Meier	5b2ff49555	fixed 3v3 switch double off	2021-08-17 11:55:38 +02:00
Jakob.Meier	5574fe91c7	turn on stack 3V3	2021-08-17 11:49:37 +02:00
Jakob.Meier	84485a245b	turn acs board side A on	2021-08-17 10:37:13 +02:00
Robin Mueller	0a2f1b3feb	removed some functions	2021-08-16 14:20:22 +02:00
Jakob.Meier	95c5aa46d9	star tracker ping command	2021-08-16 10:03:40 +02:00
Jakob.Meier	950adf36ed	op_code to turn star tracker and sus nominal off	2021-08-13 09:34:44 +02:00
Jakob.Meier	e5dc68c819	turn sus nominal on	2021-08-12 17:17:28 +02:00
Jakob.Meier	30bb3c8778	pdu2 star tracker switch on	2021-08-12 15:07:03 +02:00
Robin Mueller	387a076a21	printing length as well	2021-08-11 19:32:51 +02:00
Robin Mueller	25f8543a8d	need to return something as well	2021-08-11 19:26:40 +02:00
Robin Mueller	5713bf0806	gps data handler function	2021-08-11 19:16:08 +02:00
Jakob.Meier	c7f5db0f53	op_code fix	2021-08-11 17:14:30 +02:00
Jakob.Meier	0c99bc9d11	star tracker on command	2021-08-11 16:49:32 +02:00
Robin Mueller	84656b90fc	tmtccmd update	2021-08-11 15:52:56 +02:00