prep v2.11.0

Reviewed-on: #130

.gitignore

@@ -9,3 +9,21 @@ log
 /scex_conf.json
 /tmtc_conf.json
 /seqcnt*.txt
+
+# Distribution / packaging
+/.Python
+/build/
+/develop-eggs/
+/downloads/
+/eggs/
+/.eggs/
+/parts/
+/sdist/
+/var/
+/wheels/
+/pip-wheel-metadata/
+/share/python-wheels/
+/*.egg-info/
+/.installed.cfg
+/*.egg
+/MANIFEST

.gitmodules

@@ -1,7 +0,0 @@
-[submodule "tmtccmd"]
-	path = deps/tmtccmd
-	url = https://github.com/robamu-org/tmtccmd.git
-
-[submodule "spacepackets"]
-	path = deps/spacepackets
-	url = https://github.com/robamu-org/py-spacepackets.git

.run/ACU.run.xml

@@ -21,4 +21,26 @@
     <option name="INPUT_FILE" value="" />
     <method v="2" />
   </configuration>
+  <configuration default="false" name="ACU" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+    <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$/tmtcc.py" />
+    <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" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
 </component>

.run/CFDP Test File Small No Closure.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CFDP Test File Small" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+  <configuration default="false" name="CFDP Test File Small No Closure" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
     <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$/tmtcc.py" />
-    <option name="PARAMETERS" value="cfdp filetest/cfdp_test.txt /tmp/cfdp_test.txt -d 0.2" />
+    <option name="PARAMETERS" value="cfdp filetest/cfdp_test.txt /tmp/cfdp_test.txt --no-closure -d 0.2" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

.run/IMTQ Dipole.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Test UDP" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Dipole" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <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$/tmtcc.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s imtq -l -d 4" />
+    <option name="PARAMETERS" value="-s imtq -o set_dipole -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />

.run/IMTQ_Get_Commanded_Dipole.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Get Commanded Dipole" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Get Commanded Dipole" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/IMTQ_Neg_X_Test.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Neg X Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Neg X Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/IMTQ_Neg_Y_Test.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Neg Y Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Neg Y Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/IMTQ_Neg_Z_Test.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Neg Z Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Neg Z Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/IMTQ_Pos_X_Test.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Pos X Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Pos X Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/IMTQ_Pos_Y_Test.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Pos Y Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Pos Y Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/IMTQ_Pos_Z_Test.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="IMTQ Pos Z Test" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="IMTQ Pos Z Test" type="PythonConfigurationType" factoryName="Python" folderName="IMTQ">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/P60_Dock_Commanding.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="P60 Dock Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+  <configuration default="false" name="P60 Dock" type="PythonConfigurationType" factoryName="Python" folderName="Power">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/PDU1.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU1 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+  <configuration default="false" name="PDU1" type="PythonConfigurationType" factoryName="Python" folderName="Power">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/PDU2.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PDU2 Commanding" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+  <configuration default="false" name="PDU2" type="PythonConfigurationType" factoryName="Python" folderName="Power">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/PLOC MPSoC with Listener.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC MPSoC with Listener" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s ploc_mpsoc -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>

.run/PLOC SUPV With Listener.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV With Listener" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s ploc_supv -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>

.run/RW All Off.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW All Off" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s rw_ass -o speed_off -d 0.1 -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>

.run/RW All On.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW All On" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s rw_ass -o speed_up -d 0.1 -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>

.run/RW1.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PLOC MPSoC" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+  <configuration default="false" name="RW1" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
     <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$/tmtcc.py" />
-    <option name="PARAMETERS" value="-s ploc_mpsoc -d 6" />
+    <option name="PARAMETERS" value="-s rw_1 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />

.run/RW2.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW2" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s rw_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>

.run/RW3.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW3" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s rw_3 -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>

.run/RW4.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="RW4" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s rw_4 -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>

.run/SA Deployment.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SA Deployment" 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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s sa_depl -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/SCEX All Cells.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SCEX All Cells" type="PythonConfigurationType" factoryName="Python" folderName="SCEX">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s scex -o allcells -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>

.run/Subsystem IDLE.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem IDLE" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o idle -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>

.run/Subsystem OFF.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem OFF" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o safe -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>

.run/Subsystem SAFE.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem SAFE" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o safe -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>

.run/_IMTQ_Command_Dipole.run.xml

@@ -1,24 +0,0 @@
-<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$/tmtcc.py" />
-    <option name="PARAMETERS" value="-c udp -s imtq -o 7 -l -d 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>

.run/tmtc listener.run.xml

@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
-    <option name="PARAMETERS" value="-l" />
+    <option name="PARAMETERS" value="tmtc -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

.run/tmtccli.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="tmtccli" type="PythonConfigurationType" factoryName="Python">
     <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="INTERPRETER_OPTIONS" value="-X dev" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />

CHANGELOG.md

@@ -10,7 +10,135 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
-# [v1.13.0]
+# [v2.11.0] 2023-02-06
+
+## Fixed
+
+- TMP1075 comands: Implement proper prompt for device select.
+- TMP1075 commands: Add OFF, ON, NORMAL, and HK command
+
+# [v2.10.0] 2023-02-03
+
+tmtccmd v4.0.0rc0
+
+## Changed
+
+- Updated ACS SS commands for OBSW ACS SS update.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/130
+
+## Fixed
+
+- Fixed parsing of processed GPS data
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/129
+
+# [v2.9.0] 2023-02-01
+
+## Fixed
+
+- Create proper application root logger now.
+- Generated files update.
+
+## Added
+
+- Dedicated handling for health events.
+- Add time dump command.
+- Time event handling.
+
+# [v2.8.0] 2023-02-01
+
+- Move all device modules inside `pus_tc` and `pus_tm` to `tmtc` module and respective
+  subsystem submodules.
+- Move low level ACS board device modules `gyros.py` and `mgms.py`
+  to the `tmtc.acs` module.
+- Bump tmtccmd to include more pythonic log usage. All related changes.
+  It is recommended to use `logging.getLogger(__name__)` for module level loggers now.
+- Moved TCS components to `tmtc` module
+- Renamed `HEATER_ID` to `HEATER_CONTROLLER_ID`
+
+# [v2.7.0] 2023-01-31
+
+- tmtccmd v4.0.0a3
+
+# [v2.6.0 and v2.6.1] 2023-01-28
+
+## Changed
+
+- Reworked and improved PUS 20 parameter reply handling
+
+## Added
+
+- COM subsystem commanding. Default datarate parameter commanding
+  was moved to the subsystem as well.
+
+# [v2.5.0] 2023-01-26
+
+## Fixed
+
+- Bugfix for CCSDS handler commanding: Pass correct object ID
+- Processed MGM set TM handling fix
+
+## Added
+
+- Added command to request switcher set from PCDU handler.
+- Star Tracker: Add commands to update default datarate.
+
+## Changed
+
+- Move Star Tracker module to `tmtc` folder and add some set IDs. Rename `SetIds` to `SetId`.
+- Move `syrlinks_hk_handler` and `ccsds_handler` module to `tmtc` module.
+  Rename `syrlinks_hk_handler` to `syrlinks_handler`.
+- Move `star_tracker` module into `tmtc.acs`
+- CCSDS Handler: Switch from action commands to mode commands for ON/OFF handling.
+- Star Tracker: Switch from actions commands to mode commands for RX/TX/Modulation commanding.
+
+# [v2.4.0] and [v2.4.1] 2023-01-23
+
+- Pin `tmtccmd` to v4.0.0a2
+- Unify and move Syrlinks module, some bugfixes
+- Add/Re-enable handling for SUS temp packets
+- Update SA deployment commands for OBSW https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/347
+- Extend, fix and improve Syrlinks TMTC handling a bit
+
+# [v2.3.0] and [v2.3.1] 2023-01-18
+
+- Bumped `tmtccmd` version to new alpha release, use some new features
+  and fix the breaking changes
+
+# [v2.2.0] 2023-01-16
+
+- A lot of consistency renaming: Single name for enums which are not flag enums, 
+  e.g `ActionId` instead of `ActionIds`
+- Updated required Python version to 3.10
+
+# [v2.1.1] 2023-01-12
+
+- Typo in `setup.cfg`, missing version prefix `v` for `tmtccmd`
+
+# [v2.1.0] 2023-01-12
+
+- Various refactoring and tweaks to allow easier integration into `eive-mib`.
+- Handle ACS CTRL HK sets.
+- Add reboot commands for PCDU modules.
+- Extend MPSoC commands.
+- Starting from now, more regular releases, especially on breaking changes. This is because
+  this is now also a library with dependents.
+
+# [v2.0.2] 2022-01-12
+
+- Bumped dependencies, small fix to allow working script if PyQt is not installed
+
+# [v2.0.1] 2022-11-29
+
+- Minor bugfix
+
+# [v2.0.0] 2022-11-29
+
+- The tmtc program is installable now, which allow re-using it in other Python applications
+- Bugfixes for IMTQ TM handling
+- Updates S/A deployment command
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/118
+
+# [v1.13.0] 2022-10-13
 
 - CFDP integration
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/113
@@ -23,7 +151,7 @@ list yields a list of all related PRs for each release.
 - Update PLOC supervisor commands
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/107
 
-# [v1.12.0] 05.07.2022
+# [v1.12.0] 2022-07-05
 
 - Update GPS HK Parsing
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/86

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include eive_tmtc/config *.csv

README.md

@@ -19,13 +19,13 @@ were installed properly.
 Run CLI mode
 
 ```sh
-./tmtccli.py
+./tmtcc.py
 ```
 
 Run GUI mode
 
 ```sh
-./tmtcgui.py
+./tmtcc.py -g
 ```
 
 # <a id="venv"></a> Set up virtual environment
@@ -68,18 +68,10 @@ Assuming you are running in a virtual environment:
 1. Install `tmtccmd` for virtual environment. `-e` for interactive installation.
 
    ```sh
-   cd tmtccmd
+   cd deps/tmtccmd
    pip install -e .[gui]
    ```
 
-2. You can also install the `spacepackets` package locally/interactively
-   Normally, it will be installed as a `tmtccmd` dependency.
-
-   ```sh
-   cd spacepackets
-   pip install -e .
-   ```
-
 Alternatively you can also install the packages from PyPI completely, but the risk of
 incompatibilities will be high there
 

config/__init__.py

@@ -1,6 +0,0 @@
-SW_NAME = "eive"
-VERSION_MAJOR = 1
-VERSION_MINOR = 13
-VERSION_SUBMINOR = 0
-
-__version__ = "1.13.0"

config/globals_config.py

@@ -1,33 +0,0 @@
-"""
-@brief      This file transfers definitions of global variables to the user.
-@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
-            it to your needs.
-"""
-
-import enum
-import argparse
-
-
-# All globals can be added here and will be part of a globals dictionary.
-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
-from tmtccmd.logging import get_console_logger
-
-LOGGER = get_console_logger()
-
-
-class CustomGlobalIds(enum.Enum):
-    from enum import auto
-
-    pass
-
-
-def set_globals_pre_args_parsing(gui: bool = False):
-    set_default_globals_pre_args_parsing(
-        gui=gui,
-        tc_apid=PUS_APID,
-        tm_apid=PUS_APID,
-        com_if_id=CoreComInterfaces.TCPIP_UDP.value,
-    )

deps/.gitignore

@@ -0,0 +1,4 @@
+/*
+!/*.sh
+!/.gitignore
+

deps/install_spacepackets.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+git clone https://github.com/us-irs/spacepackets-py.git

deps/install_tmtccmd.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+git clone https://github.com/robamu-org/tmtccmd.git

eive_tmtc/__init__.py

@@ -0,0 +1,14 @@
+import logging
+from pathlib import Path
+
+SW_NAME = "eive-tmtc"
+VERSION_MAJOR = 2
+VERSION_MINOR = 11
+VERSION_REVISION = 0
+
+__version__ = "2.11.0"
+
+EIVE_TMTC_ROOT = Path(__file__).parent
+PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
+
+APP_LOGGER = logging.getLogger(__name__)

eive_tmtc/config/definitions.py

@@ -6,11 +6,20 @@
 
 import enum
 
+from spacepackets import PacketType
+from spacepackets.ccsds import PacketId
 from spacepackets.util import UnsignedByteField
+from pathlib import Path
+
 
 PUS_APID = 0x65
-SPACE_PACKET_IDS = (0x08 << 8 | PUS_APID,)
 CFDP_APID = 0x66
+PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID)
+CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID)
+SPACE_PACKET_IDS = (
+    PUS_PACKET_ID,
+    CFDP_PACKET_ID,
+)
 
 CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)
 CFDP_REMOTE_ENTITY_ID = UnsignedByteField(byte_len=2, val=CFDP_APID)
@@ -20,15 +29,15 @@ class CustomServiceList(str, enum.Enum):
     value: str
 
     TEST_DEVICE = "test"
+    HEALTH = "health"
     P60DOCK = "p60dock"
     PDU1 = "pdu1"
     PDU2 = "pdu2"
     POWER = "power"
     ACU = "acu"
     ACS = "acs"
+    COM_SS = "com"
     BPX_BATTERY = "bpx"
-    TMP1075_1 = "tmp1075_1"
-    TMP1075_2 = "tmp1075_2"
     HEATER = "heater"
     IMTQ = "imtq"
     PLOC_SUPV = "ploc_supv"
@@ -42,7 +51,7 @@ class CustomServiceList(str, enum.Enum):
     REACTION_WHEEL_4 = "rw_4"
     RW_ASSEMBLY = "rw_ass"
     RAD_SENSOR = "rad_sensor"
-    GPS_CTRL = "gnss-ctrl"
+    GPS_CTRL = "gps"
     PLOC_MEMORY_DUMPER = "ploc_memory_dumper"
     CORE = "core"
     STAR_TRACKER = "star_tracker"
@@ -51,13 +60,16 @@ class CustomServiceList(str, enum.Enum):
     STR_IMG_HELPER = "str_img_helper"
     SYRLINKS = "syrlinks"
     ACS_CTRL = "acs_ctrl"
-    ACS_ASS = "acs_ass"
-    SUS_ASS = "sus_ass"
+    ACS_SS = "acs_subsystem"
+    PL_SS = "pl_subsystem"
+    ACS_BRD_ASS = "acs_brd_ass"
+    SUS_BRD_ASS = "sus_brd_ass"
     TCS = "tcs"
     TCS_ASS = "tcs_ass"
     TIME = "time"
     PROCEDURE = "proc"
     RTD = "rtd"
+    TMP1075 = "tcs_tmp"
     TVTTESTPROCEDURE = "tvtestproc"
     CONTROLLERS = "controllers"
     SCEX = "scex"

eive_tmtc/config/events.csv

@@ -76,10 +76,16 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 8900;0x22c4;CLOCK_SET;INFO;;fsfw/src/fsfw/pus/Service9TimeManagement.h
-8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8901;0x22c5;CLOCK_DUMP;INFO;;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8902;0x22c6;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h
 9100;0x238c;TC_DELETION_FAILED;MEDIUM;Deletion of a TC from the map failed. P1: First 32 bit of request ID, P2. Last 32 bit of Request ID;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h
 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
+10800;0x2a30;STORE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
+10801;0x2a31;MSG_QUEUE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
+10802;0x2a32;SERIALIZATION_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
+11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;;mission/acsDefs.h
+11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;;mission/acsDefs.h
 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
@@ -92,45 +98,53 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
 11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;;mission/devices/HeaterHandler.h
 11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;;mission/devices/HeaterHandler.h
-11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11500;0x2cec;BURN_PHASE_START;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/devices/SolarArrayDeploymentHandler.h
+11501;0x2ced;BURN_PHASE_DONE;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/devices/SolarArrayDeploymentHandler.h
+11502;0x2cee;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11503;0x2cef;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11504;0x2cf0;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11505;0x2cf1;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11506;0x2cf2;DEPL_SA1_GPIO_SWTICH_OFF_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11507;0x2cf3;DEPL_SA2_GPIO_SWTICH_OFF_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11508;0x2cf4;AUTONOMOUS_DEPLOYMENT_COMPLETED;INFO;;mission/devices/SolarArrayDeploymentHandler.h
 11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
 11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
 11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
 11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
 11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h
 11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h
-11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
+11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/ImtqHandler.h
+11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/ImtqHandler.h
 11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/devicedefinitions/RwDefinitions.h
 11802;0x2e1a;RESET_OCCURED;LOW;;mission/devices/devicedefinitions/RwDefinitions.h
 11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
 11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
 12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
-12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
-12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h
-12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_MPSOC_SHUWDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h
+12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/devices/ploc/PlocSupervisorHandler.h
+12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;;linux/devices/ploc/PlocSupervisorHandler.h
+12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
+12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h
+12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
+12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/devices/ploc/PlocSupervisorHandler.h
+12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h
 12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/fs/SdCardManager.h
 12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/fs/SdCardManager.h
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h
 12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
 12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
-12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
-12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
-12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
-12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
-12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/obc/PdecHandler.h
-12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/obc/PdecHandler.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/ipcore/PdecHandler.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/ipcore/PdecHandler.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/ipcore/PdecHandler.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/ipcore/PdecHandler.h
+12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/ipcore/PdecHandler.h
+12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/ipcore/PdecHandler.h
+12407;0x3077;POLL_ERROR_PDEC;MEDIUM;;linux/ipcore/PdecHandler.h
 12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
 12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
 12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
@@ -174,48 +188,49 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
 12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
 12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
-12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
-12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
-12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
-12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
-13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.h
+12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/objects/AcsBoardAssembly.h
+12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/objects/AcsBoardAssembly.h
+12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/objects/AcsBoardAssembly.h
+12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/objects/AcsBoardAssembly.h
+12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/objects/SusAssembly.h
+12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/objects/SusAssembly.h
+12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/objects/SusAssembly.h
+12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/objects/SusAssembly.h
+13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/objects/TcsBoardAssembly.h
 13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
 13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
 13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
 13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
-13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvHelper.h
-13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvHelper.h
-13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/devices/ploc/PlocSupvHelper.h
-13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/devices/ploc/PlocSupvHelper.h
-13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvHelper.h
-13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvHelper.h
-13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvHelper.h
-13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvHelper.h
-13608;0x3528;SUPV_MEM_CHECK_OK;INFO;;linux/devices/ploc/PlocSupvHelper.h
-13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;;linux/devices/ploc/PlocSupvHelper.h
-13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvHelper.h
-13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvHelper.h
-13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvHelper.h
-13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvHelper.h
-13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvHelper.h
-13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvHelper.h
-13700;0x3584;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
-13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
-13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
-13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
+13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvUartMan.h
+13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvUartMan.h
+13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/devices/ploc/PlocSupvUartMan.h
+13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/devices/ploc/PlocSupvUartMan.h
+13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvUartMan.h
+13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvUartMan.h
+13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvUartMan.h
+13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvUartMan.h
+13608;0x3528;SUPV_MEM_CHECK_OK;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvUartMan.h
+13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvUartMan.h
+13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvUartMan.h
+13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvUartMan.h
+13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvUartMan.h
+13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h
+13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvUartMan.h
+13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvUartMan.h
+13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h
+13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13632;0x3540;HDLC_CRC_ERROR;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13700;0x3584;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/SyrlinksDefinitions.h
+13701;0x3585;TX_ON;INFO;Transmitter is on now. P1: Submode, P2: Current default datarate.;mission/devices/devicedefinitions/SyrlinksDefinitions.h
+13702;0x3586;TX_OFF;INFO;Transmitter is off now.;mission/devices/devicedefinitions/SyrlinksDefinitions.h
 13800;0x35e8;MISSING_PACKET;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
 13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
 13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;;mission/devices/devicedefinitions/ScexDefinitions.h
@@ -224,3 +239,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
 13904;0x3650;WRITE_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
 13905;0x3651;READ_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
+14000;0x36b0;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
+14001;0x36b1;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+14002;0x36b2;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
+14003;0x36b3;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
+14004;0x36b4;NO_SD_CARD_ACTIVE;HIGH;No SD card was active. Core controller will attempt to re-initialize a SD card.;bsp_q7s/core/CoreController.h

eive_tmtc/config/events.py

@@ -0,0 +1,22 @@
+import logging
+import os
+
+from eive_tmtc import EIVE_TMTC_ROOT
+from tmtccmd.fsfw import parse_fsfw_events_csv
+from tmtccmd.pus.s5_event import EventDictT
+
+DEFAULT_EVENTS_CSV_PATH = EIVE_TMTC_ROOT / "config/events.csv"
+__EVENT_DICT = None
+
+
+def get_event_dict() -> EventDictT:
+    global __EVENT_DICT
+    if __EVENT_DICT is None:
+        if os.path.exists(DEFAULT_EVENTS_CSV_PATH):
+            __EVENT_DICT = parse_fsfw_events_csv(DEFAULT_EVENTS_CSV_PATH)
+        else:
+            logging.getLogger(__name__).warning(
+                f"No Event CSV file found at {DEFAULT_EVENTS_CSV_PATH}"
+            )
+            __EVENT_DICT = dict()
+    return __EVENT_DICT

eive_tmtc/config/hook.py

@@ -1,16 +1,16 @@
 from typing import Optional
 
-from config.definitions import SPACE_PACKET_IDS
-from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend
-from tmtccmd.com_if import ComInterface
+from eive_tmtc.config.definitions import SPACE_PACKET_IDS
+from tmtccmd import HookBase, CcsdsTmtcBackend
+from tmtccmd.com import ComInterface
 from tmtccmd.config import TmtcDefinitionWrapper
 
-from config.retvals import get_retval_dict
-from pus_tc.cmd_definitions import get_eive_service_op_code_dict
+from eive_tmtc.config.retvals import get_retval_dict
+from eive_tmtc.pus_tc.cmd_definitions import get_eive_service_op_code_dict
 from tmtccmd.util import ObjectIdDictT, RetvalDictT
 
 
-class EiveHookObject(TmTcCfgHookBase):
+class EiveHookObject(HookBase):
     def __init__(self, json_cfg_path: str):
         super().__init__(json_cfg_path=json_cfg_path)
 
@@ -18,7 +18,7 @@ class EiveHookObject(TmTcCfgHookBase):
         return get_eive_service_op_code_dict()
 
     def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]:
-        from tmtccmd.config.com_if import (
+        from tmtccmd.config.com import (
             create_com_interface_default,
             create_com_interface_cfg_default,
         )
@@ -31,12 +31,12 @@ class EiveHookObject(TmTcCfgHookBase):
         return create_com_interface_default(cfg)
 
     def perform_mode_operation(self, tmtc_backend: CcsdsTmtcBackend, mode: int):
-        from config.custom_mode_op import custom_mode_operation
+        from eive_tmtc.config.custom_mode_op import custom_mode_operation
 
         custom_mode_operation(tmtc_backend, mode)
 
     def get_object_ids(self) -> ObjectIdDictT:
-        from config.object_ids import get_object_ids
+        from eive_tmtc.config.object_ids import get_object_ids
 
         return get_object_ids()
 

eive_tmtc/config/object_ids.py

@@ -3,14 +3,16 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
+import logging
 import os.path
-from tmtccmd.util.obj_id import ObjectIdDictT
+from typing import Dict
+
+from eive_tmtc import EIVE_TMTC_ROOT
+from tmtccmd.util.obj_id import ObjectIdDictT, ObjectIdU32
 from tmtccmd.fsfw import parse_fsfw_objects_csv
-from tmtccmd.logging import get_console_logger
 
 
-LOGGER = get_console_logger()
-DEFAULT_OBJECTS_CSV_PATH = "config/objects.csv"
+DEFAULT_OBJECTS_CSV_PATH = EIVE_TMTC_ROOT / "config/objects.csv"
 __OBJECT_ID_DICT = None
 
 
@@ -28,9 +30,11 @@ SCEX_HANDLER_ID = bytes([0x44, 0x33, 0x00, 0x32])
 
 # Thermal Object IDs
 THERMAL_CONTROLLER_ID = bytes([0x43, 0x40, 0x00, 0x01])
-HEATER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
-TMP_1075_1_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x04])
-TMP_1075_2_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x05])
+HEATER_CONTROLLER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
+TMP1075_HANDLER_TCS_BRD_0_ID = bytes([0x44, 0x42, 0x00, 0x04])
+TMP1075_HANDLER_TCS_BRD_1_ID = bytes([0x44, 0x42, 0x00, 0x05])
+TMP1075_HANDLER_PLPCDU_0_ID = bytes([0x44, 0x42, 0x00, 0x06])
+TMP1075_HANDLER_IF_BRD_ID = bytes([0x44, 0x42, 0x00, 0x08])
 
 # Communication Object IDs
 SYRLINKS_HANDLER_ID = bytes([0x44, 0x53, 0x00, 0xA3])
@@ -122,6 +126,11 @@ SUS_5_N_LOC_XFYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x37])
 SUS_11_R_LOC_XBYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x43])
 
 # System and Assembly Objects
+ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
+PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
+TCS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x03])
+COM_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x04])
+
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
 SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
 TCS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x03])
@@ -133,10 +142,15 @@ ACS_CONTROLLER = bytes([0x43, 0x00, 0x00, 0x02])
 CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
 
 
-def get_object_ids() -> ObjectIdDictT:
+ObjectIdDict = Dict[bytes, ObjectIdU32]
+
+
+def get_object_ids() -> ObjectIdDict:
     global __OBJECT_ID_DICT
     if not os.path.exists(DEFAULT_OBJECTS_CSV_PATH):
-        LOGGER.warning(f"No Objects CSV file found at {DEFAULT_OBJECTS_CSV_PATH}")
+        logging.getLogger(__name__).warning(
+            f"No Objects CSV file found at {DEFAULT_OBJECTS_CSV_PATH}"
+        )
     if __OBJECT_ID_DICT is None:
         if os.path.exists(DEFAULT_OBJECTS_CSV_PATH):
             __OBJECT_ID_DICT = parse_fsfw_objects_csv(csv_file=DEFAULT_OBJECTS_CSV_PATH)

eive_tmtc/config/objects.csv

@@ -50,8 +50,12 @@
 0x44330032;SCEX
 0x444100A2;SOLAR_ARRAY_DEPL_HANDLER
 0x444100A4;HEATER_HANDLER
-0x44420004;TMP1075_HANDLER_1
-0x44420005;TMP1075_HANDLER_2
+0x44420004;TMP1075_HANDLER_TCS_0
+0x44420005;TMP1075_HANDLER_TCS_1
+0x44420006;TMP1075_HANDLER_PLPCDU_0
+0x44420007;TMP1075_HANDLER_PLPCDU_1
+0x44420008;TMP1075_HANDLER_IF_BOARD
+0x44420009;TMP1075_HANDLER_OBC_IF_BOARD
 0x44420016;RTD_0_IC3_PLOC_HEATSPREADER
 0x44420017;RTD_1_IC4_PLOC_MISSIONBOARD
 0x44420018;RTD_2_IC5_4K_CAMERA
@@ -68,7 +72,7 @@
 0x44420029;RTD_13_IC16_PLPCDU_HEATSPREADER
 0x44420030;RTD_14_IC17_TCS_BOARD
 0x44420031;RTD_15_IC18_IMTQ
-0x445300A3;SYRLINKS_HK_HANDLER
+0x445300A3;SYRLINKS_HANDLER
 0x49000000;ARDUINO_COM_IF
 0x49010005;GPIO_IF
 0x49010006;SCEX_UART_READER
@@ -80,8 +84,10 @@
 0x49050001;CSP_COM_IF
 0x50000100;CCSDS_PACKET_DISTRIBUTOR
 0x50000200;PUS_PACKET_DISTRIBUTOR
-0x50000300;TMTC_BRIDGE
-0x50000400;TMTC_POLLING_TASK
+0x50000300;TCP_TMTC_SERVER
+0x50000301;UDP_TMTC_SERVER
+0x50000400;TCP_TMTC_POLLING_TASK
+0x50000401;UDP_TMTC_POLLING_TASK
 0x50000500;FILE_SYSTEM_HANDLER
 0x50000550;SDC_MANAGER
 0x50000600;PTME
@@ -131,8 +137,16 @@
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS
 0x73000004;RW_ASS
-0x73000005;CFDP_HANDLER
-0x73000006;CFDP_DISTRIBUTOR
+0x73000006;CAM_SWITCHER
 0x73000100;TM_FUNNEL
+0x73000101;PUS_TM_FUNNEL
+0x73000102;CFDP_TM_FUNNEL
+0x73000205;CFDP_HANDLER
+0x73000206;CFDP_DISTRIBUTOR
+0x73010000;EIVE_SYSTEM
+0x73010001;ACS_SUBSYSTEM
+0x73010002;PL_SUBSYSTEM
+0x73010003;TCS_SUBSYSTEM
+0x73010004;COM_SUBSYSTEM
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT

eive_tmtc/config/returnvalues.csv

@@ -2,6 +2,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
+0x6300;NVMB_Busy;;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.h
 0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
 0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
 0x66a0;SADPL_CommandNotSupported;;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
@@ -9,6 +10,14 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x66a2;SADPL_MainSwitchTimeoutFailure;;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a3;SADPL_SwitchingDeplSa1Failed;;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a4;SADPL_SwitchingDeplSa2Failed;;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x52b0;RWHA_SpiWriteFailure;;176;RW_HANDLER;mission/devices/RwHandler.h
 0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/RwHandler.h
 0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/RwHandler.h
@@ -21,35 +30,30 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x52a2;RWHA_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;RW_HANDLER;mission/devices/RwHandler.h
 0x52a3;RWHA_ExecutionFailed;Command execution failed;163;RW_HANDLER;mission/devices/RwHandler.h
 0x52a4;RWHA_CrcError;Reaction wheel reply has invalid crc;164;RW_HANDLER;mission/devices/RwHandler.h
+0x50a0;SYRLINKS_CrcFailure;;160;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a1;SYRLINKS_UartFraminOrParityErrorAck;;161;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a2;SYRLINKS_BadCharacterAck;;162;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a3;SYRLINKS_BadParameterValueAck;;163;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a4;SYRLINKS_BadEndOfFrameAck;;164;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a5;SYRLINKS_UnknownCommandIdAck;;165;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a6;SYRLINKS_BadCrcAck;;166;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a7;SYRLINKS_ReplyWrongSize;;167;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a8;SYRLINKS_MissingStartFrameCharacter;;168;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
 0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d03;GOMS_InvalidParamSize;;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d04;GOMS_InvalidPayloadSize;;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d05;GOMS_UnknownReplyId;;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x50a0;SYRLINKS_CrcFailure;;160;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a1;SYRLINKS_UartFraminOrParityErrorAck;;161;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a2;SYRLINKS_BadCharacterAck;;162;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a3;SYRLINKS_BadParameterValueAck;;163;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a4;SYRLINKS_BadEndOfFrameAck;;164;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a5;SYRLINKS_UnknownCommandIdAck;;165;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a6;SYRLINKS_BadCrcAck;;166;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a7;SYRLINKS_ReplyWrongSize;;167;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a8;SYRLINKS_MissingStartFrameCharacter;;168;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
 0x4fa1;HEATER_CommandNotSupported;;161;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x4fa2;HEATER_InitFailed;;162;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x4fa3;HEATER_InvalidSwitchNr;;163;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CCSDSHandler.h
+0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
+0x6001;CCSDS_KalmanNoGyrMeas;;1;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6002;CCSDS_KalmanNoModel;;2;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6003;CCSDS_KalmanInversionFailed;;3;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
 0x4500;HSPI_OpeningFileFailed;;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4501;HSPI_FullDuplexTransferFailed;;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4502;HSPI_HalfDuplexTransferFailed;;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
@@ -60,9 +64,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
+0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
 0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4401;UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
@@ -101,10 +105,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x38a6;SGP4_SatelliteHasDecayed;;166;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
 0x38b1;SGP4_TleTooOld;;177;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
 0x38b2;SGP4_TleNotInitialized;;178;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x1101;AL_Full;;1;ARRAY_LIST;fsfw/src/fsfw/container/ArrayList.h
-0x1501;FM_KeyAlreadyExists;;1;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1502;FM_MapFull;;2;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1503;FM_KeyDoesNotExist;;3;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
 0x1801;FF_Full;;1;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
 0x1802;FF_Empty;;2;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
 0x1601;FMM_MapFull;;1;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
@@ -325,6 +325,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x360a;CFDP_InvalidPduFormat;;10;CFDP;fsfw/src/fsfw/cfdp/definitions.h
 0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4301;FILS_GenericDirError;;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4302;FILS_FilesystemInactive;;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4303;FILS_GenericRenameError;;3;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4304;FILS_IsBusy;;4;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4305;FILS_InvalidParameters;;5;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
@@ -372,6 +373,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4202;PUS11_InvalidTimeWindow;;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4203;PUS11_TimeshiftingNotPossible;;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x4204;PUS11_InvalidRelativeTime;;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4205;PUS11_ContainedTcTooSmall;;5;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4206;PUS11_ContainedTcCrcMissmatch;;6;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h

eive_tmtc/config/retvals.py

@@ -1,10 +1,11 @@
 import os
-from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
-from tmtccmd.logging import get_console_logger
+import logging
 
-DEFAULT_RETVAL_CSV_NAME = "config/returnvalues.csv"
+from eive_tmtc import EIVE_TMTC_ROOT
+from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
+
+DEFAULT_RETVAL_CSV_NAME = EIVE_TMTC_ROOT / "config/returnvalues.csv"
 __RETVAL_DICT = None
-LOGGER = get_console_logger()
 
 
 def get_retval_dict() -> RetvalDictT:
@@ -15,7 +16,7 @@ def get_retval_dict() -> RetvalDictT:
                 csv_file=DEFAULT_RETVAL_CSV_NAME
             )
         else:
-            LOGGER.warning(
+            logging.getLogger(__name__).warning(
                 f"No Return Value CSV file found at {DEFAULT_RETVAL_CSV_NAME}"
             )
             __RETVAL_DICT = dict()

eive_tmtc/gomspace/gomspace_common.py

@@ -12,11 +12,11 @@ from typing import Union
 
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
 
-class GomspaceDeviceActionIds(enum.IntEnum):
+class GomspaceDeviceActionId(enum.IntEnum):
     PING = 1
     REBOOT = 4
     PARAM_GET = 0
@@ -31,46 +31,6 @@ class GomspaceDeviceActionIds(enum.IntEnum):
     PRINT_LATCHUPS = 33
 
 
-class GomspaceOpCodes:
-    # Request HK
-    REQUEST_CORE_HK_ONCE = ["hk_core"]
-    REQUEST_AUX_HK_ONCE = ["hk_aux"]
-    PRINT_SWITCH_V_I = ["print_switch_vi"]
-    PRINT_LATCHUPS = ["print_latchups"]
-    GET_PARAM = ["get_param"]
-    SET_INTEGER_PARAM = ["set_int_param"]
-    SAVE_TABLE = ["save_table"]
-    RESET_GND_WATCHDOG = ["reset_gnd_wdt"]
-    SAVE_TABLE_DEFAULT = ["save_table_default"]
-    LOAD_TABLE = ["load_table"]
-    REQUEST_CONFIG_TABLE = ["cfg_table"]
-
-
-class GsInfo:
-    REQUEST_CORE_HK_ONCE = "Requesting Core HK once"
-    REQUEST_AUX_HK_ONCE = "Requesting Aux HK once"
-    PRINT_SWITCH_V_I = "Print Switch V I Info"
-    PRINT_LATCHUPS = "Print latchups"
-    GET_PARAMETER = "Get parameter"
-    SET_PARAMETER = "Set  integer parameter"
-    REQUEST_CONFIG_TABLE = "Request Config Table"
-    RESET_GND_WATCHDOG = "Reset GND watchdog"
-    SAVE_TABLE = "Save table non-volatile (file)"
-    SAVE_TABLE_DEFAULT = "Save table non-volatile (default)"
-    LOAD_TABLE = "Load Table"
-
-
-class SetIds:
-    PDU_1_CORE = 1
-    PDU_1_AUX = 2
-    PDU_2_CORE = 3
-    PDU_2_AUX = 4
-    P60_CORE = 5
-    P60_AUX = 6
-    ACU_CORE = 7
-    ACU_AUX = 8
-
-
 class ParamTypes(enum.Enum):
     U8 = 0
     U16 = 1
@@ -103,8 +63,8 @@ class Channel:
 
 
 def pack_request_config_command(object_id: bytes) -> PusTelecommand:
-    return make_fsfw_action_cmd(
-        object_id=object_id, action_id=GomspaceDeviceActionIds.REQUEST_CONFIG_TABLE
+    return create_action_cmd(
+        object_id=object_id, action_id=GomspaceDeviceActionId.REQUEST_CONFIG_TABLE
     )
 
 
@@ -128,9 +88,9 @@ def pack_get_param_command(
     else:
         app_data += memory_address
     app_data += struct.pack("!B", parameter_size)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id,
-        action_id=GomspaceDeviceActionIds.PARAM_GET,
+        action_id=GomspaceDeviceActionId.PARAM_GET,
         user_data=app_data,
     )
 
@@ -138,12 +98,12 @@ def pack_get_param_command(
 def pack_set_float_param_command(
     object_id: bytes, memory_address: bytes, parameter: float
 ) -> PusTelecommand:
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(4)
     app_data += struct.pack("!f", parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -151,12 +111,12 @@ def pack_set_float_param_command(
 def pack_set_u8_param_command(
     object_id: bytes, memory_address: bytes, parameter: int
 ) -> PusTelecommand:
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(1)
     app_data.append(parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -164,12 +124,12 @@ def pack_set_u8_param_command(
 def pack_set_i8_param_command(
     object_id: bytes, memory_address: bytes, parameter: int
 ) -> PusTelecommand:
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(1)
     app_data += struct.pack("!b", parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -177,12 +137,12 @@ def pack_set_i8_param_command(
 def pack_set_u16_param_command(
     object_id: bytes, memory_address: bytes, parameter: int
 ) -> PusTelecommand:
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(2)
     app_data += struct.pack("!H", parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -190,34 +150,34 @@ def pack_set_u16_param_command(
 def pack_set_i16_param_command(
     object_id: bytes, memory_address: bytes, parameter: int
 ) -> PusTelecommand:
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(2)
     app_data += struct.pack("!h", parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
 
 def pack_set_u32_param_command(object_id: bytes, memory_address: bytes, parameter: int):
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(4)
     app_data += struct.pack("!I", parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
 
 def pack_set_i32_param_command(object_id: bytes, memory_address: bytes, parameter: int):
-    action_id = GomspaceDeviceActionIds.PARAM_SET
+    action_id = GomspaceDeviceActionId.PARAM_SET
     app_data = bytearray()
     app_data += memory_address
     app_data.append(4)
     app_data += struct.pack("!i", parameter)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id, action_id=action_id, user_data=app_data
     )
 
@@ -264,9 +224,9 @@ def pack_ping_command(object_id: ObjectIdU32, data: bytearray) -> PusTelecommand
     @note   The ping request sends the specified data to a gompsace device. These
             data are simply copied by the device and then sent back.
     """
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=object_id.as_bytes,
-        action_id=GomspaceDeviceActionIds.PING,
+        action_id=GomspaceDeviceActionId.PING,
         user_data=data,
     )
 
@@ -275,8 +235,8 @@ def pack_gnd_wdt_reset_command(object_id: ObjectIdBase) -> PusTelecommand:
     """ " Function to generate the command to reset the watchdog of a gomspace device.
     @param object_id    Object Id of the gomspace device handler.
     """
-    return make_fsfw_action_cmd(
-        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionIds.WDT_RESET
+    return create_action_cmd(
+        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionId.WDT_RESET
     )
 
 
@@ -284,8 +244,8 @@ def pack_reboot_command(object_id: ObjectIdU32) -> PusTelecommand:
     """Function to generate the command which triggers a reboot of a gomspace device
     @param object_id    The object id of the gomspace device handler.
     """
-    return make_fsfw_action_cmd(
-        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionIds.REBOOT
+    return create_action_cmd(
+        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionId.REBOOT
     )
 
 
@@ -294,6 +254,6 @@ def pack_request_full_hk_table_command(object_id: ObjectIdU32) -> PusTelecommand
         device.
     @param object_id    The object id of the gomspace device handler.
     """
-    return make_fsfw_action_cmd(
-        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionIds.REQUEST_HK_TABLE
+    return create_action_cmd(
+        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionId.REQUEST_HK_TABLE
     )

eive_tmtc/gomspace/gomspace_pdu_definitions.py

@@ -1,4 +1,4 @@
-from gomspace.gomspace_common import TableEntry
+from eive_tmtc.gomspace.gomspace_common import TableEntry
 
 
 class PduConfigTable:

eive_tmtc/pus_tc/cmd_definitions.py

@@ -0,0 +1,116 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry, CoreServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    call_all_definitions_providers,
+)
+from tmtccmd.config.globals import get_default_tmtc_defs
+
+
+def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
+    """Call all registered TMTC definition providers. They were registered using
+    the :py:func:`tmtc_definitions_provider` decorator.
+    """
+    def_wrapper = get_default_tmtc_defs()
+    srv_5 = OpCodeEntry()
+    srv_5.add("0", "Event Test")
+    def_wrapper.add_service(
+        name=CoreServiceList.SERVICE_5.value,
+        info="PUS Service 5 Event",
+        op_code_entry=srv_5,
+    )
+    call_all_definitions_providers(def_wrapper)
+    return def_wrapper
+
+
+@tmtc_definitions_provider
+def add_pdec_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add("0", "PDEC Handler: Print CLCW")
+    oce.add("1", "PDEC Handler: Print PDEC monitor")
+    defs.add_service(CustomServiceList.PDEC_HANDLER.value, "PDEC Handler", oce)
+
+
+@tmtc_definitions_provider
+def add_str_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add("0", "Star Tracker: Mode On, Submode Bootloader")
+    oce.add("1", "Star Tracker: Mode On, Submode Firmware")
+    oce.add("2", "Star Tracker: Mode Normal")
+    oce.add("3", "Star Tracker: Mode Off")
+    oce.add("4", "Star Tracker: Mode Raw")
+    oce.add("5", "Star Tracker: Ping")
+    oce.add("6", "Star Tracker: Switch to bootloader program")
+    oce.add("7", "Star Tracker: Request temperature")
+    oce.add("8", "Star Tracker: Request version")
+    oce.add("9", "Star Tracker: Request interface")
+    oce.add("10", "Star Tracker: Request power")
+    oce.add("11", "Star Tracker: Set subscription parameters")
+    oce.add("12", "Star Tracker: Boot image (requires bootloader mode)")
+    oce.add("13", "Star Tracker: Request time")
+    oce.add("14", "Star Tracker: Request solution")
+    oce.add("15", "Star Tracker: Upload image")
+    oce.add("16", "Star Tracker: Download image")
+    oce.add("17", "Star Tracker: Set limit parameters")
+    oce.add("17", "Star Tracker: Set limit parameters")
+    oce.add("18", "Star Tracker: Set tracking parameters")
+    oce.add("19", "Star Tracker: Set mounting parameters")
+    oce.add("20", "Star Tracker: Set camera parameters")
+    oce.add("22", "Star Tracker: Set centroiding parameters")
+    oce.add("23", "Star Tracker: Set LISA parameters")
+    oce.add("24", "Star Tracker: Set matching parameters")
+    oce.add("25", "Star Tracker: Set validation parameters")
+    oce.add("26", "Star Tracker: Set algo parameters")
+    oce.add("27", "Star Tracker: Take image")
+    oce.add("28", "Star Tracker: Stop str helper")
+    oce.add("30", "Star Tracker: Set name of download image")
+    oce.add("31", "Star Tracker: Request histogram")
+    oce.add("32", "Star Tracker: Request contrast")
+    oce.add("33", "Star Tracker: Set json filename")
+    oce.add("35", "Star Tracker: Flash read")
+    oce.add("36", "Star Tracker: Set flash read filename")
+    oce.add("37", "Star Tracker: Get checksum")
+    oce.add("49", "Star Tracker: Request camera parameter")
+    oce.add("50", "Star Tracker: Request limits")
+    oce.add("51", "Star Tracker: Set image processor parameters")
+    oce.add("52", "Star Tracker: (EGSE only) Load camera ground config")
+    oce.add("53", "Star Tracker: (EGSE only) Load camera flight config")
+    oce.add("54", "Star Tracker: Request log level parameters")
+    oce.add("55", "Star Tracker: Request mounting parameters")
+    oce.add("56", "Star Tracker: Request image processor parameters")
+    oce.add("57", "Star Tracker: Request centroiding parameters")
+    oce.add("58", "Star Tracker: Request lisa parameters")
+    oce.add("59", "Star Tracker: Request matching parameters")
+    oce.add("60", "Star Tracker: Request tracking parameters")
+    oce.add("61", "Star Tracker: Request validation parameters")
+    oce.add("62", "Star Tracker: Request algo parameters")
+    oce.add("63", "Star Tracker: Request subscription parameters")
+    oce.add("64", "Star Tracker: Request log subscription parameters")
+    oce.add("65", "Star Tracker: Request debug camera parameters")
+    oce.add("66", "Star Tracker: Set log level parameters")
+    oce.add("67", "Star Tracker: Set log subscription parameters")
+    oce.add("68", "Star Tracker: Set debug camera parameters")
+    oce.add("69", "Star Tracker: Firmware update")
+    oce.add("70", "Star Tracker: Disable timestamp generation")
+    oce.add("71", "Star Tracker: Enable timestamp generation")
+    defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)
+
+
+@tmtc_definitions_provider
+def add_system_cmds(defs: TmtcDefinitionWrapper):
+    import eive_tmtc.pus_tc.system.controllers as controllers
+
+    oce = OpCodeEntry()
+    oce.add(
+        keys=controllers.OpCode.THERMAL_CONTROLLER,
+        info=controllers.Info.THERMAL_CONTROLLER,
+    )
+    oce.add(
+        keys=controllers.OpCode.CORE_CONTROLLER,
+        info=controllers.Info.CORE_CONTROLLER,
+    )
+    defs.add_service(
+        name=CustomServiceList.CONTROLLERS.value,
+        info="Controllers",
+        op_code_entry=oce,
+    )

eive_tmtc/pus_tc/procedure_packer.py

@@ -1,17 +1,18 @@
 """Hook function which packs telecommands based on service and operation code string
 """
+import logging
 from typing import cast
 
-from tmtc.power.power import pack_power_commands
-from pus_tc.devs.rtd import pack_rtd_commands
-from pus_tc.devs.scex import pack_scex_cmds
-from pus_tc.system.controllers import (
+from eive_tmtc.tmtc.power.power import pack_power_commands
+from eive_tmtc.tmtc.tcs.rtd import pack_rtd_commands
+from eive_tmtc.tmtc.payload.scex import pack_scex_cmds
+from eive_tmtc.pus_tc.system.controllers import (
     pack_cmd_ctrl_to_prompted_mode,
     get_object_from_op_code,
 )
+from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 from tmtccmd.config import CoreServiceList
-from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.decorator import (
     route_to_registered_service_handlers,
@@ -20,39 +21,35 @@ from tmtccmd.tc.decorator import (
 from tmtccmd.tc.pus_5_event import (
     pack_generic_service_5_test_into,
 )
-from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
 
-from pus_tc.service_200_mode import pack_service_200_test_into
-from tmtc.power.p60dock import pack_p60dock_cmds
-from tmtc.power.pdu2 import pack_pdu2_commands
-from tmtc.power.pdu1 import pack_pdu1_commands
-from tmtc.power.acu import pack_acu_commands
-from pus_tc.devs.solar_array_deployment import pack_solar_array_deployment_test_into
-from pus_tc.devs.imtq import pack_imtq_test_into
-from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from pus_tc.devs.heater import pack_heater_cmds
-from pus_tc.devs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds
-from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
-from tmtc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
-from pus_tc.devs.ccsds_handler import pack_ccsds_handler_test
-from pus_tc.system.core import pack_core_commands
-from pus_tc.devs.star_tracker import pack_star_tracker_commands
-from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
-from pus_tc.devs.gps import pack_gps_command
-from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
-from pus_tc.devs.plpcdu import pack_pl_pcdu_commands
-from pus_tc.devs.str_img_helper import pack_str_img_helper_command
-from pus_tc.system.tcs import pack_tcs_sys_commands
-from pus_tc.system.proc import pack_proc_commands
-from config.definitions import CustomServiceList
-from config.object_ids import (
+from eive_tmtc.tmtc.misc.s200_test import pack_service_200_test_into
+from eive_tmtc.tmtc.power.p60dock import pack_p60dock_cmds
+from eive_tmtc.tmtc.power.pdu2 import pack_pdu2_commands
+from eive_tmtc.tmtc.power.pdu1 import pack_pdu1_commands
+from eive_tmtc.tmtc.power.acu import pack_acu_commands
+from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into
+from eive_tmtc.tmtc.tcs.heater import pack_heater_cmds
+from eive_tmtc.tmtc.acs.reaction_wheels import (
+    pack_single_rw_test_into,
+    pack_rw_ass_cmds,
+)
+from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
+from eive_tmtc.tmtc.com.ccsds_handler import pack_ccsds_handler_test
+from eive_tmtc.tmtc.core import pack_core_commands
+from eive_tmtc.tmtc.acs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.tmtc.com.syrlinks_handler import pack_syrlinks_command
+from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.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,
+    TMP1075_HANDLER_TCS_BRD_0_ID,
+    TMP1075_HANDLER_TCS_BRD_1_ID,
+    TMP1075_HANDLER_PLPCDU_0_ID,
+    TMP1075_HANDLER_IF_BRD_ID,
+    HEATER_CONTROLLER_ID,
     IMTQ_HANDLER_ID,
     RW1_ID,
     RW2_ID,
@@ -65,14 +62,21 @@ from config.object_ids import (
     PDEC_HANDLER_ID,
     STR_IMG_HELPER_ID,
     SYRLINKS_HANDLER_ID,
-    SOLAR_ARRAY_DEPLOYMENT_ID,
     RW_ASSEMBLY,
     get_object_ids,
 )
-import config.object_ids as oids
+
+from eive_tmtc.tmtc.tcs.tmp1075 import pack_tmp1075_test_into
+from eive_tmtc.tmtc.acs.gps import pack_gps_command
+from eive_tmtc.tmtc.payload.rad_sensor import pack_rad_sensor_test_into
+from eive_tmtc.tmtc.power.plpcdu import pack_pl_pcdu_commands
+from eive_tmtc.tmtc.acs.str_img_helper import pack_str_img_helper_command
+from eive_tmtc.pus_tc.system.proc import pack_proc_commands
+
+import eive_tmtc.config.object_ids as oids
 from tmtccmd.util import ObjectIdU32
 
-LOGGER = get_console_logger()
+from eive_tmtc.utility.input_helper import InputHelper
 
 
 def handle_default_procedure(
@@ -85,11 +89,6 @@ def handle_default_procedure(
     obj_id_man = get_object_ids()
     if service == CoreServiceList.SERVICE_5.value:
         return pack_generic_service_5_test_into(q=queue_helper)
-    if (
-        service == CoreServiceList.SERVICE_17
-        or service == CoreServiceList.SERVICE_17_ALT
-    ):
-        return queue_helper.add_pus_tc(pack_service_17_ping_command())
     if service == CoreServiceList.SERVICE_200.value:
         return pack_service_200_test_into(q=queue_helper)
     if service == CustomServiceList.P60DOCK.value:
@@ -106,22 +105,23 @@ def handle_default_procedure(
     if service == CustomServiceList.ACU.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(ACU_HANDLER_ID))
         return pack_acu_commands(object_id=object_id, q=queue_helper, op_code=op_code)
-    # if service == CustomServiceList.BPX_BATTERY.value:
-    #    return pack_bpx_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.TMP1075_1.value:
-        object_id = cast(ObjectIdU32, obj_id_man.get(TMP_1075_1_HANDLER_ID))
-        return pack_tmp1075_test_into(
-            object_id=object_id, q=queue_helper, op_code=op_code
-        )
-    if service == CustomServiceList.TMP1075_2.value:
-        object_id = cast(ObjectIdU32, obj_id_man.get(TMP_1075_2_HANDLER_ID))
+    if service == CustomServiceList.TMP1075.value:
+        menu_dict = {
+            "0": ("TMP1075 TCS Board 0", TMP1075_HANDLER_TCS_BRD_0_ID),
+            "1": ("TMP1075 TCS Board 1", TMP1075_HANDLER_TCS_BRD_1_ID),
+            "2": ("TMP1075 PL PCDU 0", TMP1075_HANDLER_PLPCDU_0_ID),
+            "4": ("TMP1075 IF Board", TMP1075_HANDLER_IF_BRD_ID),
+        }
+        input_helper = InputHelper(menu_dict)
+        tmp_select = input_helper.get_key()
+        object_id = obj_id_man.get(menu_dict[tmp_select][1])
         return pack_tmp1075_test_into(
             object_id=object_id, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.HEATER.value:
-        object_id = HEATER_ID
+        object_id = HEATER_CONTROLLER_ID
         return pack_heater_cmds(object_id=object_id, q=queue_helper, op_code=op_code)
     if service == CustomServiceList.IMTQ.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(IMTQ_HANDLER_ID))
@@ -173,8 +173,9 @@ def handle_default_procedure(
             object_id=oids.GPS_CONTROLLER, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.CCSDS_HANDLER.value:
+        object_id = cast(ObjectIdU32, obj_id_man.get(CCSDS_HANDLER_ID))
         return pack_ccsds_handler_test(
-            object_id=CCSDS_HANDLER_ID, q=queue_helper, op_code=op_code
+            object_id=object_id, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.PDEC_HANDLER.value:
         return pack_ccsds_handler_test(
@@ -185,18 +186,10 @@ def handle_default_procedure(
         return pack_syrlinks_command(
             object_id=object_id, q=queue_helper, op_code=op_code
         )
-    if service == CustomServiceList.SA_DEPLYOMENT.value:
-        return pack_solar_array_deployment_test_into(
-            object_id=SOLAR_ARRAY_DEPLOYMENT_ID, q=queue_helper
-        )
     if service == CustomServiceList.PROCEDURE.value:
         return pack_proc_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.SUS_ASS.value:
-        return pack_sus_cmds(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PL_PCDU.value:
         return pack_pl_pcdu_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.ACS_ASS.value:
-        return pack_acs_command(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS_ASS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.RW_ASSEMBLY.value:
@@ -228,4 +221,4 @@ def handle_default_procedure(
             queue_helper=queue_helper,
         ),
     ):
-        LOGGER.warning(f"Invalid Service {service}")
+        logging.getLogger(__name__).warning(f"Invalid Service {service}")

eive_tmtc/pus_tc/system/controllers.py

@@ -1,16 +1,14 @@
 from typing import Union
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
-from .common import command_mode
-import config.object_ids as obj_ids
-
-from pus_tc.prompt_parameters import prompt_parameters_cli, prompt_parameters_gui
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+import eive_tmtc.config.object_ids as obj_ids
 
 
-class OpCodes:
+class OpCode:
     THERMAL_CONTROLLER = [obj_ids.THERMAL_CONTROLLER_ID.hex(), "ctrl-th"]
     CORE_CONTROLLER = [obj_ids.CORE_CONTROLLER_ID.hex(), "ctrl-core"]
 
@@ -23,11 +21,17 @@ class Info:
 def pack_cmd_ctrl_to_prompted_mode(
     q: DefaultPusQueueHelper, object_id: ObjectIdU32, gui: bool
 ):
+    from eive_tmtc.pus_tc.prompt_parameters import (
+        prompt_parameters_cli,
+    )
+
     param_list = [
         {"name": "Mode", "defaultValue": "2"},
         {"name": "Submode", "defaultValue": "0"},
     ]
     if gui:
+        from eive_tmtc.pus_tc.prompt_parameters import prompt_parameters_gui
+
         parameters = prompt_parameters_gui(param_list)
     else:
         parameters = prompt_parameters_cli(param_list)
@@ -36,7 +40,7 @@ def pack_cmd_ctrl_to_prompted_mode(
         print("Invalid Mode, defaulting to OFF")
         mode = 0
     submode = int(parameters["Submode"])
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=mode,
         submode=submode,
@@ -48,9 +52,9 @@ def pack_cmd_ctrl_to_prompted_mode(
 def pack_cmd_ctrl_to_off(
     q: DefaultPusQueueHelper, object_id: Union[ObjectIdBase, ObjectIdU32]
 ):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
-        mode=Modes.OFF,
+        mode=Mode.OFF,
         submode=0,
         q=q,
         info=f"Commanding {object_id} OFF",
@@ -58,9 +62,9 @@ def pack_cmd_ctrl_to_off(
 
 
 def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
-        mode=Modes.ON,
+        mode=Mode.ON,
         submode=0,
         q=q,
         info=f"Commanding {object_id} ON",
@@ -70,9 +74,9 @@ def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
 def pack_cmd_ctrl_to_nml(
     q: DefaultPusQueueHelper, object_id: Union[ObjectIdBase, ObjectIdU32]
 ):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
-        mode=Modes.NORMAL,
+        mode=Mode.NORMAL,
         submode=0,
         q=q,
         info=f"Commanding {object_id} NORMAL",
@@ -85,7 +89,7 @@ def get_object_from_op_code(op_code: str):
     except:
         pass
 
-    if op_code in OpCodes.THERMAL_CONTROLLER:
+    if op_code in OpCode.THERMAL_CONTROLLER:
         return obj_ids.THERMAL_CONTROLLER_ID
-    if op_code in OpCodes.CORE_CONTROLLER:
+    if op_code in OpCode.CORE_CONTROLLER:
         return obj_ids.CORE_CONTROLLER_ID

eive_tmtc/pus_tc/system/proc.py

@@ -2,48 +2,56 @@ from __future__ import annotations
 
 import time
 from datetime import timedelta
-from typing import List
 
-from config.definitions import CustomServiceList
-from config.object_ids import get_object_ids
-from pus_tc.system.tcs import pack_tcs_sys_commands
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import get_object_ids
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_11_tc_sched import (
-    generate_time_tagged_cmd,
-    generate_enable_tc_sched_cmd,
-    generate_reset_tc_sched_cmd,
+from tmtccmd.pus.s11_tc_sched import (
+    create_time_tagged_cmd,
+    create_enable_tc_sched_cmd,
+    create_reset_tc_sched_cmd,
 )
 from tmtccmd.tc.pus_3_fsfw_hk import *
 
-import config.object_ids as oids
-from pus_tc.system.tcs import OpCodes as TcsOpCodes
-from pus_tc.devs.bpx_batt import BpxSetIds
-from pus_tc.system.core import SetIds as CoreSetIds
-from gomspace.gomspace_common import SetIds as GsSetIds
-from pus_tc.devs.rad_sensor import SetIds as RadSetIds
-from pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
-from pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
-from pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2
-from pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3
-from pus_tc.devs.syrlinks_hk_handler import OpCodes as SyrlinksOpCodes
-from pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds
-from pus_tc.devs.star_tracker import OpCodes as StrOpCodes
-from pus_tc.devs.gps import SetIds as GpsSetIds
-from pus_tc.devs.imtq import ImtqSetIds
-from pus_tc.devs.sus import SetIds
-from pus_tc.devs.star_tracker import SetIds as StrSetIds
-from pus_tc.devs.reaction_wheels import RwSetIds
-from pus_tc.system.controllers import pack_cmd_ctrl_to_off, pack_cmd_ctrl_to_nml
-from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
-from pus_tc.devs.imtq import pack_imtq_test_into, pack_dipole_command
-from pus_tc.devs.star_tracker import pack_star_tracker_commands
-from pus_tc.devs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command
+import eive_tmtc.config.object_ids as oids
+from eive_tmtc.tmtc.tcs.brd_assy import OpCodeAssy as TcsOpCodes
+from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
+from eive_tmtc.tmtc.core import SetId as CoreSetIds
+from eive_tmtc.tmtc.power.common_power import SetId as GsSetIds
+from eive_tmtc.tmtc.com.syrlinks_handler import SetId as SyrlinksSetIds
+from eive_tmtc.tmtc.acs.imtq import ImtqSetId
+from eive_tmtc.tmtc.acs.star_tracker import SetId as StrSetIds
+from eive_tmtc.tmtc.acs.reaction_wheels import (
+    RwSetId,
+    rw_speed_up_cmd_consec,
+    rw_speed_down_cmd_consec,
+)
+from eive_tmtc.pus_tc.system.controllers import (
+    pack_cmd_ctrl_to_off,
+    pack_cmd_ctrl_to_nml,
+)
+from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
+from eive_tmtc.tmtc.acs.sus_board import pack_sus_cmds
+from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command
+from eive_tmtc.tmtc.acs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command
+
+from eive_tmtc.tmtc.acs.sus import SetId
+from eive_tmtc.tmtc.power.bpx_batt import BpxSetId
+from eive_tmtc.tmtc.payload.rad_sensor import SetId as RadSetIds
+from eive_tmtc.tmtc.acs.mgms import MgmLis3SetId as MgmLis3SetIds_0_2
+from eive_tmtc.tmtc.acs.mgms import MgmRm3100SetId as MgmRm3100SetIds_1_3
+from eive_tmtc.tmtc.acs.gyros import (
+    AdisGyroSetId as AdisGyroSetIds_0_2,
+    L3gGyroSetId as L3gGyroSetIds_1_3,
+)
+from eive_tmtc.tmtc.acs.gps import SetId as GpsSetIds
 
 
-class OpCodes:
+class OpCode:
     """FT: Functional Test"""
 
     TV_SETUP_TCS_FT_ON = ["s", "tcs-ft-on"]
@@ -87,34 +95,34 @@ KAI = KeyAndInfo
 
 PROC_INFO_DICT = {
     KAI.TV_SETUP_TCS_FT_ON[0]: [
-        OpCodes.TV_SETUP_TCS_FT_ON,
+        OpCode.TV_SETUP_TCS_FT_ON,
         KAI.TV_SETUP_TCS_FT_ON[1],
         120.0,
         10.0,
     ],
     KAI.TV_TEARDOWN_TCS_FT_OFF[0]: [
-        OpCodes.TV_TEARDOWN_TCS_FT_OFF,
+        OpCode.TV_TEARDOWN_TCS_FT_OFF,
         KAI.TV_TEARDOWN_TCS_FT_OFF[1],
         120.0,
         10.0,
     ],
-    KAI.BAT_FT[0]: [OpCodes.BAT_FT, KAI.BAT_FT[1], 120.0, 10.0],
-    KAI.CORE_FT[0]: [OpCodes.CORE_FT, KAI.CORE_FT[1], 120.0, 10.0],
-    KAI.PCDU_FT[0]: [OpCodes.PCDU_FT, KAI.PCDU_FT[1], 120.0, 10.0],
-    KAI.RAD_SEN_FT[0]: [OpCodes.RAD_SEN_FT, KAI.RAD_SEN_FT[1], 120.0, 10.0],
-    KAI.ACS_FT[0]: [OpCodes.ACS_FT, KAI.ACS_FT[1], 120.0, 10.0],
-    KAI.MGT_FT[0]: [OpCodes.MGT_FT, KAI.MGT_FT[1], 120.0, 10.0],
+    KAI.BAT_FT[0]: [OpCode.BAT_FT, KAI.BAT_FT[1], 120.0, 10.0],
+    KAI.CORE_FT[0]: [OpCode.CORE_FT, KAI.CORE_FT[1], 120.0, 10.0],
+    KAI.PCDU_FT[0]: [OpCode.PCDU_FT, KAI.PCDU_FT[1], 120.0, 10.0],
+    KAI.RAD_SEN_FT[0]: [OpCode.RAD_SEN_FT, KAI.RAD_SEN_FT[1], 120.0, 10.0],
+    KAI.ACS_FT[0]: [OpCode.ACS_FT, KAI.ACS_FT[1], 120.0, 10.0],
+    KAI.MGT_FT[0]: [OpCode.MGT_FT, KAI.MGT_FT[1], 120.0, 10.0],
     # collection_time for KAI.MGT_FT_DP maybe be reduced as a full 120
     # seconds is not needed after MGTs are tested
-    KAI.MGT_FT_DP[0]: [OpCodes.MGT_FT_DP, KAI.MGT_FT_DP[1], 10.0, 10.0],
-    KAI.SUS_FT[0]: [OpCodes.SUS_FT, KAI.SUS_FT[1], 120.0, 10.0],
-    KAI.STR_FT[0]: [OpCodes.STR_FT, KAI.STR_FT[1], 120.0, 10.0],
+    KAI.MGT_FT_DP[0]: [OpCode.MGT_FT_DP, KAI.MGT_FT_DP[1], 10.0, 10.0],
+    KAI.SUS_FT[0]: [OpCode.SUS_FT, KAI.SUS_FT[1], 120.0, 10.0],
+    KAI.STR_FT[0]: [OpCode.STR_FT, KAI.STR_FT[1], 120.0, 10.0],
     # collection_time for KAI.RW_FT_ONE_RW maybe be reduced as a full 120
     # seconds is not needed after RWs are tested
-    KAI.RW_FT_ONE_RW[0]: [OpCodes.RW_FT_ONE_RW, KAI.RW_FT_ONE_RW[1], 10.0, 1.0],
+    KAI.RW_FT_ONE_RW[0]: [OpCode.RW_FT_ONE_RW, KAI.RW_FT_ONE_RW[1], 10.0, 1.0],
     # collection_time for KAI.RW_FT_ONE_RW maybe be reduced as a full 120
     # seconds is not needed after RWs are tested
-    KAI.RW_FT_TWO_RWS[0]: [OpCodes.RW_FT_TWO_RWS, KAI.RW_FT_TWO_RWS[1], 10.0, 1.0],
+    KAI.RW_FT_TWO_RWS[0]: [OpCode.RW_FT_TWO_RWS, KAI.RW_FT_TWO_RWS[1], 10.0, 1.0],
 }
 
 
@@ -203,7 +211,7 @@ def pack_generic_hk_listening_cmds(
     else:
         for cmd in disable_cmd_list:
             q.add_pus_tc(
-                generate_time_tagged_cmd(
+                create_time_tagged_cmd(
                     release_time=struct.pack("!I", int(current_time)), tc_to_insert=cmd
                 )
             )
@@ -217,12 +225,12 @@ def pack_generic_hk_listening_cmds(
 def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
     sid_list = []
     obj_id_dict = get_object_ids()
-    if op_code in OpCodes.RESET_SCHED:
+    if op_code in OpCode.RESET_SCHED:
         q.add_log_cmd("Resetting/Clearing TC schedule")
-        q.add_pus_tc(generate_reset_tc_sched_cmd())
-    if op_code in OpCodes.BAT_FT:
+        q.add_pus_tc(create_reset_tc_sched_cmd())
+    if op_code in OpCode.BAT_FT:
         key = KAI.BAT_FT[0]
-        sid_list.append(make_sid(oids.BPX_HANDLER_ID, BpxSetIds.GET_HK_SET))
+        sid_list.append(make_sid(oids.BPX_HANDLER_ID, BpxSetId.GET_HK_SET))
         diag_list = [False]
         pack_generic_hk_listening_cmds(
             q=q,
@@ -232,7 +240,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
             cfg=GenericHkListeningCfg.default(),
         )
 
-    if op_code in OpCodes.CORE_FT:
+    if op_code in OpCode.CORE_FT:
         key = KAI.CORE_FT[0]
         sid_list.append(make_sid(oids.CORE_CONTROLLER_ID, CoreSetIds.HK))
         diag_list = [False]
@@ -244,17 +252,17 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
             cfg=GenericHkListeningCfg.default(),
         )
 
-    if op_code in OpCodes.PCDU_FT:
+    if op_code in OpCode.PCDU_FT:
         key = KAI.PCDU_FT[0]
         pcdu_pairs = [
-            (oids.P60_DOCK_HANDLER, GsSetIds.P60_CORE),
-            (oids.PDU_1_HANDLER_ID, GsSetIds.PDU_1_CORE),
-            (oids.PDU_2_HANDLER_ID, GsSetIds.PDU_2_CORE),
-            (oids.ACU_HANDLER_ID, GsSetIds.ACU_CORE),
-            (oids.P60_DOCK_HANDLER, GsSetIds.P60_AUX),
-            (oids.PDU_1_HANDLER_ID, GsSetIds.PDU_1_AUX),
-            (oids.PDU_2_HANDLER_ID, GsSetIds.PDU_2_AUX),
-            (oids.ACU_HANDLER_ID, GsSetIds.ACU_AUX),
+            (oids.P60_DOCK_HANDLER, GsSetIds.CORE),
+            (oids.PDU_1_HANDLER_ID, GsSetIds.CORE),
+            (oids.PDU_2_HANDLER_ID, GsSetIds.CORE),
+            (oids.ACU_HANDLER_ID, GsSetIds.CORE),
+            (oids.P60_DOCK_HANDLER, GsSetIds.AUX),
+            (oids.PDU_1_HANDLER_ID, GsSetIds.AUX),
+            (oids.PDU_2_HANDLER_ID, GsSetIds.AUX),
+            (oids.ACU_HANDLER_ID, GsSetIds.AUX),
         ]
 
         diag_list = [
@@ -280,7 +288,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
             cfg=GenericHkListeningCfg.default(),
         )
 
-    if op_code in OpCodes.RAD_SEN_FT:
+    if op_code in OpCode.RAD_SEN_FT:
         key = KAI.RAD_SEN_FT[0]
         sid_list.append(make_sid(oids.RAD_SENSOR_ID, RadSetIds.HK))
         diag_list = [False]
@@ -292,18 +300,18 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
             cfg=GenericHkListeningCfg.default(),
         )
 
-    if op_code in OpCodes.TV_SETUP_TCS_FT_ON:
+    if op_code in OpCode.TV_SETUP_TCS_FT_ON:
         # Enable scheduling
-        q.add_pus_tc(generate_enable_tc_sched_cmd())
+        q.add_pus_tc(create_enable_tc_sched_cmd())
         # check whether tcs_assembly also has to be commanded to NORMAL Mode
         pack_tcs_sys_commands(q=q, op_code=TcsOpCodes.TCS_BOARD_ASS_NORMAL[0])
         pack_cmd_ctrl_to_nml(q=q, object_id=obj_id_dict.get(oids.THERMAL_CONTROLLER_ID))
 
-    if op_code in OpCodes.TV_TEARDOWN_TCS_FT_OFF:
+    if op_code in OpCode.TV_TEARDOWN_TCS_FT_OFF:
         # TCS board should always be on anyway, do not command it off here
         pack_cmd_ctrl_to_off(q=q, object_id=obj_id_dict.get(oids.THERMAL_CONTROLLER_ID))
 
-    if op_code in OpCodes.ACS_FT:
+    if op_code in OpCode.ACS_FT:
         key = KAI.ACS_FT[0]
         a_side_pairs = [
             (oids.MGM_0_LIS3_HANDLER_ID, MgmLis3SetIds_0_2.CORE_HK),
@@ -386,12 +394,12 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         pack_acs_command(q=q, op_code="acs-off")
 
-    if op_code in OpCodes.MGT_FT:
+    if op_code in OpCode.MGT_FT:
         key = KAI.MGT_FT[0]
         imtq_pairs = [
-            (oids.IMTQ_HANDLER_ID, ImtqSetIds.ENG_HK_SET),
-            (oids.IMTQ_HANDLER_ID, ImtqSetIds.CAL_MTM_SET),
-            (oids.IMTQ_HANDLER_ID, ImtqSetIds.RAW_MTM_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.ENG_HK_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.CAL_MTM_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.RAW_MTM_SET),
         ]
         diag_list = [
             True,
@@ -419,7 +427,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         pack_imtq_test_into(oids.IMTQ_HANDLER_ID, q=q, op_code="0")
 
-    if op_code in OpCodes.MGT_FT_DP:
+    if op_code in OpCode.MGT_FT_DP:
         key = KAI.MGT_FT_DP[0]
         a_side_pairs = [
             (oids.MGM_0_LIS3_HANDLER_ID, MgmLis3SetIds_0_2.CORE_HK),
@@ -436,9 +444,9 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
             (oids.GPS_CONTROLLER, GpsSetIds.HK),
         ]
         imtq_pairs = [
-            (oids.IMTQ_HANDLER_ID, ImtqSetIds.ENG_HK_SET),
-            (oids.IMTQ_HANDLER_ID, ImtqSetIds.CAL_MTM_SET),
-            (oids.IMTQ_HANDLER_ID, ImtqSetIds.RAW_MTM_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.ENG_HK_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.CAL_MTM_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.RAW_MTM_SET),
         ]
         d_side_and_imtq_pairs = a_side_pairs + b_side_pairs + imtq_pairs
         diag_list = [
@@ -481,7 +489,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
         pack_imtq_test_into(oids.IMTQ_HANDLER_ID, q=q, op_code="0")
         pack_acs_command(q=q, op_code="acs-off")
 
-    if op_code in OpCodes.SUS_FT:
+    if op_code in OpCode.SUS_FT:
         key = KAI.SUS_FT[0]
 
         pack_sus_cmds(q=q, op_code="sus-nom")
@@ -513,7 +521,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         # SUSs
         for nom_sus in sus_n_ids:
-            sid_list.append(make_sid(nom_sus, SetIds.HK))
+            sid_list.append(make_sid(nom_sus, SetId.HK))
         pack_generic_hk_listening_cmds(
             q=q,
             proc_key=key,
@@ -537,7 +545,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         # SUSs
         for red_sus in sus_r_ids:
-            sid_list.append(make_sid(red_sus, SetIds.HK))
+            sid_list.append(make_sid(red_sus, SetId.HK))
         pack_generic_hk_listening_cmds(
             q=q,
             proc_key=key,
@@ -552,9 +560,9 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         # SUSs
         for nom_sus in sus_n_ids:
-            sid_list.append(make_sid(nom_sus, SetIds.HK))
+            sid_list.append(make_sid(nom_sus, SetId.HK))
         for red_sus in sus_r_ids:
-            sid_list.append(make_sid(red_sus, SetIds.HK))
+            sid_list.append(make_sid(red_sus, SetId.HK))
         diag_list = [
             True,
             True,
@@ -579,7 +587,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         pack_acs_command(q=q, op_code="sus-off")
 
-    if op_code in OpCodes.SYRLINKS_FT:
+    if op_code in OpCode.SYRLINKS_FT:
         key = KAI.SYRLINKS_FT[0]
         sid_list = [
             make_sid(oids.SYRLINKS_HANDLER_ID, SyrlinksSetIds.RX_REGISTERS_DATASET),
@@ -587,13 +595,13 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
         ]
         # HK listening
         pack_generic_hk_listening_cmds(
-            tc_queue=tc_queue,
+            q=q,
             proc_key=key,
             sid_list=sid_list,
-            diag=False,
+            diag_list=[False],
             cfg=GenericHkListeningCfg.default(),
         )
-    if op_code in OpCodes.STR_FT:
+    if op_code in OpCode.STR_FT:
         key = KAI.STR_FT[0]
 
         pack_star_tracker_commands(object_id=oids.STAR_TRACKER_ID, q=q, op_code="2")
@@ -611,21 +619,21 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
 
         pack_star_tracker_commands(object_id=oids.STAR_TRACKER_ID, q=q, op_code="3")
 
-    if op_code in OpCodes.RW_FT_ONE_RW:
+    if op_code in OpCode.RW_FT_ONE_RW:
         key = KAI.RW_FT_ONE_RW[0]
         rw_pairs = [
-            (oids.RW1_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW1_ID, RwSetIds.LAST_RESET),
-            (oids.RW1_ID, RwSetIds.TM_SET),
-            (oids.RW2_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW2_ID, RwSetIds.LAST_RESET),
-            (oids.RW2_ID, RwSetIds.TM_SET),
-            (oids.RW3_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW3_ID, RwSetIds.LAST_RESET),
-            (oids.RW3_ID, RwSetIds.TM_SET),
-            (oids.RW4_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW4_ID, RwSetIds.LAST_RESET),
-            (oids.RW4_ID, RwSetIds.TM_SET),
+            (oids.RW1_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW1_ID, RwSetId.LAST_RESET),
+            (oids.RW1_ID, RwSetId.TM_SET),
+            (oids.RW2_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW2_ID, RwSetId.LAST_RESET),
+            (oids.RW2_ID, RwSetId.TM_SET),
+            (oids.RW3_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW3_ID, RwSetId.LAST_RESET),
+            (oids.RW3_ID, RwSetId.TM_SET),
+            (oids.RW4_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW4_ID, RwSetId.LAST_RESET),
+            (oids.RW4_ID, RwSetId.TM_SET),
         ]
         diag_list = [
             True,
@@ -660,25 +668,25 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
         pack_rw_ass_cmds(object_id=oids.RW_ASSEMBLY, q=q, op_code="off")
 
     # ass command with 2 rws to speed
-    if op_code in OpCodes.RW_FT_TWO_RWS:
+    if op_code in OpCode.RW_FT_TWO_RWS:
         key = KAI.RW_FT_TWO_RWS[0]
         rw_pairs = [
-            (oids.RW1_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW1_ID, RwSetIds.TEMPERATURE_SET_ID),
-            (oids.RW1_ID, RwSetIds.LAST_RESET),
-            (oids.RW1_ID, RwSetIds.TM_SET),
-            (oids.RW2_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW2_ID, RwSetIds.TEMPERATURE_SET_ID),
-            (oids.RW2_ID, RwSetIds.LAST_RESET),
-            (oids.RW2_ID, RwSetIds.TM_SET),
-            (oids.RW3_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW3_ID, RwSetIds.TEMPERATURE_SET_ID),
-            (oids.RW3_ID, RwSetIds.LAST_RESET),
-            (oids.RW3_ID, RwSetIds.TM_SET),
-            (oids.RW4_ID, RwSetIds.STATUS_SET_ID),
-            (oids.RW4_ID, RwSetIds.TEMPERATURE_SET_ID),
-            (oids.RW4_ID, RwSetIds.LAST_RESET),
-            (oids.RW4_ID, RwSetIds.TM_SET),
+            (oids.RW1_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW1_ID, RwSetId.TEMPERATURE_SET_ID),
+            (oids.RW1_ID, RwSetId.LAST_RESET),
+            (oids.RW1_ID, RwSetId.TM_SET),
+            (oids.RW2_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW2_ID, RwSetId.TEMPERATURE_SET_ID),
+            (oids.RW2_ID, RwSetId.LAST_RESET),
+            (oids.RW2_ID, RwSetId.TM_SET),
+            (oids.RW3_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW3_ID, RwSetId.TEMPERATURE_SET_ID),
+            (oids.RW3_ID, RwSetId.LAST_RESET),
+            (oids.RW3_ID, RwSetId.TM_SET),
+            (oids.RW4_ID, RwSetId.STATUS_SET_ID),
+            (oids.RW4_ID, RwSetId.TEMPERATURE_SET_ID),
+            (oids.RW4_ID, RwSetId.LAST_RESET),
+            (oids.RW4_ID, RwSetId.TM_SET),
         ]
         diag_list = [
             False,
@@ -726,11 +734,11 @@ def enable_listen_to_hk_for_x_seconds(
 ):
     q.add_log_cmd(f"Enabling periodic HK for {device}")
     cmd_tuple = enable_periodic_hk_command_with_interval(
-        diag=diag, sid=sid, interval_seconds=interval_seconds, ssc=0
+        diag=diag, sid=sid, interval_seconds=interval_seconds
     )
     for cmd in cmd_tuple:
         q.add_pus_tc(cmd)
-    generate_time_tagged_cmd(
+    create_time_tagged_cmd(
         struct.pack("!I", int(round(time.time() + interval_seconds))),
         gen_disable_listen_to_hk_for_x_seconds(q, diag, device, sid),
     )
@@ -827,24 +835,6 @@ def rw_speed_cmd_single(
     q.add_pus_tc(pack_set_speed_command(object_id=oid, speed=0, ramp_time_ms=ramp_time))
 
 
-def rw_speed_up_cmd_consec(
-    q: DefaultPusQueueHelper, obids: List[bytes], speed: int, ramp_time: int
-):
-    for oid in obids:
-        q.add_pus_tc(
-            pack_set_speed_command(object_id=oid, speed=speed, ramp_time_ms=ramp_time)
-        )
-
-
-def rw_speed_down_cmd_consec(
-    q: DefaultPusQueueHelper, obids: List[bytes], ramp_time: int
-):
-    for oid in obids:
-        q.add_pus_tc(
-            pack_set_speed_command(object_id=oid, speed=0, ramp_time_ms=ramp_time)
-        )
-
-
 def activate_all_rws_in_sequence(
     q: DefaultPusQueueHelper, init_ssc: int, test_speed: int, test_ramp_time: int
 ):

eive_tmtc/pus_tm/action_reply_handler.py

@@ -1,16 +1,16 @@
 import struct
-from config.object_ids import *
-from pus_tc.devs.imtq import ImtqActionIds
-from pus_tm.defs import PrintWrapper
-from tmtc.ploc_mpsoc import PlocReplyIds
-from tmtc.ploc_supervisor import SupvActionIds
-from pus_tc.devs.star_tracker import StarTrackerActionIds
-from tmtc.power.tm import handle_get_param_data_reply
-from tmtccmd.logging import get_console_logger
+from eive_tmtc.config.object_ids import *
+from eive_tmtc.tmtc.acs.imtq import ImtqActionId
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.tmtc.payload.ploc_mpsoc import PlocReplyIds
+from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionId
+from eive_tmtc.tmtc.acs.star_tracker import StarTrackerActionId
+from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.tm import Service8FsfwTm
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from spacepackets.ccsds.time import CdsShortTimestamp
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
 def handle_action_reply(
@@ -19,7 +19,9 @@ def handle_action_reply(
     """Core Action reply handler
     :return:
     """
-    tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm)
+    tm_packet = Service8FsfwTm.unpack(
+        raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty()
+    )
     printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
     object_id = obj_id_dict.get(tm_packet.source_object_id_as_bytes)
     pw = PrintWrapper(printer)
@@ -52,7 +54,7 @@ def handle_action_reply(
 def handle_imtq_replies(
     action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
 ):
-    if action_id == struct.unpack("!I", ImtqActionIds.get_commanded_dipole)[0]:
+    if action_id == struct.unpack("!I", ImtqActionId.get_commanded_dipole)[0]:
         header_list = [
             "Commanded X-Dipole",
             "Commanded Y-Dipole",
@@ -99,14 +101,14 @@ def handle_ploc_replies(
 def handle_supervisor_replies(
     action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
 ):
-    if action_id == SupvActionIds.DUMP_MRAM:
+    if action_id == SupvActionId.DUMP_MRAM:
         header_list = ["MRAM Dump"]
         content_list = [custom_data[: len(custom_data)]]
         print(header_list)
         print(content_list)
         printer.file_logger.info(header_list)
         printer.file_logger.info(content_list)
-    elif action_id == SupvActionIds.READ_GPIO:
+    elif action_id == SupvActionId.READ_GPIO:
         header_list = ["GPIO state"]
         content_list = [struct.unpack("!H", custom_data[:2])[0]]
         print(header_list)
@@ -118,9 +120,9 @@ def handle_supervisor_replies(
 def handle_startracker_replies(
     action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
 ):
-    if action_id == StarTrackerActionIds.CHECKSUM:
+    if action_id == StarTrackerActionId.CHECKSUM:
         if len(custom_data) != 5:
-            LOGGER.warning(
+            _LOGGER.warning(
                 "Star tracker reply has invalid length {0}".format(len(custom_data))
             )
             return

eive_tmtc/pus_tm/defs.py

@@ -1,3 +1,5 @@
+import logging
+
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
@@ -9,6 +11,10 @@ class PrintWrapper:
         print(string)
         self.printer.file_logger.info(string)
 
+    def ilog(self, logger: logging.Logger, string: str):
+        logger.info(string)
+        self.printer.file_logger.info(string)
+
 
 def log_to_both(printer: FsfwTmTcPrinter, string: str):
     print(string)

eive_tmtc/pus_tm/event_handler.py

@@ -0,0 +1,99 @@
+import logging
+import datetime
+
+from eive_tmtc.config.events import get_event_dict
+from eive_tmtc.config.object_ids import get_object_ids
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.verification_handler import generic_retval_printout
+from eive_tmtc.tmtc.acs.subsystem import AcsMode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
+from tmtccmd.tc.pus_201_fsfw_health import FsfwHealth
+
+from tmtccmd.tm import Service5Tm
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.fsfw import EventInfo
+from spacepackets.ccsds.time import CdsShortTimestamp
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
+    pw = PrintWrapper(printer)
+    tm = Service5Tm.unpack(data=raw_tm, time_reader=CdsShortTimestamp.empty())
+    event_dict = get_event_dict()
+    event_def = tm.event_definition
+    info = event_dict.get(event_def.event_id)
+    if info is None:
+        _LOGGER.warning(f"Event ID {event_def.event_id} has no information")
+        info = EventInfo()
+        info.name = "Unknown event"
+    obj_ids = get_object_ids()
+    obj_id_obj = obj_ids.get(event_def.reporter_id)
+    if obj_id_obj is None:
+        _LOGGER.warning(f"Object ID 0x{event_def.reporter_id.hex(sep=',')} has no name")
+        obj_name = event_def.reporter_id.hex(sep=",")
+    else:
+        obj_name = obj_id_obj.name
+    generic_event_string = f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x}) at {tm.time_provider.as_date_time()}"
+    _LOGGER.info(generic_event_string)
+    pw.printer.file_logger.info(
+        f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
+    )
+    specific_handler = True
+    if info.name == "MODE_TRANSITION_FAILED":
+        reason = generic_retval_printout(event_def.param1)
+        for string in reason:
+            pw.dlog(f"Reason from event parameter 1: {string}")
+            pw.dlog(f"Mode, sequence or table: {event_def.param2:#08x}")
+    if info.name == "SUPV_UPDATE_PROGRESS" or info.name == "WRITE_MEMORY_FAILED":
+        additional_event_info = f"Additional info: {info.info}"
+        context = (
+            f"Progress Percent: {event_def.param1 >> 24 & 0xff} | Sequence Count: {event_def.param1 & 0xffff} "
+            f"| Bytes Written: {event_def.param2}"
+        )
+        pw.dlog(additional_event_info)
+        pw.dlog(context)
+    if info.name == "MODE_INFO":
+        mode_name = "Unknown"
+        if obj_name == "ACS_SUBSYSTEM":
+            acs_mode = AcsMode(event_def.param1)
+            pw.dlog(f"ACS Mode: {acs_mode!r}")
+        elif obj_name == "ACS_CONTROLLER_ID":
+            mode_name = Mode(event_def.param1)
+            submode = AcsMode(event_def.param2)
+            pw.dlog(f"Mode: {mode_name!r}")
+            pw.dlog(f"ACS Mode: {submode!r}")
+        else:
+            if event_def.param1 == Mode.OFF:
+                mode_name = "Off"
+            elif event_def.param1 == Mode.ON:
+                mode_name = "On"
+            elif event_def.param1 == Mode.NORMAL:
+                mode_name = "Normal"
+            elif event_def.param1 == Mode.RAW:
+                mode_name = "Raw"
+            pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}")
+            pw.dlog(f"Submode: {event_def.param2}")
+    elif info.name == "CLOCK_SET":
+        old_time = event_def.param1
+        new_time = event_def.param2
+        old_time_dt = datetime.datetime.fromtimestamp(old_time, datetime.timezone.utc)
+        new_time_dt = datetime.datetime.fromtimestamp(new_time, datetime.timezone.utc)
+        pw.dlog(f"Old time (UTC): {old_time_dt}")
+        pw.dlog(f"New time (UTC): {new_time_dt}")
+    elif info.name == "CLOCK_DUMP":
+        # param 1 is timeval seconds, param 2 is timeval subsecond milliseconds
+        time = event_def.param1 + event_def.param2 / 1000.0
+        time_dt = datetime.datetime.fromtimestamp(time, datetime.timezone.utc)
+        pw.dlog(f"Current time: {time_dt}")
+    elif info.name == "HEALTH_INFO":
+        health = FsfwHealth(event_def.param1)
+        pw.dlog(f"{obj_name}: {health!r}")
+    else:
+        specific_handler = False
+        if info.info != "":
+            additional_event_info = f"Additional info: {info.info} | P1: {event_def.param1} | P2: {event_def.param2}"
+            pw.dlog(additional_event_info)
+    if not specific_handler:
+        # printer.handle_long_tm_print(packet_if=tm.pus_tm, info_if=tm.pus_tm)
+        pass

eive_tmtc/pus_tm/factory_hook.py

@@ -0,0 +1,114 @@
+"""Core EIVE TM handler module
+"""
+import logging
+
+from eive_tmtc.config.object_ids import get_object_ids
+from spacepackets.ecss import PusTelemetry
+from spacepackets.ecss.pus_17_test import Service17Tm
+from spacepackets.util import PrintFormats
+from spacepackets.ccsds.time import CdsShortTimestamp
+from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
+from tmtccmd.pus import VerificationWrapper
+from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm
+from tmtccmd.tm.pus_20_fsfw_param import Service20ParamDumpWrapper
+from tmtccmd.pus.s20_fsfw_param_defs import CustomSubservice as ParamSubservice
+from tmtccmd.tm.pus_200_fsfw_mode import Subservice as ModeSubservice
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from .defs import PrintWrapper
+
+from .event_handler import handle_event_packet
+from .verification_handler import handle_service_1_fsfw_packet, generic_retval_printout
+from .hk_handling import handle_hk_packet
+from .action_reply_handler import handle_action_reply
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def pus_factory_hook(
+    packet: bytes,
+    verif_wrapper: VerificationWrapper,
+    printer: FsfwTmTcPrinter,
+    raw_logger: RawTmtcTimedLogWrapper,
+):
+    if len(packet) < 8:
+        _LOGGER.warning("Detected packet shorter than 8 bytes!")
+        return
+    try:
+        tm_packet = PusTelemetry.unpack(packet, CdsShortTimestamp.empty())
+    except ValueError:
+        _LOGGER.warning("Could not generate PUS TM object from raw data")
+        _LOGGER.warning(f"Raw Packet: [{packet.hex(sep=',')}], REPR: {packet!r}")
+        return
+    service = tm_packet.service
+    obj_id_dict = get_object_ids()
+    pw = PrintWrapper(printer)
+    dedicated_handler = True
+    if service == 1:
+        handle_service_1_fsfw_packet(wrapper=verif_wrapper, raw_tm=packet)
+    elif service == 3:
+        handle_hk_packet(printer=printer, raw_tm=packet, obj_id_dict=obj_id_dict)
+    elif service == 5:
+        handle_event_packet(raw_tm=packet, printer=printer)
+    elif service == 8:
+        handle_action_reply(raw_tm=packet, printer=printer, obj_id_dict=obj_id_dict)
+    elif service == 17:
+        tm_packet = Service17Tm.unpack(
+            data=packet, time_reader=CdsShortTimestamp.empty()
+        )
+        if tm_packet.subservice == 2:
+            verif_wrapper.dlog("Received Ping Reply TM[17,2]")
+        dedicated_handler = True
+    elif service == 20:
+        param_packet = Service20FsfwTm.unpack(
+            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
+        )
+        if tm_packet.subservice == ParamSubservice.TM_DUMP_REPLY:
+            param_wrapper = Service20ParamDumpWrapper(param_tm=param_packet)
+            try:
+                param = param_wrapper.get_param()
+                obj = obj_id_dict.get(param_wrapper.param_tm.object_id)
+                pw.dlog(f"Received parameter dump TM from {obj}")
+                pw.dlog(f"Parameter: {param}")
+                if param.rows == 1 and param.columns == 1:
+                    try:
+                        scalar_param = param.parse_scalar_param()
+                        if isinstance(scalar_param, int):
+                            pw.dlog(f"Scalar integer parameter: {scalar_param}")
+                        elif isinstance(scalar_param, float):
+                            pw.dlog(f"Scalar floating point parameter: {scalar_param}")
+                    except ValueError as e:
+                        pw.dlog("received {e} trying to parse scalar parameter")
+                else:
+                    # TODO: Could improve display further by actually displaying a matrix as a
+                    #       matrix using row and column information
+                    pw.dlog(
+                        f"Received vector or matrix data: {param.param_raw.hex(sep=',')}"
+                    )
+            except ValueError as e:
+                pw.dlog(f"received {e} when trying to parse parameters")
+            except NotImplementedError as e:
+                pw.dlog(f"received {e} when trying to parse parameters")
+        else:
+            pw.dlog(f"unknown subservice {tm_packet.subservice} for parameter service")
+    elif service == 200:
+        tm_packet = Service200FsfwTm.unpack(
+            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
+        )
+        if tm_packet.subservice == ModeSubservice.TM_CANT_REACH_MODE:
+            obj_id = tm_packet.object_id
+            obj_id_obj = obj_id_dict.get(obj_id)
+            retval = tm_packet.return_value
+            string_list = generic_retval_printout(retval)
+            pw.dlog(f"Received Mode Reply from {obj_id_obj}: Can't reach mode.")
+            for string in string_list:
+                pw.dlog(f"Reason: {string}")
+            dedicated_handler = True
+        else:
+            dedicated_handler = False
+    else:
+        _LOGGER.info(f"The service {service} is not implemented in Telemetry Factory")
+        tm_packet.print_source_data(PrintFormats.HEX)
+        dedicated_handler = True
+    if not dedicated_handler and tm_packet is not None:
+        printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+    raw_logger.log_tm(tm_packet)

eive_tmtc/pus_tm/hk_handling.py

@@ -1,39 +1,44 @@
 """HK Handling for EIVE OBSW"""
+import logging
+
 # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
-from tmtc.acs_ctrl import handle_acs_ctrl_mgm_data
-from pus_tm.devs.plpcdu import handle_plpcdu_hk
-from pus_tm.devs.rad_sensor import handle_rad_sensor_data
-from pus_tm.devs.sus import handle_sus_hk
-from pus_tm.system.tcs import handle_thermal_controller_hk_data
-from tmtc.ploc_supervisor import handle_supv_hk_data
+from eive_tmtc.tmtc.acs.acs_ctrl import handle_raw_mgm_data, handle_acs_ctrl_hk_data
+from eive_tmtc.tmtc.power.plpcdu import handle_plpcdu_hk
+from eive_tmtc.tmtc.payload.rad_sensor import handle_rad_sensor_data
+from eive_tmtc.tmtc.acs.sus import handle_sus_hk
+from eive_tmtc.tmtc.payload.ploc_supervisor import handle_supv_hk_data
+from eive_tmtc.tmtc.acs.reaction_wheels import handle_rw_hk_data
+from eive_tmtc.tmtc.com.syrlinks_handler import handle_syrlinks_hk_data
+from eive_tmtc.tmtc.tcs import handle_thermal_controller_hk_data
 from tmtccmd.tm.pus_3_fsfw_hk import (
     Service3Base,
     HkContentType,
     Service3FsfwTm,
 )
 from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT
-from tmtccmd.logging import get_console_logger
 
-from pus_tm.devs.bpx_bat import handle_bpx_hk_data
-from pus_tm.devs.gps import handle_gps_data
-from pus_tm.devs.gyros import handle_gyros_hk_data
-from pus_tm.devs.imtq_mgt import (
+from eive_tmtc.tmtc.power.bpx_batt import handle_bpx_hk_data
+from eive_tmtc.tmtc.acs.gps import handle_gps_data
+from eive_tmtc.tmtc.acs.gyros import handle_gyros_hk_data
+from eive_tmtc.tmtc.power.tm import (
+    handle_pdu_data,
+    handle_p60_hk_data,
+    handle_acu_hk_data,
+)
+from eive_tmtc.tmtc.acs.imtq import (
+    ImtqSetId,
     handle_self_test_data,
     handle_eng_set,
     handle_calibrated_mtm_measurement,
     handle_raw_mtm_measurement,
 )
-from tmtc.power.tm import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data
-from pus_tm.devs.syrlinks import handle_syrlinks_hk_data
-from pus_tc.devs.imtq import ImtqSetIds
-from pus_tm.devs.reaction_wheels import handle_rw_hk_data
-from pus_tm.defs import FsfwTmTcPrinter
-from pus_tm.system.core import handle_core_hk_data
-from pus_tm.devs.mgms import handle_mgm_hk_data
-import config.object_ids as obj_ids
+from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter
+from eive_tmtc.tmtc.core import handle_core_hk_data
+from eive_tmtc.tmtc.acs.mgms import handle_mgm_hk_data
+import eive_tmtc.config.object_ids as obj_ids
 
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
 FORWARD_SENSOR_TEMPS = False
@@ -70,11 +75,11 @@ def handle_hk_packet(
                 hk_data=hk_data,
             )
         except ValueError as e:
-            LOGGER.exception(
+            _LOGGER.exception(
                 f"{e} error when parsing HK data coming from {named_obj_id}"
             )
     if tm_packet.subservice == 10 or tm_packet.subservice == 12:
-        LOGGER.warning("HK definitions printout not implemented yet")
+        _LOGGER.warning("HK definitions printout not implemented yet")
 
 
 def handle_regular_hk_print(
@@ -91,18 +96,18 @@ def handle_regular_hk_print(
     elif objb == obj_ids.SYRLINKS_HANDLER_ID:
         handle_syrlinks_hk_data(printer=printer, hk_data=hk_data, set_id=set_id)
     elif objb == obj_ids.IMTQ_HANDLER_ID:
-        if (set_id >= ImtqSetIds.POSITIVE_X_TEST) and (
-            set_id <= ImtqSetIds.NEGATIVE_Z_TEST
+        if (set_id >= ImtqSetId.POSITIVE_X_TEST) and (
+            set_id <= ImtqSetId.NEGATIVE_Z_TEST
         ):
             return handle_self_test_data(printer, hk_data)
-        elif set_id == ImtqSetIds.ENG_HK_SET:
+        elif set_id == ImtqSetId.ENG_HK_SET:
             return handle_eng_set(printer, hk_data)
-        elif set_id == ImtqSetIds.CAL_MTM_SET:
+        elif set_id == ImtqSetId.CAL_MTM_SET:
             return handle_calibrated_mtm_measurement(printer, hk_data)
-        elif set_id == ImtqSetIds.RAW_MTM_SET:
+        elif set_id == ImtqSetId.RAW_MTM_SET:
             return handle_raw_mtm_measurement(printer, hk_data)
         else:
-            LOGGER.info("Service 3 TM: IMTQ handler reply with unknown set id")
+            _LOGGER.info("Service 3 TM: IMTQ handler reply with unknown set id")
     elif objb == obj_ids.GPS_CONTROLLER:
         return handle_gps_data(printer=printer, hk_data=hk_data)
     elif objb == obj_ids.BPX_HANDLER_ID:
@@ -171,9 +176,9 @@ def handle_regular_hk_print(
     elif objb == obj_ids.PLOC_SUPV_ID:
         handle_supv_hk_data(set_id=set_id, hk_data=hk_data, printer=printer)
     elif objb == obj_ids.ACS_CONTROLLER:
-        handle_acs_ctrl_mgm_data(printer, hk_data)
+        handle_acs_ctrl_hk_data(printer, set_id, hk_data)
     else:
-        LOGGER.info(
+        _LOGGER.info(
             f"Service 3 TM: Parsing for object {object_id} and set ID {set_id} "
             f"has not been implemented."
         )

eive_tmtc/pus_tm/verification_handler.py

@@ -0,0 +1,66 @@
+import logging
+from typing import List, Optional
+
+from spacepackets.ccsds import CdsShortTimestamp
+from spacepackets.ecss.pus_1_verification import UnpackParams, Service1Tm
+from tmtccmd.pus import VerificationWrapper
+from tmtccmd.tm.pus_1_verification import Service1FsfwWrapper
+from eive_tmtc.config.retvals import get_retval_dict
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def handle_service_1_fsfw_packet(wrapper: VerificationWrapper, raw_tm: bytes):
+    if wrapper.console_logger is None or wrapper.file_logger is None:
+        raise ValueError(
+            "Console logger or file logger not valid. Please set a valid one"
+        )
+    # Error code with length 2 is FSFW specific
+    tm_packet = Service1Tm.unpack(
+        data=raw_tm, params=UnpackParams(CdsShortTimestamp.empty(), 1, 2)
+    )
+    fsfw_wrapper = Service1FsfwWrapper(tm_packet)
+    res = wrapper.verificator.add_tm(tm_packet)
+    if res is None:
+        _LOGGER.info(
+            f"Received Verification TM[{tm_packet.service}, {tm_packet.subservice}] "
+            f"with Request ID {tm_packet.tc_req_id.as_u32():#08x}"
+        )
+        _LOGGER.warning(f"No matching telecommand found for {tm_packet.tc_req_id}")
+    else:
+        wrapper.log_to_console(tm_packet, res)
+        wrapper.log_to_file(tm_packet, res)
+    if tm_packet.has_failure_notice:
+        str_list = generic_retval_printout(
+            tm_packet.error_code.val,
+            fsfw_wrapper.error_param_1,
+            fsfw_wrapper.error_param_2,
+        )
+        for string in str_list:
+            wrapper.dlog(string)
+
+
+def generic_retval_printout(
+    retval: int, p1: Optional[int] = None, p2: Optional[int] = None
+) -> List[str]:
+    retval_dict = get_retval_dict()
+    retval_info = retval_dict.get(retval)
+    if retval_info is None:
+        raw_err = retval
+        return [
+            f"No returnvalue information found for error code  with "
+            f"subsystem ID {(raw_err >> 8) & 0xff} and unique ID {raw_err & 0xff}"
+        ]
+    else:
+        retval_string = (
+            f"Error Code information for code {retval:#06x} | "
+            f"Name: {retval_info.name} | Info: {retval_info.info}"
+        )
+        string_list = [retval_string]
+        if p1:
+            error_param_1_str = f"Error Parameter 1: hex {p1:#010x} " f"dec {p1} "
+            string_list.append(error_param_1_str)
+        if p2:
+            error_param_2_str = f"Error Parameter 2: hex {p2:#010x} " f"dec {p2}"
+            string_list.append(error_param_2_str)
+        return string_list

eive_tmtc/tmtc/__init__.py

@@ -0,0 +1,5 @@
+from .payload.subsystem import add_payload_subsystem_cmds
+from .solar_array_deployment import add_sa_depl_cmds
+from .test import add_test_defs
+from .time import add_time_cmds
+from .health import add_health_cmd_defs

eive_tmtc/tmtc/acs/acs_board.py

@@ -0,0 +1,134 @@
+import enum
+
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider, DefaultPusQueueHelper
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
+from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID
+
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+
+
+class AcsOpCodes:
+    ACS_ASS_A_SIDE = ["0", "a"]
+    ACS_ASS_B_SIDE = ["1", "b"]
+    ACS_ASS_DUAL_MODE = ["2", "d"]
+    ACS_ASS_OFF = ["3", "off"]
+    ACS_ASS_A_ON = ["4", "ao"]
+    ACS_ASS_B_ON = ["5", "bo"]
+    ACS_ASS_DUAL_ON = ["6", "do"]
+
+
+class DualSideSubmode(enum.IntEnum):
+    A_SIDE = 0
+    B_SIDE = 1
+    DUAL_SIDE = 2
+
+
+def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
+    if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.A_SIDE,
+            q=q,
+            info="Switching to ACS board assembly A side",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.B_SIDE,
+            q=q,
+            info="Switching to ACS board assembly B side",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.DUAL_SIDE,
+            q=q,
+            info="Switching to ACS board assembly dual mode",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_A_ON:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.ON,
+            submode=DualSideSubmode.A_SIDE,
+            q=q,
+            info="Switching ACS board assembly A side on",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_B_ON:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.ON,
+            submode=DualSideSubmode.B_SIDE,
+            q=q,
+            info="Switching ACS board assembly B side on",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.ON,
+            submode=DualSideSubmode.B_SIDE,
+            q=q,
+            info="Switching ACS board assembly dual side on",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_OFF:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Mode.OFF,
+            submode=0,
+            q=q,
+            info="Switching to ACS board assembly off",
+        )
+
+
+@service_provider(CustomServiceList.ACS_BRD_ASS)
+def pack_acs_command_provider(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    pack_acs_command(q, op_code)
+
+
+@tmtc_definitions_provider
+def add_acs_board_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_A_SIDE,
+        info="Switch to ACS board A side",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_B_SIDE,
+        info="Switch to ACS board B side",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_DUAL_MODE,
+        info="Switch to ACS board dual mode",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_A_ON,
+        info="Switch ACS board A side on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_B_ON,
+        info="Switch ACS board B side on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_DUAL_ON,
+        info="Switch ACS board dual mode on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_OFF,
+        info="Switch off ACS board",
+    )
+    defs.add_service(
+        name=CustomServiceList.ACS_BRD_ASS.value,
+        info="ACS Board Assemblie",
+        op_code_entry=oce,
+    )

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -0,0 +1,810 @@
+import enum
+import logging
+import socket
+import struct
+from socket import AF_INET
+from typing import Tuple
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import ACS_CONTROLLER
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_command
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    generate_one_hk_command,
+    make_sid,
+    enable_periodic_hk_command_with_interval,
+    disable_periodic_hk_command,
+    create_request_one_diag_command,
+)
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+
+class SetId(enum.IntEnum):
+    MGM_RAW_SET = 0
+    MGM_PROC_SET = 1
+    SUS_RAW_SET = 2
+    SUS_PROC_SET = 3
+    GYR_RAW_SET = 4
+    GYR_PROC_SET = 5
+    GPS_PROC_SET = 6
+    MEKF_DATA = 7
+    CTRL_VAL_DATA = 8
+    ACTUATOR_CMD_DATA = 9
+
+
+class Submode(enum.IntEnum):
+    SAFE = 2
+    DETUMBLE = 3
+    IDLE = 4
+
+
+class OpCodes:
+    OFF = ["off"]
+    SAFE = ["normal_safe"]
+    DTBL = ["normal_detumble"]
+    IDLE = ["normal_idle"]
+    REQUEST_RAW_MGM_HK = ["0", "mgm_raw_hk"]
+    ENABLE_RAW_MGM_HK = ["1", "mgm_raw_enable_hk"]
+    DISABLE_RAW_MGM_HK = ["2", "mgm_raw_disable_hk"]
+    REQUEST_PROC_MGM_HK = ["3", "mgm_proc_hk"]
+    ENABLE_PROC_MGM_HK = ["4", "mgm_proc_enable_hk"]
+    DISABLE_PROC_MGM_HK = ["5", "mgm_proc_disable_hk"]
+    REQUEST_RAW_SUS_HK = ["6", "sus_raw_hk"]
+    ENABLE_RAW_SUS_HK = ["7", "sus_raw_enable_hk"]
+    DISABLE_RAW_SUS_HK = ["8", "sus_raw_disable_hk"]
+    REQUEST_PROC_SUS_HK = ["9", "sus_proc_hk"]
+    ENABLE_PROC_SUS_HK = ["10", "sus_proc_enable_hk"]
+    DISABLE_PROC_SUS_HK = ["11", "sus_proc_disable_hk"]
+    REQUEST_RAW_GYR_HK = ["12", "gyr_raw_hk"]
+    ENABLE_RAW_GYR_HK = ["13", "gyr_raw_enable_hk"]
+    DISABLE_RAW_GYR_HK = ["14", "gyr_raw_disable_hk"]
+    REQUEST_PROC_GYR_HK = ["15", "gyr_proc_hk"]
+    ENABLE_PROC_GYR_HK = ["16", "gyr_proc_enable_hk"]
+    DISABLE_PROC_GYR_HK = ["17", "gyr_proc_disable_hk"]
+    REQUEST_PROC_GPS_HK = ["18", "gps_proc_hk"]
+    ENABLE_PROC_GPS_HK = ["19", "gps_proc_enable_hk"]
+    DISABLE_PROC_GPS_HK = ["20", "gps_proc_disable_hk"]
+    REQUEST_MEKF_HK = ["21", "mekf_hk"]
+    ENABLE_MEKF_HK = ["22", "mekf_enable_hk"]
+    DISABLE_MEKF_HK = ["23", "mekf_disable_hk"]
+    REQUEST_CTRL_VAL_HK = ["24", "ctrl_val_hk"]
+    ENABLE_CTRL_VAL_HK = ["25", "ctrl_val_enable_hk"]
+    DISABLE_CTRL_VAL_HK = ["26", "ctrl_val_disable_hk"]
+    REQUEST_ACT_CMD_HK = ["27", "act_cmd_hk"]
+    ENABLE_ACT_CMD_HK = ["28", "act_cmd_enable_hk"]
+    DISABLE_ACT_CMD_HK = ["29", "act_cmd_disable_hk"]
+
+
+class Info:
+    OFF = "Switch ACS CTRL off"
+    SAFE = "Switch ACS CTRL normal safe"
+    DTBL = "Switch ACS CTRL normal detumble"
+    IDLE = "Switch ACS CTRL normal idle"
+    REQUEST_RAW_MGM_HK = "Request Raw MGM HK once"
+    ENABLE_RAW_MGM_HK = "Enable Raw MGM HK data generation"
+    DISABLE_RAW_MGM_HK = "Disable Raw MGM HK data generation"
+    REQUEST_PROC_MGM_HK = "Request Processed MGM HK"
+    ENABLE_PROC_MGM_HK = "Enable Processed MGM HK data generation"
+    DISABLE_PROC_MGM_HK = "Disable Processed MGM HK data generation"
+    REQUEST_RAW_SUS_HK = "Request Raw SUS HK"
+    ENABLE_RAW_SUS_HK = "Enable Raw SUS HK data generation"
+    DISABLE_RAW_SUS_HK = "Disable Raw SUS HK data generation"
+    REQUEST_PROC_SUS_HK = "Request Processed SUS HK"
+    ENABLE_PROC_SUS_HK = "Enable Processed SUS HK data generation"
+    DISABLE_PROC_SUS_HK = "Disable Processed MGM HK data generation"
+    REQUEST_RAW_GYR_HK = "Request Raw GYR HK"
+    ENABLE_RAW_GYR_HK = "Enable Raw GYR HK data generation"
+    DISABLE_RAW_GYR_HK = "Disable Raw GYR HK data generation"
+    REQUEST_PROC_GYR_HK = "Request Processed GYR HK"
+    ENABLE_PROC_GYR_HK = "Enable Processed GYR HK data generation"
+    DISABLE_PROC_GYR_HK = "Disable Processed GYR HK data generation"
+    REQUEST_PROC_GPS_HK = "Request Processed GPS HK"
+    ENABLE_PROC_GPS_HK = "Enable Processed GPS HK data generation"
+    DISABLE_PROC_GPS_HK = "Disable Processed GPS HK data generation"
+    REQUEST_MEKF_HK = "Request MEKF HK"
+    ENABLE_MEKF_HK = "Enable MEKF HK data generation"
+    DISABLE_MEKF_HK = "Disable MEKF HK data generation"
+    REQUEST_CTRL_VAL_HK = "Request Control Values HK"
+    ENABLE_CTRL_VAL_HK = "Enable Control Values HK data generation"
+    DISABLE_CTRL_VAL_HK = "Disable Control Values HK data generation"
+    REQUEST_ACT_CMD_HK = "Request Actuator Commands HK"
+    ENABLE_ACT_CMD_HK = "Enable Actuator Commands HK data generation"
+    DISABLE_ACT_CMD_HK = "Disable Actuator Commands HK data generation"
+
+
+PERFORM_MGM_CALIBRATION = False
+CALIBRATION_SOCKET_HOST = "localhost"
+CALIBRATION_SOCKET_PORT = 6677
+CALIBRATION_ADDR = (CALIBRATION_SOCKET_HOST, CALIBRATION_SOCKET_PORT)
+
+if PERFORM_MGM_CALIBRATION:
+    CALIBR_SOCKET = socket.socket(AF_INET, socket.SOCK_STREAM)
+    CALIBR_SOCKET.setblocking(False)
+    CALIBR_SOCKET.settimeout(0.2)
+    CALIBR_SOCKET.connect(CALIBRATION_ADDR)
+
+
+@tmtc_definitions_provider
+def acs_cmd_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCodes.OFF, info=Info.OFF)
+    oce.add(keys=OpCodes.SAFE, info=Info.SAFE)
+    oce.add(keys=OpCodes.DTBL, info=Info.DTBL)
+    oce.add(keys=OpCodes.IDLE, info=Info.IDLE)
+    oce.add(keys=OpCodes.REQUEST_RAW_MGM_HK, info=Info.REQUEST_RAW_MGM_HK)
+    oce.add(keys=OpCodes.ENABLE_RAW_MGM_HK, info=Info.ENABLE_RAW_MGM_HK)
+    oce.add(keys=OpCodes.DISABLE_RAW_MGM_HK, info=Info.DISABLE_RAW_MGM_HK)
+    oce.add(keys=OpCodes.REQUEST_PROC_MGM_HK, info=Info.REQUEST_PROC_MGM_HK)
+    oce.add(keys=OpCodes.ENABLE_PROC_MGM_HK, info=Info.ENABLE_PROC_MGM_HK)
+    oce.add(keys=OpCodes.DISABLE_PROC_MGM_HK, info=Info.DISABLE_PROC_MGM_HK)
+    oce.add(keys=OpCodes.REQUEST_RAW_SUS_HK, info=Info.REQUEST_RAW_SUS_HK)
+    oce.add(keys=OpCodes.ENABLE_RAW_SUS_HK, info=Info.ENABLE_RAW_SUS_HK)
+    oce.add(keys=OpCodes.DISABLE_RAW_SUS_HK, info=Info.DISABLE_RAW_SUS_HK)
+    oce.add(keys=OpCodes.REQUEST_PROC_SUS_HK, info=Info.REQUEST_PROC_SUS_HK)
+    oce.add(keys=OpCodes.ENABLE_PROC_SUS_HK, info=Info.ENABLE_PROC_SUS_HK)
+    oce.add(keys=OpCodes.DISABLE_PROC_SUS_HK, info=Info.DISABLE_PROC_SUS_HK)
+    oce.add(keys=OpCodes.REQUEST_RAW_GYR_HK, info=Info.REQUEST_RAW_GYR_HK)
+    oce.add(keys=OpCodes.ENABLE_RAW_GYR_HK, info=Info.ENABLE_RAW_GYR_HK)
+    oce.add(keys=OpCodes.DISABLE_RAW_GYR_HK, info=Info.DISABLE_RAW_GYR_HK)
+    oce.add(keys=OpCodes.REQUEST_PROC_GYR_HK, info=Info.REQUEST_PROC_GYR_HK)
+    oce.add(keys=OpCodes.ENABLE_PROC_GYR_HK, info=Info.ENABLE_PROC_GYR_HK)
+    oce.add(keys=OpCodes.DISABLE_PROC_GYR_HK, info=Info.DISABLE_PROC_GYR_HK)
+    oce.add(keys=OpCodes.REQUEST_PROC_GPS_HK, info=Info.REQUEST_PROC_GPS_HK)
+    oce.add(keys=OpCodes.ENABLE_PROC_GPS_HK, info=Info.ENABLE_PROC_GPS_HK)
+    oce.add(keys=OpCodes.DISABLE_PROC_GPS_HK, info=Info.DISABLE_PROC_GPS_HK)
+    oce.add(keys=OpCodes.REQUEST_MEKF_HK, info=Info.REQUEST_MEKF_HK)
+    oce.add(keys=OpCodes.ENABLE_MEKF_HK, info=Info.ENABLE_MEKF_HK)
+    oce.add(keys=OpCodes.DISABLE_MEKF_HK, info=Info.DISABLE_MEKF_HK)
+    oce.add(keys=OpCodes.REQUEST_CTRL_VAL_HK, info=Info.REQUEST_CTRL_VAL_HK)
+    oce.add(keys=OpCodes.ENABLE_CTRL_VAL_HK, info=Info.ENABLE_CTRL_VAL_HK)
+    oce.add(keys=OpCodes.DISABLE_CTRL_VAL_HK, info=Info.DISABLE_CTRL_VAL_HK)
+    oce.add(keys=OpCodes.REQUEST_ACT_CMD_HK, info=Info.REQUEST_ACT_CMD_HK)
+    oce.add(keys=OpCodes.ENABLE_ACT_CMD_HK, info=Info.ENABLE_ACT_CMD_HK)
+    oce.add(keys=OpCodes.DISABLE_ACT_CMD_HK, info=Info.DISABLE_ACT_CMD_HK)
+    defs.add_service(
+        name=CustomServiceList.ACS_CTRL.value, info="ACS Controller", op_code_entry=oce
+    )
+
+
+@service_provider(CustomServiceList.ACS_CTRL.value)
+def pack_acs_ctrl_command(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    if op_code in OpCodes.OFF:
+        q.add_log_cmd(f"{Info.OFF}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.OFF, 0))
+    elif op_code in OpCodes.SAFE:
+        q.add_log_cmd(f"{Info.SAFE}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.SAFE))
+    elif op_code in OpCodes.DTBL:
+        q.add_log_cmd(f"{Info.DTBL}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.DETUMBLE))
+    elif op_code in OpCodes.IDLE:
+        q.add_log_cmd(f"{Info.IDLE}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.IDLE))
+    elif op_code in OpCodes.REQUEST_RAW_MGM_HK:
+        q.add_log_cmd(Info.REQUEST_RAW_MGM_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.MGM_RAW_SET))
+        )
+    elif op_code in OpCodes.ENABLE_RAW_MGM_HK:
+        q.add_log_cmd(Info.ENABLE_RAW_MGM_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.MGM_RAW_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_RAW_MGM_HK:
+        q.add_log_cmd(Info.DISABLE_RAW_MGM_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.MGM_RAW_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_PROC_MGM_HK:
+        q.add_log_cmd(Info.REQUEST_PROC_MGM_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.MGM_PROC_SET))
+        )
+    elif op_code in OpCodes.ENABLE_PROC_MGM_HK:
+        q.add_log_cmd(Info.ENABLE_PROC_MGM_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.MGM_PROC_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_PROC_MGM_HK:
+        q.add_log_cmd(Info.DISABLE_PROC_MGM_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.MGM_PROC_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_RAW_SUS_HK:
+        q.add_log_cmd(Info.REQUEST_RAW_SUS_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.SUS_RAW_SET))
+        )
+    elif op_code in OpCodes.ENABLE_RAW_SUS_HK:
+        q.add_log_cmd(Info.ENABLE_RAW_SUS_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.SUS_RAW_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_RAW_SUS_HK:
+        q.add_log_cmd(Info.DISABLE_RAW_SUS_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.SUS_RAW_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_PROC_SUS_HK:
+        q.add_log_cmd(Info.REQUEST_PROC_SUS_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.SUS_PROC_SET))
+        )
+    elif op_code in OpCodes.ENABLE_PROC_SUS_HK:
+        q.add_log_cmd(Info.ENABLE_PROC_SUS_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.SUS_PROC_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_PROC_SUS_HK:
+        q.add_log_cmd(Info.DISABLE_PROC_SUS_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.SUS_PROC_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_RAW_GYR_HK:
+        q.add_log_cmd(Info.REQUEST_RAW_GYR_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET))
+        )
+    elif op_code in OpCodes.ENABLE_RAW_GYR_HK:
+        q.add_log_cmd(Info.ENABLE_RAW_GYR_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            True, make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_RAW_GYR_HK:
+        q.add_log_cmd(Info.DISABLE_RAW_GYR_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                True, make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_PROC_GYR_HK:
+        q.add_log_cmd(Info.REQUEST_PROC_GYR_HK)
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET)
+            )
+        )
+    elif op_code in OpCodes.ENABLE_PROC_GYR_HK:
+        q.add_log_cmd(Info.ENABLE_PROC_GYR_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_PROC_GYR_HK:
+        q.add_log_cmd(Info.DISABLE_PROC_GYR_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_PROC_GPS_HK:
+        q.add_log_cmd(Info.REQUEST_PROC_GPS_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.GPS_PROC_SET))
+        )
+    elif op_code in OpCodes.ENABLE_PROC_GPS_HK:
+        q.add_log_cmd(Info.ENABLE_PROC_GPS_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.GPS_PROC_SET), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_PROC_GPS_HK:
+        q.add_log_cmd(Info.DISABLE_PROC_GPS_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.GPS_PROC_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_MEKF_HK:
+        q.add_log_cmd(Info.REQUEST_MEKF_HK)
+        q.add_pus_tc(generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.MEKF_DATA)))
+    elif op_code in OpCodes.ENABLE_MEKF_HK:
+        q.add_log_cmd(Info.ENABLE_MEKF_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            True, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_MEKF_HK:
+        q.add_log_cmd(Info.DISABLE_MEKF_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(True, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA))
+        )
+    elif op_code in OpCodes.REQUEST_CTRL_VAL_HK:
+        q.add_log_cmd(Info.REQUEST_CTRL_VAL_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.CTRL_VAL_DATA))
+        )
+    elif op_code in OpCodes.ENABLE_CTRL_VAL_HK:
+        q.add_log_cmd(Info.ENABLE_CTRL_VAL_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.CTRL_VAL_DATA), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_CTRL_VAL_HK:
+        q.add_log_cmd(Info.DISABLE_CTRL_VAL_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.CTRL_VAL_DATA)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_ACT_CMD_HK:
+        q.add_log_cmd(Info.REQUEST_ACT_CMD_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.ACTUATOR_CMD_DATA))
+        )
+    elif op_code in OpCodes.ENABLE_ACT_CMD_HK:
+        q.add_log_cmd(Info.ENABLE_ACT_CMD_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(ACS_CONTROLLER, SetId.ACTUATOR_CMD_DATA), 2.0
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_ACT_CMD_HK:
+        q.add_log_cmd(Info.DISABLE_ACT_CMD_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(ACS_CONTROLLER, SetId.ACTUATOR_CMD_DATA)
+            )
+        )
+    else:
+        logging.getLogger(__name__).info(f"Unknown op code {op_code}")
+
+
+def handle_acs_ctrl_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    match set_id:
+        case SetId.MGM_RAW_SET:
+            handle_raw_mgm_data(pw, hk_data)
+        case SetId.MGM_PROC_SET:
+            handle_mgm_data_processed(pw, hk_data)
+        case SetId.SUS_RAW_SET:
+            handle_acs_ctrl_sus_raw_data(pw, hk_data)
+        case SetId.SUS_PROC_SET:
+            handle_acs_ctrl_sus_processed_data(pw, hk_data)
+        case SetId.GYR_RAW_SET:
+            handle_gyr_data_raw(pw, hk_data)
+        case SetId.GYR_PROC_SET:
+            handle_gyr_data_processed(pw, hk_data)
+        case SetId.GPS_PROC_SET:
+            handle_gps_data_processed(pw, hk_data)
+        case SetId.MEKF_DATA:
+            handle_mekf_data(pw, hk_data)
+        case SetId.CTRL_VAL_DATA:
+            handle_ctrl_val_data(pw, hk_data)
+        case SetId.ACTUATOR_CMD_DATA:
+            handle_act_cmd_data(pw, hk_data)
+
+
+def handle_acs_ctrl_sus_raw_data(pw: PrintWrapper, hk_data: bytes):
+    if len(hk_data) < 6 * 2 * 12:
+        pw.dlog(
+            f"SUS Raw dataset with size {len(hk_data)} does not have expected size"
+            f" of {6 * 2 * 12} bytes"
+        )
+        return
+    current_idx = 0
+    vec_fmt = "["
+    for _ in range(5):
+        vec_fmt += "{:#06x}, "
+    vec_fmt += "{:#06x}]"
+    for idx in range(12):
+        fmt_str = "!HHHHHH"
+        length = struct.calcsize(fmt_str)
+        sus_list = struct.unpack(fmt_str, hk_data[current_idx : current_idx + length])
+        sus_list_formatted = vec_fmt.format(*sus_list)
+        current_idx += length
+        pw.dlog(f"SUS {idx} RAW: {sus_list_formatted}")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=12)
+
+
+def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
+    if len(hk_data) < 3 * 4 * 12 + 3 * 8 * 3:
+        pw.dlog(
+            f"SUS Processed dataset with size {len(hk_data)} does not have expected size"
+            f" of {3 * 4 * 12 + 3 * 8 * 3} bytes"
+        )
+        return
+    current_idx = 0
+    for idx in range(12):
+        fmt_str = "!fff"
+        length = struct.calcsize(fmt_str)
+        sus_list = struct.unpack(fmt_str, hk_data[current_idx : current_idx + length])
+        sus_list_formatted = [f"{val:8.3f}" for val in sus_list]
+        current_idx += length
+        pw.dlog(f"SUS {idx} CALIB: {sus_list_formatted}")
+    fmt_str = "!ddd"
+    inc_len = struct.calcsize(fmt_str)
+    sus_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+
+    sus_vec_tot = [f"{val:8.3f}" for val in sus_vec_tot]
+    current_idx += inc_len
+    pw.dlog(f"SUS Vector Total: {sus_vec_tot}")
+    sus_vec_tot_deriv = struct.unpack(
+        fmt_str, hk_data[current_idx : current_idx + inc_len]
+    )
+    sus_vec_tot_deriv = [f"{val:8.3f}" for val in {sus_vec_tot_deriv}]
+    current_idx += inc_len
+    pw.dlog(f"SUS Vector Derivative: {sus_vec_tot_deriv}")
+    sun_ijk_model = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    sun_ijk_model = [f"{val:8.3f}" for val in sun_ijk_model]
+    current_idx += inc_len
+    pw.dlog(f"SUS ijk Model: {sun_ijk_model}")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=15)
+
+
+def handle_raw_mgm_data(pw: PrintWrapper, hk_data: bytes):
+    current_idx = 0
+
+    if len(hk_data) < 61:
+        pw.dlog(
+            f"ACS CTRL HK: MGM HK data with length {len(hk_data)} shorter than expected 61 bytes"
+        )
+        pw.dlog(f"Raw Data: {hk_data.hex(sep=',')}")
+        return
+
+    def unpack_float_tuple(idx: int) -> (tuple, int):
+        f_tuple = struct.unpack(
+            float_tuple_fmt_str,
+            hk_data[idx : idx + struct.calcsize(float_tuple_fmt_str)],
+        )
+        idx += struct.calcsize(float_tuple_fmt_str)
+        return f_tuple, idx
+
+    float_tuple_fmt_str = "!fff"
+    mgm_0_lis3_floats_ut, current_idx = unpack_float_tuple(current_idx)
+    mgm_1_rm3100_floats_ut, current_idx = unpack_float_tuple(current_idx)
+    mgm_2_lis3_floats_ut, current_idx = unpack_float_tuple(current_idx)
+    mgm_3_rm3100_floats_ut, current_idx = unpack_float_tuple(current_idx)
+    isis_floats_nt, current_idx = unpack_float_tuple(current_idx)
+    imtq_mgm_ut = tuple(val / 1000.0 for val in isis_floats_nt)
+    pw.dlog("ACS CTRL HK: MGM values [X,Y,Z] in floating point uT: ")
+    mgm_lists = [
+        mgm_0_lis3_floats_ut,
+        mgm_1_rm3100_floats_ut,
+        mgm_2_lis3_floats_ut,
+        mgm_3_rm3100_floats_ut,
+        imtq_mgm_ut,
+    ]
+    formatted_list = []
+    # Reserve 8 decimal digits, use precision 3
+    float_str_fmt = "[{:8.3f}, {:8.3f}, {:8.3f}]"
+    for mgm_entry in mgm_lists[0:4]:
+        formatted_list.append(float_str_fmt.format(*mgm_entry))
+    formatted_list.append(float_str_fmt.format(*mgm_lists[4]))
+    formatted_list.append(hk_data[current_idx])
+    print_str_list = [
+        "ACS Board MGM 0 LIS3MDL",
+        "ACS Board MGM 1 RM3100",
+        "ACS Board MGM 2 LIS3MDL",
+        "ACS Board MGM 3 RM3100",
+        "IMTQ MGM:",
+        "IMTQ Actuation Status:",
+    ]
+    for entry in zip(print_str_list, formatted_list):
+        pw.dlog(f"{entry[0].ljust(28)}: {entry[1]}")
+    current_idx += 1
+    if PERFORM_MGM_CALIBRATION:
+        perform_mgm_calibration(pw, mgm_0_lis3_floats_ut)
+    assert current_idx == 61
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=6)
+
+
+def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received Processed MGM Set")
+    fmt_str = "!fffffddd"
+    inc_len = struct.calcsize(fmt_str)
+    if len(hk_data) < inc_len:
+        pw.dlog("Recieved HK set too small")
+        return
+    current_idx = 0
+    for i in range(5):
+        fmt_str = "!fff"
+        inc_len = struct.calcsize(fmt_str)
+        mgm_vec = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        mgm_vec = [f"{val:8.3f}" for val in mgm_vec]
+        pw.dlog(f"MGM {i}: {mgm_vec}")
+        current_idx += inc_len
+    fmt_str = "!ddd"
+    inc_len = struct.calcsize(fmt_str)
+    mgm_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    mgm_vec_tot = [f"{val:8.3f}" for val in mgm_vec_tot]
+    current_idx += inc_len
+    pw.dlog(f"MGM Total Vec: {mgm_vec_tot}")
+    mgm_vec_tot_deriv = struct.unpack(
+        fmt_str, hk_data[current_idx : current_idx + inc_len]
+    )
+    mgm_vec_tot_deriv = [f"{val:8.3f}" for val in mgm_vec_tot_deriv]
+    pw.dlog(f"MGM Total Vec Deriv: {mgm_vec_tot_deriv}")
+    current_idx += inc_len
+    mag_igrf_model = struct.unpack(
+        fmt_str, hk_data[current_idx : current_idx + inc_len]
+    )
+    mag_igrf_model = [f"{val:8.3f}" for val in mag_igrf_model]
+    pw.dlog(f"MAG IGRF Model: {mag_igrf_model}")
+    current_idx += inc_len
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=8)
+
+
+def handle_gyr_data_raw(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received GYR Raw Set with rotation rates in deg per second")
+    float_fmt = "!fff"
+    double_fmt = "!ddd"
+    inc_len_flt = struct.calcsize(float_fmt)
+    inc_len_double = struct.calcsize(double_fmt)
+    if len(hk_data) < 2 * inc_len_double + 2 * inc_len_flt:
+        pw.dlog("HK data too small")
+        return
+    current_idx = 0
+    float_str_fmt = "[{:8.3f}, {:8.3f}, {:8.3f}]"
+    gyr_0_adis = struct.unpack(
+        double_fmt, hk_data[current_idx : current_idx + inc_len_double]
+    )
+    current_idx += inc_len_double
+    gyr_1_l3 = struct.unpack(
+        float_fmt, hk_data[current_idx : current_idx + inc_len_flt]
+    )
+    current_idx += inc_len_flt
+    gyr_2_adis = struct.unpack(
+        double_fmt, hk_data[current_idx : current_idx + inc_len_double]
+    )
+    current_idx += inc_len_double
+    gyr_3_l3 = struct.unpack(
+        float_fmt, hk_data[current_idx : current_idx + inc_len_flt]
+    )
+    current_idx += inc_len_flt
+    pw.dlog(f"{'GYR 0 ADIS'.ljust(15)}: {float_str_fmt.format(*gyr_0_adis)}")
+    pw.dlog(f"{'GYR 1 L3'.ljust(15)}: {float_str_fmt.format(*gyr_1_l3)}")
+    pw.dlog(f"{'GYR 2 ADIS'.ljust(15)}: {float_str_fmt.format(*gyr_2_adis)}")
+    pw.dlog(f"{'GYR 3 L3'.ljust(15)}: {float_str_fmt.format(*gyr_3_l3)}")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], 4)
+
+
+GYR_NAMES = ["GYR 0 ADIS", "GYR 1 L3", "GYR 2 ADIS", "GYR 3 L3"]
+
+
+def handle_gyr_data_processed(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received GYR Processed Set with rotation rates in deg per second")
+    fmt_str = "!ddd"
+    inc_len = struct.calcsize(fmt_str)
+    current_idx = 0
+    for i in range(4):
+        gyr_vec = [
+            f"{val:8.3f}"
+            for val in struct.unpack(
+                fmt_str, hk_data[current_idx : current_idx + inc_len]
+            )
+        ]
+        pw.dlog(f"{GYR_NAMES[i]}: {gyr_vec}")
+        current_idx += inc_len
+    gyr_vec_tot = [
+        f"{val:8.3f}"
+        for val in struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    ]
+    pw.dlog(f"GYR Vec Total: {gyr_vec_tot}")
+    current_idx += inc_len
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=5)
+
+
+def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received GPS Processed Set")
+    fmt_scalar = "!d"
+    fmt_vec = "!ddd"
+    inc_len_scalar = struct.calcsize(fmt_scalar)
+    inc_len_vec = struct.calcsize(fmt_vec)
+    if len(hk_data) < 2 * inc_len_scalar + 2 * inc_len_vec:
+        pw.dlog("Received HK set too small")
+        return
+    current_idx = 0
+    lat = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_scalar, hk_data[current_idx : current_idx + inc_len_scalar]
+        )
+    ]
+    current_idx += inc_len_scalar
+    long = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_scalar, hk_data[current_idx : current_idx + inc_len_scalar]
+        )
+    ]
+    current_idx += inc_len_scalar
+    pos = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
+        )
+    ]
+    velo = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
+        )
+    ]
+    current_idx += inc_len_vec
+    pw.dlog(f"GPS Latitude: {lat} [rad]")
+    pw.dlog(f"GPS Longitude: {long} [rad]")
+    pw.dlog(f"GPS Position: {pos} [m]")
+    pw.dlog(f"GPS Velocity: {velo} [m/s]")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)
+
+
+def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received MEKF Set")
+    fmt_quat = "!dddd"
+    fmt_vec = "!ddd"
+    inc_len_quat = struct.calcsize(fmt_quat)
+    inc_len_vec = struct.calcsize(fmt_vec)
+    if len(hk_data) < inc_len_quat + inc_len_vec:
+        pw.dlog("Received HK set too small")
+        return
+    current_idx = 0
+    quat = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_quat, hk_data[current_idx : current_idx + inc_len_quat]
+        )
+    ]
+    current_idx += inc_len_quat
+    rate = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
+        )
+    ]
+    current_idx += inc_len_vec
+    pw.dlog(f"MEKF Quaternion: {quat}")
+    pw.dlog(f"MEKF Rotational Rate: {rate}")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=2)
+
+
+def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received CTRL Values Set")
+    fmt_quat = "!dddd"
+    fmt_scalar = "!d"
+    inc_len_quat = struct.calcsize(fmt_quat)
+    inc_len_scalar = struct.calcsize(fmt_scalar)
+    if len(hk_data) < 2 * inc_len_quat + inc_len_scalar:
+        pw.dlog("Received HK set too small")
+        return
+    current_idx = 0
+    tgt_quat = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_quat, hk_data[current_idx : current_idx + inc_len_quat]
+        )
+    ]
+    current_idx += inc_len_quat
+    err_quat = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_quat, hk_data[current_idx : current_idx + inc_len_quat]
+        )
+    ]
+    current_idx += inc_len_quat
+    err_ang = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_scalar, hk_data[current_idx : current_idx + inc_len_scalar]
+        )
+    ]
+    current_idx += inc_len_scalar
+    pw.dlog(f"Control Values Target Quaternion: {tgt_quat}")
+    pw.dlog(f"Control Values Error Quaternion: {err_quat}")
+    pw.dlog(f"Control Values Error Angle: {err_ang} [rad]")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)
+
+
+def handle_act_cmd_data(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received Actuator Command Values Set")
+    fmt_vec4_double = "!dddd"
+    fmt_vec4_int32 = "!iiii"
+    fmt_vec3_int16 = "!hhh"
+    inc_len_vec4_double = struct.calcsize(fmt_vec4_double)
+    inc_len_vec4_int32 = struct.calcsize(fmt_vec4_int32)
+    inc_len_vec3_int16 = struct.calcsize(fmt_vec3_int16)
+    if len(hk_data) < inc_len_vec4_double + inc_len_vec4_int32 + inc_len_vec3_int16:
+        pw.dlog("Received HK set too small")
+        return
+    current_idx = 0
+    rw_tgt_torque = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec4_double, hk_data[current_idx : current_idx + inc_len_vec4_double]
+        )
+    ]
+    current_idx += inc_len_vec4_double
+    rw_tgt_speed = [
+        f"{val:d}"
+        for val in struct.unpack(
+            fmt_vec4_int32, hk_data[current_idx : current_idx + inc_len_vec4_int32]
+        )
+    ]
+    current_idx += inc_len_vec4_int32
+    mtq_tgt_dipole = [
+        f"{val:d}"
+        for val in struct.unpack(
+            fmt_vec3_int16, hk_data[current_idx : current_idx + inc_len_vec3_int16]
+        )
+    ]
+    current_idx += inc_len_vec3_int16
+    pw.dlog(f"Actuator Commands RW Target Torque: {rw_tgt_torque}")
+    pw.dlog(f"Actuator Commands RW Target Speed: {rw_tgt_speed}")
+    pw.dlog(f"Actuator Commands MTQ Target Dipole: {mtq_tgt_dipole}")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)
+
+
+def perform_mgm_calibration(pw: PrintWrapper, mgm_tuple: Tuple):
+    global CALIBR_SOCKET, CALIBRATION_ADDR
+    try:
+        declare_api_cmd = "declare_api_version 2"
+        CALIBR_SOCKET.sendall(f"{declare_api_cmd}\n".encode())
+        reply = CALIBR_SOCKET.recv(1024)
+        if len(reply) != 2:
+            pw.dlog(
+                f"MGM calibration: Reply received command {declare_api_cmd} has"
+                f" invalid length {len(reply)}"
+            )
+            return
+        else:
+            if str(reply[0]) == "0":
+                pw.dlog(f"MGM calibration: API version 2 was not accepted")
+                return
+        if len(mgm_tuple) != 3:
+            pw.dlog(f"MGM tuple has invalid length {len(mgm_tuple)}")
+        mgm_list = [mgm / 1e6 for mgm in mgm_tuple]
+        command = (
+            f"magnetometer_field {mgm_list[0]} {mgm_list[1]} {mgm_list[2]}\n".encode()
+        )
+        CALIBR_SOCKET.sendall(command)
+        reply = CALIBR_SOCKET.recv(1024)
+        if len(reply) != 2:
+            pw.dlog(
+                f"MGM calibration: Reply received command magnetometer_field has invalid "
+                f"length {len(reply)}"
+            )
+            return
+        else:
+            if str(reply[0]) == "0":
+                pw.dlog(f"MGM calibration: magnetmeter field format was not accepted")
+                return
+        pw.dlog(f"Sent data {mgm_list} to Helmholtz Testbench successfully")
+    except socket.timeout:
+        pw.dlog("Socket timeout")
+    except BlockingIOError as e:
+        pw.dlog(f"Error {e}")
+    except ConnectionResetError as e:
+        pw.dlog("Socket was closed")
+    except ConnectionRefusedError or OSError:
+        pw.dlog("Connecting to Calibration Socket on addrss {} failed")

eive_tmtc/tmtc/acs/gps.py

@@ -0,0 +1,84 @@
+import logging
+import struct
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config.tmtc import tmtc_definitions_provider
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class OpCode:
+    REQ_OS_HK = ["hk"]
+    RESET_GNSS = ["reset"]
+
+
+class Info:
+    REQ_OS_HK = "Request One-Shot HK"
+    RESET_GNSS = "Reset GNSS using reset pin"
+
+
+class SetId:
+    HK = 0
+
+
+@tmtc_definitions_provider
+def add_gps_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
+    oce.add(keys=OpCode.REQ_OS_HK, info=Info.REQ_OS_HK)
+    defs.add_service(
+        name=CustomServiceList.GPS_CTRL.value,
+        info="GPS/GNSS Controller",
+        op_code_entry=oce,
+    )
+
+
+def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
+    if op_code in OpCode.RESET_GNSS:
+        # TODO: This needs to be re-implemented
+        _LOGGER.warning("Reset pin handling needs to be re-implemented")
+    if op_code in OpCode.REQ_OS_HK:
+        q.add_log_cmd(f"GMSS: {Info.REQ_OS_HK}")
+        q.add_pus_tc(
+            generate_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.HK))
+        )
+
+
+def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    pw.dlog(f"Received GPS data, HK data length {len(hk_data)}")
+    current_idx = 0
+    fmt_str = "!ddddBBBHBBBBBI"
+    inc_len = struct.calcsize(fmt_str)
+    (
+        lat,
+        long,
+        alt,
+        speed,
+        fix,
+        sats_in_use,
+        sats_in_view,
+        year,
+        month,
+        day,
+        hours,
+        minutes,
+        seconds,
+        unix_seconds,
+    ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    date_string = f"{day}.{month}.{year} {hours}:{minutes}:{seconds}"
+    pw.dlog(f"Lat: {lat} deg")
+    pw.dlog(f"Long: {long} deg")
+    pw.dlog(f"Altitude: {alt} m | Speed: {speed} m/s")
+    pw.dlog(
+        f"Fix Type: {fix} | Sats in View {sats_in_view} | Sats in Use {sats_in_use}"
+    )
+    pw.dlog(f"GNSS Date: {date_string}")
+    pw.dlog(f"Unix seconds {unix_seconds}")
+    printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=14)

eive_tmtc/tmtc/acs/gyros.py

@@ -1,11 +1,20 @@
+import enum
 import struct
 
-from pus_tm.defs import PrintWrapper
+import eive_tmtc.config.object_ids as obj_ids
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
-from pus_tc.devs.gyros import L3gGyroSetIds, AdisGyroSetIds
-import config.object_ids as obj_ids
+
+class AdisGyroSetId(enum.IntEnum):
+    CORE_HK = 0
+    CFG_HK = 1
+
+
+class L3gGyroSetId(enum.IntEnum):
+    CORE_HK = 0
 
 
 def handle_gyros_hk_data(
@@ -30,7 +39,7 @@ def handle_gyros_hk_data(
 def handle_adis_gyro_hk(
     object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
-    if set_id == AdisGyroSetIds.CORE_HK:
+    if set_id == AdisGyroSetId.CORE_HK:
         pw = PrintWrapper(printer)
         fmt_str = "!ddddddf"
         inc_len = struct.calcsize(fmt_str)
@@ -44,7 +53,7 @@ def handle_adis_gyro_hk(
         )
         pw.dlog(f"Acceleration (m/s^2): X {accelX} | Y {accelY} | Z {accelZ}")
         pw.dlog(f"Temperature {temp} C")
-    if set_id == AdisGyroSetIds.CFG_HK:
+    if set_id == AdisGyroSetId.CFG_HK:
         pw = PrintWrapper(printer)
         fmt_str = "!HBHH"
         inc_len = struct.calcsize(fmt_str)
@@ -60,7 +69,7 @@ def handle_adis_gyro_hk(
 def handle_l3g_gyro_hk(
     object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
-    if set_id == L3gGyroSetIds.CORE_HK:
+    if set_id == L3gGyroSetId.CORE_HK:
         pw = PrintWrapper(printer)
         fmt_str = "!ffff"
         inc_len = struct.calcsize(fmt_str)

eive_tmtc/tmtc/acs/imtq.py

@@ -0,0 +1,492 @@
+# -*- coding: utf-8 -*-
+"""
+@file   imtq.py
+@brief  Tests for the ISIS IMTQ (Magnettorquer) device handler
+@author J. Meier
+@date   25.03.2021
+"""
+import struct
+from typing import List
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    OpCodeEntry,
+    TmtcDefinitionWrapper,
+)
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    generate_one_diag_command,
+    generate_one_hk_command,
+)
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+
+class OpCode:
+    ON = ["on"]
+    NORMAL = ["normal"]
+    OFF = ["off"]
+    SET_DIPOLE = ["set_dipole"]
+
+
+class ImtqSetId:
+    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 ImtqActionId:
+    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])
+
+
+@tmtc_definitions_provider
+def add_imtq_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.OFF, "Mode Off")
+    oce.add(OpCode.ON, "Mode On")
+    oce.add(OpCode.NORMAL, "Mode Normal")
+    oce.add("3", "IMTQ perform pos X self test")
+    oce.add("4", "IMTQ perform neg X self test")
+    oce.add("5", "IMTQ perform pos Y self test")
+    oce.add("6", "IMTQ perform neg Y self test")
+    oce.add("7", "IMTQ perform pos Z self test")
+    oce.add("8", "IMTQ perform neg Z self test")
+    oce.add(OpCode.SET_DIPOLE, "IMTQ command dipole")
+    oce.add("10", "IMTQ get commanded dipole")
+    oce.add("11", "IMTQ get engineering hk set")
+    oce.add("12", "IMTQ get calibrated MTM measurement one shot")
+    oce.add("13", "IMTQ get raw MTM measurement one shot")
+    defs.add_service(CustomServiceList.IMTQ.value, "IMQT Device", oce)
+
+
+def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
+    q.add_log_cmd(
+        f"Testing ISIS IMTQ handler with object id: {object_id.as_hex_string}"
+    )
+
+    if op_code in OpCode.OFF:
+        q.add_log_cmd("IMTQ: Set mode off")
+        command = pack_mode_data(object_id.as_bytes, Mode.OFF, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
+    if op_code in OpCode.ON:
+        q.add_log_cmd("IMTQ: Set mode on")
+        command = pack_mode_data(object_id.as_bytes, Mode.ON, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
+    if op_code in OpCode.NORMAL:
+        q.add_log_cmd("IMTQ: Mode Normal")
+        command = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
+    if op_code == "3":
+        q.add_log_cmd("IMTQ: Perform positive x self test")
+        command = object_id.as_bytes + ImtqActionId.perform_positive_x_test
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Initiate reading of positive x self test results")
+        command = object_id.as_bytes + ImtqActionId.read_self_test_results
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Request dataset with positive x self test results")
+        sid = make_sid(object_id.as_bytes, ImtqSetId.POSITIVE_X_TEST)
+        q.add_pus_tc(generate_one_hk_command(sid))
+
+    if op_code == "4":
+        q.add_log_cmd("IMTQ: Perform negative x self test")
+        command = object_id.as_bytes + ImtqActionId.perform_negative_x_test
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+        q.add_log_cmd("IMTQ: Initiate reading of negative x self test results")
+        command = object_id.as_bytes + ImtqActionId.read_self_test_results
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+        q.add_log_cmd("IMTQ: Request dataset with negative x self test results")
+        sid = make_sid(object_id.as_bytes, ImtqSetId.NEGATIVE_X_TEST)
+        q.add_pus_tc(generate_one_hk_command(sid))
+
+    if op_code == "5":
+        q.add_log_cmd("IMTQ: Perform positive y self test")
+        command = object_id.as_bytes + ImtqActionId.perform_positive_y_test
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+        q.add_log_cmd("IMTQ: Initiate reading of positive y self test results")
+        command = object_id.as_bytes + ImtqActionId.read_self_test_results
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Request dataset with positive y self test results")
+        sid = make_sid(object_id.as_bytes, ImtqSetId.POSITIVE_Y_TEST)
+        q.add_pus_tc(generate_one_hk_command(sid))
+
+    if op_code == "6":
+        q.add_log_cmd("IMTQ: Perform negative y self test")
+        command = object_id.as_bytes + ImtqActionId.perform_negative_y_test
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Initiate reading of negative y self test results")
+        command = object_id.as_bytes + ImtqActionId.read_self_test_results
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Request dataset with negative y self test results")
+        sid = make_sid(object_id.as_bytes, ImtqSetId.NEGATIVE_Y_TEST)
+        q.add_pus_tc(generate_one_hk_command(sid))
+
+    if op_code == "7":
+        q.add_log_cmd("IMTQ: Perform positive z self test")
+        command = object_id.as_bytes + ImtqActionId.perform_positive_z_test
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Initiate reading of positive z self test results")
+        command = object_id.as_bytes + ImtqActionId.read_self_test_results
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+        q.add_log_cmd("IMTQ: Request dataset with positive z self test results")
+        sid = make_sid(object_id.as_bytes, ImtqSetId.POSITIVE_Y_TEST)
+        q.add_pus_tc(generate_one_hk_command(sid))
+
+    if op_code == "8":
+        q.add_log_cmd("IMTQ: Perform negative z self test")
+        command = object_id.as_bytes + ImtqActionId.perform_negative_z_test
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+        q.add_log_cmd("IMTQ: Initiate reading of negative z self test results")
+        command = object_id.as_bytes + ImtqActionId.read_self_test_results
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+        q.add_log_cmd("IMTQ: Request dataset with negative z self test results")
+        sid = make_sid(object_id.as_bytes, ImtqSetId.NEGATIVE_Z_TEST)
+        q.add_pus_tc(generate_one_hk_command(sid))
+
+    if op_code in OpCode.SET_DIPOLE:
+        x_dipole = int(input("Specify X dipole [range [0, 2000] * 10^-4 * Am^2]: "))
+        y_dipole = int(input("Specify Y dipole [range [0, 2000] * 10^-4 * Am^2]: "))
+        z_dipole = int(input("Specify Z dipole [range [0, 2000] * 10^-4 * Am^2]: "))
+        duration = int(
+            input(
+                f"Specify torque duration [range [0, {pow(2, 16) - 1}, "
+                f"0 for continuous generation until update]: "
+            )
+        )
+        dur_str = "infinite" if duration == 0 else str(duration)
+        q.add_log_cmd(
+            f"IMTQ: Commanding dipole X={x_dipole}, Y={y_dipole}, Z={y_dipole}, duration={dur_str}"
+        )
+        q.add_pus_tc(
+            pack_dipole_command(
+                object_id.as_bytes, x_dipole, y_dipole, z_dipole, duration
+            )
+        )
+
+    if op_code == "10":
+        q.add_log_cmd("IMTQ: Get commanded dipole")
+        command = object_id.as_bytes + ImtqActionId.get_commanded_dipole
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+    if op_code == "11":
+        q.add_log_cmd("IMTQ: Get engineering hk set")
+        q.add_pus_tc(
+            generate_one_diag_command(
+                sid=make_sid(object_id=object_id.as_bytes, set_id=ImtqSetId.ENG_HK_SET)
+            )
+        )
+
+    if op_code == "12":
+        q.add_log_cmd("IMTQ: Get calibrated MTM hk set")
+        q.add_pus_tc(
+            generate_one_diag_command(
+                sid=make_sid(object_id=object_id.as_bytes, set_id=ImtqSetId.CAL_MTM_SET)
+            )
+        )
+
+    if op_code == "13":
+        q.add_log_cmd("IMTQ: Get raw MTM hk set")
+        q.add_pus_tc(
+            generate_one_diag_command(
+                sid=make_sid(object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_SET)
+            )
+        )
+
+
+def pack_dipole_command(
+    object_id: bytes, x_dipole: int, y_dipole: int, z_dipole: int, duration: int
+) -> PusTelecommand:
+    """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 = ImtqActionId.start_actuation_dipole
+    command = object_id + action_id
+    x_dipole = int(round(x_dipole))
+    y_dipole = int(round(y_dipole))
+    z_dipole = int(round(z_dipole))
+    if x_dipole < -2000 or x_dipole > 2000:
+        raise_dipole_error("X dipole", x_dipole)
+    if y_dipole < -2000 or y_dipole > 2000:
+        raise_dipole_error("Y dipole", y_dipole)
+    if z_dipole < -2000 or z_dipole > 2000:
+        raise_dipole_error("Z dipole", z_dipole)
+    duration = int(round(duration))
+    if duration < 0 or duration > pow(2, 16) - 1:
+        raise ValueError(
+            f"Duration in ms of {duration} smaller than 0 or larger than allowed {pow(2, 16) - 1}"
+        )
+    command += struct.pack("!h", x_dipole)
+    command += struct.pack("!h", y_dipole)
+    command += struct.pack("!h", z_dipole)
+    command += struct.pack("!H", duration)
+    command = PusTelecommand(service=8, subservice=128, app_data=command)
+    return command
+
+
+def raise_dipole_error(dipole_str: str, value: int):
+    raise ValueError(
+        f"{dipole_str} {value} negative or larger than maximum allowed 2000 * 10^-4*Am^2"
+    )
+
+
+ENG_HK_HEADERS = [
+    "Digital Voltage [mV]",
+    "Analog Voltage [mV]",
+    "Digital Current [mA]",
+    "Analog Current [mA]",
+    "Coil Current X [mA]",
+    "Coil Current Y [mA]",
+    "Coil Current Z [mA]",
+    "Coil X Temperature [°C]",
+    "Coil Y Temperature [°C]",
+    "Coil Z Temperature [°C]",
+    "MCU Temperature [°C]",
+]
+
+
+def unpack_eng_hk(hk_data: bytes) -> List:
+    digital_voltage = struct.unpack("!H", hk_data[0:2])[0]
+    analog_voltage = struct.unpack("!H", hk_data[2:4])[0]
+    digital_current = struct.unpack("!f", hk_data[4:8])[0]
+    analog_current = struct.unpack("!f", hk_data[8:12])[0]
+    coil_x_current = struct.unpack("!f", hk_data[12:16])[0]
+    coil_y_current = struct.unpack("!f", hk_data[16:20])[0]
+    coil_z_current = struct.unpack("!f", hk_data[20:24])[0]
+    coil_x_temperature = struct.unpack("!h", hk_data[24:26])[0]
+    coil_y_temperature = struct.unpack("!h", hk_data[26:28])[0]
+    coil_z_temperature = struct.unpack("!h", hk_data[28:30])[0]
+    mcu_temperature = struct.unpack("!h", hk_data[30:32])[0]
+    content_list = [
+        digital_voltage,
+        analog_voltage,
+        digital_current,
+        analog_current,
+        coil_x_current,
+        coil_y_current,
+        coil_z_current,
+        coil_x_temperature,
+        coil_y_temperature,
+        coil_z_temperature,
+        mcu_temperature,
+    ]
+    return content_list
+
+
+def handle_eng_set(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    content_list = unpack_eng_hk(hk_data)
+    validity_buffer = hk_data[32:]
+
+    num_of_vars = len(ENG_HK_HEADERS)
+    pw.dlog(str(ENG_HK_HEADERS))
+    pw.dlog(str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)
+
+
+def handle_calibrated_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    header_list = [
+        "Calibrated MTM X [nT]",
+        "Calibrated MTM Y [nT]",
+        "Calibrated MTM Z [nT]",
+        "Coil actuation status",
+    ]
+    mtm_x = struct.unpack("!I", hk_data[0:4])[0]
+    mtm_y = struct.unpack("!I", hk_data[4:8])[0]
+    mtm_z = struct.unpack("!I", hk_data[8:12])[0]
+    coil_actuation_status = hk_data[12]
+    validity_buffer = hk_data[12:]
+    content_list = [mtm_x, mtm_y, mtm_z, coil_actuation_status]
+    num_of_vars = len(header_list)
+    pw.dlog(str(header_list))
+    pw.dlog(str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)
+
+
+def handle_raw_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    header_list = [
+        "Raw MTM X [nT]",
+        "Raw MTM Y [nT]",
+        "Raw MTM Z [nT]",
+        "Coil actuation status",
+    ]
+    mtm_x = struct.unpack("!f", hk_data[0:4])[0]
+    mtm_y = struct.unpack("!f", hk_data[4:8])[0]
+    mtm_z = struct.unpack("!f", hk_data[8:12])[0]
+    coil_actuation_status = hk_data[12]
+    validity_buffer = hk_data[13:]
+    content_list = [mtm_x, mtm_y, mtm_z, coil_actuation_status]
+    num_of_vars = 2
+    pw.dlog(str(header_list))
+    pw.dlog(str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)
+
+
+def handle_self_test_data(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    header_list = [
+        "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]
+
+    validity_buffer = hk_data[129:]
+    content_list = [
+        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,
+    ]
+    num_of_vars = len(header_list)
+    pw.dlog(str(header_list))
+    pw.dlog(str(content_list))
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)

eive_tmtc/tmtc/acs/mgms.py

@@ -1,10 +1,19 @@
+import enum
 import struct
 
-from pus_tm.defs import PrintWrapper
-from pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds
+import eive_tmtc.config.object_ids as obj_ids
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-import config.object_ids as obj_ids
+
+
+class MgmLis3SetId(enum.IntEnum):
+    CORE_HK = 0
+
+
+class MgmRm3100SetId(enum.IntEnum):
+    CORE_HK = 0
 
 
 def handle_mgm_hk_data(
@@ -26,7 +35,7 @@ def handle_mgm_hk_data(
 def handle_mgm_lis3_hk_data(
     object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
-    if set_id == MgmLis3SetIds.CORE_HK:
+    if set_id == MgmLis3SetId.CORE_HK:
         pw = PrintWrapper(printer)
         fmt_str = "!ffff"
         inc_len = struct.calcsize(fmt_str)
@@ -43,7 +52,7 @@ def handle_mgm_lis3_hk_data(
 def handle_mgm_rm3100_hk_data(
     object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
-    if set_id == MgmRm3100SetIds.CORE_HK:
+    if set_id == MgmRm3100SetId.CORE_HK:
         pw = PrintWrapper(printer)
         fmt_str = f"!fff"
         inc_len = struct.calcsize(fmt_str)

eive_tmtc/tmtc/acs/reaction_wheels.py

@@ -0,0 +1,410 @@
+# -*- coding: utf-8 -*-
+"""reaction_wheels.py
+@brief  Tests for the reaction wheel handler
+@author J. Meier
+@date   20.06.2021
+"""
+import struct
+from typing import List
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config.tmtc import tmtc_definitions_provider
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    generate_one_hk_command,
+    generate_one_diag_command,
+    make_sid,
+    enable_periodic_hk_command_with_interval,
+    disable_periodic_hk_command,
+)
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+
+class OpCodesDev:
+    SPEED = ["0", "speed"]
+    ON = ["1", "on"]
+    NML = ["2", "nml"]
+    OFF = ["3", "off"]
+    GET_STATUS = ["4", "status"]
+    GET_TM = ["5", "tm"]
+    ENABLE_STATUS_HK = ["6", "enable_status_hk"]
+    DISABLE_STATUS_HK = ["7", "disable_status_hk"]
+
+
+class InfoDev:
+    SPEED = "Set speed"
+    ON = "Set On"
+    NML = "Set Normal"
+    OFF = "Set Off"
+    GET_STATUS = "Get Status HK"
+    GET_TM = "Get TM HK"
+    ENABLE_STATUS_HK = "Enable Status HK"
+    DISABLE_STATUS_HK = "Disable Status HK"
+
+
+class OpCodesAss:
+    ON = ["0", "on"]
+    NML = ["1", "nml"]
+    OFF = ["2", "off"]
+    ALL_SPEED_UP = ["3", "speed_up"]
+    ALL_SPEED_OFF = ["4", "speed_off"]
+
+
+class InfoAss:
+    ON = "Mode On: 3/4 RWs min. on"
+    NML = "Mode Normal: 3/4 RWs min. normal"
+    OFF = "Mode Off: All RWs off"
+    ALL_SPEED_UP = "Speed up consecutively"
+    ALL_SPEED_OFF = "Speed down to 0"
+
+
+class RwSetId:
+    STATUS_SET_ID = 4
+    TEMPERATURE_SET_ID = 8
+    LAST_RESET = 2
+    TM_SET = 9
+
+
+class RwCommandId:
+    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
+
+
+@tmtc_definitions_provider
+def add_rw_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(info=InfoDev.SPEED, keys=OpCodesDev.SPEED)
+    oce.add(info=InfoDev.ON, keys=OpCodesDev.ON)
+    oce.add(info=InfoDev.OFF, keys=OpCodesDev.OFF)
+    oce.add(info=InfoDev.NML, keys=OpCodesDev.NML)
+    oce.add(info=InfoDev.GET_STATUS, keys=OpCodesDev.GET_STATUS)
+    oce.add(info=InfoDev.GET_TM, keys=OpCodesDev.GET_TM)
+    oce.add(info=InfoDev.ENABLE_STATUS_HK, keys=OpCodesDev.ENABLE_STATUS_HK)
+    oce.add(info=InfoDev.DISABLE_STATUS_HK, keys=OpCodesDev.DISABLE_STATUS_HK)
+    defs.add_service(
+        name=CustomServiceList.REACTION_WHEEL_1.value,
+        info="Reaction Wheel 1",
+        op_code_entry=oce,
+    )
+    defs.add_service(
+        name=CustomServiceList.REACTION_WHEEL_2.value,
+        info="Reaction Wheel 2",
+        op_code_entry=oce,
+    )
+    defs.add_service(
+        name=CustomServiceList.REACTION_WHEEL_3.value,
+        info="Reaction Wheel 3",
+        op_code_entry=oce,
+    )
+    defs.add_service(
+        name=CustomServiceList.REACTION_WHEEL_4.value,
+        info="Reaction Wheel 4",
+        op_code_entry=oce,
+    )
+    oce = OpCodeEntry()
+    oce.add(info=InfoAss.ON, keys=OpCodesAss.ON)
+    oce.add(info=InfoAss.NML, keys=OpCodesAss.NML)
+    oce.add(info=InfoAss.OFF, keys=OpCodesAss.OFF)
+    oce.add(info=InfoAss.ALL_SPEED_UP, keys=OpCodesAss.ALL_SPEED_UP)
+    oce.add(info=InfoAss.ALL_SPEED_OFF, keys=OpCodesAss.ALL_SPEED_OFF)
+    defs.add_service(
+        name=CustomServiceList.RW_ASSEMBLY.value,
+        info="Reaction Wheel Assembly",
+        op_code_entry=oce,
+    )
+
+
+def pack_single_rw_test_into(
+    object_id: bytes, rw_idx: int, q: DefaultPusQueueHelper, op_code: str
+):
+    if op_code in OpCodesDev.SPEED:
+        speed, ramp_time = prompt_speed_ramp_time()
+        q.add_log_cmd(
+            f"RW {rw_idx}: {InfoDev.SPEED} with target "
+            f"speed {speed / 10.0} RPM and {ramp_time} ms ramp time"
+        )
+        q.add_pus_tc(pack_set_speed_command(object_id, speed, ramp_time))
+
+    if op_code in OpCodesDev.ON:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.ON}")
+        mode_data = pack_mode_data(object_id, Mode.ON, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
+
+    if op_code in OpCodesDev.NML:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.NML}")
+        mode_data = pack_mode_data(object_id, Mode.NORMAL, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
+
+    if op_code in OpCodesDev.OFF:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.OFF}")
+        mode_data = pack_mode_data(object_id, Mode.OFF, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
+
+    if op_code in OpCodesDev.GET_TM:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.GET_TM}")
+        q.add_pus_tc(
+            generate_one_hk_command(
+                sid=make_sid(object_id=object_id, set_id=RwSetId.TM_SET)
+            )
+        )
+    if op_code in OpCodesDev.GET_STATUS:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.GET_STATUS}")
+        q.add_pus_tc(
+            generate_one_diag_command(
+                sid=make_sid(object_id=object_id, set_id=RwSetId.STATUS_SET_ID)
+            )
+        )
+    if op_code in OpCodesDev.ENABLE_STATUS_HK:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.ENABLE_STATUS_HK}")
+        interval = float(input("Please enter HK interval in floating point seconds: "))
+        cmds = enable_periodic_hk_command_with_interval(
+            True, make_sid(object_id, RwSetId.STATUS_SET_ID), interval
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCodesDev.DISABLE_STATUS_HK:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.DISABLE_STATUS_HK}")
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                True, make_sid(object_id, RwSetId.STATUS_SET_ID)
+            )
+        )
+
+
+def pack_rw_ass_cmds(q: DefaultPusQueueHelper, object_id: bytes, op_code: str):
+    if op_code in OpCodesAss.OFF:
+        data = pack_mode_data(object_id=object_id, mode=Mode.OFF, submode=0)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
+            )
+        )
+    if op_code in OpCodesAss.ON:
+        data = pack_mode_data(object_id=object_id, mode=Mode.ON, submode=0)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
+            )
+        )
+    if op_code in OpCodesAss.NML:
+        data = pack_mode_data(object_id=object_id, mode=Mode.NORMAL, submode=0)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
+            )
+        )
+    if op_code in OpCodesAss.ALL_SPEED_UP:
+        speed, ramp_time = prompt_speed_ramp_time()
+        rw_speed_up_cmd_consec(q, [RW1_ID, RW2_ID, RW3_ID, RW4_ID], speed, ramp_time)
+    if op_code in OpCodesAss.ALL_SPEED_OFF:
+        rw_speed_down_cmd_consec(
+            q, [RW1_ID, RW2_ID, RW3_ID, RW4_ID], prompt_ramp_time()
+        )
+
+
+def prompt_speed_ramp_time() -> (int, int):
+    speed = int(
+        input("Specify speed [0.1 RPM, 0 or range [-65000, -1000] and [1000, 65000]: ")
+    )
+    return speed, prompt_ramp_time()
+
+
+def prompt_ramp_time() -> int:
+    return int(input("Specify ramp time [ms, range [10, 20000]]: "))
+
+
+def pack_set_speed_command(
+    object_id: bytes, speed: int, ramp_time_ms: int
+) -> PusTelecommand:
+    """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 0, [-65000, -1000] and [1000, 65000]. Values are
+        specified in 0.1 * RPM
+    :param ramp_time_ms: The time after which the reaction wheel will reach the commanded speed.
+        Valid times are 10 - 20000 ms
+    """
+    if speed > 0:
+        if speed < 1000 or speed > 65000:
+            raise ValueError(
+                "Invalid RW speed specified. "
+                "Allowed range is [1000, 65000] 0.1 * RPM"
+            )
+    elif speed < 0:
+        if speed < -65000 or speed > -1000:
+            raise ValueError(
+                "Invalid RW speed specified. "
+                "Allowed range is [-65000, -1000] 0.1 * RPM"
+            )
+    else:
+        # Speed is 0
+        pass
+
+    if ramp_time_ms < 0 or (
+        ramp_time_ms > 0 and (ramp_time_ms > 20000 or ramp_time_ms < 10)
+    ):
+        raise ValueError("Invalid Ramp Speed time. Allowed range is [10-20000] ms")
+    command_id = RwCommandId.SET_SPEED
+    command = bytearray()
+    command += object_id + command_id
+    command = command + struct.pack("!i", speed)
+    command = command + ramp_time_ms.to_bytes(length=2, byteorder="big")
+    command = PusTelecommand(service=8, subservice=128, app_data=command)
+    return command
+
+
+def handle_rw_hk_data(
+    printer: FsfwTmTcPrinter, object_id: ObjectIdU32, set_id: int, hk_data: bytes
+):
+
+    pw = PrintWrapper(printer)
+    current_idx = 0
+    if set_id == RwSetId.STATUS_SET_ID:
+        pw.dlog(
+            f"Received Status HK (ID {set_id}) from Reaction Wheel {object_id.name}"
+        )
+        fmt_str = "!IiiBB"
+        inc_len = struct.calcsize(fmt_str)
+        (temp, speed, ref_speed, state, clc_mode) = struct.unpack(
+            fmt_str, hk_data[current_idx : current_idx + inc_len]
+        )
+        current_idx += inc_len
+        speed_rpm = speed / 10.0
+        ref_speed_rpm = ref_speed / 10.0
+        pw.dlog(
+            f"Temperature {temp} C | Speed {speed_rpm} rpm | Reference Speed {ref_speed_rpm} rpm"
+        )
+        pw.dlog(
+            f"State {state}. 0: Error, 1: Idle, 2: Coasting, 3: Running, speed stable, "
+            f"4: Running, speed  changing"
+        )
+        pw.dlog(
+            f"Current Limit Control mode {clc_mode}. 0: Low Current Mode (0.3 A), "
+            f"1: High Current Mode (0.6 A)"
+        )
+        printer.print_validity_buffer(hk_data[current_idx:], 5)
+    if set_id == RwSetId.LAST_RESET:
+        pw.dlog(
+            f"Received Last Reset HK (ID {set_id}) from Reaction Wheel {object_id.name}"
+        )
+        fmt_str = "!BB"
+        inc_len = struct.calcsize(fmt_str)
+        (last_not_cleared_reset_status, current_reset_status) = struct.unpack(
+            fmt_str, hk_data[current_idx : current_idx + inc_len]
+        )
+        current_idx += inc_len
+        pw.dlog(
+            f"Last Non-Cleared (Cached) Reset Status {last_not_cleared_reset_status} | "
+            f"Current Reset Status {current_reset_status}"
+        )
+    if set_id == RwSetId.TM_SET:
+        pw.dlog(f"Received TM HK (ID {set_id}) from Reaction Wheel {object_id.name}")
+        fmt_str = "!BiffBBiiIIIIIIIIIIIIIIII"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            last_reset_status,
+            mcu_temp,
+            pressure_sens_temp,
+            pressure,
+            state,
+            clc_mode,
+            current_speed,
+            ref_speed,
+            num_invalid_crc_packets,
+            num_invalid_len_packets,
+            num_invalid_cmd_packets,
+            num_of_cmd_executed_requests,
+            num_of_cmd_replies,
+            uart_num_of_bytes_written,
+            uart_num_of_bytes_read,
+            uart_num_parity_errors,
+            uart_num_noise_errors,
+            uart_num_frame_errors,
+            uart_num_reg_overrun_errors,
+            uart_total_num_errors,
+            spi_num_bytes_written,
+            spi_num_bytes_read,
+            spi_num_reg_overrun_errors,
+            spi_total_num_errors,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+
+        pw.dlog(
+            f"MCU Temperature {mcu_temp} | Pressure Sensore Temperature {pressure_sens_temp} C"
+        )
+        pw.dlog(f"Last Reset Status {last_reset_status}")
+        pw.dlog(
+            f"Current Limit Control mode {clc_mode}. 0: Low Current Mode (0.3 A), "
+            f"1: High Current Mode (0.6 A)"
+        )
+        pw.dlog(f"Speed {current_speed} rpm | Reference Speed {ref_speed} rpm")
+        pw.dlog(
+            f"State {state}. 0: Error, 1: Idle, 2: Coasting, 3: Running, speed stable, "
+            f"4: Running, speed  changing"
+        )
+        pw.dlog(f"Number Of Invalid Packets:")
+        pw.dlog("CRC | Length | CMD")
+        pw.dlog(
+            f"{num_invalid_crc_packets} | {num_invalid_len_packets} | {num_invalid_cmd_packets}"
+        )
+        pw.dlog(
+            f"Num Of CMD Executed Requests {num_of_cmd_executed_requests} | "
+            f"Num of CMD Replies {num_of_cmd_replies}"
+        )
+        pw.dlog("UART COM information:")
+        pw.dlog(
+            f"NumBytesWritten | NumBytesRead | ParityErrs | NoiseErrs | FrameErrs | "
+            f"RegOverrunErrs | TotalErrs"
+        )
+        pw.dlog(
+            f"{uart_num_of_bytes_written} | {uart_num_of_bytes_read} | {uart_num_parity_errors} | "
+            f"{uart_num_noise_errors} | {uart_num_frame_errors} | {uart_num_reg_overrun_errors} | "
+            f"{uart_total_num_errors}"
+        )
+        pw.dlog("SPI COM Info:")
+        pw.dlog(f"NumBytesWritten | NumBytesRead | RegOverrunErrs | TotalErrs")
+        pw.dlog(
+            f"{spi_num_bytes_written} | {spi_num_bytes_read} | {spi_num_reg_overrun_errors} | "
+            f"{spi_total_num_errors}"
+        )
+        if current_idx > 0:
+            printer.print_validity_buffer(
+                validity_buffer=hk_data[current_idx:], num_vars=27
+            )
+
+
+def rw_speed_up_cmd_consec(
+    q: DefaultPusQueueHelper, obids: List[bytes], speed: int, ramp_time: int
+):
+    for oid in obids:
+        q.add_pus_tc(
+            pack_set_speed_command(object_id=oid, speed=speed, ramp_time_ms=ramp_time)
+        )
+
+
+def rw_speed_down_cmd_consec(
+    q: DefaultPusQueueHelper, obids: List[bytes], ramp_time: int
+):
+    for oid in obids:
+        q.add_pus_tc(
+            pack_set_speed_command(object_id=oid, speed=0, ramp_time_ms=ramp_time)
+        )

eive_tmtc/tmtc/acs/star_tracker.py

@@ -5,21 +5,22 @@
 @author J. Meier
 @date   14.08.2021
 """
+import enum
+import logging
 import struct
 
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-from tmtccmd.logging import get_console_logger
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
-from utility.input_helper import InputHelper
+from eive_tmtc.utility.input_helper import InputHelper
 
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
-class StarTrackerActionIds:
+class StarTrackerActionId(enum.IntEnum):
     PING = 0
     BOOT = 1
     REQ_VERSION = 2
@@ -89,8 +90,18 @@ class OpCodes:
     NORMAL = ["2", "nml"]
 
 
-class SetIds:
+class SetId(enum.IntEnum):
+    VERSION = 2
+    INTERFACE = 3
+    POWER = 11
     TEMPERATURE = 25
+    SOLUTION = 24
+    HISTOGRAM = 28
+    CHECKSUM = 50
+    CAMERA = 67
+    LIMITS = 68
+    CENTROIDING = 72
+    LISA = 73
 
 
 class FileDefs:
@@ -163,77 +174,77 @@ def pack_star_tracker_commands(
     obyt = object_id.as_bytes
     if op_code == "0":
         q.add_log_cmd("Star tracker: Mode On, Submode Bootloader")
-        data = pack_mode_data(obyt, Modes.ON, Submode.BOOTLOADER)
+        data = pack_mode_data(obyt, Mode.ON, Submode.BOOTLOADER)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "1":
         q.add_log_cmd("Star tracker: Mode On, Submode Firmware")
-        data = pack_mode_data(obyt, Modes.ON, Submode.FIRMWARE)
+        data = pack_mode_data(obyt, Mode.ON, Submode.FIRMWARE)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "2":
         q.add_log_cmd("Star tracker: Mode Normal")
-        data = pack_mode_data(obyt, Modes.NORMAL, 0)
+        data = pack_mode_data(obyt, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "3":
         q.add_log_cmd("Star tracker: Mode Off")
-        data = pack_mode_data(obyt, Modes.OFF, 0)
+        data = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "4":
         q.add_log_cmd("Star tracker: Mode Raw")
-        data = pack_mode_data(obyt, Modes.RAW, 0)
+        data = pack_mode_data(obyt, Mode.RAW, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "5":
         q.add_log_cmd("Star tracker: Ping")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.PING)
+        data = obyt + struct.pack("!I", StarTrackerActionId.PING)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "6":
         q.add_log_cmd("Star tracker:  Switch to bootloader program")
         data = obyt + struct.pack(
-            "!I", StarTrackerActionIds.SWITCH_TO_BOOTLOADER_PROGRAM
+            "!I", StarTrackerActionId.SWITCH_TO_BOOTLOADER_PROGRAM
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "7":
         q.add_log_cmd("Star tracker: Temperature request")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_TEMPERATURE)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_TEMPERATURE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "8":
         q.add_log_cmd("Star tracker: Request version")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_VERSION)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_VERSION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "9":
         q.add_log_cmd("Star tracker: Request interface")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_INTERFACE)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_INTERFACE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "10":
         q.add_log_cmd("Star tracker: Request power")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_POWER)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_POWER)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "11":
         q.add_log_cmd("Star tracker: Set subscription parameters")
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.SUBSCRIPTION)
+            + struct.pack("!I", StarTrackerActionId.SUBSCRIPTION)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "12":
         q.add_log_cmd("Star tracker: Boot")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.BOOT)
+        data = obyt + struct.pack("!I", StarTrackerActionId.BOOT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "13":
         q.add_log_cmd("Star tracker: Request time")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_TIME)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_TIME)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "14":
         q.add_log_cmd("Star tracker: Request solution")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_SOLUTION)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_SOLUTION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "15":
         q.add_log_cmd("Star tracker: Upload image")
         image = get_upload_image()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.UPLOAD_IMAGE)
+            + struct.pack("!I", StarTrackerActionId.UPLOAD_IMAGE)
             + bytearray(image, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -244,7 +255,7 @@ def pack_star_tracker_commands(
             path = FileDefs.download_path
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_IMAGE)
             + bytearray(path, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -253,7 +264,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.LIMITS)
+            + struct.pack("!I", StarTrackerActionId.LIMITS)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -262,7 +273,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.TRACKING)
+            + struct.pack("!I", StarTrackerActionId.TRACKING)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -271,7 +282,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.MOUNTING)
+            + struct.pack("!I", StarTrackerActionId.MOUNTING)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -280,7 +291,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.CAMERA)
+            + struct.pack("!I", StarTrackerActionId.CAMERA)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -289,7 +300,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.CENTROIDING)
+            + struct.pack("!I", StarTrackerActionId.CENTROIDING)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -298,7 +309,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.LISA)
+            + struct.pack("!I", StarTrackerActionId.LISA)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -307,7 +318,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.MATCHING)
+            + struct.pack("!I", StarTrackerActionId.MATCHING)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -316,7 +327,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.VALIDATION)
+            + struct.pack("!I", StarTrackerActionId.VALIDATION)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -325,7 +336,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.ALGO)
+            + struct.pack("!I", StarTrackerActionId.ALGO)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -334,37 +345,37 @@ def pack_star_tracker_commands(
         actionid = int(input("Specify parameter ID (take image - 4): "))
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.TAKE_IMAGE)
+            + struct.pack("!I", StarTrackerActionId.TAKE_IMAGE)
             + struct.pack("!B", actionid)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "28":
         q.add_log_cmd("Star tracker: Stop str helper")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.STOP_STR_HELPER)
+        data = obyt + struct.pack("!I", StarTrackerActionId.STOP_STR_HELPER)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "30":
         q.add_log_cmd("Star tracker: Set name of download image")
         filename = input("Specify download image name: ")
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.CHANGE_DOWNLOAD_IMAGE)
+            + struct.pack("!I", StarTrackerActionId.CHANGE_DOWNLOAD_IMAGE)
             + bytearray(filename, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "31":
         q.add_log_cmd("Star tracker: Request histogram")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_HISTOGRAM)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_HISTOGRAM)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "32":
         q.add_log_cmd("Star tracker: Request contrast")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_CONTRAST)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_CONTRAST)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "33":
         q.add_log_cmd("Star tracker: Set json filename")
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.SET_JSON_FILE_NAME)
+            + struct.pack("!I", StarTrackerActionId.SET_JSON_FILE_NAME)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -377,7 +388,7 @@ def pack_star_tracker_commands(
         filename = input("Specify filename: ")
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.SET_FLASH_READ_FILENAME)
+            + struct.pack("!I", StarTrackerActionId.SET_FLASH_READ_FILENAME)
             + bytearray(filename, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -390,7 +401,7 @@ def pack_star_tracker_commands(
         unix_time = 1640783543
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.SET_TIME)
+            + struct.pack("!I", StarTrackerActionId.SET_TIME)
             + struct.pack("!Q", unix_time)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -399,7 +410,7 @@ def pack_star_tracker_commands(
         id = 0
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_CENTROID)
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_CENTROID)
             + struct.pack("!B", id)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -408,7 +419,7 @@ def pack_star_tracker_commands(
         id = 0
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_MATCHED_STAR)
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_MATCHED_STAR)
             + struct.pack("!B", id)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -417,7 +428,7 @@ def pack_star_tracker_commands(
         id = 0
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_DBIMAGE)
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_DBIMAGE)
             + struct.pack("!B", id)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -427,7 +438,7 @@ def pack_star_tracker_commands(
         type = 1  # 0 - normal, 1 - fast
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_BLOBPIXEL)
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_BLOBPIXEL)
             + struct.pack("!B", id)
             + struct.pack("!B", type)
         )
@@ -438,7 +449,7 @@ def pack_star_tracker_commands(
         length = int(input("Size to download: "))
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_FPGA_IMAGE)
             + struct.pack("!I", position)
             + struct.pack("!I", length)
             + bytearray(FileDefs.downloadFpgaImagePath, "utf-8")
@@ -448,7 +459,7 @@ def pack_star_tracker_commands(
         q.add_log_cmd("Star tracker: Change donwload FPGA image file name")
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
+            + struct.pack("!I", StarTrackerActionId.CHANGE_FPGA_DOWNLOAD_FILE)
             + bytearray(FileDefs.downloadFpgaImageName, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -456,7 +467,7 @@ def pack_star_tracker_commands(
         q.add_log_cmd("Star tracker: Upload FPGA image")
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
+            + struct.pack("!I", StarTrackerActionId.UPLOAD_FPGA_IMAGE)
             + bytearray(FileDefs.uploadFpgaImageName, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -465,28 +476,28 @@ def pack_star_tracker_commands(
         id = 3
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.FPGA_ACTION)
+            + struct.pack("!I", StarTrackerActionId.FPGA_ACTION)
             + struct.pack("!B", id)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "48":
         q.add_log_cmd("Star tracker: Unlock")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.UNLOCK)
+        data = obyt + struct.pack("!I", StarTrackerActionId.UNLOCK)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "49":
         q.add_log_cmd("Star tracker: Request camera parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_CAMERA_PARAMS)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_CAMERA_PARAMS)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "50":
         q.add_log_cmd("Star tracker: Request limits")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_LIMITS)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_LIMITS)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "51":
         q.add_log_cmd("Star tracker: Set image processor parameters")
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.IMAGE_PROCESSOR)
+            + struct.pack("!I", StarTrackerActionId.IMAGE_PROCESSOR)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -494,7 +505,7 @@ def pack_star_tracker_commands(
         q.add_log_cmd("Star tracker: EGSE load ground config camera parameters")
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.CAMERA)
+            + struct.pack("!I", StarTrackerActionId.CAMERA)
             + bytearray(FileDefs.egse_ground_config, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -502,64 +513,64 @@ def pack_star_tracker_commands(
         q.add_log_cmd("Star tracker: EGSE load flight config camera parameters")
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.CAMERA)
+            + struct.pack("!I", StarTrackerActionId.CAMERA)
             + bytearray(FileDefs.egse_flight_config, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "54":
         q.add_log_cmd("Star tracker: Request log level parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_LOG_LEVEL)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_LOG_LEVEL)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "55":
         q.add_log_cmd("Star tracker: Request mounting parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_MOUNTING)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_MOUNTING)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "56":
         q.add_log_cmd("Star tracker: Request image processor parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_IMAGE_PROCESSOR)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_IMAGE_PROCESSOR)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "57":
         q.add_log_cmd("Star tracker: Request centroiding parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_CENTROIDING)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_CENTROIDING)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "58":
         q.add_log_cmd("Star tracker: Request lisa parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_LISA)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_LISA)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "59":
         q.add_log_cmd("Star tracker: Request matching parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_MATCHING)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_MATCHING)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "60":
         q.add_log_cmd("Star tracker: Request tracking parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_TRACKING)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_TRACKING)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "61":
         q.add_log_cmd("Star tracker: Request validation parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_VALIDATION)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_VALIDATION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "62":
         q.add_log_cmd("Star tracker: Request algo parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_ALGO)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_ALGO)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "63":
         q.add_log_cmd("Star tracker: Request subscription parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_SUBSCRIPTION)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_SUBSCRIPTION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "64":
         q.add_log_cmd("Star tracker: Request log subscription parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_LOG_SUBSCRIPTION)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_LOG_SUBSCRIPTION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "65":
         q.add_log_cmd("Star tracker: Request debug camera parameters")
-        data = obyt + struct.pack("!I", StarTrackerActionIds.REQ_DEBUG_CAMERA)
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_DEBUG_CAMERA)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "66":
         q.add_log_cmd("Star tracker: Set log level parameters")
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.LOGLEVEL)
+            + struct.pack("!I", StarTrackerActionId.LOGLEVEL)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -569,7 +580,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.LOG_SUBSCRIPTION)
+            + struct.pack("!I", StarTrackerActionId.LOG_SUBSCRIPTION)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -578,7 +589,7 @@ def pack_star_tracker_commands(
         json_file = get_config_file()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.DEBUG_CAMERA)
+            + struct.pack("!I", StarTrackerActionId.DEBUG_CAMERA)
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -587,20 +598,20 @@ def pack_star_tracker_commands(
         firmware = get_firmware()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.FIRMWARE_UPDATE)
+            + struct.pack("!I", StarTrackerActionId.FIRMWARE_UPDATE)
             + bytearray(firmware, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "70":
         q.add_log_cmd("Star tracker: Disable timestamp generation")
         command = obyt + struct.pack(
-            "!I", StarTrackerActionIds.DISBALE_TIMESTAMP_GENERATION
+            "!I", StarTrackerActionId.DISBALE_TIMESTAMP_GENERATION
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "71":
         q.add_log_cmd("Star tracker: Enable timestamp generation")
         command = obyt + struct.pack(
-            "!I", StarTrackerActionIds.ENABLE_TIMESTAMP_GENERATION
+            "!I", StarTrackerActionId.ENABLE_TIMESTAMP_GENERATION
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
 
@@ -613,7 +624,7 @@ def pack_read_command(object_id: bytes) -> bytearray:
         path = FileDefs.download_path
     data = (
         object_id
-        + struct.pack("!I", StarTrackerActionIds.FLASH_READ)
+        + struct.pack("!I", StarTrackerActionId.FLASH_READ)
         + struct.pack("!B", start_region)
         + struct.pack("!I", size)
         + bytearray(path, "utf-8")
@@ -627,7 +638,7 @@ def pack_checksum_command(object_id: bytes) -> bytearray:
     size = PartitionSize.STAR_TRACKER_FIRMWARE
     data = (
         object_id
-        + struct.pack("!I", StarTrackerActionIds.CHECKSUM)
+        + struct.pack("!I", StarTrackerActionId.CHECKSUM)
         + struct.pack("!B", start_region)
         + struct.pack("!I", address)
         + struct.pack("!I", size)
@@ -636,7 +647,7 @@ def pack_checksum_command(object_id: bytes) -> bytearray:
 
 
 def get_config_file() -> str:
-    LOGGER.info("Specify json file")
+    _LOGGER.info("Specify json file")
     input_helper = InputHelper(json_dict)
     key = input_helper.get_key()
     json_file = json_dict[key][1]
@@ -644,7 +655,7 @@ def get_config_file() -> str:
 
 
 def get_firmware() -> str:
-    LOGGER.info("Specify firmware file")
+    _LOGGER.info("Specify firmware file")
     input_helper = InputHelper(firmware_dict)
     key = input_helper.get_key()
     firmware = firmware_dict[key][1]
@@ -652,7 +663,7 @@ def get_firmware() -> str:
 
 
 def get_upload_image() -> str:
-    LOGGER.info("Specify image to upload")
+    _LOGGER.info("Specify image to upload")
     input_helper = InputHelper(upload_image_dict)
     key = input_helper.get_key()
     image = upload_image_dict[key][1]

eive_tmtc/tmtc/acs/subsystem.py

@@ -0,0 +1,97 @@
+import enum
+from typing import Tuple, Dict
+
+from spacepackets.ecss import PusTelecommand
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from eive_tmtc.config.object_ids import ACS_SUBSYSTEM_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCode(str, enum.Enum):
+    OFF = "off"
+    SAFE = "safe"
+    DETUMBLE = "detumble"
+    IDLE = "idle"
+    PTG_TARGET = "ptg_target"
+    PTG_TARGET_NADIR = "ptg_nadir"
+    PTG_TARGET_GS = "ptg_target_gs"
+    PTG_TARGET_INERTIAL = "ptg_inertial"
+    REPORT_ALL_MODES = "all_modes"
+
+
+class AcsMode(enum.IntEnum):
+    OFF = 0
+    SAFE = 2
+    DETUMBLE = 3
+    IDLE = 4
+    PTG_TARGET_NADIR = 5
+    PTG_TARGET = 6
+    PTG_TARGET_GS = 7
+    PTG_TARGET_INERTIAL = 8
+
+
+class Info(str, enum.Enum):
+    OFF = "Off Command"
+    SAFE = "Safe Mode Command"
+    DETUMBLE = "Detumble Mode Command"
+    IDLE = "Idle Mode Command"
+    PTG_TARGET_NADIR = "Target Pointing Nadir"
+    PTG_TARGET = "Target Pointing"
+    PTG_TARGET_GS = "Target Pointing Ground Station"
+    PTG_TARGET_INERTIAL = "Target Pointing Inertial"
+    REPORT_ALL_MODES = "Report All Modes Recursively"
+
+
+HANDLER_LIST: Dict[str, Tuple[int, str]] = {
+    OpCode.OFF: (AcsMode.OFF, Info.OFF),
+    OpCode.SAFE: (AcsMode.SAFE, Info.SAFE),
+    OpCode.DETUMBLE: (AcsMode.DETUMBLE, Info.DETUMBLE),
+    OpCode.IDLE: (AcsMode.IDLE, Info.IDLE),
+    OpCode.PTG_TARGET: (AcsMode.PTG_TARGET, Info.PTG_TARGET),
+    OpCode.PTG_TARGET_GS: (AcsMode.PTG_TARGET_GS, Info.PTG_TARGET_GS),
+    OpCode.PTG_TARGET_NADIR: (AcsMode.PTG_TARGET_NADIR, Info.PTG_TARGET_NADIR),
+    OpCode.PTG_TARGET_INERTIAL: (AcsMode.PTG_TARGET_INERTIAL, Info.PTG_TARGET_INERTIAL),
+}
+
+
+@service_provider(CustomServiceList.ACS_SS.value)
+def build_acs_subsystem_cmd(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    info_prefix = "ACS Subsystem"
+    if op_code in OpCode.REPORT_ALL_MODES:
+        q.add_log_cmd(f"{info_prefix}: {Info.REPORT_ALL_MODES}")
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=ModeSubservices.TC_MODE_ANNOUNCE_RECURSIVE,
+                app_data=ACS_SUBSYSTEM_ID,
+            )
+        )
+    mode_info_tup = HANDLER_LIST.get(op_code)
+    if mode_info_tup is None:
+        return
+    pack_mode_cmd_with_info(
+        object_id=ACS_SUBSYSTEM_ID,
+        info=f"{info_prefix}: {mode_info_tup[1]}",
+        submode=0,
+        mode=mode_info_tup[0],
+        q=q,
+    )
+
+
+@tmtc_definitions_provider
+def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    for op_code, (_, info) in HANDLER_LIST.items():
+        oce.add(op_code, info)
+    oce.add(OpCode.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
+    defs.add_service(CustomServiceList.ACS_SS, "ACS Subsystem", oce)

eive_tmtc/tmtc/acs/sus.py

@@ -1,17 +1,20 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
-from pus_tc.devs.sus import SetIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
+class SetId:
+    HK = 3
+
+
 def handle_sus_hk(
     object_id: ObjectIdU32, hk_data: bytes, printer: FsfwTmTcPrinter, set_id: int
 ):
     pw = PrintWrapper(printer)
     pw.dlog(f"Received SUS HK data from {object_id}")
-    if set_id == SetIds.HK:
+    if set_id == SetId.HK:
         current_idx = 0
         temperature = struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
         current_idx += 4

eive_tmtc/tmtc/acs/sus_board.py

@@ -0,0 +1,87 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import SUS_BOARD_ASS_ID
+from eive_tmtc.tmtc.acs.acs_board import DualSideSubmode
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider, DefaultPusQueueHelper
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
+
+
+class SusOpCode:
+    SUS_ASS_NOM_SIDE = ["0", "nom"]
+    SUS_ASS_RED_SIDE = ["1", "red"]
+    SUS_ASS_DUAL_MODE = ["2", "dual"]
+    SUS_ASS_OFF = ["3", "off"]
+
+
+def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
+    if op_code in SusOpCode.SUS_ASS_NOM_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.A_SIDE,
+            q=q,
+            info="Switching to SUS board to nominal side",
+        )
+    if op_code in SusOpCode.SUS_ASS_RED_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.B_SIDE,
+            q=q,
+            info="Switching to SUS board to redundant side",
+        )
+    if op_code in SusOpCode.SUS_ASS_OFF:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Mode.OFF,
+            submode=0,
+            q=q,
+            info="Switching SUS board off",
+        )
+    if op_code in SusOpCode.SUS_ASS_DUAL_MODE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.DUAL_SIDE,
+            q=q,
+            info="Switching to SUS board to dual side",
+        )
+
+
+@service_provider(CustomServiceList.SUS_BRD_ASS)
+def pack_sus_cmds_prvoider(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    pack_sus_cmds(q, op_code)
+
+
+@tmtc_definitions_provider
+def add_sus_board_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(
+        keys=SusOpCode.SUS_ASS_NOM_SIDE,
+        info="Switch SUS board to nominal side",
+    )
+    oce.add(
+        keys=SusOpCode.SUS_ASS_RED_SIDE,
+        info="Switch SUS board to redundant side",
+    )
+    oce.add(
+        keys=SusOpCode.SUS_ASS_OFF,
+        info="Switch off SUS board",
+    )
+    oce.add(
+        keys=SusOpCode.SUS_ASS_DUAL_MODE,
+        info="Switch SUS board to dual mode",
+    )
+    defs.add_service(
+        name=CustomServiceList.SUS_BRD_ASS.value,
+        info="SUS Board Assembly",
+        op_code_entry=oce,
+    )

eive_tmtc/tmtc/com/__init__.py

@@ -0,0 +1 @@
+from .subsystem import add_com_subsystem_cmds

eive_tmtc/tmtc/com/ccsds_handler.py

@@ -0,0 +1,132 @@
+# -*- coding: utf-8 -*-
+"""
+@file   ccsds_handler.py
+@brief  Test commanding of CCSDS Handler
+@author J. Meier
+@date   20.11.2021
+"""
+import enum
+import struct
+
+from eive_tmtc.config.definitions import CustomServiceList
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    OpCodeEntry,
+    TmtcDefinitionWrapper,
+)
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
+from tmtccmd.util import ObjectIdU32
+from eive_tmtc.config.object_ids import CCSDS_HANDLER_ID
+
+
+class ActionId(enum.IntEnum):
+    # Configures input rate of syrlinks to 400 Khz (results in downlink rate of 200 kbps)
+    # SET_LOW_RATE = 0
+    # Configures input rate of syrlinks to 2000 Khz (results in downlink rate of 1000 kbps)
+    # SET_HIGH_RATE = 1
+    # Enables the syrlinks transmitter (by using RS485 enables lines). Please note that this
+    # is a legacy command. It is recommended to use mode commands instead
+    EN_TRANSMITTER = 2
+    # Disables the syrlinks transmitter (by using RS485 enables lines). Please note that this is
+    # a legacy command. It is recommended to use mode commands instead.
+    DIS_TRANSMITTER = 3
+    # Sets an arbitrary bitrate. Normally only set low and set high rate commands should be
+    # required
+    ARBITRARY_BITRATE = 4
+    ENABLE_TX_CLK_MANIPULATOR = 5
+    DISABLE_TX_CLK_MANIPULATOR = 6
+    # Tx data will be updated on rising edge of tx clock
+    UPDATE_ON_RISING_EDGE = 7
+    # Tx data will be updated on falling edge of tx clock
+    UPDATE_ON_FALLING_EDGE = 8
+
+
+class Submode(enum.IntEnum):
+    # Informative, do not command this.
+    UNSET = 0
+    DATARATE_LOW = 1
+    DATARATE_HIGH = 2
+
+
+class OpCode:
+    ENABLE_WITH_LOW_DATARATE = ["enable_low_datarate"]
+    ENABLE_WITH_HIGH_DATARATE = ["enable_high_datarate"]
+    DISABLE = ["disable"]
+    ENABLE_ACTION = ["legacy_enable_tx"]
+    DISABLE_ACTION = ["legacy_disable_tx"]
+
+
+class Info:
+    ENABLE_WITH_LOW_DATARATE = "Enable TX with low datarate"
+    ENABLE_WITH_HIGH_DATARATE = "Enable TX with high datarate"
+    DISABLE = "Disable TX"
+    ENABLE_ACTION = "Enable TX (legacy)"
+    DISABLE_ACTION = "Disable TX (legacy)"
+
+
+def pack_ccsds_handler_test(
+    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
+):
+    obyt = object_id.as_bytes
+    prefix = "CCSDS Handler"
+    q.add_log_cmd(f"Testing CCSDS handler with object id: {object_id.as_hex_string}")
+    if op_code in OpCode.ENABLE_WITH_LOW_DATARATE:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_WITH_LOW_DATARATE}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, Submode.DATARATE_LOW))
+    if op_code in OpCode.ENABLE_WITH_HIGH_DATARATE:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_WITH_HIGH_DATARATE}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, Submode.DATARATE_HIGH))
+    if op_code in OpCode.DISABLE:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.OFF, 0))
+    if op_code in OpCode.ENABLE_ACTION:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_ACTION}")
+        command = obyt + struct.pack("!I", ActionId.EN_TRANSMITTER)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code in OpCode.DISABLE_ACTION:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_ACTION}")
+        command = obyt + struct.pack("!I", ActionId.DIS_TRANSMITTER)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "4":
+        q.add_log_cmd("CCSDS Handler: Set arbitrary bitrate")
+        bitrate = int(input("Specify bit rate (bps): "))
+        command = (
+            obyt
+            + struct.pack("!I", ActionId.ARBITRARY_BITRATE)
+            + struct.pack("!I", bitrate)
+        )
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "5":
+        q.add_log_cmd("CCSDS Handler: Enable tx clock manipulator")
+        command = obyt + struct.pack("!I", ActionId.ENABLE_TX_CLK_MANIPULATOR)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "6":
+        q.add_log_cmd("CCSDS Handler: Disable tx clock manipulator")
+        command = obyt + struct.pack("!I", ActionId.DISABLE_TX_CLK_MANIPULATOR)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "7":
+        q.add_log_cmd("CCSDS Handler: Update tx data on rising edge of tx clock")
+        command = obyt + struct.pack("!I", ActionId.UPDATE_ON_RISING_EDGE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "8":
+        q.add_log_cmd("CCSDS Handler: Update tx data on falling edge of tx clock")
+        command = obyt + struct.pack("!I", ActionId.UPDATE_ON_FALLING_EDGE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+
+@tmtc_definitions_provider
+def add_ccsds_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.ENABLE_WITH_LOW_DATARATE, Info.ENABLE_WITH_LOW_DATARATE)
+    oce.add(OpCode.ENABLE_WITH_HIGH_DATARATE, Info.ENABLE_WITH_HIGH_DATARATE)
+    oce.add(OpCode.DISABLE, Info.DISABLE)
+    oce.add(OpCode.ENABLE_ACTION, Info.ENABLE_ACTION)
+    oce.add(OpCode.DISABLE_ACTION, Info.DISABLE_ACTION)
+    oce.add("4", "CCSDS Handler: Set arbitrary bitrate")
+    oce.add("5", "CCSDS Handler: Enable tx clock manipulator")
+    oce.add("6", "CCSDS Handler: Disable tx clock manipulator")
+    oce.add("7", "CCSDS Handler: Update tx data on rising edge")
+    oce.add("8", "CCSDS Handler: Update tx data on falling edge")
+    defs.add_service(CustomServiceList.CCSDS_HANDLER.value, "CCSDS Handler", oce)

eive_tmtc/tmtc/com/pdec_handler.py

@@ -9,7 +9,7 @@ from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
 
 
-class CommandIds:
+class CommandId:
     # prints the clcw to the console. Useful for debugging
     PRINT_CLCW = bytearray([0x0, 0x0, 0x0, 0x0])
     # Print PDEC monitor register
@@ -22,9 +22,9 @@ def pack_pdec_handler_test(
     q.add_log_cmd(f"Testing PDEC handler with object id: {object_id.hex()}")
     if op_code == "0":
         q.add_log_cmd("PDEC Handler: Print CLCW")
-        command = object_id + CommandIds.PRINT_CLCW
+        command = object_id + CommandId.PRINT_CLCW
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "1":
         q.add_log_cmd("PDEC Handler: Print PDEC monitor register")
-        command = object_id + CommandIds.PRINT_PDEC_MON
+        command = object_id + CommandId.PRINT_PDEC_MON
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))

eive_tmtc/tmtc/com/subsystem.py

@@ -0,0 +1,115 @@
+import enum
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import COM_SUBSYSTEM_ID
+from eive_tmtc.tmtc.com.syrlinks_handler import Datarate
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command
+from tmtccmd.tc.pus_20_fsfw_param import (
+    create_load_param_cmd,
+    pack_scalar_u8_parameter_app_data,
+)
+
+
+class ParameterId(enum.IntEnum):
+    DATARATE = 0
+
+
+class Submode(enum.IntEnum):
+    RX_ONLY = 0
+    RX_AND_TX_DEF_DATARATE = 1
+    RX_AND_TX_LOW_DATARATE = 2
+    RX_AND_TX_HIGH_DATARATE = 3
+    RX_AND_TX_CARRIER_WAVE = 4
+
+
+class OpCode:
+    RX_ONLY = "rx_only"
+    TX_AND_RX_DEF_RATE = "rx_and_tx_default_rate"
+    TX_AND_RX_LOW_RATE = "rx_and_tx_low_rate"
+    TX_AND_RX_HIGH_RATE = "rx_and_tx_high_rate"
+    TX_AND_RX_CARRIER_WAVE = "rx_and_tx_carrier_wave"
+    UPDATE_DEFAULT_DATARATE_LOW = "update_default_rate_low"
+    UPDATE_DEFAULT_DATARATE_HIGH = "update_default_rate_high"
+
+
+class Info:
+    RX_ONLY = "Syrlinks RX Only"
+    TX_AND_RX_DEF_DATARATE = "Syrlinks with TX default datarate"
+    TX_AND_RX_LOW_DATARATE = "Syrlinks with TX low datarate (BPSK modulation)"
+    TX_AND_RX_HIGH_DATARATE = "Syrlinks with TX high datarate (0QPSK modulation)"
+    TX_AND_RX_CARRIER_WAVE = "Syrlinks with TX carrier wave"
+    UPDATE_DEFAULT_DATARATE_LOW = "Configure default low datarate (BPSK modulation)"
+    UPDATE_DEFAULT_DATARATE_HIGH = "Configure default high datarate (0QPSK modulation)"
+
+
+@service_provider(CustomServiceList.COM_SS)
+def build_com_subsystem_cmd(p: ServiceProviderParams):
+    q = p.queue_helper
+    o = p.op_code
+    prefix = "COM Subsystem"
+    if o == OpCode.RX_ONLY:
+        q.add_log_cmd(Info.RX_ONLY)
+        q.add_pus_tc(create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_ONLY, 0))
+    elif o == OpCode.TX_AND_RX_DEF_RATE:
+        q.add_log_cmd(Info.TX_AND_RX_DEF_DATARATE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_DEF_DATARATE, 0)
+        )
+    elif o == OpCode.TX_AND_RX_LOW_RATE:
+        q.add_log_cmd(Info.TX_AND_RX_LOW_DATARATE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_LOW_DATARATE, 0)
+        )
+    elif o == OpCode.TX_AND_RX_HIGH_RATE:
+        q.add_log_cmd(Info.TX_AND_RX_HIGH_DATARATE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_HIGH_DATARATE, 0)
+        )
+    if o == OpCode.UPDATE_DEFAULT_DATARATE_LOW:
+        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_LOW}")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                pack_scalar_u8_parameter_app_data(
+                    COM_SUBSYSTEM_ID,
+                    0,
+                    ParameterId.DATARATE,
+                    Datarate.LOW_RATE_MODULATION_BPSK,
+                )
+            )
+        )
+    if o == OpCode.UPDATE_DEFAULT_DATARATE_HIGH:
+        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_HIGH}")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                pack_scalar_u8_parameter_app_data(
+                    COM_SUBSYSTEM_ID,
+                    0,
+                    ParameterId.DATARATE,
+                    Datarate.HIGH_RATE_MODULATION_0QPSK,
+                )
+            )
+        )
+    elif o == OpCode.TX_AND_RX_CARRIER_WAVE:
+        q.add_log_cmd(Info.TX_AND_RX_CARRIER_WAVE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_CARRIER_WAVE, 0)
+        )
+
+
+@tmtc_definitions_provider
+def add_com_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.RX_ONLY, Info.RX_ONLY)
+    oce.add(OpCode.TX_AND_RX_LOW_RATE, Info.TX_AND_RX_LOW_DATARATE)
+    oce.add(OpCode.TX_AND_RX_HIGH_RATE, Info.TX_AND_RX_HIGH_DATARATE)
+    oce.add(OpCode.TX_AND_RX_DEF_RATE, Info.TX_AND_RX_DEF_DATARATE)
+    oce.add(OpCode.UPDATE_DEFAULT_DATARATE_LOW, Info.UPDATE_DEFAULT_DATARATE_LOW)
+    oce.add(OpCode.UPDATE_DEFAULT_DATARATE_HIGH, Info.UPDATE_DEFAULT_DATARATE_HIGH)
+    defs.add_service(CustomServiceList.COM_SS, "COM Subsystem", oce)

eive_tmtc/tmtc/com/syrlinks_handler.py

@@ -0,0 +1,316 @@
+# -*- coding: utf-8 -*-
+"""
+@file   syrlinks_hk_handler.py
+@brief  Syrlinks Hk Handler tests
+@author J. Meier
+@date   13.12.2020
+"""
+import enum
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    create_request_one_diag_command,
+    create_enable_periodic_hk_command_with_interval,
+    create_disable_periodic_hk_command,
+)
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_mode_command
+from eive_tmtc.config.object_ids import SYRLINKS_HANDLER_ID
+import struct
+
+from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+
+class SetId:
+    RX_REGISTERS_DATASET = 1
+    TX_REGISTERS_DATASET = 2
+    TEMPERATURE_SET_ID = 3
+
+
+class OpCode:
+    OFF = "off"
+    ON = "on"
+    NORMAL_RX_ONLY = "nml_rx_only"
+    NORMAL_RX_AND_TX_CW = "nml_carrier_wave"
+    NORMAL_RX_AND_TX_DEF_DATARATE = "nml_default_datarate"
+    NORMAL_RX_AND_TX_LOW_DATARATE = "nml_low_datarate"
+    NORMAL_RX_AND_TX_HIGH_DATARATE = "nml_high_datarate"
+    HK_RX_REGS = "hk_rx_regs"
+    ENABLE_HK_RX_REGS = "enable_hk_rx"
+    DISABLE_HK_RX_REGS = "disable_hk_rx"
+    ENABLE_HK_TX_REGS = "enable_hk_tx"
+    DISABLE_HK_TX_REGS = "disable_hk_tx"
+    HK_TX_REGS = "hk_tx_regs"
+    TX_STATUS = "tx_status"
+    RX_STATUS = "rx_status"
+
+
+class Info:
+    OFF = "Switch OFF"
+    ON = "Switch ON"
+    NORMAL_RX_ONLY = "NORMAL RX Only, set TX to standby"
+    NORMAL_RX_AND_TX_CW = "NORMAL RX and TX, TX Carrier Wave"
+    NORMAL_RX_AND_TX_DEF_DATARATE = "NORMAL RX and TX, TX with default datarate"
+    NORMAL_RX_AND_TX_LOW_DATARATE = "NORMAL RX and TX, TX with low datarate"
+    NORMAL_RX_AND_TX_HIGH_DATARATE = "NORMAL RX and TX, TX with high datarate"
+    HK_RX_REGS = "Request RX register set"
+    HK_TX_REGS = "Request TX register set"
+    ENABLE_HK_RX_REGS = "Enable periodic RX register HK"
+    DISABLE_HK_RX_REGS = "Disable periodic RX register HK"
+    ENABLE_HK_TX_REGS = "Enable periodic TX register HK"
+    DISABLE_HK_TX_REGS = "Disable periodic TX register HK"
+    TX_STATUS = "Read TX status (always read in normal mode)"
+    RX_STATUS = "Read RX status (always read in normal mode)"
+    SET_CW = "Set TX carrier wave"
+
+
+class CommandId(enum.IntEnum):
+    READ_RX_STATUS_REGISTERS = 2
+    SET_TX_MODE_STANDBY = 3
+    SET_TX_MODE_MODULATION = 4
+    SET_TX_MODE_CW = 5
+    READ_TX_STATUS = 7
+    READ_TX_WAVEFORM = 8
+    READ_TX_AGC_VALUE_HIGH_BYTE = 9
+    READ_TX_AGC_VALUE_LOW_BYTE = 10
+    WRITE_LCL_CONFIG = 11
+    READ_LCL_CONFIG_REGISTER = 12
+    SET_WAVEFORM_OQPSK = 17
+    SET_WAVEFORM_BPSK = 18
+    SET_SECOND_CONFIG = 19
+    ENABLE_DEBUG = 20
+    DISABLE_DEBUG = 21
+
+
+class Submode(enum.IntEnum):
+    RX_ONLY = 0
+    RX_AND_TX_DEFAULT_DATARATE = 1
+    RX_AND_TX_LOW_DATARATE = 2
+    RX_AND_TX_HIGH_DATARATE = 3
+    RX_AND_TX_CW = 4
+
+
+class Datarate(enum.IntEnum):
+    LOW_RATE_MODULATION_BPSK = 0
+    HIGH_RATE_MODULATION_0QPSK = 1
+
+
+@tmtc_definitions_provider
+def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.OFF, Info.OFF)
+    oce.add(OpCode.ON, Info.ON)
+    oce.add(OpCode.NORMAL_RX_ONLY, Info.NORMAL_RX_ONLY)
+    oce.add(OpCode.NORMAL_RX_AND_TX_CW, Info.NORMAL_RX_AND_TX_CW)
+    oce.add(OpCode.NORMAL_RX_AND_TX_DEF_DATARATE, Info.NORMAL_RX_AND_TX_DEF_DATARATE)
+    oce.add(OpCode.NORMAL_RX_AND_TX_LOW_DATARATE, Info.NORMAL_RX_AND_TX_LOW_DATARATE)
+    oce.add(OpCode.NORMAL_RX_AND_TX_HIGH_DATARATE, Info.NORMAL_RX_AND_TX_HIGH_DATARATE)
+    oce.add(OpCode.HK_RX_REGS, Info.HK_RX_REGS)
+    oce.add(OpCode.HK_TX_REGS, Info.HK_TX_REGS)
+    oce.add(OpCode.TX_STATUS, Info.TX_STATUS)
+    oce.add(OpCode.RX_STATUS, Info.RX_STATUS)
+    oce.add(OpCode.ENABLE_HK_RX_REGS, Info.ENABLE_HK_RX_REGS)
+    oce.add(OpCode.DISABLE_HK_RX_REGS, Info.DISABLE_HK_RX_REGS)
+    oce.add(OpCode.ENABLE_HK_TX_REGS, Info.ENABLE_HK_TX_REGS)
+    oce.add(OpCode.DISABLE_HK_TX_REGS, Info.DISABLE_HK_TX_REGS)
+    oce.add("7", "Syrlinks Handler: Read TX waveform")
+    oce.add("8", "Syrlinks Handler: Read TX AGC value high byte")
+    oce.add("9", "Syrlinks Handler: Read TX AGC value low byte")
+    oce.add("12", "Syrlinks Handler: Write LCL config")
+    oce.add("14", "Syrlinks Handler: Read LCL config register")
+    oce.add("15", "Syrlinks Handler: Set waveform OQPSK")
+    oce.add("16", "Syrlinks Handler: Set waveform BPSK")
+    oce.add("17", "Syrlinks Handler: Set second config")
+    oce.add("18", "Syrlinks Handler: Enable debug output")
+    oce.add("19", "Syrlinks Handler: Disable debug output")
+    defs.add_service(CustomServiceList.SYRLINKS.value, "Syrlinks Handler", oce)
+
+
+_PREFIX = "Syrlinks"
+
+
+def normal_mode_cmd(q: DefaultPusQueueHelper, info: str, submode: int):
+    q.add_log_cmd(f"{_PREFIX}: {info}")
+    q.add_pus_tc(create_mode_command(SYRLINKS_HANDLER_ID, Mode.NORMAL, submode))
+
+
+def pack_syrlinks_command(
+    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
+):
+    obyt = object_id.as_bytes
+    prefix = "Syrlinks"
+    q.add_log_cmd(f"Testing Syrlinks with object id: {object_id.as_hex_string}")
+    if op_code == OpCode.OFF:
+        q.add_log_cmd(f"{prefix}: {Info.OFF}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.OFF, 0))
+    if op_code == OpCode.ON:
+        q.add_log_cmd(f"{prefix}: {Info.ON}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, 0))
+    if op_code == OpCode.NORMAL_RX_ONLY:
+        normal_mode_cmd(q, Info.NORMAL_RX_ONLY, Submode.RX_ONLY)
+    if op_code == OpCode.NORMAL_RX_AND_TX_LOW_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_LOW_DATARATE, Submode.RX_AND_TX_LOW_DATARATE
+        )
+    if op_code == OpCode.NORMAL_RX_AND_TX_DEF_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_DEF_DATARATE, Submode.RX_AND_TX_DEFAULT_DATARATE
+        )
+    if op_code == OpCode.NORMAL_RX_AND_TX_HIGH_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_HIGH_DATARATE, Submode.RX_AND_TX_HIGH_DATARATE
+        )
+    if op_code in OpCode.NORMAL_RX_AND_TX_CW:
+        normal_mode_cmd(q, Info.NORMAL_RX_AND_TX_CW, Submode.RX_AND_TX_CW)
+    if op_code in OpCode.HK_RX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.HK_RX_REGS}")
+        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
+        q.add_pus_tc(create_request_one_diag_command(sid))
+    if op_code in OpCode.ENABLE_HK_RX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_RX_REGS}")
+        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
+        interval = float(input("HK interval in floating point seconds"))
+        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_HK_RX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_RX_REGS}")
+        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
+        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+    if op_code in OpCode.ENABLE_HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        interval = float(input("HK interval in floating point seconds"))
+        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+    if op_code in OpCode.HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        q.add_pus_tc(create_request_one_diag_command(sid))
+    if op_code in OpCode.TX_STATUS:
+        q.add_log_cmd(f"{prefix}: {Info.TX_STATUS}")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_STATUS)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "9":
+        q.add_log_cmd("Syrlinks: Read TX waveform")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_WAVEFORM)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "10":
+        q.add_log_cmd("Syrlinks: Read TX AGC value high byte")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_AGC_VALUE_HIGH_BYTE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "11":
+        q.add_log_cmd("Syrlinks: Read TX AGC value low byte")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_AGC_VALUE_LOW_BYTE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "12":
+        q.add_log_cmd("Syrlinks: Write LCL config")
+        command = obyt + struct.pack("!I", CommandId.WRITE_LCL_CONFIG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "13":
+        q.add_log_cmd("Syrlinks: Read RX status registers")
+        command = obyt + struct.pack("!I", CommandId.READ_RX_STATUS_REGISTERS)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "14":
+        q.add_log_cmd("Syrlinks: Read LCL config register")
+        command = obyt + struct.pack("!I", CommandId.READ_LCL_CONFIG_REGISTER)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "15":
+        q.add_log_cmd("Syrlinks: Set waveform OQPSK")
+        command = obyt + struct.pack("!I", CommandId.SET_WAVEFORM_OQPSK)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "16":
+        q.add_log_cmd("Syrlinks: Set waveform BPSK")
+        command = obyt + struct.pack("!I", CommandId.SET_WAVEFORM_BPSK)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "17":
+        q.add_log_cmd("Syrlinks: Set second config")
+        command = obyt + struct.pack("!I", CommandId.SET_SECOND_CONFIG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "18":
+        q.add_log_cmd("Syrlinks: Enable debug printout")
+        command = obyt + struct.pack("!I", CommandId.ENABLE_DEBUG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "19":
+        q.add_log_cmd("Syrlinks: Disable debug printout")
+        command = obyt + struct.pack("!I", CommandId.DISABLE_DEBUG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+
+def handle_syrlinks_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    if set_id == SetId.RX_REGISTERS_DATASET:
+        return handle_syrlinks_rx_registers_dataset(printer, hk_data)
+    elif set_id == SetId.TX_REGISTERS_DATASET:
+        return handle_syrlinks_tx_registers_dataset(printer, hk_data)
+    else:
+        pw = PrintWrapper(printer)
+        pw.dlog(f"Service 3 TM: Syrlinks handler reply with unknown set ID {set_id}")
+
+
+def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    header_list = [
+        "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])[0]
+    rx_frequency_shift = struct.unpack("!i", hk_data[5:9])[0]
+    freq_shift_hz = rx_frequency_shift / 8.0
+    freq_shift_printout = f"Raw: {rx_frequency_shift}, Eng: {freq_shift_hz} Hz"
+    rx_iq_power = struct.unpack("!H", hk_data[9:11])[0]
+    rx_agc_value = struct.unpack("!H", hk_data[11:13])[0]
+    rx_demod_eb = struct.unpack("!I", hk_data[13:17])[0]
+    rx_demod_n0 = struct.unpack("!I", hk_data[17:21])[0]
+    rx_data_rate = hk_data[21]
+    content_list = [
+        rx_status,
+        rx_sensitivity,
+        freq_shift_printout,
+        rx_iq_power,
+        rx_agc_value,
+        rx_demod_eb,
+        rx_demod_n0,
+        rx_data_rate,
+    ]
+    validity_buffer = hk_data[22:]
+    for header, content in zip(header_list, content_list):
+        pw.dlog(f"{header}: {content}")
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=8)
+
+
+def handle_syrlinks_tx_registers_dataset(
+    printer: FsfwTmTcPrinter,
+    hk_data: bytes,
+):
+    pw = PrintWrapper(printer)
+    header_list = ["TX Status", "TX Waveform", "TX AGC value"]
+    tx_status = hk_data[0]
+    tx_waveform = hk_data[1]
+    tx_agc_value = struct.unpack("!H", hk_data[2:4])[0]
+    content_list = [tx_status, tx_waveform, tx_agc_value]
+    validity_buffer = hk_data[4:]
+    for header, content in zip(header_list, content_list):
+        pw.dlog(f"{header}: {content}")
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=3)

eive_tmtc/tmtc/common.py

@@ -0,0 +1,32 @@
+from typing import Union
+
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
+from tmtccmd.util import ObjectIdU32
+
+
+def pack_mode_cmd_with_info(
+    object_id: Union[ObjectIdU32, bytes],
+    mode: Union[int, Mode],
+    submode: int,
+    q: DefaultPusQueueHelper,
+    info: str,
+):
+    if isinstance(object_id, ObjectIdU32):
+        object_id_bytes = object_id.as_bytes
+    elif isinstance(object_id, bytes):
+        object_id_bytes = object_id
+    else:
+        raise ValueError("Invalid Object ID type")
+    q.add_log_cmd(info)
+    mode_data = pack_mode_data(
+        object_id=object_id_bytes,
+        mode=mode,
+        submode=submode,
+    )
+    q.add_pus_tc(
+        PusTelecommand(
+            service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=mode_data
+        )
+    )

eive_tmtc/tmtc/core.py

@@ -1,21 +1,24 @@
 import enum
+import logging
+import struct
 
-from config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
-from tmtccmd.logging import get_console_logger
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
-from config.object_ids import CORE_CONTROLLER_ID
+from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+_LOGGER = logging.getLogger(__name__)
 
 
-LOGGER = get_console_logger()
-
-
-class ActionIds(enum.IntEnum):
+class ActionId(enum.IntEnum):
     LIST_DIR_INTO_FILE = 0
     SWITCH_REBOOT_FILE_HANDLING = 5
     RESET_REBOOT_COUNTER = 6
@@ -31,11 +34,11 @@ class ActionIds(enum.IntEnum):
     FULL_REBOOT = 34
 
 
-class SetIds(enum.IntEnum):
+class SetId(enum.IntEnum):
     HK = 5
 
 
-class OpCodes:
+class OpCode:
     REBOOT_XSC = ["0", "reboot_xsc"]
     XSC_REBOOT_SELF = ["1", "reboot_self"]
     XSC_REBOOT_0_0 = ["2", "reboot_00"]
@@ -86,193 +89,202 @@ class Copy(enum.IntEnum):
 @tmtc_definitions_provider
 def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(keys=OpCodes.REBOOT_XSC, info=Info.REBOOT_XSC)
-    oce.add(keys=OpCodes.REBOOT_XSC, info=Info.REBOOT_XSC)
-    oce.add(keys=OpCodes.REBOOT_FULL, info=Info.REBOOT_FULL)
-    oce.add(keys=OpCodes.XSC_REBOOT_SELF, info="Reboot Self")
-    oce.add(keys=OpCodes.XSC_REBOOT_0_0, info="Reboot 0 0")
-    oce.add(keys=OpCodes.XSC_REBOOT_0_1, info="Reboot 0 1")
-    oce.add(keys=OpCodes.XSC_REBOOT_1_0, info="Reboot 1 0")
-    oce.add(keys=OpCodes.XSC_REBOOT_1_1, info="Reboot 1 1")
+    oce.add(keys=OpCode.REBOOT_XSC, info=Info.REBOOT_XSC)
+    oce.add(keys=OpCode.REBOOT_XSC, info=Info.REBOOT_XSC)
+    oce.add(keys=OpCode.REBOOT_FULL, info=Info.REBOOT_FULL)
+    oce.add(keys=OpCode.XSC_REBOOT_SELF, info="Reboot Self")
+    oce.add(keys=OpCode.XSC_REBOOT_0_0, info="Reboot 0 0")
+    oce.add(keys=OpCode.XSC_REBOOT_0_1, info="Reboot 0 1")
+    oce.add(keys=OpCode.XSC_REBOOT_1_0, info="Reboot 1 0")
+    oce.add(keys=OpCode.XSC_REBOOT_1_1, info="Reboot 1 1")
+    oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
+    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
+    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
     oce.add(
-        keys=OpCodes.GET_HK,
+        keys=OpCode.GET_HK,
         info="Request housekeeping set",
     )
     oce.add(
-        keys=OpCodes.ENABLE_REBOOT_FILE_HANDLING,
+        keys=OpCode.ENABLE_REBOOT_FILE_HANDLING,
         info="Enable reboot file handling",
     )
     oce.add(
-        keys=OpCodes.DISABLE_REBOOT_FILE_HANDLING,
+        keys=OpCode.DISABLE_REBOOT_FILE_HANDLING,
         info="Disable reboot file handling",
     )
     oce.add(
-        keys=OpCodes.RESET_ALL_REBOOT_COUNTERS,
+        keys=OpCode.RESET_ALL_REBOOT_COUNTERS,
         info="Reset all reboot counters",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_00,
+        keys=OpCode.RESET_REBOOT_COUNTER_00,
         info="Reset reboot counter 0 0",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_01,
+        keys=OpCode.RESET_REBOOT_COUNTER_01,
         info="Reset reboot counter 0 1",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_10,
+        keys=OpCode.RESET_REBOOT_COUNTER_10,
         info="Reset reboot counter 1 0",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_11,
+        keys=OpCode.RESET_REBOOT_COUNTER_11,
         info="Reset reboot counter 1 1",
     )
-    oce.add(keys=OpCodes.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
-    oce.add(keys=OpCodes.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
-    oce.add(keys=OpCodes.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
-    oce.add(keys=OpCodes.SWITCH_TO_SD_0, info=Info.SWITCH_TO_SD_0)
-    oce.add(keys=OpCodes.SWITCH_TO_SD_1, info=Info.SWITCH_TO_SD_1)
-    oce.add(keys=OpCodes.SWITCH_TO_BOTH_SD_CARDS, info=Info.SWITCH_TO_BOTH_SD_CARDS)
+    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
+    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
+    oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
+    oce.add(keys=OpCode.SWITCH_TO_SD_0, info=Info.SWITCH_TO_SD_0)
+    oce.add(keys=OpCode.SWITCH_TO_SD_1, info=Info.SWITCH_TO_SD_1)
+    oce.add(keys=OpCode.SWITCH_TO_BOTH_SD_CARDS, info=Info.SWITCH_TO_BOTH_SD_CARDS)
     defs.add_service(CustomServiceList.CORE.value, "Core Controller", oce)
 
 
 def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in OpCodes.REBOOT_XSC:
+    if op_code in OpCode.REBOOT_XSC:
         reboot_self, chip_select, copy_select = determine_reboot_params()
-        perform_reboot_cmd(
+        add_xsc_reboot_cmd(
             q=q,
             reboot_self=reboot_self,
             chip=chip_select,
             copy=copy_select,
         )
-    if op_code in OpCodes.REBOOT_FULL:
+    if op_code in OpCode.REBOOT_FULL:
         q.add_log_cmd(f"Core Command: {Info.REBOOT_FULL}")
         q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=CORE_CONTROLLER_ID, action_id=ActionIds.FULL_REBOOT
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID, action_id=ActionId.FULL_REBOOT
             )
         )
-    if op_code in OpCodes.XSC_REBOOT_SELF:
-        perform_reboot_cmd(q=q, reboot_self=True)
-    if op_code in OpCodes.XSC_REBOOT_0_0:
-        perform_reboot_cmd(
+    if op_code in OpCode.XSC_REBOOT_SELF:
+        add_xsc_reboot_cmd(q=q, reboot_self=True)
+    if op_code in OpCode.XSC_REBOOT_0_0:
+        add_xsc_reboot_cmd(
             q=q, reboot_self=False, chip=Chip.CHIP_0, copy=Copy.COPY_0_NOM
         )
-    if op_code in OpCodes.XSC_REBOOT_0_1:
-        perform_reboot_cmd(
+    if op_code in OpCode.XSC_REBOOT_0_1:
+        add_xsc_reboot_cmd(
             q=q,
             reboot_self=False,
             chip=Chip.CHIP_0,
             copy=Copy.COPY_1_GOLD,
         )
-    if op_code in OpCodes.XSC_REBOOT_1_0:
-        perform_reboot_cmd(
+    if op_code in OpCode.XSC_REBOOT_1_0:
+        add_xsc_reboot_cmd(
             q=q, reboot_self=False, chip=Chip.CHIP_1, copy=Copy.COPY_0_NOM
         )
-    if op_code in OpCodes.XSC_REBOOT_1_1:
-        perform_reboot_cmd(
+    if op_code in OpCode.XSC_REBOOT_1_1:
+        add_xsc_reboot_cmd(
             q=q,
             reboot_self=False,
             chip=Chip.CHIP_1,
             copy=Copy.COPY_1_GOLD,
         )
-    if op_code in OpCodes.DISABLE_REBOOT_FILE_HANDLING:
+    if op_code in OpCode.DISABLE_REBOOT_FILE_HANDLING:
         q.add_log_cmd("Disabling reboot file handling")
         user_data = bytearray([0])
         q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                 object_id=CORE_CONTROLLER_ID,
-                action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING,
+                action_id=ActionId.SWITCH_REBOOT_FILE_HANDLING,
                 user_data=user_data,
             )
         )
-    if op_code in OpCodes.ENABLE_REBOOT_FILE_HANDLING:
+    if op_code in OpCode.ENABLE_REBOOT_FILE_HANDLING:
         q.add_log_cmd("Enabling reboot file handling")
         user_data = bytearray([1])
         q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                 object_id=CORE_CONTROLLER_ID,
-                action_id=ActionIds.SWITCH_REBOOT_FILE_HANDLING,
+                action_id=ActionId.SWITCH_REBOOT_FILE_HANDLING,
                 user_data=user_data,
             )
         )
-    if op_code in OpCodes.RESET_ALL_REBOOT_COUNTERS:
+    if op_code in OpCode.RESET_ALL_REBOOT_COUNTERS:
         q.add_log_cmd("Resetting all reboot counters")
         q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                 object_id=CORE_CONTROLLER_ID,
-                action_id=ActionIds.RESET_REBOOT_COUNTER,
+                action_id=ActionId.RESET_REBOOT_COUNTER,
             )
         )
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_00:
+    if op_code in OpCode.RESET_REBOOT_COUNTER_00:
         reset_specific_boot_counter(q, 0, 0)
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_01:
+    if op_code in OpCode.RESET_REBOOT_COUNTER_01:
         reset_specific_boot_counter(q, 0, 1)
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_10:
+    if op_code in OpCode.RESET_REBOOT_COUNTER_10:
         reset_specific_boot_counter(q, 1, 0)
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_11:
+    if op_code in OpCode.RESET_REBOOT_COUNTER_11:
         reset_specific_boot_counter(q, 1, 1)
-    if op_code in OpCodes.OBSW_UPDATE_FROM_SD_0:
+    if op_code in OpCode.OBSW_UPDATE_FROM_SD_0:
         q.add_log_cmd(Info.OBSW_UPDATE_FROM_SD_0)
-        q.add_pus_tc(pack_obsw_update_cmd(ActionIds.UPDATE_OBSW_FROM_SD_0))
-    if op_code in OpCodes.OBSW_UPDATE_FROM_SD_1:
+        q.add_pus_tc(pack_obsw_update_cmd(ActionId.UPDATE_OBSW_FROM_SD_0))
+    if op_code in OpCode.OBSW_UPDATE_FROM_SD_1:
         q.add_log_cmd(Info.OBSW_UPDATE_FROM_SD_1)
-        q.add_pus_tc(pack_obsw_update_cmd(ActionIds.UPDATE_OBSW_FROM_SD_1))
-    if op_code in OpCodes.OBSW_UPDATE_FROM_TMP:
+        q.add_pus_tc(pack_obsw_update_cmd(ActionId.UPDATE_OBSW_FROM_SD_1))
+    if op_code in OpCode.OBSW_UPDATE_FROM_TMP:
         q.add_log_cmd(Info.OBSW_UPDATE_FROM_TMP)
-        q.add_pus_tc(pack_obsw_update_cmd(ActionIds.UPDATE_OBSW_FROM_TMP))
-    if op_code in OpCodes.SWITCH_TO_SD_0:
+        q.add_pus_tc(pack_obsw_update_cmd(ActionId.UPDATE_OBSW_FROM_TMP))
+    if op_code in OpCode.SWITCH_TO_SD_0:
         q.add_log_cmd(Info.SWITCH_TO_SD_0)
         q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=CORE_CONTROLLER_ID, action_id=ActionIds.SWITCH_TO_SD_0
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID, action_id=ActionId.SWITCH_TO_SD_0
             )
         )
-    if op_code in OpCodes.SWITCH_TO_SD_1:
+    if op_code in OpCode.SWITCH_TO_SD_1:
         q.add_log_cmd(Info.SWITCH_TO_SD_1)
         q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=CORE_CONTROLLER_ID, action_id=ActionIds.SWITCH_TO_SD_1
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID, action_id=ActionId.SWITCH_TO_SD_1
             )
         )
-    if op_code in OpCodes.SWITCH_TO_BOTH_SD_CARDS:
+    if op_code in OpCode.SWITCH_TO_BOTH_SD_CARDS:
         while True:
             active_sd_card = int(input("Please specify active SD cqrd [0/1]: "))
             if active_sd_card not in [0, 1]:
-                LOGGER.warning("Invalid SD card specified. Try again")
+                _LOGGER.warning("Invalid SD card specified. Try again")
             break
         q.add_log_cmd(Info.SWITCH_TO_BOTH_SD_CARDS)
         q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                 object_id=CORE_CONTROLLER_ID,
-                action_id=ActionIds.SWITCH_TO_BOTH_SD_CARDS,
+                action_id=ActionId.SWITCH_TO_BOTH_SD_CARDS,
                 user_data=bytes([active_sd_card]),
             )
         )
-    if op_code in OpCodes.GET_HK:
+    if op_code in OpCode.GET_HK:
         q.add_log_cmd("Requesting housekeeping set")
-        sid = make_sid(object_id=CORE_CONTROLLER_ID, set_id=SetIds.HK)
+        sid = make_sid(object_id=CORE_CONTROLLER_ID, set_id=SetId.HK)
         q.add_pus_tc(generate_one_hk_command(sid))
 
 
 def reset_specific_boot_counter(q: DefaultPusQueueHelper, chip: int, copy: int):
     q.add_log_cmd(f"Resetting boot counter {chip} {copy}")
     q.add_pus_tc(
-        make_fsfw_action_cmd(
+        create_action_cmd(
             object_id=CORE_CONTROLLER_ID,
-            action_id=ActionIds.RESET_REBOOT_COUNTER,
+            action_id=ActionId.RESET_REBOOT_COUNTER,
             user_data=bytes([chip, copy]),
         )
     )
 
 
+def create_full_reboot_cmds() -> PusTelecommand:
+    return create_action_cmd(
+        object_id=CORE_CONTROLLER_ID, action_id=ActionId.FULL_REBOOT
+    )
+
+
 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")
+        _LOGGER.info("Rebooting currently running image")
         return True, chip_select, copy_select
-    LOGGER.info("Rebooting image specified by chip and copy")
+    _LOGGER.info("Rebooting image specified by chip and copy")
     return False, determine_chip_and_copy()
 
 
@@ -286,7 +298,7 @@ def determine_chip_and_copy() -> (int, int):
                 chip_select = Chip.CHIP_1
             break
         else:
-            LOGGER.warning("Invalid chip select value. Try again")
+            _LOGGER.warning("Invalid chip select value. Try again")
     while True:
         copy_select = input("Copy select [0/1]: ")
         if copy_select in ["0", "1"]:
@@ -296,37 +308,59 @@ def determine_chip_and_copy() -> (int, int):
                 copy_select = Copy.COPY_1_GOLD
             break
         else:
-            LOGGER.warning("Invalid copy select value. Try again")
+            _LOGGER.warning("Invalid copy select value. Try again")
     return chip_select, copy_select
 
 
 def pack_obsw_update_cmd(action_id: int) -> PusTelecommand:
     chip, copy = determine_chip_and_copy()
     user_data = bytes([chip, copy])
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
         object_id=CORE_CONTROLLER_ID, action_id=action_id, user_data=user_data
     )
 
 
-def perform_reboot_cmd(
+def add_xsc_reboot_cmd(
     q: DefaultPusQueueHelper,
     reboot_self: bool,
     chip: Chip = Chip.NONE,
     copy: Copy = Copy.NONE,
 ):
-    tc_data = bytearray()
     if reboot_self:
         q.add_log_cmd("Packing reboot command for current image")
+    else:
+        q.add_log_cmd(f"Packing reboot command for chip {chip} and copy {copy}")
+    q.add_pus_tc(create_xsc_reboot_cmds(reboot_self, chip, copy))
+
+
+def create_xsc_reboot_cmds(
+    reboot_self: bool,
+    chip: Chip = Chip.NONE,
+    copy: Copy = Copy.NONE,
+) -> PusTelecommand:
+    tc_data = bytearray()
+    if reboot_self:
         tc_data.append(True)
     else:
         tc_data.append(False)
         tc_data.append(chip)
         tc_data.append(copy)
-        q.add_log_cmd(f"Packing reboot command for chip {chip} and copy {copy}")
-    q.add_pus_tc(
-        make_fsfw_action_cmd(
-            object_id=CORE_CONTROLLER_ID,
-            action_id=ActionIds.XSC_REBOOT,
-            user_data=tc_data,
-        )
+    return create_action_cmd(
+        object_id=CORE_CONTROLLER_ID, action_id=ActionId.XSC_REBOOT, user_data=tc_data
     )
+
+
+def handle_core_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    if set_id == SetId.HK:
+        pw = PrintWrapper(printer)
+        fmt_str = "!fff"
+        inc_len = struct.calcsize(fmt_str)
+        (temperature, ps_voltage, pl_voltage) = struct.unpack(
+            fmt_str, hk_data[0 : 0 + inc_len]
+        )
+        printout = (
+            f"Chip Temperature [°C] {temperature} | PS Voltage [mV] {ps_voltage} | "
+            f"PL Voltage [mV] {pl_voltage}"
+        )
+        pw.dlog(printout)
+        printer.print_validity_buffer(validity_buffer=hk_data[inc_len:], num_vars=3)

eive_tmtc/tmtc/health.py

@@ -0,0 +1,43 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from spacepackets.ecss import PusTelecommand
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.pus.s201_fsfw_health import Subservice
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCode:
+    ANNOUNCE_HEALTH_ALL = "read_health_all"
+    ANNOUNCE_HEALTH = "read_health"
+
+
+class Info:
+    ANNOUNCE_HEALTH_ALL = "Read all health states"
+    ANNOUNCE_HEALTH = "Read health state of one object"
+
+
+@service_provider(CustomServiceList.HEALTH)
+def pack_test_command(p: ServiceProviderParams):
+    o = p.op_code
+    q = p.queue_helper
+    if o == OpCode.ANNOUNCE_HEALTH:
+        raise NotImplementedError()
+    elif o == OpCode.ANNOUNCE_HEALTH_ALL:
+        q.add_log_cmd(Info.ANNOUNCE_HEALTH_ALL)
+        q.add_pus_tc(
+            PusTelecommand(service=201, subservice=Subservice.TC_ANNOUNCE_HEALTH_ALL)
+        )
+        return
+    raise ValueError(f"unknown op code {o} for service {CustomServiceList.HEALTH}")
+
+
+@tmtc_definitions_provider
+def add_health_cmd_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.ANNOUNCE_HEALTH_ALL, Info.ANNOUNCE_HEALTH_ALL)
+    oce.add(OpCode.ANNOUNCE_HEALTH, Info.ANNOUNCE_HEALTH)
+    defs.add_service(CustomServiceList.HEALTH, info="Health Service", op_code_entry=oce)

eive_tmtc/tmtc/misc/s200_test.py

@@ -7,8 +7,8 @@
 """
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-from config.object_ids import TEST_DEVICE_ID
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
+from eive_tmtc.config.object_ids import TEST_DEVICE_ID
 
 TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID
 
@@ -19,17 +19,17 @@ def pack_service_200_test_into(q: DefaultPusQueueHelper):
     obj_id = TEST_DEVICE_OBJ_ID
     # Set On Mode
     q.add_log_cmd("Testing Service 200: Set Mode On")
-    mode_data = pack_mode_data(obj_id, Modes.ON, 0)
+    mode_data = pack_mode_data(obj_id, Mode.ON, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     # Set Normal mode
     q.add_log_cmd("Testing Service 200: Set Mode Normal")
-    mode_data = pack_mode_data(obj_id, Modes.NORMAL, 0)
+    mode_data = pack_mode_data(obj_id, Mode.NORMAL, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     # Set Raw Mode
     q.add_log_cmd("Testing Service 200: Set Mode Raw")
-    mode_data = pack_mode_data(obj_id, Modes.RAW, 0)
+    mode_data = pack_mode_data(obj_id, Mode.RAW, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     # Set Off Mode
     q.add_log_cmd("Testing Service 200: Set Mode Off")
-    mode_data = pack_mode_data(obj_id, Modes.OFF, 0)
+    mode_data = pack_mode_data(obj_id, Mode.OFF, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))

eive_tmtc/tmtc/payload/ploc_memory_dumper.py

@@ -8,7 +8,7 @@
 """
 import struct
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry
@@ -16,7 +16,7 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
 
 
-class ActionIds:
+class ActionId:
     DUMP_MRAM = 1
 
 
@@ -43,7 +43,7 @@ def pack_ploc_memory_dumper_cmd(
 def pack_mram_dump_cmd(object_id: bytes) -> bytearray:
     start = int(input("Start address: 0x"), 16)
     end = int(input("End address: 0x"), 16)
-    command = object_id + struct.pack("!I", ActionIds.DUMP_MRAM)
+    command = object_id + struct.pack("!I", ActionId.DUMP_MRAM)
     command = command + struct.pack("!I", start)
     command = command + struct.pack("!I", end)
     return bytearray(command)

eive_tmtc/tmtc/payload/ploc_mpsoc.py

@@ -6,25 +6,25 @@
 @author J. Meier
 @date   06.03.2021
 """
+import logging
 import struct
 import enum
 
-from config.definitions import CustomServiceList
-from config.object_ids import get_object_ids, PLOC_MPSOC_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import get_object_ids, PLOC_MPSOC_ID
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
     OpCodeEntry,
     TmtcDefinitionWrapper,
 )
-from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc import DefaultPusQueueHelper, service_provider
+from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.util import ObjectIdU32
-from utility.input_helper import InputHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from eive_tmtc.utility.input_helper import InputHelper
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 
-LOGGER = get_console_logger()
+
+_LOGGER = logging.getLogger(__name__)
 
 MANUAL_INPUT = "1"
 
@@ -38,16 +38,19 @@ mpsoc_file_dict = {
     "2": ["0:/flash", "0:/flash"],
 }
 
-sequence_file_dict = {
+SEQ_FILE_NAMES = ["0:/EM16/231", "0:/EQ04/E-75", "0:/EQ01/E130"]
+SEQ_FILE_DICT = {
     MANUAL_INPUT: ["manual input", ""],
-    "2": ["0:/EM16/231", "0:/EM16/231"],
-    "3": ["0:/EQ04/E-75", "0:/EQ04/E-75"],
+    "2": [f"16QRM On Carrier 200 MBd ({SEQ_FILE_NAMES[0]})", f"{SEQ_FILE_NAMES[0]}"],
+    "3": [f"QPSK On Carrier 780 MBd ({SEQ_FILE_NAMES[1]})", f"{SEQ_FILE_NAMES[1]}"],
+    "4": [f"Maximum Bandwidth QPSK ({SEQ_FILE_NAMES[2]})", f"{SEQ_FILE_NAMES[2]}"],
 }
 
+
 CARRIAGE_RETURN = 0xD
 
 
-class CommandIds(enum.IntEnum):
+class CommandId(enum.IntEnum):
     TC_MEM_WRITE = 1
     TC_MEM_READ = 2
     FLASH_WRITE = 9
@@ -65,6 +68,30 @@ class CommandIds(enum.IntEnum):
     RELEASE_UART_TX = 21
 
 
+class OpCode:
+    ON = ["on"]
+    OFF = ["off"]
+    NORMAL = ["normal"]
+    VERIFY_BOOT = ["verify_boot"]
+    MODE_REPLAY = ["mode_replay"]
+    MODE_IDLE = ["mode_idle"]
+    REPLAY_WRITE_SEQ = ["replay_write"]
+    DOWNLINK_PWR_ON = ["downlink_pwr_on"]
+    REPLAY_START = ["replay_start"]
+
+
+class Info:
+    ON = "On"
+    OFF = "Off"
+    NORMAL = "Normal"
+    VERIFY_BOOT = "Verify boot by reading 0xdeadbeef from DEADBEEF address"
+    MODE_REPLAY = "Switch to REPLAY mode"
+    MODE_IDLE = "Switch to IDLE mode"
+    REPLAY_WRITE_SEQ = "Replay write sequence"
+    DOWNLINK_PWR_ON = "Downlink Power On"
+    REPLAY_START = "Replay Start"
+
+
 class MemAddresses(enum.IntEnum):
     DEADBEEF = 0x40000004
 
@@ -77,22 +104,22 @@ class PlocReplyIds(enum.IntEnum):
 @tmtc_definitions_provider
 def add_ploc_mpsoc_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add("0", "Ploc MPSoC: Set mode off")
-    oce.add("1", "Ploc MPSoC: Set mode on")
-    oce.add("2", "Ploc MPSoC: Set mode normal")
+    oce.add(OpCode.OFF, Info.OFF)
+    oce.add(OpCode.ON, Info.ON)
+    oce.add(OpCode.NORMAL, Info.NORMAL)
     oce.add("3", "Ploc MPSoC: Memory write")
     oce.add("4", "Ploc MPSoC: Memory read")
     oce.add("5", "Ploc MPSoC: Flash write")
     oce.add("6", "Ploc MPSoC: Flash delete")
-    oce.add("7", "Ploc MPSoC: Replay start")
+    oce.add(OpCode.REPLAY_START, Info.REPLAY_START)
     oce.add("8", "Ploc MPSoC: Replay stop")
-    oce.add("9", "Ploc MPSoC: Downlink pwr on")
+    oce.add(OpCode.DOWNLINK_PWR_ON, Info.DOWNLINK_PWR_ON)
     oce.add("10", "Ploc MPSoC: Downlink pwr off")
-    oce.add("11", "Ploc MPSoC: Replay write sequence")
+    oce.add(OpCode.REPLAY_WRITE_SEQ, Info.REPLAY_WRITE_SEQ)
     oce.add("12", "Ploc MPSoC: OBSW reset sequence count")
-    oce.add("13", "Ploc MPSoC: Read DEADBEEF address")
-    oce.add("14", "Ploc MPSoC: Mode replay")
-    oce.add("15", "Ploc MPSoC: Mode idle")
+    oce.add(OpCode.VERIFY_BOOT, "Ploc MPSoC: Read DEADBEEF address")
+    oce.add(OpCode.MODE_REPLAY, Info.MODE_REPLAY)
+    oce.add(OpCode.MODE_IDLE, Info.MODE_IDLE)
     oce.add("16", "Ploc MPSoC: Tc cam command send")
     oce.add("17", "Ploc MPSoC: Set UART TX tristate")
     oce.add("18", "Ploc MPSoC: Relesase UART TX")
@@ -103,22 +130,23 @@ def add_ploc_mpsoc_cmds(defs: TmtcDefinitionWrapper):
 def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
     object_id = get_object_ids().get(PLOC_MPSOC_ID)
     q = p.queue_helper
+    prefix = "PLOC MPSoC"
     op_code = p.op_code
     q.add_log_cmd(
         f"Generate command for PLOC MPSoC with object id: {object_id.as_hex_string}"
     )
     obyt = object_id.as_bytes
-    if op_code == "0":
-        q.add_log_cmd("PLOC MPSoC: Set mode off")
-        command = pack_mode_data(obyt, Modes.OFF, 0)
+    if op_code in OpCode.OFF:
+        q.add_log_cmd(f"{prefix}: {Info.OFF}")
+        command = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
-    if op_code == "1":
-        q.add_log_cmd("PLOC MPSoC: Set mode on")
-        data = pack_mode_data(obyt, Modes.ON, 0)
+    if op_code in OpCode.ON:
+        q.add_log_cmd(f"{prefix}: {Info.ON}")
+        data = pack_mode_data(obyt, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "2":
-        q.add_log_cmd("PLOC MPSoC: Mode Normal")
-        data = pack_mode_data(object_id.as_bytes, Modes.NORMAL, 0)
+    if op_code in OpCode.NORMAL:
+        q.add_log_cmd(f"{prefix}: {Info.NORMAL}")
+        data = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
     if op_code == "3":
         q.add_log_cmd("PLOC MPSoC: TC mem write test")
@@ -144,64 +172,64 @@ def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
         q.add_log_cmd("PLOC MPSoC: Flash delete")
         data = prepare_flash_delete_cmd(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "7":
-        q.add_log_cmd("PLOC MPSoC: Replay start")
+    if op_code in OpCode.REPLAY_START:
+        q.add_log_cmd(f"{prefix}: {Info.REPLAY_START}")
         data = prepare_replay_start_cmd(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "8":
         q.add_log_cmd("PLOC MPSoC: Replay stop")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.TC_REPLAY_STOP)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.TC_REPLAY_STOP)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "9":
-        q.add_log_cmd("PLOC MPSoC: Downlink pwr on")
+    if op_code in OpCode.DOWNLINK_PWR_ON:
+        q.add_log_cmd(f"{prefix}: {OpCode.DOWNLINK_PWR_ON}")
         data = prepare_downlink_pwr_on_cmd(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "10":
         q.add_log_cmd("PLOC MPSoC: Downlink pwr off")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.TC_DOWNLINK_PWR_OFF)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.TC_DOWNLINK_PWR_OFF)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "11":
-        q.add_log_cmd("PLOC MPSoC: Replay write sequence")
+    if op_code in OpCode.REPLAY_WRITE_SEQ:
+        q.add_log_cmd(f"{prefix}: {Info.REPLAY_WRITE_SEQ}")
         data = prepare_replay_write_sequence_cmd(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "12":
         q.add_log_cmd("PLOC MPSoC: Reset OBSW sequence count")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.OBSW_RESET_SEQ_COUNT)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.OBSW_RESET_SEQ_COUNT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "13":
+    if op_code in OpCode.VERIFY_BOOT:
         num_words = 1
-        q.add_log_cmd("PLOC MPSoC: Read DEADBEEF address")
+        q.add_log_cmd(f"{prefix} {Info.VERIFY_BOOT}")
         data = (
             object_id.as_bytes
-            + struct.pack("!I", CommandIds.TC_MEM_READ)
+            + struct.pack("!I", CommandId.TC_MEM_READ)
             + struct.pack("!I", MemAddresses.DEADBEEF)
             + struct.pack("!H", num_words)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "14":
+    if op_code in OpCode.MODE_REPLAY:
         q.add_log_cmd("PLOC MPSoC: Tc mode replay")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.TC_MODE_REPLAY)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.TC_MODE_REPLAY)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "15":
+    if op_code in OpCode.MODE_IDLE:
         q.add_log_cmd("PLOC MPSoC: Tc mode idle")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.TC_MODE_IDLE)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.TC_MODE_IDLE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "16":
         q.add_log_cmd("PLOC MPSoC: Tc cam command send")
         cam_cmd = input("Specify cam command string: ")
         data = (
             object_id.as_bytes
-            + struct.pack("!I", CommandIds.TC_CAM_CMD_SEND)
+            + struct.pack("!I", CommandId.TC_CAM_CMD_SEND)
             + bytearray(cam_cmd, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "17":
         q.add_log_cmd("PLOC MPSoC: Set UART TX tristate")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.SET_UART_TX_TRISTATE)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.SET_UART_TX_TRISTATE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "18":
         q.add_log_cmd("PLOC MPSoC: Release UART TX")
-        data = object_id.as_bytes + struct.pack("!I", CommandIds.RELEASE_UART_TX)
+        data = object_id.as_bytes + struct.pack("!I", CommandId.RELEASE_UART_TX)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
 
 
@@ -218,7 +246,7 @@ def generate_write_mem_command(
     """
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_MEM_WRITE)
+        + struct.pack("!I", CommandId.TC_MEM_WRITE)
         + struct.pack("!I", memory_address)
         + struct.pack("!H", mem_len)
         + struct.pack("!I", memory_data)
@@ -231,7 +259,7 @@ def prepare_mem_read_command(object_id: bytes) -> bytearray:
     num_words = int(input("PLOC MPSoC specify number of words (32-bit) to read: "))
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_MEM_READ)
+        + struct.pack("!I", CommandId.TC_MEM_READ)
         + struct.pack("!I", memory_address)
         + struct.pack("!H", num_words)
     )
@@ -243,7 +271,7 @@ def prepare_flash_write_cmd(object_id: bytes) -> bytearray:
     mpsocFile = get_mpsoc_file()
     command = (
         object_id
-        + struct.pack("!I", CommandIds.FLASH_WRITE)
+        + struct.pack("!I", CommandId.FLASH_WRITE)
         + bytearray(obcFile, "utf-8")
         + bytearray(mpsocFile, "utf-8")
     )
@@ -254,7 +282,7 @@ def prepare_flash_delete_cmd(object_id: bytes) -> bytearray:
     file = get_mpsoc_file()
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_FLASH_DELETE)
+        + struct.pack("!I", CommandId.TC_FLASH_DELETE)
         + bytearray(file, "utf-8")
     )
     return bytearray(command)
@@ -264,7 +292,7 @@ def prepare_replay_start_cmd(object_id: bytes) -> bytearray:
     replay = int(input("Specify replay mode (0 - once, 1 - repeated): "))
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_REPLAY_START)
+        + struct.pack("!I", CommandId.TC_REPLAY_START)
         + struct.pack("!B", replay)
     )
     return bytearray(command)
@@ -275,7 +303,7 @@ def prepare_downlink_pwr_on_cmd(object_id: bytes) -> bytearray:
     lane_rate = int(input("Specify lane rate (0 - 9): "))
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_DOWNLINK_PWR_ON)
+        + struct.pack("!I", CommandId.TC_DOWNLINK_PWR_ON)
         + struct.pack("!B", mode)
         + struct.pack("!B", lane_rate)
     )
@@ -283,20 +311,20 @@ def prepare_downlink_pwr_on_cmd(object_id: bytes) -> bytearray:
 
 
 def prepare_replay_write_sequence_cmd(object_id: bytes) -> bytearray:
-    null_terminator = 0
     use_decoding = int(input("Use decoding  (set to 1): "))
     file = get_sequence_file()
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_REPLAY_WRITE_SEQUENCE)
+        + struct.pack("!I", CommandId.TC_REPLAY_WRITE_SEQUENCE)
         + struct.pack("!B", use_decoding)
         + bytearray(file, "utf-8")
+        # + bytes([0])
     )
     return bytearray(command)
 
 
 def get_obc_file() -> str:
-    LOGGER.info("Specify OBC file ")
+    _LOGGER.info("Specify OBC file ")
     input_helper = InputHelper(flash_write_file_dict)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
@@ -307,7 +335,7 @@ def get_obc_file() -> str:
 
 
 def get_mpsoc_file() -> str:
-    LOGGER.info("Specify MPSoC file")
+    _LOGGER.info("Specify MPSoC file")
     input_helper = InputHelper(mpsoc_file_dict)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
@@ -318,11 +346,11 @@ def get_mpsoc_file() -> str:
 
 
 def get_sequence_file() -> str:
-    LOGGER.info("Specify sequence file")
-    input_helper = InputHelper(sequence_file_dict)
+    _LOGGER.info("Specify sequence file")
+    input_helper = InputHelper(SEQ_FILE_DICT)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
         file = input("Ploc MPSoC: Specify absolute name file: ")
     else:
-        file = sequence_file_dict[key][1]
+        file = SEQ_FILE_DICT[key][1]
     return file

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -7,24 +7,24 @@
 @date   10.07.2021
 """
 import enum
+import logging
 import struct
 
-from config.object_ids import PLOC_SUPV_ID, get_object_ids
-from config.definitions import CustomServiceList
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.config import TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry
-from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from utility.input_helper import InputHelper
+from eive_tmtc.utility.input_helper import InputHelper
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 latchup_id_dict = {
     "0": "0.85V",
@@ -36,9 +36,12 @@ latchup_id_dict = {
     "6": "SAFECOTS",
 }
 
+HARDCODED = "0"
 MANUAL_INPUT = "1"
+HARDCODED_FILE = "/home/rmueller/EIVE/mpsoc_boot.bin"
 
 update_file_dict = {
+    HARDCODED: ["hardcoded", ""],
     MANUAL_INPUT: ["manual input", ""],
     "2": ["/mnt/sd0/ploc/supervisor/update.bin", "/mnt/sd0/ploc/supervisor/update.bin"],
     "3": [
@@ -61,7 +64,26 @@ event_buffer_path_dict = {
 }
 
 
-class SupvActionIds:
+FACTORY_RESET_OPS = {
+    0x00: "CLEAR_MRAM_EVENT_BUF",
+    0x01: "CLEAR_MRAM_ADC_BUF",
+    0x02: "FACTORY_DEFAULT_MRAM_SYS_CFG",
+    0x03: "FACTORY_DEFAULT_MRAM_DBG_CFG",
+    0x04: "FACTORY_DEFAULT_BOOTMAN_CFG",
+    0x05: "FACTORY_DEFAULT_DATA_LOGGER",
+    0x06: "DATA_LOGGER_OP_DATA_TO_ZERO",
+    0x07: "FACTORY_DEFAULT_MRAM_LATCHUP_MON",
+    0x08: "FACTORY_DEFAULT_ADC_MON_CFG",
+    0x09: "FACTORY_DEFAULT_WATCHDOG_MON_CFG",
+    0x0A: "FACTORY_DEFAULT_HK_CFG",
+    0x0B: "FACTORY_DEFAULT_MEM_MAN_CFG",
+    0x10: "REDWIRE_TASK_1",
+    0x11: "REDWIRE_TASK_2",
+    0x12: "REDWIRE_TASK_3",
+}
+
+
+class SupvActionId:
     HK_REPORT = 1
     START_MPSOC = 3
     SHUTWOWN_MPSOC = 4
@@ -89,11 +111,8 @@ class SupvActionIds:
     SET_GPIO = 34
     READ_GPIO = 35
     RESTART_SUPERVISOR = 36
-    FACTORY_RESET_CLEAR_ALL = 37
     LOGGING_REQUEST_COUNTERS = 38
-    UPDATE_IMAGE_DATA = 39
-    FACTORY_RESET_CLEAR_MIRROR = 40
-    FACTORY_RESET_CLEAR_CIRCULAR = 41
+    FACTORY_RESET = 39
     START_MPSOC_QUIET = 45
     SET_SHUTDOWN_TIMEOUT = 46
     FACTORY_FLASH = 47
@@ -125,9 +144,12 @@ class OpCodes:
     START_MPSOC = ["5", "start_mpsoc"]
     SHUTDOWN_MPSOC = ["6", "stop_mpsoc"]
     SEL_NVM = ["7", "sel_nvm"]
+    SET_TIME_REF = ["set_time_ref"]
+    FACTORY_FLASH = ["factory_flash"]
     REQ_BOOT_STATUS_REPORT = ["13", "boot_report"]
     START_UPDATE = ["42", "start_update"]
     PERFORM_UPDATE = ["update"]
+    FACTORY_RESET = ["factory_reset"]
     MEM_CHECK = ["mem_check"]
 
 
@@ -138,8 +160,11 @@ class Info(str, enum.Enum):
     NML = "Switch Normal"
     HK_TO_OBC = "Request  HK from PLOC SUPV"
     REQUEST_HK = "Request HK set from PLOC Handler"
+    SET_TIME_REF = "Set time reference"
+    FACTORY_FLASH = "Factory Flash Mode"
     PERFORM_UPDATE = "Start or continue MPSoC SW update at starting bytes"
     START_UPDATE = "Start new MPSoC SW update"
+    FACTORY_RESET = "Factory Reset of loggers"
     REQ_BOOT_STATUS_REPORT = "Request boot status report and HK"
     MEM_CHECK = "Memory Check"
     SEL_NVM = "Select NVM"
@@ -157,9 +182,10 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCodes.START_MPSOC, "PLOC Supervisor: Start MPSoC")
     oce.add(OpCodes.SHUTDOWN_MPSOC, "PLOC Supervisor: Shutdown MPSoC")
     oce.add(OpCodes.SEL_NVM, Info.SEL_NVM)
+    oce.add(OpCodes.SET_TIME_REF, Info.SET_TIME_REF)
+    oce.add(OpCodes.FACTORY_RESET, Info.FACTORY_RESET)
     oce.add("8", "PLOC Supervisor: Set max restart tries")
     oce.add("9", "PLOC Supervisor: Reset MPSoC")
-    oce.add("10", "PLOC Supervisor: Set time reference")
     oce.add("11", "PLOC Supervisor: Set boot timeout")
     oce.add("12", "PLOC Supervisor: Disable Hk")
     oce.add(OpCodes.REQ_BOOT_STATUS_REPORT, Info.REQ_BOOT_STATUS_REPORT)
@@ -176,15 +202,12 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     oce.add("35", "PLOC Supervisor: Set GPIO")
     oce.add("36", "PLOC Supervisor: Read GPIO")
     oce.add("37", "PLOC Supervisor: Restart supervisor")
-    oce.add("38", "PLOC Supervisor: Factory reset clear all")
-    oce.add("39", "PLOC Supervisor: Factory reset clear mirror entries")
-    oce.add("40", "PLOC Supervisor: Factory reset clear circular entries")
     oce.add(OpCodes.PERFORM_UPDATE, Info.PERFORM_UPDATE)
     oce.add(OpCodes.START_UPDATE, Info.START_UPDATE)
     oce.add("43", "PLOC Supervisor: Terminate supervisor process")
     oce.add("44", "PLOC Supervisor: Start MPSoC quiet")
     oce.add("45", "PLOC Supervisor: Set shutdown timeout")
-    oce.add("46", "PLOC Supervisor: Factory flash")
+    oce.add(OpCodes.FACTORY_FLASH, Info.FACTORY_FLASH)
     oce.add("47", "PLOC Supervisor: Enable auto TM")
     oce.add("48", "PLOC Supervisor: Disable auto TM")
     oce.add("51", "PLOC Supervisor: Logging request event buffers")
@@ -209,19 +232,19 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     prefix = "PLOC Supervisor"
     if op_code in OpCodes.OFF:
         q.add_log_cmd(f"{prefix}: {Info.OFF}")
-        command = pack_mode_data(object_id.as_bytes, Modes.OFF, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCodes.ON:
         q.add_log_cmd(f"{prefix}: {Info.ON}")
-        command = pack_mode_data(object_id.as_bytes, Modes.ON, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCodes.NORMAL:
         q.add_log_cmd(f"{prefix}: {Info.NML}")
-        command = pack_mode_data(object_id.as_bytes, Modes.NORMAL, 0)
+        command = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
     if op_code in OpCodes.HK_TO_OBC:
         q.add_log_cmd(f"{prefix}: {Info.HK_TO_OBC}")
-        command = obyt + struct.pack("!I", SupvActionIds.HK_REPORT)
+        command = obyt + struct.pack("!I", SupvActionId.HK_REPORT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.REQUEST_HK:
         q.add_log_cmd(f"{prefix}: {Info.REQUEST_HK}")
@@ -230,11 +253,11 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         q.add_pus_tc(cmd)
     elif op_code in OpCodes.START_MPSOC:
         q.add_log_cmd("PLOC Supervisor: Start MPSoC")
-        command = obyt + struct.pack("!I", SupvActionIds.START_MPSOC)
+        command = obyt + struct.pack("!I", SupvActionId.START_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.SHUTDOWN_MPSOC:
         q.add_log_cmd("PLOC Supervisor: Shutdown MPSoC")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.SHUTWOWN_MPSOC)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.SHUTWOWN_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.SEL_NVM:
         q.add_log_cmd("PLOC Supervisor: Select MPSoC boot image")
@@ -244,40 +267,58 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         bp2 = int(input("BP2 (0 or 1): "))
         command = pack_sel_boot_image_cmd(object_id.as_bytes, mem, bp0, bp1, bp2)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code in OpCodes.FACTORY_RESET:
+        q.add_log_cmd(f"{prefix}: {Info.FACTORY_RESET}")
+        key = -1
+        while True:
+            print("Please select the key for a factory reset operation")
+            for key, val in FACTORY_RESET_OPS.items():
+                print(f"{key}: {val}")
+            key = int(input("Key Select: "))
+            if key not in FACTORY_RESET_OPS:
+                print("Key invalid!")
+            break
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=PLOC_SUPV_ID,
+                action_id=SupvActionId.FACTORY_RESET,
+                user_data=bytes([key]),
+            )
+        )
     if op_code == "8":
         q.add_log_cmd("PLOC Supervisor: Set max restart tries")
         restart_tries = int(input("Specify maximum restart tries: "))
         command = (
             object_id.as_bytes
-            + struct.pack("!I", SupvActionIds.SET_MAX_RESTART_TRIES)
+            + struct.pack("!I", SupvActionId.SET_MAX_RESTART_TRIES)
             + struct.pack("!B", restart_tries)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "9":
         q.add_log_cmd("PLOC Supervisor: Reset MPSoC")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.RESET_MPSOC)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.RESET_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "10":
+    if op_code in OpCodes.SET_TIME_REF:
         q.add_log_cmd("PLOC Supervisor: Set time reference")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.SET_TIME_REF)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.SET_TIME_REF)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "11":
         q.add_log_cmd("PLOC Supervisor: Set boot timeout")
         boot_timeout = int(input("Specify boot timeout [ms]: "))
         command = (
             object_id.as_bytes
-            + struct.pack("!I", SupvActionIds.SET_BOOT_TIMEOUT)
+            + struct.pack("!I", SupvActionId.SET_BOOT_TIMEOUT)
             + struct.pack("!I", boot_timeout)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "12":
         q.add_log_cmd("PLOC Supervisor: Disable HK")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.DISABLE_HK)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.DISABLE_HK)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.REQ_BOOT_STATUS_REPORT:
         q.add_log_cmd(f"{prefix}:  {Info.REQ_BOOT_STATUS_REPORT}")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.GET_BOOT_STATUS_REPORT
+            "!I", SupvActionId.GET_BOOT_STATUS_REPORT
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
         q.add_wait_seconds(2.0)
@@ -311,13 +352,13 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     if op_code == "26":
         q.add_log_cmd("PLOC Supervisor: Request latchup status report")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.GET_LATCHUP_STATUS_REPORT
+            "!I", SupvActionId.GET_LATCHUP_STATUS_REPORT
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "27":
         q.add_log_cmd("PLOC Supervisor: Copy ADC data to MRAM")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.COPY_ADC_DATA_TO_MRAM
+            "!I", SupvActionId.COPY_ADC_DATA_TO_MRAM
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "30":
@@ -339,25 +380,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     if op_code == "37":
         q.add_log_cmd("PLOC Supervisor: Restart supervisor")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.RESTART_SUPERVISOR
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "38":
-        q.add_log_cmd("PLOC Supervisor: Factory reset clear all")
-        command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.FACTORY_RESET_CLEAR_ALL
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "39":
-        q.add_log_cmd("PLOC Supervisor: Factory reset clear mirror entries")
-        command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.FACTORY_RESET_CLEAR_MIRROR
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "40":
-        q.add_log_cmd("PLOC Supervisor: Factory reset clear circular entries")
-        command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.FACTORY_RESET_CLEAR_CIRCULAR
+            "!I", SupvActionId.RESTART_SUPERVISOR
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.START_UPDATE:
@@ -371,30 +394,28 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     if op_code == "43":
         q.add_log_cmd("PLOC Supervisor: Terminate supervisor process")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.TERMINATE_SUPV_HELPER
+            "!I", SupvActionId.TERMINATE_SUPV_HELPER
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "44":
         q.add_log_cmd("PLOC Supervisor: Start MPSoC quiet")
-        command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.START_MPSOC_QUIET
-        )
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.START_MPSOC_QUIET)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "45":
         q.add_log_cmd("PLOC Supervisor: Set shutdown timeout")
         command = pack_set_shutdown_timeout_command(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "46":
-        q.add_log_cmd("PLOC Supervisor: Factory flash")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.FACTORY_FLASH)
+    if op_code in OpCodes.FACTORY_FLASH:
+        q.add_log_cmd(f"{prefix}: {Info.FACTORY_FLASH}")
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.FACTORY_FLASH)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "47":
         q.add_log_cmd("PLOC Supervisor: Enable auto TM")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.ENABLE_AUTO_TM)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.ENABLE_AUTO_TM)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "48":
         q.add_log_cmd("PLOC Supervisor: Disable auto TM")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.DISABLE_AUTO_TM)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.DISABLE_AUTO_TM)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "51":
         q.add_log_cmd("PLOC Supervisor: Logging request event buffers")
@@ -403,7 +424,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     if op_code == "52":
         q.add_log_cmd("PLOC Supervisor: Logging clear counters")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.LOGGING_CLEAR_COUNTERS
+            "!I", SupvActionId.LOGGING_CLEAR_COUNTERS
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "53":
@@ -413,18 +434,18 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
     if op_code == "54":
         q.add_log_cmd("PLOC Supervisor: Logging request counters")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.LOGGING_REQUEST_COUNTERS
+            "!I", SupvActionId.LOGGING_REQUEST_COUNTERS
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "55":
         q.add_log_cmd("PLOC Supervisor: Request ADC report")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionIds.REQUEST_ADC_REPORT
+            "!I", SupvActionId.REQUEST_ADC_REPORT
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "56":
         q.add_log_cmd("PLOC Supervisor: Reset PL")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.RESET_PL)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.RESET_PL)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "57":
         q.add_log_cmd("PLOC Supervisor: Enable NVMs")
@@ -432,14 +453,14 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         nvm3 = int(input("Enable (1) or disable(0) NVM 3: "))
         command = (
             object_id.as_bytes
-            + struct.pack("!I", SupvActionIds.ENABLE_NVMS)
+            + struct.pack("!I", SupvActionId.ENABLE_NVMS)
             + struct.pack("B", nvm01)
             + struct.pack("B", nvm3)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "58":
         q.add_log_cmd("PLOC Supervisor: Continue update")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.CONTINUE_UPDATE)
+        command = object_id.as_bytes + struct.pack("!I", SupvActionId.CONTINUE_UPDATE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.MEM_CHECK:
         custom_data = bytearray()
@@ -454,8 +475,8 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
             f"{prefix}: {Info.MEM_CHECK} for file {update_file} at memory ID {memory_id} at start "
             f"address {start_address}"
         )
-        command = make_fsfw_action_cmd(
-            object_id.as_bytes, SupvActionIds.MEM_CHECK, custom_data
+        command = create_action_cmd(
+            object_id.as_bytes, SupvActionId.MEM_CHECK, custom_data
         )
         q.add_pus_tc(command)
 
@@ -470,7 +491,7 @@ def pack_sel_boot_image_cmd(
     @param bp1  Partition pin 1
     @param bp2  Partition pin 2
     """
-    command = object_id + struct.pack("!I", SupvActionIds.SEL_MPSOC_BOOT_IMAGE)
+    command = object_id + struct.pack("!I", SupvActionId.SEL_MPSOC_BOOT_IMAGE)
     command = command + struct.pack("!B", mem)
     command = command + struct.pack("!B", bp0)
     command = command + struct.pack("!B", bp1)
@@ -488,7 +509,7 @@ def pack_update_available_cmd(object_id: bytes) -> bytearray:
     image_size = 222
     image_crc = 0x0
     number_of_packets = 150
-    command = object_id + struct.pack("!I", SupvActionIds.UPDATE_AVAILABLE)
+    command = object_id + struct.pack("!I", SupvActionId.UPDATE_AVAILABLE)
     command = command + struct.pack("!B", image_select)
     command = command + struct.pack("!B", image_partition)
     command = command + struct.pack("!I", image_size)
@@ -506,9 +527,9 @@ def pack_lachtup_alert_cmd(object_id: bytes, state: bool) -> bytearray:
     latchup_id = get_latchup_id()
     command = bytearray()
     if state:
-        command = object_id + struct.pack("!I", SupvActionIds.ENABLE_LATCHUP_ALERT)
+        command = object_id + struct.pack("!I", SupvActionId.ENABLE_LATCHUP_ALERT)
     else:
-        command = object_id + struct.pack("!I", SupvActionIds.DISABLE_LATCHUP_ALERT)
+        command = object_id + struct.pack("!I", SupvActionId.DISABLE_LATCHUP_ALERT)
     command = command + struct.pack("!B", latchup_id)
     return bytearray(command)
 
@@ -537,7 +558,7 @@ def pack_set_alert_limit_cmd(object_id: bytes) -> bytearray:
     latchup_id = get_latchup_id()
     dutycycle = int(input("Specify dutycycle: "))
     command = bytearray()
-    command = object_id + struct.pack("!I", SupvActionIds.SET_ALERT_LIMIT)
+    command = object_id + struct.pack("!I", SupvActionId.SET_ALERT_LIMIT)
     command = command + struct.pack("!B", latchup_id)
     command = command + struct.pack("!I", dutycycle)
     return bytearray(command)
@@ -549,7 +570,7 @@ def pack_set_adc_enabled_channels_cmd(object_id: bytes) -> bytearray:
     @param object_id    The object id of the PLOC supervisor handler.
     """
     ch = int(input("Specify ch: 0x"), 16)
-    cmd = object_id + struct.pack("!I", SupvActionIds.SET_ADC_ENABLED_CHANNELS)
+    cmd = object_id + struct.pack("!I", SupvActionId.SET_ADC_ENABLED_CHANNELS)
     cmd = cmd + struct.pack("!H", ch)
     return bytearray(cmd)
 
@@ -557,7 +578,7 @@ def pack_set_adc_enabled_channels_cmd(object_id: bytes) -> bytearray:
 def pack_set_adc_window_and_stride_cmd(object_id: bytes) -> bytearray:
     window_size = int(input("Specify window size: "))
     striding_step_size = int(input("Specify striding step size: "))
-    command = object_id + struct.pack("!I", SupvActionIds.SET_ADC_WINDOW_AND_STRIDE)
+    command = object_id + struct.pack("!I", SupvActionId.SET_ADC_WINDOW_AND_STRIDE)
     command = command + struct.pack("!H", window_size)
     command = command + struct.pack("!H", striding_step_size)
     return bytearray(command)
@@ -565,21 +586,21 @@ def pack_set_adc_window_and_stride_cmd(object_id: bytes) -> bytearray:
 
 def pack_set_adc_threshold_cmd(object_id: bytes) -> bytearray:
     threshold = int(input("Specify threshold: "))
-    command = object_id + struct.pack("!I", SupvActionIds.SET_ADC_THRESHOLD)
+    command = object_id + struct.pack("!I", SupvActionId.SET_ADC_THRESHOLD)
     command = command + struct.pack("!I", threshold)
     return bytearray(command)
 
 
 def pack_select_nvm_cmd(object_id: bytes) -> bytearray:
     mem = int(input("Specify NVM (0 - NVM0, 1 - MVM1): "))
-    command = object_id + struct.pack("!I", SupvActionIds.SELECT_NVM)
+    command = object_id + struct.pack("!I", SupvActionId.SELECT_NVM)
     command = command + struct.pack("!B", mem)
     return bytearray(command)
 
 
 def pack_auto_em_tests_cmd(object_id: bytes) -> bytearray:
     test = int(input("Specify test (1 - complete, 2 - short): "))
-    command = object_id + struct.pack("!I", SupvActionIds.RUN_AUTO_EM_TESTS)
+    command = object_id + struct.pack("!I", SupvActionId.RUN_AUTO_EM_TESTS)
     command = command + struct.pack("!B", test)
     return bytearray(command)
 
@@ -587,7 +608,7 @@ def pack_auto_em_tests_cmd(object_id: bytes) -> bytearray:
 def pack_mram_wipe_cmd(object_id: bytes) -> bytearray:
     start = int(input("Start address: 0x"), 16)
     stop = int(input("Stop address: 0x"), 16)
-    command = object_id + struct.pack("!I", SupvActionIds.WIPE_MRAM)
+    command = object_id + struct.pack("!I", SupvActionId.WIPE_MRAM)
     command = command + struct.pack("!I", start)
     command = command + struct.pack("!I", stop)
     return bytearray(command)
@@ -619,7 +640,7 @@ def pack_update_command(object_id: bytes, new_update: bool) -> bytearray:
         else:
             raise ValueError("Invalid input, use y or n")
     command += object_id
-    command += struct.pack("!I", SupvActionIds.PERFORM_UPDATE)
+    command += struct.pack("!I", SupvActionId.PERFORM_UPDATE)
     command += bytearray(update_file, "utf-8")
     # Adding null terminator
     command += struct.pack("!B", 0)
@@ -634,7 +655,7 @@ def pack_update_command(object_id: bytes, new_update: bool) -> bytearray:
 def pack_set_shutdown_timeout_command(object_id: bytes) -> bytearray:
     command = bytearray()
     command += object_id
-    command += struct.pack("!I", SupvActionIds.SET_SHUTDOWN_TIMEOUT)
+    command += struct.pack("!I", SupvActionId.SET_SHUTDOWN_TIMEOUT)
     timeout = int(input("Specify shutdown timeout (ms): "))
     command += struct.pack("!I", timeout)
     return command
@@ -643,7 +664,7 @@ def pack_set_shutdown_timeout_command(object_id: bytes) -> bytearray:
 def pack_logging_buffer_request(object_id: bytes) -> bytearray:
     command = bytearray()
     command += object_id
-    command += struct.pack("!I", SupvActionIds.LOGGING_REQUEST_EVENT_BUFFERS)
+    command += struct.pack("!I", SupvActionId.LOGGING_REQUEST_EVENT_BUFFERS)
     path = get_event_buffer_path()
     command += bytearray(path, "utf-8")
     return command
@@ -653,7 +674,7 @@ def pack_set_gpio_cmd(object_id: bytes) -> bytearray:
     port = int(input("Specify port: 0x"), 16)
     pin = int(input("Specify pin: 0x"), 16)
     val = int(input("Specify val: 0x"), 16)
-    command = object_id + struct.pack("!I", SupvActionIds.SET_GPIO)
+    command = object_id + struct.pack("!I", SupvActionId.SET_GPIO)
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
     command = command + struct.pack("!B", val)
@@ -663,24 +684,26 @@ def pack_set_gpio_cmd(object_id: bytes) -> bytearray:
 def pack_read_gpio_cmd(object_id: bytes) -> bytearray:
     port = int(input("Specify port: 0x"), 16)
     pin = int(input("Specify pin: 0x"), 16)
-    command = object_id + struct.pack("!I", SupvActionIds.READ_GPIO)
+    command = object_id + struct.pack("!I", SupvActionId.READ_GPIO)
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
     return bytearray(command)
 
 
 def pack_logging_set_topic(object_id: bytes) -> bytearray:
-    command = object_id + struct.pack("!I", SupvActionIds.LOGGING_SET_TOPIC)
+    command = object_id + struct.pack("!I", SupvActionId.LOGGING_SET_TOPIC)
     tpc = int(input("Specify logging topic: "))
     command += struct.pack("!B", tpc)
     return bytearray(command)
 
 
 def get_update_file() -> str:
-    LOGGER.info("Specify update file ")
+    _LOGGER.info("Specify update file ")
     input_helper = InputHelper(update_file_dict)
     key = input_helper.get_key()
-    if key == MANUAL_INPUT:
+    if key == HARDCODED:
+        file = HARDCODED_FILE
+    elif key == MANUAL_INPUT:
         file = input("Ploc Supervisor: Specify absolute name of update file: ")
     else:
         file = update_file_dict[key][1]
@@ -688,7 +711,7 @@ def get_update_file() -> str:
 
 
 def get_event_buffer_path() -> str:
-    LOGGER.info("Specify path where to store event buffer file ")
+    _LOGGER.info("Specify path where to store event buffer file ")
     input_helper = InputHelper(event_buffer_path_dict)
     key = input_helper.get_key()
     if key == MANUAL_INPUT: