diff --git a/.gitignore b/.gitignore
index cc672c2..0e1a63e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,7 @@
 __pycache__
+/.idea
+/venv
+
 log
 /gps_log.txt
-
-.idea/*
-!.idea/runConfigurations
-
-*.json
-
-/venv
+/config/*.json
diff --git a/.idea/runConfigurations/S_A_Deployment_Test_UDP.xml b/.idea/runConfigurations/S_A_Deployment_Test_UDP.xml
deleted file mode 100644
index 3a73221..0000000
--- a/.idea/runConfigurations/S_A_Deployment_Test_UDP.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="S/A Deployment Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-m 3 -c 2 -s SA_DEPL -l" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Syrlinks.xml b/.idea/runConfigurations/Syrlinks.xml
deleted file mode 100644
index 3e1f604..0000000
--- a/.idea/runConfigurations/Syrlinks.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Syrlinks" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\AppData\Local\Programs\Python\Python39\python.exe" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <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 syrlinks -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>
\ No newline at end of file
diff --git a/.idea/runConfigurations/ACU.xml b/.run/ACU.run.xml
similarity index 100%
rename from .idea/runConfigurations/ACU.xml
rename to .run/ACU.run.xml
diff --git a/.idea/runConfigurations/BPX.xml b/.run/BPX.run.xml
similarity index 100%
rename from .idea/runConfigurations/BPX.xml
rename to .run/BPX.run.xml
diff --git a/.idea/runConfigurations/BPX_Request_HK.xml b/.run/BPX_Request_HK.run.xml
similarity index 100%
rename from .idea/runConfigurations/BPX_Request_HK.xml
rename to .run/BPX_Request_HK.run.xml
diff --git a/.idea/runConfigurations/BPX_Reset_Reboot_Counter.xml b/.run/BPX_Reset_Reboot_Counter.run.xml
similarity index 100%
rename from .idea/runConfigurations/BPX_Reset_Reboot_Counter.xml
rename to .run/BPX_Reset_Reboot_Counter.run.xml
diff --git a/.idea/runConfigurations/GPS_0.xml b/.run/GPS_0.run.xml
similarity index 100%
rename from .idea/runConfigurations/GPS_0.xml
rename to .run/GPS_0.run.xml
diff --git a/.idea/runConfigurations/GPS_1.xml b/.run/GPS_1.run.xml
similarity index 100%
rename from .idea/runConfigurations/GPS_1.xml
rename to .run/GPS_1.run.xml
diff --git a/.idea/runConfigurations/Heater_Test.xml b/.run/Heater_Test.run.xml
similarity index 93%
rename from .idea/runConfigurations/Heater_Test.xml
rename to .run/Heater_Test.run.xml
index 8336926..65618ba 100644
--- a/.idea/runConfigurations/Heater_Test.xml
+++ b/.run/Heater_Test.run.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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-m 3 -c 2 -s HEATER -l" />
+    <option name="PARAMETERS" value="-s heater -o 0 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/IMTQ_Get_Commanded_Dipole.xml b/.run/IMTQ_Get_Commanded_Dipole.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Get_Commanded_Dipole.xml
rename to .run/IMTQ_Get_Commanded_Dipole.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Neg_X_Test.xml b/.run/IMTQ_Neg_X_Test.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Neg_X_Test.xml
rename to .run/IMTQ_Neg_X_Test.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Neg_Y_Test.xml b/.run/IMTQ_Neg_Y_Test.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Neg_Y_Test.xml
rename to .run/IMTQ_Neg_Y_Test.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Neg_Z_Test.xml b/.run/IMTQ_Neg_Z_Test.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Neg_Z_Test.xml
rename to .run/IMTQ_Neg_Z_Test.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Pos_X_Test.xml b/.run/IMTQ_Pos_X_Test.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Pos_X_Test.xml
rename to .run/IMTQ_Pos_X_Test.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Pos_Y_Test.xml b/.run/IMTQ_Pos_Y_Test.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Pos_Y_Test.xml
rename to .run/IMTQ_Pos_Y_Test.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Pos_Z_Test.xml b/.run/IMTQ_Pos_Z_Test.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Pos_Z_Test.xml
rename to .run/IMTQ_Pos_Z_Test.run.xml
diff --git a/.idea/runConfigurations/IMTQ_Test_UDP.xml b/.run/IMTQ_Test_UDP.run.xml
similarity index 100%
rename from .idea/runConfigurations/IMTQ_Test_UDP.xml
rename to .run/IMTQ_Test_UDP.run.xml
diff --git a/.idea/runConfigurations/P60_Dock_Commanding.xml b/.run/P60_Dock_Commanding.run.xml
similarity index 100%
rename from .idea/runConfigurations/P60_Dock_Commanding.xml
rename to .run/P60_Dock_Commanding.run.xml
diff --git a/.idea/runConfigurations/PDU1_Commanding.xml b/.run/PDU1_Commanding.run.xml
similarity index 93%
rename from .idea/runConfigurations/PDU1_Commanding.xml
rename to .run/PDU1_Commanding.run.xml
index 45f209a..28f9c0d 100644
--- a/.idea/runConfigurations/PDU1_Commanding.xml
+++ b/.run/PDU1_Commanding.run.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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s pdu1 -l -t 6" />
+    <option name="PARAMETERS" value="-s pdu1 -t 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/PDU2_Commanding.xml b/.run/PDU2_Commanding.run.xml
similarity index 100%
rename from .idea/runConfigurations/PDU2_Commanding.xml
rename to .run/PDU2_Commanding.run.xml
diff --git a/.run/PLOC_MPSoC.run.xml b/.run/PLOC_MPSoC.run.xml
new file mode 100644
index 0000000..e58826d
--- /dev/null
+++ b/.run/PLOC_MPSoC.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC MPSoC" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
+    <option name="PARAMETERS" value="-s ploc_mpsoc -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>
\ No newline at end of file
diff --git a/.run/PLOC_SUPV.run.xml b/.run/PLOC_SUPV.run.xml
new file mode 100644
index 0000000..e9877dc
--- /dev/null
+++ b/.run/PLOC_SUPV.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
+    <option name="PARAMETERS" value="-s ploc_supv -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>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Ping_Command.xml b/.run/Ping_Command.run.xml
similarity index 100%
rename from .idea/runConfigurations/Ping_Command.xml
rename to .run/Ping_Command.run.xml
diff --git a/.idea/runConfigurations/RW1_Test.xml b/.run/RW1_Test.run.xml
similarity index 87%
rename from .idea/runConfigurations/RW1_Test.xml
rename to .run/RW1_Test.run.xml
index 82237a4..fe1186c 100644
--- a/.idea/runConfigurations/RW1_Test.xml
+++ b/.run/RW1_Test.run.xml
@@ -13,9 +13,9 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-c udp -s reaction_wheel_1 -l -t 8 --hk" />
+    <option name="PARAMETERS" value="-s reaction_wheel_1 -l -t 8 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" 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="" />
diff --git a/.idea/runConfigurations/RW2_Test_.xml b/.run/RW2_Test_.run.xml
similarity index 87%
rename from .idea/runConfigurations/RW2_Test_.xml
rename to .run/RW2_Test_.run.xml
index 64abfd1..b03dd54 100644
--- a/.idea/runConfigurations/RW2_Test_.xml
+++ b/.run/RW2_Test_.run.xml
@@ -13,9 +13,9 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-c udp -s reaction_wheel_2 -l -t 6 --hk" />
+    <option name="PARAMETERS" value="-s reaction_wheel_2 -l -t 6 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" 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="" />
diff --git a/.idea/runConfigurations/RW3_Test_.xml b/.run/RW3_Test_.run.xml
similarity index 87%
rename from .idea/runConfigurations/RW3_Test_.xml
rename to .run/RW3_Test_.run.xml
index 3037211..a5f9530 100644
--- a/.idea/runConfigurations/RW3_Test_.xml
+++ b/.run/RW3_Test_.run.xml
@@ -13,9 +13,9 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-c udp -s reaction_wheel_3 -l -t 6 --hk" />
+    <option name="PARAMETERS" value="-s reaction_wheel_3 -l -t 6 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" 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="" />
diff --git a/.idea/runConfigurations/RW4_Test_.xml b/.run/RW4_Test_.run.xml
similarity index 87%
rename from .idea/runConfigurations/RW4_Test_.xml
rename to .run/RW4_Test_.run.xml
index e188563..83f1612 100644
--- a/.idea/runConfigurations/RW4_Test_.xml
+++ b/.run/RW4_Test_.run.xml
@@ -13,9 +13,9 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-c udp -s reaction_wheel_4 -l -t 12 --hk" />
+    <option name="PARAMETERS" value="-s reaction_wheel_4 -l -t 12 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" 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="" />
diff --git a/.idea/runConfigurations/Reboot_0_0.xml b/.run/Reboot_0_0.run.xml
similarity index 100%
rename from .idea/runConfigurations/Reboot_0_0.xml
rename to .run/Reboot_0_0.run.xml
diff --git a/.idea/runConfigurations/Reboot_0_1.xml b/.run/Reboot_0_1.run.xml
similarity index 100%
rename from .idea/runConfigurations/Reboot_0_1.xml
rename to .run/Reboot_0_1.run.xml
diff --git a/.idea/runConfigurations/Reboot_1_0.xml b/.run/Reboot_1_0.run.xml
similarity index 100%
rename from .idea/runConfigurations/Reboot_1_0.xml
rename to .run/Reboot_1_0.run.xml
diff --git a/.idea/runConfigurations/Reboot_1_1.xml b/.run/Reboot_1_1.run.xml
similarity index 100%
rename from .idea/runConfigurations/Reboot_1_1.xml
rename to .run/Reboot_1_1.run.xml
diff --git a/.idea/runConfigurations/Reboot_Prompt.xml b/.run/Reboot_Prompt.run.xml
similarity index 100%
rename from .idea/runConfigurations/Reboot_Prompt.xml
rename to .run/Reboot_Prompt.run.xml
diff --git a/.idea/runConfigurations/Reboot_Self.xml b/.run/Reboot_Self.run.xml
similarity index 100%
rename from .idea/runConfigurations/Reboot_Self.xml
rename to .run/Reboot_Self.run.xml
diff --git a/.idea/runConfigurations/PLOC_Test_UDP_Local.xml b/.run/S_A_Deployment_Test.run.xml
similarity index 87%
rename from .idea/runConfigurations/PLOC_Test_UDP_Local.xml
rename to .run/S_A_Deployment_Test.run.xml
index 65d59e9..8b8caa3 100644
--- a/.idea/runConfigurations/PLOC_Test_UDP_Local.xml
+++ b/.run/S_A_Deployment_Test.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PLOC Test UDP Local" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="S/A Deployment Test" 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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s PLOC -l" />
+    <option name="PARAMETERS" value="-s sa_depl -o 0 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/Star_Tracker.xml b/.run/Star_Tracker.run.xml
similarity index 100%
rename from .idea/runConfigurations/Star_Tracker.xml
rename to .run/Star_Tracker.run.xml
diff --git a/.run/Syrlinks.run.xml b/.run/Syrlinks.run.xml
new file mode 100644
index 0000000..d5a3454
--- /dev/null
+++ b/.run/Syrlinks.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Syrlinks" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
+    <option name="PARAMETERS" value="-s syrlinks -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>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Syrlinks_Test_UDP.xml b/.run/Syrlinks_Test_UDP.run.xml
similarity index 100%
rename from .idea/runConfigurations/Syrlinks_Test_UDP.xml
rename to .run/Syrlinks_Test_UDP.run.xml
diff --git a/.idea/runConfigurations/TMP1075_1_Dock_Test_UDP.xml b/.run/TMP1075_1_Dock_Test_UDP.run.xml
similarity index 100%
rename from .idea/runConfigurations/TMP1075_1_Dock_Test_UDP.xml
rename to .run/TMP1075_1_Dock_Test_UDP.run.xml
diff --git a/.idea/runConfigurations/TMP1075_2_Dock_Test_UDP.xml b/.run/TMP1075_2_Dock_Test_UDP.run.xml
similarity index 100%
rename from .idea/runConfigurations/TMP1075_2_Dock_Test_UDP.xml
rename to .run/TMP1075_2_Dock_Test_UDP.run.xml
diff --git a/.idea/runConfigurations/Unittests_in_spacepackets.xml b/.run/Unittests_in_spacepackets.run.xml
similarity index 100%
rename from .idea/runConfigurations/Unittests_in_spacepackets.xml
rename to .run/Unittests_in_spacepackets.run.xml
diff --git a/.idea/runConfigurations/Unittests_in_tmtccmd.xml b/.run/Unittests_in_tmtccmd.run.xml
similarity index 97%
rename from .idea/runConfigurations/Unittests_in_tmtccmd.xml
rename to .run/Unittests_in_tmtccmd.run.xml
index f6549f0..5cdbb08 100644
--- a/.idea/runConfigurations/Unittests_in_tmtccmd.xml
+++ b/.run/Unittests_in_tmtccmd.run.xml
@@ -4,7 +4,7 @@
     <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="WORKING_DIRECTORY" value="$PROJECT_DIR$/tmtccmd/src/tests" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
diff --git a/.idea/runConfigurations/_IMTQ_Command_Dipole.xml b/.run/_IMTQ_Command_Dipole.run.xml
similarity index 100%
rename from .idea/runConfigurations/_IMTQ_Command_Dipole.xml
rename to .run/_IMTQ_Command_Dipole.run.xml
diff --git a/.idea/runConfigurations/ccsds_handler.xml b/.run/ccsds_handler.run.xml
similarity index 81%
rename from .idea/runConfigurations/ccsds_handler.xml
rename to .run/ccsds_handler.run.xml
index 7c6d714..5e506bb 100644
--- a/.idea/runConfigurations/ccsds_handler.xml
+++ b/.run/ccsds_handler.run.xml
@@ -6,16 +6,16 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
     <option name="PARAMETERS" value="-s ccsds_handler -l -t 8 --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" 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="" />
diff --git a/.idea/runConfigurations/pdec_handler.xml b/.run/pdec_handler.run.xml
similarity index 86%
rename from .idea/runConfigurations/pdec_handler.xml
rename to .run/pdec_handler.run.xml
index 5a2f222..cedb49e 100644
--- a/.idea/runConfigurations/pdec_handler.xml
+++ b/.run/pdec_handler.run.xml
@@ -6,9 +6,9 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
diff --git a/.idea/runConfigurations/tmtcc_Service_17.xml b/.run/tmtcc_Service_17.run.xml
similarity index 94%
rename from .idea/runConfigurations/tmtcc_Service_17.xml
rename to .run/tmtcc_Service_17.run.xml
index 92a9e47..01536e7 100644
--- a/.idea/runConfigurations/tmtcc_Service_17.xml
+++ b/.run/tmtcc_Service_17.run.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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s 17 -t 3 -l" />
+    <option name="PARAMETERS" value="-s 17 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcc_Service_2.xml b/.run/tmtcc_Service_2.run.xml
similarity index 100%
rename from .idea/runConfigurations/tmtcc_Service_2.xml
rename to .run/tmtcc_Service_2.run.xml
diff --git a/.idea/runConfigurations/tmtcc_Service_200.xml b/.run/tmtcc_Service_200.run.xml
similarity index 100%
rename from .idea/runConfigurations/tmtcc_Service_200.xml
rename to .run/tmtcc_Service_200.run.xml
diff --git a/.idea/runConfigurations/tmtcc_Service_3.xml b/.run/tmtcc_Service_3.run.xml
similarity index 100%
rename from .idea/runConfigurations/tmtcc_Service_3.xml
rename to .run/tmtcc_Service_3.run.xml
diff --git a/.idea/runConfigurations/tmtcc_Service_8.xml b/.run/tmtcc_Service_8.run.xml
similarity index 100%
rename from .idea/runConfigurations/tmtcc_Service_8.xml
rename to .run/tmtcc_Service_8.run.xml
diff --git a/.idea/runConfigurations/tmtcclient_CLI.xml b/.run/tmtccli.run.xml
similarity index 89%
rename from .idea/runConfigurations/tmtcclient_CLI.xml
rename to .run/tmtccli.run.xml
index 08531e2..1b4b29b 100644
--- a/.idea/runConfigurations/tmtcclient_CLI.xml
+++ b/.run/tmtccli.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient CLI" type="PythonConfigurationType" factoryName="Python">
+  <configuration default="false" name="tmtccli" type="PythonConfigurationType" factoryName="Python">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/PLOC_Test_UDP_Flatsat.xml b/.run/tmtccli_example.run.xml
similarity index 70%
rename from .idea/runConfigurations/PLOC_Test_UDP_Flatsat.xml
rename to .run/tmtccli_example.run.xml
index 688bd6b..4760217 100644
--- a/.idea/runConfigurations/PLOC_Test_UDP_Flatsat.xml
+++ b/.run/tmtccli_example.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PLOC Test UDP Flatsat" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="tmtccli-example" type="PythonConfigurationType" factoryName="Python" folderName="Example">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -7,13 +7,13 @@
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tmtccmd/examples" />
     <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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-m 1 -c 2 -s PLOC -l" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccmd/examples/tmtccli.py" />
+    <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
diff --git a/.idea/runConfigurations/tmtcclient_Help.xml b/.run/tmtcclient_Help.run.xml
similarity index 100%
rename from .idea/runConfigurations/tmtcclient_Help.xml
rename to .run/tmtcclient_Help.run.xml
diff --git a/.idea/runConfigurations/tmtccmd_Listener_Mode.xml b/.run/tmtccmd_Listener_Mode.run.xml
similarity index 100%
rename from .idea/runConfigurations/tmtccmd_Listener_Mode.xml
rename to .run/tmtccmd_Listener_Mode.run.xml
diff --git a/.idea/runConfigurations/tmtcclient_GUI.xml b/.run/tmtcgui.run.xml
similarity index 89%
rename from .idea/runConfigurations/tmtcclient_GUI.xml
rename to .run/tmtcgui.run.xml
index 1e9e748..845b1c6 100644
--- a/.idea/runConfigurations/tmtcclient_GUI.xml
+++ b/.run/tmtcgui.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient GUI" type="PythonConfigurationType" factoryName="Python">
+  <configuration default="false" name="tmtcgui" type="PythonConfigurationType" factoryName="Python">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/.idea/runConfigurations/PLOC_SUPV_Test.xml b/.run/tmtcgui_example.run.xml
similarity index 70%
rename from .idea/runConfigurations/PLOC_SUPV_Test.xml
rename to .run/tmtcgui_example.run.xml
index e651ae6..7234a88 100644
--- a/.idea/runConfigurations/PLOC_SUPV_Test.xml
+++ b/.run/tmtcgui_example.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PLOC SUPV Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="tmtcgui-example" type="PythonConfigurationType" factoryName="Python" folderName="Example">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
@@ -7,13 +7,13 @@
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
     <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tmtccmd/examples" />
     <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$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s ploc_supv -l -t 6 --hk" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccmd/examples/tmtcgui.py" />
+    <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
diff --git a/config/custom_mode_op.py b/config/custom_mode_op.py
index 159e350..64b9033 100644
--- a/config/custom_mode_op.py
+++ b/config/custom_mode_op.py
@@ -6,7 +6,7 @@
 import enum
 
 from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()
 
diff --git a/config/definitions.py b/config/definitions.py
index ded12d5..80a7ddb 100644
--- a/config/definitions.py
+++ b/config/definitions.py
@@ -22,7 +22,8 @@ class CustomServiceList(enum.Enum):
     TMP1075_2 = "tmp1075_2"
     HEATER = "heater"
     IMTQ = "imtq"
-    PLOC = "ploc"
+    PLOC_SUPV = "ploc_supv"
+    PLOC_MPSOC = "ploc_mpsoc"
     PCDU = "pcdu"
     PL_PCDU = "plpcdu"
     SA_DEPLYOMENT = "sa_depl"
@@ -31,7 +32,6 @@ class CustomServiceList(enum.Enum):
     REACTION_WHEEL_3 = "reaction_wheel_3"
     REACTION_WHEEL_4 = "reaction_wheel_4"
     RAD_SENSOR = "rad_sensor"
-    PLOC_SUPV = "ploc_supv"
     PLOC_UPDATER = "ploc_updater"
     GPS_0 = "gps0"
     GPS_1 = "gps1"
@@ -43,3 +43,6 @@ class CustomServiceList(enum.Enum):
     STR_IMG_HELPER = "str_img_helper"
     SYRLINKS = "syrlinks"
     ACS_ASS = "acs-ass"
+    SUS_ASS = "sus-ass"
+    TCS_ASS = "tcs-ass"
+    TIME = "time"
diff --git a/config/events.csv b/config/events.csv
index 6bb34d7..ccab2e4 100644
--- a/config/events.csv
+++ b/config/events.csv
@@ -77,86 +77,118 @@
 8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h
 9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h
 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
-10800;0x2a30;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
-10801;0x2a31;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
-10802;0x2a32;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-10900;0x2a94;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
-10901;0x2a95;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
-10902;0x2a96;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
-10903;0x2a97;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
-10904;0x2a98;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h
-11000;0x2af8;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11001;0x2af9;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11002;0x2afa;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11003;0x2afb;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11004;0x2afc;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11101;0x2b5d;MEMORY_READ_RPT_CRC_FAILURE;LOW;;mission/devices/PlocMPSoCHandler.h
-11102;0x2b5e;ACK_FAILURE;LOW;;mission/devices/PlocMPSoCHandler.h
-11103;0x2b5f;EXE_FAILURE;LOW;;mission/devices/PlocMPSoCHandler.h
-11104;0x2b60;CRC_FAILURE_EVENT;LOW;;mission/devices/PlocMPSoCHandler.h
-11201;0x2bc1;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11202;0x2bc2;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11203;0x2bc3;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11204;0x2bc4;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11205;0x2bc5;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11206;0x2bc6;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11207;0x2bc7;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11208;0x2bc8;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
-11301;0x2c25;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/RwHandler.h
-11401;0x2c89;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
-11402;0x2c8a;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
-11501;0x2ced;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;bsp_q7s/devices/PlocSupervisorHandler.h
-11502;0x2cee;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;bsp_q7s/devices/PlocSupervisorHandler.h
-11503;0x2cef;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report;bsp_q7s/devices/PlocSupervisorHandler.h
-11504;0x2cf0;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;bsp_q7s/devices/PlocSupervisorHandler.h
-11600;0x2d50;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
-11601;0x2d51;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
-11700;0x2db4;UPDATE_FILE_NOT_EXISTS;LOW;;bsp_q7s/devices/PlocUpdater.h
-11701;0x2db5;ACTION_COMMANDING_FAILED;LOW;Failed to send command to supervisor handler P1: Return value of CommandActionHelper::commandAction P2: Action ID of command to send;bsp_q7s/devices/PlocUpdater.h
-11702;0x2db6;UPDATE_AVAILABLE_FAILED;LOW;Supervisor handler replied action message indicating a command execution failure of the update available command;bsp_q7s/devices/PlocUpdater.h
-11703;0x2db7;UPDATE_TRANSFER_FAILED;LOW;Supervisor handler failed to transfer an update space packet. P1: Parameter holds the number of update packets already sent (inclusive the failed packet);bsp_q7s/devices/PlocUpdater.h
-11704;0x2db8;UPDATE_VERIFY_FAILED;LOW;Supervisor failed to execute the update verify command.;bsp_q7s/devices/PlocUpdater.h
-11705;0x2db9;UPDATE_FINISHED;INFO;MPSoC update successful completed;bsp_q7s/devices/PlocUpdater.h
-11800;0x2e18;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;bsp_q7s/devices/PlocMemoryDumper.h
-11801;0x2e19;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;bsp_q7s/devices/PlocMemoryDumper.h
-11802;0x2e1a;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;bsp_q7s/devices/PlocMemoryDumper.h
-11901;0x2e7d;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
-11902;0x2e7e;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
-11903;0x2e7f;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
-11904;0x2e80;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
-12000;0x2ee0;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
-12001;0x2ee1;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
-12002;0x2ee2;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
-12003;0x2ee3;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
-12004;0x2ee4;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
-12005;0x2ee5;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
-12006;0x2ee6;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
-12007;0x2ee7;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
-12008;0x2ee8;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
-12009;0x2ee9;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12010;0x2eea;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12011;0x2eeb;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
-12012;0x2eec;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
-12013;0x2eed;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
-12014;0x2eee;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
-12015;0x2eef;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12016;0x2ef0;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12100;0x2f44;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
-12101;0x2f45;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12102;0x2f46;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12103;0x2f47;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12104;0x2f48;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12105;0x2f49;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12106;0x2f4a;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12107;0x2f4b;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12108;0x2f4c;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12109;0x2f4d;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12110;0x2f4e;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12111;0x2f4f;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12200;0x2fa8;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12201;0x2fa9;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12202;0x2faa;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-13600;0x3520;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
-13601;0x3521;REBOOT_SW;MEDIUM; Software reboot occured. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
-13602;0x3522;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
-13603;0x3523;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
+11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
+11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
+11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
+11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
+11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
+11402;0x2c8a;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
+11403;0x2c8b;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
+11404;0x2c8c;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h
+11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
+11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
+11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
+11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
+11605;0x2d55;MPSOC_HANDLER_SEQ_CNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h
+11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h
+11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
+11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/RwHandler.h
+11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
+11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
+12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
+12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report;linux/devices/ploc/PlocSupervisorHandler.h
+12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
+12005;0x2ee5;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/devices/ploc/PlocSupervisorHandler.h
+12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
+12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
+12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h
+12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
+12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
+12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
+12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
+12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
+12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
+12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
+12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
+12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
+12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
+12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
+12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
+12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
+12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
+12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
+12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
+12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
+12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
+12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
+12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
+12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
+12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
+12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h
+12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
+12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
+12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
+12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
+12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
+12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
+12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
+12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
+12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
+13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.h
+13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
+13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
+13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
+13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
+13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvHelper.h
+13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvHelper.h
+13602;0x3522;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvHelper.h
+13603;0x3523;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvHelper.h
+13604;0x3524;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvHelper.h
+13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvHelper.h
+13606;0x3526;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvHelper.h
+13607;0x3527;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13608;0x3528;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13609;0x3529;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvHelper.h
+13610;0x352a;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13611;0x352b;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13612;0x352c;SUPV_EXE_FAILURE_REPORT;LOW;Supervisor received execution failure report P1: Internal state of supervisor;linux/devices/ploc/PlocSupvHelper.h
+13613;0x352d;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13614;0x352e;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
+13615;0x352f;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvHelper.h
+13616;0x3530;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvHelper.h
diff --git a/config/globals_config.py b/config/globals_config.py
index 947558b..bb2640b 100644
--- a/config/globals_config.py
+++ b/config/globals_config.py
@@ -12,11 +12,8 @@ import argparse
 from config.definitions import CustomServiceList, PUS_APID
 from config.custom_mode_op import CustomModeList
 from tmtccmd.config.definitions import CoreComInterfaces
-from tmtccmd.config.globals import (
-    set_default_globals_pre_args_parsing,
-    set_default_globals_post_args_parsing,
-)
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.config.globals import set_default_globals_pre_args_parsing
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()
 
@@ -34,12 +31,3 @@ def set_globals_pre_args_parsing(gui: bool = False):
         tm_apid=PUS_APID,
         com_if_id=CoreComInterfaces.TCPIP_UDP.value,
     )
-
-
-def add_globals_post_args_parsing(args: argparse.Namespace, json_cfg_path: str):
-    set_default_globals_post_args_parsing(
-        args=args,
-        custom_services_list=[CustomServiceList],
-        custom_modes_list=[CustomModeList],
-        json_cfg_path=json_cfg_path,
-    )
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 3cc9be8..9f50c1f 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -1,19 +1,14 @@
-import argparse
-from typing import Union, Dict
+from typing import Union
 
 from tmtccmd.config.definitions import (
     ServiceOpCodeDictT,
-    HkReplyUnpacked,
-    DataReplyUnpacked,
 )
-from tmtccmd.tm.service_3_base import Service3Base
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.utility.retval import RetvalDictT
 from tmtccmd.pus.obj_id import ObjectIdDictT
 from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.core.backend import TmTcHandler
 from tmtccmd.config.hook import TmTcHookBase
-from tmtccmd.utility.tmtc_printer import TmTcPrinter
 from tmtccmd.config.globals import OpCodeDictKeys
 
 from config.definitions import CustomServiceList
@@ -21,43 +16,24 @@ from config.retvals import get_retval_dict
 
 
 class EiveHookObject(TmTcHookBase):
+    def __init__(self, json_cfg_path: str):
+        super().__init__(json_cfg_path=json_cfg_path)
+
     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()
-
         get_eive_service_op_code_dict(service_op_code_dict=service_op_code_dict)
-
         return service_op_code_dict
 
-    def get_json_config_file_path(self) -> str:
-        """The user can specify a path and filename for the JSON configuration file by overriding
-        this function.
-        :return:
-        """
-        return "config/tmtc_config.json"
-
-    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)
-
-    def add_globals_post_args_parsing(self, args: argparse.Namespace):
-        from config.globals_config import add_globals_post_args_parsing
-
-        add_globals_post_args_parsing(
-            args=args, json_cfg_path=self.get_json_config_file_path()
-        )
-
     def assign_communication_interface(
-        self, com_if_key: str, tmtc_printer: TmTcPrinter
+        self, com_if_key: str
     ) -> Union[CommunicationInterface, None]:
         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(),
+            json_cfg_path=self.json_cfg_path,
             space_packet_ids=(0x0865,),
         )
 
@@ -78,39 +54,6 @@ class EiveHookObject(TmTcHookBase):
 
         return get_object_ids()
 
-    @staticmethod
-    def handle_service_8_telemetry(
-        object_id: bytes, action_id: int, custom_data: bytearray
-    ) -> DataReplyUnpacked:
-        from pus_tm.service_8_hook import user_analyze_service_8_data
-
-        return user_analyze_service_8_data(
-            object_id=object_id, action_id=action_id, custom_data=custom_data
-        )
-
-    @staticmethod
-    def handle_service_3_housekeeping(
-        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
-    ) -> HkReplyUnpacked:
-        from pus_tm.hk_handling import handle_user_hk_packet
-
-        return handle_user_hk_packet(
-            object_id=object_id,
-            set_id=set_id,
-            hk_data=hk_data,
-            service3_packet=service3_packet,
-        )
-
-    @staticmethod
-    def handle_service_5_event(
-        object_id: bytes, event_id: int, param_1: int, param_2: int
-    ) -> str:
-        from pus_tm.event_handler import handle_event_packet
-
-        return handle_event_packet(
-            object_id=object_id, event_id=event_id, param_1=param_1, param_2=param_2
-        )
-
     def get_retval_dict(self) -> RetvalDictT:
         return get_retval_dict()
 
@@ -124,8 +67,10 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         add_imtq_cmds,
         add_rw_cmds,
         add_rad_sens_cmds,
-        add_ploc_cmds,
+        add_ploc_mpsoc_cmds,
+        add_ploc_supv_cmds,
         add_system_cmds,
+        add_time_cmds,
     )
     from pus_tc.devs.gps import GpsOpCodes
 
@@ -136,8 +81,10 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     add_imtq_cmds(cmd_dict=service_op_code_dict)
     add_rad_sens_cmds(cmd_dict=service_op_code_dict)
     add_rw_cmds(cmd_dict=service_op_code_dict)
-    add_ploc_cmds(cmd_dict=service_op_code_dict)
+    add_ploc_mpsoc_cmds(cmd_dict=service_op_code_dict)
+    add_ploc_supv_cmds(cmd_dict=service_op_code_dict)
     add_system_cmds(cmd_dict=service_op_code_dict)
+    add_time_cmds(cmd_dict=service_op_code_dict)
 
     op_code_dict = {
         GpsOpCodes.RESET_GNSS.value: ("Reset GPS", {OpCodeDictKeys.TIMEOUT: 2.0})
@@ -175,7 +122,7 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "2": ("Star Tracker: Mode Normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "3": ("Star Tracker: Mode Off", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "4": ("Star Tracker: Mode Raw", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "5": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 5.0}),
         "6": (
             "Star Tracker: Switch to bootloader program",
             {OpCodeDictKeys.TIMEOUT: 2.0},
@@ -332,19 +279,54 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     service_pdec_handler_tuple = ("PDEC Handler", op_code_dict_srv_pdec_handler)
 
     op_code_dict_srv_syrlinks_handler = {
-        "0": ("Syrlinks Handler: Set TX standby", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "1": ("Syrlinks Handler: Set TX modulation", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "2": ("Syrlinks Handler: Set TX carrier wave", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "5": ("Syrlinks Handler: Read TX status", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "6": ("Syrlinks Handler: Read TX waveform", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "7": (
+        "0": ("Syrlinks Handler: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("Syrlinks Handler: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Syrlinks Handler: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Syrlinks Handler: Set TX standby", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Syrlinks Handler: Set TX modulation", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Syrlinks Handler: Set TX carrier wave", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("Syrlinks Handler: Read TX status", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "7": ("Syrlinks Handler: Read TX waveform", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": (
             "Syrlinks Handler: Read TX AGC value high byte ",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "8": (
+        "9": (
             "Syrlinks Handler: Read TX AGC value low byte ",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
+        "12": (
+            "Syrlinks Handler: Write LCL config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "13": (
+            "Syrlinks Handler: Read RX status registers",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "14": (
+            "Syrlinks Handler: Read LCL config register",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "15": (
+            "Syrlinks Handler: Set waveform OQPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "16": (
+            "Syrlinks Handler: Set waveform BPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "17": (
+            "Syrlinks Handler: Set second config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "18": (
+            "Syrlinks Handler: Enable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "19": (
+            "Syrlinks Handler: Disable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
     }
     service_syrlinks_handler_tuple = (
         "Syrlinks Handler",
diff --git a/config/object_ids.py b/config/object_ids.py
index b2c9756..c1b4236 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -5,8 +5,9 @@
 """
 import os.path
 from tmtccmd.pus.obj_id import ObjectIdDictT
-from tmtccmd.utility.fsfw import parse_fsfw_objects_csv
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.fsfw import parse_fsfw_objects_csv
+from tmtccmd.logging import get_console_logger
+
 
 LOGGER = get_console_logger()
 DEFAULT_OBJECTS_CSV_PATH = "config/objects.csv"
@@ -15,7 +16,7 @@ __OBJECT_ID_DICT = None
 
 # Core Object IDs
 CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
-SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x10, 0xA2])
+SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x00, 0xA2])
 
 # Power Object IDs
 PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
@@ -54,7 +55,7 @@ IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
 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])
+PDEC_HANDLER_ID = bytes([0x50, 0x00, 0x07, 0x00])
 
 # Payload Object IDs
 STAR_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])
@@ -68,11 +69,8 @@ PL_PCDU_ID = bytes([0x44, 0x30, 0x00, 0x00])
 
 # System and Assembly Objects
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
-
-
-class ObjectInfo:
-    id: int = 0
-    name: str = ""
+SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
+TCS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x03])
 
 
 def get_object_ids() -> ObjectIdDictT:
diff --git a/config/objects.csv b/config/objects.csv
index da127d3..98b1453 100644
--- a/config/objects.csv
+++ b/config/objects.csv
@@ -37,11 +37,12 @@
 0x44260000;BPX_BATT_HANDLER
 0x44300000;PLPCDU_HANDLER
 0x443200A5;RAD_SENSOR
-0x44330000;PLOC_UPDATER
 0x44330001;PLOC_MEMORY_DUMPER
 0x44330002;STR_HELPER
+0x44330003;PLOC_MPSOC_HELPER
 0x44330015;PLOC_MPSOC_HANDLER
 0x44330016;PLOC_SUPERVISOR_HANDLER
+0x44330017;PLOC_SUPERVISOR_HELPER
 0x444100A2;SOLAR_ARRAY_DEPL_HANDLER
 0x444100A4;HEATER_HANDLER
 0x44420004;TMP1075_HANDLER_1
@@ -108,6 +109,8 @@
 0x54123456;LIBGPIOD_TEST
 0x54694269;TEST_TASK
 0x73000001;ACS_BOARD_ASS
+0x73000002;SUS_BOARD_ASS
+0x73000003;TCS_BOARD_ASS
 0x73000100;TM_FUNNEL
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT
diff --git a/config/returnvalues.csv b/config/returnvalues.csv
index 5464683..da26342 100644
--- a/config/returnvalues.csv
+++ b/config/returnvalues.csv
@@ -1,17 +1,13 @@
 0x0;OK;System-wide code for ok.;RETURN_OK;HasReturnvaluesIF.h;HasReturnvaluesIF
 0x1;Failed;Unspecified system-wide code for failed.;RETURN_FAILED;HasReturnvaluesIF.h;HasReturnvaluesIF
-0x64a0;NVMB_KeyNotExists;Specified key does not exist in json file;0xA0;mission/memory/NVMParameterBase.h;NVM_PARAM_BASE
-0x57a0;PLMP_CrcFailure;;0xA0;mission/devices/PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a1;PLMP_ReceivedAckFailure;;0xA1;mission/devices/PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a2;PLMP_ReceivedExeFailure;;0xA2;mission/devices/PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x57a3;PLMP_InvalidApid;;0xA3;mission/devices/PlocMPSoCHandler.h;PLOC_MPSOC_HANDLER
-0x59a0;SUSS_ErrorUnlockMutex;;0xA0;mission/devices/SusHandler.h;SUS_HANDLER
-0x59a1;SUSS_ErrorLockMutex;;0xA1;mission/devices/SusHandler.h;SUS_HANDLER
-0x65a0;SADPL_CommandNotSupported;;0xA0;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x65a1;SADPL_DeploymentAlreadyExecuting;;0xA1;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x65a2;SADPL_MainSwitchTimeoutFailure;;0xA2;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x65a3;SADPL_SwitchingDeplSa1Failed;;0xA3;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
-0x65a4;SADPL_SwitchingDeplSa2Failed;;0xA4;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x63a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;0xA0;mission/tmtc/CCSDSHandler.h;CCSDS_HANDLER
+0x69a0;SADPL_CommandNotSupported;;0xA0;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x69a1;SADPL_DeploymentAlreadyExecuting;;0xA1;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x69a2;SADPL_MainSwitchTimeoutFailure;;0xA2;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x69a3;SADPL_SwitchingDeplSa1Failed;;0xA3;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x69a4;SADPL_SwitchingDeplSa2Failed;;0xA4;mission/devices/SolarArrayDeploymentHandler.h;SA_DEPL_HANDLER
+0x5ba0;SUSS_ErrorUnlockMutex;;0xA0;mission/devices/SusHandler.h;SUS_HANDLER
+0x5ba1;SUSS_ErrorLockMutex;;0xA1;mission/devices/SusHandler.h;SUS_HANDLER
 0x55b0;RWHA_SpiWriteFailure;;0xB0;mission/devices/RwHandler.h;RW_HANDLER
 0x55b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;0xB1;mission/devices/RwHandler.h;RW_HANDLER
 0x55b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;0xB2;mission/devices/RwHandler.h;RW_HANDLER
@@ -24,12 +20,6 @@
 0x55a2;RWHA_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;0xA2;mission/devices/RwHandler.h;RW_HANDLER
 0x55a3;RWHA_ExecutionFailed;Command execution failed;0xA3;mission/devices/RwHandler.h;RW_HANDLER
 0x55a4;RWHA_CrcError;Reaction wheel reply has invalid crc;0xA4;mission/devices/RwHandler.h;RW_HANDLER
-0x5e00;GOMS_PacketTooLong;;0;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5e01;GOMS_InvalidTableId;;1;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5e02;GOMS_InvalidAddress;;2;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5e03;GOMS_InvalidParamSize;;3;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5e04;GOMS_InvalidPayloadSize;;4;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
-0x5e05;GOMS_UnknownReplyId;;5;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
 0x54a0;IMTQ_InvalidCommandCode;;0xA0;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a1;IMTQ_ParameterMissing;;0xA1;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a2;IMTQ_ParameterInvalid;;0xA2;mission/devices/IMTQHandler.h;IMTQ_HANDLER
@@ -38,6 +28,17 @@
 0x54a5;IMTQ_RejectedWithoutReason;;0xA5;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a6;IMTQ_CmdErrUnknown;;0xA6;mission/devices/IMTQHandler.h;IMTQ_HANDLER
 0x54a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;0xA7;mission/devices/IMTQHandler.h;IMTQ_HANDLER
+0x52a1;HEATER_CommandNotSupported;;0xA1;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a2;HEATER_InitFailed;;0xA2;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a3;HEATER_InvalidSwitchNr;;0xA3;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a4;HEATER_MainSwitchSetTimeout;;0xA4;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x52a5;HEATER_CommandAlreadyWaiting;;0xA5;mission/devices/HeaterHandler.h;HEATER_HANDLER
+0x6000;GOMS_PacketTooLong;;0;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x6001;GOMS_InvalidTableId;;1;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x6002;GOMS_InvalidAddress;;2;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x6003;GOMS_InvalidParamSize;;3;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x6004;GOMS_InvalidPayloadSize;;4;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
+0x6005;GOMS_UnknownReplyId;;5;mission/devices/GomspaceDeviceHandler.h;GOM_SPACE_HANDLER
 0x53a0;SYRLINKS_CrcFailure;;0xA0;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a1;SYRLINKS_UartFraminOrParityErrorAck;;0xA1;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a2;SYRLINKS_BadCharacterAck;;0xA2;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
@@ -47,63 +48,91 @@
 0x53a6;SYRLINKS_BadCrcAck;;0xA6;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a7;SYRLINKS_ReplyWrongSize;;0xA7;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
 0x53a8;SYRLINKS_MissingStartFrameCharacter;;0xA8;mission/devices/SyrlinksHkHandler.h;SYRLINKS_HANDLER
-0x52a1;HEATER_CommandNotSupported;;0xA1;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a2;HEATER_InitFailed;;0xA2;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a3;HEATER_InvalidSwitchNr;;0xA3;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a4;HEATER_MainSwitchSetTimeout;;0xA4;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x52a5;HEATER_CommandAlreadyWaiting;;0xA5;mission/devices/HeaterHandler.h;HEATER_HANDLER
-0x61a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;0xA0;mission/tmtc/CCSDSHandler.h;CCSDS_HANDLER
+0x66a0;NVMB_KeyNotExists;Specified key does not exist in json file;0xA0;mission/memory/NVMParameterBase.h;NVM_PARAM_BASE
+0x4300; HSPI_OpeningFileFailed;;0;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
+0x4301; HSPI_FullDuplexTransferFailed;;1;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
+0x4302; HSPI_HalfDuplexTransferFailed;;2;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
+0x4401; HURT_UartReadFailure;;1;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
+0x4402; HURT_UartReadSizeMissmatch;;2;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
+0x4403; HURT_UartRxBufferTooSmall;;3;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
+0x4601; HGIO_UnknownGpioId;;1;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4602; HGIO_DriveGpioFailure;;2;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4603; HGIO_GpioTypeFailure;;3;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4604; HGIO_GpioInvalidInstance;;4;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4605; HGIO_GpioDuplicateDetected;;5;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
+0x4200; UXOS_ExecutionFinished;Execution of the current command has finished;0;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4201; UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4202; UXOS_BytesRead;Some bytes have been read from the executing process;2;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4203; UXOS_CommandError;Command execution failed;3;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4204; UXOS_NoCommandLoadedOrPending;;4;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x4206; UXOS_PcloseCallError;;6;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
+0x3b00; LPIF_PoolEntryNotFound;;0x00;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
+0x3b01; LPIF_PoolEntryTypeConflict;;0x01;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
+0x3d00; HKM_QueueOrDestinationInvalid;;0;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d01; HKM_WrongHkPacketType;;1;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d02; HKM_ReportingStatusUnchanged;;2;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d03; HKM_PeriodicHelperInvalid;;3;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d04; HKM_PoolobjectNotFound;;4;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3d05; HKM_DatasetNotFound;;5;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
+0x3501; CFDP_InvalidTlvType;;1;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3502; CFDP_InvalidDirectiveFields;;2;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3503; CFDP_InvalidPduDatafieldLen;;3;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3504; CFDP_InvalidAckDirectiveFields;;4;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3505; CFDP_MetadataCantParseOptions;;5;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3506; CFDP_FinishedCantParseFsResponses;;6;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3508; CFDP_FilestoreRequiresSecondFile;;8;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3509; CFDP_FilestoreResponseCantParseFsMessage;;9;fsfw/src/fsfw/cfdp/definitions.h;CFDP
+0x3101; CF_ObjectHasNoFunctions;;1;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
+0x3102; CF_AlreadyCommanding;;2;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
+0x3201; HF_IsBusy;;1;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x3202; HF_InvalidParameters;;2;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x3203; HF_ExecutionFinished;;3;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x3204; HF_InvalidActionId;;4;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
+0x2d01; HPA_InvalidIdentifierId;;0x01;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2d02; HPA_InvalidDomainId;;0x02;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2d03; HPA_InvalidValue;;0x03;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2d05; HPA_ReadOnly;;0x05;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
+0x2c01; PAW_UnknownDatatype;;0x01;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c02; PAW_DatatypeMissmatch;;0x02;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c03; PAW_Readonly;;0x03;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c04; PAW_TooBig;;0x04;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c05; PAW_SourceNotSet;;0x05;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c06; PAW_OutOfBounds;;0x06;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c07; PAW_NotSet;;0x07;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x2c08; PAW_ColumnOrRowsZero;;0x08;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
+0x1701; HHI_ObjectNotHealthy;;1;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
+0x1702; HHI_InvalidHealthState;;2;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
 0x2701; SM_DataTooLarge;;1;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
 0x2702; SM_DataStorageFull;;2;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
 0x2703; SM_IllegalStorageId;;3;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
 0x2704; SM_DataDoesNotExist;;4;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
 0x2705; SM_IllegalAddress;;5;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
 0x2706; SM_PoolTooLarge;;6;fsfw/src/fsfw/storagemanager/StorageManagerIF.h;STORAGE_MANAGER_IF
-0x601; PP_DoItMyself;;1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x602; PP_PointsToVariable;;2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x603; PP_PointsToMemory;;3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x604; PP_ActivityCompleted;;4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x605; PP_PointsToVectorUint8;;5;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x606; PP_PointsToVectorUint16;;6;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x607; PP_PointsToVectorUint32;;7;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x608; PP_PointsToVectorFloat;;8;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6a0; PP_DumpNotSupported;;0xA0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e0; PP_InvalidSize;;0xE0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e1; PP_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e2; PP_InvalidContent;;0xE2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e3; PP_UnalignedAccess;;0xE3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x6e4; PP_WriteProtected;;0xE4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
-0x4100; FILS_GenericFileError;;0;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4101; FILS_IsBusy;;1;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4102; FILS_InvalidParameters;;2;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4105; FILS_FileDoesNotExist;;5;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4106; FILS_FileAlreadyExists;;6;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4107; FILS_FileLocked;;7;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410a; FILS_DirectoryDoesNotExist;;10;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410b; FILS_DirectoryAlreadyExists;;11;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410c; FILS_DirectoryNotEmpty;;12;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x410f; FILS_SequencePacketMissingWrite;;15;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x4110; FILS_SequencePacketMissingRead;;16;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
-0x13e0; MH_UnknownCmd;;0xE0;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x13e1; MH_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x13e2; MH_InvalidSize;;0xE2;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x13e3; MH_StateMismatch;;0xE3;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
-0x37a1; SGP4_InvalidEccentricity;;0xA1;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37a2; SGP4_InvalidMeanMotion;;0xA2;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37a3; SGP4_InvalidPerturbationElements;;0xA3;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37a4; SGP4_InvalidSemiLatusRectum;;0xA4;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37a5; SGP4_InvalidEpochElements;;0xA5;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37a6; SGP4_SatelliteHasDecayed;;0xA6;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37b1; SGP4_TleTooOld;;0xB1;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x37b2; SGP4_TleNotInitialized;;0xB2;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
-0x1101; AL_Full;;0x01;fsfw/src/fsfw/container/ArrayList.h;ARRAY_LIST
-0x1501; FM_KeyAlreadyExists;;0x01;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
-0x1502; FM_MapFull;;0x02;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
-0x1503; FM_KeyDoesNotExist;;0x03;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
-0x1801; FF_Full;;1;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
-0x1802; FF_Empty;;2;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
-0x1601; FMM_MapFull;;0x01;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
-0x1602; FMM_KeyDoesNotExist;;0x02;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
+0x2301; MT_TooDetailedRequest;;1;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2302; MT_TooGeneralRequest;;2;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2303; MT_NoMatch;;3;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2304; MT_Full;;4;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x2305; MT_NewNodeCreated;;5;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
+0x3e01; DLEE_StreamTooShort;;0x01;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
+0x3e02; DLEE_DecodingError;;0x02;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
+0x2e01; ASC_TooLongForTargetType;;1;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
+0x2e02; ASC_InvalidCharacters;;2;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
+0x2e03; ASC_BufferTooSmall;;0x3;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
+0x1c01; TCD_PacketLost;;1;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
+0x1c02; TCD_DestinationNotFound;;2;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
+0x1c03; TCD_ServiceIdAlreadyExists;;3;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
+0x1b00; TCC_IllegalApid;;0;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b01; TCC_IncompletePacket;;1;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b02; TCC_IncorrectChecksum;;2;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b03; TCC_IllegalPacketType;;3;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b04; TCC_IllegalPacketSubtype;;4;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b05; TCC_IncorrectPrimaryHeader;;5;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x1b06; TCC_IncorrectSecondaryHeader;;6;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
+0x3901; MQI_Empty;;1;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3902; MQI_Full;No space left for more messages;2;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3903; MQI_NoReplyPartner;Returned if a reply method was called without partner;3;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0x3904; MQI_DestinationInvalid;Returned if the target destination is invalid.;4;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
+0xf01; CM_UnknownCommand;;1;fsfw/src/fsfw/ipc/CommandMessageIF.h;COMMAND_MESSAGE
 0x3801; MUX_NotEnoughResources;;1;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
 0x3802; MUX_InsufficientMemory;;2;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
 0x3803; MUX_NoPrivilege;;3;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
@@ -116,23 +145,20 @@
 0x380a; MUX_MutexTimeout;;10;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
 0x380b; MUX_MutexInvalidId;;11;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
 0x380c; MUX_MutexDestroyedWhileWaiting;;12;fsfw/src/fsfw/ipc/MutexIF.h;MUTEX_IF
-0x3901; MQI_Empty;;1;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0x3902; MQI_Full;No space left for more messages;2;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0x3903; MQI_NoReplyPartner;Returned if a reply method was called without partner;3;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0x3904; MQI_DestinationInvalid;Returned if the target destination is invalid.;4;fsfw/src/fsfw/ipc/MessageQueueIF.h;MESSAGE_QUEUE_IF
-0xf01; CM_UnknownCommand;;1;fsfw/src/fsfw/ipc/CommandMessageIF.h;COMMAND_MESSAGE
-0xe01; HM_InvalidMode;;0x01;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0xe02; HM_TransNotAllowed;;0x02;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0xe03; HM_InTransition;;0x03;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
-0xe04; HM_InvalidSubmode;;0x04;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0x2801; TC_InvalidTargetState;;1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
+0x28f1; TC_AboveOperationalLimit;;0xF1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
+0x28f2; TC_BelowOperationalLimit;;0xF2;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
+0x801; DPS_InvalidParameterDefinition;;1;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x802; DPS_SetWasAlreadyRead;;2;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x803; DPS_CommitingWithoutReading;;3;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x804; DPS_DataSetUninitialised;;4;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x805; DPS_DataSetFull;;5;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x806; DPS_PoolVarNull;;6;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
+0x3ca0; PVA_InvalidReadWriteMode;;0xA0;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
+0x3ca1; PVA_InvalidPoolEntry;;0xA1;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
 0xc02; MS_InvalidEntry;;0x02;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
 0xc03; MS_TooManyElements;;0x03;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
 0xc04; MS_CantStoreEmpty;;0x04;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h;MODE_STORE_IF
-0xb01; SB_ChildNotFound;;0x01;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb02; SB_ChildInfoUpdated;;0x02;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb03; SB_ChildDoesntHaveModes;;0x03;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb04; SB_CouldNotInsertChild;;0x04;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
-0xb05; SB_TableContainsInvalidObjectId;;0x05;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
 0xd01; SS_SequenceAlreadyExists;;0x01;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
 0xd02; SS_TableAlreadyExists;;0x02;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
 0xd03; SS_TableDoesNotExist;;0x03;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
@@ -147,7 +173,53 @@
 0xd0e; SS_TableInUse;;0x0E;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
 0xda1; SS_TargetTableNotReached;;0xA1;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
 0xda2; SS_TableCheckFailed;;0xA2;fsfw/src/fsfw/subsystem/Subsystem.h;SUBSYSTEM
-0x2401; EV_ListenerNotFound;;1;fsfw/src/fsfw/events/EventManagerIF.h;EVENT_MANAGER_IF
+0xb01; SB_ChildNotFound;;0x01;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb02; SB_ChildInfoUpdated;;0x02;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb03; SB_ChildDoesntHaveModes;;0x03;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb04; SB_CouldNotInsertChild;;0x04;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb05; SB_TableContainsInvalidObjectId;;0x05;fsfw/src/fsfw/subsystem/SubsystemBase.h;SUBSYSTEM_BASE
+0xb00; SB_ConnBroken;;0;fsfw/src/fsfw/osal/common/TcpTmTcServer.h;SUBSYSTEM_BASE
+0x2901; IEC_NoConfigurationTable;;0x01;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2902; IEC_NoCpuTable;;0x02;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2903; IEC_InvalidWorkspaceAddress;;0x03;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2904; IEC_TooLittleWorkspace;;0x04;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2905; IEC_WorkspaceAllocation;;0x05;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2906; IEC_InterruptStackTooSmall;;0x06;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2907; IEC_ThreadExitted;;0x07;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2908; IEC_InconsistentMpInformation;;0x08;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2909; IEC_InvalidNode;;0x09;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290a; IEC_NoMpci;;0x0a;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290b; IEC_BadPacket;;0x0b;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290c; IEC_OutOfPackets;;0x0c;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290d; IEC_OutOfGlobalObjects;;0x0d;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290e; IEC_OutOfProxies;;0x0e;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x290f; IEC_InvalidGlobalId;;0x0f;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2910; IEC_BadStackHook;;0x10;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2911; IEC_BadAttributes;;0x11;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2912; IEC_ImplementationKeyCreateInconsistency;;0x12;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2913; IEC_ImplementationBlockingOperationCancel;;0x13;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2914; IEC_MutexObtainFromBadState;;0x14;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x2915; IEC_UnlimitedAndMaximumIs0;;0x15;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
+0x1401; SE_BufferTooShort;;1;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
+0x1402; SE_StreamTooShort;;2;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
+0x1403; SE_TooManyElements;;3;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
+0x4a00; SPPA_NoPacketFound;;0x00;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
+0x4a01; SPPA_SplitPacket;;0x01;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
+0x1d01; PUS_ActivityStarted;;1;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d02; PUS_InvalidSubservice;;2;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d03; PUS_IllegalApplicationData;;3;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d04; PUS_SendTmFailed;;4;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1d05; PUS_Timeout;;5;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
+0x1f01; CSB_ExecutionComplete;;1;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f02; CSB_NoStepMessage;;2;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f03; CSB_ObjectBusy;;3;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f04; CSB_Busy;;4;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f05; CSB_InvalidTc;;5;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f06; CSB_InvalidObject;;6;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x1f07; CSB_InvalidReply;;7;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
+0x2500; FDI_YourFault;;0;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
+0x2501; FDI_MyFault;;1;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
+0x2502; FDI_ConfirmLater;;2;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
 0x4e1; RMP_CommandNoDescriptorsAvailable;;0xE1;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x4e2; RMP_CommandBufferFull;;0xE2;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x4e3; RMP_CommandChannelOutOfRange;;0xE3;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
@@ -188,128 +260,6 @@
 0x40a; RMP_ReplyCommandNotImplementedOrNotAuthorised;;10;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x40b; RMP_ReplyRmwDataLengthError;;11;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
 0x40c; RMP_ReplyInvalidTargetLogicalAddress;;12;fsfw/src/fsfw/rmap/RMAP.h;RMAP_CHANNEL
-0x1401; SE_BufferTooShort;;1;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
-0x1402; SE_StreamTooShort;;2;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
-0x1403; SE_TooManyElements;;3;fsfw/src/fsfw/serialize/SerializeIF.h;SERIALIZE_IF
-0x3ca0; PVA_InvalidReadWriteMode;;0xA0;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
-0x3ca1; PVA_InvalidPoolEntry;;0xA1;fsfw/src/fsfw/datapool/PoolVariableIF.h;POOL_VARIABLE_IF
-0x801; DPS_InvalidParameterDefinition;;1;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x802; DPS_SetWasAlreadyRead;;2;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x803; DPS_CommitingWithoutReading;;3;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x804; DPS_DataSetUninitialised;;4;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x805; DPS_DataSetFull;;5;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x806; DPS_PoolVarNull;;6;fsfw/src/fsfw/datapool/DataSetIF.h;DATA_SET_CLASS
-0x1b00; TCC_IllegalApid;;0;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b01; TCC_IncompletePacket;;1;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b02; TCC_IncorrectChecksum;;2;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b03; TCC_IllegalPacketType;;3;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b04; TCC_IllegalPacketSubtype;;4;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b05; TCC_IncorrectPrimaryHeader;;5;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1b06; TCC_IncorrectSecondaryHeader;;6;fsfw/src/fsfw/tcdistribution/TcPacketCheckPUS.h;TC_PACKET_CHECK
-0x1c01; TCD_PacketLost;;1;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
-0x1c02; TCD_DestinationNotFound;;2;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
-0x1c03; TCD_ServiceIdAlreadyExists;;3;fsfw/src/fsfw/tcdistribution/TcDistributor.h;PACKET_DISTRIBUTION
-0x2f01; POS_InPowerTransition;;1;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
-0x2f02; POS_SwitchStateMismatch;;2;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
-0x501; PS_SwitchOn;;1;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x500; PS_SwitchOff;;0;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x502; PS_SwitchTimeout;;2;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x503; PS_FuseOn;;3;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x504; PS_FuseOff;;4;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
-0x3a00; SPH_ConnBroken;;0;fsfw/src/fsfw/osal/common/TcpTmTcServer.h;SEMAPHORE_IF
-0x2901; IEC_NoConfigurationTable;;0x01;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2902; IEC_NoCpuTable;;0x02;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2903; IEC_InvalidWorkspaceAddress;;0x03;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2904; IEC_TooLittleWorkspace;;0x04;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2905; IEC_WorkspaceAllocation;;0x05;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2906; IEC_InterruptStackTooSmall;;0x06;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2907; IEC_ThreadExitted;;0x07;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2908; IEC_InconsistentMpInformation;;0x08;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2909; IEC_InvalidNode;;0x09;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290a; IEC_NoMpci;;0x0a;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290b; IEC_BadPacket;;0x0b;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290c; IEC_OutOfPackets;;0x0c;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290d; IEC_OutOfGlobalObjects;;0x0d;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290e; IEC_OutOfProxies;;0x0e;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x290f; IEC_InvalidGlobalId;;0x0f;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2910; IEC_BadStackHook;;0x10;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2911; IEC_BadAttributes;;0x11;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2912; IEC_ImplementationKeyCreateInconsistency;;0x12;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2913; IEC_ImplementationBlockingOperationCancel;;0x13;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2914; IEC_MutexObtainFromBadState;;0x14;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2915; IEC_UnlimitedAndMaximumIs0;;0x15;fsfw/src/fsfw/osal/InternalErrorCodes.h;INTERNAL_ERROR_CODES
-0x2500; FDI_YourFault;;0;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
-0x2501; FDI_MyFault;;1;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
-0x2502; FDI_ConfirmLater;;2;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h;HANDLES_FAILURES_IF
-0x201; OM_InsertionFailed;;1;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x202; OM_NotFound;;2;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x203; OM_ChildInitFailed;;3;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x204; OM_InternalErrReporterUninit;;4;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
-0x2101; TMF_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2102; TMF_LastPacketFound;;2;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2103; TMF_StopFetch;;3;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2104; TMF_Timeout;;4;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2105; TMF_TmChannelFull;;5;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2106; TMF_NotStored;;6;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2107; TMF_AllDeleted;;7;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2108; TMF_InvalidData;;8;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2109; TMF_NotReady;;9;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
-0x2001; TMB_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2002; TMB_Full;;2;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2003; TMB_Empty;;3;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2004; TMB_NullRequested;;4;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2005; TMB_TooLarge;;5;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2006; TMB_NotReady;;6;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2007; TMB_DumpError;;7;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2008; TMB_CrcError;;8;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2009; TMB_Timeout;;9;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200a; TMB_IdlePacketFound;;10;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200b; TMB_TelecommandFound;;11;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200c; TMB_NoPusATm;;12;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200d; TMB_TooSmall;;13;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200e; TMB_BlockNotFound;;14;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x200f; TMB_InvalidRequest;;15;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
-0x2c01; PAW_UnknownDatatype;;0x01;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c02; PAW_DatatypeMissmatch;;0x02;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c03; PAW_Readonly;;0x03;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c04; PAW_TooBig;;0x04;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c05; PAW_SourceNotSet;;0x05;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c06; PAW_OutOfBounds;;0x06;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c07; PAW_NotSet;;0x07;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2c08; PAW_ColumnOrRowsZero;;0x08;fsfw/src/fsfw/parameters/ParameterWrapper.h;PARAMETER_WRAPPER
-0x2d01; HPA_InvalidIdentifierId;;0x01;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2d02; HPA_InvalidDomainId;;0x02;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2d03; HPA_InvalidValue;;0x03;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x2d05; HPA_ReadOnly;;0x05;fsfw/src/fsfw/parameters/HasParametersIF.h;HAS_PARAMETERS_IF
-0x3a01; SPH_SemaphoreTimeout;;1;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
-0x3a02; SPH_SemaphoreNotOwned;;2;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
-0x3a03; SPH_SemaphoreInvalid;;3;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
-0x1a01; TRC_NotEnoughSensors;;1;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a02; TRC_LowestValueOol;;2;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a03; TRC_HighestValueOol;;3;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a04; TRC_BothValuesOol;;4;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x1a05; TRC_DuplexOol;;5;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
-0x3001; LIM_Unchecked;;1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3002; LIM_Invalid;;2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3003; LIM_Unselected;;3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3004; LIM_BelowLowLimit;;4;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3005; LIM_AboveHighLimit;;5;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3006; LIM_UnexpectedValue;;6;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3007; LIM_OutOfRange;;7;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30a0; LIM_FirstSample;;0xA0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e0; LIM_InvalidSize;;0xE0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e1; LIM_WrongType;;0xE1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e2; LIM_WrongPid;;0xE2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30e3; LIM_WrongLimitId;;0xE3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x30ee; LIM_MonitorNotFound;;0xEE;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
-0x3501; CFDP_InvalidTlvType;;1;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3502; CFDP_InvalidDirectiveFields;;2;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3503; CFDP_InvalidPduDatafieldLen;;3;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3504; CFDP_InvalidAckDirectiveFields;;4;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3505; CFDP_MetadataCantParseOptions;;5;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3506; CFDP_FinishedCantParseFsResponses;;6;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3508; CFDP_FilestoreRequiresSecondFile;;8;fsfw/src/fsfw/cfdp/definitions.h;CFDP
-0x3509; CFDP_FilestoreResponseCantParseFsMessage;;9;fsfw/src/fsfw/cfdp/definitions.h;CFDP
 0x2b01; CCS_BcIsSetVrCommand;;0x01;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
 0x2b02; CCS_BcIsUnlockCommand;;0x02;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
 0x2bb0; CCS_BcIllegalCommand;;0xB0;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
@@ -339,12 +289,97 @@
 0x2bd1; CCS_ShorterThanHeader;;0xD1;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
 0x2bd2; CCS_TooShortBlockedPacket;;0xD2;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
 0x2bd3; CCS_TooShortMapExtraction;;0xD3;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h;CCSDS_HANDLER_IF
-0x3301; DC_NoReplyReceived;;0x01;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3302; DC_ProtocolError;;0x02;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3303; DC_Nullpointer;;0x03;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3304; DC_InvalidCookieType;;0x04;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3305; DC_NotActive;;0x05;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
-0x3306; DC_TooMuchData;;0x06;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x37a1; SGP4_InvalidEccentricity;;0xA1;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37a2; SGP4_InvalidMeanMotion;;0xA2;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37a3; SGP4_InvalidPerturbationElements;;0xA3;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37a4; SGP4_InvalidSemiLatusRectum;;0xA4;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37a5; SGP4_InvalidEpochElements;;0xA5;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37a6; SGP4_SatelliteHasDecayed;;0xA6;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37b1; SGP4_TleTooOld;;0xB1;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x37b2; SGP4_TleNotInitialized;;0xB2;fsfw/src/fsfw/coordinates/Sgp4Propagator.h;SGP4PROPAGATOR_CLASS
+0x13e0; MH_UnknownCmd;;0xE0;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x13e1; MH_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x13e2; MH_InvalidSize;;0xE2;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x13e3; MH_StateMismatch;;0xE3;fsfw/src/fsfw/memory/MemoryHelper.h;MEMORY_HELPER
+0x4100; FILS_GenericFileError;;0;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4101; FILS_IsBusy;;1;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4102; FILS_InvalidParameters;;2;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4105; FILS_FileDoesNotExist;;5;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4106; FILS_FileAlreadyExists;;6;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4107; FILS_FileLocked;;7;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410a; FILS_DirectoryDoesNotExist;;10;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410b; FILS_DirectoryAlreadyExists;;11;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410c; FILS_DirectoryNotEmpty;;12;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x410f; FILS_SequencePacketMissingWrite;;15;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x4110; FILS_SequencePacketMissingRead;;16;fsfw/src/fsfw/memory/HasFileSystemIF.h;FILE_SYSTEM
+0x601; PP_DoItMyself;;1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x602; PP_PointsToVariable;;2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x603; PP_PointsToMemory;;3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x604; PP_ActivityCompleted;;4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x605; PP_PointsToVectorUint8;;5;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x606; PP_PointsToVectorUint16;;6;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x607; PP_PointsToVectorUint32;;7;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x608; PP_PointsToVectorFloat;;8;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6a0; PP_DumpNotSupported;;0xA0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e0; PP_InvalidSize;;0xE0;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e1; PP_InvalidAddress;;0xE1;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e2; PP_InvalidContent;;0xE2;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e3; PP_UnalignedAccess;;0xE3;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x6e4; PP_WriteProtected;;0xE4;fsfw/src/fsfw/memory/HasMemoryIF.h;HAS_MEMORY_IF
+0x201; OM_InsertionFailed;;1;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x202; OM_NotFound;;2;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x203; OM_ChildInitFailed;;3;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x204; OM_InternalErrReporterUninit;;4;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h;OBJECT_MANAGER_IF
+0x501; PS_SwitchOn;;1;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x500; PS_SwitchOff;;0;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x502; PS_SwitchTimeout;;2;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x503; PS_FuseOn;;3;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x504; PS_FuseOff;;4;fsfw/src/fsfw/power/PowerSwitchIF.h;POWER_SWITCH_IF
+0x2f01; POS_InPowerTransition;;1;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
+0x2f02; POS_SwitchStateMismatch;;2;fsfw/src/fsfw/power/PowerSwitcher.h;POWER_SWITCHER
+0x1000; TIM_UnsupportedTimeFormat;;0;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1001; TIM_NotEnoughInformationForTargetFormat;;1;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1002; TIM_LengthMismatch;;2;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1003; TIM_InvalidTimeFormat;;3;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1004; TIM_InvalidDayOfYear;;4;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x1005; TIM_TimeDoesNotFitFormat;;5;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
+0x3601; TSI_BadTimestamp;;1;fsfw/src/fsfw/timemanager/TimeStamperIF.h;TIME_STAMPER_IF
+0x2101; TMF_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2102; TMF_LastPacketFound;;2;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2103; TMF_StopFetch;;3;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2104; TMF_Timeout;;4;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2105; TMF_TmChannelFull;;5;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2106; TMF_NotStored;;6;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2107; TMF_AllDeleted;;7;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2108; TMF_InvalidData;;8;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2109; TMF_NotReady;;9;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h;TM_STORE_FRONTEND_IF
+0x2001; TMB_Busy;;1;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2002; TMB_Full;;2;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2003; TMB_Empty;;3;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2004; TMB_NullRequested;;4;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2005; TMB_TooLarge;;5;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2006; TMB_NotReady;;6;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2007; TMB_DumpError;;7;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2008; TMB_CrcError;;8;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x2009; TMB_Timeout;;9;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200a; TMB_IdlePacketFound;;10;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200b; TMB_TelecommandFound;;11;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200c; TMB_NoPusATm;;12;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200d; TMB_TooSmall;;13;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200e; TMB_BlockNotFound;;14;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0x200f; TMB_InvalidRequest;;15;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h;TM_STORE_BACKEND_IF
+0xe01; HM_InvalidMode;;0x01;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0xe02; HM_TransNotAllowed;;0x02;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0xe03; HM_InTransition;;0x03;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0xe04; HM_InvalidSubmode;;0x04;fsfw/src/fsfw/modes/HasModesIF.h;HAS_MODES_IF
+0x1501; FM_KeyAlreadyExists;;0x01;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
+0x1502; FM_MapFull;;0x02;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
+0x1503; FM_KeyDoesNotExist;;0x03;fsfw/src/fsfw/container/FixedMap.h;FIXED_MAP
+0x1101; AL_Full;;0x01;fsfw/src/fsfw/container/ArrayList.h;ARRAY_LIST
+0x1601; FMM_MapFull;;0x01;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
+0x1602; FMM_KeyDoesNotExist;;0x02;fsfw/src/fsfw/container/FixedOrderedMultimap.h;FIXED_MULTIMAP
+0x1801; FF_Full;;1;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
+0x1802; FF_Empty;;2;fsfw/src/fsfw/container/FIFOBase.h;FIFO_CLASS
 0x3a0; DHB_InvalidChannel;;0xA0;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
 0x3b0; DHB_AperiodicReply;;0xB0;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
 0x3b1; DHB_IgnoreReplyData;;0xB1;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h;DEVICE_HANDLER_BASE
@@ -381,121 +416,92 @@
 0x26c3; DHI_DeviceReplyInvalid;;0xC3;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
 0x26d0; DHI_InvalidCommandParameter;;0xD0;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
 0x26d1; DHI_InvalidNumberOrLengthOfParameters;;0xD1;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h;DEVICE_HANDLER_IF
-0x2301; MT_TooDetailedRequest;;1;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2302; MT_TooGeneralRequest;;2;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2303; MT_NoMatch;;3;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2304; MT_Full;;4;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x2305; MT_NewNodeCreated;;5;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h;MATCH_TREE_CLASS
-0x3e01; DLEE_StreamTooShort;;0x01;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
-0x3e02; DLEE_DecodingError;;0x02;fsfw/src/fsfw/globalfunctions/DleEncoder.h;DLE_ENCODER
-0x2e01; ASC_TooLongForTargetType;;1;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
-0x2e02; ASC_InvalidCharacters;;2;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
-0x2e03; ASC_BufferTooSmall;;0x3;fsfw/src/fsfw/globalfunctions/AsciiConverter.h;ASCII_CONVERTER
-0x1701; HHI_ObjectNotHealthy;;1;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
-0x1702; HHI_InvalidHealthState;;2;fsfw/src/fsfw/health/HasHealthIF.h;HAS_HEALTH_IF
-0x3101; CF_ObjectHasNoFunctions;;1;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
-0x3102; CF_AlreadyCommanding;;2;fsfw/src/fsfw/action/CommandsActionsIF.h;COMMANDS_ACTIONS_IF
-0x3201; HF_IsBusy;;1;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3202; HF_InvalidParameters;;2;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3203; HF_ExecutionFinished;;3;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3204; HF_InvalidActionId;;4;fsfw/src/fsfw/action/HasActionsIF.h;HAS_ACTIONS_IF
-0x3601; TSI_BadTimestamp;;1;fsfw/src/fsfw/timemanager/TimeStamperIF.h;TIME_STAMPER_IF
-0x1000; TIM_UnsupportedTimeFormat;;0;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1001; TIM_NotEnoughInformationForTargetFormat;;1;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1002; TIM_LengthMismatch;;2;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1003; TIM_InvalidTimeFormat;;3;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1004; TIM_InvalidDayOfYear;;4;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x1005; TIM_TimeDoesNotFitFormat;;5;fsfw/src/fsfw/timemanager/CCSDSTime.h;CCSDS_TIME_HELPER_CLASS
-0x3b00; LPIF_PoolEntryNotFound;;0x00;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
-0x3b01; LPIF_PoolEntryTypeConflict;;0x01;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h;LOCAL_POOL_OWNER_IF
-0x3d00; HKM_QueueOrDestinationInvalid;;0;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d01; HKM_WrongHkPacketType;;1;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d02; HKM_ReportingStatusUnchanged;;2;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d03; HKM_PeriodicHelperInvalid;;3;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d04; HKM_PoolobjectNotFound;;4;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x3d05; HKM_DatasetNotFound;;5;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h;HOUSEKEEPING_MANAGER
-0x2801; TC_InvalidTargetState;;1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
-0x28f1; TC_AboveOperationalLimit;;0xF1;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
-0x28f2; TC_BelowOperationalLimit;;0xF2;fsfw/src/fsfw/thermal/ThermalComponentIF.h;THERMAL_COMPONENT_IF
-0x1f01; CSB_ExecutionComplete;;1;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f02; CSB_NoStepMessage;;2;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f03; CSB_ObjectBusy;;3;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f04; CSB_Busy;;4;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f05; CSB_InvalidTc;;5;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f06; CSB_InvalidObject;;6;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x1f07; CSB_InvalidReply;;7;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h;COMMAND_SERVICE_BASE
-0x4a00; SPPA_NoPacketFound;;0x00;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
-0x4a01; SPPA_SplitPacket;;0x01;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h;SPACE_PACKET_PARSER
-0x1d01; PUS_ActivityStarted;;1;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d02; PUS_InvalidSubservice;;2;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d03; PUS_IllegalApplicationData;;3;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d04; PUS_SendTmFailed;;4;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x1d05; PUS_Timeout;;5;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h;ACCEPTS_TELECOMMANDS_IF
-0x4300; HSPI_OpeningFileFailed;;0;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
-0x4301; HSPI_FullDuplexTransferFailed;;1;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
-0x4302; HSPI_HalfDuplexTransferFailed;;2;fsfw/hal/src/fsfw_hal/linux/spi/SpiComIF.h;HAL_SPI
-0x4601; HGIO_UnknownGpioId;;1;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4602; HGIO_DriveGpioFailure;;2;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4603; HGIO_GpioTypeFailure;;3;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4604; HGIO_GpioInvalidInstance;;4;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4605; HGIO_GpioDuplicateDetected;;5;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4401; HURT_UartReadFailure;;1;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
-0x4402; HURT_UartReadSizeMissmatch;;2;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
-0x4403; HURT_UartRxBufferTooSmall;;3;fsfw/hal/src/fsfw_hal/linux/uart/UartComIF.h;HAL_UART
-0x4200; UXOS_ExecutionFinished;Execution of the current command has finished;0;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4201; UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4202; UXOS_BytesRead;Some bytes have been read from the executing process;2;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4203; UXOS_CommandError;Command execution failed;3;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4204; UXOS_NoCommandLoadedOrPending;;4;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x4206; UXOS_PcloseCallError;;6;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
-0x6d00; SCBU_KeyNotFound;;0;bsp_q7s/memory/scratchApi.h;SCRATCH_BUFFER
-0x6c00; SDMA_OpOngoing;;0;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c01; SDMA_AlreadyOn;;1;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c02; SDMA_AlreadyMounted;;2;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c03; SDMA_AlreadyOff;;3;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c0a; SDMA_StatusFileNexists;;10;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c0b; SDMA_StatusFileFormatInvalid;;11;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c0c; SDMA_MountError;;12;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c0d; SDMA_UnmountError;;13;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c0e; SDMA_SystemCallError;;14;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x6c0f; SDMA_PopenCallError;;15;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
-0x58a0;PLSV_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;0xA0;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a1;PLSV_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;0xA1;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a2;PLSV_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;0xA2;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a3;PLSV_InvalidApid;Received space packet with invalid APID from PLOC supervisor;0xA3;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a4;PLSV_GetTimeFailure;Failed to read current system time;0xA4;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a5;PLSV_InvalidUartComIf;Invalid communication interface specified;0xA5;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a6;PLSV_InvalidWatchdog;Received command with invalid watchdog parameter. Valid watchdogs are 0 for PS, 1 for PL and 2 for INT;0xA6;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a7;PLSV_InvalidWatchdogTimeout;Received watchdog timeout config command with invalid timeout. Valid timeouts must be in the range between 1000 and 360000 ms.;0xA7;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a8;PLSV_InvalidLatchupId;Received latchup config command with invalid latchup ID;0xA8;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58a9;PLSV_SweepPeriodTooSmall;Received set adc sweep period command with invalid sweep period. Must be larger than 21.;0xA9;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58aa;PLSV_InvalidTestParam;Receive auto EM test command with invalid test param. Valid params are 1 and 2.;0xAA;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58ab;PLSV_MramPacketParsingFailure;Returned when scanning for MRAM dump packets failed.;0xAB;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58ac;PLSV_InvalidMramAddresses;Returned when the start and stop addresses of the MRAM dump or MRAM  wipe commands are invalid (e.g. start address bigger than stop address);0xAC;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58ad;PLSV_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;0xAD;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58ae;PLSV_PathDoesNotExist;Path to PLOC directory on SD card does not exist;0xAE;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x58af;PLSV_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;0xAF;bsp_q7s/devices/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
-0x5ca0;PLUD_UpdaterBusy;Updater is already performing an update;0xA0;bsp_q7s/devices/PlocUpdater.h;PLOC_UPDATER
-0x5ca1;PLUD_NameTooLong;Received update command with invalid path string (too long).;0xA1;bsp_q7s/devices/PlocUpdater.h;PLOC_UPDATER
-0x5ca2;PLUD_SdNotMounted;Received command to initiate update but SD card with update image not mounted.;0xA2;bsp_q7s/devices/PlocUpdater.h;PLOC_UPDATER
-0x5ca3;PLUD_FileNotExists;Update file received with update command does not exist.;0xA3;bsp_q7s/devices/PlocUpdater.h;PLOC_UPDATER
-0x5fa0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;bsp_q7s/devices/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
-0x5fa1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;0xA1;bsp_q7s/devices/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
-0x6301;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
-0x6302;JSONBASE_SetNotExists;Requested set does not exist in json file;2;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
-0x6303;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
+0x3301; DC_NoReplyReceived;;0x01;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3302; DC_ProtocolError;;0x02;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3303; DC_Nullpointer;;0x03;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3304; DC_InvalidCookieType;;0x04;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3305; DC_NotActive;;0x05;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x3306; DC_TooMuchData;;0x06;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h;DEVICE_COMMUNICATION_IF
+0x2401; EV_ListenerNotFound;;1;fsfw/src/fsfw/events/EventManagerIF.h;EVENT_MANAGER_IF
+0x1a01; TRC_NotEnoughSensors;;1;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a02; TRC_LowestValueOol;;2;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a03; TRC_HighestValueOol;;3;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a04; TRC_BothValuesOol;;4;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x1a05; TRC_DuplexOol;;5;fsfw/src/fsfw/monitoring/TriplexMonitor.h;TRIPLE_REDUNDACY_CHECK
+0x3001; LIM_Unchecked;;1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3002; LIM_Invalid;;2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3003; LIM_Unselected;;3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3004; LIM_BelowLowLimit;;4;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3005; LIM_AboveHighLimit;;5;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3006; LIM_UnexpectedValue;;6;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3007; LIM_OutOfRange;;7;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30a0; LIM_FirstSample;;0xA0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e0; LIM_InvalidSize;;0xE0;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e1; LIM_WrongType;;0xE1;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e2; LIM_WrongPid;;0xE2;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30e3; LIM_WrongLimitId;;0xE3;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x30ee; LIM_MonitorNotFound;;0xEE;fsfw/src/fsfw/monitoring/MonitoringIF.h;LIMITS_IF
+0x3a01; SPH_SemaphoreTimeout;;1;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x3a02; SPH_SemaphoreNotOwned;;2;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x3a03; SPH_SemaphoreInvalid;;3;fsfw/src/fsfw/tasks/SemaphoreIF.h;SEMAPHORE_IF
+0x7200; SDMA_OpOngoing;;0;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x7201; SDMA_AlreadyOn;;1;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x7202; SDMA_AlreadyMounted;;2;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x7203; SDMA_AlreadyOff;;3;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x720a; SDMA_StatusFileNexists;;10;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x720b; SDMA_StatusFileFormatInvalid;;11;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x720c; SDMA_MountError;;12;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x720d; SDMA_UnmountError;;13;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x720e; SDMA_SystemCallError;;14;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x720f; SDMA_PopenCallError;;15;bsp_q7s/memory/SdCardManager.h;SD_CARD_MANAGER
+0x7300; SCBU_KeyNotFound;;0;bsp_q7s/memory/scratchApi.h;SCRATCH_BUFFER
+0x67a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;0xA0;bsp_q7s/memory/FilesystemHelper.h;FILE_SYSTEM_HELPER
+0x67a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;bsp_q7s/memory/FilesystemHelper.h;FILE_SYSTEM_HELPER
+0x6aa0;MPSOCRTVIF_CrcFailure;Space Packet received from PLOC has invalid CRC;0xA0;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa1;MPSOCRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC;0xA1;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa2;MPSOCRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC;0xA2;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa3;MPSOCRTVIF_InvalidApid;Received space packet with invalid APID from PLOC;0xA3;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa4;MPSOCRTVIF_InvalidLength;Received command with invalid length;0xA4;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa5;MPSOCRTVIF_FilenameTooLong;Filename of file in OBC filesystem is too long;0xA5;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa6;MPSOCRTVIF_MpsocHelperExecuting;MPSoC helper is currently executing a command;0xA6;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa7;MPSOCRTVIF_MpsocFilenameTooLong;Filename of MPSoC file is to long (max. 256 bytes);0xA7;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa8;MPSOCRTVIF_InvalidParameter;Command has invalid parameter;0xA8;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6aa9;MPSOCRTVIF_NameTooLong;Received command has file string with invalid length;0xA9;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
+0x6ba0;SPVRTVIF_CrcFailure;Space Packet received from PLOC supervisor has invalid CRC;0xA0;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba1;SPVRTVIF_ReceivedAckFailure;Received ACK failure reply from PLOC supervisor;0xA1;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba2;SPVRTVIF_ReceivedExeFailure;Received execution failure reply from PLOC supervisor;0xA2;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba3;SPVRTVIF_InvalidApid;Received space packet with invalid APID from PLOC supervisor;0xA3;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba4;SPVRTVIF_GetTimeFailure;Failed to read current system time;0xA4;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba5;SPVRTVIF_InvalidWatchdog;Received command with invalid watchdog parameter. Valid watchdogs are 0 for PS, 1 for PL and 2 for INT;0xA5;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba6;SPVRTVIF_InvalidWatchdogTimeout;Received watchdog timeout config command with invalid timeout. Valid timeouts must be in the range between 1000 and 360000 ms.;0xA6;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba7;SPVRTVIF_InvalidLatchupId;Received latchup config command with invalid latchup ID;0xA7;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba8;SPVRTVIF_SweepPeriodTooSmall;Received set adc sweep period command with invalid sweep period. Must be larger than 21.;0xA8;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6ba9;SPVRTVIF_InvalidTestParam;Receive auto EM test command with invalid test param. Valid params are 1 and 2.;0xA9;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6baa;SPVRTVIF_MramPacketParsingFailure;Returned when scanning for MRAM dump packets failed.;0xAA;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bab;SPVRTVIF_InvalidMramAddresses;Returned when the start and stop addresses of the MRAM dump or MRAM  wipe commands are invalid (e.g. start address bigger than stop address);0xAB;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bac;SPVRTVIF_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;0xAC;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bad;SPVRTVIF_PathDoesNotExist;Path to PLOC directory on SD card does not exist;0xAD;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bae;SPVRTVIF_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;0xAE;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6baf;SPVRTVIF_InvalidLength;Received action command has invalid length;0xAF;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bb0;SPVRTVIF_FilenameTooLong;Filename too long;0xB0;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bb1;SPVRTVIF_UpdateStatusReportInvalidLength;Received update status report with invalid packet length field;0xB1;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bb2;SPVRTVIF_UpdateCrcFailure;Update status report does not contain expected CRC. There might be a bit flip in the update memory region.;0xB2;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x6bb3;SPVRTVIF_SupvHelperExecuting;Supervisor helper task ist currently executing a command (wait until helper tas has finished or interrupt by sending the terminate command);0xB3;linux/devices/devicedefinitions/SupvReturnValuesIF.h;SUPV_RETURN_VALUES_IF
+0x57e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);0xE0;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
+0x57e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);0xE1;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
+0x61a0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
+0x61a1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;0xA1;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
+0x68a0; PLMPHLP_FileClosedAccidentally;File accidentally close;0xA0;linux/devices/ploc/PlocMPSoCHelper.h;PLOC_MPSOC_HELPER
+0x5aa0;PLSPVhLP_FileClosedAccidentally;File accidentally close;0xA0;linux/devices/ploc/PlocSupvHelper.h;PLOC_SUPV_HELPER
+0x5aa1;PLSPVhLP_ProcessTerminated;Process has been terminated by command;0xA1;linux/devices/ploc/PlocSupvHelper.h;PLOC_SUPV_HELPER
+0x5aa2;PLSPVhLP_PathNotExists;Received command with invalid pathname;0xA2;linux/devices/ploc/PlocSupvHelper.h;PLOC_SUPV_HELPER
+0x5aa3;PLSPVhLP_EventBufferReplyInvalidApid;Expected event buffer TM but received space packet with other APID;0xA3;linux/devices/ploc/PlocSupvHelper.h;PLOC_SUPV_HELPER
+0x6501;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
+0x6502;JSONBASE_SetNotExists;Requested set does not exist in json file;2;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
+0x6503;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
 0x56a0;STRH_TemperatureReqFailed;Status in temperature reply signals error;0xA0;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a1;STRH_PingFailed;Ping command failed;0xA1;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a2;STRH_VersionReqFailed;Status in version reply signals error;0xA2;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
-0x5da0;STRHLP_SdNotMounted;SD card specified in path string not mounted;0xA0;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da1;STRHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da2;STRHLP_PathNotExists;Specified path does not exist;0xA2;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da3;STRHLP_FileCreationFailed;Failed to create download image or read flash file;0xA3;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da4;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;0xA4;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da5;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;0xA5;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da6;STRHLP_LengthMismatch;Length in flash write/read reply does not match expected length;0xA6;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da7;STRHLP_StatusError;Status field in reply signals error;0xA7;linux/devices/startracker/StrHelper.h;STR_HELPER
-0x5da8;STRHLP_InvalidTypeId;Reply has invalid type ID (should be of action reply type);0xA8;linux/devices/startracker/StrHelper.h;STR_HELPER
 0x56a3;STRH_InterfaceReqFailed;Status in interface reply signals error;0xA3;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a4;STRH_PowerReqFailed;Status in power reply signals error;0xA4;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56a5;STRH_SetParamFailed;Status of reply to parameter set command signals error;0xA5;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
@@ -518,24 +524,33 @@
 0x56b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;0xB6;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56b7;STRH_StartrackerRunningFirmware;Star tracker is in firmware mode but must be in bootloader mode to execute this command;0xB7;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
 0x56b8;STRH_StartrackerRunningBootloader;Star tracker is in bootloader mode but must be in firmware mode to execute this command;0xB8;linux/devices/startracker/StarTrackerHandler.h;STR_HANDLER
-0x5ba0;PTME_UnknownVcId;;0xA0;linux/obc/Ptme.h;PTME
-0x60a0;PDEC_AbandonedCltu;;0xA0;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a1;PDEC_FrameDirty;;0xA1;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a2;PDEC_FrameIllegalMultipleReasons;;0xA2;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a3;PDEC_AdDiscardedLockout;;0xA3;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a4;PDEC_AdDiscardedWait;;0xA4;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a5;PDEC_AdDiscardedNsVs;;0xA5;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60b0;PDEC_CommandNotImplemented;Received action message with unknown action id;0xB0;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a6;PDEC_NoReport;;0xA6;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a7;PDEC_ErrorVersionNumber;;0xA7;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a8;PDEC_IllegalCombination;;0xA8;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60a9;PDEC_InvalidScId;;0xA9;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60aa;PDEC_InvalidVcIdMsb;;0xAA;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60ab;PDEC_InvalidVcIdLsb;;0xAB;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60ac;PDEC_NsNotZero;;0xAC;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x60ae;PDEC_InvalidBcCc;;0xAE;linux/obc/PdecHandler.h;PDEC_HANDLER
-0x62a0;RS_RateNotSupported;The commanded rate is not supported by the current FPGA design;0xA0;linux/obc/PtmeConfig.h;RATE_SETTER
-0x62a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);0xA1;linux/obc/PtmeConfig.h;RATE_SETTER
-0x62a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;0xA2;linux/obc/PtmeConfig.h;RATE_SETTER
-0x62a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;0xA3;linux/obc/PtmeConfig.h;RATE_SETTER
-0x5aa0;IPCI_PapbBusy;;0xA0;linux/obc/PapbVcInterface.h;CCSDS_IP_CORE_BRIDGE
+0x5fa0;STRHLP_SdNotMounted;SD card specified in path string not mounted;0xA0;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa1;STRHLP_FileNotExists;Specified file does not exist on filesystem;0xA1;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa2;STRHLP_PathNotExists;Specified path does not exist;0xA2;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa3;STRHLP_FileCreationFailed;Failed to create download image or read flash file;0xA3;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa4;STRHLP_RegionMismatch;Region in flash write/read reply does not match expected region;0xA4;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa5;STRHLP_AddressMismatch;Address in flash write/read reply does not match expected address;0xA5;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa6;STRHLP_LengthMismatch;Length in flash write/read reply does not match expected length;0xA6;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa7;STRHLP_StatusError;Status field in reply signals error;0xA7;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5fa8;STRHLP_InvalidTypeId;Reply has invalid type ID (should be of action reply type);0xA8;linux/devices/startracker/StrHelper.h;STR_HELPER
+0x5ca0;IPCI_PapbBusy;;0xA0;linux/obc/PapbVcInterface.h;CCSDS_IP_CORE_BRIDGE
+0x5da0;PTME_UnknownVcId;;0xA0;linux/obc/Ptme.h;PTME
+0x64a0;RS_RateNotSupported;The commanded rate is not supported by the current FPGA design;0xA0;linux/obc/PtmeConfig.h;RATE_SETTER
+0x64a1;RS_BadBitRate;Bad bitrate has been commanded (e.g. 0);0xA1;linux/obc/PtmeConfig.h;RATE_SETTER
+0x64a2;RS_ClkInversionFailed;Failed to invert clock and thus change the time the data is updated with respect to the tx clock;0xA2;linux/obc/PtmeConfig.h;RATE_SETTER
+0x64a3;RS_TxManipulatorConfigFailed;Failed to change configuration bit of tx clock manipulator;0xA3;linux/obc/PtmeConfig.h;RATE_SETTER
+0x62a0;PDEC_AbandonedCltu;;0xA0;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a1;PDEC_FrameDirty;;0xA1;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a2;PDEC_FrameIllegalMultipleReasons;;0xA2;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a3;PDEC_AdDiscardedLockout;;0xA3;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a4;PDEC_AdDiscardedWait;;0xA4;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a5;PDEC_AdDiscardedNsVs;;0xA5;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62b0;PDEC_CommandNotImplemented;Received action message with unknown action id;0xB0;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a6;PDEC_NoReport;;0xA6;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a7;PDEC_ErrorVersionNumber;;0xA7;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a8;PDEC_IllegalCombination;;0xA8;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62a9;PDEC_InvalidScId;;0xA9;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62aa;PDEC_InvalidVcIdMsb;;0xAA;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62ab;PDEC_InvalidVcIdLsb;;0xAB;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62ac;PDEC_NsNotZero;;0xAC;linux/obc/PdecHandler.h;PDEC_HANDLER
+0x62ae;PDEC_InvalidBcCc;;0xAE;linux/obc/PdecHandler.h;PDEC_HANDLER
diff --git a/config/retvals.py b/config/retvals.py
index ab1a78d..d6f7be9 100644
--- a/config/retvals.py
+++ b/config/retvals.py
@@ -1,6 +1,6 @@
 import os
-from tmtccmd.utility.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
+from tmtccmd.logging import get_console_logger
 
 DEFAULT_RETVAL_CSV_NAME = "config/returnvalues.csv"
 __RETVAL_DICT = None
diff --git a/config/version.py b/config/version.py
index eb51c97..56db5af 100644
--- a/config/version.py
+++ b/config/version.py
@@ -1,6 +1,6 @@
 SW_NAME = "eive"
 VERSION_MAJOR = 1
-VERSION_MINOR = 8
+VERSION_MINOR = 9
 VERSION_SUBMINOR = 0
 
-__version__ = "1.8.0"
+__version__ = "1.9.0"
diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py
index 38242c9..c8741c1 100644
--- a/gomspace/gomspace_common.py
+++ b/gomspace/gomspace_common.py
@@ -20,10 +20,30 @@ class GomspaceDeviceActionIds(enum.IntEnum):
     WDT_RESET = 9
     REQUEST_HK_TABLE = 16
     PRINT_SWITCH_V_I = 32
+    PRINT_LATCHUPS = 33
 
 
-class GomspaceOpCodes(enum.Enum):
-    PRINT_SWITCH_V_I = "32"
+class GomspaceOpCodes:
+    # Request HK
+    REQUEST_CORE_HK_ONCE = ["hk-core", "128"]
+    REQUEST_AUX_HK_ONCE = ["hk-aux", "129"]
+    PRINT_SWITCH_V_I = ["print-switch-vi", "130"]
+    PRINT_LATCHUPS = ["print-latchups", "131"]
+
+
+class Info:
+    REQUEST_CORE_HK_ONCE = "Requesting Core HK once"
+    REQUEST_AUX_HK_ONCE = "Requesting Aux HK once"
+
+
+class SetIds:
+    PDU_1_CORE = 1
+    PDU_1_AUX = 2
+    PDU_2_CORE = 3
+    PDU_2_AUX = 4
+    P60_CORE = 5
+    P60_AUX = 6
+    ACU = 7
 
 
 class TableIds:
diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index 339ccf0..37e4a8e 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -83,6 +83,11 @@ def add_core_controller_definitions(cmd_dict: ServiceOpCodeDictT):
         keys=OpCodes.RESET_REBOOT_COUNTER_11,
         info="Reset reboot counter 1 1",
     )
+    add_op_code_entry(
+        op_code_dict=od,
+        keys=OpCodes.GET_HK,
+        info="Request housekeeping set",
+    )
     add_service_op_code_entry(
         srv_op_code_dict=cmd_dict,
         name=CustomServiceList.CORE.value,
@@ -92,25 +97,44 @@ def add_core_controller_definitions(cmd_dict: ServiceOpCodeDictT):
 
 
 def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
-    from pus_tc.devs.plpcdu import OpCodes
+    from pus_tc.devs.plpcdu import OpCodes, Info
 
     op_code_dict = dict()
     add_op_code_entry(
-        op_code_dict=op_code_dict, keys=OpCodes.SWITCH_ON, info="Switch PL PCDU on"
+        op_code_dict=op_code_dict, keys=OpCodes.SWITCH_ON, info=Info.SWITCH_ON
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=OpCodes.SWITCH_ADC_NORMAL,
-        info="Switch PL PCDU ADC normal, submode ADC ON",
-    )
-    add_op_code_entry(
-        op_code_dict=op_code_dict, keys=OpCodes.SWITCH_OFF, info="Switch PL PCDU off"
+        keys=OpCodes.NORMAL_SSR,
+        info=Info.NORMAL_SSR,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=OpCodes.SWITCH_ALL_NORMAL,
-        info="Switch all PL PCDU modules normal, submode ALL ON",
-        options=generate_op_code_options(enter_listener_mode=True),
+        keys=OpCodes.NORMAL_DRO,
+        info=Info.NORMAL_DRO,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=OpCodes.NORMAL_X8,
+        info=Info.NORMAL_X8,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=OpCodes.NORMAL_TX,
+        info=Info.NORMAL_TX,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=OpCodes.NORMAL_MPA,
+        info=Info.NORMAL_MPA,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=OpCodes.NORMAL_HPA,
+        info=Info.NORMAL_HPA,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict, keys=OpCodes.SWITCH_OFF, info=Info.SWITCH_OFF
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
@@ -155,38 +179,71 @@ def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
 
 
-def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
-    from pus_tc.devs.p60dock import P60OpCodes, GomspaceOpCodes
-    from pus_tc.devs.pdu1 import Pdu1OpCodes
-    from pus_tc.devs.pdu2 import Pdu2OpCodes
+def add_time_cmds(cmd_dict: ServiceOpCodeDictT):
+    from pus_tc.system.time import OpCodes, Info
 
     op_code_dict = dict()
-    add_op_code_entry(op_code_dict=op_code_dict, keys="0", info="P60 Tests")
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=P60OpCodes.STACK_3V3_ON.value,
-        info="P60 Dock: Turn stack 3V3 on",
+        keys=OpCodes.SET_CURRENT_TIME,
+        info=Info.SET_CURRENT_TIME,
+    )
+    add_service_op_code_entry(
+        srv_op_code_dict=cmd_dict,
+        name=CustomServiceList.TIME.value,
+        info="Time Service",
+        op_code_entry=op_code_dict,
+    )
+
+
+def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
+    from pus_tc.devs.p60dock import P60OpCodes, GomspaceOpCodes, Info
+    from pus_tc.devs.pdu1 import Pdu1OpCodes
+    from pus_tc.devs.pdu2 import Pdu2OpCodes
+    from gomspace.gomspace_common import Info as GsInfo
+
+    op_code_dict = dict()
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=P60OpCodes.STACK_3V3_ON,
+        info=Info.STACK_3V3_ON,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=P60OpCodes.STACK_3V3_OFF.value,
-        info="P60 Dock: Turn stack 3V3 off",
+        keys=P60OpCodes.STACK_3V3_OFF,
+        info=Info.STACK_3V3_OFF,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=P60OpCodes.STACK_5V_ON.value,
-        info="P60 Dock: Turn stack 5V on",
+        keys=P60OpCodes.STACK_5V_ON,
+        info=Info.STACK_5V_ON,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=P60OpCodes.STACK_5V_OFF.value,
-        info="P60 Dock: Turn stack 5V off",
+        keys=P60OpCodes.STACK_5V_OFF,
+        info=Info.STACK_5V_OFF,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.PRINT_SWITCH_V_I.value,
+        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
+        info=GsInfo.REQUEST_CORE_HK_ONCE,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
+        info=GsInfo.REQUEST_AUX_HK_ONCE,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
         info="P60 Dock: Print Switches, Voltages, Currents",
     )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.PRINT_LATCHUPS,
+        info="P60 Dock: Print Latchups",
+    )
+    add_op_code_entry(op_code_dict=op_code_dict, keys=P60OpCodes.TEST, info="P60 Tests")
     add_service_op_code_entry(
         srv_op_code_dict=cmd_dict,
         name=CustomServiceList.P60DOCK.value,
@@ -195,7 +252,6 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
 
     op_code_dict = dict()
-    add_op_code_entry(op_code_dict=op_code_dict, keys="0", info="PDU1 Tests")
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu1OpCodes.TCS_BOARD_ON.value,
@@ -254,7 +310,17 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu1OpCodes.MGT_OFF.value,
-        info="PDU1: Turn MGT on",
+        info="PDU1: Turn MGT off",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu1OpCodes.PLOC_ON.value,
+        info="PDU1: Turn PLOC on",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu1OpCodes.PLOC_OFF.value,
+        info="PDU1: Turn PLOC off",
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
@@ -268,9 +334,27 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.PRINT_SWITCH_V_I.value,
+        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
+        info=GsInfo.REQUEST_CORE_HK_ONCE,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
+        info=GsInfo.REQUEST_AUX_HK_ONCE,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
         info="PDU1: Print Switches, Voltages, Currents",
     )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.PRINT_LATCHUPS,
+        info="PDU1: Print Latchups",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict, keys=Pdu1OpCodes.TESTS.value, info="PDU1 Tests"
+    )
     add_service_op_code_entry(
         srv_op_code_dict=cmd_dict,
         name=CustomServiceList.PDU1.value,
@@ -279,61 +363,108 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
 
     op_code_dict = dict()
-    add_op_code_entry(
-        op_code_dict=op_code_dict,
-        keys="0",
-        info="PDU2 Tests",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
-    )
+    add_op_code_entry(op_code_dict=op_code_dict, keys="0", info="PDU2 Tests")
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu2OpCodes.ACS_SIDE_B_ON.value,
         info="PDU2: Turn ACS Side B on",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu2OpCodes.ACS_SIDE_B_OFF.value,
         info="PDU2: Turn ACS Side B off",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu2OpCodes.SUS_REDUNDANT_ON.value,
         info="PDU2: Turn SUS redundant on",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu2OpCodes.SUS_REDUNDANT_OFF.value,
         info="PDU2: Turn SUS redundant off",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu2OpCodes.RW_ON.value,
         info="PDU2: Turn reaction wheels on",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=Pdu2OpCodes.RW_OFF.value,
         info="PDU2: Turn reaction wheels off",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=Pdu2OpCodes.Q7S_OFF.value,
-        info="Q7S Off",
-        options={OpCodeDictKeys.TIMEOUT: 2.0},
+        keys=Pdu2OpCodes.PL_PCDU_VBAT_NOM_ON.value,
+        info="PDU2: PL PCDU Switch Channel Nominal (1) on",
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.PRINT_SWITCH_V_I.value,
+        keys=Pdu2OpCodes.PL_PCDU_VBAT_NOM_OFF.value,
+        info="PDU2: PL PCDU Switch Channel Nominal (1) off",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.PL_PCDU_VBAT_RED_ON.value,
+        info="PDU2: PL PCDU Switch Channel Redundant (1) on",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.PL_PCDU_VBAT_RED_OFF.value,
+        info="PDU2: PL PCDU Switch Channel Redundant (1) off",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.TCS_HEATER_IN_ON.value,
+        info="PDU2: Switch TCS Heater Input on",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.TCS_HEATER_IN_OFF.value,
+        info="PDU2: Switch TCS Heater Input off",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.SOLAR_ARRAY_DEPL_ON.value,
+        info="PDU2: Switch Solar Array Deployment On",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.SOLAR_ARRAY_DEPL_OFF.value,
+        info="PDU2: Switch Solar Array Deployment Off",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.PL_CAMERA_ON.value,
+        info="PDU2: Turn payload camera on",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=Pdu2OpCodes.PL_CAMERA_OFF.value,
+        info="PDU2: Turn payload camera off",
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
+        info=GsInfo.REQUEST_CORE_HK_ONCE,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
+        info=GsInfo.REQUEST_AUX_HK_ONCE,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.PRINT_SWITCH_V_I,
         info="PDU2: Print Switches, Voltages, Currents",
         options={OpCodeDictKeys.TIMEOUT: 2.0},
     )
-
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=GomspaceOpCodes.PRINT_LATCHUPS,
+        info="PDU2: Print Latchups",
+    )
     add_service_op_code_entry(
         srv_op_code_dict=cmd_dict,
         name="pdu2",
@@ -382,12 +513,40 @@ def add_rad_sens_cmds(cmd_dict: ServiceOpCodeDictT):
         "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}),
+        "3": ("Radiation Sensor: Start conversions", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Radiation Sensor: Read conversions", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Radiation Sensor: Enable debug output", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("Radiation Sensor: Disable debug putput", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_rad_sensor_tuple = ("Radiation Sensor", op_code_dict_srv_rad_sensor)
     cmd_dict[CustomServiceList.RAD_SENSOR.value] = service_rad_sensor_tuple
 
 
-def add_ploc_cmds(cmd_dict: ServiceOpCodeDictT):
+def add_ploc_mpsoc_cmds(cmd_dict: ServiceOpCodeDictT):
+    op_code_dict_srv_ploc_mpsoc = {
+        "0": ("Ploc MPSoC: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("Ploc MPSoC: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Ploc MPSoC: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Ploc MPSoC: Memory write", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Ploc MPSoC: Memory read", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Ploc MPSoC: Flash write", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("Ploc MPSoC: Flash delete", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "7": ("Ploc MPSoC: Replay start", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": ("Ploc MPSoC: Replay stop", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "9": ("Ploc MPSoC: Downlink pwr on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "10": ("Ploc MPSoC: Downlink pwr off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "11": ("Ploc MPSoC: Replay write sequence", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "12": ("Ploc MPSoC: OBSW reset sequence count", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "13": ("Ploc MPSoC: Read DEADBEEF address", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "14": ("Ploc MPSoC: Mode replay", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "15": ("Ploc MPSoC: Mode idle", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "16": ("Ploc MPSoC: Tc cam command send", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_ploc_mpsoc_tuple = ("Ploc MPSoC", op_code_dict_srv_ploc_mpsoc)
+    cmd_dict[CustomServiceList.PLOC_MPSOC.value] = service_ploc_mpsoc_tuple
+
+
+def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT):
     op_code_dict_ploc_mem_dumper = {
         "0": ("PLOC Memory Dumper: MRAM dump", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
@@ -397,9 +556,9 @@ def add_ploc_cmds(cmd_dict: ServiceOpCodeDictT):
     )
 
     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}),
+        "0": ("PLOC Supervisor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("PLOC Supervisor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("PLOC Supervisor: Set mode normal", {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}),
@@ -447,7 +606,6 @@ def add_ploc_cmds(cmd_dict: ServiceOpCodeDictT):
             "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}),
@@ -468,6 +626,20 @@ def add_ploc_cmds(cmd_dict: ServiceOpCodeDictT):
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
         "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "42": ("PLOC Supervisor: Perform update", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "43": ("PLOC Supervisor: Terminate supervisor process", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "44": ("PLOC Supervisor: Start MPSoC quiet", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "45": ("PLOC Supervisor: Set shutdown timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "46": ("PLOC Supervisor: Factory flash", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "47": ("PLOC Supervisor: Enable auto TM", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "48": ("PLOC Supervisor: Disable auto TM", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "49": ("PLOC Supervisor: Enable ADC monitor task", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "50": ("PLOC Supervisor: Disable ADC monitor task", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "51": ("PLOC Supervisor: Logging request event buffers", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "52": ("PLOC Supervisor: Logging clear counters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "53": ("PLOC Supervisor: Logging set topic", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "54": ("PLOC Supervisor: Logging request counters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "55": ("PLOC Supervisor: Request ADC Report", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
 
@@ -514,50 +686,54 @@ def add_ploc_cmds(cmd_dict: ServiceOpCodeDictT):
 
 
 def add_system_cmds(cmd_dict: ServiceOpCodeDictT):
-    from pus_tc.system.acs import AcsOpCodes
-    default_opts = generate_op_code_options(enter_listener_mode=False, custom_timeout=8.0)
+    from pus_tc.system.acs import AcsOpCodes, SusOpCodes
+    import pus_tc.system.tcs as tcs
+
+    default_opts = generate_op_code_options(
+        enter_listener_mode=False, custom_timeout=8.0
+    )
     op_code_dict = dict()
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_A_SIDE,
         info="Switch to ACS board A side",
-        options=default_opts
+        options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_B_SIDE,
         info="Switch to ACS board B side",
-        options=default_opts
+        options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_DUAL_MODE,
         info="Switch to ACS board dual mode",
-        options=default_opts
+        options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_A_ON,
         info="Switch ACS board A side on",
-        options=default_opts
+        options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_B_ON,
         info="Switch ACS board B side on",
-        options=default_opts
+        options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_DUAL_ON,
         info="Switch ACS board dual mode on",
-        options=default_opts
+        options=default_opts,
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
         keys=AcsOpCodes.ACS_ASS_OFF,
         info="Switch off ACS board",
-        options=default_opts
+        options=default_opts,
     )
     add_service_op_code_entry(
         srv_op_code_dict=cmd_dict,
@@ -565,3 +741,55 @@ def add_system_cmds(cmd_dict: ServiceOpCodeDictT):
         info="ACS Assemblies",
         op_code_entry=op_code_dict,
     )
+
+    op_code_dict = dict()
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=SusOpCodes.SUS_ASS_NOM_SIDE,
+        info="Switch SUS board to nominal side",
+        options=default_opts,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=SusOpCodes.SUS_ASS_RED_SIDE,
+        info="Switch SUS board to redundant side",
+        options=default_opts,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=SusOpCodes.SUS_ASS_OFF,
+        info="Switch off SUS board",
+        options=default_opts,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=SusOpCodes.SUS_ASS_DUAL_MODE,
+        info="Switch SUS board to dual mode",
+        options=default_opts,
+    )
+    add_service_op_code_entry(
+        srv_op_code_dict=cmd_dict,
+        name=CustomServiceList.SUS_ASS.value,
+        info="SUS Assembly",
+        op_code_entry=op_code_dict,
+    )
+
+    op_code_dict = dict()
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=tcs.OpCodes.TCS_BOARD_ASS_NORMAL,
+        info=tcs.Info.TCS_BOARD_ASS_NORMAL,
+        options=default_opts,
+    )
+    add_op_code_entry(
+        op_code_dict=op_code_dict,
+        keys=tcs.OpCodes.TCS_BOARD_ASS_OFF,
+        info=tcs.Info.TCS_BOARD_ASS_OFF,
+        options=default_opts,
+    )
+    add_service_op_code_entry(
+        srv_op_code_dict=cmd_dict,
+        name=CustomServiceList.TCS_ASS.value,
+        info="TCS Board Assembly",
+        op_code_entry=op_code_dict,
+    )
diff --git a/pus_tc/devs/heater.py b/pus_tc/devs/heater.py
index 36de073..e04b5b0 100644
--- a/pus_tc/devs/heater.py
+++ b/pus_tc/devs/heater.py
@@ -29,8 +29,8 @@ class ActionIds:
 def pack_heater_test_into(object_id: bytearray, tc_queue: TcQueueT):
     tc_queue.appendleft((QueueCommands.PRINT, "Testing Heater Switching"))
 
-    heater_number = int(input("Type number of heater to switch: "))
-    if heater_number >= SwitchNumbers.NUMBER_OF_SWITCHES:
+    heater_number = int(input("Type number of heater to switch [0-7]: "))
+    if heater_number >= SwitchNumbers.NUMBER_OF_SWITCHES or heater_number < 0:
         print("Invalid heater switch number")
         return
     action = int(input("Turn switch on or off? (0 - off, 1 - on): "))
@@ -52,7 +52,8 @@ def pack_switch_heater_command(
     @param switch_action    Action to perform. 0 - Sets switch off, 1 - Sets switch on.
     """
     action_id = ActionIds.SWITCH_HEATER
-    command = object_id + action_id
+    command = bytearray()
+    command += object_id + action_id
     command.append(switch_nr)
     command.append(switch_action)
     return command
diff --git a/pus_tc/devs/p60dock.py b/pus_tc/devs/p60dock.py
index d4ccdca..dbdc59a 100644
--- a/pus_tc/devs/p60dock.py
+++ b/pus_tc/devs/p60dock.py
@@ -7,15 +7,32 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.tc.service_3_housekeeping import (
+    generate_one_hk_command,
+    make_sid,
+    generate_one_diag_command,
+)
 from gomspace.gomspace_common import *
+from config.object_ids import P60_DOCK_HANDLER
 
 
-class P60OpCodes(enum.Enum):
-    TEST = "0"
-    STACK_3V3_ON = "1"
-    STACK_3V3_OFF = "2"
-    STACK_5V_ON = "3"
-    STACK_5V_OFF = "4"
+HK_SET_ID = 0x3
+
+
+class P60OpCodes:
+    STACK_3V3_ON = ["stack-3v3-on", "1"]
+    STACK_3V3_OFF = ["stack-3v3-off", "2"]
+    STACK_5V_ON = ["stack-5v-on", "3"]
+    STACK_5V_OFF = ["stack-5v-off", "4"]
+    TEST = ["test", "0"]
+
+
+class Info:
+    PREFIX = "P60 Dock"
+    STACK_3V3_ON = f"{PREFIX}: Turn Stack 3V3 on"
+    STACK_3V3_OFF = f"{PREFIX}: Turn Stack 3V3 off"
+    STACK_5V_ON = f"{PREFIX}: Turn Stack 5V on"
+    STACK_5V_OFF = f"{PREFIX}: Turn Stack 5V off"
 
 
 class P60DockTestProcedure:
@@ -73,9 +90,9 @@ class P60DockHkTable:
     wdt_gnd_left = TableEntry(bytearray([0x00, 0xA8]), TableEntry.uint32_size)
 
 
-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"))
+def pack_p60dock_cmds(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+    if op_code in P60OpCodes.STACK_3V3_ON:
+        tc_queue.appendleft((QueueCommands.PRINT, Info.STACK_3V3_ON))
         command = pack_set_param_command(
             object_id,
             P60DockConfigTable.out_en_9.parameter_address,
@@ -83,8 +100,8 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             Channel.on,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == P60OpCodes.STACK_3V3_OFF.value:
-        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 3V3 off"))
+    if op_code in P60OpCodes.STACK_3V3_OFF:
+        tc_queue.appendleft((QueueCommands.PRINT, Info.STACK_3V3_OFF))
         command = pack_set_param_command(
             object_id,
             P60DockConfigTable.out_en_9.parameter_address,
@@ -92,8 +109,8 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == P60OpCodes.STACK_5V_ON.value:
-        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 5V on"))
+    if op_code in P60OpCodes.STACK_5V_ON:
+        tc_queue.appendleft((QueueCommands.PRINT, Info.STACK_5V_ON))
         command = pack_set_param_command(
             object_id,
             P60DockConfigTable.out_en_10.parameter_address,
@@ -101,8 +118,8 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             Channel.on,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == P60OpCodes.STACK_5V_OFF.value:
-        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Turning stack 5V off"))
+    if op_code in P60OpCodes.STACK_5V_OFF:
+        tc_queue.appendleft((QueueCommands.PRINT, Info.STACK_5V_OFF))
         command = pack_set_param_command(
             object_id,
             P60DockConfigTable.out_en_10.parameter_address,
@@ -110,7 +127,21 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "P60 Dock: Requesting HK Core HK Once")
+        )
+        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_CORE)
+        command = generate_one_hk_command(sid=hk_sid, ssc=0)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "P60 Dock: Requesting HK Aux HK Once")
+        )
+        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_AUX)
+        command = generate_one_hk_command(sid=hk_sid, ssc=0)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
         tc_queue.appendleft(
             (QueueCommands.PRINT, "P60 Dock: Print Switches, Voltages, Currents")
         )
@@ -118,7 +149,12 @@ def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: st
             object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
         )
         tc_queue.appendleft(command.pack_command_tuple())
-        return
+    if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Print Latchups"))
+        command = generate_action_command(
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
     if P60DockTestProcedure.all or P60DockTestProcedure.reboot:
         tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Reboot"))
         command = pack_reboot_command(object_id)
diff --git a/pus_tc/devs/pdu1.py b/pus_tc/devs/pdu1.py
index 333002d..2028639 100644
--- a/pus_tc/devs/pdu1.py
+++ b/pus_tc/devs/pdu1.py
@@ -5,27 +5,36 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.tc.service_3_housekeeping import (
+    generate_one_hk_command,
+    make_sid,
+    generate_one_diag_command,
+)
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
+from config.object_ids import PDU_1_HANDLER_ID
 
 
 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"
-    SYRLINKS_ON = "9"
-    SYRLINKS_OFF = "10"
-    MGT_ON = "11"
-    MGT_OFF = "12"
+    TCS_BOARD_ON = "0"
+    TCS_BOARD_OFF = "1"
+    STAR_TRACKER_ON = "2"
+    STAR_TRACKER_OFF = "3"
+    SUS_NOMINAL_ON = "4"
+    SUS_NOMINAL_OFF = "5"
+    ACS_A_SIDE_ON = "6"
+    ACS_A_SIDE_OFF = "7"
+    SYRLINKS_ON = "8"
+    SYRLINKS_OFF = "9"
+    MGT_ON = "10"
+    MGT_OFF = "11"
     # Solar Cell Experiment
-    SCEX_ON = "13"
-    SCEX_OFF = "14"
+    SCEX_ON = "12"
+    SCEX_OFF = "13"
+    PLOC_ON = "14"
+    PLOC_OFF = "15"
+
+    TESTS = "32"
 
 
 class PDU1TestProcedure:
@@ -53,7 +62,7 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
         command = pack_set_param_command(
             object_id,
             PDUConfigTable.out_en_0.parameter_address,
-            PDUConfigTable.out_en_2.parameter_size,
+            PDUConfigTable.out_en_0.parameter_size,
             Channel.on,
         )
         tc_queue.appendleft(command.pack_command_tuple())
@@ -62,7 +71,7 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
         command = pack_set_param_command(
             object_id,
             PDUConfigTable.out_en_0.parameter_address,
-            PDUConfigTable.out_en_2.parameter_size,
+            PDUConfigTable.out_en_0.parameter_size,
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
@@ -151,14 +160,6 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             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 op_code == Pdu1OpCodes.SYRLINKS_ON.value:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn Syrlinks on"))
         command = pack_set_param_command(
@@ -195,6 +196,48 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.PLOC_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn PLOC on"))
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_6.parameter_address,
+            PDUConfigTable.out_en_6.parameter_size,
+            Channel.on,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu1OpCodes.PLOC_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn PLOC off"))
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_6.parameter_address,
+            PDUConfigTable.out_en_6.parameter_size,
+            Channel.off,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, f"PDU1: {Info.REQUEST_CORE_HK_ONCE}"))
+        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1_CORE)
+        command = generate_one_diag_command(sid=hk_sid, ssc=0)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, f"PDU1: {Info.REQUEST_AUX_HK_ONCE}"))
+        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1_AUX)
+        command = generate_one_hk_command(sid=hk_sid, ssc=0)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
+        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 op_code in GomspaceOpCodes.PRINT_LATCHUPS:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Print Latchups"))
+        command = generate_action_command(
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
+        )
+        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])
diff --git a/pus_tc/devs/pdu2.py b/pus_tc/devs/pdu2.py
index 6b2b83c..c4e3623 100644
--- a/pus_tc/devs/pdu2.py
+++ b/pus_tc/devs/pdu2.py
@@ -8,8 +8,14 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.tc.service_3_housekeeping import (
+    generate_one_hk_command,
+    generate_one_diag_command,
+    make_sid,
+)
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
+from config.object_ids import PDU_2_HANDLER_ID
 
 
 class Pdu2OpCodes(enum.Enum):
@@ -19,8 +25,18 @@ class Pdu2OpCodes(enum.Enum):
     SUS_REDUNDANT_OFF = "4"
     RW_ON = "5"
     RW_OFF = "6"
+    PL_PCDU_VBAT_NOM_ON = "7"
+    PL_PCDU_VBAT_NOM_OFF = "8"
+    PL_PCDU_VBAT_RED_ON = "9"
+    PL_PCDU_VBAT_RED_OFF = "10"
+    TCS_HEATER_IN_ON = "11"
+    TCS_HEATER_IN_OFF = "12"
+    SOLAR_ARRAY_DEPL_ON = "13"
+    SOLAR_ARRAY_DEPL_OFF = "14"
+    PL_CAMERA_ON = "15"
+    PL_CAMERA_OFF = "16"
     # There is not really a point of the on command, the SW can not be commanded if the OBC is off
-    Q7S_OFF = "7"
+    Q7S_OFF = "32"
 
 
 class PDU2TestProcedure:
@@ -118,7 +134,119 @@ def pack_pdu2_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == GomspaceOpCodes.PRINT_SWITCH_V_I.value:
+    if op_code == Pdu2OpCodes.PL_PCDU_VBAT_NOM_ON.value:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Turn PDU2 PL PCDU Channel 1 on")
+        )
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_1.parameter_address,
+            PDUConfigTable.out_en_1.parameter_size,
+            Channel.on,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.PL_PCDU_VBAT_NOM_OFF.value:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Turn PDU2 PL PCDU Channel 1 off")
+        )
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_1.parameter_address,
+            PDUConfigTable.out_en_1.parameter_size,
+            Channel.off,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.PL_PCDU_VBAT_RED_ON.value:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Turn PDU2 PL PCDU Channel 6 on")
+        )
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_6.parameter_address,
+            PDUConfigTable.out_en_6.parameter_size,
+            Channel.off,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.PL_PCDU_VBAT_RED_OFF.value:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Turn PDU2 PL PCDU Channel 6 off")
+        )
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_6.parameter_address,
+            PDUConfigTable.out_en_6.parameter_size,
+            Channel.off,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.TCS_HEATER_IN_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn TCS Heater Input on"))
+        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 op_code == Pdu2OpCodes.TCS_HEATER_IN_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn TCS Heater Input off"))
+        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())
+    if op_code == Pdu2OpCodes.SOLAR_ARRAY_DEPL_ON.value:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Turn Solar Array Deployment On")
+        )
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_5.parameter_address,
+            PDUConfigTable.out_en_5.parameter_size,
+            Channel.on,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.SOLAR_ARRAY_DEPL_OFF.value:
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU2: Turn Solar Array Deployment Off")
+        )
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_5.parameter_address,
+            PDUConfigTable.out_en_5.parameter_size,
+            Channel.off,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.PL_CAMERA_ON.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn payload camera on"))
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_8.parameter_address,
+            PDUConfigTable.out_en_8.parameter_size,
+            Channel.on,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == Pdu2OpCodes.PL_CAMERA_OFF.value:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Turn payload camera off"))
+        command = pack_set_param_command(
+            object_id,
+            PDUConfigTable.out_en_8.parameter_address,
+            PDUConfigTable.out_en_8.parameter_size,
+            Channel.off,
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, f"PDU2: {Info.REQUEST_CORE_HK_ONCE}"))
+        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2_CORE)
+        command = generate_one_diag_command(sid=hk_sid, ssc=0)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, f"PDU2: {Info.REQUEST_AUX_HK_ONCE}"))
+        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2_AUX)
+        command = generate_one_hk_command(sid=hk_sid, ssc=0)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:
         tc_queue.appendleft(
             (QueueCommands.PRINT, "PDU2: Print Switches, Currents, Voltahes")
         )
@@ -126,7 +254,12 @@ def pack_pdu2_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I
         )
         tc_queue.appendleft(command.pack_command_tuple())
-
+    if op_code in GomspaceOpCodes.PRINT_LATCHUPS:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Print Latchups"))
+        command = generate_action_command(
+            object_id=object_id, action_id=GomspaceDeviceActionIds.PRINT_LATCHUPS
+        )
+        tc_queue.appendleft(command.pack_command_tuple())
     if PDU2TestProcedure.all or PDU2TestProcedure.reboot:
         tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Reboot"))
         command = pack_reboot_command(object_id)
diff --git a/pus_tc/devs/ploc_mpsoc.py b/pus_tc/devs/ploc_mpsoc.py
index 5fc2224..9a39acb 100644
--- a/pus_tc/devs/ploc_mpsoc.py
+++ b/pus_tc/devs/ploc_mpsoc.py
@@ -7,63 +7,180 @@
 @date   06.03.2021
 """
 import struct
+import enum
 
 from tmtccmd.config.definitions import QueueCommands
-
+from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
+from utility.input_helper import InputHelper
+from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
+
+LOGGER = get_console_logger()
+
+MANUAL_INPUT = "1"
+
+flash_write_file_dict = {
+    MANUAL_INPUT: ["manual input", ""],
+    "2": ["/mnt/sd0/ploc/mpsoc/flash_write.bin", "/mnt/sd0/ploc/mpsoc/flash_write.bin"],
+}
+
+mpsoc_file_dict = {
+    MANUAL_INPUT: ["manual input", ""],
+    "2": ["0:/flash", "0:/flash"],
+}
+
+sequence_file_dict = {
+    MANUAL_INPUT: ["manual input", ""],
+    "2": ["0:/EM16/231", "0:/EM16/231"],
+    "3": ["0:/EQ04/E-75", "0:/EQ04/E-75"],
+}
+
+CARRIAGE_RETURN = 0xD
 
 
-class PlocTestProcedure:
-    """
-    @brief  Use this class to define the tests to perform for the PLOC.
-    @details    Setting all to True will run all tests.
-                Setting all to False will only run the tests set to True.
-    """
-
-    all = False
-    test_tc_mem_write = False
-    test_tc_mem_read = True
+class CommandIds(enum.IntEnum):
+    TC_MEM_WRITE = 1
+    TC_MEM_READ = 2
+    FLASH_WRITE = 9
+    TC_FLASH_DELETE = 10
+    TC_REPLAY_START = 11
+    TC_REPLAY_STOP = 12
+    TC_REPLAY_WRITE_SEQUENCE = 13
+    TC_DOWNLINK_PWR_ON = 14
+    TC_DOWNLINK_PWR_OFF = 15
+    OBSW_RESET_SEQ_COUNT = 50
+    TC_MODE_REPLAY = 16
+    TC_CAM_CMD_SEND = 17
+    TC_MODE_IDLE = 18
 
 
-class PlocActionIds:
-    tc_mem_write = bytearray([0x0, 0x0, 0x0, 0x1])
-    tc_mem_read = bytearray([0x0, 0x0, 0x0, 0x2])
+class MemAddresses(enum.IntEnum):
+    DEADBEEF = 0x40000004
 
 
 class PlocReplyIds:
     tm_mem_read_report = 6
 
 
-def pack_ploc_mpsoc_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_ploc_mpsoc_commands(
+    object_id: bytearray, tc_queue: TcQueueT, op_code: str
+) -> TcQueueT:
     tc_queue.appendleft(
-        (QueueCommands.PRINT, "Testing PLOC MPSoC with object id: 0x" + object_id.hex())
+        (
+            QueueCommands.PRINT,
+            "Generate command for PLOC MPSoC with object id: 0x" + object_id.hex(),
+        )
     )
 
-    if PlocTestProcedure.all or PlocTestProcedure.test_tc_mem_write:
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC: TC Mem Write Test"))
-        memory_address = int(input("PLOC Tc Mem Write: Type memory address: 0x"), 16)
-        memory_data = int(input("PLOC Tc Mem Write: Type memory data: 0x"), 16)
-        command = generate_write_mem_command(
-            object_id, struct.pack("!I", memory_address), memory_data
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Set mode off"))
+        command = pack_mode_data(object_id, Modes.OFF, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=9, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Set mode on"))
+        command = pack_mode_data(object_id, Modes.ON, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Mode Normal"))
+        command = pack_mode_data(object_id, Modes.NORMAL, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: TC mem write test"))
+        memory_address = int(
+            input("PLOC MPSoC: Tc Mem Write: Type memory address: 0x"), 16
         )
+        memory_data = int(input("PLOC MPSoC: Tc Mem Write: Type memory data: 0x"), 16)
+        # TODO: implement variable length mem write command
+        mem_len = 1  # 1 32-bit word
+        command = generate_write_mem_command(
+            object_id, memory_address, memory_data, mem_len
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: TC mem read test"))
+        command = prepare_mem_read_command(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Flash write"))
+        command = prepare_flash_write_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Flash delete"))
+        command = prepare_flash_delete_cmd(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-
-    if PlocTestProcedure.all or PlocTestProcedure.test_tc_mem_read:
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC: TC Mem Read Test"))
-        memory_address = int(input("PLOC Tc Mem Read: Type memory address: 0x"), 16)
-        command = (
-            object_id + PlocActionIds.tc_mem_read + struct.pack("!I", memory_address)
-        )
+    elif op_code == "7":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Replay start"))
+        command = prepare_replay_start_cmd(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "8":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Replay stop"))
+        command = object_id + struct.pack("!I", CommandIds.TC_REPLAY_STOP)
+        command = PusTelecommand(service=8, subservice=128, ssc=25, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "9":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Downlink pwr on"))
+        command = prepare_downlink_pwr_on_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=26, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "10":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Downlink pwr off"))
+        command = object_id + struct.pack("!I", CommandIds.TC_DOWNLINK_PWR_OFF)
+        command = PusTelecommand(service=8, subservice=128, ssc=26, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "11":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Replay write sequence"))
+        command = prepare_replay_write_sequence_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "12":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC MPSoC: Reset OBSW sequence count")
+        )
+        command = object_id + struct.pack("!I", CommandIds.OBSW_RESET_SEQ_COUNT)
+        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "13":
+        num_words = 1
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Read DEADBEEF address"))
+        command = (
+            object_id
+            + struct.pack("!I", CommandIds.TC_MEM_READ)
+            + struct.pack("!I", MemAddresses.DEADBEEF)
+            + struct.pack("!H", num_words)
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=29, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "14":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Tc mode replay"))
+        command = object_id + struct.pack("!I", CommandIds.TC_MODE_REPLAY)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "15":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Tc mode idle"))
+        command = object_id + struct.pack("!I", CommandIds.TC_MODE_IDLE)
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "16":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Tc cam command send"))
+        cam_cmd = input("Specify cam command string: ")
+        command = object_id + struct.pack("!I", CommandIds.TC_CAM_CMD_SEND) + bytearray(cam_cmd, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
 
 
 def generate_write_mem_command(
-    object_id: bytearray, memory_address: bytes, memory_data: int
+    object_id: bytearray, memory_address: int, memory_data: int, mem_len: int
 ) -> bytearray:
     """This function generates the command to write to a memory address within the PLOC
     @param object_id    The object id of the PlocHandler
@@ -72,8 +189,111 @@ def generate_write_mem_command(
     """
     command = (
         object_id
-        + PlocActionIds.tc_mem_write
-        + memory_address
+        + struct.pack("!I", CommandIds.TC_MEM_WRITE)
+        + struct.pack("!I", memory_address)
+        + struct.pack("!H", mem_len)
         + struct.pack("!I", memory_data)
     )
     return command
+
+
+def prepare_mem_read_command(object_id: bytearray) -> bytearray:
+    memory_address = int(input("PLOC MPSoC Tc Mem Read: Type memory address: 0x"), 16)
+    num_words = int(input("PLOC MPSoC specify number of words (32-bit) to read: "))
+    command = (
+        object_id
+        + struct.pack("!I", CommandIds.TC_MEM_READ)
+        + struct.pack("!I", memory_address)
+        + struct.pack("!H", num_words)
+    )
+    return command
+
+
+def prepare_flash_write_cmd(object_id: bytearray) -> bytearray:
+    obcFile = get_obc_file()
+    mpsocFile = get_mpsoc_file()
+    command = (
+        object_id
+        + struct.pack("!I", CommandIds.FLASH_WRITE)
+        + bytearray(obcFile, "utf-8")
+        + bytearray(mpsocFile, "utf-8")
+    )
+    return command
+
+
+def prepare_flash_delete_cmd(object_id: bytearray) -> bytearray:
+    file = get_mpsoc_file()
+    command = (
+        object_id
+        + struct.pack("!I", CommandIds.TC_FLASH_DELETE)
+        + bytearray(file, "utf-8")
+    )
+    return command
+
+
+def prepare_replay_start_cmd(object_id: bytearray) -> bytearray:
+    replay = int(input("Specify replay mode (0 - once, 1 - repeated): "))
+    command = (
+        object_id
+        + struct.pack("!I", CommandIds.TC_REPLAY_START)
+        + struct.pack("!B", replay)
+    )
+    return command
+
+
+def prepare_downlink_pwr_on_cmd(object_id: bytearray) -> bytearray:
+    mode = int(input("Specify JESD mode (0 - 5): "))
+    lane_rate = int(input("Specify lane rate (0 - 9): "))
+    command = (
+        object_id
+        + struct.pack("!I", CommandIds.TC_DOWNLINK_PWR_ON)
+        + struct.pack("!B", mode)
+        + struct.pack("!B", lane_rate)
+    )
+    return command
+
+
+def prepare_replay_write_sequence_cmd(object_id: bytearray) -> bytearray:
+    null_terminator = 0
+    use_decoding = int(input("Use decoding  (set to 1): "))
+    file = get_sequence_file()
+    command = (
+        object_id
+        + struct.pack("!I", CommandIds.TC_REPLAY_WRITE_SEQUENCE)
+        + struct.pack("!B", use_decoding)
+        + bytearray(file, "utf-8")
+    )
+    return command
+
+
+def get_obc_file() -> str:
+    LOGGER.info("Specify OBC file ")
+    input_helper = InputHelper(flash_write_file_dict)
+    key = input_helper.get_key()
+    if key == MANUAL_INPUT:
+        file = input("Ploc MPSoC: Specify absolute name of flash file: ")
+    else:
+        file = flash_write_file_dict[key][1]
+    return file
+
+
+def get_mpsoc_file() -> str:
+    LOGGER.info("Specify MPSoC file")
+    input_helper = InputHelper(mpsoc_file_dict)
+    key = input_helper.get_key()
+    if key == MANUAL_INPUT:
+        file = input("Ploc MPSoC: Specify absolute name file: ")
+    else:
+        file = mpsoc_file_dict[key][1]
+    return file
+
+
+def get_sequence_file() -> str:
+    LOGGER.info("Specify sequence file")
+    input_helper = InputHelper(sequence_file_dict)
+    key = input_helper.get_key()
+    if key == MANUAL_INPUT:
+        file = input("Ploc MPSoC: Specify absolute name file: ")
+    else:
+        file = sequence_file_dict[key][1]
+    return file
diff --git a/pus_tc/devs/ploc_supervisor.py b/pus_tc/devs/ploc_supervisor.py
index 0513a22..6e8effb 100644
--- a/pus_tc/devs/ploc_supervisor.py
+++ b/pus_tc/devs/ploc_supervisor.py
@@ -11,7 +11,9 @@ import struct
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
+from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
+from utility.input_helper import InputHelper
 
 LOGGER = get_console_logger()
 
@@ -25,6 +27,18 @@ latchup_id_dict = {
     "6": "SAFECOTS",
 }
 
+MANUAL_INPUT = "1"
+
+update_file_dict = {
+    MANUAL_INPUT: ["manual input", ""],
+    "2": ["/mnt/sd0/ploc/supervisor/update.bin", "/mnt/sd0/ploc/supervisor/update.bin"],
+}
+
+event_buffer_path_dict = {
+    MANUAL_INPUT: ["manual input", ""],
+    "2": ["/mnt/sd0/ploc/supervisor", "/mnt/sd0/ploc/supervisor"],
+}
+
 
 class SupvActionIds:
     HK_REPORT = 1
@@ -64,10 +78,23 @@ class SupvActionIds:
     READ_GPIO = 35
     RESTART_SUPERVISOR = 36
     FACTORY_RESET_CLEAR_ALL = 37
-    REQUEST_LOGGING_DATA = 38
+    LOGGING_REQUEST_COUNTERS = 38
     UPDATE_IMAGE_DATA = 39
     FACTORY_RESET_CLEAR_MIRROR = 40
     FACTORY_RESET_CLEAR_CIRCULAR = 41
+    START_MPSOC_QUIET = 45
+    SET_SHUTDOWN_TIMEOUT = 46
+    FACTORY_FLASH = 47
+    PERFORM_UPDATE = 48
+    TERMINATE_SUPV_HELPER = 49
+    ENABLE_AUTO_TM = 50
+    DISABLE_AUTO_TM = 51
+    ENABLE_ADC_MONITOR_TASK = 52
+    DISABLE_ADC_MONITOR_TASK = 53
+    LOGGING_REQUEST_EVENT_BUFFERS = 54
+    LOGGING_CLEAR_COUNTERS = 55
+    LOGGING_SET_TOPIC = 56
+    REQUEST_ADC_REPORT = 57
 
 
 class SupvHkIds:
@@ -75,7 +102,7 @@ class SupvHkIds:
     BOOT_STATUS_REPORT = 53
 
 
-def pack_ploc_supv_test_into(
+def pack_ploc_supv_commands(
     object_id: bytearray, tc_queue: TcQueueT, op_code: str
 ) -> TcQueueT:
     tc_queue.appendleft(
@@ -84,7 +111,21 @@ def pack_ploc_supv_test_into(
             "Testing PLOC Supervisor with object id: 0x" + object_id.hex(),
         )
     )
-
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set mode off"))
+        command = pack_mode_data(object_id, Modes.OFF, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=9, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set mode on"))
+        command = pack_mode_data(object_id, Modes.ON, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Normal"))
+        command = pack_mode_data(object_id, Modes.NORMAL, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "3":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: TC Get Hk Report"))
         command = object_id + struct.pack("!I", SupvActionIds.HK_REPORT)
@@ -118,7 +159,7 @@ def pack_ploc_supv_test_into(
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "8":
         tc_queue.appendleft(
-            (QueueCommands.PRINT, "PLOC Supervisor: Set max restart tries")
+            (QueueCommands.PRINT, "PLOC Supervisor: Set max restart tries: ")
         )
         restart_tries = int(input("Set maximum restart tries:"))
         command = (
@@ -259,11 +300,6 @@ def pack_ploc_supv_test_into(
         command = pack_enable_nvms_cmd(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    elif op_code == "29":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Select NVM"))
-        command = pack_select_nvm_cmd(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "30":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Run auto EM tests"))
         command = pack_auto_em_tests_cmd(object_id)
@@ -342,6 +378,92 @@ def pack_ploc_supv_test_into(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=56, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "42":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Perform update"))
+        command = pack_update_command(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=57, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "43":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Terminate supervisor process"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.TERMINATE_SUPV_HELPER
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=58, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "44":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Start MPSoC quiet"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.START_MPSOC_QUIET
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=59, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "45":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set shutdown timeout"))
+        command = pack_set_shutdown_timeout_command(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=60, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "46":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Factory flash"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.FACTORY_FLASH
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=61, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "47":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Enable auto TM"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.ENABLE_AUTO_TM
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=62, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "48":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Disable auto TM"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.DISABLE_AUTO_TM
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=63, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "49":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Enable ADC monitor task"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.ENABLE_ADC_MONITOR_TASK
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=64, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "50":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Disable ADC monitor task"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.DISABLE_ADC_MONITOR_TASK
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "51":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging request event buffers"))
+        command = pack_logging_buffer_request(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=66, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "52":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging clear counters"))
+        command = object_id + struct.pack(
+            "!I", SupvActionIds.LOGGING_CLEAR_COUNTERS
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "53":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging set topic"))
+        command = pack_logging_set_topic(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=68, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "54":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging request counters"))
+        command = object_id + struct.pack('!I', SupvActionIds.LOGGING_REQUEST_COUNTERS)
+        command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "55":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Request ADC report"))
+        command = object_id + struct.pack('!I', SupvActionIds.REQUEST_ADC_REPORT)
+        command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
 
@@ -586,6 +708,39 @@ def pack_set_debug_verbosity_cmd(object_id: bytearray) -> bytearray:
     return command
 
 
+def pack_update_command(object_id: bytearray) -> bytearray:
+    command = bytearray()
+    memory_id = int(input("Specify memory ID: "))
+    start_address = int(input("Specify start address: 0x"), 16)
+    update_file = get_update_file()
+    command += object_id
+    command += struct.pack('!I', SupvActionIds.PERFORM_UPDATE)
+    command += bytearray(update_file, 'utf-8')
+    # Adding null terminator
+    command += struct.pack('!B', 0)
+    command += struct.pack('!B', memory_id)
+    command += struct.pack('!I', start_address)
+    return command
+
+
+def pack_set_shutdown_timeout_command(object_id: bytearray) -> bytearray:
+    command = bytearray()
+    command += object_id
+    command += struct.pack('!I', SupvActionIds.SET_SHUTDOWN_TIMEOUT)
+    timeout = int(input("Specify shutdown timeout (ms): "))
+    command += struct.pack('!I', timeout)
+    return command
+
+
+def pack_logging_buffer_request(object_id: bytearray) -> bytearray:
+    command = bytearray()
+    command += object_id
+    command += struct.pack('!I', SupvActionIds.LOGGING_REQUEST_EVENT_BUFFERS)
+    path = get_event_buffer_path()
+    command += bytearray(path, 'utf-8')
+    return command
+
+
 def get_debug_verbosity() -> int:
     tries = 0
     while tries < 3:
@@ -631,3 +786,32 @@ def pack_read_gpio_cmd(object_id: bytearray) -> bytearray:
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
     return command
+
+
+def pack_logging_set_topic(objetc_id: bytearray) -> bytearray:
+    command = objetc_id + struct.pack('!I', SupvActionIds.LOGGING_SET_TOPIC)
+    tpc = int(input("Specify logging topic: "))
+    command += struct.pack('!B', tpc)
+    return command
+
+
+def get_update_file() -> str:
+    LOGGER.info("Specify update file ")
+    input_helper = InputHelper(update_file_dict)
+    key = input_helper.get_key()
+    if key == MANUAL_INPUT:
+        file = input("Ploc Supervisor: Specify absolute name of update file: ")
+    else:
+        file = update_file_dict[key][1]
+    return file
+
+
+def get_event_buffer_path() -> str:
+    LOGGER.info("Specify path where to store event buffer file ")
+    input_helper = InputHelper(event_buffer_path_dict)
+    key = input_helper.get_key()
+    if key == MANUAL_INPUT:
+        file = input("Ploc Supervisor: Specify path: ")
+    else:
+        file = event_buffer_path_dict[key][1]
+    return file
diff --git a/pus_tc/devs/plpcdu.py b/pus_tc/devs/plpcdu.py
index b11be7d..dd6f027 100644
--- a/pus_tc/devs/plpcdu.py
+++ b/pus_tc/devs/plpcdu.py
@@ -9,7 +9,7 @@ from tmtccmd.tc.service_20_parameter import (
     pack_fsfw_load_param_cmd,
     pack_boolean_parameter_app_data,
 )
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
 from config.object_ids import PL_PCDU_ID
 
@@ -18,13 +18,13 @@ LOGGER = get_console_logger()
 
 class OpCodes:
     SWITCH_ON = ["0", "on"]
-    SWITCH_ADC_NORMAL = ["1", "adc-normal"]
-    SWITCH_ALL_NORMAL = ["2", "all-normal"]
-    SWITCH_OFF = ["3", "off"]
-    UPDATE_DRO_TO_X8_WAIT = ["6", "dro-to-x8-wait"]
-    UPDATE_X8_TO_TX_WAIT_TIME = ["7", "x8-to-tx-wait"]
-    UPDATE_TX_TO_MPA_WAIT_TIME = ["8", "tx-to-mpa-wait"]
-    UPDATE_MPA_TO_HPA_WAIT_TIME = ["9", "mpa-to-hpa-wait"]
+    SWITCH_OFF = ["1", "off"]
+    NORMAL_SSR = ["2", "nml-ssr"]
+    NORMAL_DRO = ["3", "nml-dro"]
+    NORMAL_X8 = ["4", "nml-x8"]
+    NORMAL_TX = ["5", "nml-tx"]
+    NORMAL_MPA = ["6", "nml-mpa"]
+    NORMAL_HPA = ["7", "nml-hpa"]
 
     INJECT_SSR_TO_DRO_FAILURE = ["10", "inject-ssr-dro-fault"]
     INJECT_DRO_TO_X8_FAILURE = ["11", "inject-dro-x8-fault"]
@@ -33,10 +33,32 @@ class OpCodes:
     INJECT_MPA_TO_HPA_FAILURE = ["14", "inject-mpa-hpa-fault"]
     INJECT_ALL_ON_FAILURE = ["15", "inject-all-on-fault"]
 
+    # The following commands might become deprecated in the future
+    UPDATE_DRO_TO_X8_WAIT = ["128", "dro-to-x8-wait"]
+    UPDATE_X8_TO_TX_WAIT_TIME = ["129", "x8-to-tx-wait"]
+    UPDATE_TX_TO_MPA_WAIT_TIME = ["130", "tx-to-mpa-wait"]
+    UPDATE_MPA_TO_HPA_WAIT_TIME = ["131", "mpa-to-hpa-wait"]
 
-class Submodes(enum.IntEnum):
-    ADC_ON = 0
-    ALL_ON = 1
+
+class Info:
+    NORMAL = "PL PCDU ADC modules normal"
+    SWITCH_ON = "Switching PL PCDU on"
+    SWITCH_OFF = "Switching PL PCDU off"
+    NORMAL_SSR = f"{NORMAL}, SSR on"
+    NORMAL_DRO = f"{NORMAL},DRO on"
+    NORMAL_X8 = f"{NORMAL}, X8 on"
+    NORMAL_TX = f"{NORMAL}, TX on"
+    NORMAL_MPA = f"{NORMAL}, MPA on"
+    NORMAL_HPA = f"{NORMAL}, HPA on"
+
+
+class NormalSubmodesMask(enum.IntEnum):
+    SOLID_STATE_RELAYS_ADC_ON = 0
+    DRO_ON = 1
+    X8_ON = 2
+    TX_ON = 3
+    MPA_ON = 4
+    HPA_ON = 5
 
 
 class ParamIds(enum.IntEnum):
@@ -79,67 +101,79 @@ class ParamIds(enum.IntEnum):
 
 def pack_pl_pcdu_commands(tc_queue: TcQueueT, op_code: str):
     if op_code in OpCodes.SWITCH_ON:
-        tc_queue.appendleft((QueueCommands.PRINT, "Switching PL PCDU on"))
-        mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=Modes.ON, submode=0)
-        mode_cmd = PusTelecommand(
-            service=200, subservice=Subservices.SWITCH_MODE, app_data=mode_data
+        pack_pl_pcdu_mode_cmd(
+            tc_queue=tc_queue, info=Info.SWITCH_ON, mode=Modes.ON, submode=0
         )
-        tc_queue.appendleft(mode_cmd.pack_command_tuple())
     if op_code in OpCodes.SWITCH_OFF:
-        tc_queue.appendleft((QueueCommands.PRINT, "Switching PL PCDU off"))
-        mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=Modes.OFF, submode=0)
-        mode_cmd = PusTelecommand(
-            service=200, subservice=Subservices.SWITCH_MODE, app_data=mode_data
+        pack_pl_pcdu_mode_cmd(
+            tc_queue=tc_queue, info=Info.SWITCH_OFF, mode=Modes.OFF, submode=0
         )
-        tc_queue.appendleft(mode_cmd.pack_command_tuple())
-    if op_code in OpCodes.SWITCH_ADC_NORMAL:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching PL PCDU ADC module normal, submode ADC ON")
-        )
-        mode_data = pack_mode_data(
-            object_id=PL_PCDU_ID, mode=Modes.NORMAL, submode=Submodes.ADC_ON
-        )
-        mode_cmd = PusTelecommand(
-            service=200, subservice=Subservices.SWITCH_MODE, app_data=mode_data
-        )
-        tc_queue.appendleft(mode_cmd.pack_command_tuple())
-    if op_code in OpCodes.SWITCH_ALL_NORMAL:
-        tc_queue.appendleft(
-            (
-                QueueCommands.PRINT,
-                "Switching all PL PCDU modules normal, submode ALL ON",
-            )
-        )
-        mode_data = pack_mode_data(
-            object_id=PL_PCDU_ID, mode=Modes.NORMAL, submode=Submodes.ALL_ON
-        )
-        mode_cmd = PusTelecommand(
-            service=200, subservice=Subservices.SWITCH_MODE, app_data=mode_data
-        )
-        tc_queue.appendleft(mode_cmd.pack_command_tuple())
-    if op_code in OpCodes.UPDATE_DRO_TO_X8_WAIT:
-        pack_wait_time_cmd(
+    if op_code in OpCodes.NORMAL_SSR:
+        pack_pl_pcdu_mode_cmd(
             tc_queue=tc_queue,
-            param_id=ParamIds.DRO_TO_X8_WAIT_TIME,
-            print_str="DRO to X8",
+            info=Info.NORMAL_SSR,
+            mode=Modes.NORMAL,
+            submode=(1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON),
         )
-    if op_code in OpCodes.UPDATE_X8_TO_TX_WAIT_TIME:
-        pack_wait_time_cmd(
+    if op_code in OpCodes.NORMAL_DRO:
+        pack_pl_pcdu_mode_cmd(
             tc_queue=tc_queue,
-            param_id=ParamIds.X8_TO_TX_WAIT_TIME,
-            print_str="X8 to TX",
+            info=Info.NORMAL_DRO,
+            mode=Modes.NORMAL,
+            submode=(
+                1 << NormalSubmodesMask.DRO_ON
+                | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+            ),
         )
-    if op_code in OpCodes.UPDATE_TX_TO_MPA_WAIT_TIME:
-        pack_wait_time_cmd(
+    if op_code in OpCodes.NORMAL_X8:
+        pack_pl_pcdu_mode_cmd(
             tc_queue=tc_queue,
-            param_id=ParamIds.TX_TO_MPA_WAIT_TIME,
-            print_str="TX to MPA",
+            info=Info.NORMAL_X8,
+            mode=Modes.NORMAL,
+            submode=(
+                1 << NormalSubmodesMask.DRO_ON
+                | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+                | (1 << NormalSubmodesMask.X8_ON)
+            ),
         )
-    if op_code in OpCodes.UPDATE_MPA_TO_HPA_WAIT_TIME:
-        pack_wait_time_cmd(
+    if op_code in OpCodes.NORMAL_TX:
+        pack_pl_pcdu_mode_cmd(
             tc_queue=tc_queue,
-            param_id=ParamIds.MPA_TO_HPA_WAIT_TIME,
-            print_str="MPA to HPA",
+            info=Info.NORMAL_TX,
+            mode=Modes.NORMAL,
+            submode=(
+                1 << NormalSubmodesMask.DRO_ON
+                | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+                | (1 << NormalSubmodesMask.X8_ON)
+                | (1 << NormalSubmodesMask.TX_ON)
+            ),
+        )
+    if op_code in OpCodes.NORMAL_MPA:
+        pack_pl_pcdu_mode_cmd(
+            tc_queue=tc_queue,
+            info=Info.NORMAL_MPA,
+            mode=Modes.NORMAL,
+            submode=(
+                1 << NormalSubmodesMask.DRO_ON
+                | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+                | (1 << NormalSubmodesMask.X8_ON)
+                | (1 << NormalSubmodesMask.TX_ON)
+                | (1 << NormalSubmodesMask.MPA_ON)
+            ),
+        )
+    if op_code in OpCodes.NORMAL_HPA:
+        pack_pl_pcdu_mode_cmd(
+            tc_queue=tc_queue,
+            info=Info.NORMAL_HPA,
+            mode=Modes.NORMAL,
+            submode=(
+                1 << NormalSubmodesMask.DRO_ON
+                | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+                | (1 << NormalSubmodesMask.X8_ON)
+                | (1 << NormalSubmodesMask.TX_ON)
+                | (1 << NormalSubmodesMask.MPA_ON)
+                | (1 << NormalSubmodesMask.HPA_ON)
+            ),
         )
     if op_code in OpCodes.INJECT_ALL_ON_FAILURE:
         pack_failure_injection_cmd(
@@ -189,3 +223,17 @@ def pack_failure_injection_cmd(tc_queue: TcQueueT, param_id: int, print_str: str
     )
     cmd = pack_fsfw_load_param_cmd(ssc=0, app_data=param_data)
     tc_queue.appendleft(cmd.pack_command_tuple())
+
+
+def pack_pl_pcdu_mode_cmd(tc_queue: TcQueueT, info: str, mode: Modes, submode: int):
+    tc_queue.appendleft(
+        (
+            QueueCommands.PRINT,
+            info,
+        )
+    )
+    mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=mode, submode=submode)
+    mode_cmd = PusTelecommand(
+        service=200, subservice=Subservices.COMMAND_MODE_COMMAND, app_data=mode_data
+    )
+    tc_queue.appendleft(mode_cmd.pack_command_tuple())
diff --git a/pus_tc/devs/rad_sensor.py b/pus_tc/devs/rad_sensor.py
index 8ea77d1..cd66930 100644
--- a/pus_tc/devs/rad_sensor.py
+++ b/pus_tc/devs/rad_sensor.py
@@ -6,6 +6,7 @@
 @date   01.07.2021
 """
 import struct
+
 from tmtccmd.config.definitions import QueueCommands
 
 from tmtccmd.tc.packer import TcQueueT
@@ -13,6 +14,13 @@ from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data
 
 
+class CommandIds:
+    START_CONVERSIONS = 2
+    READ_CONVERSIONS = 3
+    ENABLE_DEBUG_OUTPUT = 4
+    DISABLE_DEBUG_OUTPUT = 5
+
+
 def pack_rad_sensor_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     tc_queue.appendleft(
         (
@@ -38,3 +46,27 @@ def pack_rad_sensor_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code:
         mode_data = pack_mode_data(object_id, 0, 0)
         command = PusTelecommand(service=200, subservice=1, ssc=42, app_data=mode_data)
         tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Start  conversions"))
+        command = object_id + struct.pack("!I", CommandIds.START_CONVERSIONS)
+        command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Read  conversions"))
+        command = object_id + struct.pack("!I", CommandIds.READ_CONVERSIONS)
+        command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Enable debug output"))
+        command = object_id + struct.pack("!I", CommandIds.ENABLE_DEBUG_OUTPUT)
+        command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Disable debug output"))
+        command = object_id + struct.pack("!I", CommandIds.DISABLE_DEBUG_OUTPUT)
+        command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
diff --git a/pus_tc/devs/star_tracker.py b/pus_tc/devs/star_tracker.py
index b8da74b..f8df76d 100644
--- a/pus_tc/devs/star_tracker.py
+++ b/pus_tc/devs/star_tracker.py
@@ -12,9 +12,10 @@ from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from utility.input_helper import InputHelper
 
+
 LOGGER = get_console_logger()
 
 
@@ -145,9 +146,7 @@ class Submode:
     FIRMWARE = 2
 
 
-def pack_star_tracker_commands(
-    object_id: bytearray, tc_queue: TcQueueT, op_code: str
-) -> TcQueueT:
+def pack_star_tracker_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     tc_queue.appendleft(
         (
             QueueCommands.PRINT,
diff --git a/pus_tc/devs/syrlinks_hk_handler.py b/pus_tc/devs/syrlinks_hk_handler.py
index 93a3b9d..b5f3099 100644
--- a/pus_tc/devs/syrlinks_hk_handler.py
+++ b/pus_tc/devs/syrlinks_hk_handler.py
@@ -10,6 +10,8 @@ from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command
 from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
+import struct
 
 
 class SetIds:
@@ -18,13 +20,21 @@ class SetIds:
 
 
 class CommandIds:
-    SET_TX_MODE_STANDBY = bytearray([0x0, 0x0, 0x0, 0x3])
-    SET_TX_MODE_MODULATION = bytearray([0x0, 0x0, 0x0, 0x4])
-    SET_TX_MODE_CW = bytearray([0x0, 0x0, 0x0, 0x5])
-    READ_TX_STATUS = bytearray([0x0, 0x0, 0x0, 0x7])
-    READ_TX_WAVEFORM = bytearray([0x0, 0x0, 0x0, 0x8])
-    READ_TX_AGC_VALUE_HIGH_BYTE = bytearray([0x0, 0x0, 0x0, 0x9])
-    READ_TX_AGC_VALUE_LOW_BYTE = bytearray([0x0, 0x0, 0x0, 0x9])
+    READ_RX_STATUS_REGISTERS = 2
+    SET_TX_MODE_STANDBY = 3
+    SET_TX_MODE_MODULATION = 4
+    SET_TX_MODE_CW = 5
+    READ_TX_STATUS = 7
+    READ_TX_WAVEFORM = 8
+    READ_TX_AGC_VALUE_HIGH_BYTE = 9
+    READ_TX_AGC_VALUE_LOW_BYTE = 10
+    WRITE_LCL_CONFIG = 11
+    READ_LCL_CONFIG_REGISTER = 12
+    SET_WAVEFORM_OQPSK = 17
+    SET_WAVEFORM_BPSK = 18
+    SET_SECOND_CONFIG = 19
+    ENABLE_DEBUG = 20
+    DISABLE_DEBUG = 21
 
 
 def pack_syrlinks_command(
@@ -33,56 +43,111 @@ def pack_syrlinks_command(
     tc_queue.appendleft(
         (
             QueueCommands.PRINT,
-            "Testing PLOC memory dumper with object id: 0x" + object_id.hex(),
+            "Testing Syrlinks with object id: 0x" + object_id.hex(),
         )
     )
 
     if op_code == "0":
-        tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode standby"))
-        command = object_id + CommandIds.SET_TX_MODE_STANDBY
-        command = PusTelecommand(service=8, subservice=128, ssc=10, app_data=command)
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Set mode off"))
+        command = pack_mode_data(object_id, Modes.OFF, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=9, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "1":
-        tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode modulation"))
-        command = object_id + CommandIds.SET_TX_MODE_MODULATION
-        command = PusTelecommand(service=8, subservice=128, ssc=11, app_data=command)
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Set mode on"))
+        command = pack_mode_data(object_id, Modes.ON, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "2":
-        tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode CW"))
-        command = object_id + CommandIds.SET_TX_MODE_CW
-        command = PusTelecommand(service=8, subservice=128, ssc=12, app_data=command)
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Mode Normal"))
+        command = pack_mode_data(object_id, Modes.NORMAL, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode standby"))
+        command = object_id + struct.pack('!I', CommandIds.SET_TX_MODE_STANDBY)
+        command = PusTelecommand(service=8, subservice=128, ssc=10, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode modulation"))
+        command = object_id + struct.pack('!I', CommandIds.SET_TX_MODE_MODULATION)
+        command = PusTelecommand(service=8, subservice=128, ssc=11, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode CW"))
+        command = object_id + struct.pack('!I', CommandIds.SET_TX_MODE_CW)
+        command = PusTelecommand(service=8, subservice=128, ssc=12, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "6":
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Get RX Registers"))
         sid = make_sid(object_id, SetIds.RX_REGISTERS_DATASET)
         command = generate_one_hk_command(sid, 200)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "4":
+    if op_code == "7":
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Get TX Registers"))
         sid = make_sid(object_id, SetIds.TX_REGISTERS_DATASET)
         command = generate_one_hk_command(sid, 201)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "5":
+    if op_code == "8":
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Read TX status"))
-        command = object_id + CommandIds.READ_TX_STATUS
+        command = object_id + struct.pack('!I', CommandIds.READ_TX_STATUS)
         command = PusTelecommand(service=8, subservice=128, ssc=13, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "6":
+    if op_code == "9":
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Read TX waveform"))
-        command = object_id + CommandIds.READ_TX_WAVEFORM
+        command = object_id + struct.pack('!I', CommandIds.READ_TX_WAVEFORM)
         command = PusTelecommand(service=8, subservice=128, ssc=14, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "7":
+    if op_code == "10":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Syrlinks: Read TX AGC value high byte")
         )
-        command = object_id + CommandIds.READ_TX_AGC_VALUE_HIGH_BYTE
+        command = object_id + struct.pack('!I', CommandIds.READ_TX_AGC_VALUE_HIGH_BYTE)
         command = PusTelecommand(service=8, subservice=128, ssc=15, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "8":
+    if op_code == "11":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Syrlinks: Read TX AGC value low byte")
         )
-        command = object_id + CommandIds.READ_TX_AGC_VALUE_LOW_BYTE
+        command = object_id + struct.pack('!I', CommandIds.READ_TX_AGC_VALUE_LOW_BYTE)
         command = PusTelecommand(service=8, subservice=128, ssc=16, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "12":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Write LCL config"))
+        command = object_id + struct.pack("!I", CommandIds.WRITE_LCL_CONFIG)
+        command = PusTelecommand(service=8, subservice=128, ssc=17, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "13":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Read RX status registers"))
+        command = object_id + struct.pack("!I", CommandIds.READ_RX_STATUS_REGISTERS)
+        command = PusTelecommand(service=8, subservice=128, ssc=18, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "14":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Read LCL config register"))
+        command = object_id + struct.pack("!I", CommandIds.READ_LCL_CONFIG_REGISTER)
+        command = PusTelecommand(service=8, subservice=128, ssc=19, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "15":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Set waveform OQPSK"))
+        command = object_id + struct.pack("!I", CommandIds.SET_WAVEFORM_OQPSK)
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "16":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Set waveform BPSK"))
+        command = object_id + struct.pack("!I", CommandIds.SET_WAVEFORM_BPSK)
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "17":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Set second config"))
+        command = object_id + struct.pack("!I", CommandIds.SET_SECOND_CONFIG)
+        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "18":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Enable debug printout"))
+        command = object_id + struct.pack("!I", CommandIds.ENABLE_DEBUG)
+        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "19":
+        tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Disable debug printout"))
+        command = object_id + struct.pack("!I", CommandIds.DISABLE_DEBUG)
+        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
diff --git a/pus_tc/system/acs.py b/pus_tc/system/acs.py
index 8b8cc6d..109a8e7 100644
--- a/pus_tc/system/acs.py
+++ b/pus_tc/system/acs.py
@@ -1,21 +1,29 @@
 import enum
-from tmtccmd.tc.definitions import TcQueueT, QueueCommands
-from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.service_200_mode import pack_mode_data, Modes, Subservices
-from config.object_ids import ACS_BOARD_ASS_ID
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_200_mode import Modes
+from config.object_ids import ACS_BOARD_ASS_ID, SUS_BOARD_ASS_ID
+
+from .common import command_assembly
 
 
 class AcsOpCodes:
-    ACS_ASS_A_SIDE = ["0", "a"]
-    ACS_ASS_B_SIDE = ["1", "b"]
-    ACS_ASS_DUAL_MODE = ["2", "d"]
-    ACS_ASS_OFF = ["3", "off"]
-    ACS_ASS_A_ON = ["4", "ao"]
-    ACS_ASS_B_ON = ["5", "bo"]
-    ACS_ASS_DUAL_ON = ["6", "do"]
+    ACS_ASS_A_SIDE = ["0", "acs-a"]
+    ACS_ASS_B_SIDE = ["1", "acs-b"]
+    ACS_ASS_DUAL_MODE = ["2", "acs-d"]
+    ACS_ASS_OFF = ["3", "acs-off"]
+    ACS_ASS_A_ON = ["4", "acs-ao"]
+    ACS_ASS_B_ON = ["5", "acs-bo"]
+    ACS_ASS_DUAL_ON = ["6", "acs-do"]
 
 
-class AcsBoardSubmodes(enum.IntEnum):
+class SusOpCodes:
+    SUS_ASS_NOM_SIDE = ["0", "sus-nom"]
+    SUS_ASS_RED_SIDE = ["1", "sus-red"]
+    SUS_ASS_DUAL_MODE = ["2", "sus-d"]
+    SUS_ASS_OFF = ["3", "sus-off"]
+
+
+class DualSideSubmodes(enum.IntEnum):
     A_SIDE = 0
     B_SIDE = 1
     DUAL_SIDE = 2
@@ -23,49 +31,93 @@ class AcsBoardSubmodes(enum.IntEnum):
 
 def pack_acs_command(tc_queue: TcQueueT, op_code: str):
     if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching to ACS board assembly A side")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.A_SIDE,
+            tc_queue=tc_queue,
+            info="Switching to ACS board assembly A side",
         )
-        command_acs_board(mode=Modes.NORMAL, submode=AcsBoardSubmodes.A_SIDE, tc_queue=tc_queue)
     if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching to ACS board assembly B side")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.B_SIDE,
+            tc_queue=tc_queue,
+            info="Switching to ACS board assembly B side",
         )
-        command_acs_board(mode=Modes.NORMAL, submode=AcsBoardSubmodes.B_SIDE, tc_queue=tc_queue)
     if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching to ACS board assembly dual mode")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.DUAL_SIDE,
+            tc_queue=tc_queue,
+            info="Switching to ACS board assembly dual mode",
         )
-        command_acs_board(mode=Modes.NORMAL, submode=AcsBoardSubmodes.DUAL_SIDE, tc_queue=tc_queue)
     if op_code in AcsOpCodes.ACS_ASS_A_ON:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching ACS board assembly A side on")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.ON,
+            submode=DualSideSubmodes.A_SIDE,
+            tc_queue=tc_queue,
+            info="Switching ACS board assembly A side on",
         )
-        command_acs_board(mode=Modes.ON, submode=AcsBoardSubmodes.A_SIDE, tc_queue=tc_queue)
     if op_code in AcsOpCodes.ACS_ASS_B_ON:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching ACS board assembly B side on")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.ON,
+            submode=DualSideSubmodes.B_SIDE,
+            tc_queue=tc_queue,
+            info="Switching ACS board assembly B side on",
         )
-        command_acs_board(mode=Modes.ON, submode=AcsBoardSubmodes.B_SIDE, tc_queue=tc_queue)
     if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching ACS board assembly dual side on")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.ON,
+            submode=DualSideSubmodes.B_SIDE,
+            tc_queue=tc_queue,
+            info="Switching ACS board assembly dual side on",
         )
-        command_acs_board(mode=Modes.ON, submode=AcsBoardSubmodes.B_SIDE, tc_queue=tc_queue)
     if op_code in AcsOpCodes.ACS_ASS_OFF:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Switching to ACS board assembly off")
+        command_assembly(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.OFF,
+            submode=0,
+            tc_queue=tc_queue,
+            info="Switching to ACS board assembly off",
         )
-        command_acs_board(mode=Modes.OFF, submode=0, tc_queue=tc_queue)
 
 
-def command_acs_board(mode: Modes, submode: int, tc_queue: TcQueueT):
-    mode_data = pack_mode_data(
-        object_id=ACS_BOARD_ASS_ID,
-        mode=mode,
-        submode=submode,
-    )
-    cmd = PusTelecommand(
-        service=200, subservice=Subservices.COMMAND_MODE_COMMAND, app_data=mode_data
-    )
-    tc_queue.appendleft(cmd.pack_command_tuple())
+def pack_sus_cmds(tc_queue: TcQueueT, op_code: str):
+    if op_code in SusOpCodes.SUS_ASS_NOM_SIDE:
+        command_assembly(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.A_SIDE,
+            tc_queue=tc_queue,
+            info="Switching to SUS board to nominal side",
+        )
+    if op_code in SusOpCodes.SUS_ASS_RED_SIDE:
+        command_assembly(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.B_SIDE,
+            tc_queue=tc_queue,
+            info="Switching to SUS board to redundant side",
+        )
+    if op_code in SusOpCodes.SUS_ASS_OFF:
+        command_assembly(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.OFF,
+            submode=0,
+            tc_queue=tc_queue,
+            info="Switching SUS board off",
+        )
+    if op_code in SusOpCodes.SUS_ASS_DUAL_MODE:
+        command_assembly(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.DUAL_SIDE,
+            tc_queue=tc_queue,
+            info="Switching to SUS board to dual side",
+        )
diff --git a/pus_tc/system/common.py b/pus_tc/system/common.py
new file mode 100644
index 0000000..a37412a
--- /dev/null
+++ b/pus_tc/system/common.py
@@ -0,0 +1,18 @@
+from tmtccmd.tc.definitions import TcQueueT, QueueCommands
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc.service_200_mode import pack_mode_data, Modes, Subservices
+
+
+def command_assembly(
+    object_id: bytes, mode: Modes, submode: int, tc_queue: TcQueueT, info: str
+):
+    tc_queue.appendleft((QueueCommands.PRINT, info))
+    mode_data = pack_mode_data(
+        object_id=object_id,
+        mode=mode,
+        submode=submode,
+    )
+    cmd = PusTelecommand(
+        service=200, subservice=Subservices.COMMAND_MODE_COMMAND, app_data=mode_data
+    )
+    tc_queue.appendleft(cmd.pack_command_tuple())
diff --git a/pus_tc/system/core.py b/pus_tc/system/core.py
index 338337b..132ab8a 100644
--- a/pus_tc/system/core.py
+++ b/pus_tc/system/core.py
@@ -3,7 +3,8 @@ 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 tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
+from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command
 from config.object_ids import CORE_CONTROLLER_ID
 
 LOGGER = get_console_logger()
@@ -21,6 +22,10 @@ class ActionIds(enum.IntEnum):
     REBOOT = 32
 
 
+class SetIds(enum.IntEnum):
+    HK = 5
+
+
 class OpCodes:
     REBOOT = ["0", "reboot"]
     REBOOT_SELF = ["1", "reboot_self"]
@@ -36,6 +41,7 @@ class OpCodes:
     RESET_REBOOT_COUNTER_10 = ["11", "rbh-reset-10"]
     RESET_REBOOT_COUNTER_11 = ["12", "rbh-reset-11"]
     SET_MAX_REBOOT_CNT = ["13", "rbh-max-cnt"]
+    GET_HK = ["14", "get-hk"]
 
 
 class Chip(enum.IntEnum):
@@ -124,6 +130,11 @@ def pack_core_commands(tc_queue: TcQueueT, op_code: str):
         generate_action_command(
             object_id=CORE_CONTROLLER_ID, action_id=ActionIds.RESET_REBOOT_COUNTER_11
         )
+    elif op_code in OpCodes.GET_HK:
+        tc_queue.appendleft((QueueCommands.PRINT, "Requesting housekeeping set"))
+        sid = make_sid(object_id=CORE_CONTROLLER_ID, set_id=SetIds.HK)
+        command = generate_one_hk_command(sid, 201)
+        tc_queue.appendleft(command.pack_command_tuple())
 
 
 def determine_reboot_params() -> (bool, Chip, Copy):
diff --git a/pus_tc/system/tcs.py b/pus_tc/system/tcs.py
new file mode 100644
index 0000000..fda1a76
--- /dev/null
+++ b/pus_tc/system/tcs.py
@@ -0,0 +1,34 @@
+from tmtccmd.tc.definitions import TcQueueT, QueueCommands
+from tmtccmd.tc.service_200_mode import Modes
+
+from .common import command_assembly
+from config.object_ids import TCS_BOARD_ASS_ID
+
+
+class OpCodes:
+    TCS_BOARD_ASS_NORMAL = ["0", "tcs-normal"]
+    TCS_BOARD_ASS_OFF = ["1", "tcs-off"]
+
+
+class Info:
+    TCS_BOARD_ASS_NORMAL = "Switching TCS board assembly on"
+    TCS_BOARD_ASS_OFF = "Switching TCS board assembly off"
+
+
+def pack_tcs_sys_commands(tc_queue: TcQueueT, op_code: str):
+    if op_code in OpCodes.TCS_BOARD_ASS_NORMAL:
+        command_assembly(
+            object_id=TCS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=0,
+            tc_queue=tc_queue,
+            info=Info.TCS_BOARD_ASS_NORMAL,
+        )
+    if op_code in OpCodes.TCS_BOARD_ASS_OFF:
+        command_assembly(
+            object_id=TCS_BOARD_ASS_ID,
+            mode=Modes.OFF,
+            submode=0,
+            tc_queue=tc_queue,
+            info=Info.TCS_BOARD_ASS_OFF,
+        )
diff --git a/pus_tc/system/time.py b/pus_tc/system/time.py
new file mode 100644
index 0000000..c66bc17
--- /dev/null
+++ b/pus_tc/system/time.py
@@ -0,0 +1,28 @@
+from datetime import datetime
+
+from spacepackets.ecss import PusTelecommand
+from tmtccmd.config import QueueCommands
+from tmtccmd.tc.definitions import TcQueueT
+
+from tmtccmd.logging import get_console_logger
+
+LOGGER = get_console_logger()
+
+
+class OpCodes:
+    SET_CURRENT_TIME = ["0", "set-curr-time"]
+
+
+class Info:
+    SET_CURRENT_TIME = "Setting current time in ASCII format"
+
+
+def pack_set_current_time_ascii_command(tc_queue: TcQueueT, ssc: int):
+    time_test_current_time = datetime.utcnow().isoformat() + "Z" + "\0"
+    current_time_ascii = time_test_current_time.encode("ascii")
+    LOGGER.info(f"Current time in ASCII format: {current_time_ascii}")
+    tc_queue.appendleft((QueueCommands.PRINT, Info.SET_CURRENT_TIME))
+    command = PusTelecommand(
+        service=9, subservice=128, ssc=ssc, app_data=current_time_ascii
+    )
+    tc_queue.appendleft(command.pack_command_tuple())
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index 340a8ac..420a768 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -1,25 +1,31 @@
 """Hook function which packs telecommands based on service and operation code string
 """
+import logging
 import os
 from collections import deque
 from typing import Union
 
+from spacepackets.ecss import PusTelecommand
+from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.config.definitions import CoreServiceList
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
+from tmtccmd.logging.pus import log_raw_pus_tc
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_5_event import pack_generic_service5_test_into
 from tmtccmd.pus.service_17_test import pack_service_17_ping_command
+from tmtccmd.logging import get_current_time_string
 
 from pus_tc.service_200_mode import pack_service200_test_into
-from pus_tc.devs.p60dock import pack_p60dock_test_into
+from pus_tc.devs.p60dock import pack_p60dock_cmds
 from pus_tc.devs.pdu2 import pack_pdu2_commands
 from pus_tc.devs.pdu1 import pack_pdu1_commands
 from pus_tc.devs.bpx_batt import pack_bpx_commands
 from pus_tc.devs.acu import pack_acu_test_into
+from pus_tc.devs.solar_array_deployment import pack_solar_array_deployment_test_into
 from pus_tc.devs.imtq import pack_imtq_test_into
 from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from pus_tc.devs.ploc_mpsoc import pack_ploc_mpsoc_test_into
-from pus_tc.devs.ploc_supervisor import pack_ploc_supv_test_into
+from pus_tc.devs.ploc_mpsoc import pack_ploc_mpsoc_commands
+from pus_tc.devs.ploc_supervisor import pack_ploc_supv_commands
 from pus_tc.devs.heater import pack_heater_test_into
 from pus_tc.devs.reaction_wheels import pack_single_rw_test_into
 from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
@@ -30,9 +36,11 @@ from pus_tc.system.core import pack_core_commands
 from pus_tc.devs.star_tracker import pack_star_tracker_commands
 from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
 from pus_tc.devs.gps import pack_gps_command
-from pus_tc.system.acs import pack_acs_command
+from pus_tc.system.time import pack_set_current_time_ascii_command
+from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
 from pus_tc.devs.plpcdu import pack_pl_pcdu_commands
 from pus_tc.devs.str_img_helper import pack_str_img_helper_command
+from pus_tc.system.tcs import pack_tcs_sys_commands
 from config.definitions import CustomServiceList
 from config.object_ids import (
     P60_DOCK_HANDLER,
@@ -59,12 +67,28 @@ from config.object_ids import (
     PDEC_HANDLER_ID,
     STR_IMG_HELPER_ID,
     SYRLINKS_HANDLER_ID,
+    SOLAR_ARRAY_DEPLOYMENT_ID,
 )
 
 
 LOGGER = get_console_logger()
 
 
+def pre_tc_send_cb(
+    packet: bytes,
+    com_if: CommunicationInterface,
+    pus_info: Union[PusTelecommand, any],
+    file_logger: logging.Logger,
+):
+    log_raw_pus_tc(
+        packet=packet, srv_subservice=(pus_info.service, pus_info.subservice)
+    )
+    tc_info_string = f"Sent {pus_info}"
+    LOGGER.info(tc_info_string)
+    file_logger.info(f"{get_current_time_string(True)}: {tc_info_string}")
+    com_if.send(data=packet)
+
+
 def pack_service_queue_user(
     service: Union[str, int], op_code: str, service_queue: TcQueueT
 ):
@@ -78,7 +102,7 @@ def pack_service_queue_user(
         return pack_service200_test_into(tc_queue=service_queue)
     if service == CustomServiceList.P60DOCK.value:
         object_id = P60_DOCK_HANDLER
-        return pack_p60dock_test_into(
+        return pack_p60dock_cmds(
             object_id=object_id, tc_queue=service_queue, op_code=op_code
         )
     if service == CustomServiceList.PDU1.value:
@@ -116,9 +140,11 @@ def pack_service_queue_user(
         return pack_imtq_test_into(
             object_id=object_id, tc_queue=service_queue, op_code=op_code
         )
-    if service == CustomServiceList.PLOC.value:
+    if service == CustomServiceList.PLOC_MPSOC.value:
         object_id = PLOC_MPSOC_ID
-        return pack_ploc_mpsoc_test_into(object_id=object_id, tc_queue=service_queue)
+        return pack_ploc_mpsoc_commands(
+            object_id=object_id, tc_queue=service_queue, op_code=op_code
+        )
     if service == CustomServiceList.REACTION_WHEEL_1.value:
         object_id = RW1_ID
         return pack_single_rw_test_into(
@@ -146,7 +172,7 @@ def pack_service_queue_user(
         )
     if service == CustomServiceList.PLOC_SUPV.value:
         object_id = PLOC_SUPV_ID
-        return pack_ploc_supv_test_into(
+        return pack_ploc_supv_commands(
             object_id=object_id, tc_queue=service_queue, op_code=op_code
         )
     if service == CustomServiceList.PLOC_UPDATER.value:
@@ -193,10 +219,20 @@ def pack_service_queue_user(
         return pack_syrlinks_command(
             object_id=SYRLINKS_HANDLER_ID, tc_queue=service_queue, op_code=op_code
         )
+    if service == CustomServiceList.SA_DEPLYOMENT.value:
+        return pack_solar_array_deployment_test_into(
+            object_id=SOLAR_ARRAY_DEPLOYMENT_ID, tc_queue=service_queue
+        )
+    if service == CustomServiceList.SUS_ASS.value:
+        return pack_sus_cmds(tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.PL_PCDU.value:
         return pack_pl_pcdu_commands(tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.ACS_ASS.value:
         return pack_acs_command(tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.TCS_ASS.value:
+        return pack_tcs_sys_commands(tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.TIME.value:
+        return pack_set_current_time_ascii_command(tc_queue=service_queue, ssc=0)
     LOGGER.warning("Invalid Service !")
 
 
diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py
new file mode 100644
index 0000000..cee50e1
--- /dev/null
+++ b/pus_tm/action_reply_handler.py
@@ -0,0 +1,107 @@
+import struct
+from config.object_ids import *
+from pus_tc.devs.imtq import ImtqActionIds
+from pus_tc.devs.ploc_mpsoc import PlocReplyIds
+from pus_tc.devs.ploc_supervisor import SupvActionIds
+from pus_tc.devs.star_tracker import StarTrackerActionIds
+from tmtccmd.logging import get_console_logger
+from tmtccmd.config.definitions import DataReplyUnpacked
+from tmtccmd.tm import Service8FsfwTm
+from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
+
+LOGGER = get_console_logger()
+
+
+def handle_action_reply(
+    raw_tm: bytes, printer: FsfwTmTcPrinter, obj_id_dict: ObjectIdDictT
+):
+    """Core Action reply handler
+    :return:
+    """
+    tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm)
+    printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+    object_id = obj_id_dict.get(tm_packet.source_object_id)
+    custom_data = tm_packet.custom_data
+    action_id = tm_packet.action_id
+    generic_print_str = printer.generic_action_packet_tm_print(
+        packet=tm_packet, obj_id=object_id
+    )
+    print(generic_print_str)
+    printer.file_logger.info(generic_print_str)
+    if object_id == IMTQ_HANDLER_ID:
+        return handle_imtq_replies(action_id, printer, custom_data)
+    elif object_id == PLOC_MPSOC_ID:
+        return handle_ploc_replies(action_id, printer, custom_data)
+    elif object_id == PLOC_SUPV_ID:
+        return handle_supervisor_replies(action_id, printer, custom_data)
+    elif object_id == STAR_TRACKER_ID:
+        return handle_startracker_replies(action_id, printer, custom_data)
+
+
+def handle_imtq_replies(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
+    if action_id == struct.unpack("!I", ImtqActionIds.get_commanded_dipole)[0]:
+        header_list = [
+            "Commanded X-Dipole",
+            "Commanded Y-Dipole",
+            "Commanded Z-Dipole",
+        ]
+        [x_dipole, y_dipole, z_dipole] = struct.unpack("!HHH", custom_data[0:6])
+        content_list = [x_dipole, y_dipole, z_dipole]
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
+
+
+def handle_ploc_replies(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
+    if action_id == PlocReplyIds.tm_mem_read_report:
+        header_list = [
+            "PLOC Memory Address",
+            "PLOC Mem Len",
+            "PLOC Read Memory Data",
+        ]
+        content_list = [
+            "0x" + custom_data[:4].hex(),
+            struct.unpack("!H", custom_data[4:6])[0],
+            "0x" + custom_data[6:10].hex(),
+        ]
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
+
+
+def handle_supervisor_replies(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
+    reply = DataReplyUnpacked()
+    if action_id == SupvActionIds.DUMP_MRAM:
+        header_list = ["MRAM Dump"]
+        content_list = [custom_data[: len(custom_data)]]
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
+
+
+def handle_startracker_replies(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
+    if action_id == StarTrackerActionIds.CHECKSUM:
+        if len(custom_data) != 5:
+            LOGGER.warning(
+                "Star tracker reply has invalid length {0}".format(len(custom_data))
+            )
+            return
+        header_list = ["Checksum", "Checksum valid"]
+        print(custom_data[4])
+        checksum_valid_flag = custom_data[4] >> 8
+        content_list = ["0x" + custom_data[:4].hex(), checksum_valid_flag]
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
diff --git a/pus_tm/event_handler.py b/pus_tm/event_handler.py
index 8d64db5..9d0426d 100644
--- a/pus_tm/event_handler.py
+++ b/pus_tm/event_handler.py
@@ -1,8 +1,13 @@
+import logging
 import os.path
-
+from datetime import datetime
 from config.object_ids import get_object_ids
-from tmtccmd.utility.logger import get_console_logger
-from tmtccmd.utility.fsfw import parse_fsfw_events_csv, EventDictT, EventInfo
+
+from tmtccmd.tm import Service5Tm
+from tmtccmd.logging import get_console_logger
+from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.fsfw import parse_fsfw_events_csv, EventDictT, EventInfo
+
 
 LOGGER = get_console_logger()
 DEFAULT_EVENTS_CSV_PATH = "config/events.csv"
@@ -21,25 +26,36 @@ def get_event_dict() -> EventDictT:
 
 
 def handle_event_packet(
-    object_id: bytes, event_id: int, param_1: int, param_2: int
+    raw_tm: bytes, printer: FsfwTmTcPrinter, file_logger: logging.Logger
 ) -> str:
+    tm = Service5Tm.unpack(raw_telemetry=raw_tm)
+    printer.handle_long_tm_print(packet_if=tm, info_if=tm)
     additional_event_info = ""
     event_dict = get_event_dict()
-    info = event_dict.get(event_id)
+    info = event_dict.get(tm.event_id)
     if info is None:
-        LOGGER.warning(f"Event ID {event_id} has no information")
+        LOGGER.warning(f"Event ID {tm.event_id} has no information")
         info = EventInfo()
         info.name = "Unknown event"
     obj_ids = get_object_ids()
-    obj_id_obj = obj_ids.get(bytes(object_id))
+    obj_id_obj = obj_ids.get(tm.reporter_id.as_bytes)
     if obj_id_obj is None:
-        LOGGER.warning(f"Object ID 0x{object_id.hex()} has no name")
-        obj_name = object_id.hex()
+        LOGGER.warning(f"Object ID 0x{tm.reporter_id.as_string} has no name")
+        obj_name = tm.reporter_id.as_string
     else:
         obj_name = obj_id_obj.name
-    generic_event_string = f"Object {obj_name} generated Event {event_id} | {info.name}"
+    generic_event_string = (
+        f"Object {obj_name} generated Event {tm.event_id} | {info.name}"
+    )
     if info.info != "":
         additional_event_info = (
-            f" | Additional info: {info.info} | P1: {param_1} | P2: {param_2}"
+            f"Additional info: {info.info} | P1: {tm.param_1} | P2: {tm.param_2}"
         )
-    return generic_event_string + additional_event_info
+    file_logger.info(
+        f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
+    )
+    LOGGER.info(generic_event_string)
+    if additional_event_info != "":
+        file_logger.info(additional_event_info)
+        print(additional_event_info)
+    return generic_event_string + " | " + additional_event_info
diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 4532bd1..b5a318a 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -1,64 +1,80 @@
+"""Core EIVE TM handler module
 """
-@brief      This file transfers control of TM parsing to the user
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-from tmtccmd.tm.service_8_fsfw_functional_cmd import Service8FsfwTm
 from spacepackets.ecss.tm import PusTelemetry
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
+from tmtccmd.logging.pus import (
+    log_raw_pus_tm,
+    log_raw_unknown_packet,
+    PacketTypes,
+    create_tmtc_logger,
+)
 
-from tmtccmd.pus.service_1_verification import Service1TMExtended
 from tmtccmd.pus.service_17_test import Service17TMExtended
-from tmtccmd.tm.service_3_fsfw_housekeeping import Service3FsfwTm
 from tmtccmd.tm.service_20_fsfw_parameters import Service20FsfwTm
-from tmtccmd.tm.service_5_event import Service5Tm
 from tmtccmd.tm.service_200_fsfw_mode import Service200FsfwTm
-from tmtccmd.utility.tmtc_printer import TmTcPrinter, PrintFormats
+from tmtccmd.utility.tmtc_printer import PrintFormats, FsfwTmTcPrinter
 
 from config.definitions import PUS_APID
+from config.object_ids import get_object_ids
+
+from .event_handler import handle_event_packet
+from .verification_handler import handle_service_1_packet
+from .hk_handling import handle_hk_packet
+from .action_reply_handler import handle_action_reply
 
 LOGGER = get_console_logger()
 
 
-def ccsds_tm_handler(
-    apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter
-) -> None:
+FSFW_PRINTER = FsfwTmTcPrinter(file_logger=create_tmtc_logger())
+
+
+def ccsds_tm_handler(apid: int, raw_tm_packet: bytes, _user_args: any) -> None:
     if apid == PUS_APID:
-        pus_factory_hook(raw_tm_packet=raw_tm_packet, tmtc_printer=tmtc_printer)
+        pus_factory_hook(raw_tm_packet=raw_tm_packet)
 
 
-def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
+def pus_factory_hook(raw_tm_packet: bytes):
     if len(raw_tm_packet) < 8:
         LOGGER.warning("Detected packet shorter than 8 bytes!")
         return
     service_type = raw_tm_packet[7]
-    tm_packet = None
+    subservice_type = raw_tm_packet[8]
+    file_logger = FSFW_PRINTER.file_logger
+    obj_id_dict = get_object_ids()
     try:
         if service_type == 1:
-            tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm_packet)
-        if service_type == 3:
-            tm_packet = Service3FsfwTm.unpack(
-                raw_telemetry=raw_tm_packet, custom_hk_handling=False
+            handle_service_1_packet(printer=FSFW_PRINTER, raw_tm=raw_tm_packet)
+        elif service_type == 3:
+            handle_hk_packet(
+                printer=FSFW_PRINTER, raw_tm=raw_tm_packet, obj_id_dict=obj_id_dict
             )
-        if service_type == 5:
-            tm_packet = Service5Tm.unpack(raw_telemetry=raw_tm_packet)
-        if service_type == 8:
-            tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm_packet)
-        if service_type == 17:
+        elif service_type == 5:
+            handle_event_packet(
+                raw_tm=raw_tm_packet, printer=FSFW_PRINTER, file_logger=file_logger
+            )
+        elif service_type == 8:
+            handle_action_reply(
+                raw_tm=raw_tm_packet, printer=FSFW_PRINTER, obj_id_dict=obj_id_dict
+            )
+        elif service_type == 17:
             tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet)
-        if service_type == 20:
+            FSFW_PRINTER.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+        elif service_type == 20:
             tm_packet = Service20FsfwTm.unpack(raw_telemetry=raw_tm_packet)
-        if service_type == 200:
+            FSFW_PRINTER.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+        elif service_type == 200:
             tm_packet = Service200FsfwTm.unpack(raw_telemetry=raw_tm_packet)
-        if tm_packet is None:
+            FSFW_PRINTER.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+        else:
             LOGGER.info(
                 f"The service {service_type} is not implemented in Telemetry Factory"
             )
             tm_packet = PusTelemetry.unpack(raw_telemetry=raw_tm_packet)
             tm_packet.print_source_data(PrintFormats.HEX)
-        tmtc_printer.print_telemetry(
-            packet_if=tm_packet, info_if=tm_packet, print_raw_tm=False
+        log_raw_pus_tm(
+            packet=raw_tm_packet, srv_subservice=(service_type, subservice_type)
         )
     except ValueError:
         # TODO: Log faulty packet
         LOGGER.warning("Invalid packet format detected")
+        log_raw_unknown_packet(packet=raw_tm_packet, packet_type=PacketTypes.TM)
diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index 69d8a24..0902f36 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -3,55 +3,101 @@ import struct
 import os
 import datetime
 
+from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.config.definitions import HkReplyUnpacked
-from tmtccmd.tm.service_3_fsfw_housekeeping import Service3Base
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.tm.service_3_fsfw_housekeeping import (
+    Service3Base,
+    HkContentType,
+    Service3FsfwTm,
+)
+from tmtccmd.logging import get_console_logger
 from pus_tc.devs.bpx_batt import BpxSetIds
 from pus_tc.devs.syrlinks_hk_handler import SetIds
+from pus_tc.devs.p60dock import SetIds
 from pus_tc.devs.imtq import ImtqSetIds
-from config.object_ids import (
-    SYRLINKS_HANDLER_ID,
-    IMTQ_HANDLER_ID,
-    GPS_HANDLER_0_ID,
-    GPS_HANDLER_1_ID,
-    BPX_HANDLER_ID,
-)
+from tmtccmd.pus.obj_id import ObjectId, ObjectIdDictT
+import config.object_ids as obj_ids
+
 
 LOGGER = get_console_logger()
 
 
-def handle_user_hk_packet(
-    object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
-) -> HkReplyUnpacked:
+def handle_hk_packet(
+    raw_tm: bytes,
+    obj_id_dict: ObjectIdDictT,
+    printer: FsfwTmTcPrinter,
+):
+    tm_packet = Service3FsfwTm.unpack(raw_telemetry=raw_tm, custom_hk_handling=False)
+    named_obj_id = obj_id_dict.get(tm_packet.object_id.as_bytes)
+    if named_obj_id is None:
+        named_obj_id = tm_packet.object_id
+    if tm_packet.subservice == 25 or tm_packet.subservice == 26:
+        hk_data = tm_packet.tm_data[8:]
+        printer.generic_hk_tm_print(
+            content_type=HkContentType.HK,
+            object_id=named_obj_id,
+            set_id=tm_packet.set_id,
+            hk_data=hk_data,
+        )
+        handle_regular_hk_print(
+            printer=printer,
+            object_id=named_obj_id,
+            hk_packet=tm_packet,
+            hk_data=hk_data,
+        )
+    if tm_packet.subservice == 10 or tm_packet.subservice == 12:
+        LOGGER.warning("HK definitions printout not implemented yet")
+
+
+def handle_regular_hk_print(
+    printer: FsfwTmTcPrinter,
+    object_id: ObjectId,
+    hk_packet: Service3Base,
+    hk_data: bytes,
+):
+    object_id = object_id.as_bytes
+    set_id = hk_packet.set_id
     """This function is called when a Service 3 Housekeeping packet is received."""
-    if object_id == SYRLINKS_HANDLER_ID:
+    if object_id == obj_ids.SYRLINKS_HANDLER_ID:
         if set_id == SetIds.RX_REGISTERS_DATASET:
-            return handle_syrlinks_rx_registers_dataset(hk_data)
+            return handle_syrlinks_rx_registers_dataset(printer, hk_data)
         elif set_id == SetIds.TX_REGISTERS_DATASET:
-            return handle_syrlinks_tx_registers_dataset(hk_data)
+            return handle_syrlinks_tx_registers_dataset(printer, hk_data)
         else:
-            LOGGER.info("Serive 3 TM: Syrlinks handler reply with unknown set id")
-    elif object_id == IMTQ_HANDLER_ID:
+            LOGGER.info("Service 3 TM: Syrlinks handler reply with unknown set id")
+    elif object_id == obj_ids.IMTQ_HANDLER_ID:
         if (set_id >= ImtqSetIds.POSITIVE_X_TEST) and (
             set_id <= ImtqSetIds.NEGATIVE_Z_TEST
         ):
-            return handle_self_test_data(hk_data)
+            return handle_self_test_data(printer, hk_data)
         else:
-            LOGGER.info("Serive 3 TM: Syrlinks handler reply with unknown set id")
-    elif object_id == GPS_HANDLER_0_ID or object_id == GPS_HANDLER_1_ID:
-        return handle_gps_data(hk_data=hk_data)
-    elif object_id == BPX_HANDLER_ID:
-        return handle_bpx_hk_data(hk_data=hk_data, set_id=set_id)
+            LOGGER.info("Service 3 TM: Syrlinks handler reply with unknown set id")
+    elif object_id == obj_ids.GPS_HANDLER_0_ID or object_id == obj_ids.GPS_HANDLER_1_ID:
+        handle_gps_data(printer=printer, hk_data=hk_data)
+    elif object_id == obj_ids.BPX_HANDLER_ID:
+        handle_bpx_hk_data(hk_data=hk_data, set_id=set_id, printer=printer)
+    elif object_id == obj_ids.CORE_CONTROLLER_ID:
+        return handle_core_hk_data(printer=printer, hk_data=hk_data)
+    elif object_id == obj_ids.PDU_1_HANDLER_ID:
+        return handle_pdu_data(
+            printer=printer, pdu_idx=1, set_id=set_id, hk_data=hk_data
+        )
+    elif object_id == obj_ids.PDU_2_HANDLER_ID:
+        return handle_pdu_data(
+            printer=printer, pdu_idx=2, set_id=set_id, hk_data=hk_data
+        )
+    elif object_id == obj_ids.P60_DOCK_HANDLER:
+        handle_p60_hk_data(printer=printer, set_id=set_id, hk_data=hk_data)
+    elif object_id == obj_ids.PL_PCDU_ID:
+        log_to_both(printer, "Received PL PCDU HK data")
     else:
         LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.")
         return HkReplyUnpacked()
 
 
-def handle_syrlinks_rx_registers_dataset(
-    hk_data: bytearray,
-) -> HkReplyUnpacked:
+def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: bytes):
     reply = HkReplyUnpacked()
-    reply.header_list = [
+    header_list = [
         "RX Status",
         "RX Sensitivity",
         "RX Frequency Shift",
@@ -69,7 +115,7 @@ def handle_syrlinks_rx_registers_dataset(
     rx_demod_eb = struct.unpack("!I", hk_data[13:17])
     rx_demod_n0 = struct.unpack("!I", hk_data[17:21])
     rx_data_rate = hk_data[21]
-    reply.content_list = [
+    content_list = [
         rx_status,
         rx_sensitivity,
         rx_frequency_shift,
@@ -79,28 +125,30 @@ def handle_syrlinks_rx_registers_dataset(
         rx_demod_n0,
         rx_data_rate,
     ]
-    reply.validity_buffer = hk_data[22:]
-    reply.num_of_vars = 8
-    return reply
+    validity_buffer = hk_data[22:]
+    log_to_both(printer, str(header_list))
+    log_to_both(printer, str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=8)
 
 
 def handle_syrlinks_tx_registers_dataset(
-    hk_data: bytearray,
-) -> HkReplyUnpacked:
+    printer: FsfwTmTcPrinter,
+    hk_data: bytes,
+):
     reply = HkReplyUnpacked()
-    reply.header_list = ["TX Status", "TX Waveform", "TX AGC value"]
+    header_list = ["TX Status", "TX Waveform", "TX AGC value"]
     tx_status = hk_data[0]
     tx_waveform = hk_data[1]
     tx_agc_value = struct.unpack("!H", hk_data[2:4])
-    reply.content_list = [tx_status, tx_waveform, tx_agc_value]
-    reply.validity_buffer = hk_data[4:]
-    reply.num_of_vars = 3
-    return reply
+    content_list = [tx_status, tx_waveform, tx_agc_value]
+    validity_buffer = hk_data[4:]
+    log_to_both(printer, str(header_list))
+    log_to_both(printer, str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=3)
 
 
-def handle_self_test_data(hk_data: bytearray) -> HkReplyUnpacked:
-    reply = HkReplyUnpacked()
-    reply.hk_header = [
+def handle_self_test_data(printer: FsfwTmTcPrinter, hk_data: bytes):
+    header_list = [
         "Init Err",
         "Init Raw Mag X [nT]",
         "Init Raw Mag Y [nT]",
@@ -186,8 +234,8 @@ def handle_self_test_data(hk_data: bytearray) -> HkReplyUnpacked:
     fina_coil_y_temperature = struct.unpack("!H", hk_data[125:127])[0]
     fina_coil_z_temperature = struct.unpack("!H", hk_data[127:129])[0]
 
-    reply.validity_buffer = hk_data[129:]
-    reply.content_list = [
+    validity_buffer = hk_data[129:]
+    content_list = [
         init_err,
         init_raw_mag_x,
         init_raw_mag_y,
@@ -228,17 +276,17 @@ def handle_self_test_data(hk_data: bytearray) -> HkReplyUnpacked:
         fina_coil_y_temperature,
         fina_coil_z_temperature,
     ]
-    reply.num_of_vars = len(reply.hk_header)
-    return reply
+    num_of_vars = len(header_list)
+    log_to_both(printer, str(header_list))
+    log_to_both(printer, str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)
 
 
-def handle_gps_data(hk_data: bytearray) -> HkReplyUnpacked:
+def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes):
     LOGGER.info(f"Received GPS data, HK data length {len(hk_data)}")
     reply = HkReplyUnpacked()
     var_index = 0
-    header_array = []
-    content_array = []
-    reply.header_list = [
+    header_list = [
         "Latitude",
         "Longitude",
         "Altitude",
@@ -260,7 +308,7 @@ def handle_gps_data(hk_data: bytearray) -> HkReplyUnpacked:
     seconds = hk_data[32]
     date_string = f"{day}.{month}.{year} {hours}:{minutes}:{seconds}"
     unix_seconds = struct.unpack("!I", hk_data[33:37])[0]
-    content_array = [
+    content_list = [
         latitude,
         longitude,
         altitude,
@@ -282,27 +330,29 @@ def handle_gps_data(hk_data: bytearray) -> HkReplyUnpacked:
             f"{datetime.datetime.now()}, {latitude}, {longitude}, {altitude}, "
             f"{fix_mode}, {sat_in_use}, {date_string}, {unix_seconds}\n"
         )
-    reply.header_list = header_array
-    reply.content_list = content_array
-    reply.validity_buffer = hk_data[37:39]
-    return reply
+    validity_buffer = hk_data[37:39]
+    log_to_both(printer, str(header_list))
+    log_to_both(printer, str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
 
 
-def handle_bpx_hk_data(hk_data: bytes, set_id: int) -> HkReplyUnpacked:
-    LOGGER.info(f"Received BPX data, HK data length {len(hk_data)}")
-    reply = HkReplyUnpacked()
+def handle_bpx_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
     if set_id == BpxSetIds.GET_HK_SET:
-        charge_current = struct.unpack("!H", hk_data[0:2])[0]
-        discharge_current = struct.unpack("!H", hk_data[2:4])[0]
-        heater_current = struct.unpack("!H", hk_data[4:6])[0]
-        batt_voltage = struct.unpack("!H", hk_data[6:8])[0]
-        batt_temp_1 = struct.unpack("!h", hk_data[8:10])[0]
-        batt_temp_2 = struct.unpack("!h", hk_data[10:12])[0]
-        batt_temp_3 = struct.unpack("!h", hk_data[12:14])[0]
-        batt_temp_4 = struct.unpack("!h", hk_data[14:16])[0]
-        reboot_cntr = struct.unpack("!I", hk_data[16:20])[0]
-        boot_cause = hk_data[20]
-        reply.header_list = [
+        fmt_str = "!HHHHhhhhIB"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            charge_current,
+            discharge_current,
+            heater_current,
+            batt_voltage,
+            batt_temp_1,
+            batt_temp_2,
+            batt_temp_3,
+            batt_temp_4,
+            reboot_cntr,
+            boot_cause,
+        ) = struct.unpack(fmt_str, hk_data[0:inc_len])
+        header_list = [
             "Charge Current",
             "Discharge Current",
             "Heater Current",
@@ -314,7 +364,7 @@ def handle_bpx_hk_data(hk_data: bytes, set_id: int) -> HkReplyUnpacked:
             "Reboot Counter",
             "Boot Cause",
         ]
-        reply.content_list = [
+        content_list = [
             charge_current,
             discharge_current,
             heater_current,
@@ -326,16 +376,332 @@ def handle_bpx_hk_data(hk_data: bytes, set_id: int) -> HkReplyUnpacked:
             reboot_cntr,
             boot_cause,
         ]
-        reply.validity_buffer = hk_data[21:]
+        validity_buffer = hk_data[inc_len:]
+        log_to_both(printer, str(header_list))
+        log_to_both(printer, str(content_list))
+        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
     elif set_id == BpxSetIds.GET_CFG_SET:
         battheat_mode = hk_data[0]
         battheat_low = struct.unpack("!b", hk_data[1:2])[0]
         battheat_high = struct.unpack("!b", hk_data[2:3])[0]
-        reply.header_list = [
+        header_list = [
             "Battery Heater Mode",
             "Battery Heater Low Limit",
             "Battery Heater High Limit",
         ]
-        reply.content_list = [battheat_mode, battheat_low, battheat_high]
-        reply.validity_buffer = hk_data[3:]
-    return reply
+        content_list = [battheat_mode, battheat_low, battheat_high]
+        validity_buffer = hk_data[3:]
+        log_to_both(printer, str(header_list))
+        log_to_both(printer, str(content_list))
+        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
+
+
+def handle_core_hk_data(printer: FsfwTmTcPrinter, hk_data: bytes):
+
+    fmt_str = "!fffH"
+    inc_len = struct.calcsize(fmt_str)
+    (temperature, ps_voltage, pl_voltage, tx_agc_value) = struct.unpack(
+        fmt_str, hk_data[0 : 0 + inc_len]
+    )
+    printout = (
+        f"Chip Temperature [°C] {temperature} | PS Voltage [mV] {ps_voltage} | "
+        f"PL Voltage [mV] {pl_voltage} | TX AGC {tx_agc_value}"
+    )
+    log_to_both(printer, printout)
+    printer.print_validity_buffer(validity_buffer=hk_data[inc_len:], num_vars=4)
+
+
+P60_INDEX_LIST = [
+    "ACU VCC",
+    "PDU1 VCC",
+    "X3 IDLE VCC",
+    "PDU2 VCC",
+    "ACU VBAT",
+    "PDU1 VBAT",
+    "X3 IDLE VBAT",
+    "PDU2 VBAT",
+    "STACK VBAT",
+    "STACK 3V3",
+    "STACK 5V",
+    "GS3V3",
+    "GS5V",
+]
+
+WDT_LIST = ["GND", "I2C", "CAN", "CSP0", "CSP1"]
+
+PDU1_CHANNELS_NAMES = [
+    "TCS Board",
+    "Syrlinks",
+    "Startracker",
+    "MGT",
+    "SUS Nominal",
+    "SCEX",
+    "PLOC",
+    "ACS A Side",
+    "Unused Channel 8",
+]
+
+PDU2_CHANNELS_NAMES = [
+    "Q7S",
+    "Payload PCDU CH1",
+    "RW",
+    "TCS Heater In",
+    "SUS Redundant",
+    "Deployment Mechanism",
+    "Payload PCDU CH6",
+    "ACS B Side",
+    "Payload Camera",
+]
+
+PDU_CHANNEL_NAMES = [PDU1_CHANNELS_NAMES, PDU2_CHANNELS_NAMES]
+
+
+class WdtInfo:
+    def __init__(self):
+        self.wdt_reboots_list = []
+        self.time_pings_left_list = []
+
+    def print(self, printer: FsfwTmTcPrinter):
+        wdt_info = "WDT Type | Reboots | Time or Pings left (CSP only)"
+        log_to_both(printer, wdt_info)
+        for idx in range(len(self.wdt_reboots_list)):
+            log_to_both(
+                printer,
+                f"{WDT_LIST[idx].ljust(5)} | "
+                f"{self.wdt_reboots_list[idx]:010} | {self.time_pings_left_list[idx]:010}",
+            )
+
+    def parse(self, wdt_data: bytes, current_idx: int) -> int:
+        priv_idx = 0
+        self.wdt_reboots_list = []
+        self.time_pings_left_list = []
+        for idx in range(5):
+            self.wdt_reboots_list.append(
+                struct.unpack("!I", wdt_data[priv_idx : priv_idx + 4])[0]
+            )
+            priv_idx += 4
+            current_idx += 4
+        for idx in range(3):
+            self.time_pings_left_list.append(
+                struct.unpack("!I", wdt_data[priv_idx : priv_idx + 4])[0]
+            )
+            priv_idx += 4
+            current_idx += 4
+        for idx in range(2):
+            self.time_pings_left_list.append(wdt_data[priv_idx])
+            current_idx += 1
+            priv_idx += 1
+        return current_idx
+
+
+def handle_pdu_data(
+    printer: FsfwTmTcPrinter, pdu_idx: int, set_id: int, hk_data: bytes
+):
+    current_idx = 0
+    priv_idx = pdu_idx - 1
+    if set_id == SetIds.PDU_1_AUX or set_id == SetIds.PDU_2_AUX:
+        fmt_str = "!hhBBBIIH"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            vcc,
+            vbat,
+            conv_enb_0,
+            conv_enb_1,
+            conv_enb_2,
+            boot_cause,
+            uptime,
+            reset_cause,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        log_to_both(printer, f"VCC {vcc} mV | VBAT {vbat} mV")
+        log_to_both(
+            printer, f"Converter Enables [{conv_enb_0},{conv_enb_1},{conv_enb_2}]"
+        )
+        log_to_both(
+            printer,
+            f"Boot Cause {boot_cause} | Uptime {uptime} | Reset Cause {reset_cause}",
+        )
+        current_idx += inc_len
+        latchup_list = []
+        log_to_both(printer, "Latchups")
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            latchup_list.append(
+                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+            )
+            content_line = (
+                f"{PDU_CHANNEL_NAMES[priv_idx][idx].ljust(24)} | {latchup_list[idx]}"
+            )
+            log_to_both(printer, content_line)
+            current_idx += 2
+        device_types = []
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            device_types.append(hk_data[current_idx])
+            current_idx += 1
+        device_statuses = []
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            device_statuses.append(hk_data[current_idx])
+            current_idx += 1
+        wdt = WdtInfo()
+        current_idx = wdt.parse(wdt_data=hk_data[current_idx:], current_idx=current_idx)
+        wdt.print(printer=printer)
+    if set_id == SetIds.PDU_1_CORE or set_id == SetIds.PDU_2_CORE:
+        log_to_both(printer, f"Received PDU HK from PDU {pdu_idx}")
+        current_list = []
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            current_list.append(
+                struct.unpack("!h", hk_data[current_idx : current_idx + 2])[0]
+            )
+            current_idx += 2
+        voltage_list = []
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            voltage_list.append(
+                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+            )
+            current_idx += 2
+        output_enb_list = []
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            output_enb_list.append(hk_data[current_idx])
+            current_idx += 1
+        header_str = f"{'Name'.ljust(24)} | OutEnb | U [mV] | I [mA]"
+        print(header_str)
+        printer.file_logger.info(header_str)
+        for idx in range(len(PDU1_CHANNELS_NAMES)):
+            out_enb = f"{output_enb_list[idx]}".ljust(6)
+            content_line = (
+                f"{PDU_CHANNEL_NAMES[priv_idx][idx].ljust(24)} | {out_enb} | "
+                f"{voltage_list[idx]:05} | {current_list[idx]:04}"
+            )
+            log_to_both(printer, content_line)
+        fmt_str = "!IBh"
+        inc_len = struct.calcsize(fmt_str)
+        (boot_count, batt_mode, temperature) = struct.unpack(
+            fmt_str, hk_data[current_idx : current_idx + inc_len]
+        )
+        info = (
+            f"Boot Count {boot_count} | Battery Mode {batt_mode} | "
+            f"Temperature {temperature / 10.0}"
+        )
+        log_to_both(printer, info)
+
+
+def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    if set_id == SetIds.P60_CORE:
+        log_to_both(printer, "Received P60 Core HK. Voltages in mV, currents in mA")
+        current_idx = 0
+        current_list = []
+        for idx in range(13):
+            current_list.append(
+                struct.unpack("!h", hk_data[current_idx : current_idx + 2])[0]
+            )
+            current_idx += 2
+        voltage_list = []
+        for idx in range(13):
+            voltage_list.append(
+                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+            )
+            current_idx += 2
+        out_enb_list = []
+        for idx in range(13):
+            out_enb_list.append(hk_data[current_idx])
+            current_idx += 1
+        header_str = f"{'Name'.ljust(24)} | OutEnb | U [mV] | I [mA]"
+        print(header_str)
+        printer.file_logger.info(header_str)
+        for idx in range(13):
+            out_enb = f"{out_enb_list[idx]}".ljust(6)
+            content_line = (
+                f"{P60_INDEX_LIST[idx].ljust(24)} | {out_enb} | "
+                f"{voltage_list[idx]:05} | {current_list[idx]:04}"
+            )
+            log_to_both(printer, content_line)
+        fmt_str = "!IBhHhh"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            boot_count,
+            batt_mode,
+            batt_current,
+            batt_voltage,
+            temp_0,
+            temp_1,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        current_idx += inc_len
+        batt_info = (
+            f"Batt: Mode {batt_mode} | Boot Count {boot_count} | "
+            f"Charge current {batt_current} | Voltage {batt_voltage}"
+        )
+        temps = f"In C: Temp 0 {temp_0 / 10.0} | Temp 1 {temp_1 / 10.0} | "
+        log_to_both(printer, temps)
+        log_to_both(printer, batt_info)
+        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=9)
+    if set_id == SetIds.P60_AUX:
+        log_to_both(printer, "Received P60 AUX HK. Voltages in mV, currents in mA")
+        current_idx = 0
+        latchup_list = []
+        log_to_both(printer, "P60 Dock Latchups")
+        for idx in range(0, 13):
+            latchup_list.append(
+                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+            )
+            content_line = f"{P60_INDEX_LIST[idx].ljust(24)} | {latchup_list[idx]}"
+            log_to_both(printer, content_line)
+            current_idx += 2
+        fmt_str = "!IIHBBHHhhB"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            boot_cause,
+            uptime,
+            reset_cause,
+            heater_on,
+            conv_5v_on,
+            dock_vbat,
+            dock_vcc_c,
+            batt_temp_0,
+            batt_temp_1,
+            dearm_status,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        current_idx += inc_len
+        wdt = WdtInfo()
+        current_idx = wdt.parse(wdt_data=hk_data[current_idx:], current_idx=current_idx)
+        fmt_str = "!hhbb"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            batt_charge_current,
+            batt_discharge_current,
+            ant6_depl,
+            ar6_depl,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        current_idx += inc_len
+        device_types = []
+        device_statuses = []
+        for idx in range(8):
+            device_types.append(hk_data[current_idx])
+            current_idx += 1
+        for idx in range(8):
+            device_statuses.append(hk_data[current_idx])
+            current_idx += 1
+        util_info = (
+            f"Reset Cause {reset_cause} | Boot Cause {boot_cause} | Uptime {uptime}"
+        )
+        util_info_2 = (
+            f"Conv 5V on {conv_5v_on} |  Heater On {heater_on} | "
+            f"Dock VBAT {dock_vbat} | DOCK VCC Current {dock_vcc_c}"
+        )
+        log_to_both(printer, util_info)
+        log_to_both(printer, util_info_2)
+        wdt.print(printer)
+        misc_info = (
+            f"Dearm {dearm_status} | ANT6 Depl {ant6_depl} | AR6 Deply {ar6_depl}"
+        )
+        log_to_both(printer, misc_info)
+        batt_info = (
+            f"Batt Temp 0 {batt_temp_0 / 10.0} | Batt Temp 1 {batt_temp_1 / 10.0} | "
+            f"Charge Current {batt_charge_current} | Discharge Current {batt_discharge_current}"
+        )
+        log_to_both(printer, batt_info)
+        printer.print_validity_buffer(
+            validity_buffer=hk_data[current_idx:], num_vars=27
+        )
+
+
+def log_to_both(printer: FsfwTmTcPrinter, string: str):
+    print(string)
+    printer.file_logger.info(string)
diff --git a/pus_tm/service_8_hook.py b/pus_tm/service_8_hook.py
deleted file mode 100644
index f5ddde0..0000000
--- a/pus_tm/service_8_hook.py
+++ /dev/null
@@ -1,100 +0,0 @@
-import struct
-from config.object_ids import *
-from pus_tc.devs.imtq import ImtqActionIds
-from pus_tc.devs.ploc_mpsoc import PlocReplyIds
-from pus_tc.devs.ploc_supervisor import SupvActionIds
-from pus_tc.devs.star_tracker import StarTrackerActionIds
-from tmtccmd.utility.logger import get_console_logger
-from tmtccmd.config.definitions import DataReplyUnpacked
-
-LOGGER = get_console_logger()
-
-
-def user_analyze_service_8_data(
-    object_id: bytes, action_id: int, custom_data: bytearray
-) -> DataReplyUnpacked:
-    """
-    This function is called by the TMTC core if a Service 8 data reply (subservice 130)
-    is received. The user can return a tuple of two lists, where the first list
-    is a list of header strings to print and the second list is a list of values to print.
-    The TMTC core will take care of printing both lists and logging them.
-
-    @param object_id:
-    @param action_id:
-    @param custom_data:
-    @return:
-    """
-    if object_id == PDU_2_HANDLER_ID:
-        reply = DataReplyUnpacked()
-        reply.header_list = ["PDU2 Service 8 Reply"]
-        data_string = str()
-        for index in range(len(custom_data)):
-            data_string += str(hex(custom_data[index])) + " , "
-        data_string = data_string.rstrip()
-        data_string = data_string.rstrip(",")
-        data_string = data_string.rstrip()
-        reply.content_list = [data_string]
-        return reply
-    elif object_id == IMTQ_HANDLER_ID:
-        return handle_imtq_replies(action_id, custom_data)
-    elif object_id == PLOC_MPSOC_ID:
-        return handle_ploc_replies(action_id, custom_data)
-    elif object_id == PLOC_SUPV_ID:
-        return handle_supervisor_replies(action_id, custom_data)
-    elif object_id == STAR_TRACKER_ID:
-        return handle_startracker_replies(action_id, custom_data)
-    return DataReplyUnpacked()
-
-
-def handle_imtq_replies(action_id: int, custom_data: bytearray) -> DataReplyUnpacked:
-    reply = DataReplyUnpacked()
-    if action_id == struct.unpack("!I", ImtqActionIds.get_commanded_dipole)[0]:
-        reply.header_list = [
-            "Commanded X-Dipole",
-            "Commanded Y-Dipole",
-            "Commanded Z-Dipole",
-        ]
-        x_dipole = struct.unpack("!H", custom_data[:2])
-        y_dipole = struct.unpack("!H", custom_data[2:4])
-        z_dipole = struct.unpack("!H", custom_data[4:6])
-        reply.content_list = [x_dipole[0], y_dipole[0], z_dipole[0]]
-    return reply
-
-
-def handle_ploc_replies(action_id: int, custom_data: bytearray) -> DataReplyUnpacked:
-    reply = DataReplyUnpacked()
-    if action_id == PlocReplyIds.tm_mem_read_report:
-        reply.header_list = [
-            "PLOC Memory Address",
-            "PLOC Mem Len",
-            "PLOC Read Memory Data",
-        ]
-        reply.content_list = [custom_data[:4], custom_data[4:6], custom_data[6:10]]
-    return reply
-
-
-def handle_supervisor_replies(
-    action_id: int, custom_data: bytearray
-) -> DataReplyUnpacked:
-    reply = DataReplyUnpacked()
-    if action_id == SupvActionIds.DUMP_MRAM:
-        reply.header_list = ["MRAM Dump"]
-        reply.content_list = [custom_data[: len(custom_data)]]
-    return reply
-
-
-def handle_startracker_replies(
-    action_id: int, custom_data: bytearray
-) -> DataReplyUnpacked:
-    reply = DataReplyUnpacked()
-    if action_id == StarTrackerActionIds.CHECKSUM:
-        if len(custom_data) != 5:
-            LOGGER.warning(
-                "Star tracker reply has invalid length {0}".format(len(custom_data))
-            )
-            return reply
-        reply.header_list = ["Checksum", "Checksum valid"]
-        print(custom_data[4])
-        checksum_valid_flag = custom_data[4] >> 8
-        reply.content_list = ["0x" + custom_data[:4].hex(), checksum_valid_flag]
-    return reply
diff --git a/pus_tm/verification_handler.py b/pus_tm/verification_handler.py
new file mode 100644
index 0000000..2047f1d
--- /dev/null
+++ b/pus_tm/verification_handler.py
@@ -0,0 +1,30 @@
+import logging
+from datetime import datetime
+from typing import cast
+
+from tmtccmd.pus.service_1_verification import Service1TMExtended
+from tmtccmd.logging import get_console_logger
+from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
+from config.retvals import get_retval_dict
+
+LOGGER = get_console_logger()
+
+
+def handle_service_1_packet(printer: FsfwTmTcPrinter, raw_tm: bytes):
+    tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm)
+    printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+    srv1_packet = cast(Service1TMExtended, tm_packet)
+    retval_dict = get_retval_dict()
+    if srv1_packet.has_tc_error_code:
+        retval_info = retval_dict.get(srv1_packet.error_code)
+        if retval_info is None:
+            LOGGER.info(
+                f"No returnvalue information found for error code {srv1_packet.error_code}"
+            )
+        else:
+            retval_string = (
+                f"Error Code information for code {srv1_packet.error_code}| "
+                f"Name: {retval_info.name} | Info: {retval_info.info}"
+            )
+            LOGGER.info(retval_string)
+            printer.file_logger.info(retval_string)
diff --git a/requirements.txt b/requirements.txt
index 9a6f784..7b75c9d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-tmtccmd>=1.13.0
+tmtccmd>=2.0.1
diff --git a/spacepackets b/spacepackets
index 19e8a58..522b021 160000
--- a/spacepackets
+++ b/spacepackets
@@ -1 +1 @@
-Subproject commit 19e8a588fa0723a5991f80bb2fd52dfc64f0ac64
+Subproject commit 522b021ba5690f97a4b74ae8b110762a32eb9b19
diff --git a/tmtccli.py b/tmtccli.py
index 9561eb9..c80e4ac 100755
--- a/tmtccli.py
+++ b/tmtccli.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 """
 @brief      TMTC Commander entry point for command line mode.
 @details
@@ -30,13 +30,16 @@ import sys
 import traceback
 
 try:
-    from tmtccmd.runner import (
-        initialize_tmtc_commander,
-        run_tmtc_commander,
-        add_ccsds_handler,
+    import tmtccmd.runner as tmtccmd
+    from tmtccmd.config import default_json_path, SetupArgs
+    from tmtccmd.config.args import (
+        create_default_args_parser,
+        add_default_tmtccmd_args,
+        parse_default_input_arguments,
     )
-    from tmtccmd.ccsds.handler import CcsdsTmHandler
-    from tmtccmd.utility.logger import TMTC_LOGGER_NAME
+    from tmtccmd.ccsds.handler import CcsdsTmHandler, ApidHandler
+    from tmtccmd.logging import init_console_logger
+    from tmtccmd.logging.pus import create_tmtc_logger
 except ImportError as error:
     run_tmtc_commander = None
     initialize_tmtc_commander = None
@@ -47,7 +50,6 @@ except ImportError as error:
 
 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")
@@ -59,23 +61,33 @@ except ImportError as error:
 from config.hook_implementations import EiveHookObject
 from config.version import __version__
 from config.definitions import PUS_APID
+from pus_tc.tc_packer_hook import pre_tc_send_cb
 from pus_tm.factory_hook import ccsds_tm_handler
 
 
 def main():
-    from pus_tm.event_handler import handle_event_packet
-
-    hook_obj = EiveHookObject()
     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
+    tmtccmd.init_printout(False)
+    tmtc_file_logger = create_tmtc_logger()
+    hook_obj = EiveHookObject(json_cfg_path=default_json_path())
+    arg_parser = create_default_args_parser()
+    add_default_tmtccmd_args(arg_parser)
+    args = parse_default_input_arguments(arg_parser, hook_obj)
+    setup_args = SetupArgs(
+        hook_obj=hook_obj, use_gui=False, apid=PUS_APID, cli_args=args
     )
-    add_ccsds_handler(ccsds_handler)
-    run_tmtc_commander(False)
+    apid_handler = ApidHandler(cb=ccsds_tm_handler, queue_len=50, user_args=None)
+    ccsds_handler = CcsdsTmHandler()
+    ccsds_handler.add_tm_handler(apid=PUS_APID, handler=apid_handler)
+    tmtccmd.setup(setup_args=setup_args)
+    tmtccmd.add_ccsds_handler(ccsds_handler)
+    tmtc_backend = tmtccmd.create_default_tmtc_backend(
+        setup_args=setup_args,
+        tm_handler=ccsds_handler,
+    )
+    tmtc_backend.usr_send_wrapper = (pre_tc_send_cb, tmtc_file_logger)
+    tmtccmd.run(tmtc_backend=tmtc_backend)
 
 
 if __name__ == "__main__":
diff --git a/tmtccmd b/tmtccmd
index 86cf0bf..33a7308 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 86cf0bf9530f0d31784ff96b025f8b778d1732b1
+Subproject commit 33a730815207c6f1dd6947e895e243d28d0b1e5a
diff --git a/tmtcgui.py b/tmtcgui.py
index c5a7978..16759bc 100755
--- a/tmtcgui.py
+++ b/tmtcgui.py
@@ -35,8 +35,8 @@ from pus_tm.factory_hook import ccsds_tm_handler
 
 try:
     from tmtccmd.runner import (
-        initialize_tmtc_commander,
-        run_tmtc_commander,
+        init_tmtccmd,
+        run_tmtccmd,
         add_ccsds_handler,
     )
     from tmtccmd.ccsds.handler import CcsdsTmHandler
@@ -56,13 +56,13 @@ def main():
     hook_obj = EiveHookObject()
     print(f"-- eive tmtc version {__version__}")
     print(f"-- spacepackets version {spacepackets.__version__} --")
-    initialize_tmtc_commander(hook_object=hook_obj)
+    init_tmtccmd(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
     )
     add_ccsds_handler(ccsds_handler)
-    run_tmtc_commander(use_gui=True)
+    run_tmtccmd(use_gui=True)
 
 
 if __name__ == "__main__":
diff --git a/utility/input_helper.py b/utility/input_helper.py
index 96c10e3..5c00856 100644
--- a/utility/input_helper.py
+++ b/utility/input_helper.py
@@ -6,7 +6,7 @@
 @date   13.02.2021
 """
 
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()