Merge pull request 'bumped version to v1.8.0' (#17 ) from develop into master

Reviewed-on: #17
Merge branch 'master' into develop
2021-08-09 15:49:56 +02:00 · 2021-08-09 15:49:50 +02:00 · 2021-08-09 15:49:07 +02:00 · 2021-08-09 15:46:53 +02:00 · 2021-08-09 14:39:52 +02:00 · 2021-08-09 14:19:43 +02:00
71 changed files with 2433 additions and 195 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,4 +4,14 @@ log
 .idea/*
 !.idea/runConfigurations

-*.json
+*.json
+
+/Lib
+/Scripts
+/pyvenv.cfg
+/bin
+/lib
+/lib64
+/share
+
+/venv
--- a/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 200 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="ACU Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 200 -t 4" />
+    <option name="PARAMETERS" value="-s acu -l" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="true" />
    <option name="MODULE_MODE" value="false" />
--- a/.idea/runConfigurations/Heater_Test.xml
+++ b/.idea/runConfigurations/Heater_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Heater Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m 3 -c 2 -s HEATER -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>
--- a/.idea/runConfigurations/IMTQ_Get_Commanded_Dipole.xml
+++ b/.idea/runConfigurations/IMTQ_Get_Commanded_Dipole.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Get Commanded Dipole" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 8 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Neg_X_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Neg X Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 2 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Neg_Y_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Neg_Y_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Neg Y Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 4 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Neg_Z_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Neg_Z_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Neg Z Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 6 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Pos_X_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Pos_X_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Pos X Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 1 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Pos_Y_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Pos_Y_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Pos Y Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 3 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Pos_Z_Test.xml
+++ b/.idea/runConfigurations/IMTQ_Pos_Z_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ Pos Z Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 5 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/IMTQ_Test_UDP.xml
+++ b/.idea/runConfigurations/IMTQ_Test_UDP.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="IMTQ 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$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m seqcmd -c udp -s imtq -l -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient P60 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="P60 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient PDU1 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU1 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient PDU2 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PDU2 Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/PLOC_SUPV_Test.xml
+++ b/.idea/runConfigurations/PLOC_SUPV_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s ploc_supv -l -t 6 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/PLOC_Test_UDP_Flatsat.xml
+++ b/.idea/runConfigurations/PLOC_Test_UDP_Flatsat.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC Test UDP Flatsat" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -s PLOC -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>
--- a/.idea/runConfigurations/PLOC_Test_UDP_Local.xml
+++ b/.idea/runConfigurations/PLOC_Test_UDP_Local.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC Test UDP Local" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -s PLOC -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>
--- a/.idea/runConfigurations/RW1_Test.xml
+++ b/.idea/runConfigurations/RW1_Test.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW1 Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s reaction_wheel_1 -l -t 8 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/RW2_Test_.xml
+++ b/.idea/runConfigurations/RW2_Test_.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW2 Test " type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s reaction_wheel_2 -l -t 6 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/RW3_Test_.xml
+++ b/.idea/runConfigurations/RW3_Test_.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW3 Test " type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s reaction_wheel_3 -l -t 6 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/RW4_Test_.xml
+++ b/.idea/runConfigurations/RW4_Test_.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW4 Test " type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s reaction_wheel_4 -l -t 12 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Reboot_0_0.xml
+++ b/.idea/runConfigurations/Reboot_0_0.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reboot 0 0" type="PythonConfigurationType" factoryName="Python" folderName="Core">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s core -o reboot_0_0 -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Reboot_0_1.xml
+++ b/.idea/runConfigurations/Reboot_0_1.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reboot 0 1" type="PythonConfigurationType" factoryName="Python" folderName="Core">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s core -o reboot_0_1 -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Reboot_1_0.xml
+++ b/.idea/runConfigurations/Reboot_1_0.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reboot 1 0" type="PythonConfigurationType" factoryName="Python" folderName="Core">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s core -o reboot_1_0 -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Reboot_1_1.xml
+++ b/.idea/runConfigurations/Reboot_1_1.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reboot 1 1" type="PythonConfigurationType" factoryName="Python" folderName="Core">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s core -o reboot_1_1 -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Reboot_Prompt.xml
+++ b/.idea/runConfigurations/Reboot_Prompt.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reboot Prompt" type="PythonConfigurationType" factoryName="Python" folderName="Core">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s core -o reboot -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/Reboot_Self.xml
+++ b/.idea/runConfigurations/Reboot_Self.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Reboot Self" type="PythonConfigurationType" factoryName="Python" folderName="Core">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s core -o reboot_self -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/S_A_Deployment_Test_UDP.xml
+++ b/.idea/runConfigurations/S_A_Deployment_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcclient ACU Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <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" />
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s acu -l" />
+    <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" />
--- a/.idea/runConfigurations/Syrlinks_Test_UDP.xml
+++ b/.idea/runConfigurations/Syrlinks_Test_UDP.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Syrlinks 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$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m 3 -c 2 -s SYRLINKS -l --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/TMP1075_1_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/TMP1075_1_Dock_Test_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Listener Mode UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="TMP1075_1 Dock Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
@ -13,9 +13,9 @@
    <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="-m listener --hk" />
+    <option name="PARAMETERS" value="-m 3 -c 2 -s TMP1075_1 -l" />
    <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="" />
--- a/.idea/runConfigurations/TMP1075_2_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/TMP1075_2_Dock_Test_UDP.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TMP1075_2 Dock 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$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-m 1 -c 2 -s TMP1075_2 -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>
--- a/.idea/runConfigurations/_IMTQ_Command_Dipole.xml
+++ b/.idea/runConfigurations/_IMTQ_Command_Dipole.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name=" IMTQ Command Dipole" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-c udp -s imtq -o 7 -l -t 4 --hk" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/tmtcc_Listener_Mode.xml
+++ b/.idea/runConfigurations/tmtcc_Listener_Mode.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 2 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="tmtcc Listener Mode" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
@ -13,7 +13,7 @@
    <option name="ADD_SOURCE_ROOTS" value="true" />
    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-s 2 -t 4" />
+    <option name="PARAMETERS" value="-m listener --hk" />
    <option name="SHOW_COMMAND_LINE" value="false" />
    <option name="EMULATE_TERMINAL" value="false" />
    <option name="MODULE_MODE" value="false" />
--- a/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 17 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="tmtcc Service 17" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/tmtcc_Service_2.xml
+++ b/.idea/runConfigurations/tmtcc_Service_2.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcc Service 2" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s 2 -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/tmtcc_Service_200.xml
+++ b/.idea/runConfigurations/tmtcc_Service_200.xml
@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcc Service 200" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
+    <option name="PARAMETERS" value="-s 200 -o 0 -t 4" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>
--- a/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 3 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="tmtcc Service 3" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Service 8 UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
+  <configuration default="false" name="tmtcc Service 8" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
    <module name="tmtc" />
    <option name="INTERPRETER_OPTIONS" value="" />
    <option name="PARENT_ENVS" value="true" />
--- a/README.md
+++ b/README.md
@ -1,8 +1,66 @@
-### How to use this folder
+# TMTC Commander EIVE

-This folder contains template files to set up the TMTC commander 
-for a new mission or project. These files are the adaption
-point to customize the TMTC commander.
+# Run Linter
+
+Can be used to quickly check validity of script. Install `flake8` first
+
+```sh
+python3 -m pip install flake8
+```
+
+or on Windows
+
+```sh
+py -m pip install flake8
+```
+
+and then run the `lint.py` script
+
+```sh
+./lint.py
+```
+
+# Set up virtual environment
+
+## Linux
+
+1. Create virtual environment
+
+```sh
+python3 -m venv .
+```
+
+2. Activate virtual environment
+
+```sh
+./Scripts/activate
+```
+
+3. Install `tmtccmd` for virtual environment. `-e` for interactive installation.
+
+```sh
+cd tmtccmd
+python3 -m pip install -e .[gui]
+```
+
+## Windows
+
+1. Create virtual environment
+
+```sh
+py -m venv .
+```
+
+2. Activate virtual environment
+
+```sh
+Scripts\activate.bat
+```
+
+3. Install `tmtccmd` for virtual environment. `-e` for interactive installation.
+
+```sh
+cd tmtccmd
+py -m pip install -e .[gui]
+```

-To do so, simply copy all folder inside the TMTC commander root. This
-step is also required because the TMTC commander core will load some modules.
--- a/config/custom_mode_op.py
+++ b/config/custom_mode_op.py
@ -6,9 +6,9 @@
 import enum

 from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.logger import get_console_logger

-LOGGER = get_logger()
+LOGGER = get_console_logger()


 class CustomModeList(enum.IntEnum):
--- a/config/definitions.py
+++ b/config/definitions.py
@ -7,6 +7,9 @@
 import enum


+PUS_APID = 0x65
+
+
 class CustomServiceList(enum.Enum):
    TEST_DEVICE = "test",
    P60DOCK = "p60dock"
@ -15,6 +18,16 @@ class CustomServiceList(enum.Enum):
    ACU = "acu"
    TMP1075_1 = "tmp1075_1"
    TMP1075_2 = "tmp1075_2"
-    HEATER = "heater",
+    HEATER = "heater"
+    IMTQ = "imtq"
+    PLOC = "ploc"
    PCDU = "pcdu",
    SA_DEPLYOMENT = "sa_depl"
+    REACTION_WHEEL_1 = "reaction_wheel_1"
+    REACTION_WHEEL_2 = "reaction_wheel_2"
+    REACTION_WHEEL_3 = "reaction_wheel_3"
+    REACTION_WHEEL_4 = "reaction_wheel_4"
+    RAD_SENSOR = "rad_sensor"
+    PLOC_SUPV = "ploc_supv"
+    PLOC_UPDATER = "ploc_updater"
+    CORE = 'core'
--- a/config/globals_config.py
+++ b/config/globals_config.py
@ -9,14 +9,14 @@ import argparse


 # All globals can be added here and will be part of a globals dictionary.
-from config.definitions import CustomServiceList
+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_logger
+from tmtccmd.utility.logger import get_console_logger

-LOGGER = get_logger()
+LOGGER = get_console_logger()


 class CustomGlobalIds(enum.Enum):
@ -25,7 +25,8 @@ class CustomGlobalIds(enum.Enum):


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


 def add_globals_post_args_parsing(args: argparse.Namespace, json_cfg_path: str):
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@ -2,14 +2,15 @@ import argparse
 from typing import Union, Dict, Tuple

 from tmtccmd.config.definitions import ServiceOpCodeDictT
-from tmtccmd.pus_tm.service_3_base import Service3Base
+from tmtccmd.tm.service_3_base import Service3Base
 from tmtccmd.ecss.tm import PusTelemetry
-from tmtccmd.pus_tc.definitions import TcQueueT
+from tmtccmd.tc.definitions import TcQueueT
 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.object_ids import RW1_ID

 from config.definitions import CustomServiceList

@ -19,16 +20,30 @@ class EiveHookObject(TmTcHookBase):
    def get_service_op_code_dictionary(self) -> ServiceOpCodeDictT:
        from tmtccmd.config.globals import get_default_service_op_code_dict
        service_op_code_dict = get_default_service_op_code_dict()
-        op_code_dict_srv_acu = {
+        op_code_dict = {
+            'reboot': ('Reboot with Prompt', {OpCodeDictKeys.TIMEOUT: 2.0}),
+            'reboot_self': ('Reboot Self', {OpCodeDictKeys.TIMEOUT: 4.0}),
+            'reboot_0_0': ('Reboot 0 0', {OpCodeDictKeys.TIMEOUT: 4.0}),
+            'reboot_0_1': ('Reboot 0 1', {OpCodeDictKeys.TIMEOUT: 4.0}),
+            'reboot_1_0': ('Reboot 1 0', {OpCodeDictKeys.TIMEOUT: 4.0}),
+            'reboot_1_1': ('Reboot 1 1', {OpCodeDictKeys.TIMEOUT: 4.0}),
+        }
+        service_tuple = ('Core Controller', op_code_dict)
+        service_op_code_dict[CustomServiceList.CORE.value] = service_tuple
+
+        op_code_dict = {
            "0": ("ACU Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
        }
-        service_acu_tuple = ("ACU Devices", op_code_dict_srv_acu)
+        service_tuple = ("ACU Devices", op_code_dict)
+        service_op_code_dict[CustomServiceList.ACU.value] = service_tuple

-        op_code_dict_srv_tmp1075 = {
+        op_code_dict = {
            "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
        }
-        service_tmp1075_1_tuple = ("TMP1075 1", op_code_dict_srv_tmp1075)
-        service_tmp1075_2_tuple = ("TMP1075 2", op_code_dict_srv_tmp1075)
+        service_tuple = ("TMP1075 1", op_code_dict)
+        service_op_code_dict[CustomServiceList.TMP1075_1.value] = service_tuple
+        service_tuple = ("TMP1075 2", op_code_dict)
+        service_op_code_dict[CustomServiceList.TMP1075_2.value] = service_tuple

        op_code_dict_srv_p60 = {
            "0": ("P60 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
@ -50,14 +65,102 @@ class EiveHookObject(TmTcHookBase):
        }
        service_heater_tuple = ("Heater Device", op_code_dict_srv_heater)

-        service_op_code_dict[CustomServiceList.ACU.value] = service_acu_tuple
-        service_op_code_dict[CustomServiceList.TMP1075_1.value] = service_tmp1075_1_tuple
-        service_op_code_dict[CustomServiceList.TMP1075_2.value] = service_tmp1075_2_tuple
+        op_code_dict_srv_imtq = {
+            "0": ("IMTQ Tests All", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("IMTQ perform pos X self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("IMTQ perform neg X self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "3": ("IMTQ perform pos Y self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "4": ("IMTQ perform neg Y self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "5": ("IMTQ perform pos Z self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "6": ("IMTQ perform neg Z self test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "7": ("IMTQ command dipole", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "8": ("IMTQ get commanded dipole", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_imtq_tuple = ("IMTQ Device", op_code_dict_srv_imtq)
+
+        op_code_dict_srv_rw = {
+            "0": ("Reaction Wheel: Run all commands", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("Reaction Wheel: Set speed", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("Reaction Wheel: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "3": ("Reaction Wheel: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "4": ("Reaction Wheel: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "5": ("Reaction Wheel: Send get-telemetry-command", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_rw_tuple = ("Reaction Wheel", op_code_dict_srv_rw)
+
+        op_code_dict_srv_rad_sensor = {
+            "0": ("Radiation Sensor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("Radiation Sensor: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("Radiation Sensor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_rad_sensor_tuple = ("Radiation Sensor", op_code_dict_srv_rad_sensor)
+
+        op_code_dict_srv_ploc_supv = {
+            "0": ("PLOC Supervisor: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("PLOC Supervisor: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("PLOC Supervisor: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "3": ("PLOC Supervisor: Get HK Report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "4": ("PLOC Supervisor: Restart MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "5": ("PLOC Supervisor: Start MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "6": ("PLOC Supervisor: Shutdown MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "7": ("PLOC Supervisor: Select MPSoC boot image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "8": ("PLOC Supervisor: Set max restart tries", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "9": ("PLOC Supervisor: Reset MPSoC", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "10": ("PLOC Supervisor: Set time reference", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "11": ("PLOC Supervisor: Set boot timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "12": ("PLOC Supervisor: Disable Hk", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "13": ("PLOC Supervisor: Request boot status report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "14": ("PLOC Supervisor: Update available", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "15": ("PLOC Supervisor: Watchdogs enable", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "16": ("PLOC Supervisor: Watchdog Configure Timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "17": ("PLOC Supervisor: Enable latchup alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "18": ("PLOC Supervisor: Disable latchup alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "19": ("PLOC Supervisor: Auto calibrate alert", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "20": ("PLOC Supervisor: Set alert limit", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "21": ("PLOC Supervisor: Set alert irq filter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "22": ("PLOC Supervisor: Set ADC sweep period", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "23": ("PLOC Supervisor: Set ADC enabled channels", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "24": ("PLOC Supervisor: Set ADC window and stride", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "25": ("PLOC Supervisor: Set ADC threshold", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "26": ("PLOC Supervisor: Request latchup status report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "27": ("PLOC Supervisor: Copy ADC data to MRAM", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "28": ("PLOC Supervisor: Enable/Disable NVM0/1/3", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "29": ("PLOC Supervisor: Select NVM", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "30": ("PLOC Supervisor: Run auto EM tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "31": ("PLOC Supervisor: MRAM Wipe", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "32": ("PLOC Supervisor: MRAM Dump", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "33": ("PLOC Supervisor: Print CPU stats", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "34": ("PLOC Supervisor: Set debug verbosity", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "35": ("PLOC Supervisor: Set GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "36": ("PLOC Supervisor: Read GPIO", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "37": ("PLOC Supervisor: Restart supervisor", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "38": ("PLOC Supervisor: Factory reset clear all", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "39": ("PLOC Supervisor: Factory reset clear mirror entries", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "40": ("PLOC Supervisor: Factory reset clear circular entries", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
+
+        op_code_dict_srv_ploc_updater = {
+            "0": ("Ploc Updater: Update partion A on NVM0", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "1": ("Ploc Updater: Update partion B on NVM0", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "2": ("Ploc Updater: Update partion A on NVM1", {OpCodeDictKeys.TIMEOUT: 2.0}),
+            "3": ("Ploc Updater: Update partion B on NVM1", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_ploc_updater_tuple = ("Ploc Updater", op_code_dict_srv_ploc_updater)
+
        service_op_code_dict[CustomServiceList.P60DOCK.value] = service_p60_tuple
        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu1_tuple
        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu2_tuple
-        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu2_tuple
        service_op_code_dict[CustomServiceList.HEATER.value] = service_heater_tuple
+        service_op_code_dict[CustomServiceList.IMTQ.value] = service_imtq_tuple
+        service_op_code_dict[CustomServiceList.REACTION_WHEEL_1.value] = service_rw_tuple
+        service_op_code_dict[CustomServiceList.REACTION_WHEEL_2.value] = service_rw_tuple
+        service_op_code_dict[CustomServiceList.REACTION_WHEEL_3.value] = service_rw_tuple
+        service_op_code_dict[CustomServiceList.REACTION_WHEEL_4.value] = service_rw_tuple
+        service_op_code_dict[CustomServiceList.RAD_SENSOR.value] = service_rad_sensor_tuple
+        service_op_code_dict[CustomServiceList.PLOC_SUPV.value] = service_ploc_supv_tuple
+        service_op_code_dict[CustomServiceList.PLOC_UPDATER.value] = service_ploc_updater_tuple
        return service_op_code_dict

    def get_json_config_file_path(self) -> str:
@ -83,7 +186,8 @@ class EiveHookObject(TmTcHookBase):
            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()
+            com_if_key=com_if_key, tmtc_printer=tmtc_printer,
+            json_cfg_path=self.get_json_config_file_path(), space_packet_id=0x0865
        )

    def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
@ -113,9 +217,18 @@ class EiveHookObject(TmTcHookBase):

    @staticmethod
    def handle_service_3_housekeeping(
-        object_id: int, set_id: int, hk_data: bytearray, service3_packet: Service3Base
+        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
    ) -> Tuple[list, list, bytearray, int]:
        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:
+        if object_id == RW1_ID:
+            if event_id == 1:
+                return ""
+        return ""
--- a/config/object_ids.py
+++ b/config/object_ids.py
@ -6,17 +6,28 @@
 from typing import Dict

 PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
-TEST_DEVICE_ID = bytes([0x44, 0x00, 0xAF, 0xFE])
-P60_DOCK_HANDLER = bytes([0x44, 0x00, 0x00, 0x1])
-PDU_1_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x2])
-PDU_2_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x3])
-ACU_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x4])
-TMP_1075_1_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x5])
-TMP_1075_2_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x6])
-HEATER_ID = bytes([0x54, 0x00, 0x00, 0x1])
-PCDU_HANDLER_ID = bytes([0x44, 0x00, 0x10, 0x00])
-SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x00, 0x10, 0x01])
-SYRLINKS_HANDLER = bytes([0x44, 0x00, 0x10, 0x02])
+TEST_DEVICE_ID = bytes([0x54, 0x00, 0xAF, 0xFE])
+P60_DOCK_HANDLER = bytes([0x44, 0x25, 0x00, 0x00])
+PDU_1_HANDLER_ID = bytes([0x44, 0x25, 0x00, 0x01])
+PDU_2_HANDLER_ID = bytes([0x44, 0x25, 0x00, 0x02])
+ACU_HANDLER_ID = bytes([0x44, 0x25, 0x00, 0x03])
+TMP_1075_1_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x04])
+TMP_1075_2_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x05])
+HEATER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
+PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
+SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x10, 0xA2])
+SYRLINKS_HANDLER = bytes([0x44, 0x53, 0x00, 0xA3])
+IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
+PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
+RW1_ID = bytes([0x44, 0x12, 0x00, 0x1])
+RW2_ID = bytes([0x44, 0x12, 0x00, 0x2])
+RW3_ID = bytes([0x44, 0x12, 0x00, 0x3])
+RW4_ID = bytes([0x44, 0x12, 0x00, 0x4])
+START_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])
+RAD_SENSOR_ID = bytes([0x44, 0x32, 0x00, 0xA5])
+PLOC_SUPV_ID = bytes([0x44, 0x33, 0x00, 0x16])
+PLOC_UPDATER_ID = bytes([0x44, 0x33, 0x00, 0x00])
+CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])


 def get_object_ids() -> Dict[bytes, list]:
@ -32,5 +43,12 @@ def get_object_ids() -> Dict[bytes, list]:
         HEATER_ID: "Heater",
         PCDU_HANDLER_ID: "PCDU",
         SOLAR_ARRAY_DEPLOYMENT_ID: "Solar Array Deployment",
+         RW1_ID: "Reaction Wheel 1",
+         RW2_ID: "Reaction Wheel 2",
+         RW3_ID: "Reaction Wheel 3",
+         RW4_ID: "Reaction Wheel 4",
+         RAD_SENSOR_ID: "Radiation Sensor",
+         PLOC_SUPV_ID: "PLOC Supervisor",
+         CORE_CONTROLLER_ID: "Core Controller",
    })
    return object_id_dict
--- a/config/version.py
+++ b/config/version.py
@ -1,4 +1,6 @@
 SW_NAME = "eive"
 VERSION_MAJOR = 1
-VERSION_MINOR = 5
+VERSION_MINOR = 8
 VERSION_SUBMINOR = 0
+
+__version__ = "1.8.0"
--- a/gomspace/gomspace_pdu_definitions.py
+++ b/gomspace/gomspace_pdu_definitions.py
@ -6,6 +6,11 @@ class PDUConfigTable:
    out_en_1 = TableEntry(bytearray([0x00, 0x49]), TableEntry.uint8_size)
    out_en_2 = TableEntry(bytearray([0x00, 0x4A]), TableEntry.uint8_size)
    out_en_3 = TableEntry(bytearray([0x00, 0x4B]), TableEntry.uint8_size)
+    out_en_4 = TableEntry(bytearray([0x00, 0x4C]), TableEntry.uint8_size)
+    out_en_5 = TableEntry(bytearray([0x00, 0x4D]), TableEntry.uint8_size)
+    out_en_6 = TableEntry(bytearray([0x00, 0x4E]), TableEntry.uint8_size)
+    out_en_7 = TableEntry(bytearray([0x00, 0x4F]), TableEntry.uint8_size)
+    out_en_8 = TableEntry(bytearray([0x00, 0x50]), TableEntry.uint8_size)
    # When channel consumes more than cur_lu_lim, channel is turned of immediately
    cur_lu_lim_0 = TableEntry(bytearray([0x00, 0xB8]), TableEntry.uint16_size)

--- a/lint.py
+++ b/lint.py
@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+import os
+import sys
+
+
+def main():
+    # Ignore folder created by venv
+    exclude_dirs_flag = '--exclude bin,lib'
+    additional_flags_both_steps = '--count --statistics'
+    additional_flags_first_step = '--select=E9,F63,F7,F82 --show-source'
+    flake8_first_step_cmd = \
+        f'flake8 . {additional_flags_both_steps} {additional_flags_first_step} {exclude_dirs_flag}'
+    status = os.system(flake8_first_step_cmd)
+    if os.WEXITSTATUS(status) != 0:
+        print("Flake8 linter errors")
+        sys.exit(0)
+    flake8_second_step_cmd = \
+        f'flake8 . {additional_flags_both_steps} --exit-zero --max-complexity=10 ' \
+        f'--max-line-length=127 {exclude_dirs_flag}'
+    os.system(flake8_second_step_cmd)
+
+
+if __name__ == "__main__":
+    main()
--- a/pus_tc/acu.py
+++ b/pus_tc/acu.py
@ -6,7 +6,7 @@
@date   21.12.2020
 """

-from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.ecss.tc import PusTelecommand
 from tmtccmd.config.definitions import QueueCommands
 from gomspace.gomspace_common import *
@ -53,13 +53,17 @@ class ACUHkTable:
    wdt_gnd_left = TableEntry(bytearray([0x00, 0x74]), TableEntry.uint32_size)


-def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT):
    tc_queue.appendleft((QueueCommands.PRINT, "Testing ACU"))

-    tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling ACU connected to X1 slot (channel 0)"))
+    tc_queue.appendleft(
+        (QueueCommands.PRINT, "P60 Dock: Enabling ACU connected to X1 slot (channel 0)")
+    )
    p60dock_object_id = P60_DOCK_HANDLER
-    command = pack_set_param_command(p60dock_object_id, P60DockConfigTable.out_en_0.parameter_address,
-                                     P60DockConfigTable.out_en_0.parameter_size, Channel.on)
+    command = pack_set_param_command(
+        p60dock_object_id, P60DockConfigTable.out_en_0.parameter_address,
+        P60DockConfigTable.out_en_0.parameter_size, Channel.on
+    )
    command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
    tc_queue.appendleft(command.pack_command_tuple())

@ -70,8 +74,10 @@ def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
        tc_queue.appendleft(command.pack_command_tuple())
    if ACUTestProcedure.all or ACUTestProcedure.read_gnd_wdt:
        tc_queue.appendleft((QueueCommands.PRINT, "ACU: Reading ground watchdog timer value"))
-        command = pack_get_param_command(object_id, TableIds.hk, ACUHkTable.wdt_gnd_left.parameter_address,
-                                         ACUHkTable.wdt_gnd_left.parameter_size)
+        command = pack_get_param_command(
+            object_id, TableIds.hk, ACUHkTable.wdt_gnd_left.parameter_address,
+            ACUHkTable.wdt_gnd_left.parameter_size
+        )
        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
    if ACUTestProcedure.all or ACUTestProcedure.gnd_wdt_reset:
--- a/pus_tc/core.py
+++ b/pus_tc/core.py
@ -0,0 +1,112 @@
+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 config.object_ids import CORE_CONTROLLER_ID
+
+LOGGER = get_console_logger()
+
+
+class ActionIds(enum.IntEnum):
+    REBOOT = 32
+
+
+class OpCodes(enum.Enum):
+    REBOOT = 'reboot'
+    REBOOT_SELF = 'reboot_self'
+    REBOOT_0_0 = 'reboot_0_0'
+    REBOOT_0_1 = 'reboot_0_1'
+    REBOOT_1_0 = 'reboot_1_0'
+    REBOOT_1_1 = 'reboot_1_1'
+
+
+class Chip(enum.IntEnum):
+    CHIP_0 = 0
+    CHIP_1 = 1
+    NONE = 2
+
+
+class Copy(enum.IntEnum):
+    COPY_0_NOM = 0
+    COPY_1_GOLD = 1
+    NONE = 2
+
+
+def pack_core_commands(tc_queue: TcQueueT, op_code: str):
+    if op_code == OpCodes.REBOOT.value:
+        reboot_self, chip_select, copy_select = determine_reboot_params()
+        perform_reboot_cmd(
+            tc_queue=tc_queue, reboot_self=reboot_self, chip=chip_select, copy=copy_select
+        )
+    elif op_code == OpCodes.REBOOT_SELF.value:
+        perform_reboot_cmd(tc_queue=tc_queue, reboot_self=True)
+    elif op_code == OpCodes.REBOOT_0_0.value:
+        perform_reboot_cmd(
+            tc_queue=tc_queue, reboot_self=False, chip=Chip.CHIP_0, copy=Copy.COPY_0_NOM
+        )
+    elif op_code == OpCodes.REBOOT_0_1.value:
+        perform_reboot_cmd(
+            tc_queue=tc_queue, reboot_self=False, chip=Chip.CHIP_0, copy=Copy.COPY_1_GOLD
+        )
+    elif op_code == OpCodes.REBOOT_1_0.value:
+        perform_reboot_cmd(
+            tc_queue=tc_queue, reboot_self=False, chip=Chip.CHIP_1, copy=Copy.COPY_0_NOM
+        )
+    elif op_code == OpCodes.REBOOT_1_1.value:
+        perform_reboot_cmd(
+            tc_queue=tc_queue, reboot_self=False, chip=Chip.CHIP_1, copy=Copy.COPY_1_GOLD
+        )
+
+
+def determine_reboot_params() -> (bool, Chip, Copy):
+    chip_select = -1
+    copy_select = -1
+    reboot_self = input('Reboot self? [y/n]: ')
+    if reboot_self in ['y', 'yes', '1']:
+        LOGGER.info('Rebooting currently running image')
+        return True, chip_select, copy_select
+    LOGGER.info('Rebooting image specified by chip and copy')
+    while True:
+        chip_select = input('Chip select [0/1]: ')
+        if chip_select in ['0', '1']:
+            if chip_select == '0':
+                chip_select = Chip.CHIP_0
+            else:
+                chip_select = Chip.CHIP_1
+            break
+        else:
+            LOGGER.warning('Invalid chip select value. Try again')
+    while True:
+        copy_select = input('Copy select [0/1]: ')
+        if copy_select in ['0', '1']:
+            if copy_select == '0':
+                copy_select = Copy.COPY_0_NOM
+            else:
+                copy_select = Copy.COPY_1_GOLD
+            break
+        else:
+            LOGGER.warning('Invalid copy select value. Try again')
+    return False, chip_select, copy_select
+
+
+def perform_reboot_cmd(
+        tc_queue: TcQueueT, reboot_self: bool, chip: Chip = Chip.NONE, copy: Copy = Copy.NONE
+):
+    tc_data = bytearray()
+    if reboot_self:
+        tc_queue.appendleft((QueueCommands.PRINT, 'Packing reboot command for current image'))
+        tc_data.append(True)
+    else:
+        tc_data.append(False)
+        tc_data.append(chip)
+        tc_data.append(copy)
+        tc_queue.append(
+            (QueueCommands.PRINT, f'Packing reboot command for chip {chip} and copy {copy}')
+        )
+    action_cmd = generate_action_command(
+        object_id=CORE_CONTROLLER_ID, action_id=ActionIds.REBOOT, app_data=tc_data, ssc=0
+    )
+    tc_queue.appendleft(action_cmd.pack_command_tuple())
+
--- a/pus_tc/heater.py
+++ b/pus_tc/heater.py
@ -6,7 +6,7 @@
@date   30.01.2021
 """
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.ecss.tc import PusTelecommand


--- a/pus_tc/imtq.py
+++ b/pus_tc/imtq.py
@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+"""
+@file   imtq.py
+@brief  Tests for the ISIS IMTQ (Magnettorquer) device handler
+@author J. Meier
+@date   25.03.2021
+"""
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command
+
+
+class ImtqSetIds:
+    ENG_HK_SET = 1
+    CAL_MTM_SET = 2
+    RAW_MTM_SET = 3
+    POSITIVE_X_TEST = 4
+    NEGATIVE_X_TEST = 5
+    POSITIVE_Y_TEST = 6
+    NEGATIVE_Y_TEST = 7
+    POSITIVE_Z_TEST = 8
+    NEGATIVE_Z_TEST = 9
+
+
+class ImtqActionIds:
+    start_actuation_dipole = bytearray([0x0, 0x0, 0x0, 0x02])
+    get_commanded_dipole = bytearray([0x0, 0x0, 0x0, 0x03])
+    perform_positive_x_test = bytearray([0x0, 0x0, 0x0, 0x07])
+    perform_negative_x_test = bytearray([0x0, 0x0, 0x0, 0x08])
+    perform_positive_y_test = bytearray([0x0, 0x0, 0x0, 0x09])
+    perform_negative_y_test = bytearray([0x0, 0x0, 0x0, 0x0A])
+    perform_positive_z_test = bytearray([0x0, 0x0, 0x0, 0x0B])
+    perform_negative_z_test = bytearray([0x0, 0x0, 0x0, 0x0C])
+    # Initiates the reading of the last performed self test. After sending this command the results can be downlinked
+    # via the housekeeping service by using the appropriate set ids listed above.
+    read_self_test_results = bytearray([0x0, 0x0, 0x0, 0x0D])
+
+
+def pack_imtq_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing ISIS IMTQ handler with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0" or op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Perform positive x self test"))
+        command = object_id + ImtqActionIds.perform_positive_x_test
+        command = PusTelecommand(service=8, subservice=128, ssc=22, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Initiate reading of positive x self test results"))
+        command = object_id + ImtqActionIds.read_self_test_results
+        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Request dataset with positive x self test results"))
+        sid = make_sid(object_id, ImtqSetIds.POSITIVE_X_TEST)
+        command = generate_one_hk_command(sid, 24)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Perform negative x self test"))
+        command = object_id + ImtqActionIds.perform_negative_x_test
+        command = PusTelecommand(service=8, subservice=128, ssc=25, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Initiate reading of negative x self test results"))
+        command = object_id + ImtqActionIds.read_self_test_results
+        command = PusTelecommand(service=8, subservice=128, ssc=26, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Request dataset with negative x self test results"))
+        sid = make_sid(object_id, ImtqSetIds.NEGATIVE_X_TEST)
+        command = generate_one_hk_command(sid, 27)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Perform positive y self test"))
+        command = object_id + ImtqActionIds.perform_positive_y_test
+        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Initiate reading of positive y self test results"))
+        command = object_id + ImtqActionIds.read_self_test_results
+        command = PusTelecommand(service=8, subservice=128, ssc=29, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Request dataset with positive y self test results"))
+        sid = make_sid(object_id, ImtqSetIds.POSITIVE_Y_TEST)
+        command = generate_one_hk_command(sid, 30)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Perform negative y self test"))
+        command = object_id + ImtqActionIds.perform_negative_y_test
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Initiate reading of negative y self test results"))
+        command = object_id + ImtqActionIds.read_self_test_results
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Request dataset with negative y self test results"))
+        sid = make_sid(object_id, ImtqSetIds.NEGATIVE_Y_TEST)
+        command = generate_one_hk_command(sid, 33)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Perform positive z self test"))
+        command = object_id + ImtqActionIds.perform_positive_z_test
+        command = PusTelecommand(service=8, subservice=128, ssc=34, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Initiate reading of positive z self test results"))
+        command = object_id + ImtqActionIds.read_self_test_results
+        command = PusTelecommand(service=8, subservice=128, ssc=35, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Request dataset with positive z self test results"))
+        sid = make_sid(object_id, ImtqSetIds.POSITIVE_Y_TEST)
+        command = generate_one_hk_command(sid, 36)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "6":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Perform negative z self test"))
+        command = object_id + ImtqActionIds.perform_negative_z_test
+        command = PusTelecommand(service=8, subservice=128, ssc=35, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Initiate reading of negative z self test results"))
+        command = object_id + ImtqActionIds.read_self_test_results
+        command = PusTelecommand(service=8, subservice=128, ssc=36, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Request dataset with negative z self test results"))
+        sid = make_sid(object_id, ImtqSetIds.NEGATIVE_Z_TEST)
+        command = generate_one_hk_command(sid, 37)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "7":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Commanding dipole"))
+        x_dipole = 0
+        y_dipole = 0
+        z_dipole = 0
+        duration = 0    # ms
+        command = pack_dipole_command(object_id, x_dipole, y_dipole, z_dipole, duration)
+        command = PusTelecommand(service=8, subservice=128, ssc=20, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "0" or op_code == "8":
+        tc_queue.appendleft((QueueCommands.PRINT, "IMTQ: Get commanded dipole"))
+        command = object_id + ImtqActionIds.get_commanded_dipole
+        command = PusTelecommand(service=8, subservice=128, ssc=21, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    return tc_queue
+
+
+def pack_dipole_command(object_id: bytearray, x_dipole: int, y_dipole: int, z_dipole: int, duration: int) -> bytearray:
+    """ This function packs the command causing the ISIS IMTQ to generate a dipole.
+    @param object_id    The object id of the IMTQ handler.
+    @param x_dipole   The dipole of the x coil in 10^-4*Am^2 (max. 2000)
+    @param y_dipole   The dipole of the y coil in 10^-4*Am^2 (max. 2000)
+    @param z_dipole   The dipole of the z coil in 10^-4*Am^2 (max. 2000)
+    @param duration  The duration in milliseconds the dipole will be generated by the coils.
+                     When set to 0, the dipole will be generated until a new dipole actuation
+                     command is sent.
+    """
+    action_id = ImtqActionIds.start_actuation_dipole
+    command = bytearray()
+    command = object_id + action_id
+    command.extend(x_dipole.to_bytes(length=2, byteorder='big'))
+    command.extend(y_dipole.to_bytes(length=2, byteorder='big'))
+    command.extend(z_dipole.to_bytes(length=2, byteorder='big'))
+    command.extend(duration.to_bytes(length=2, byteorder='big'))
+    return command
--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@ -6,7 +6,7 @@
@date   13.12.2020
 """
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *

--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@ -7,7 +7,7 @@
 """
 from tmtccmd.config.definitions import QueueCommands

-from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 from pus_tc.p60dock import P60DockConfigTable
@ -24,6 +24,10 @@ class PDU1TestProcedure:
    reboot = False
    ping = False
    read_temperature = False
+    turn_channel_2_on = False    # Star Tracker connected to this channel (5V)
+    turn_channel_2_off = False
+    turn_channel_3_on = False  # MTQ connected to this channel (5V)
+    turn_channel_3_off = True


 def pack_pdu1_test_into(
@ -31,14 +35,6 @@ def pack_pdu1_test_into(
 ):
    tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU1"))

-    tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling PDU1"))
-    command = pack_set_param_command(
-        p60dock_object_id, P60DockConfigTable.out_en_1.parameter_address,
-        P60DockConfigTable.out_en_1.parameter_size, Channel.on
-    )
-    command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
-    tc_queue.appendleft(command.pack_command_tuple())
-
    if PDU1TestProcedure.all or PDU1TestProcedure.ping:
        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Ping Test"))
        ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])
@ -53,3 +49,27 @@ def pack_pdu1_test_into(
        )
        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
+    if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_on:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 on (Star Tracker)"))
+        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_2.parameter_address,
+                                         PDUConfigTable.out_en_2.parameter_size, Channel.on)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_off:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 off (Star Tracker)"))
+        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_2.parameter_address,
+                                         PDUConfigTable.out_en_2.parameter_size, Channel.off)
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_3_on:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 3 on (MTQ)"))
+        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_3.parameter_address,
+                                         PDUConfigTable.out_en_3.parameter_size, Channel.on)
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_3_off:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 3 off (MTQ)"))
+        command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_3.parameter_address,
+                                         PDUConfigTable.out_en_3.parameter_size, Channel.off)
+        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@ -6,7 +6,7 @@
@date   17.12.2020
 """
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.pus_tc.packer import TcQueueT
+from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.ecss.tc import PusTelecommand
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
@ -101,4 +101,5 @@ def pack_pdu2_test_into(pdu2_object_id: bytearray, p60dock_object_id: bytearray,
        command = pack_request_full_hk_table_command(pdu2_object_id)
        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
        tc_queue.appendleft(command.pack_command_tuple())
+
    return tc_queue
--- a/pus_tc/ploc_mpsoc.py
+++ b/pus_tc/ploc_mpsoc.py
@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+"""
+@file   ploc_mpsoc.py
+@brief  Tests for commanding the MPSoC of the PLOC.
+        The MPSoC is programmed by the ILH.
+@author J. Meier
+@date   06.03.2021
+"""
+import struct
+
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+
+
+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 PlocActionIds:
+    tc_mem_write = bytearray([0x0, 0x0, 0x0, 0x1])
+    tc_mem_read = bytearray([0x0, 0x0, 0x0, 0x2])
+
+
+class PlocReplyIds:
+    tm_mem_read_report = 6
+
+
+def pack_ploc_mpsoc_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing 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)
+        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)
+        command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    return tc_queue
+
+
+def generate_write_mem_command(object_id: bytearray, memory_address: bytearray, memory_data: 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
+    @param memory_address   The PLOC memory address where to write to.
+    @param memory_data    The data to write to the memory address specified by the bytearray memory_address.
+    """
+    command = object_id + PlocActionIds.tc_mem_write + memory_address + struct.pack('!I', memory_data)
+    return command
--- a/pus_tc/ploc_supervisor.py
+++ b/pus_tc/ploc_supervisor.py
@ -0,0 +1,583 @@
+# -*- coding: utf-8 -*-
+"""
+@file   ploc_supervisor.py
+@brief  Tests for commanding the supervisor of the PLOC.
+        The supervisor is programmed by Thales.
+@author J. Meier
+@date   10.07.2021
+"""
+import struct
+
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+from tmtccmd.utility.logger import get_console_logger
+
+LOGGER = get_console_logger()
+
+latchup_id_dict = {
+        "0": "0.85V",
+        "1": "1.8V",
+        "2": "MISC",
+        "3": "3.3V",
+        "4": "NVM_4XO",
+        "5": "MISSION",
+        "6": "SAFECOTS"
+    }
+
+class SupvActionIds:
+    HK_REPORT = 1
+    RESTART_MPSOC = 2
+    START_MPSOC = 3
+    SHUTWOWN_MPSOC = 4
+    SEL_MPSOC_BOOT_IMAGE = 5
+    SET_BOOT_TIMEOUT = 6
+    SET_MAX_RESTART_TRIES = 7
+    RESET_MPSOC = 8
+    SET_TIME_REF = 9
+    DISABLE_HK = 10
+    GET_BOOT_STATUS_REPORT = 11
+    UPDATE_AVAILABLE = 12
+    WATCHDOGS_ENABLE = 13
+    WATCHDOGS_CONFIG_TIMEOUT = 14
+    ENABLE_LATCHUP_ALERT = 15
+    DISABLE_LATCHUP_ALERT = 16
+    AUTO_CALIBRATE_ALERT = 17
+    SET_ALERT_LIMIT = 18
+    SET_ALERT_IRQ_FILTER = 19
+    SET_ADC_SWEEP_PERIOD = 20
+    SET_ADC_ENABLED_CHANNELS = 21
+    SET_ADC_WINDOW_AND_STRIDE = 22
+    SET_ADC_THRESHOLD = 23
+    GET_LATCHUP_STATUS_REPORT = 24
+    COPY_ADC_DATA_TO_MRAM = 25
+    ENABLE_NVMS = 26
+    SELECT_NVM = 27
+    RUN_AUTO_EM_TESTS = 28
+    WIPE_MRAM = 29
+    DUMP_MRAM = 30
+    SET_DBG_VERBOSITY = 31
+    CAN_LOOPBACK_TEST = 32
+    PRINT_CPU_STATS = 33
+    SET_GPIO = 34
+    READ_GPIO = 35
+    RESTART_SUPERVISOR = 36
+    FACTORY_RESET_CLEAR_ALL = 37
+    REQUEST_LOGGING_DATA = 38
+    UPDATE_IMAGE_DATA = 39
+    FACTORY_RESET_CLEAR_MIRROR = 40
+    FACTORY_RESET_CLEAR_CIRCULAR = 41
+
+
+class SupvHkIds:
+    HK_REPORT = 52
+    BOOT_STATUS_REPORT = 53
+
+
+def pack_ploc_supv_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing PLOC Supervisor with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: TC Get Hk Report"))
+        command = object_id + struct.pack('!I', SupvActionIds.HK_REPORT)
+        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 Supervisor: Restart MPSoC"))
+        command = object_id + struct.pack('!I', SupvActionIds.RESTART_MPSOC)
+        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 Supervisor: Start MPSoC"))
+        command = object_id + struct.pack('!I', SupvActionIds.START_MPSOC)
+        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 Supervisor: Shutdown MPSoC"))
+        command = object_id + struct.pack('!I', SupvActionIds.SHUTWOWN_MPSOC)
+        command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "7":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Select MPSoC boot image"))
+        mem = int(input("MEM (NVM0 - 0 or NVM1 - 1):"))
+        bp0 = int(input("BP0 (0 or 1):"))
+        bp1 = int(input("BP1 (0 or 1):"))
+        bp2 = int(input("BP2 (0 or 1):"))
+        command = pack_sel_boot_image_cmd(object_id, mem, bp0, bp1, bp2)
+        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 Supervisor: Set max restart tries"))
+        restart_tries = int(input("Set maximum restart tries:"))
+        command = object_id + struct.pack('!I', SupvActionIds.SET_MAX_RESTART_TRIES) + struct.pack('!B', restart_tries)
+        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 Supervisor: Reset MPSoC"))
+        command = object_id + struct.pack('!I', SupvActionIds.RESET_MPSOC)
+        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 Supervisor: Set time reference"))
+        command = object_id + struct.pack('!I', SupvActionIds.SET_TIME_REF)
+        command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "11":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set boot timeout"))
+        boot_timeout = int(input("Specify boot timeout [ms]:"))
+        command = object_id + struct.pack('!I', SupvActionIds.SET_BOOT_TIMEOUT) + struct.pack('!I', boot_timeout)
+        command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "12":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Disable HK"))
+        command = object_id + struct.pack('!I', SupvActionIds.DISABLE_HK)
+        command = PusTelecommand(service=8, subservice=128, ssc=29, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "13":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Request boot status report"))
+        command = object_id + struct.pack('!I', SupvActionIds.GET_BOOT_STATUS_REPORT)
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "14":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update available"))
+        command = pack_update_available_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "15":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Watchdogs Enable"))
+        command = pack_watchdogs_enable_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "16":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Watchdog configure timeout"))
+        command = pack_watchdog_config_timeout_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "17":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Enable latchup alert"))
+        command = pack_lachtup_alert_cmd(object_id, True)
+        command = PusTelecommand(service=8, subservice=128, ssc=34, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "18":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Disable latchup alert"))
+        command = pack_lachtup_alert_cmd(object_id, False)
+        command = PusTelecommand(service=8, subservice=128, ssc=35, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "19":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Auto calibrate alert"))
+        command = pack_auto_calibrate_alert_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=36, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "20":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set alert limit"))
+        command = pack_set_alert_limit_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=37, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "21":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set alert irq filter"))
+        command = pack_set_alert_irq_filter_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=38, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "22":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set ADC sweep period"))
+        command = pack_set_adc_sweep_period_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=39, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "23":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set ADC enabled channels"))
+        command = pack_set_adc_enabled_channels_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=40, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "24":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set ADC window and stride"))
+        command = pack_set_adc_window_and_stride_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=41, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "25":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set ADC threshold"))
+        command = pack_set_adc_threshold_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=42, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "26":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Request latchup status report"))
+        command = object_id + struct.pack('!I', SupvActionIds.GET_LATCHUP_STATUS_REPORT)
+        command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "27":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Copy ADC data to MRAM"))
+        command = object_id + struct.pack('!I', SupvActionIds.COPY_ADC_DATA_TO_MRAM)
+        command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "28":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Enalbe/Disable NVMs"))
+        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)
+        command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "31":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Wipe MRAM"))
+        command = pack_mram_wipe_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=46, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "32":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Dump MRAM"))
+        command = pack_mram_dump_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=47, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "33":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Print CPU stats"))
+        command = pack_print_cpu_stats_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=48, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "34":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set debug verbosity"))
+        command = pack_set_debug_verbosity_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=49, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "35":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set GPIO command"))
+        command = pack_set_gpio_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=50, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "36":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Read GPIO command"))
+        command = pack_read_gpio_cmd(object_id)
+        command = PusTelecommand(service=8, subservice=128, ssc=51, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "37":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Restart supervisor"))
+        command = command = object_id + struct.pack('!I', SupvActionIds.RESTART_SUPERVISOR)
+        command = PusTelecommand(service=8, subservice=128, ssc=52, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "38":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Factory reset clear all"))
+        command = command = object_id + struct.pack('!I', SupvActionIds.FACTORY_RESET_CLEAR_ALL)
+        command = PusTelecommand(service=8, subservice=128, ssc=53, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "39":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Factory reset clear mirror entries"))
+        command = command = object_id + struct.pack('!I', SupvActionIds.FACTORY_RESET_CLEAR_MIRROR)
+        command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "40":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Factory reset clear circular entries"))
+        command = command = object_id + struct.pack('!I', SupvActionIds.FACTORY_RESET_CLEAR_CIRCULAR)
+        command = PusTelecommand(service=8, subservice=128, ssc=55, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "41":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: CAN loopback test"))
+        command = command = object_id + struct.pack('!I', SupvActionIds.CAN_LOOPBACK_TEST)
+        command = PusTelecommand(service=8, subservice=128, ssc=56, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    return tc_queue
+
+
+def pack_sel_boot_image_cmd(object_id: bytearray, mem: int, bp0: int, bp1: int, bp2: int) -> bytearray:
+    """ This function can be used to generate the command to select the image from which the MPSoC will boot
+    @param object_id    The object id of the PLOC supervisor handler.
+    @param mem  The memory from which the MPSoC shall boot (NVM0 - 0, NVM1 - 1)
+    @param bp0  Partition pin 0
+    @param bp1  Partition pin 1
+    @param bp2  Partition pin 2
+    """
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SEL_MPSOC_BOOT_IMAGE)
+    command = command + struct.pack('!B', mem)
+    command = command + struct.pack('!B', bp0)
+    command = command + struct.pack('!B', bp1)
+    command = command + struct.pack('!B', bp2)
+    return command
+
+
+def pack_update_available_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the udpate availabe command.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    image_select = 1
+    image_partition = 0
+    image_size = 222
+    image_crc = 0x0
+    number_of_packets = 150
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.UPDATE_AVAILABLE)
+    command = command + struct.pack('!B', image_select)
+    command = command + struct.pack('!B', image_partition)
+    command = command + struct.pack('!I', image_size)
+    command = command + struct.pack('!I', image_crc)
+    command = command + struct.pack('!I', number_of_packets)
+    return command
+
+
+def pack_watchdogs_enable_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command to enable or disable watchdogs on the PLOC.
+    @param object_id    The object id of the PLOC supervisor handler.
+    @note   Enable = 1, Disable = 0
+    """
+    watchdog_ps = 1
+    watchdog_pl = 1
+    watchdog_int = 0
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.WATCHDOGS_ENABLE)
+    command = command + struct.pack('!B', watchdog_ps)
+    command = command + struct.pack('!B', watchdog_pl)
+    command = command + struct.pack('!B', watchdog_int)
+    return command
+
+
+def pack_watchdog_config_timeout_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command set the timeout of one of the three watchdogs of the PLOC.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    watchdog = int(input("Specify watchdog (0 - PS, 1 - PL, 2 - INT):"))
+    timeout = int(input("Specify timeout (1000 ms - 360000 ms):"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.WATCHDOGS_CONFIG_TIMEOUT)
+    command = command + struct.pack('!B', watchdog)
+    command = command + struct.pack('!I', timeout)
+    return command
+
+
+def pack_lachtup_alert_cmd(object_id: bytearray, state: bool) -> bytearray:
+    """
+    @brief  This function packs the command to enable or disable a certain latchup alerts.
+    @param object_id    The object id of the PLOC supervisor handler.
+    @param state    True - enable latchup alert, False - disable latchup alert
+    """
+    latchup_id = get_latchup_id()
+    command = bytearray()
+    if state:
+        command = object_id + struct.pack('!I', SupvActionIds.ENABLE_LATCHUP_ALERT)
+    else:
+        command = object_id + struct.pack('!I', SupvActionIds.DISABLE_LATCHUP_ALERT)
+    command = command + struct.pack('!B', latchup_id)
+    return command
+
+
+def pack_auto_calibrate_alert_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command to auto calibrate a latchup alert.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    latchup_id = get_latchup_id()
+    mg = int(input("Specify MG:"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.AUTO_CALIBRATE_ALERT)
+    command = command + struct.pack('!B', latchup_id)
+    command = command + struct.pack('!I', mg)
+    return command
+
+
+def get_latchup_id() -> int:
+    key_column_width = 10
+    description_column_width = 50
+    separator_width = key_column_width + description_column_width + 3
+    separator_string = separator_width * "-"
+    key_string = "Latchup ID".ljust(key_column_width)
+    description_string = "Description".ljust(description_column_width)
+    print(f"{key_string} | {description_string}")
+    print(separator_string)
+    for key in latchup_id_dict:
+        key_string = key.ljust(key_column_width)
+        description_string = latchup_id_dict[key].ljust(description_column_width)
+        print(f"{key_string} | {description_string}")
+    return int(input("Specify latchup ID:"))
+
+
+def pack_set_alert_limit_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command to set the limit of a latchup alert.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    latchup_id = get_latchup_id()
+    dutycycle = int(input("Specify dutycycle:"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.AUTO_CALIBRATE_ALERT)
+    command = command + struct.pack('!B', latchup_id)
+    command = command + struct.pack('!I', dutycycle)
+    return command
+
+
+def pack_set_alert_irq_filter_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command to configure the latchup alert irq filter.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    latchup_id = get_latchup_id()
+    tp = int(input("Specify TP:"))
+    div = int(input("Specify DIV:"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_ALERT_IRQ_FILTER)
+    command = command + struct.pack('!B', latchup_id)
+    command = command + struct.pack('!B', tp)
+    command = command + struct.pack('!B', div)
+    return command
+
+
+def pack_set_adc_sweep_period_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command to set the limit of a latchup alert.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    sweep_period = int(input("Specify sweep period (min 21 us):"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_ADC_SWEEP_PERIOD)
+    command = command + struct.pack('!I', sweep_period)
+    return command
+
+
+def pack_set_adc_enabled_channels_cmd(object_id: bytearray) -> bytearray:
+    """
+    @brief  This function packs the command to enable or disable channels of the ADC.
+    @param object_id    The object id of the PLOC supervisor handler.
+    """
+    ch = int(input("Specify ch:"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_ADC_ENABLED_CHANNELS)
+    command = command + struct.pack('!H', ch)
+    return command
+
+
+def pack_set_adc_window_and_stride_cmd(object_id: bytearray) -> bytearray:
+    window_size = int(input("Specify window size:"))
+    striding_step_size = int(input("Specify striding step size:"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_ADC_WINDOW_AND_STRIDE)
+    command = command + struct.pack('!H', window_size)
+    command = command + struct.pack('!H', striding_step_size)
+    return command
+
+
+def pack_set_adc_threshold_cmd(object_id: bytearray) -> bytearray:
+    threshold = int(input("Specify threshold:"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_ADC_THRESHOLD)
+    command = command + struct.pack('!I', threshold)
+    return command
+
+
+def pack_enable_nvms_cmd(object_id: bytearray) -> bytearray:
+    n01 = int(input("NVM0/1 (0 - off, 1 - on):"))
+    n3 = int(input("NVM3 (0 - off, 1 - on):"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.ENABLE_NVMS)
+    command = command + struct.pack('!B', n01)
+    command = command + struct.pack('!B', n3)
+    return command
+
+
+def pack_select_nvm_cmd(object_id: bytearray) -> bytearray:
+    mem = int(input("Specify NVM (0 - NVM0, 1 - MVM1):"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SELECT_NVM)
+    command = command + struct.pack('!B', mem)
+    return command
+
+
+def pack_auto_em_tests_cmd(object_id: bytearray) -> bytearray:
+    test = int(input("Specify test (1 - complete, 2 - short):"))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.RUN_AUTO_EM_TESTS)
+    command = command + struct.pack('!B', test)
+    return command
+
+
+def pack_mram_wipe_cmd(object_id: bytearray) -> bytearray:
+    start = int(input("Start address: 0x"), 16)
+    stop = int(input("Stop address: 0x"), 16)
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.WIPE_MRAM)
+    command = command + struct.pack('!I', start)
+    command = command + struct.pack('!I', stop)
+    return command
+
+
+def pack_mram_dump_cmd(object_id: bytearray) -> bytearray:
+    start = int(input("Start address: 0x"), 16)
+    stop = int(input("Stop address: 0x"), 16)
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.DUMP_MRAM)
+    command = command + struct.pack('!I', start)
+    command = command + struct.pack('!I', stop)
+    return command
+
+
+def pack_print_cpu_stats_cmd(object_id: bytearray) -> bytearray:
+    en = 1
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.PRINT_CPU_STATS)
+    command = command + struct.pack('!B', en)
+    return command
+
+
+def pack_set_debug_verbosity_cmd(object_id: bytearray) -> bytearray:
+    command = bytearray()
+    verbosity = get_debug_verbosity()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_DBG_VERBOSITY)
+    command = command + struct.pack('!B', verbosity)
+    return command
+
+
+def get_debug_verbosity() -> int:
+    tries = 0
+    while tries < 3:
+        try:
+            print("Debug verbosity options")
+            verbosity_options_dict = {
+                0: "None",
+                1: "Error",
+                2: "Warn",
+                3: "Info",
+            }
+            print("{:<6} | {}".format('Key', 'Description'))
+            for entry in verbosity_options_dict.items():
+                print("{:<6} | {}".format(entry[0], entry[1]))
+            verbosity = int(input("Specify verbosity key: "))
+            if verbosity > len(verbosity_options_dict) - 1:
+                raise ValueError
+            return verbosity
+        except ValueError:
+            LOGGER.warning("Invalid verbosity key specified")
+            tries = tries + 1
+    LOGGER.error("get_debug_verbosity: Exceeded max tries to input verbosity key")
+    quit()
+
+
+def pack_set_gpio_cmd(object_id: bytearray) -> bytearray:
+    port = int(input("Specify port: "))
+    pin = int(input("Specify pin: "))
+    val = int(input("Specify val: "))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.SET_GPIO)
+    command = command + struct.pack('!B', port)
+    command = command + struct.pack('!B', pin)
+    command = command + struct.pack('!B', val)
+    return command
+
+
+def pack_read_gpio_cmd(object_id: bytearray) -> bytearray:
+    port = int(input("Specify port: "))
+    pin = int(input("Specify pin: "))
+    command = bytearray()
+    command = object_id + struct.pack('!I', SupvActionIds.READ_GPIO)
+    command = command + struct.pack('!B', port)
+    command = command + struct.pack('!B', pin)
+    return command
+
+
--- a/pus_tc/ploc_upater.py
+++ b/pus_tc/ploc_upater.py
@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+"""
+@file   ploc_supervisor.py
+@brief  Tests for commanding the supervisor of the PLOC.
+        The supervisor is programmed by Thales.
+@author J. Meier
+@date   10.07.2021
+"""
+import struct
+
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+from tmtccmd.utility.logger import get_console_logger
+
+LOGGER = get_console_logger()
+
+latchup_id_dict = {
+    "0": "0.85V",
+    "1": "1.8V",
+    "2": "MISC",
+    "3": "3.3V",
+    "4": "NVM_4XO",
+    "5": "MISSION",
+    "6": "SAFECOTS"
+}
+
+
+class UpdaterActionIds:
+    UPDATE_NVM0_A = 0
+    UPDATE_NVM0_B = 1
+    UPDATE_NVM1_A = 2
+    UPDATE_NVM1_B = 3
+
+
+class ImagePathDefs:
+    imageNvm0A = "/mnt/sd0/ploc/updateNvm0A.bin"
+    imageNvm0B = "/mnt/sd0/ploc/updateNvm0B.bin"
+    imageNvm1A = "/mnt/sd0/ploc/updateNvm1A.bin"
+    imageNvm1B = "/mnt/sd0/ploc/updateNvm1B.bin"
+
+
+def pack_ploc_updater_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing PLOC updater with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition A on NVM0"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM0_A) + \
+                  bytearray(ImagePathDefs.imageNvm0A, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition B on NVM0"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM0_B) + \
+                  bytearray(ImagePathDefs.imageNvm0B, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition A on NVM1"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM1_A) + \
+                  bytearray(ImagePathDefs.imageNvm1A, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Update partition B on NVM1"))
+        command = object_id + struct.pack('!I', UpdaterActionIds.UPDATE_NVM1_B) + \
+                  bytearray(ImagePathDefs.imageNvm1B, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
--- a/pus_tc/rad_sensor.py
+++ b/pus_tc/rad_sensor.py
@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+"""
+@file   rad_sensor.py
+@brief  Tests for the radiation sensor handler
+@author J. Meier
+@date   01.07.2021
+"""
+import struct
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+from pus_tc.service_200_mode import pack_mode_data
+
+
+def pack_rad_sensor_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing radiation sensor handler with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Switch to mode on"))
+        mode_data = pack_mode_data(object_id, 1, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=41, app_data=mode_data)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "1":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Switch to mode normal"))
+        mode_data = pack_mode_data(object_id, 2, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=42, app_data=mode_data)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "Rad sensor: Switch to mode off"))
+        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())
--- a/pus_tc/reaction_wheels.py
+++ b/pus_tc/reaction_wheels.py
@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+"""
+@file   reaction_wheels.py
+@brief  Tests for the reaction wheel handler
+@author J. Meier
+@date   20.06.2021
+"""
+import struct
+from tmtccmd.config.definitions import QueueCommands
+
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.ecss.tc import PusTelecommand
+from pus_tc.service_200_mode import pack_mode_data
+
+
+class RwSetIds:
+    STATUS_SET_ID = 4
+    TEMPERATURE_SET_ID = 8
+
+
+class RwCommandIds:
+    RESET_MCU = bytearray([0x0, 0x0, 0x0, 0x01])
+    # Reads status information from reaction wheel into dataset with id 4
+    GET_RW_STATUS = bytearray([0x0, 0x0, 0x0, 0x04])
+    INIT_RW_CONTROLLER = bytearray([0x0, 0x0, 0x0, 0x05])
+    SET_SPEED = bytearray([0x0, 0x0, 0x0, 0x06])
+    # Reads temperature from reaction wheel into dataset with id 8
+    GET_TEMPERATURE = bytearray([0x0, 0x0, 0x0, 0x08])
+    GET_TM = bytearray([0x0, 0x0, 0x0, 0x09])
+
+
+class SpeedDefinitions:
+    RPM_100 = 1000
+    RPM_5000 = 5000
+
+
+class RampTime:
+    MS_1000 = 1000
+
+
+def pack_single_rw_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str) -> TcQueueT:
+    tc_queue.appendleft(
+        (QueueCommands.PRINT,
+         "Testing reaction wheel handler with object id: 0x" + object_id.hex())
+    )
+
+    if op_code == "0" or op_code == "1":
+        speed = int(input("Specify speed [0.1 RPM]: "))
+        ramp_time = int(input("Specify ramp time [ms]: "))
+        tc_queue.appendleft((QueueCommands.PRINT, "Reaction Wheel: Set speed"))
+        command = pack_set_speed_command(object_id, speed, ramp_time)
+        command = PusTelecommand(service=8, subservice=128, ssc=40, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "2":
+        tc_queue.appendleft((QueueCommands.PRINT, "Reaction Wheel: Switch to mode on"))
+        mode_data = pack_mode_data(object_id, 1, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=41, app_data=mode_data)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "Reaction Wheel: Switch to mode normal"))
+        mode_data = pack_mode_data(object_id, 2, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=42, app_data=mode_data)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "4":
+        tc_queue.appendleft((QueueCommands.PRINT, "Reaction Wheel: Switch to mode off"))
+        mode_data = pack_mode_data(object_id, 0, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=43, app_data=mode_data)
+        tc_queue.appendleft(command.pack_command_tuple())
+
+    if op_code == "5":
+        tc_queue.appendleft((QueueCommands.PRINT, "Reaction Wheel: Send get-telemetry-command"))
+        command = object_id + RwCommandIds.GET_TM
+        command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    return tc_queue
+
+
+def pack_set_speed_command(object_id: bytearray, speed: int, ramp_time: int) -> bytearray:
+    """ With this function a command is packed to set the speed of a reaction wheel
+    @param object_id    The object id of the reaction wheel handler.
+    @param speed   Valid speeds are [-65000, -1000] and [1000, 65000]. Values are specified in 0.1 * RPM
+    @param ramp_time   The time after which the reaction wheel will reached the commanded speed. Valid times are
+                       10 - 10000 ms
+    """
+    command_id = RwCommandIds.SET_SPEED
+    command = bytearray()
+    command = object_id + command_id
+    command = command + struct.pack('!i', speed)
+    command = command + ramp_time.to_bytes(length=2, byteorder='big')
+    return command
--- a/pus_tc/service_200_mode.py
+++ b/pus_tc/service_200_mode.py
@ -7,8 +7,8 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.pus_tc.packer import TcQueueT
-from tmtccmd.pus_tc.service_200_mode import pack_mode_data
+from tmtccmd.tc.packer import TcQueueT
+from tmtccmd.tc.service_200_mode import pack_mode_data
 from config.object_ids import TEST_DEVICE_ID

 TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID
--- a/pus_tc/solar_array_deployment.py
+++ b/pus_tc/solar_array_deployment.py
@ -6,8 +6,8 @@
@date   15.02.2021
 """
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tc.packer import PusTelecommand
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.packer import PusTelecommand


 class ActionIds:
--- a/pus_tc/syrlinks_hk_handler.py
+++ b/pus_tc/syrlinks_hk_handler.py
@ -7,8 +7,8 @@
 """

 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tc.service_3_housekeeping import make_sid, generate_one_hk_command
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command


 class SetIds:
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@ -9,23 +9,32 @@ from collections import deque
 from typing import Union

 from tmtccmd.config.definitions import CoreServiceList
-from tmtccmd.utility.logger import get_logger
-from tmtccmd.pus_tc.definitions import TcQueueT
-from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into
-from tmtccmd.pus_tc.service_17_test import pack_service17_ping_command
+from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.tc.definitions import TcQueueT
+from tmtccmd.tc.service_5_event import pack_generic_service5_test_into
+from tmtccmd.tc.service_17_test import pack_service17_ping_command

+from pus_tc.service_200_mode import pack_service200_test_into
 from pus_tc.p60dock import pack_p60dock_test_into
 from pus_tc.pdu2 import pack_pdu2_test_into
 from pus_tc.pdu1 import pack_pdu1_test_into
 from pus_tc.acu import pack_acu_test_into
+from pus_tc.imtq import pack_imtq_test_into
 from pus_tc.tmp1075 import pack_tmp1075_test_into
+from pus_tc.ploc_mpsoc import pack_ploc_mpsoc_test_into
+from pus_tc.ploc_supervisor import pack_ploc_supv_test_into
 from pus_tc.heater import pack_heater_test_into
+from pus_tc.reaction_wheels import pack_single_rw_test_into
+from pus_tc.rad_sensor import pack_rad_sensor_test_into
+from pus_tc.ploc_upater import pack_ploc_updater_test_into
+from pus_tc.core import pack_core_commands
 from config.definitions import CustomServiceList
 from config.object_ids import P60_DOCK_HANDLER, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, ACU_HANDLER_ID, \
-    TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID
+    TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID, IMTQ_HANDLER_ID, PLOC_MPSOC_ID, RW1_ID, RW2_ID, RW3_ID, RW4_ID, \
+    RAD_SENSOR_ID, PLOC_SUPV_ID, PLOC_UPDATER_ID


-LOGGER = get_logger()
+LOGGER = get_console_logger()


 def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):
@ -33,6 +42,8 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
        return pack_generic_service5_test_into(tc_queue=service_queue)
    if service == CoreServiceList.SERVICE_17.value:
        return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
+    if service == CoreServiceList.SERVICE_200.value:
+        return pack_service200_test_into(tc_queue=service_queue)
    if service == CustomServiceList.P60DOCK.value:
        object_id = P60_DOCK_HANDLER
        return pack_p60dock_test_into(object_id=object_id, tc_queue=service_queue)
@ -60,6 +71,35 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu
    if service == CustomServiceList.HEATER.value:
        object_id = HEATER_ID
        return pack_heater_test_into(object_id=object_id, tc_queue=service_queue)
+    if service == CustomServiceList.IMTQ.value:
+        object_id = IMTQ_HANDLER_ID
+        return pack_imtq_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.PLOC.value:
+        object_id = PLOC_MPSOC_ID
+        return pack_ploc_mpsoc_test_into(object_id=object_id, tc_queue=service_queue)
+    if service == CustomServiceList.REACTION_WHEEL_1.value:
+        object_id = RW1_ID
+        return pack_single_rw_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.REACTION_WHEEL_2.value:
+        object_id = RW2_ID
+        return pack_single_rw_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.REACTION_WHEEL_3.value:
+        object_id = RW3_ID
+        return pack_single_rw_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.REACTION_WHEEL_4.value:
+        object_id = RW4_ID
+        return pack_single_rw_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.RAD_SENSOR.value:
+        object_id = RAD_SENSOR_ID
+        return pack_rad_sensor_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.PLOC_SUPV.value:
+        object_id = PLOC_SUPV_ID
+        return pack_ploc_supv_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.PLOC_UPDATER.value:
+        object_id = PLOC_UPDATER_ID
+        return pack_ploc_updater_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+    if service == CustomServiceList.CORE.value:
+        return pack_core_commands(tc_queue=service_queue, op_code=op_code)
    LOGGER.warning("Invalid Service !")


--- a/pus_tc/tmp1075.py
+++ b/pus_tc/tmp1075.py
@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_tmp1075.py
+@file   tmp1075.py
@brief  TMP1075 tests
@author J. Meier
@date   06.01.2021
 """
 from tmtccmd.config.definitions import QueueCommands

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

--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@ -3,30 +3,40 @@
@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
            it to your needs.
 """
-from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
+from tmtccmd.tm.service_8_functional_cmd import Service8TM
 from tmtccmd.ecss.tm import PusTelemetry
-from tmtccmd.utility.logger import get_logger
+from tmtccmd.utility.logger import get_console_logger

-from tmtccmd.pus_tm.service_1_verification import Service1TM
-from tmtccmd.pus_tm.service_3_base import Service3Base
-from tmtccmd.pus_tm.service_5_event import Service5TM
-from tmtccmd.pus_tm.service_17_test import Service17TM
+from tmtccmd.tm.service_1_verification import Service1TM
+from tmtccmd.tm.service_3_housekeeping import Service3TM
+from tmtccmd.tm.service_5_event import Service5TM
+from tmtccmd.tm.service_17_test import Service17TM
+from tmtccmd.utility.tmtc_printer import TmTcPrinter

-LOGGER = get_logger()
+from config.definitions import PUS_APID
+
+LOGGER = get_console_logger()


-def tm_user_factory_hook(raw_tm_packet: bytearray) -> PusTelemetry:
+def ccsds_tm_handler(apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter) -> None:
+    if apid == PUS_APID:
+        pus_factory_hook(raw_tm_packet=raw_tm_packet, tmtc_printer=tmtc_printer)
+
+
+def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
    service_type = raw_tm_packet[7]
+    tm_packet = None
    if service_type == 1:
-        return Service1TM(raw_tm_packet)
+        tm_packet = Service1TM(raw_tm_packet)
    if service_type == 3:
-        return Service3Base(raw_tm_packet)
+        tm_packet = Service3TM(raw_tm_packet)
    if service_type == 5:
-        return Service5TM(raw_tm_packet)
+        tm_packet = Service5TM(raw_tm_packet)
    if service_type == 8:
-        service_8_tm = Service8TM(raw_tm_packet)
-        return Service8TM(raw_tm_packet)
+        tm_packet = Service8TM(raw_tm_packet)
    if service_type == 17:
-        return Service17TM(raw_tm_packet)
-    LOGGER.info("The service " + str(service_type) + " is not implemented in Telemetry Factory")
-    return PusTelemetry(raw_tm_packet)
+        tm_packet = Service17TM(raw_tm_packet)
+    if tm_packet is None:
+        LOGGER.info(f'The service {service_type} is not implemented in Telemetry Factory')
+        tm_packet = PusTelemetry(raw_tm_packet)
+    tmtc_printer.print_telemetry(packet=tm_packet)
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@ -4,19 +4,29 @@
@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
            it to your needs.
 """
+import struct
 from typing import Tuple

-from tmtccmd.pus_tm.service_3_base import Service3Base
-from tmtccmd.utility.logger import get_logger
-
-LOGGER = get_logger()
+from tmtccmd.tm.service_3_housekeeping import Service3Base
+from tmtccmd.utility.logger import get_console_logger
+from pus_tc.syrlinks_hk_handler import SetIds
+from pus_tc.imtq import ImtqSetIds
+from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID
+LOGGER = get_console_logger()


-def handle_user_hk_packet(object_id: int, set_id: int, hk_data: bytearray,
+def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray,
                          service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]:
    """
    This function is called when a Service 3 Housekeeping packet is received.

+    Please note that the object IDs should be compared by value because direct comparison of
+    enumerations does not work in Python. For example use:
+
+        if object_id.value == ObjectIds.TEST_OBJECT.value
+
+    to test equality based on the object ID list.
+
    @param object_id:
    @param set_id:
    @param hk_data:
@ -26,5 +36,122 @@ def handle_user_hk_packet(object_id: int, set_id: int, hk_data: bytearray,
    the corresponding values. The bytearray is the validity buffer, which is usually appended
    at the end of the housekeeping packet. The last value is the number of parameters.
    """
-    LOGGER.info("Service3TM: Parsing for this SID has not been implemented.")
-    return [], [], bytearray(), 0
+    if object_id == SYRLINKS_HANDLER:
+        if set_id == SetIds.RX_REGISTERS_DATASET:
+            return handle_syrlinks_rx_registers_dataset(hk_data)
+        elif set_id == SetIds.TX_REGISTERS_DATASET:
+            return handle_syrlinks_tx_registers_dataset(hk_data)
+        else:
+            LOGGER.info("Serive 3 TM: Syrlinks handler reply with unknown set id")
+            return [], [], bytearray(), 0
+    elif object_id == IMTQ_HANDLER_ID:
+        if (set_id >= ImtqSetIds.POSITIVE_X_TEST) and (set_id <= ImtqSetIds.NEGATIVE_Z_TEST):
+            return handle_self_test_data(hk_data)
+        else:
+            LOGGER.info("Serive 3 TM: Syrlinks handler reply with unknown set id")
+            return [], [], bytearray(), 0
+    else:
+        LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.")
+        return [], [], bytearray(), 0
+
+
+def handle_syrlinks_rx_registers_dataset(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
+    hk_header = []
+    hk_content = []
+    validity_buffer = bytearray()
+    hk_header = ["RX Status", "RX Sensitivity", "RX Frequency Shift", "RX IQ Power", "RX AGC Value", "RX Demod Eb",
+                 "RX Demod N0", "RX Datarate"]
+    rx_status = hk_data[0]
+    rx_sensitivity = struct.unpack('!I', hk_data[1:5])
+    rx_frequency_shift = struct.unpack('!I', hk_data[5:9])
+    rx_iq_power = struct.unpack('!H', hk_data[9:11])
+    rx_agc_value = struct.unpack('!H', hk_data[11:13])
+    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]
+    hk_content = [rx_status, rx_sensitivity, rx_frequency_shift, rx_iq_power, rx_agc_value, rx_demod_eb, rx_demod_n0,
+                  rx_data_rate]
+    return hk_header, hk_content, validity_buffer, 8
+
+
+def handle_syrlinks_tx_registers_dataset(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
+    hk_header = []
+    hk_content = []
+    validity_buffer = bytearray()
+    hk_header = ["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])
+    hk_content = [tx_status,  tx_waveform, tx_agc_value]
+    return hk_header, hk_content, validity_buffer, 3
+
+
+def handle_self_test_data(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
+    hk_header = []
+    hk_content = []
+    validity_buffer = bytearray()
+    hk_header = ["Init Err", "Init Raw Mag X [nT]", "Init Raw Mag Y [nT]", "Init Raw Mag Z [nT]", "Init Cal Mag X [nT]",
+                 "Init Cal Mag Y [nT]", "Init Cal Mag Z [nT]", "Init Coil X Current [mA]", "Init Coil Y Current [mA]",
+                 "Init Coil Z Current [mA]", "Init Coil X Temperature [°C]", "Init Coil Y Temperature [°C]",
+                 "Init Coil Z Temperature [°C]", "Err", "Raw Mag X [nT]", "Raw Mag Y [nT]", "Raw Mag Z [nT]",
+                 "Cal Mag X [nT]", "Cal Mag Y [nT]", "Cal Mag Z [nT]", "Coil X Current [mA]", "Coil Y Current [mA]",
+                 "Coil Z Current [mA]", "Coil X Temperature [°C]", "Coil Y Temperature [°C]", "Coil Z Temperature [°C]",
+                 "Fina Err", "Fina Raw Mag X [nT]", "Fina Raw Mag Y [nT]", "Fina Raw Mag Z [nT]", "Fina Cal Mag X [nT]",
+                 "Fina Cal Mag Y [nT]", "Fina Cal Mag Z [nT]", "Fina Coil X Current [mA]", "Fina Coil Y Current [mA]",
+                 "Fina Coil Z Current [mA]", "Fina Coil X Temperature [°C]", "Fina Coil Y Temperature [°C]",
+                 "Fina Coil Z Temperature [°C]"]
+    # INIT step (no coil actuation)
+    init_err = hk_data[0]
+    init_raw_mag_x = struct.unpack('!f', hk_data[1:5])[0]
+    init_raw_mag_y = struct.unpack('!f', hk_data[5:9])[0]
+    init_raw_mag_z = struct.unpack('!f', hk_data[9:13])[0]
+    init_cal_mag_x = struct.unpack('!f', hk_data[13:17])[0]
+    init_cal_mag_y = struct.unpack('!f', hk_data[17:21])[0]
+    init_cal_mag_z = struct.unpack('!f', hk_data[21:25])[0]
+    init_coil_x_current = struct.unpack('!f', hk_data[25:29])[0]
+    init_coil_y_current = struct.unpack('!f', hk_data[29:33])[0]
+    init_coil_z_current = struct.unpack('!f', hk_data[33:37])[0]
+    init_coil_x_temperature = struct.unpack('!H', hk_data[37:39])[0]
+    init_coil_y_temperature = struct.unpack('!H', hk_data[39:41])[0]
+    init_coil_z_temperature = struct.unpack('!H', hk_data[41:43])[0]
+
+    # Actuation step
+    err = hk_data[43]
+    raw_mag_x = struct.unpack('!f', hk_data[44:48])[0]
+    raw_mag_y = struct.unpack('!f', hk_data[48:52])[0]
+    raw_mag_z = struct.unpack('!f', hk_data[52:56])[0]
+    cal_mag_x = struct.unpack('!f', hk_data[56:60])[0]
+    cal_mag_y = struct.unpack('!f', hk_data[60:64])[0]
+    cal_mag_z = struct.unpack('!f', hk_data[64:68])[0]
+    coil_x_current = struct.unpack('!f', hk_data[68:72])[0]
+    coil_y_current = struct.unpack('!f', hk_data[72:76])[0]
+    coil_z_current = struct.unpack('!f', hk_data[76:80])[0]
+    coil_x_temperature = struct.unpack('!H', hk_data[80:82])[0]
+    coil_y_temperature = struct.unpack('!H', hk_data[82:84])[0]
+    coil_z_temperature = struct.unpack('!H', hk_data[84:86])[0]
+
+    # FINA step (no coil actuation)
+    fina_err = hk_data[86]
+    fina_raw_mag_x = struct.unpack('!f', hk_data[87:91])[0]
+    fina_raw_mag_y = struct.unpack('!f', hk_data[91:95])[0]
+    fina_raw_mag_z = struct.unpack('!f', hk_data[95:99])[0]
+    fina_cal_mag_x = struct.unpack('!f', hk_data[99:103])[0]
+    fina_cal_mag_y = struct.unpack('!f', hk_data[103:107])[0]
+    fina_cal_mag_z = struct.unpack('!f', hk_data[107:111])[0]
+    fina_coil_x_current = struct.unpack('!f', hk_data[111:115])[0]
+    fina_coil_y_current = struct.unpack('!f', hk_data[115:119])[0]
+    fina_coil_z_current = struct.unpack('!f', hk_data[119:123])[0]
+    fina_coil_x_temperature = struct.unpack('!H', hk_data[123:125])[0]
+    fina_coil_y_temperature = struct.unpack('!H', hk_data[125:127])[0]
+    fina_coil_z_temperature = struct.unpack('!H', hk_data[127:129])[0]
+
+    hk_content = [init_err, init_raw_mag_x, init_raw_mag_y, init_raw_mag_z, init_cal_mag_x, init_cal_mag_y,
+                  init_cal_mag_z, init_coil_x_current, init_coil_y_current, init_coil_z_current,
+                  init_coil_x_temperature, init_coil_y_temperature, init_coil_z_temperature, err, raw_mag_x,
+                  init_raw_mag_y, raw_mag_z, cal_mag_x, cal_mag_y, cal_mag_z, coil_x_current, coil_y_current,
+                  coil_z_current, coil_x_temperature, coil_y_temperature, coil_z_temperature, fina_err, fina_raw_mag_x,
+                  fina_raw_mag_y, fina_raw_mag_z, fina_cal_mag_x, fina_cal_mag_y, fina_cal_mag_z, fina_coil_x_current,
+                  fina_coil_y_current, fina_coil_z_current, fina_coil_x_temperature, fina_coil_y_temperature,
+                  fina_coil_z_temperature]
+
+    return hk_header, hk_content, validity_buffer, len(hk_header)
--- a/pus_tm/hk_handling_hook.py
+++ b/pus_tm/hk_handling_hook.py
@ -1,79 +0,0 @@
-"""
-@brief      This file transfers control of housekeeping handling (PUS service 3) to the
-            developer
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-import struct
-from typing import Tuple
-
-from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
-from tmtccmd.utility.logger import get_logger
-from pus_tc.syrlinks_hk_handler import SetIds
-from config.object_ids import SYRLINKS_HANDLER
-LOGGER = get_logger()
-
-
-def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray,
-                          service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]:
-    """
-    This function is called when a Service 3 Housekeeping packet is received.
-
-    Please note that the object IDs should be compared by value because direct comparison of
-    enumerations does not work in Python. For example use:
-
-        if object_id.value == ObjectIds.TEST_OBJECT.value
-
-    to test equality based on the object ID list.
-
-    @param object_id:
-    @param set_id:
-    @param hk_data:
-    @param service3_packet:
-    @return: Expects a tuple, consisting of two lists, a bytearray and an integer
-    The first list contains the header columns, the second list the list with
-    the corresponding values. The bytearray is the validity buffer, which is usually appended
-    at the end of the housekeeping packet. The last value is the number of parameters.
-    """
-    if object_id == SYRLINKS_HANDLER:
-        if set_id == SetIds.RX_REGISTERS_DATASET:
-            return handle_syrlinks_rx_registers_dataset(hk_data)
-        elif set_id == SetIds.TX_REGISTERS_DATASET:
-            return handle_syrlinks_tx_registers_dataset(hk_data)
-        else:
-            LOGGER.info("Serive 3 TM: Syrlinks handler reply with unknown set id")
-            return [], [], bytearray(), 0
-    else:
-        LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.")
-        return [], [], bytearray(), 0
-
-
-def handle_syrlinks_rx_registers_dataset(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
-    hk_header = []
-    hk_content = []
-    validity_buffer = bytearray()
-    hk_header = ["RX Status", "RX Sensitivity", "RX Frequency Shift", "RX IQ Power", "RX AGC Value", "RX Demod Eb",
-                 "RX Demod N0", "RX Datarate"]
-    rx_status = hk_data[0]
-    rx_sensitivity = struct.unpack('!I', hk_data[1:5])
-    rx_frequency_shift = struct.unpack('!I', hk_data[5:9])
-    rx_iq_power = struct.unpack('!H', hk_data[9:11])
-    rx_agc_value = struct.unpack('!H', hk_data[11:13])
-    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]
-    hk_content = [rx_status, rx_sensitivity, rx_frequency_shift, rx_iq_power, rx_agc_value, rx_demod_eb, rx_demod_n0,
-                  rx_data_rate]
-    return hk_header, hk_content, validity_buffer, 8
-
-
-def handle_syrlinks_tx_registers_dataset(hk_data: bytearray) -> Tuple[list, list, bytearray, int]:
-    hk_header = []
-    hk_content = []
-    validity_buffer = bytearray()
-    hk_header = ["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])
-    hk_content = [tx_status,  tx_waveform, tx_agc_value]
-    return hk_header, hk_content, validity_buffer, 3
--- a/pus_tm/service_8_hook.py
+++ b/pus_tm/service_8_hook.py
@ -1,5 +1,9 @@
+import struct
 from typing import Tuple
-from config.object_ids import PDU_2_HANDLER_ID
+from config.object_ids import *
+from pus_tc.imtq import ImtqActionIds
+from pus_tc.ploc_mpsoc import PlocReplyIds
+from pus_tc.ploc_supervisor import SupvActionIds


 def user_analyze_service_8_data(
@ -25,7 +29,42 @@ def user_analyze_service_8_data(
        data_string = data_string.rstrip(',')
        data_string = data_string.rstrip()
        content_list = [data_string]
+    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)
    else:
        header_list = []
        content_list = []
    return header_list, content_list
+
+
+def handle_imtq_replies(action_id: int, custom_data: bytearray) -> Tuple[list, list]:
+    header_list = []
+    content_list = []
+    if action_id == struct.unpack('!I', ImtqActionIds.get_commanded_dipole)[0]:
+        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])
+        content_list = [x_dipole[0], y_dipole[0], z_dipole[0]]
+
+
+def handle_ploc_replies(action_id: int, custom_data: bytearray) -> Tuple[list, list]:
+    header_list = []
+    content_list = []
+    if action_id == PlocReplyIds.tm_mem_read_report:
+        header_list = ['PLOC Memory Address', 'PLOC Mem Len', 'PLOC Read Memory Data']
+        content_list = [custom_data[:4], custom_data[4:6], custom_data[6:10]]
+    return header_list, content_list
+
+
+def handle_supervisor_replies(action_id: int, custom_data: bytearray) -> Tuple[list, list]:
+    header_list = []
+    content_list = []
+    if action_id == SupvActionIds.DUMP_MRAM:
+        header_list = ['MRAM Dump']
+        content_list = [custom_data[:len(custom_data)]]
+    return header_list, content_list
--- a/tmtc_client_cli.py
+++ b/tmtc_client_cli.py
@ -26,13 +26,31 @@ limitations under the License.

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


 def main():
    hook_obj = EiveHookObject()
+    print(f"-- eive tmtc version {__version__}")
    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)
+    add_ccsds_handler(ccsds_handler)
    run_tmtc_commander(False)


--- a/tmtc_client_gui.py
+++ b/tmtc_client_gui.py
@ -1,6 +1,6 @@
 #!/usr/bin/python3
 """
-@brief      TMTC Commander entry point for GUI mode.
+@brief      TMTC Commander entry point for command line mode.
@details
 This client was developed by KSat for the SOURCE project to test the on-board software but
 has evolved into a more generic tool for satellite developers to perform TMTC (Telemetry and Telecommand)
@ -26,14 +26,32 @@ limitations under the License.

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


 def main():
    hook_obj = EiveHookObject()
+    print(f"-- eive tmtc version {__version__}")
    initialize_tmtc_commander(hook_object=hook_obj)
-    run_tmtc_commander(True)
+    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)


 if __name__ == "__main__":
--- a/2
+++ b/2
Author	SHA1	Message	Date
Robin Müller	cc6dbd8ef9	Merge pull request 'bumped version to v1.8.0' (#17 ) from develop into master Reviewed-on: #17	2021-08-09 15:49:56 +02:00
Robin Müller	3cd7de5649	Merge branch 'master' into develop	2021-08-09 15:49:50 +02:00
Robin Mueller	f8b36a651d	bumped version	2021-08-09 15:49:07 +02:00
Robin Müller	82c8090afd	Merge pull request 'Release v1.8.0' (#16 ) from develop into master Reviewed-on: #16	2021-08-09 15:46:53 +02:00
Robin Müller	fac74219f0	Merge branch 'master' into develop	2021-08-09 14:39:52 +02:00
Jakob.Meier	3305e1d489	Merge pull request 'Update TMTC and linter script' (#15 ) from mueller/master into develop Reviewed-on: #15	2021-08-09 14:19:43 +02:00
Robin Mueller	7c598f26a8	instructions to run linter	2021-08-09 11:45:01 +02:00
Robin Mueller	5ea6903881	updated linter python script	2021-08-09 11:38:37 +02:00
Robin Mueller	6824e7d8c7	made CLI and GUI executable	2021-08-09 11:31:08 +02:00
Robin Mueller	ca63149a67	Merge remote-tracking branch 'origin/develop' into mueller/master	2021-08-09 11:29:55 +02:00
Robin Müller	f00cd8f6bd	Merge pull request 'meier/plocSupervisor' (#14 ) from meier/plocSupervisor into develop Reviewed-on: #14	2021-08-09 11:28:39 +02:00
Jakob.Meier	547b4b2137	fixed conflicts	2021-08-08 15:20:28 +02:00
Jakob.Meier	e7d8199e67	ploc updater commands	2021-08-08 15:02:29 +02:00
Jakob.Meier	98a1d0f856	supervisor CAN loopback test	2021-08-08 10:58:14 +02:00
Jakob.Meier	36ae6a233c	ploc udpater test	2021-08-07 14:34:26 +02:00
Robin Mueller	3e8626bfaf	tmtccmd update	2021-08-04 17:40:39 +02:00
Jakob.Meier	a226bf659e	Merge pull request 'added reboot command' (#12 ) from mueller/master into develop Reviewed-on: #12	2021-08-04 10:02:42 +02:00
Robin Mueller	bc32472d88	added reboot command	2021-08-03 15:28:28 +02:00
Jakob.Meier	4aebf4c0d9	debug tcs added	2021-08-02 15:28:34 +02:00
Robin Müller	477743f626	Merge pull request 'meier/plocSupervisor' (#11 ) from meier/plocSupervisor into develop Reviewed-on: #11	2021-08-02 12:59:04 +02:00
Jakob.Meier	d782aa2715	space packet id typo	2021-08-02 11:30:20 +02:00
Jakob.Meier	93fdc0fc7f	some more supervisor TCs	2021-08-02 11:27:34 +02:00
Jakob.Meier	9a7d5f08d0	supervisor run configuration	2021-08-01 17:12:09 +02:00
Jakob.Meier	6fcd52daa6	added processing of mram dump tm in service 8 hook	2021-07-31 08:32:14 +02:00
Jakob.Meier	1b1f26ac3a	mram dump and mram wipe tc, fix in hook_implementations	2021-07-29 08:58:12 +02:00
Jakob.Meier	6601233f41	Merge branch 'develop' into meier/plocSupervisor	2021-07-28 19:37:20 +02:00
Jakob.Meier	55ca910549	few more ploc supervisor commands	2021-07-28 19:35:46 +02:00
Robin Mueller	8b7331c210	Merge branch 'mueller/master' into develop	2021-07-28 15:28:21 +02:00
Robin Mueller	31bc3d8689	tmtccmd update	2021-07-28 15:24:39 +02:00
Robin Mueller	7ffda5f9ee	tmtccmd update	2021-07-27 11:54:35 +02:00
Robin Mueller	f2e95444c7	tmtccmd update	2021-07-27 11:50:29 +02:00
Robin Mueller	0b6bfdd23a	tmtccmd update	2021-07-27 11:48:42 +02:00
Robin Müller	389836c10f	Merge pull request 'v1.7.1' (#10 ) from develop into master Reviewed-on: #10	2021-07-27 09:39:52 +02:00
Robin Müller	ed1d9a81ed	Merge branch 'master' into develop	2021-07-27 09:39:44 +02:00
Jakob.Meier	132d9d2456	Merge pull request 'v1.7.1' (#9 ) from v1.7.1 into develop Reviewed-on: #9	2021-07-26 18:17:33 +02:00
Jakob.Meier	6f8d63ba87	Merge pull request 'v1.7.0' (#8 ) from develop into master Reviewed-on: #8 Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>	2021-07-26 18:17:08 +02:00
Robin Mueller	1f990e9647	v1.7.1	2021-07-26 17:57:19 +02:00
Robin Mueller	2a6c0a6cab	tmtccmd update	2021-07-26 17:53:38 +02:00
Robin Mueller	9aaf3cfa7a	tmtccmd update	2021-07-26 17:29:49 +02:00
Robin Mueller	a81b8b608d	assigned packet ID for tcp com if	2021-07-26 17:24:53 +02:00
Jakob.Meier	75ae2c786b	update availabe and watchdogs enable command	2021-07-26 16:29:54 +02:00
Robin Mueller	6758ecef0d	service 200 handler (but test task missing)	2021-07-26 14:13:58 +02:00
Jakob.Meier	6352a6f272	Merge branch 'develop' into meier/plocSupervisor	2021-07-25 20:39:49 +02:00
Jakob.Meier	390081d00e	ploc supervisor get boot status report added, not tested	2021-07-25 17:56:36 +02:00
Robin Mueller	2e942ec21e	printing own and tmtccmd version now tmtccmd updated to v1.7.2	2021-07-24 14:58:47 +02:00
Robin Mueller	3436172026	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop	2021-07-24 14:41:35 +02:00
Robin Mueller	7302b10e06	bumped version number	2021-07-24 14:41:23 +02:00
Robin Müller	193060ea65	Merge pull request 'meier/plocSupervisor' (#7 ) from meier/plocSupervisor into develop Reviewed-on: #7	2021-07-24 14:40:57 +02:00
Jakob.Meier	e552a92db4	all object ids are of bytes type now	2021-07-24 13:39:15 +02:00
Jakob.Meier	b0e78beaff	Merge branch 'develop' into meier/plocSupervisor	2021-07-24 12:12:20 +02:00
Jakob.Meier	6d3be2af33	removed unused code in ploc_supervisor.py	2021-07-24 12:08:12 +02:00
Jakob.Meier	b0ef4446d5	ploc supervisor tests	2021-07-23 13:40:27 +02:00
Jakob.Meier	d55a12a100	ploc supervisor get hk test	2021-07-11 14:29:11 +02:00
Jakob.Meier	ec0ef1a4f7	renamed ploc mpsoc object id	2021-07-09 12:57:39 +02:00
Jakob.Meier	3b073a7eef	corrected object ids of reaction wheels	2021-07-08 11:23:16 +02:00
Robin.Mueller	941f46401e	deleted tmtc_core	2021-07-01 14:52:22 +02:00
Robin Müller	2a38b1b16f	Merge pull request 'meier/reactionwheels' (#6 ) from meier/reactionwheels into develop Reviewed-on: #6	2021-07-01 14:50:41 +02:00
Jakob.Meier	fe1bed900a	added mode commanding for radiation sensor	2021-07-01 11:52:25 +02:00
Jakob.Meier	7a15062efe	fixed merge conflict in object ids	2021-06-30 15:12:10 +02:00
Jakob.Meier	953f02e895	tmtccmd udpate	2021-06-30 15:10:57 +02:00
Jakob.Meier	c226491b6c	Merge remote-tracking branch 'origin' into meier/reactionwheels	2021-06-30 15:09:17 +02:00
Jakob.Meier	da2968a512	reaction wheel get telemetry	2021-06-30 15:08:43 +02:00
Robin Mueller	96e9f26fd0	added linter	2021-06-30 11:18:57 +02:00
Robin Mueller	011fea37a0	tmtccmd update	2021-06-30 11:17:57 +02:00
Jakob.Meier	78b6830782	rw4 increased timout	2021-06-29 17:28:04 +02:00
Jakob.Meier	09cab1941f	modified run configs	2021-06-29 16:10:03 +02:00
Martin Zietz	a8ea01bb2f	added run configs for reaction wheels	2021-06-29 09:51:54 +02:00
Robin.Mueller	9d98eb6b60	renaming logging functions	2021-06-28 19:06:09 +02:00
Robin.Mueller	8048c50c22	tmtccmd update	2021-06-28 18:55:14 +02:00
Robin.Mueller	98deb8444f	updated gitignore	2021-06-28 17:49:13 +02:00
Martin Zietz	10ea97ff0b	add init command	2021-06-28 14:08:04 +02:00
Martin Zietz	19b76d961c	rw test fixes	2021-06-25 15:25:22 +02:00
Jakob.Meier	899cd942ce	reaction wheel commands	2021-06-25 12:16:35 +02:00
Jakob.Meier	3d26373726	reaction wheel set speed command	2021-06-25 12:07:16 +02:00
Jakob.Meier	36582621f2	merge	2021-06-24 17:39:23 +02:00
Robin.Mueller	2a9862489d	updated object ids again	2021-06-24 16:49:19 +02:00
Robin.Mueller	8a66b2a721	updated TMTC IDs	2021-06-24 16:42:58 +02:00
Robin.Mueller	f4e5bc1956	updated object IDS	2021-06-24 16:34:51 +02:00
Robin Mueller	5be05c2a92	tmtccmd update	2021-06-21 18:40:05 +02:00
Robin Müller	0eb6736692	Merge pull request 'Update to v1.6.1' (#5 ) from develop into master Reviewed-on: eive/eive_tmtc#5	2021-06-21 17:41:58 +02:00
Robin Müller	20a44b4b67	Merge branch 'master' into develop	2021-06-21 17:41:46 +02:00
Robin Mueller	3927377e94	bumped revision	2021-06-21 17:36:37 +02:00
Robin Mueller	aaba7d5857	small fix	2021-06-21 17:33:22 +02:00
Robin Mueller	d241101d88	updated tmtc	2021-06-21 17:30:37 +02:00
Robin Mueller	0b9bbf6212	tmtccmd update	2021-06-21 17:21:18 +02:00
Robin Mueller	01b5ae8252	Merge branch 'mueller/master' into develop	2021-06-21 17:18:27 +02:00
Robin Mueller	8fc67c2665	tmtccmd update	2021-06-21 16:46:31 +02:00
Robin.Mueller	4daddf7255	deleted tmtc_core folder	2021-06-15 17:12:05 +02:00
Jakob.Meier	805470df6d	commit tmtccmd	2021-06-15 15:39:14 +02:00
Jakob.Meier	0e317a435a	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop	2021-06-15 15:23:57 +02:00
Jakob.Meier	e4eed4602d	imtq tests	2021-06-15 15:23:27 +02:00
Robin Mueller	6debacd946	tmtccmd update	2021-06-12 15:08:41 +02:00
Robin Mueller	24fbb26ac0	bumped version	2021-06-12 13:55:12 +02:00
Robin Mueller	208724f0a9	updated README	2021-06-12 13:54:08 +02:00
Jakob.Meier	fe1e6a2877	Merge branch 'mueller/master' into meier/imtq	2021-06-12 13:50:26 +02:00
Jakob.Meier	d413ec6d08	added imtq x axis self test	2021-06-12 13:49:25 +02:00
Robin Mueller	fc87e36c2e	this should fix srv3 issues	2021-06-12 13:48:31 +02:00
Jakob.Meier	58c20e31cc	fixed merge conflicts	2021-06-11 13:51:56 +02:00
Jakob.Meier	06750809cb	ploc tests	2021-04-27 17:38:52 +02:00
Jakob.Meier	e23bc11608	fixed merge conflicts	2021-04-26 15:01:22 +02:00
Jakob.Meier	bc77e6ae76	Merge branch 'develop' into meier/imtq	2021-04-26 14:57:59 +02:00
Jakob.Meier	fa58c8e2c3	Merge branch 'develop' into meier/plocHandler	2021-04-26 14:57:41 +02:00
Jakob.Meier	e3342cf474	imtq service 8 reply, read command dipole	2021-04-26 14:56:51 +02:00
Jakob.Meier	4d2b7a6150	get commanded dipole service 8 hook wip	2021-04-25 17:46:53 +02:00
Jakob.Meier	79e897b035	ploc tc mem write and tc mem read test	2021-04-24 13:27:57 +02:00
Martin Zietz	3e466f06ef	turning on imqt channel	2021-04-18 18:52:47 +02:00
Martin Zietz	934b79a2f1	Merge branch 'develop' into meier/imtq	2021-04-18 16:36:53 +02:00
Martin Zietz	5fe23be649	Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop	2021-04-18 16:35:49 +02:00
Martin Zietz	85f5bf2e6e	pdu channel definitions	2021-04-18 16:35:18 +02:00
Jakob.Meier	7310513805	Merge branch 'develop' into meier/plocHandler	2021-04-11 11:09:22 +02:00
Jakob.Meier	aa52ed79ea	plocHandler test wip	2021-04-11 11:08:52 +02:00
Jakob.Meier	f40b70f66e	imqt handler test	2021-03-26 13:56:02 +01:00
Martin Zietz	80ee42089e	imtq wip	2021-03-25 17:53:05 +01:00