prep v5.7.1

Reviewed-on: #240
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

.run/CFDP Downlink Test Large.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CFDP Downlink Test Large" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+    <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="cfdp -p /tmp/obsw_update.bin /tmp/obsw_update_copy.bin -d 0.1" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/CFDP Downlink Test Larger.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CFDP Downlink Test Larger" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+    <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="cfdp -p /tmp/fake_5kb.bin /tmp/fake_5kb_copy.bin -d 0.1" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/CFDP Downlink Test.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CFDP Downlink Test" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+    <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="cfdp -p /tmp/hello.txt /tmp/hello2.txt -d 0.1" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/CFDP Test File Large.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="cfdp filetest/obsw_update.bin /tmp/obsw_update.bin -d 0.3" />
+    <option name="PARAMETERS" value="cfdp filetest/obsw_update.bin /tmp/obsw_update.bin -d 0.1" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

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

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CFDP Test File Small Closure" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+    <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="cfdp filetest/cfdp_test.txt /tmp/cfdp_test.txt -d 0.2" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.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

@@ -8,11 +8,559 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 The [milestone](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestones)
 list yields a list of all related PRs for each release.
 
-# [v2.1.1] 12.01.2023
+# [unreleased]
+
+# [v5.7.1] 2023-10-11
+
+## Added
+
+- SCEX normal command
+
+# [v5.7.0] 2023-10-10
+
+- `tmtccmd` v6.0.0
+- `spacepackets` v18.0.0
+
+## Added
+
+- Power controller commands.
+
+# [v5.6.0] 2023-09-14
+
+- `tmtccmd` v6.0.0
+- `spacepackets` v18.0.0
+
+## Added
+
+- CFDP file downlink support.
+
+# [v5.5.1] 2023-09-12
+
+## Fixed
+
+- Some API usage fixes related to `tmtccmd` update.
+
+# [v5.5.0] 2023-09-12
+
+- Version is not specfied dynamically anymore and can be updated in `pyproject.toml`
+- New events and returnvalues
+- Bump `tmtccmd` to v6.0.0rc0
+
+# [v5.4.3] 2023-08-15
+
+## Added
+
+- PLOC SUPV HK parsing.
+
+# [v5.4.2] 2023-08-15
+
+## Added
+
+- New NONE entry for PL PCDU submode enum.
+
+# [v5.4.1] 2023-08-15
+
+## Added
+
+- New event TLE_TOO_OLD
+
+## Changed
+
+ - PL Subsystem mode ID is int enum now.
+
+# [v5.4.0] 2023-08-15
+
+## Added
+
+- New enumeration for PL PCDU commanding.
+- Some new events
+
+# [v5.3.1] 2023-07-26
+
+## Changed
+
+- Adaptions for ACS CTRL strategy enum to make it compatible to software. Also make it re-usable
+  by putting it in global scope.
+
+# [v5.3.0] 2023-07-26
+
+## Added
+
+- Dataset handling for new ACS fused rot rate dataset.
+
+# [v5.2.0] 2023-07-13
+
+- `tmtccmd` v5.0.0
+
+## Added
+
+- New TCS controller events
+
+## Changed
+
+- HK level can be specified as CLI argument now.
+
+# [v5.1.0] 2023-06-28
+
+## Added
+
+- Internal error reporter dataset handling.
+
+## Fixed
+
+- `APP_LOGGER` is the root logger now.
+
+## Changed
+
+- HK is only displayed in brief format per default now. This will soon be adaptable by CLI
+  argument.
+
+# [v5.0.0] 2023-06-22
+
+## Changed
+
+- Force flag for copy helper.
+
+# [v4.1.0] 2023-06-14
+
+## Added
+
+- Some BPX battery commands
+
+# [v4.0.0] 2023-06-10
+
+`tmtccmd` version: v5.0.0rc0
+
+## Added
+
+- Event handling for reboot counter events.
+- Start adding new MPSoC commands, improve MPSoC commanding module a bit.
+- Handling for PLOC MPSoC flash content report.
+
+## Fixed
+
+- Fix for PLOC power switching.
+- Bump `tmtccmd` to v5.0.0rc0 for important bugfix in CFDP header.
+
+# [v3.1.2] 2023-06-19
+
+## Fixed
+
+- Pin `tmtccmd` to v4.1.3 to enforce correct `spacepackets` version on install
+
+# [v3.1.1] 2023-04-17
+
+## Added
+
+- Update generated event file.
+
+# [v3.1.0] 2023-04-16
+
+## Added
+
+- New core controller file system helper commands.
+
+# [v3.0.0] 2023-04-14
+
+## Fixed
+
+- Bugfix for STR solution set format.
+- Update for STR commands.
+
+## Added
+
+- Added core commands to execute `systemctl` commands and to execute arbitrary Linux commands.
+
+# [v2.22.1] 2023-04-12
+
+## Added
+
+- Prompts to specify custom filename for OBSW update
+
+# [v2.22.0] 2023-04-07
+
+- Various smaller and helper commands added for tests
+- Update generated files
+
+# [v2.21.0] 2023-04-04
+
+## Added
+
+- Add boot mode command for EIVE system.
+
+## Changed
+
+- PCDU switcher set now includes the 3V3 stack switcher state.
+
+# [v2.20.1] 2023-04-01
+
+## Fixed
+
+- MEKF: Handle NOT_FINITE status (key 5)
+
+# [v2.20.0] 2023-03-28
+
+## Changed
+
+- COM `Submode` enum moved from subsystem module to separate definitions module and renamed
+  to `Mode`. Added re-imports with the name `ComMode` in the subsystem and syrlinks module.
+- Convert various enums to proper `IntEnum`s
+- Updates for some enumerations.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/178
+
+## Fixed
+
+- Eb to N0 calculation: Improve robustness against division by zero.
+- Some fixes for PCDU commands: Wrongfully packed command to switch devices off instead of on.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/180.
+
+## Added
+
+- Added `PcduSwitches` enum.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/179
+
+# [v2.19.4] 2023-03-24
+
+## Fixed
+
+- Correction for Syrlinks submodes
+- Update generated files
+
+# [v2.19.3] 2023-03-21
+
+- Update generated files
+- Improve STR commanding a bit
+
+# [v2.19.2] 2023-03-17
+
+- Update generated files
+
+## Added
+
+- Add a little bit of first time stamp extraction for HK packet handling.
+
+# [v2.19.1] 2023-03-14
+
+## Added
+
+- New `subsystems.csv` file with all subsystem IDs
+- Update `events.csv` and `returnvalues.csv`
+
+# [v2.19.0] 2023-03-14
+
+## Added
+
+- Added RTD ID enum and Set ID enumeration in the RTD module.
+- STR Temperature Set
+- Added some more MPSoC commands
+- RTD HK set
+
+## Fixed
+
+- Import error for STR code
+- STR HK bugfixes and length check
+
+# [v2.18.1] 2023-03-11
+
+## Fixed
+
+- Missing heater location fix.
+
+## Added
+
+- Request to announce reboot counts in core controller commands
+
+# [v2.18.0] 2023-03-11
+
+## Added
+
+- Added GPS Altitude for GPS Processed Data Dataset
+
+## Changed
+
+- Updated CSVs.
+- ACS mode changes: The ACS CTRL submodes are now modes. DETUBMLE is now submode of SAFE mode.
+
+# [v2.17.3] 2023-03-09
+
+## Fixed
+
+- Fixed the heater object ID names completely. Also,
+  the HPA heater is now the Syrlinks heater.
+
+# [v2.17.2] 2023-03-07
+
+- Updated CSVs
+- New events for core controller
+
+# [v2.17.1] 2023-03-07
+
+## Added
+
+- `MGT_ASSEMBLY` object ID
+
+# [v2.17.0] 2023-03-07
+
+## Added
+
+- Health set and health announce commands
+- Camera Switcher, Syrlinks Assembly, IMTQ assembly and Star Tracker assembly object IDs added
+
+## Changed
+
+- Breaking typo fix in TMP1075 `SetId`
+
+# [v2.16.4] 2023-03-04
+
+## Added
+
+- Some more IMTQ commands
+
+# [v2.16.3] 2023-03-03
+
+## Added
+
+- Syrlinks ASSY object ID
+
+# [v2.16.2] 2023-03-01
+
+## Added
+
+- Added ACS action cmds
+- Added new ACS hk values
+- Added ACS set parameter cmds
+
+## Fixed
+
+- Correction for ACS CTRL raw data requests HK type
+- Fixed diag related ACS hk cmds
+
+## Added
+
+- Basic MGM commanding (modes)
+
+# [v2.16.1] 2023-02-24
+
+- Updated CSVs for new persistent TM store
+
+# [v2.16.0] 2023-02-23
+
+## Added
+
+- PDEC parameter commands to change size of positive and negative window of AD frames.
+
+## Fixed
+
+- Added missing skip directive for private resultcode.
+
+# [v2.15.2] 2023-02-23
+
+- Update of generated returnvalue and event files.
+
+# [v2.15.1] 2023-02-23
+
+- Actually use `tmtccmd` 4.1 in requirements.
+- Remove `setup.cfg` completely
+
+# [v2.15.0] 2023-02-23
+
+tmtccmd version v4.1.1
+
+## Changed
+
+- Moved to `pyproject.toml` package file
+
+## Fixed
+
+- Correction in `tmtccmd` dependency, added missing function
+
+# [v2.14.0] 2023-02-22
+
+## Changed
+
+- Generated CSV files for PDEC handler
+
+# [v2.13.0] 2023-02-21
+
+tmtccmd version 4.0.0
+
+Added `python-dateutil` dependency for time prompts.
+
+## Added
+
+- Basic persistent TM store commanding
+- System and TCS system announce mode commands
+
+## Changed
+
+- IMTQ set IDs.
+- Significantly improved IMTQ module and also updated it to refactored OBSW IMTQ handlers.
+- Update of generated CSVs: Explicit no description strings
+
+# [v2.12.7] 2023-02-17
+
+- Re-run generators
+- Small fix for HK parsing, faulty printout
+
+# [v2.12.6] 2023-02-14
+
+## Fixed
+
+- Fixed GPS processed set output
+
+## Added
+
+- Added command to request switcher set from PCDU handler.
+
+# [v2.12.5] 2023-02-13
+
+## Added
+
+- EIVE system commands
+
+# [v2.12.4] 2023-02-12
+
+## Fixed
+
+- `tmtccmd` bumped to v4.0.0rc2, package discovery was broken.
+
+## Added
+
+- Syrlinks temperatur set readout
+
+# [v2.12.3] 2023-02-10
+
+tmtccmd v4.0.0rc1
+
+## Fixed
+
+- Fixed SUS processed data printout format.
+- Fixed other ACS processed data printout format.
+- Fixed ACS submode: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/132
+
+# [v2.12.2] 2023-02-08
+
+- Use specific `tmtccmd` rev with new mode helper method.
+
+# [v2.12.1] 2023-02-08
+
+## Added
+
+- Added version announce and current image announce commands.
+- Added persistent TM store object IDs
+- GPS enable and disable HK commands
+- All mode commands for the COM subsystem.
+
+# [v2.12.0] 2023-02-06
+
+## Changed
+
+- Updated the subsystem IDs to avoid value clashes with regular device handler mode IDs.
+
+# [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
+
+- 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] 12.01.2023
+# [v2.1.0] 2023-01-12
 
 - Various refactoring and tweaks to allow easier integration into `eive-mib`.
 - Handle ACS CTRL HK sets.
@@ -21,22 +569,22 @@ list yields a list of all related PRs for each release.
 - Starting from now, more regular releases, especially on breaking changes. This is because
   this is now also a library with dependents.
 
-# [v2.0.2] 01.12.2022
+# [v2.0.2] 2022-01-12
 
 - Bumped dependencies, small fix to allow working script if PyQt is not installed
 
-# [v2.0.1] 29.11.2022
+# [v2.0.1] 2022-11-29
 
 - Minor bugfix
 
-# [v2.0.0] 29.11.2022
+# [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] 13.10.2022
+# [v1.13.0] 2022-10-13
 
 - CFDP integration
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/113
@@ -49,7 +597,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
@@ -89,4 +637,4 @@ list yields a list of all related PRs for each release.
 - Extended heater commands for more informative output which component is heated
 
 See [milestones](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/milestones)
-and [releases](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/releases)
+and [releases](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/releases)

README.md

@@ -4,7 +4,7 @@ This application can be used to test the EIVE On-Board Software. Furthermore, it
 also be used to retrieve all sorts of telemetry data like housekeeping data.
 
 It is recommended to use this application with a virtual environment.
-The [virtual environemnt](#venv) chapter describes how to set one up. The [requirements](#reqs)
+The [virtual environment](#venv) chapter describes how to set one up. The [requirements](#reqs)
 describes how to install all required packages.
 
 The configuration file can currently be found at `tmtc_conf.json`. It caches settings
@@ -61,42 +61,57 @@ Run GUI mode
 # <a id="reqs"></a> Install requirements
 
 There are two ways to install the requirements. One is to install the primary dependency
-`tmtccmd` interactively. This is the recommended way
+`tmtccmd` interactively. 
 
-Assuming you are running in a virtual environment:
+## Installing via PyPI
 
-1. Install `tmtccmd` for virtual environment. `-e` for interactive installation.
+It is recommended to install `eive-tmtc` itself interactively, which also installs
+all required dependencies.
 
-   ```sh
-   cd deps/tmtccmd
-   pip install -e .[gui]
-   ```
+```sh
+pip install -e .
+```
 
-Alternatively you can also install the packages from PyPI completely, but the risk of
-incompatibilities will be high there
+If you only want to install all dependencies:
 
 ```sh
 pip install -r requirements.txt
 ```
 
+## Install interactively
+
+Clone the dependency first inside the `deps` folder
+
+```sh
+cd deps
+./install_tmtccmd.sh
+```
+
+Then you can install `tmtccmd` interactively
+
+```sh
+cd tmtccmd
+pip install -e .
+```
+
 # Run Linter
 
 Can be used to quickly check validity of script. Install `flake8` first
 
 ```sh
-python3 -m pip install flake8
+python3 -m pip install ruff
 ```
 
 or on Windows
 
 ```sh
-py -m pip install flake8
+py -m pip install ruff 
 ```
 
-and then run the `lint.py` script
+and then run it
 
 ```sh
-./lint.py
+ruff .
 ```
 
 # Run Auto-Formatter

automation/Dockerfile

@@ -0,0 +1,9 @@
+FROM python:3
+
+RUN apt-get update
+RUN apt-get --yes upgrade
+#tzdata is a dependency, won't install otherwise
+ARG DEBIAN_FRONTEND=noninteractive
+
+#pip needs a valid user to work
+RUN adduser --uid 114 jenkins

automation/Jenkinsfile

@@ -0,0 +1,14 @@
+pipeline {
+    agent {
+        docker {
+            image 'eive-tmtc-ci:d2'
+        }
+    }
+    stages {
+        stage('Package') {
+            steps {
+                sh 'pip install .'
+            }
+        }
+    }
+}

eive_tmtc/__init__.py

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

eive_tmtc/cfdp/fault_handler.py

@@ -0,0 +1,20 @@
+import logging
+
+from spacepackets.cfdp import ConditionCode
+from tmtccmd.cfdp.mib import DefaultFaultHandlerBase
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class EiveCfdpFaultHandler(DefaultFaultHandlerBase):
+    def notice_of_suspension_cb(self, cond: ConditionCode):
+        _LOGGER.info(f"Received notice of suspension: {cond!r}")
+
+    def notice_of_cancellation_cb(self, cond: ConditionCode):
+        _LOGGER.info(f"Received notice of cancellation: {cond!r}")
+
+    def abandoned_cb(self, cond: ConditionCode):
+        _LOGGER.info(f"Abandoned transaction: {cond!r}")
+
+    def ignore_cb(self, cond: ConditionCode):
+        _LOGGER.info(f"Ignored transaction: {cond!r}")

eive_tmtc/cfdp/tm.py

@@ -0,0 +1,27 @@
+import logging
+
+from eive_tmtc.config.definitions import CFDP_APID
+from spacepackets.ccsds import SPACE_PACKET_HEADER_SIZE
+from spacepackets.cfdp import PduFactory, PduType, DirectiveType
+from tmtccmd.cfdp.handler import CfdpInCcsdsHandler
+from tmtccmd.tm import SpecificApidHandlerBase
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class CfdpInCcsdsWrapper(SpecificApidHandlerBase):
+    def __init__(self, cfdp_in_ccsds_handler: CfdpInCcsdsHandler):
+        super().__init__(CFDP_APID, None)
+        self.handler = cfdp_in_ccsds_handler
+
+    def handle_tm(self, packet: bytes, _user_args: any):
+        # Ignore the space packet header. Its only purpose is to use the same protocol and
+        # have a seaprate APID for space packets. If this function is called, the APID is correct.
+        pdu = packet[SPACE_PACKET_HEADER_SIZE:]
+        pdu_base = PduFactory.from_raw(pdu)
+        if pdu_base.pdu_type == PduType.FILE_DATA:
+            _LOGGER.info("Received File Data PDU")
+        else:
+            directive_type = DirectiveType(pdu_base.directive_type)
+            _LOGGER.info(f"Received File Directive PDU with type {directive_type!r}")
+        self.handler.insert_pdu_packet(pdu_base)

eive_tmtc/cfdp/user.py

@@ -0,0 +1,58 @@
+import logging
+
+from spacepackets.cfdp import ConditionCode
+from tmtccmd.cfdp import CfdpUserBase, TransactionId
+from tmtccmd.cfdp.user import (
+    TransactionFinishedParams,
+    MetadataRecvParams,
+    FileSegmentRecvdParams,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class EiveCfdpUser(CfdpUserBase):
+    def transaction_indication(self, transaction_id: TransactionId):
+        _LOGGER.info(f"CFDP User: Start of File {transaction_id}")
+
+    def eof_sent_indication(self, transaction_id: TransactionId):
+        _LOGGER.info(f"CFDP User: EOF sent for {transaction_id}")
+
+    def transaction_finished_indication(self, params: TransactionFinishedParams):
+        _LOGGER.info(f"CFDP User: {params.transaction_id} finished")
+        _LOGGER.info(f"Delivery Code: {params.delivery_code!r}")
+        _LOGGER.info(f"Condition code: {params.condition_code!r}")
+        _LOGGER.info(f"File delivery status: {params.delivery_code!r}")
+
+    def metadata_recv_indication(self, params: MetadataRecvParams):
+        pass
+
+    def file_segment_recv_indication(self, params: FileSegmentRecvdParams):
+        _LOGGER.info(
+            f"CFDP User: Received File Data PDU for {params.transaction_id} | Offset:"
+            f" {params.offset} | Segment Length: {params.length}"
+        )
+
+    def report_indication(self, transaction_id: TransactionId, status_report: any):
+        pass
+
+    def suspended_indication(
+        self, transaction_id: TransactionId, cond_code: ConditionCode
+    ):
+        pass
+
+    def resumed_indication(self, transaction_id: TransactionId, progress: int):
+        pass
+
+    def fault_indication(
+        self, transaction_id: TransactionId, cond_code: ConditionCode, progress: int
+    ):
+        pass
+
+    def abandoned_indication(
+        self, transaction_id: TransactionId, cond_code: ConditionCode, progress: int
+    ):
+        pass
+
+    def eof_recv_indication(self, transaction_id: TransactionId):
+        _LOGGER.info(f"CFDP User: EOF received for {transaction_id}")

eive_tmtc/config/definitions.py

@@ -9,7 +9,6 @@ import enum
 from spacepackets import PacketType
 from spacepackets.ccsds import PacketId
 from spacepackets.util import UnsignedByteField
-from pathlib import Path
 
 
 PUS_APID = 0x65
@@ -17,8 +16,8 @@ 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.raw(),
-    CFDP_PACKET_ID.raw(),
+    PUS_PACKET_ID,
+    CFDP_PACKET_ID,
 )
 
 CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)
@@ -29,15 +28,17 @@ class CustomServiceList(str, enum.Enum):
     value: str
 
     TEST_DEVICE = "test"
+    HEALTH = "health"
     P60DOCK = "p60dock"
     PDU1 = "pdu1"
     PDU2 = "pdu2"
     POWER = "power"
     ACU = "acu"
     ACS = "acs"
+    GYRO = "gyro"
+    MGMS = "mgms"
+    COM_SS = "com"
     BPX_BATTERY = "bpx"
-    TMP1075_1 = "tmp1075_1"
-    TMP1075_2 = "tmp1075_2"
     HEATER = "heater"
     IMTQ = "imtq"
     PLOC_SUPV = "ploc_supv"
@@ -51,7 +52,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"
@@ -64,11 +65,16 @@ class CustomServiceList(str, enum.Enum):
     PL_SS = "pl_subsystem"
     ACS_BRD_ASS = "acs_brd_ass"
     SUS_BRD_ASS = "sus_brd_ass"
-    TCS = "tcs"
+    TCS_SS = "tcs_subsystem"
+    TCS_CTRL = "tcs_ctrl"
     TCS_ASS = "tcs_ass"
     TIME = "time"
     PROCEDURE = "proc"
     RTD = "rtd"
+    TMP1075 = "tmp1075"
     TVTTESTPROCEDURE = "tvtestproc"
-    CONTROLLERS = "controllers"
     SCEX = "scex"
+    TM_STORE = "tm_store"
+    SYSTEM = "system"
+    PWR_CTRL = "pwr_ctrl"
+    EPS_SS = "eps_subsystem"

eive_tmtc/config/events.csv

@@ -1,240 +1,314 @@
 Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
-2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2201;0x0899;STORE_WRITE_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2202;0x089a;STORE_SEND_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2203;0x089b;STORE_READ_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2204;0x089c;UNEXPECTED_MSG;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2205;0x089d;STORING_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2206;0x089e;TM_DUMP_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2207;0x089f;STORE_INIT_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2208;0x08a0;STORE_INIT_EMPTY;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2209;0x08a1;STORE_CONTENT_CORRUPTED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2210;0x08a2;STORE_INITIALIZE;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2211;0x08a3;INIT_DONE;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2212;0x08a4;DUMP_FINISHED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2213;0x08a5;DELETION_FINISHED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2214;0x08a6;DELETION_FAILED;LOW;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2215;0x08a7;AUTO_CATALOGS_SENDING_FAILED;INFO;;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-2600;0x0a28;GET_DATA_FAILED;LOW;;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-2601;0x0a29;STORE_DATA_FAILED;LOW;;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-2800;0x0af0;DEVICE_BUILDING_COMMAND_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2801;0x0af1;DEVICE_SENDING_COMMAND_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2802;0x0af2;DEVICE_REQUESTING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2803;0x0af3;DEVICE_READING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2804;0x0af4;DEVICE_INTERPRETING_REPLY_FAILED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2805;0x0af5;DEVICE_MISSED_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2806;0x0af6;DEVICE_UNKNOWN_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2807;0x0af7;DEVICE_UNREQUESTED_REPLY;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2200;0x0898;STORE_SEND_WRITE_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2201;0x0899;STORE_WRITE_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2202;0x089a;STORE_SEND_READ_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2203;0x089b;STORE_READ_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2204;0x089c;UNEXPECTED_MSG;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2205;0x089d;STORING_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2206;0x089e;TM_DUMP_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2207;0x089f;STORE_INIT_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2208;0x08a0;STORE_INIT_EMPTY;INFO;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2209;0x08a1;STORE_CONTENT_CORRUPTED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2210;0x08a2;STORE_INITIALIZE;INFO;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2211;0x08a3;INIT_DONE;INFO;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2212;0x08a4;DUMP_FINISHED;INFO;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2213;0x08a5;DELETION_FINISHED;INFO;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2214;0x08a6;DELETION_FAILED;LOW;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2215;0x08a7;AUTO_CATALOGS_SENDING_FAILED;INFO;No description;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+2600;0x0a28;GET_DATA_FAILED;LOW;No description;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+2601;0x0a29;STORE_DATA_FAILED;LOW;No description;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+2800;0x0af0;DEVICE_BUILDING_COMMAND_FAILED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2801;0x0af1;DEVICE_SENDING_COMMAND_FAILED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2802;0x0af2;DEVICE_REQUESTING_REPLY_FAILED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2803;0x0af3;DEVICE_READING_REPLY_FAILED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2804;0x0af4;DEVICE_INTERPRETING_REPLY_FAILED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2805;0x0af5;DEVICE_MISSED_REPLY;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2806;0x0af6;DEVICE_UNKNOWN_REPLY;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2807;0x0af7;DEVICE_UNREQUESTED_REPLY;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 2808;0x0af8;INVALID_DEVICE_COMMAND;LOW;Indicates a SW bug in child class.;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-4201;0x1069;FUSE_CURRENT_HIGH;LOW;;fsfw/src/fsfw/power/Fuse.h
-4202;0x106a;FUSE_WENT_OFF;LOW;;fsfw/src/fsfw/power/Fuse.h
-4204;0x106c;POWER_ABOVE_HIGH_LIMIT;LOW;;fsfw/src/fsfw/power/Fuse.h
-4205;0x106d;POWER_BELOW_LOW_LIMIT;LOW;;fsfw/src/fsfw/power/Fuse.h
-4300;0x10cc;SWITCH_WENT_OFF;LOW;;fsfw/src/fsfw/power/PowerSwitchIF.h
-5000;0x1388;HEATER_ON;INFO;;fsfw/src/fsfw/thermal/Heater.h
-5001;0x1389;HEATER_OFF;INFO;;fsfw/src/fsfw/thermal/Heater.h
-5002;0x138a;HEATER_TIMEOUT;LOW;;fsfw/src/fsfw/thermal/Heater.h
-5003;0x138b;HEATER_STAYED_ON;LOW;;fsfw/src/fsfw/thermal/Heater.h
-5004;0x138c;HEATER_STAYED_OFF;LOW;;fsfw/src/fsfw/thermal/Heater.h
-5200;0x1450;TEMP_SENSOR_HIGH;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
-5201;0x1451;TEMP_SENSOR_LOW;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
-5202;0x1452;TEMP_SENSOR_GRADIENT;LOW;;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
-5901;0x170d;COMPONENT_TEMP_LOW;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5902;0x170e;COMPONENT_TEMP_HIGH;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5903;0x170f;COMPONENT_TEMP_OOL_LOW;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5904;0x1710;COMPONENT_TEMP_OOL_HIGH;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-5905;0x1711;TEMP_NOT_IN_OP_RANGE;LOW;;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-7101;0x1bbd;FDIR_CHANGED_STATE;INFO;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
-7102;0x1bbe;FDIR_STARTS_RECOVERY;MEDIUM;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
-7103;0x1bbf;FDIR_TURNS_OFF_DEVICE;MEDIUM;;fsfw/src/fsfw/fdir/FailureIsolationBase.h
-7201;0x1c21;MONITOR_CHANGED_STATE;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7202;0x1c22;VALUE_BELOW_LOW_LIMIT;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7203;0x1c23;VALUE_ABOVE_HIGH_LIMIT;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7204;0x1c24;VALUE_OUT_OF_RANGE;LOW;;fsfw/src/fsfw/monitoring/MonitoringIF.h
-7400;0x1ce8;CHANGING_MODE;INFO;;fsfw/src/fsfw/modes/HasModesIF.h
-7401;0x1ce9;MODE_INFO;INFO;;fsfw/src/fsfw/modes/HasModesIF.h
-7402;0x1cea;FALLBACK_FAILED;HIGH;;fsfw/src/fsfw/modes/HasModesIF.h
-7403;0x1ceb;MODE_TRANSITION_FAILED;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
-7404;0x1cec;CANT_KEEP_MODE;HIGH;;fsfw/src/fsfw/modes/HasModesIF.h
-7405;0x1ced;OBJECT_IN_INVALID_MODE;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
-7406;0x1cee;FORCING_MODE;MEDIUM;;fsfw/src/fsfw/modes/HasModesIF.h
-7407;0x1cef;MODE_CMD_REJECTED;LOW;;fsfw/src/fsfw/modes/HasModesIF.h
-7506;0x1d52;HEALTH_INFO;INFO;;fsfw/src/fsfw/health/HasHealthIF.h
-7507;0x1d53;CHILD_CHANGED_HEALTH;INFO;;fsfw/src/fsfw/health/HasHealthIF.h
-7508;0x1d54;CHILD_PROBLEMS;LOW;;fsfw/src/fsfw/health/HasHealthIF.h
-7509;0x1d55;OVERWRITING_HEALTH;LOW;;fsfw/src/fsfw/health/HasHealthIF.h
-7510;0x1d56;TRYING_RECOVERY;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
-7511;0x1d57;RECOVERY_STEP;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
-7512;0x1d58;RECOVERY_DONE;MEDIUM;;fsfw/src/fsfw/health/HasHealthIF.h
-7600;0x1db0;HANDLE_PACKET_FAILED;LOW;;fsfw/src/fsfw/tcdistribution/definitions.h
+2809;0x0af9;MONITORING_LIMIT_EXCEEDED;LOW;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2810;0x0afa;MONITORING_AMBIGUOUS;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+2811;0x0afb;DEVICE_WANTS_HARD_REBOOT;HIGH;No description;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+4300;0x10cc;SWITCH_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/PowerSwitchIF.h
+4301;0x10cd;FUSE_CURRENT_HIGH;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4302;0x10ce;FUSE_WENT_OFF;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4304;0x10d0;POWER_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+4305;0x10d1;POWER_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/power/Fuse.h
+5000;0x1388;HEATER_ON;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
+5001;0x1389;HEATER_OFF;INFO;No description;fsfw/src/fsfw/thermal/Heater.h
+5002;0x138a;HEATER_TIMEOUT;LOW;No description;fsfw/src/fsfw/thermal/Heater.h
+5003;0x138b;HEATER_STAYED_ON;LOW;No description;fsfw/src/fsfw/thermal/Heater.h
+5004;0x138c;HEATER_STAYED_OFF;LOW;No description;fsfw/src/fsfw/thermal/Heater.h
+5200;0x1450;TEMP_SENSOR_HIGH;LOW;No description;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
+5201;0x1451;TEMP_SENSOR_LOW;LOW;No description;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
+5202;0x1452;TEMP_SENSOR_GRADIENT;LOW;No description;fsfw/src/fsfw/thermal/AbstractTemperatureSensor.h
+5901;0x170d;COMPONENT_TEMP_LOW;LOW;No description;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5902;0x170e;COMPONENT_TEMP_HIGH;LOW;No description;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5903;0x170f;COMPONENT_TEMP_OOL_LOW;LOW;No description;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5904;0x1710;COMPONENT_TEMP_OOL_HIGH;LOW;No description;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+5905;0x1711;TEMP_NOT_IN_OP_RANGE;LOW;No description;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+7101;0x1bbd;FDIR_CHANGED_STATE;INFO;No description;fsfw/src/fsfw/fdir/FailureIsolationBase.h
+7102;0x1bbe;FDIR_STARTS_RECOVERY;MEDIUM;No description;fsfw/src/fsfw/fdir/FailureIsolationBase.h
+7103;0x1bbf;FDIR_TURNS_OFF_DEVICE;MEDIUM;No description;fsfw/src/fsfw/fdir/FailureIsolationBase.h
+7201;0x1c21;MONITOR_CHANGED_STATE;LOW;No description;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7202;0x1c22;VALUE_BELOW_LOW_LIMIT;LOW;No description;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7203;0x1c23;VALUE_ABOVE_HIGH_LIMIT;LOW;No description;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7204;0x1c24;VALUE_OUT_OF_RANGE;LOW;No description;fsfw/src/fsfw/monitoring/MonitoringIF.h
+7400;0x1ce8;CHANGING_MODE;INFO;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7401;0x1ce9;MODE_INFO;INFO;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7402;0x1cea;FALLBACK_FAILED;HIGH;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7403;0x1ceb;MODE_TRANSITION_FAILED;LOW;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7404;0x1cec;CANT_KEEP_MODE;HIGH;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7405;0x1ced;OBJECT_IN_INVALID_MODE;LOW;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7406;0x1cee;FORCING_MODE;MEDIUM;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7407;0x1cef;MODE_CMD_REJECTED;LOW;No description;fsfw/src/fsfw/modes/HasModesIF.h
+7506;0x1d52;HEALTH_INFO;INFO;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7507;0x1d53;CHILD_CHANGED_HEALTH;INFO;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7508;0x1d54;CHILD_PROBLEMS;LOW;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7509;0x1d55;OVERWRITING_HEALTH;LOW;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7510;0x1d56;TRYING_RECOVERY;MEDIUM;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7511;0x1d57;RECOVERY_STEP;MEDIUM;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7512;0x1d58;RECOVERY_DONE;MEDIUM;No description;fsfw/src/fsfw/health/HasHealthIF.h
+7600;0x1db0;HANDLE_PACKET_FAILED;LOW;No description;fsfw/src/fsfw/tcdistribution/definitions.h
 7900;0x1edc;RF_AVAILABLE;INFO;A RF available signal was detected. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7901;0x1edd;RF_LOST;INFO;A previously found RF available signal was lost. P1: raw RFA state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 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
+8900;0x22c4;CLOCK_SET;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8901;0x22c5;CLOCK_DUMP;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8902;0x22c6;CLOCK_SET_FAILURE;LOW;No description;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
-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
-11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
-11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
-11402;0x2c8a;HEATER_WENT_ON;INFO;;mission/devices/HeaterHandler.h
-11403;0x2c8b;HEATER_WENT_OFF;INFO;;mission/devices/HeaterHandler.h
-11404;0x2c8c;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
-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;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
-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_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/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
-12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
-12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
-12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
-12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
-12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
-12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
-12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
-12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
-12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
-12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
-12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
-12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
-12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
-12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h
-12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
-12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
-12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
-12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/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/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;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
-13704;0x3588;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
-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
-13901;0x364d;SET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
-13902;0x364e;GET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
-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
+9700;0x25e4;TEST;INFO;No description;fsfw/src/fsfw/pus/Service17Test.h
+10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;No description;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
+10800;0x2a30;STORE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
+10801;0x2a31;MSG_QUEUE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
+10802;0x2a32;SERIALIZATION_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
+10803;0x2a33;FILESTORE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
+10804;0x2a34;FILENAME_TOO_LARGE_ERROR;LOW;P1: Transaction step ID, P2: 0 for source file name, 1 for dest file name;fsfw/src/fsfw/cfdp/handler/defs.h
+11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;The limits for the rotation in safe mode were violated.;mission/acs/defs.h
+11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;The system has recovered from a safe rate rotation violation.;mission/acs/defs.h
+11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;Multiple RWs are invalid, uncommandable and therefore higher ACS modes cannot be maintained.;mission/acs/defs.h
+11203;0x2bc3;MEKF_INVALID_INFO;INFO;MEKF was not able to compute a solution. P1: MEKF state on exit;mission/acs/defs.h
+11204;0x2bc4;MEKF_RECOVERY;INFO;MEKF is able to compute a solution again.;mission/acs/defs.h
+11205;0x2bc5;MEKF_AUTOMATIC_RESET;INFO;MEKF performed an automatic reset after detection of nonfinite values.;mission/acs/defs.h
+11206;0x2bc6;MEKF_INVALID_MODE_VIOLATION;HIGH;MEKF was not able to compute a solution during any pointing ACS mode for a prolonged time.;mission/acs/defs.h
+11207;0x2bc7;SAFE_MODE_CONTROLLER_FAILURE;HIGH;The ACS safe mode controller was not able to compute a solution and has failed. P1: Missing information about magnetic field, P2: Missing information about rotational rate;mission/acs/defs.h
+11208;0x2bc8;TLE_TOO_OLD;INFO;The TLE for the SGP4 Propagator has become too old.;mission/acs/defs.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/power/defs.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/power/defs.h
+11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h
+11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;No description;mission/power/defs.h
+11304;0x2c28;DATASET_READ_FAILED;INFO;The dataset read for the inputs of the Power Controller has failed.;mission/power/defs.h
+11305;0x2c29;VOLTAGE_OUT_OF_BOUNDS;HIGH;No description;mission/power/defs.h
+11306;0x2c2a;TIMEDELTA_OUT_OF_BOUNDS;LOW;Time difference for Coulomb Counter was too large. P1: time in s * 10;mission/power/defs.h
+11307;0x2c2b;POWER_LEVEL_LOW;HIGH;The State of Charge is below the limit for payload use. Setting Payload to faulty.;mission/power/defs.h
+11308;0x2c2c;POWER_LEVEL_CRITICAL;HIGH;The State of Charge is below the limit for higher modes. Setting Reaction Wheels to faulty.;mission/power/defs.h
+11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;No description;mission/tcs/HeaterHandler.h
+11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;No description;mission/tcs/HeaterHandler.h
+11402;0x2c8a;HEATER_WENT_ON;INFO;No description;mission/tcs/HeaterHandler.h
+11403;0x2c8b;HEATER_WENT_OFF;INFO;No description;mission/tcs/HeaterHandler.h
+11404;0x2c8c;SWITCH_ALREADY_ON;INFO;No description;mission/tcs/HeaterHandler.h
+11405;0x2c8d;SWITCH_ALREADY_OFF;INFO;No description;mission/tcs/HeaterHandler.h
+11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;No description;mission/tcs/HeaterHandler.h
+11407;0x2c8f;FAULTY_HEATER_WAS_ON;LOW;No description;mission/tcs/HeaterHandler.h
+11500;0x2cec;BURN_PHASE_START;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/SolarArrayDeploymentHandler.h
+11501;0x2ced;BURN_PHASE_DONE;INFO;P1: Burn duration in milliseconds, P2: Dry run flag;mission/SolarArrayDeploymentHandler.h
+11502;0x2cee;MAIN_SWITCH_ON_TIMEOUT;LOW;No description;mission/SolarArrayDeploymentHandler.h
+11503;0x2cef;MAIN_SWITCH_OFF_TIMEOUT;LOW;No description;mission/SolarArrayDeploymentHandler.h
+11504;0x2cf0;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h
+11505;0x2cf1;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h
+11506;0x2cf2;DEPL_SA1_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h
+11507;0x2cf3;DEPL_SA2_GPIO_SWTICH_OFF_FAILED;HIGH;No description;mission/SolarArrayDeploymentHandler.h
+11508;0x2cf4;AUTONOMOUS_DEPLOYMENT_COMPLETED;INFO;No description;mission/SolarArrayDeploymentHandler.h
+11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/payload/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/payload/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/payload/PlocMpsocHandler.h
+11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/payload/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/payload/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/payload/PlocMpsocHandler.h
+11607;0x2d57;SUPV_NOT_ON;LOW;SUPV not on for boot or shutdown process. P1: 0 for OFF transition, 1 for ON transition.;linux/payload/PlocMpsocHandler.h
+11608;0x2d58;SUPV_REPLY_TIMEOUT;LOW;No description;linux/payload/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/acs/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/acs/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/acs/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/acs/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/acs/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/acs/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/acs/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/acs/ImtqHandler.h
+11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/acs/rwHelpers.h
+11802;0x2e1a;RESET_OCCURED;LOW;No description;mission/acs/rwHelpers.h
+11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h
+11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h
+11903;0x2e7f;COM_ERROR_REPLY_RECEIVED;LOW;Received COM error. P1:  Communication Error ID (datasheet p32);mission/acs/str/StarTrackerHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h
+12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h
+12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h
+12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/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/payload/PlocSupervisorHandler.h
+12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/PlocSupervisorHandler.h
+12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/PlocSupervisorHandler.h
+12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/PlocSupervisorHandler.h
+12100;0x2f44;SANITIZATION_FAILED;LOW;No description;bsp_q7s/fs/SdCardManager.h
+12101;0x2f45;MOUNTED_SD_CARD;INFO;No description;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/payload/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/payload/PlocMemoryDumper.h
+12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/payload/PlocMemoryDumper.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;No description;linux/ipcore/pdec.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/ipcore/pdec.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/ipcore/pdec.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/ipcore/pdec.h
+12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/ipcore/pdec.h
+12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/ipcore/pdec.h
+12407;0x3077;TOO_MANY_IRQS;MEDIUM;Too many IRQs over the time window of one second. P1: Allowed TCs;linux/ipcore/pdec.h
+12408;0x3078;POLL_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/pdec.h
+12409;0x3079;WRITE_SYSCALL_ERROR_PDEC;HIGH;No description;linux/ipcore/pdec.h
+12410;0x307a;PDEC_TRYING_RESET_WITH_INIT;LOW;Trying a PDEC reset with complete re-initialization;linux/ipcore/pdec.h
+12411;0x307b;PDEC_TRYING_RESET_NO_INIT;LOW;Trying a PDEC reset without re-initialization.;linux/ipcore/pdec.h
+12412;0x307c;PDEC_RESET_FAILED;HIGH;Failed to pull PDEC reset to low;linux/ipcore/pdec.h
+12413;0x307d;OPEN_IRQ_FILE_FAILED;HIGH;Failed to open the IRQ uio file;linux/ipcore/pdec.h
+12414;0x307e;PDEC_INIT_FAILED;HIGH;PDEC initialization failed. This might also be due to the persistent confiuration never becoming available, for example due to SD card issues.;linux/ipcore/pdec.h
+12415;0x307f;PDEC_CONFIG_CORRUPTED;HIGH;The PDEC configuration area has been corrupted P1: The first configuration word P2: The second configuration word;linux/ipcore/pdec.h
+12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/acs/StrComHandler.h
+12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/acs/StrComHandler.h
+12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/acs/StrComHandler.h
+12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/acs/StrComHandler.h
+12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/acs/StrComHandler.h
+12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/acs/StrComHandler.h
+12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/acs/StrComHandler.h
+12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/acs/StrComHandler.h
+12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/acs/StrComHandler.h
+12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/StrComHandler.h
+12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/acs/StrComHandler.h
+12511;0x30df;STR_COM_REPLY_TIMEOUT;LOW;Star tracker did not send a valid reply for a certain timeout. P1: Position of upload or download packet for which the packet wa sent. P2: Timeout;linux/acs/StrComHandler.h
+12513;0x30e1;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/acs/StrComHandler.h
+12514;0x30e2;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/acs/StrComHandler.h
+12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/acs/StrComHandler.h
+12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/acs/StrComHandler.h
+12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/acs/StrComHandler.h
+12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/payload/PlocMpsocSpecialComHelper.h
+12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;INFO;Flash write successful;linux/payload/PlocMpsocSpecialComHelper.h
+12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
+12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
+12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
+12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
+12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
+12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
+12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
+12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
+12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocSpecialComHelper.h
+12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12614;0x3146;MPSOC_FLASH_READ_PACKET_ERROR;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12615;0x3147;MPSOC_FLASH_READ_FAILED;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12616;0x3148;MPSOC_FLASH_READ_SUCCESSFUL;INFO;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12617;0x3149;MPSOC_READ_TIMEOUT;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/payload/PayloadPcduHandler.h
+12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
+12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/acs/AcsBoardAssembly.h
+12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/acs/AcsBoardAssembly.h
+12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/acs/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/acs/AcsBoardAssembly.h
+12804;0x3204;DIRECT_TRANSITION_TO_DUAL_OTHER_GPS_FAULTY;MEDIUM;This is triggered when the assembly would have normally switched the board side, but the GPS device of the other side was marked faulty. P1: Current submode.;mission/system/acs/AcsBoardAssembly.h
+12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;No description;mission/system/acs/SusAssembly.h
+12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;No description;mission/system/acs/SusAssembly.h
+12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;No description;mission/system/acs/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/acs/SusAssembly.h
+13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;No description;mission/system/tcs/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/acs/archive/GPSDefinitions.h
+13101;0x332d;CANT_GET_FIX;LOW;Could not get fix in maximum allowed time. P1: Maximum allowed time to get a fix after the GPS was switched on.;mission/acs/archive/GPSDefinitions.h
+13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/power/P60DockHandler.h
+13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/power/P60DockHandler.h
+13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/power/P60DockHandler.h
+13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/payload/PlocSupvUartMan.h
+13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/payload/PlocSupvUartMan.h
+13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/payload/PlocSupvUartMan.h
+13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/payload/PlocSupvUartMan.h
+13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/payload/PlocSupvUartMan.h
+13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/payload/PlocSupvUartMan.h
+13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/payload/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/payload/PlocSupvUartMan.h
+13608;0x3528;SUPV_MEM_CHECK_OK;INFO;No description;linux/payload/PlocSupvUartMan.h
+13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;No description;linux/payload/PlocSupvUartMan.h
+13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/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/payload/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/payload/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/payload/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/payload/PlocSupvUartMan.h
+13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/payload/PlocSupvUartMan.h
+13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/payload/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/payload/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/payload/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/payload/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/payload/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/payload/PlocSupvUartMan.h
+13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;No description;linux/payload/PlocSupvUartMan.h
+13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;No description;linux/payload/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/payload/PlocSupvUartMan.h
+13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;No description;linux/payload/PlocSupvUartMan.h
+13632;0x3540;HDLC_CRC_ERROR;INFO;No description;linux/payload/PlocSupvUartMan.h
+13701;0x3585;TX_ON;INFO;Transmitter is on now. P1: Submode, P2: Current default datarate.;mission/com/syrlinksDefs.h
+13702;0x3586;TX_OFF;INFO;Transmitter is off now.;mission/com/syrlinksDefs.h
+13800;0x35e8;MISSING_PACKET;LOW;No description;mission/payload/scexHelpers.h
+13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;No description;mission/payload/scexHelpers.h
+13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;No description;mission/payload/scexHelpers.h
+13803;0x35eb;FS_UNUSABLE;LOW;No description;mission/payload/scexHelpers.h
+13901;0x364d;SET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
+13902;0x364e;GET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
+13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
+13904;0x3650;WRITE_CONFIGFILE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
+13905;0x3651;READ_CONFIGFILE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
+14000;0x36b0;ALLOC_FAILURE;MEDIUM;No description;mission/sysDefs.h
+14001;0x36b1;REBOOT_SW;LOW; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;mission/sysDefs.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;mission/sysDefs.h
+14003;0x36b3;REBOOT_HW;MEDIUM;No description;mission/sysDefs.h
+14004;0x36b4;NO_SD_CARD_ACTIVE;HIGH;No SD card was active. Core controller will attempt to re-initialize a SD card.;mission/sysDefs.h
+14005;0x36b5;VERSION_INFO;INFO;P1: Byte 0: Major, Byte 1: Minor, Byte 2: Patch, Byte 3: Has Git Hash P2: First four letters of Git SHA is the last byte of P1 is set.;mission/sysDefs.h
+14006;0x36b6;CURRENT_IMAGE_INFO;INFO;P1: Current Chip, P2: Current Copy;mission/sysDefs.h
+14007;0x36b7;REBOOT_COUNTER;INFO;Total reboot counter, which is the sum of the boot count of all individual images.;mission/sysDefs.h
+14008;0x36b8;INDIVIDUAL_BOOT_COUNTS;INFO;Get the boot count of the individual images. P1: First 16 bits boot count of image 0 0, last 16 bits boot count of image 0 1. P2: First 16 bits boot count of image 1 0, last 16 bits boot count of image 1 1.;mission/sysDefs.h
+14010;0x36ba;TRYING_I2C_RECOVERY;HIGH;I2C is unavailable. Trying recovery of I2C bus by power cycling all I2C devices.;mission/sysDefs.h
+14011;0x36bb;I2C_REBOOT;HIGH;I2C is unavailable. Recovery did not work, performing full reboot.;mission/sysDefs.h
+14012;0x36bc;PDEC_REBOOT;HIGH;PDEC recovery through reset was not possible, performing full reboot.;mission/sysDefs.h
+14013;0x36bd;FIRMWARE_INFO;INFO;Version information of the firmware (not OBSW). P1: Byte 0: Major, Byte 1: Minor, Byte 2: Patch, Byte 3: Has Git Hash P2: First four letters of Git SHA is the last byte of P1 is set.;mission/sysDefs.h
+14014;0x36be;ACTIVE_SD_INFO;INFO;Active SD card info. SD States: 0: OFF, 1: ON, 2: MOUNTED. P1: Active SD Card Index, 0 if none is active P2: First two bytes: SD state of SD card 0, last two bytes SD state of SD card 1;mission/sysDefs.h
+14100;0x3714;NO_VALID_SENSOR_TEMPERATURE;MEDIUM;No description;mission/controller/tcsDefs.h
+14101;0x3715;NO_HEALTHY_HEATER_AVAILABLE;MEDIUM;No description;mission/controller/tcsDefs.h
+14102;0x3716;SYRLINKS_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
+14104;0x3718;OBC_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
+14105;0x3719;CAMERA_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
+14106;0x371a;PCDU_SYSTEM_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
+14107;0x371b;HEATER_NOT_OFF_FOR_OFF_MODE;MEDIUM;No description;mission/controller/tcsDefs.h
+14108;0x371c;MGT_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
+14109;0x371d;TCS_SWITCHING_HEATER_ON;INFO;P1: Module index. P2: Heater index;mission/controller/tcsDefs.h
+14110;0x371e;TCS_SWITCHING_HEATER_OFF;INFO;P1: Module index. P2: Heater index;mission/controller/tcsDefs.h
+14111;0x371f;TCS_HEATER_MAX_BURN_TIME_REACHED;MEDIUM;P1: Heater index. P2: Maximum burn time for heater.;mission/controller/tcsDefs.h
+14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h
+14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h
+14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h
+14301;0x37dd;FILE_TOO_LARGE;LOW;File in store too large. P1: Detected file size P2: Allowed file size;mission/persistentTmStoreDefs.h
+14302;0x37de;BUSY_DUMPING_EVENT;INFO;No description;mission/persistentTmStoreDefs.h
+14305;0x37e1;DUMP_OK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14306;0x37e2;DUMP_NOK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14307;0x37e3;DUMP_MISC_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14308;0x37e4;DUMP_HK_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14309;0x37e5;DUMP_CFDP_STORE_DONE;INFO;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14310;0x37e6;DUMP_OK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14311;0x37e7;DUMP_NOK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14312;0x37e8;DUMP_MISC_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14313;0x37e9;DUMP_HK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14314;0x37ea;DUMP_CFDP_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14500;0x38a4;TEMPERATURE_ALL_ONES_START;MEDIUM;Detected invalid values, starting invalid message counting;mission/acs/SusHandler.h
+14501;0x38a5;TEMPERATURE_ALL_ONES_RECOVERY;INFO;Detected valid values again, resetting invalid message counter. P1: Invalid message counter.;mission/acs/SusHandler.h

eive_tmtc/config/events.py

@@ -1,11 +1,10 @@
+import logging
 import os
 
 from eive_tmtc import EIVE_TMTC_ROOT
-from tmtccmd import get_console_logger
 from tmtccmd.fsfw import parse_fsfw_events_csv
-from tmtccmd.pus.pus_5_event import EventDictT
+from tmtccmd.pus.s5_fsfw_event import EventDictT
 
-LOGGER = get_console_logger()
 DEFAULT_EVENTS_CSV_PATH = EIVE_TMTC_ROOT / "config/events.csv"
 __EVENT_DICT = None
 
@@ -16,6 +15,8 @@ def get_event_dict() -> EventDictT:
         if os.path.exists(DEFAULT_EVENTS_CSV_PATH):
             __EVENT_DICT = parse_fsfw_events_csv(DEFAULT_EVENTS_CSV_PATH)
         else:
-            LOGGER.warning(f"No Event CSV file found at {DEFAULT_EVENTS_CSV_PATH}")
+            logging.getLogger(__name__).warning(
+                f"No Event CSV file found at {DEFAULT_EVENTS_CSV_PATH}"
+            )
             __EVENT_DICT = dict()
     return __EVENT_DICT

eive_tmtc/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,
-    )

eive_tmtc/config/hook.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
 from eive_tmtc.config.definitions import SPACE_PACKET_IDS
-from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend
-from tmtccmd.com_if import ComInterface
+from tmtccmd import HookBase, CcsdsTmtcBackend
+from tmtccmd.com import ComInterface
 from tmtccmd.config import TmtcDefinitionWrapper
 
 from eive_tmtc.config.retvals import get_retval_dict
@@ -10,7 +10,7 @@ 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,
         )

eive_tmtc/config/object_ids.py

@@ -3,21 +3,22 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
+import logging
 import os.path
+from typing import Dict
 
 from eive_tmtc import EIVE_TMTC_ROOT
-from tmtccmd.util.obj_id import ObjectIdDictT
+from tmtccmd.util.obj_id import ObjectIdU32
 from tmtccmd.fsfw import parse_fsfw_objects_csv
-from tmtccmd.logging import get_console_logger
 
 
-LOGGER = get_console_logger()
 DEFAULT_OBJECTS_CSV_PATH = EIVE_TMTC_ROOT / "config/objects.csv"
 __OBJECT_ID_DICT = None
 
 
 # Core Object IDs
 SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x00, 0xA2])
+INTERNAL_ERROR_REPORTER_ID = bytes([0x53, 0x04, 0x00, 0x00])
 
 # Power Object IDs
 PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
@@ -30,9 +31,12 @@ 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_PLPCDU_1_ID = bytes([0x44, 0x42, 0x00, 0x07])
+TMP1075_HANDLER_IF_BRD_ID = bytes([0x44, 0x42, 0x00, 0x08])
 
 # Communication Object IDs
 SYRLINKS_HANDLER_ID = bytes([0x44, 0x53, 0x00, 0xA3])
@@ -47,6 +51,9 @@ GYRO_1_L3G_HANDLER_ID = bytes([0x44, 0x12, 0x01, 0x11])
 GYRO_2_ADIS_HANDLER_ID = bytes([0x44, 0x12, 0x02, 0x12])
 GYRO_3_L3G_HANDLER_ID = bytes([0x44, 0x12, 0x03, 0x13])
 GPS_CONTROLLER = bytes([0x44, 0x13, 0x00, 0x45])
+GPS_0_HEALTH_DEV = bytes([0x44, 0x13, 0x00, 0x46])
+GPS_1_HEALTH_DEV = bytes([0x44, 0x13, 0x00, 0x47])
+
 RW1_ID = bytes([0x44, 0x12, 0x00, 0x47])
 RW2_ID = bytes([0x44, 0x12, 0x01, 0x48])
 RW3_ID = bytes([0x44, 0x12, 0x02, 0x49])
@@ -69,14 +76,14 @@ PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
 PL_PCDU_ID = bytes([0x44, 0x30, 0x00, 0x00])
 
 # Other
-HEATER_0_OBC_BRD = bytes([0x60, 0x00, 0x00, 0x00])
-HEATER_1_PLOC_PROC_BRD = bytes([0x60, 0x00, 0x00, 0x01])
+HEATER_0_PLOC_PROC_BRD = bytes([0x60, 0x00, 0x00, 0x00])
+HEATER_1_PCDU_BRD = bytes([0x60, 0x00, 0x00, 0x01])
 HEATER_2_ACS_BRD = bytes([0x60, 0x00, 0x00, 0x02])
-HEATER_3_PCDU_BRD = bytes([0x60, 0x00, 0x00, 0x03])
+HEATER_3_OBC_BRD = bytes([0x60, 0x00, 0x00, 0x03])
 HEATER_4_CAMERA = bytes([0x60, 0x00, 0x00, 0x04])
 HEATER_5_STR = bytes([0x60, 0x00, 0x00, 0x05])
 HEATER_6_DRO = bytes([0x60, 0x00, 0x00, 0x06])
-HEATER_7_HPA = bytes([0x60, 0x00, 0x00, 0x07])
+HEATER_7_SYRLINKS = bytes([0x60, 0x00, 0x00, 0x07])
 
 # RTDs
 RTD_0_PLOC_HSPD = bytes([0x44, 0x42, 0x00, 0x16])
@@ -124,23 +131,50 @@ 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
+EIVE_SYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x00])
 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])
+EPS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x05])
+
+# Legacy names, kept for backwards compatibility
 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])
+SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
+IMTQ_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x08])
+
+ACS_BOARD_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x01])
+SUS_BOARD_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x02])
+TCS_BOARD_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x03])
 RW_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x04])
+CAM_SWITCHER = bytes([0x73, 0x00, 0x00, 0x06])
+SYRLINKS_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x07])
+# To be removed soon..
+MGT_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x08])
+STR_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x09])
 
 # Controllers
 TCS_CONTROLLER = bytes([0x43, 0x40, 0x00, 0x01])
 ACS_CONTROLLER = bytes([0x43, 0x00, 0x00, 0x02])
 CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
+PWR_CONTROLLER = bytes([0x43, 0x00, 0x00, 0x04])
+
+MISC_TM_STORE = bytes([0x73, 0x02, 0x00, 0x01])
+OK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x02])
+NOT_OK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x03])
+HK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x04])
+CFDP_TM_STORE = bytes([0x73, 0x03, 0x00, 0x00])
+
+ObjectIdDict = Dict[bytes, ObjectIdU32]
 
 
-def get_object_ids() -> ObjectIdDictT:
+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

@@ -1,6 +1,7 @@
 0x00005060;P60DOCK_TEST_TASK
 0x43000002;ACS_CONTROLLER
 0x43000003;CORE_CONTROLLER
+0x43000004;POWER_CONTROLLER
 0x43000006;GLOBAL_JSON_CFG
 0x43400001;THERMAL_CONTROLLER
 0x44120006;MGM_0_LIS3_HANDLER
@@ -29,6 +30,9 @@
 0x44120350;RW4
 0x44130001;STAR_TRACKER
 0x44130045;GPS_CONTROLLER
+0x44130046;GPS_0_HEALTH_DEV
+0x44130047;GPS_1_HEALTH_DEV
+0x44140013;IMTQ_POLLING
 0x44140014;IMTQ_HANDLER
 0x442000A1;PCDU_HANDLER
 0x44250000;P60DOCK_HANDLER
@@ -40,10 +44,14 @@
 0x443200A5;RAD_SENSOR
 0x44330000;PLOC_UPDATER
 0x44330001;PLOC_MEMORY_DUMPER
-0x44330002;STR_HELPER
+0x44330002;STR_COM_IF
 0x44330003;PLOC_MPSOC_HELPER
 0x44330004;AXI_PTME_CONFIG
 0x44330005;PTME_CONFIG
+0x44330006;PTME_VC0_LIVE_TM
+0x44330007;PTME_VC1_LOG_TM
+0x44330008;PTME_VC2_HK_TM
+0x44330009;PTME_VC3_CFDP_TM
 0x44330015;PLOC_MPSOC_HANDLER
 0x44330016;PLOC_SUPERVISOR_HANDLER
 0x44330017;PLOC_SUPERVISOR_HELPER
@@ -55,7 +63,6 @@
 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
@@ -72,20 +79,25 @@
 0x44420029;RTD_13_IC16_PLPCDU_HEATSPREADER
 0x44420030;RTD_14_IC17_TCS_BOARD
 0x44420031;RTD_15_IC18_IMTQ
-0x445300A3;SYRLINKS_HK_HANDLER
+0x445300A3;SYRLINKS_HANDLER
+0x445300A4;SYRLINKS_COM_HANDLER
 0x49000000;ARDUINO_COM_IF
 0x49010005;GPIO_IF
 0x49010006;SCEX_UART_READER
 0x49020004;SPI_MAIN_COM_IF
-0x49020005;SPI_RW_COM_IF
-0x49020006;SPI_RTD_COM_IF
 0x49030003;UART_COM_IF
 0x49040002;I2C_COM_IF
 0x49050001;CSP_COM_IF
+0x49060004;ACS_BOARD_POLLING_TASK
+0x49060005;RW_POLLING_TASK
+0x49060006;SPI_RTD_COM_IF
+0x49060007;SUS_POLLING_TASK
 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
@@ -100,6 +112,7 @@
 0x53000008;PUS_SERVICE_8_FUNCTION_MGMT
 0x53000009;PUS_SERVICE_9_TIME_MGMT
 0x53000011;PUS_SERVICE_11_TC_SCHEDULER
+0x53000015;PUS_SERVICE_15_TM_STORAGE
 0x53000017;PUS_SERVICE_17_TEST
 0x53000020;PUS_SERVICE_20_PARAMETERS
 0x53000200;PUS_SERVICE_200_MODE_MGMT
@@ -130,12 +143,15 @@
 0x60000004;HEATER_4_CAMERA
 0x60000005;HEATER_5_STR
 0x60000006;HEATER_6_DRO
-0x60000007;HEATER_7_HPA
+0x60000007;HEATER_7_SYRLINKS
 0x73000001;ACS_BOARD_ASS
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS
-0x73000004;RW_ASS
+0x73000004;RW_ASSY
 0x73000006;CAM_SWITCHER
+0x73000007;SYRLINKS_ASSY
+0x73000008;IMTQ_ASSY
+0x73000009;STR_ASSY
 0x73000100;TM_FUNNEL
 0x73000101;PUS_TM_FUNNEL
 0x73000102;CFDP_TM_FUNNEL
@@ -144,5 +160,18 @@
 0x73010000;EIVE_SYSTEM
 0x73010001;ACS_SUBSYSTEM
 0x73010002;PL_SUBSYSTEM
-0x73500000;CCSDS_IP_CORE_BRIDGE
+0x73010003;TCS_SUBSYSTEM
+0x73010004;COM_SUBSYSTEM
+0x73010005;EPS_SUBSYSTEM
+0x73020001;MISC_TM_STORE
+0x73020002;OK_TM_STORE
+0x73020003;NOT_OK_TM_STORE
+0x73020004;HK_TM_STORE
+0x73030000;CFDP_TM_STORE
+0x73040000;LIVE_TM_TASK
+0x73040001;LOG_STORE_AND_TM_TASK
+0x73040002;HK_STORE_AND_TM_TASK
+0x73040003;CFDP_STORE_AND_TM_TASK
+0x73040004;DOWNLINK_RAM_STORE
+0x90000003;THERMAL_TEMP_INSERTER
 0xFFFFFFFF;NO_OBJECT

eive_tmtc/config/retvals.py

@@ -1,12 +1,11 @@
 import os
+import logging
 
 from eive_tmtc import EIVE_TMTC_ROOT
 from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
-from tmtccmd.logging import get_console_logger
 
 DEFAULT_RETVAL_CSV_NAME = EIVE_TMTC_ROOT / "config/returnvalues.csv"
 __RETVAL_DICT = None
-LOGGER = get_console_logger()
 
 
 def get_retval_dict() -> RetvalDictT:
@@ -17,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/config/subsystems.csv

@@ -0,0 +1,63 @@
+22;MEMORY
+26;OBSW
+28;CDH
+59;TCS_1
+42;PCDU_1
+43;POWER_SWITCH_IF
+50;HEATER
+52;T_SENSORS
+70;FDIR
+71;FDIR_1
+72;FDIR_2
+73;HK
+74;SYSTEM_MANAGER
+75;SYSTEM_MANAGER_1
+76;TMTC_DISTRIBUTION
+79;SYSTEM_1
+80;PUS_SERVICE_1
+82;PUS_SERVICE_2
+83;PUS_SERVICE_3
+85;PUS_SERVICE_5
+86;PUS_SERVICE_6
+88;PUS_SERVICE_8
+89;PUS_SERVICE_9
+91;PUS_SERVICE_11
+97;PUS_SERVICE_17
+103;PUS_SERVICE_23
+106;MGM_LIS3MDL
+107;MGM_RM3100
+108;CFDP
+112;ACS_SUBSYSTEM
+113;PCDU_HANDLER
+114;HEATER_HANDLER
+115;SA_DEPL_HANDLER
+116;PLOC_MPSOC_HANDLER
+117;IMTQ_HANDLER
+118;RW_HANDLER
+119;STR_HANDLER
+120;PLOC_SUPERVISOR_HANDLER
+121;FILE_SYSTEM
+122;PLOC_UPDATER
+123;PLOC_MEMORY_DUMPER
+124;PDEC_HANDLER
+125;STR_HELPER
+126;PLOC_MPSOC_HELPER
+127;PL_PCDU_HANDLER
+128;ACS_BOARD_ASS
+129;SUS_BOARD_ASS
+130;TCS_BOARD_ASS
+131;GPS_HANDLER
+132;P60_DOCK_HANDLER
+133;PDU1_HANDLER
+134;PDU2_HANDLER
+135;ACU_HANDLER
+136;PLOC_SUPV_HELPER
+137;SYRLINKS
+138;SCEX_HANDLER
+139;CONFIGHANDLER
+140;CORE
+141;TCS_CONTROLLER
+142;COM_SUBSYSTEM
+143;PERSISTENT_TM_STORE
+144;SYRLINKS_COM
+145;SUS_HANDLER

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
@@ -63,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
     )
 
 
@@ -74,7 +74,9 @@ def pack_get_param_command(
     memory_address: Union[int, bytes],
     parameter_size: int,
 ) -> PusTelecommand:
-    """Function to generate a command to retrieve parameters like the temperature from a gomspace device.
+    """Function to generate a command to retrieve parameters like the temperature from a
+    gomspace device.
+
     @param object_id:   The object id of the gomspace device handler.
     @param table_id:    The table id of the gomspace device
     @param memory_address:  Address offset within table of the value to read.
@@ -88,9 +90,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,
     )
 
@@ -98,12 +100,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
     )
 
@@ -111,12 +113,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
     )
 
@@ -124,12 +126,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
     )
 
@@ -137,12 +139,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
     )
 
@@ -150,34 +152,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
     )
 
@@ -218,15 +220,15 @@ def prompt_and_pack_set_integer_param_command(
 
 def pack_ping_command(object_id: ObjectIdU32, data: bytearray) -> PusTelecommand:
     """ " Function to generate the command to ping a gomspace device
-    @param object_id    Object Id of the gomspace device handler.
-    @param data Bytearray containing the bytes to send to the gomspace device. For now the on board software
-                supports only the handling of up to 33 bytes.
+    :param object_id:    Object Id of the gomspace device handler.
+    :param data: Bytearray containing the bytes to send to the gomspace device. For now the on board
+        software supports only the handling of up to 33 bytes.
     @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,
     )
 
@@ -235,8 +237,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
     )
 
 
@@ -244,8 +246,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
     )
 
 
@@ -254,6 +256,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/pus_tc/cmd_definitions.py

@@ -1,7 +1,5 @@
-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
@@ -21,135 +19,3 @@ def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
     )
     call_all_definitions_providers(def_wrapper)
     return def_wrapper
-
-
-@tmtc_definitions_provider
-def add_tmp_sens_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add("0", "TMP1075 Tests")
-    defs.add_service(CustomServiceList.TMP1075_1.value, "TMP1075 1", oce)
-    defs.add_service(CustomServiceList.TMP1075_2.value, "TMP1075 2", oce)
-
-
-@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_ccsds_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add("0", "CCSDS Handler: Set low rate")
-    oce.add("1", "CCSDS Handler: Set high rate")
-    oce.add("2", "CCSDS Handler: Enable transmitter")
-    oce.add("3", "CCSDS Handler: Disable transmitter")
-    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)
-
-
-@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_time_cmds(defs: TmtcDefinitionWrapper):
-    from eive_tmtc.pus_tc.system.time import OpCodes, Info
-
-    oce = OpCodeEntry()
-    oce.add(
-        keys=OpCodes.SET_CURRENT_TIME,
-        info=Info.SET_CURRENT_TIME,
-    )
-    defs.add_service(
-        name=CustomServiceList.TIME.value,
-        info="Time Service",
-        op_code_entry=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.OpCodes.THERMAL_CONTROLLER,
-        info=controllers.Info.THERMAL_CONTROLLER,
-    )
-    oce.add(
-        keys=controllers.OpCodes.CORE_CONTROLLER,
-        info=controllers.Info.CORE_CONTROLLER,
-    )
-    defs.add_service(
-        name=CustomServiceList.CONTROLLERS.value,
-        info="Controllers",
-        op_code_entry=oce,
-    )

eive_tmtc/pus_tc/devs/__init__.py

@@ -1 +0,0 @@
-

eive_tmtc/pus_tc/devs/bpx_batt.py

@@ -1,111 +0,0 @@
-from spacepackets.ecss import PusTelecommand
-
-from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.config.object_ids import BPX_HANDLER_ID
-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_8_funccmd import make_fsfw_action_cmd
-from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
-
-
-class BpxSetIds:
-    GET_HK_SET = 0
-    GET_CFG_SET = 5
-
-
-class BpxActionIds:
-    REBOOT = 2
-    RESET_COUNTERS = 3
-    SET_CFG = 4
-    GET_CFG = 5
-
-
-class BpxOpCodes:
-    HK = ["0", "hk"]
-    OFF = ["off"]
-    ON = ["on"]
-    RST_BOOT_CNT = ["1", "rst_boot_cnt"]
-    REQUEST_CFG = ["2", "cfg"]
-    REQUEST_CFG_HK = ["3", "cfg_hk"]
-    REBOOT = ["4", "reboot"]
-
-
-@tmtc_definitions_provider
-def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(keys=BpxOpCodes.ON, info="On command")
-    oce.add(keys=BpxOpCodes.OFF, info="Off command")
-    oce.add(keys=BpxOpCodes.HK, info="Request BPX HK")
-    oce.add(keys=BpxOpCodes.RST_BOOT_CNT, info="Reset Boot Count")
-    oce.add(keys=BpxOpCodes.REQUEST_CFG, info="Request Configuration Struct (Step 1)")
-    oce.add(
-        keys=BpxOpCodes.REQUEST_CFG_HK, info="Request Configuration Struct HK (Step 2)"
-    )
-    oce.add(keys=BpxOpCodes.REBOOT, info="Reboot Command")
-    defs.add_service(
-        name=CustomServiceList.BPX_BATTERY.value,
-        info="BPX Battery Handler",
-        op_code_entry=oce,
-    )
-
-
-@service_provider(CustomServiceList.BPX_BATTERY.value)
-def pack_bpx_commands(p: ServiceProviderParams):
-    op_code = p.op_code
-    q = p.queue_helper
-    if op_code in BpxOpCodes.HK:
-        q.add_log_cmd("Requesting BPX battery HK set")
-        sid = make_sid(object_id=BPX_HANDLER_ID, set_id=BpxSetIds.GET_HK_SET)
-        q.add_pus_tc(generate_one_hk_command(sid=sid))
-    if op_code in BpxOpCodes.OFF:
-        q.add_log_cmd("Off mode")
-        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Modes.OFF, 0)
-        q.add_pus_tc(
-            PusTelecommand(
-                service=200,
-                subservice=ModeSubservices.TC_MODE_COMMAND,
-                app_data=mode_cmd,
-            )
-        )
-    if op_code in BpxOpCodes.ON:
-        q.add_log_cmd("On mode")
-        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Modes.ON, 0)
-        q.add_pus_tc(
-            PusTelecommand(
-                service=200,
-                subservice=ModeSubservices.TC_MODE_COMMAND,
-                app_data=mode_cmd,
-            )
-        )
-    if op_code in BpxOpCodes.RST_BOOT_CNT:
-        q.add_log_cmd("Resetting reboot counters")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=BPX_HANDLER_ID, action_id=BpxActionIds.RESET_COUNTERS
-            )
-        )
-    if op_code in BpxOpCodes.REQUEST_CFG:
-        q.add_log_cmd("Requesting configuration struct")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=BPX_HANDLER_ID, action_id=BpxActionIds.GET_CFG
-            )
-        )
-    if op_code in BpxOpCodes.REQUEST_CFG_HK:
-        q.add_log_cmd("Requesting configuration struct HK")
-        sid = make_sid(object_id=BPX_HANDLER_ID, set_id=BpxSetIds.GET_CFG_SET)
-        q.add_pus_tc(generate_one_hk_command(sid=sid))
-    if op_code in BpxOpCodes.REBOOT:
-        q.add_log_cmd("Rebooting BPX battery")
-        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=BPX_HANDLER_ID, action_id=BpxActionIds.REBOOT
-            )
-        )

eive_tmtc/pus_tc/devs/ccsds_handler.py

@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@file   ccsds_handler.py
-@brief  Test commanding of CCSDS Handler
-@author J. Meier
-@date   20.11.2021
-"""
-import struct
-
-from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.util import ObjectIdU32
-
-
-class CommandIds:
-    # 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)
-    EN_TRANSMITTER = 2
-    # Disables the syrlinks transmitter (by using RS485 enables lines)
-    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
-
-
-def pack_ccsds_handler_test(
-    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
-):
-    obyt = object_id.as_bytes
-    q.add_log_cmd(f"Testing CCSDS handler with object id: {object_id.as_hex_string}")
-    if op_code == "0":
-        q.add_log_cmd("CCSDS Handler: Set low rate")
-        command = obyt + struct.pack("!I", CommandIds.SET_LOW_RATE)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "1":
-        q.add_log_cmd("CCSDS Handler: Set high rate")
-        command = obyt + struct.pack("!I", CommandIds.SET_HIGH_RATE)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "2":
-        q.add_log_cmd("CCSDS Handler: Enables the transmitter")
-        command = obyt + struct.pack("!I", CommandIds.EN_TRANSMITTER)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "3":
-        q.add_log_cmd("CCSDS Handler: Disables the transmitter")
-        command = obyt + struct.pack("!I", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.UPDATE_ON_FALLING_EDGE)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))

eive_tmtc/pus_tc/devs/gps.py

@@ -1,48 +0,0 @@
-import enum
-
-from eive_tmtc.config.definitions import CustomServiceList
-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.logging import get_console_logger
-
-
-LOGGER = get_console_logger()
-
-
-class OpCodes:
-    REQ_OS_HK = ["0", "hk-os"]
-    RESET_GNSS = ["5", "reset"]
-
-
-class Info:
-    REQ_OS_HK = "Request One-Shot HK"
-    RESET_GNSS = "Reset GNSS using reset pin"
-
-
-class SetIds:
-    HK = 0
-
-
-@tmtc_definitions_provider
-def add_gps_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(keys=OpCodes.RESET_GNSS, info=Info.RESET_GNSS)
-    oce.add(keys=OpCodes.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 OpCodes.RESET_GNSS:
-        # TODO: This needs to be re-implemented
-        LOGGER.warning("Reset pin handling needs to be re-implemented")
-    if op_code in OpCodes.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=SetIds.HK))
-        )

eive_tmtc/pus_tc/devs/gyros.py

@@ -1,10 +0,0 @@
-import enum
-
-
-class AdisGyroSetIds(enum.IntEnum):
-    CORE_HK = 0
-    CFG_HK = 1
-
-
-class L3gGyroSetIds(enum.IntEnum):
-    CORE_HK = 0

eive_tmtc/pus_tc/devs/mgms.py

@@ -1,9 +0,0 @@
-import enum
-
-
-class MgmLis3SetIds(enum.IntEnum):
-    CORE_HK = 0
-
-
-class MgmRm3100SetIds(enum.IntEnum):
-    CORE_HK = 0

eive_tmtc/pus_tc/devs/pdec_handler.py

@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@file   pdec_handler.py
-@brief  Test commanding of PDEC Handler
-@author J. Meier
-@date   22.11.2021
-"""
-from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc import DefaultPusQueueHelper
-
-
-class CommandIds:
-    # prints the clcw to the console. Useful for debugging
-    PRINT_CLCW = bytearray([0x0, 0x0, 0x0, 0x0])
-    # Print PDEC monitor register
-    PRINT_PDEC_MON = bytearray([0x0, 0x0, 0x0, 0x1])
-
-
-def pack_pdec_handler_test(
-    object_id: bytearray, q: DefaultPusQueueHelper, op_code: str
-):
-    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
-        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
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))

eive_tmtc/pus_tc/devs/rtd.py

@@ -1,112 +0,0 @@
-from typing import Optional
-
-from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.pus_tc.devs.pdec_handler import CommandIds
-from spacepackets.ecss import PusTelecommand
-from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
-from tmtccmd.config.tmtc import tmtc_definitions_provider
-
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.util import ObjectIdU32
-from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
-import eive_tmtc.config.object_ids as oids
-from eive_tmtc.config.object_ids import get_object_ids
-
-RTD_IDS = [
-    oids.RTD_0_PLOC_HSPD,
-    oids.RTD_1_PLOC_MISSIONBRD,
-    oids.RTD_2_4K_CAM,
-    oids.RTD_3_DAC_HSPD,
-    oids.RTD_4_STR,
-    oids.RTD_5_RW1_MX_MY,
-    oids.RTD_6_DRO,
-    oids.RTD_7_SCEX,
-    oids.RTD_8_X8,
-    oids.RTD_9_HPA,
-    oids.RTD_10_PL_TX,
-    oids.RTD_11_MPA,
-    oids.RTD_12_ACU,
-    oids.RTD_13_PLPCDU_HSPD,
-    oids.RTD_14_TCS_BRD,
-    oids.RTD_15_IMTQ,
-]
-
-
-class OpCodes:
-    ON = ["0", "on"]
-    OFF = ["1", "off"]
-    NORMAL = ["2", "normal"]
-    CONFIG_CMD = ["3", "Write config"]
-
-
-class Info:
-    ON = "Switch handler on"
-    OFF = "Switch handler off"
-    NORMAL = "Switch handler normal"
-    WIRTE_CONFIG = "Write config"
-
-
-@tmtc_definitions_provider
-def specify_rtd_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(keys=OpCodes.ON, info=Info.ON)
-    oce.add(keys=OpCodes.NORMAL, info=Info.NORMAL)
-    oce.add(keys=OpCodes.OFF, info=Info.OFF)
-    defs.add_service(
-        name=CustomServiceList.RTD.value, info="RTD commands", op_code_entry=oce
-    )
-
-
-def pack_rtd_commands(
-    op_code: str, object_id: Optional[ObjectIdU32], q: DefaultPusQueueHelper
-):
-    if object_id is not None and object_id not in RTD_IDS:
-        print("Specified object ID not a valid RTD ID")
-        object_id = None
-    if object_id is None:
-        tgt_rtd_idx = prompt_rtd_idx()
-        object_id_dict = get_object_ids()
-        object_id = object_id_dict.get(RTD_IDS[tgt_rtd_idx])
-    if op_code in OpCodes.ON:
-        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.ON, submode=0
-        )
-        q.add_pus_tc(
-            PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
-            )
-        )
-    if op_code in OpCodes.NORMAL:
-        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.NORMAL, submode=0
-        )
-        q.add_pus_tc(
-            PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
-            )
-        )
-    if op_code in OpCodes.OFF:
-        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.OFF, submode=0
-        )
-        q.add_pus_tc(
-            PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
-            )
-        )
-    if op_code in OpCodes.CONFIG_CMD:
-        command = object_id.as_bytes + CommandIds.PRINT_CLCW
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-
-
-def prompt_rtd_idx():
-    while True:
-        rtd_idx = input("Please specify RTD index [0-15]: ")
-        if not rtd_idx.isdigit():
-            print("Invalid input")
-            continue
-        rtd_idx = int(rtd_idx)
-        if rtd_idx < 0 or rtd_idx > 15:
-            print("Invalid device index")
-            continue
-        return rtd_idx

eive_tmtc/pus_tc/devs/sus.py

@@ -1,2 +0,0 @@
-class SetIds:
-    HK = 3

eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py

@@ -1,178 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@file   syrlinks_hk_handler.py
-@brief  Syrlinks Hk Handler tests
-@author J. Meier
-@date   13.12.2020
-"""
-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, generate_one_hk_command
-from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-import struct
-
-from tmtccmd.util import ObjectIdU32
-
-
-class SetIds:
-    RX_REGISTERS_DATASET = 1
-    TX_REGISTERS_DATASET = 2
-
-
-class OpCodes:
-    OFF = "off"
-    ON = "on"
-    NORMAL = "nml"
-    STANDBY = "set_tx_standby"
-    SET_CW = "set_tx_carrier_wave"
-    MODULATION = "modulation"
-    HK_RX_REGS = "hk_rx_regs"
-    HK_TX_REGS = "hk_tx_regs"
-    TX_STATUS = "tx_status"
-    RX_STATUS = "rx_status"
-
-
-class Info:
-    HK_RX_REGS = "Request RX register set"
-    HK_TX_REGS = "Request TX register set"
-    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 CommandIds:
-    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
-
-
-@tmtc_definitions_provider
-def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(OpCodes.OFF, "Syrlinks Handler: Set mode off")
-    oce.add(OpCodes.ON, "Syrlinks Handler: Set mode on")
-    oce.add(OpCodes.NORMAL, "Syrlinks Handler: Set mode normal")
-    oce.add(OpCodes.STANDBY, "Syrlinks Handler: Set TX standby")
-    oce.add(OpCodes.MODULATION, "Syrlinks Handler: Set TX modulation")
-    oce.add(OpCodes.HK_RX_REGS, Info.HK_RX_REGS)
-    oce.add(OpCodes.HK_TX_REGS, Info.HK_TX_REGS)
-    oce.add(OpCodes.SET_CW, Info.SET_CW)
-    oce.add(OpCodes.TX_STATUS, Info.TX_STATUS)
-    oce.add(OpCodes.RX_STATUS, Info.RX_STATUS)
-    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)
-
-
-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 == OpCodes.OFF:
-        q.add_log_cmd(f"{prefix}: Set mode off")
-        data = pack_mode_data(obyt, Modes.OFF, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == OpCodes.ON:
-        q.add_log_cmd(f"{prefix}: Set mode on")
-        data = pack_mode_data(obyt, Modes.ON, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == OpCodes.NORMAL:
-        q.add_log_cmd(f"{prefix}: Mode Normal")
-        data = pack_mode_data(obyt, Modes.NORMAL, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == OpCodes.STANDBY:
-        q.add_log_cmd(f"{prefix}: Set TX mode standby")
-        data = obyt + struct.pack("!I", CommandIds.SET_TX_MODE_STANDBY)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == OpCodes.MODULATION:
-        q.add_log_cmd(f"{prefix}: Set TX mode modulation")
-        data = obyt + struct.pack("!I", CommandIds.SET_TX_MODE_MODULATION)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCodes.SET_CW:
-        q.add_log_cmd(f"{prefix}: {Info.SET_CW}")
-        data = obyt + struct.pack("!I", CommandIds.SET_TX_MODE_CW)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCodes.HK_RX_REGS:
-        q.add_log_cmd(f"{prefix}: {Info.HK_RX_REGS}")
-        sid = make_sid(obyt, SetIds.RX_REGISTERS_DATASET)
-        q.add_pus_tc(generate_one_hk_command(sid))
-    if op_code in OpCodes.HK_TX_REGS:
-        q.add_log_cmd(f"{prefix}: {Info.HK_TX_REGS}")
-        sid = make_sid(obyt, SetIds.TX_REGISTERS_DATASET)
-        q.add_pus_tc(generate_one_hk_command(sid))
-    if op_code in OpCodes.TX_STATUS:
-        q.add_log_cmd(f"{prefix}: {Info.TX_STATUS}")
-        command = obyt + struct.pack("!I", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.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", CommandIds.DISABLE_DEBUG)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))

eive_tmtc/pus_tc/devs/tmp1075.py

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@file   tmp1075.py
-@brief  TMP1075 tests
-@author J. Meier
-@date   06.01.2021
-"""
-from spacepackets.ecss.tc import PusTelecommand
-from eive_tmtc.pus_tc.service_200_mode import pack_mode_data
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
-from tmtccmd.util import ObjectIdU32
-
-
-class Tmp1075TestProcedure:
-    """
-    @brief  Use this class to define the tests to perform for the Tmp1075.
-    @details    Setting all to True will run all tests.
-                Setting all to False will only run the tests set to True.
-    """
-
-    all = False
-    start_adc_conversion = False
-    get_temp = False
-    set_mode_normal = (
-        True  # Setting mode to normal starts continuous temperature reading
-    )
-    set_mode_on = False  # If mode is MODE_ON, temperature will only be read on command
-
-
-class Tmp1075ActionIds:
-    get_temp = bytearray([0x0, 0x0, 0x0, 0x01])
-    start_adc_conversion = bytearray([0x0, 0x0, 0x0, 0x02])
-
-
-def pack_tmp1075_test_into(
-    object_id: ObjectIdU32, op_code: str, q: DefaultPusQueueHelper
-):
-    q.add_log_cmd(
-        f"Testing Tmp1075 Temperature Sensor Handler with object id: {object_id.as_hex_string}"
-    )
-    obyt = object_id.as_bytes
-    if Tmp1075TestProcedure.all or Tmp1075TestProcedure.start_adc_conversion:
-        q.add_log_cmd("TMP1075: Starting new temperature conversion")
-        command = obyt + Tmp1075ActionIds.start_adc_conversion
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if Tmp1075TestProcedure.all or Tmp1075TestProcedure.get_temp:
-        q.add_log_cmd("TMP1075: Read temperature")
-        command = obyt + Tmp1075ActionIds.get_temp
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-
-    if Tmp1075TestProcedure.set_mode_normal:
-        q.add_log_cmd("TMP1075: Set Mode Normal")
-        mode_data = pack_mode_data(obyt, Modes.NORMAL, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
-
-    if Tmp1075TestProcedure.set_mode_on:
-        q.add_log_cmd("TMP1075: Set Mode On")
-        mode_data = pack_mode_data(obyt, Modes.ON, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
-
-    return q

eive_tmtc/pus_tc/procedure_packer.py

@@ -1,61 +1,52 @@
 """Hook function which packs telecommands based on service and operation code string
 """
+import logging
 from typing import cast
 
+from eive_tmtc.tmtc.acs.gyros import handle_gyr_cmd
+from eive_tmtc.tmtc.acs.mgms import handle_mgm_cmd
 from eive_tmtc.tmtc.power.power import pack_power_commands
-from eive_tmtc.pus_tc.devs.rtd import pack_rtd_commands
-from eive_tmtc.pus_tc.devs.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.ctrl import pack_tcs_ctrl_commands
+from eive_tmtc.tmtc.tcs.rtd import pack_rtd_commands
+from eive_tmtc.tmtc.payload.scex import pack_scex_cmds
+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,
     ServiceProviderParams,
 )
-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 eive_tmtc.pus_tc.service_200_mode import pack_service_200_test_into
+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.pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from eive_tmtc.pus_tc.devs.heater import pack_heater_cmds
+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.pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
 from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
-from eive_tmtc.pus_tc.devs.ccsds_handler import pack_ccsds_handler_test
+from eive_tmtc.tmtc.com.ccsds_handler import pack_ccsds_handler_command
 from eive_tmtc.tmtc.core import pack_core_commands
-from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands
-from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
-from eive_tmtc.pus_tc.devs.gps import pack_gps_command
+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.com.pdec_handler import pack_pdec_handler_test
 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.pus_tc.devs.plpcdu import pack_pl_pcdu_commands
-from eive_tmtc.pus_tc.devs.str_img_helper import pack_str_img_helper_command
-from eive_tmtc.pus_tc.system.tcs import pack_tcs_sys_commands
-from eive_tmtc.pus_tc.system.proc import pack_proc_commands
 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,
@@ -71,13 +62,21 @@ from eive_tmtc.config.object_ids import (
     RW_ASSEMBLY,
     get_object_ids,
 )
+
+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(
+def handle_default_procedure(  # noqa C901: Complexity okay here.
     tc_base: TcHandlerBase,
     info: DefaultProcedureInfo,
     queue_helper: DefaultPusQueueHelper,
@@ -85,8 +84,6 @@ def handle_default_procedure(
     service = info.service
     op_code = info.op_code
     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_200.value:
         return pack_service_200_test_into(q=queue_helper)
     if service == CustomServiceList.P60DOCK.value:
@@ -103,20 +100,26 @@ 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.TCS.value:
+    if service == CustomServiceList.TCS_SS.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.TCS_CTRL.value:
+        return pack_tcs_ctrl_commands(q=queue_helper, op_code=op_code)
+    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),
+            "3": ("TMP1075 PL PCDU 1", oids.TMP1075_HANDLER_PLPCDU_1_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))
@@ -137,6 +140,8 @@ def handle_default_procedure(
         return pack_single_rw_test_into(
             object_id=RW4_ID, rw_idx=4, q=queue_helper, op_code=op_code
         )
+    if service == CustomServiceList.MGMS.value:
+        return handle_mgm_cmd(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.RAD_SENSOR.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(RAD_SENSOR_ID))
         return pack_rad_sensor_test_into(
@@ -168,11 +173,12 @@ def handle_default_procedure(
             object_id=oids.GPS_CONTROLLER, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.CCSDS_HANDLER.value:
-        return pack_ccsds_handler_test(
-            object_id=CCSDS_HANDLER_ID, q=queue_helper, op_code=op_code
+        object_id = cast(ObjectIdU32, obj_id_man.get(CCSDS_HANDLER_ID))
+        return pack_ccsds_handler_command(
+            object_id=object_id, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.PDEC_HANDLER.value:
-        return pack_ccsds_handler_test(
+        return pack_pdec_handler_test(
             object_id=PDEC_HANDLER_ID, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.SYRLINKS.value:
@@ -180,6 +186,8 @@ def handle_default_procedure(
         return pack_syrlinks_command(
             object_id=object_id, q=queue_helper, op_code=op_code
         )
+    if service == CustomServiceList.GYRO.value:
+        return handle_gyr_cmd(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PROCEDURE.value:
         return pack_proc_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PL_PCDU.value:
@@ -188,15 +196,6 @@ def handle_default_procedure(
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.RW_ASSEMBLY.value:
         return pack_rw_ass_cmds(q=queue_helper, object_id=RW_ASSEMBLY, op_code=op_code)
-    if service == CustomServiceList.CONTROLLERS.value:
-        from tmtcc import TcHandler
-
-        tc_handler = cast(TcHandler, tc_base)
-        return pack_cmd_ctrl_to_prompted_mode(
-            q=queue_helper,
-            object_id=get_object_from_op_code(op_code),
-            gui=tc_handler.gui,
-        )
     if service == CustomServiceList.SCEX.value:
         return pack_scex_cmds(
             ServiceProviderParams(
@@ -215,4 +214,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/prompt_parameters.py

@@ -10,14 +10,11 @@ from PyQt5.QtWidgets import (
 
 from PyQt5 import QtCore
 
-from tmtccmd.config import CoreModeList
-from tmtccmd.core.globals_manager import get_global
-
 
 class Parameter:
-    def __init__(self, name: str, defaultValue: str, widget: QLineEdit):
+    def __init__(self, name: str, default_value: str, widget: QLineEdit):
         self.name = name
-        self.defaultValue = defaultValue
+        self.defaultValue = default_value
         self.widget = widget
         self.value = self.defaultValue
         self.widget.setPlaceholderText(self.defaultValue)
@@ -34,9 +31,9 @@ class ParameterDialog(QDialog):
 
         self.setWindowTitle("Enter Parameters")
 
-        Buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel | QDialogButtonBox.Reset
+        buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel | QDialogButtonBox.Reset
 
-        self.buttonBox = QDialogButtonBox(Buttons)
+        self.buttonBox = QDialogButtonBox(buttons)
         self.buttonBox.accepted.connect(self.accept)
         self.buttonBox.rejected.connect(self.reject)
         self.buttonBox.button(QDialogButtonBox.Reset).clicked.connect(self._reset)
@@ -54,14 +51,14 @@ class ParameterDialog(QDialog):
 
         self.parameters = {}
 
-    def addParameter(self, name: str, defaultValue: str):
+    def add_parameter(self, name: str, default_value: str):
         row = self.groupLayout.rowCount() + 1
         description = QLabel(name)
         self.groupLayout.addWidget(description, row, 0)
-        valueWidget = QLineEdit()
-        self.groupLayout.addWidget(valueWidget, row, 1)
+        value_widget = QLineEdit()
+        self.groupLayout.addWidget(value_widget, row, 1)
 
-        parameter = Parameter(name, defaultValue, valueWidget)
+        parameter = Parameter(name, default_value, value_widget)
 
         self.parameters[name] = parameter
 
@@ -69,10 +66,10 @@ class ParameterDialog(QDialog):
         for value in self.parameters.values():
             value.reset()
 
-    def getParameters(self):
+    def get_parameters(self):
         output = {}
         for key, parameter in self.parameters.items():
-            if parameter.widget != None:
+            if parameter.widget is not None:
                 if parameter.widget.text() != "":
                     parameter.value = parameter.widget.text()
             output[key] = parameter.value
@@ -103,9 +100,9 @@ def prompt_parameters_cli(param_list) -> dict:
 def _gui_prompt(param_list) -> dict:
     dialog = ParameterDialog()
     for parameter in param_list:
-        dialog.addParameter(parameter["name"], parameter["defaultValue"])
+        dialog.add_parameter(parameter["name"], parameter["defaultValue"])
     dialog.exec_()
-    return dialog.getParameters()
+    return dialog.get_parameters()
 
 
 def _cli_prompt(param_list) -> dict:

eive_tmtc/pus_tc/system/__init__.py

@@ -1 +0,0 @@
-

eive_tmtc/pus_tc/system/controllers.py

@@ -1,14 +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 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"]
 
@@ -54,7 +54,7 @@ def pack_cmd_ctrl_to_off(
 ):
     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",
@@ -64,7 +64,7 @@ def pack_cmd_ctrl_to_off(
 def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
     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",
@@ -76,7 +76,7 @@ def pack_cmd_ctrl_to_nml(
 ):
     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",
@@ -86,10 +86,9 @@ def pack_cmd_ctrl_to_nml(
 def get_object_from_op_code(op_code: str):
     try:
         return bytes.fromhex(op_code)
-    except:
+    except ValueError:
         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

@@ -1,40 +1,32 @@
 from __future__ import annotations
 
+import struct
 import time
 from datetime import timedelta
 
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import get_object_ids
-from eive_tmtc.pus_tc.system.tcs import pack_tcs_sys_commands
+from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.decorator import ServiceProviderParams
-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 eive_tmtc.config.object_ids as oids
-from eive_tmtc.pus_tc.system.tcs import OpCodes as TcsOpCodes
-from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds
-from eive_tmtc.tmtc.core import SetIds as CoreSetIds
+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.pus_tc.devs.rad_sensor import SetIds as RadSetIds
-from eive_tmtc.pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
-from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
-from eive_tmtc.pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2
-from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3
-from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds
-from eive_tmtc.pus_tc.devs.gps import SetIds as GpsSetIds
-from eive_tmtc.tmtc.acs.imtq import ImtqSetIds
-from eive_tmtc.pus_tc.devs.sus import SetIds
-from eive_tmtc.pus_tc.devs.star_tracker import SetIds as StrSetIds
+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 (
-    RwSetIds,
+    RwSetId,
     rw_speed_up_cmd_consec,
     rw_speed_down_cmd_consec,
 )
@@ -45,11 +37,27 @@ from eive_tmtc.pus_tc.system.controllers import (
 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.pus_tc.devs.star_tracker import pack_star_tracker_commands
+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
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    disable_periodic_hk_command,
+    create_enable_periodic_hk_command_with_interval,
+)
 
-class OpCodes:
+
+class OpCode:
     """FT: Functional Test"""
 
     TV_SETUP_TCS_FT_ON = ["s", "tcs-ft-on"]
@@ -93,34 +101,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],
 }
 
 
@@ -152,7 +160,7 @@ def add_proc_cmds(defs: TmtcDefinitionWrapper):
     )
 
 
-def pack_generic_hk_listening_cmds(
+def pack_generic_hk_listening_cmds(  # noqa C901: Complexity okay here.
     q: DefaultPusQueueHelper,
     proc_key: str,
     sid_list: list[bytearray],
@@ -209,7 +217,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
                 )
             )
@@ -220,15 +228,17 @@ def pack_generic_hk_listening_cmds(
     diag_list.clear()
 
 
-def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
+def pack_proc_commands(  # noqa C901: Complexity is okay here.
+    q: DefaultPusQueueHelper, op_code: str
+):  # noqa C901: Complexity okay here.
     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,
@@ -238,7 +248,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]
@@ -250,7 +260,7 @@ 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.CORE),
@@ -286,7 +296,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]
@@ -298,18 +308,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),
@@ -392,12 +402,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_NO_TORQUE),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.CAL_MTM_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.RAW_MTM_NO_TORQUE),
         ]
         diag_list = [
             True,
@@ -425,7 +435,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),
@@ -442,9 +452,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_NO_TORQUE),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.CAL_MTM_SET),
+            (oids.IMTQ_HANDLER_ID, ImtqSetId.RAW_MTM_NO_TORQUE),
         ]
         d_side_and_imtq_pairs = a_side_pairs + b_side_pairs + imtq_pairs
         diag_list = [
@@ -487,7 +497,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")
@@ -519,7 +529,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,
@@ -543,7 +553,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,
@@ -558,9 +568,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,
@@ -585,7 +595,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),
@@ -599,7 +609,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
             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")
@@ -617,21 +627,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,
@@ -666,25 +676,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,
@@ -731,12 +741,12 @@ def enable_listen_to_hk_for_x_seconds(
     interval_seconds: float,
 ):
     q.add_log_cmd(f"Enabling periodic HK for {device}")
-    cmd_tuple = enable_periodic_hk_command_with_interval(
+    cmd_tuple = create_enable_periodic_hk_command_with_interval(
         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),
     )
@@ -755,7 +765,6 @@ def gen_disable_listen_to_hk_for_x_seconds(
 def activate_mgts_alternately(
     q: DefaultPusQueueHelper,
 ):
-
     q.add_pus_tc(
         pack_dipole_command(
             object_id=oids.IMTQ_HANDLER_ID,

eive_tmtc/pus_tc/system/tcs.py

@@ -1,78 +0,0 @@
-import enum
-
-from eive_tmtc.config.definitions import CustomServiceList
-from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
-from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    make_sid,
-    generate_one_hk_command,
-)
-
-from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
-from eive_tmtc.config.object_ids import TCS_BOARD_ASS_ID, TCS_CONTROLLER
-
-
-class OpCodes:
-    TCS_BOARD_ASS_NORMAL = ["0", "normal"]
-    TCS_BOARD_ASS_OFF = ["1", "off"]
-    REQUEST_SENSOR_TEMP_SET = ["2", "temps"]
-
-
-class Info:
-    REQUEST_SENSOR_TEMP_SET = "Request HK set of primary sensor temperatures"
-    TCS_BOARD_ASS_NORMAL = "Switching TCS board assembly on"
-    TCS_BOARD_ASS_OFF = "Switching TCS board assembly off"
-
-
-class SetIds(enum.IntEnum):
-    PRIMARY_SENSORS = 0
-    DEVICE_SENSORS = 1
-    SUS_TEMP_SENSORS = 2
-
-
-@tmtc_definitions_provider
-def add_tcs_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(
-        keys=OpCodes.TCS_BOARD_ASS_NORMAL,
-        info=Info.TCS_BOARD_ASS_NORMAL,
-    )
-    oce.add(
-        keys=OpCodes.TCS_BOARD_ASS_OFF,
-        info=Info.TCS_BOARD_ASS_OFF,
-    )
-    oce.add(keys=OpCodes.REQUEST_SENSOR_TEMP_SET, info=Info.REQUEST_SENSOR_TEMP_SET)
-    defs.add_service(
-        name=CustomServiceList.TCS.value,
-        info="TCS Board Assembly",
-        op_code_entry=oce,
-    )
-
-
-def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in OpCodes.REQUEST_SENSOR_TEMP_SET:
-        sensor_set_sid = make_sid(TCS_CONTROLLER, SetIds.PRIMARY_SENSORS)
-        q.add_log_cmd(Info.REQUEST_SENSOR_TEMP_SET)
-        q.add_pus_tc(generate_one_hk_command(sensor_set_sid))
-    pack_tcs_ass_cmds(q, op_code)
-
-
-def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in OpCodes.TCS_BOARD_ASS_NORMAL:
-        pack_mode_cmd_with_info(
-            object_id=TCS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=0,
-            q=q,
-            info=Info.TCS_BOARD_ASS_NORMAL,
-        )
-    if op_code in OpCodes.TCS_BOARD_ASS_OFF:
-        pack_mode_cmd_with_info(
-            object_id=TCS_BOARD_ASS_ID,
-            mode=Modes.OFF,
-            submode=0,
-            q=q,
-            info=Info.TCS_BOARD_ASS_OFF,
-        )

eive_tmtc/pus_tc/system/time.py

@@ -1,29 +0,0 @@
-from datetime import datetime
-
-from eive_tmtc.config.definitions import CustomServiceList
-from spacepackets.ecss import PusTelecommand
-from tmtccmd import DefaultProcedureInfo, TcHandlerBase
-
-from tmtccmd.logging import get_console_logger
-from tmtccmd.tc import DefaultPusQueueHelper, service_provider
-from tmtccmd.tc.decorator import ServiceProviderParams
-
-LOGGER = get_console_logger()
-
-
-class OpCodes:
-    SET_CURRENT_TIME = ["0", "set-curr-time"]
-
-
-class Info:
-    SET_CURRENT_TIME = "Setting current time in ASCII format"
-
-
-@service_provider(CustomServiceList.TIME.value)
-def pack_set_current_time_ascii_command(p: ServiceProviderParams):
-    q = p.queue_helper
-    time_test_current_time = datetime.utcnow().isoformat() + "Z" + "\0"
-    current_time_ascii = time_test_current_time.encode("ascii")
-    LOGGER.info(f"Current time in ASCII format: {current_time_ascii}")
-    q.add_log_cmd(Info.SET_CURRENT_TIME)
-    q.add_pus_tc(PusTelecommand(service=9, subservice=128, app_data=current_time_ascii))

eive_tmtc/pus_tc/tc_handler.py

@@ -0,0 +1,163 @@
+import logging
+from typing import cast
+
+from eive_tmtc.config.definitions import (
+    CFDP_REMOTE_ENTITY_ID,
+    PUS_APID,
+    CFDP_LOCAL_ENTITY_ID,
+)
+from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure
+from tmtccmd import TcHandlerBase, ProcedureWrapper
+from tmtccmd.cfdp.defs import CfdpRequestType
+from tmtccmd.cfdp.handler import CfdpInCcsdsHandler
+from tmtccmd.logging import get_current_time_string
+from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
+from tmtccmd.tc import (
+    DefaultPusQueueHelper,
+    QueueWrapper,
+    FeedWrapper,
+    TcProcedureType,
+    SendCbParams,
+    TcQueueEntryType,
+)
+from tmtccmd.config.cfdp import generic_cfdp_params_to_put_request
+from spacepackets.ecss import PusVerificator
+from tmtccmd.util import FileSeqCountProvider
+from spacepackets.cfdp import PduHolder, DirectiveType
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class TcHandler(TcHandlerBase):
+    def __init__(
+        self,
+        seq_count_provider: FileSeqCountProvider,
+        cfdp_in_ccsds_handler: CfdpInCcsdsHandler,
+        pus_verificator: PusVerificator,
+        high_level_file_logger: logging.Logger,
+        raw_pus_logger: RawTmtcTimedLogWrapper,
+        gui: bool,
+    ):
+        super().__init__()
+        self.cfdp_handler_started = False
+        self.seq_count_provider = seq_count_provider
+        self.pus_verificator = pus_verificator
+        self.high_level_file_logger = high_level_file_logger
+        self.pus_raw_logger = raw_pus_logger
+        self.gui = gui
+        self.proxy_op = True
+        self.queue_helper = DefaultPusQueueHelper(
+            queue_wrapper=QueueWrapper.empty(),
+            default_pus_apid=PUS_APID,
+            seq_cnt_provider=seq_count_provider,
+            pus_verificator=pus_verificator,
+            tc_sched_timestamp_len=4,
+        )
+        self.cfdp_in_ccsds_handler = cfdp_in_ccsds_handler
+
+    def cfdp_done(self) -> bool:
+        if self.cfdp_handler_started:
+            if (
+                not self.cfdp_in_ccsds_handler.put_request_pending()
+                and not self.proxy_op
+            ):
+                self.cfdp_handler_started = False
+                return True
+        return False
+
+    def feed_cb(self, info: ProcedureWrapper, wrapper: FeedWrapper):
+        self.queue_helper.queue_wrapper = wrapper.queue_wrapper
+        if info.proc_type == TcProcedureType.DEFAULT:
+            handle_default_procedure(self, info.to_def_procedure(), self.queue_helper)
+        elif info.proc_type == TcProcedureType.CFDP:
+            self.handle_cfdp_procedure(info)
+
+    def send_cb(self, send_params: SendCbParams):
+        entry_helper = send_params.entry
+        if entry_helper.is_tc:
+            if entry_helper.entry_type == TcQueueEntryType.PUS_TC:
+                pus_tc_wrapper = entry_helper.to_pus_tc_entry()
+                # pus_tc_wrapper.pus_tc.apid = PUS_APID
+                raw_tc = pus_tc_wrapper.pus_tc.pack()
+                self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc)
+                tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}"
+                _LOGGER.info(tc_info_string)
+                self.high_level_file_logger.info(
+                    f"{get_current_time_string(True)}: {tc_info_string}"
+                )
+                # with open("tc.bin", "wb") as of:
+                #    of.write(raw_tc)
+                send_params.com_if.send(raw_tc)
+            elif entry_helper.entry_type == TcQueueEntryType.CCSDS_TC:
+                cfdp_packet_in_ccsds = entry_helper.to_space_packet_entry()
+                send_params.com_if.send(cfdp_packet_in_ccsds.space_packet.pack())
+                # TODO: Log raw CFDP packets similarly to how PUS packets are logged.
+                #        - Log full raw format including space packet wrapper
+                #        - Log context information: Transaction ID, and PDU type and directive
+                # Could re-use file logger. Should probably do that
+                # print(f"sending packet: [{cfdp_packet_in_ccsds.space_packet.pack()}]")
+                # with open(f"cfdp_packet_{self.cfdp_counter}", "wb") as of:
+                # of.write(cfdp_packet_in_ccsds.space_packet.pack())
+                # self.cfdp_counter += 1
+        elif entry_helper.entry_type == TcQueueEntryType.LOG:
+            log_entry = entry_helper.to_log_entry()
+            _LOGGER.info(log_entry.log_str)
+            self.high_level_file_logger.info(log_entry.log_str)
+
+    def handle_cfdp_procedure(self, info: ProcedureWrapper):
+        cfdp_procedure = info.to_cfdp_procedure()
+        if cfdp_procedure.cfdp_request_type == CfdpRequestType.PUT:
+            if (
+                not self.cfdp_in_ccsds_handler.put_request_pending()
+                and not self.cfdp_handler_started
+            ):
+                put_req_cfg_wrapper = cfdp_procedure.request_wrapper.to_put_request()
+                if put_req_cfg_wrapper.cfg.proxy_op:
+                    self.proxy_op = True
+                put_req = generic_cfdp_params_to_put_request(
+                    params=put_req_cfg_wrapper.cfg,
+                    local_id=CFDP_LOCAL_ENTITY_ID,
+                    remote_id=CFDP_REMOTE_ENTITY_ID,
+                    dest_id_proxy_put_req=CFDP_LOCAL_ENTITY_ID,
+                )
+                _LOGGER.info(
+                    f"CFDP: Starting file put request with parameters:\n{put_req}"
+                )
+                self.cfdp_in_ccsds_handler.cfdp_handler.put_request(put_req)
+                self.cfdp_handler_started = True
+
+                for source_pair, dest_pair in self.cfdp_in_ccsds_handler:
+                    pdu, sp = source_pair
+                    pdu = cast(PduHolder, pdu)
+                    if pdu.is_file_directive:
+                        if pdu.pdu_directive_type == DirectiveType.METADATA_PDU:
+                            metadata = pdu.to_metadata_pdu()
+                            self.queue_helper.add_log_cmd(
+                                "CFDP Source: Sending Metadata PDU for file with size "
+                                f"{metadata.file_size}"
+                            )
+                        elif pdu.pdu_directive_type == DirectiveType.EOF_PDU:
+                            self.queue_helper.add_log_cmd(
+                                "CFDP Source: Sending EOF PDU"
+                            )
+                    else:
+                        fd_pdu = pdu.to_file_data_pdu()
+                        self.queue_helper.add_log_cmd(
+                            "CFDP Source: Sending File Data PDU for segment at offset "
+                            f"{fd_pdu.offset} with length {len(fd_pdu.file_data)}"
+                        )
+                    self.queue_helper.add_ccsds_tc(sp)
+                    self.cfdp_in_ccsds_handler.confirm_source_packet_sent()
+                self.cfdp_in_ccsds_handler.source_handler.state_machine()
+
+    def queue_finished_cb(self, info: ProcedureWrapper):
+        if info is not None:
+            if info.proc_type == TcQueueEntryType.PUS_TC:
+                def_proc = info.to_def_procedure()
+                _LOGGER.info(
+                    f"Finished queue for service {def_proc.service} and op code"
+                    f" {def_proc.op_code}"
+                )
+            elif info.proc_type == TcProcedureType.CFDP:
+                _LOGGER.info("Finished CFDP queue")

eive_tmtc/pus_tm/action_reply_handler.py

@@ -1,16 +1,29 @@
+import logging
 import struct
-from eive_tmtc.config.object_ids import *
-from eive_tmtc.tmtc.acs.imtq import ImtqActionIds
+from eive_tmtc.config.object_ids import (
+    ACU_HANDLER_ID,
+    PDU_1_HANDLER_ID,
+    PDU_2_HANDLER_ID,
+    IMTQ_HANDLER_ID,
+    PLOC_MPSOC_ID,
+    PLOC_SUPV_ID,
+    CORE_CONTROLLER_ID,
+    STAR_TRACKER_ID,
+    P60_DOCK_HANDLER,
+)
+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 SupvActionIds
-from eive_tmtc.pus_tc.devs.star_tracker import StarTrackerActionIds
+from eive_tmtc.tmtc.core import handle_core_ctrl_action_replies
+from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_mpsoc_data_reply
+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.logging import get_console_logger
 from tmtccmd.tm import Service8FsfwTm
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from spacepackets.ccsds.time import CdsShortTimestamp
+from tmtccmd.util import ObjectIdDictT
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
 def handle_action_reply(
@@ -19,10 +32,11 @@ def handle_action_reply(
     """Core Action reply handler
     :return:
     """
-    tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm)
-    printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
+    tm_packet = Service8FsfwTm.unpack(
+        raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty()
+    )
     object_id = obj_id_dict.get(tm_packet.source_object_id_as_bytes)
-    pw = PrintWrapper(printer)
+    pw = PrintWrapper(printer.file_logger)
     custom_data = tm_packet.custom_data
     action_id = tm_packet.action_id
     generic_print_str = printer.generic_action_packet_tm_print(
@@ -30,13 +44,15 @@ def handle_action_reply(
     )
     pw.dlog(generic_print_str)
     if object_id.as_bytes == IMTQ_HANDLER_ID:
-        return handle_imtq_replies(action_id, printer, custom_data)
+        return handle_imtq_replies(action_id, pw, custom_data)
     elif object_id.as_bytes == PLOC_MPSOC_ID:
-        return handle_ploc_replies(action_id, printer, custom_data)
+        return handle_mpsoc_data_reply(action_id, pw, custom_data)
     elif object_id.as_bytes == PLOC_SUPV_ID:
-        return handle_supervisor_replies(action_id, printer, custom_data)
+        return handle_supervisor_replies(action_id, pw, custom_data)
+    elif object_id.as_bytes == CORE_CONTROLLER_ID:
+        return handle_core_ctrl_action_replies(action_id, pw, custom_data)
     elif object_id.as_bytes == STAR_TRACKER_ID:
-        return handle_startracker_replies(action_id, printer, custom_data)
+        return handle_startracker_replies(action_id, pw, custom_data)
     elif object_id.as_bytes in [
         ACU_HANDLER_ID,
         PDU_1_HANDLER_ID,
@@ -49,10 +65,8 @@ def handle_action_reply(
         pw.dlog(f"Raw Data: {tm_packet.custom_data.hex(sep=',')}")
 
 
-def handle_imtq_replies(
-    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
-):
-    if action_id == struct.unpack("!I", ImtqActionIds.get_commanded_dipole)[0]:
+def handle_imtq_replies(action_id: int, pw: PrintWrapper, custom_data: bytearray):
+    if action_id == struct.unpack("!I", ImtqActionId.get_commanded_dipole)[0]:
         header_list = [
             "Commanded X-Dipole",
             "Commanded Y-Dipole",
@@ -60,67 +74,29 @@ def handle_imtq_replies(
         ]
         [x_dipole, y_dipole, z_dipole] = struct.unpack("!HHH", custom_data[0:6])
         content_list = [x_dipole, y_dipole, z_dipole]
-        print(header_list)
-        print(content_list)
-        printer.file_logger.info(header_list)
-        printer.file_logger.info(content_list)
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")
 
 
-def handle_ploc_replies(
-    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
-):
-    if action_id == PlocReplyIds.TM_MEM_READ_RPT:
-        header_list = [
-            "PLOC Memory Address",
-            "PLOC Mem Len",
-            "PLOC Read Memory Data",
-        ]
-        content_list = [
-            "0x" + custom_data[:4].hex(),
-            struct.unpack("!H", custom_data[4:6])[0],
-            "0x" + custom_data[6:10].hex(),
-        ]
-        print(header_list)
-        print(content_list)
-        printer.file_logger.info(header_list)
-        printer.file_logger.info(content_list)
-    elif action_id == PlocReplyIds.TM_CAM_CMD_RPT:
-        header_list = ["Camera reply string", "ACK"]
-        content_list = [
-            custom_data[: len(custom_data) - 1].decode("utf-8"),
-            hex(custom_data[-1]),
-        ]
-        print(header_list)
-        print(content_list)
-        printer.file_logger.info(header_list)
-        printer.file_logger.info(content_list)
-
-
-def handle_supervisor_replies(
-    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
-):
-    if action_id == SupvActionIds.DUMP_MRAM:
+def handle_supervisor_replies(action_id: int, pw: PrintWrapper, custom_data: bytearray):
+    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:
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")
+    elif action_id == SupvActionId.READ_GPIO:
         header_list = ["GPIO state"]
         content_list = [struct.unpack("!H", custom_data[:2])[0]]
-        print(header_list)
-        print(content_list)
-        printer.file_logger.info(header_list)
-        printer.file_logger.info(content_list)
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")
 
 
 def handle_startracker_replies(
-    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+    action_id: int, pw: PrintWrapper, 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
@@ -128,7 +104,5 @@ def handle_startracker_replies(
         print(custom_data[4])
         checksum_valid_flag = custom_data[4] >> 8
         content_list = ["0x" + custom_data[:4].hex(), checksum_valid_flag]
-        print(header_list)
-        print(content_list)
-        printer.file_logger.info(header_list)
-        printer.file_logger.info(content_list)
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")

eive_tmtc/pus_tm/defs.py

@@ -1,13 +1,27 @@
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+import logging
+from typing import Optional
+
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
 
 class PrintWrapper:
-    def __init__(self, printer: FsfwTmTcPrinter):
-        self.printer = printer
+    def __init__(self, file_logger: Optional[logging.Logger]):
+        self.file_logger = file_logger
 
     def dlog(self, string: str):
         print(string)
-        self.printer.file_logger.info(string)
+        if self.file_logger:
+            self.file_logger.info(string)
+
+    def wlog(self, logger: logging.Logger, string: str):
+        logger.warning(string)
+        if self.file_logger:
+            self.file_logger.warning(string)
+
+    def ilog(self, logger: logging.Logger, string: str):
+        logger.info(string)
+        if self.file_logger:
+            self.file_logger.info(string)
 
 
 def log_to_both(printer: FsfwTmTcPrinter, string: str):

eive_tmtc/pus_tm/devs/bpx_bat.py

@@ -1,68 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-
-
-HEADER_LIST = [
-    "Charge Current",
-    "Discharge Current",
-    "Heater Current",
-    "Battery Voltage",
-    "Batt Temp 1",
-    "Batt Temp 2",
-    "Batt Temp 3",
-    "Batt Temp 4",
-    "Reboot Counter",
-    "Boot Cause",
-]
-
-
-def handle_bpx_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
-    pw = PrintWrapper(printer)
-    if set_id == BpxSetIds.GET_HK_SET:
-        fmt_str = "!HHHHhhhhIB"
-        inc_len = struct.calcsize(fmt_str)
-        (
-            charge_current,
-            discharge_current,
-            heater_current,
-            batt_voltage,
-            batt_temp_1,
-            batt_temp_2,
-            batt_temp_3,
-            batt_temp_4,
-            reboot_cntr,
-            boot_cause,
-        ) = struct.unpack(fmt_str, hk_data[0:inc_len])
-        content_list = [
-            charge_current,
-            discharge_current,
-            heater_current,
-            batt_voltage,
-            batt_temp_1,
-            batt_temp_2,
-            batt_temp_3,
-            batt_temp_4,
-            reboot_cntr,
-            boot_cause,
-        ]
-        validity_buffer = hk_data[inc_len:]
-        pw.dlog(str(HEADER_LIST))
-        pw.dlog(str(content_list))
-        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
-    elif set_id == BpxSetIds.GET_CFG_SET:
-        battheat_mode = hk_data[0]
-        battheat_low = struct.unpack("!b", hk_data[1:2])[0]
-        battheat_high = struct.unpack("!b", hk_data[2:3])[0]
-        header_list = [
-            "Battery Heater Mode",
-            "Battery Heater Low Limit",
-            "Battery Heater High Limit",
-        ]
-        content_list = [battheat_mode, battheat_low, battheat_high]
-        validity_buffer = hk_data[3:]
-        pw.dlog(str(header_list))
-        pw.dlog(str(content_list))
-        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)

eive_tmtc/pus_tm/devs/gps.py

@@ -1,39 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-
-
-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/pus_tm/devs/gyros.py

@@ -1,75 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.util import ObjectIdU32
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-
-from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetIds, AdisGyroSetIds
-import eive_tmtc.config.object_ids as obj_ids
-
-
-def handle_gyros_hk_data(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    if object_id.as_bytes in [
-        obj_ids.GYRO_0_ADIS_HANDLER_ID,
-        obj_ids.GYRO_2_ADIS_HANDLER_ID,
-    ]:
-        handle_adis_gyro_hk(
-            object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
-        )
-    elif object_id.as_bytes in [
-        obj_ids.GYRO_1_L3G_HANDLER_ID,
-        obj_ids.GYRO_3_L3G_HANDLER_ID,
-    ]:
-        handle_l3g_gyro_hk(
-            object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
-        )
-
-
-def handle_adis_gyro_hk(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    if set_id == AdisGyroSetIds.CORE_HK:
-        pw = PrintWrapper(printer)
-        fmt_str = "!ddddddf"
-        inc_len = struct.calcsize(fmt_str)
-        (angVelocX, angVelocY, angVelocZ, accelX, accelY, accelZ, temp) = struct.unpack(
-            fmt_str, hk_data[0 : 0 + inc_len]
-        )
-        pw.dlog(f"Received ADIS1650X Gyro HK data from object {object_id}")
-        pw.dlog(
-            f"Angular Velocities (degrees per second): X {angVelocX} | "
-            f"Y {angVelocY} | Z {angVelocZ}"
-        )
-        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:
-        pw = PrintWrapper(printer)
-        fmt_str = "!HBHH"
-        inc_len = struct.calcsize(fmt_str)
-        (diag_stat_reg, filter_setting, msc_ctrl_reg, dec_rate_reg) = struct.unpack(
-            fmt_str, hk_data[0 : 0 + inc_len]
-        )
-        pw.dlog(f"Diagnostic Status Register {diag_stat_reg:#018b}")
-        pw.dlog(f"Filter Settings {filter_setting:#010b}")
-        pw.dlog(f"Miscellaneous Control Register {msc_ctrl_reg:#018b}")
-        pw.dlog(f"Decimation Rate {dec_rate_reg:#06x}")
-
-
-def handle_l3g_gyro_hk(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    if set_id == L3gGyroSetIds.CORE_HK:
-        pw = PrintWrapper(printer)
-        fmt_str = "!ffff"
-        inc_len = struct.calcsize(fmt_str)
-        (angVelocX, angVelocY, angVelocZ, temp) = struct.unpack(
-            fmt_str, hk_data[0 : 0 + inc_len]
-        )
-        pw.dlog(f"Received L3GD20H Gyro HK data from object {object_id}")
-        pw.dlog(
-            f"Angular Velocities (degrees per second): X {angVelocX} | "
-            f"Y {angVelocY} | Z {angVelocZ}"
-        )
-        pw.dlog(f"Temperature {temp} °C")

eive_tmtc/pus_tm/devs/mgms.py

@@ -1,54 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds
-from tmtccmd.util import ObjectIdU32
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-import eive_tmtc.config.object_ids as obj_ids
-
-
-def handle_mgm_hk_data(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    if object_id.as_bytes in [
-        obj_ids.MGM_0_LIS3_HANDLER_ID,
-        obj_ids.MGM_2_LIS3_HANDLER_ID,
-    ]:
-        handle_mgm_lis3_hk_data(object_id, printer, set_id, hk_data)
-    elif object_id.as_bytes in [
-        obj_ids.MGM_1_RM3100_HANDLER_ID,
-        obj_ids.MGM_3_RM3100_HANDLER_ID,
-    ]:
-        handle_mgm_rm3100_hk_data(object_id, printer, set_id, hk_data)
-    pass
-
-
-def handle_mgm_lis3_hk_data(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    if set_id == MgmLis3SetIds.CORE_HK:
-        pw = PrintWrapper(printer)
-        fmt_str = "!ffff"
-        inc_len = struct.calcsize(fmt_str)
-        (field_x, field_y, field_z, temp) = struct.unpack(
-            fmt_str, hk_data[0 : 0 + inc_len]
-        )
-        pw.dlog(f"Received MGM LIS3 from object {object_id}")
-        pw.dlog(
-            f"Field strengths in micro Tesla X {field_x} | Y {field_y} | Z {field_z}"
-        )
-        pw.dlog(f"Temperature {temp} C")
-
-
-def handle_mgm_rm3100_hk_data(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    if set_id == MgmRm3100SetIds.CORE_HK:
-        pw = PrintWrapper(printer)
-        fmt_str = f"!fff"
-        inc_len = struct.calcsize(fmt_str)
-        (field_x, field_y, field_z) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
-        pw.dlog(f"Received MGM LIS3 from object {object_id}")
-        pw.dlog(
-            f"Field strengths in micro Tesla X {field_x} | Y {field_y} | Z {field_z}"
-        )

eive_tmtc/pus_tm/devs/plpcdu.py

@@ -1,52 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from eive_tmtc.pus_tc.devs.plpcdu import SetIds
-
-
-ADC_CHANNELS_NAMED = [
-    "U BAT DIV 6",
-    "U NEG V FB",
-    "I HPA",
-    "U HPA DIV 6",
-    "I MPA",
-    "U MPA DIV 6",
-    "I TX",
-    "U TX DIV 6",
-    "I X8",
-    "U X8 DIV 6",
-    "I DRO",
-    "U DRO DIV 6",
-]
-
-
-def handle_plpcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
-    if set_id == SetIds.ADC:
-        pw = PrintWrapper(printer)
-        current_idx = 0
-        pw.dlog("Received PL PCDU ADC HK data")
-        channels = []
-        ch_print = "Channels Raw (hex): ["
-        for i in range(12):
-            channels.append(
-                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
-            )
-            if i < 11:
-                ch_print += f"{channels[i]:06x},"
-            else:
-                ch_print += f"{channels[i]:06x}]"
-            current_idx += 2
-        processed_vals = []
-        for i in range(12):
-            processed_vals.append(
-                struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
-            )
-            current_idx += 4
-        temp = struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
-        current_idx += 4
-        pw.dlog(f"Temperature: {temp} C")
-        pw.dlog(ch_print)
-        for i in range(12):
-            pw.dlog(f"{ADC_CHANNELS_NAMED[i].ljust(24)} | {processed_vals[i]}")
-        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=3)

eive_tmtc/pus_tm/devs/rad_sensor.py

@@ -1,24 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from eive_tmtc.pus_tc.devs.rad_sensor import SetIds
-
-
-def handle_rad_sensor_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
-    if set_id == SetIds.HK:
-        pw = PrintWrapper(printer)
-        current_idx = 0
-        pw.dlog("Received Radiation Sensor HK data")
-        fmt_str = "!fHHHHHH"
-        inc_len = struct.calcsize(fmt_str)
-        (temp, ain0, ain1, ain4, ain5, ain6, ain7) = struct.unpack(
-            fmt_str, hk_data[current_idx : current_idx + inc_len]
-        )
-        ain_dict = {0: ain0, 1: ain1, 4: ain4, 5: ain5, 6: ain6, 7: ain7}
-        pw.dlog(f"Temperature: {temp} C")
-        pw.dlog(f"AIN Channel | Raw Value (hex) | Raw Value (dec)")
-        for idx, val in ain_dict.items():
-            pw.dlog(f"{idx} | {val:#06x} | {str(val).ljust(5)}")
-        current_idx += inc_len
-        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=7)

eive_tmtc/pus_tm/devs/syrlinks.py

@@ -1,67 +0,0 @@
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetIds
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-
-
-def handle_syrlinks_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
-    if set_id == SetIds.RX_REGISTERS_DATASET:
-        return handle_syrlinks_rx_registers_dataset(printer, hk_data)
-    elif set_id == SetIds.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])
-    rx_frequency_shift = struct.unpack("!I", hk_data[5:9])
-    rx_iq_power = struct.unpack("!H", hk_data[9:11])
-    rx_agc_value = struct.unpack("!H", hk_data[11:13])
-    rx_demod_eb = struct.unpack("!I", hk_data[13:17])
-    rx_demod_n0 = struct.unpack("!I", hk_data[17:21])
-    rx_data_rate = hk_data[21]
-    content_list = [
-        rx_status,
-        rx_sensitivity,
-        rx_frequency_shift,
-        rx_iq_power,
-        rx_agc_value,
-        rx_demod_eb,
-        rx_demod_n0,
-        rx_data_rate,
-    ]
-    validity_buffer = hk_data[22:]
-    pw.dlog(str(header_list))
-    pw.dlog(str(content_list))
-    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])
-    content_list = [tx_status, tx_waveform, tx_agc_value]
-    validity_buffer = hk_data[4:]
-    pw.dlog(str(header_list))
-    pw.dlog(str(content_list))
-    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=3)

eive_tmtc/pus_tm/event_handler.py

@@ -1,87 +1,162 @@
-from datetime import datetime
+import logging
+import datetime
+import sys
 
 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.acs_subsystem import AcsModes
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from eive_tmtc.tmtc.acs.subsystem import AcsMode
+from eive_tmtc.tmtc.core import SdState, SdCardSelect
+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.logging import get_console_logger
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.fsfw import EventInfo
+from spacepackets.ccsds.time import CdsShortTimestamp
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
-def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
-    pw = PrintWrapper(printer)
-    tm = Service5Tm.unpack(raw_telemetry=raw_tm)
+def handle_event_packet(  # noqa C901: Complexity okay here
+    raw_tm: bytes, pw: PrintWrapper
+):  # noqa C901: Complexity okay here
+    tm = Service5Tm.unpack(data=raw_tm, time_reader=CdsShortTimestamp.empty())
     event_dict = get_event_dict()
-    info = event_dict.get(tm.event_id)
+    event_def = tm.event_definition
+    info = event_dict.get(event_def.event_id)
     if info is None:
-        LOGGER.warning(f"Event ID {tm.event_id} has no information")
+        _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(tm.reporter_id.as_bytes)
+    obj_id_obj = obj_ids.get(event_def.reporter_id)
     if obj_id_obj is None:
-        LOGGER.warning(f"Object ID 0x{tm.reporter_id.as_hex_string} has no name")
-        obj_name = tm.reporter_id.as_hex_string
+        _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 {tm.event_id} | {info.name}"
+        f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x})"
+        f" at {tm.time_provider.as_date_time()}"
     )
-    pw.printer.file_logger.info(
-        f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
+    _LOGGER.info(generic_event_string)
+    pw.file_logger.info(
+        f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}:"
+        f" {generic_event_string}"
     )
-    LOGGER.info(generic_event_string)
-    specific_handler = True
+    specific_handler = False
     if info.name == "MODE_TRANSITION_FAILED":
-        reason = generic_retval_printout(tm.param_1)
+        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: {tm.param_2:#08x}")
+            pw.dlog(f"Mode, sequence or table: {event_def.param2:#08x}")
+        specific_handler = True
     if info.name == "SUPV_UPDATE_PROGRESS" or info.name == "WRITE_MEMORY_FAILED":
         additional_event_info = f"Additional info: {info.info}"
         context = (
-            f"Progress Percent: {tm.param_1 >> 24 & 0xff} | Sequence Count: {tm.param_1 & 0xffff} "
-            f"| Bytes Written: {tm.param_2}"
+            f"Progress Percent: {event_def.param1 >> 24 & 0xff} | Sequence Count:"
+            f" {event_def.param1 & 0xffff} | Bytes Written: {event_def.param2}"
         )
         pw.dlog(additional_event_info)
         pw.dlog(context)
+        specific_handler = True
     if info.name == "MODE_INFO":
+        specific_handler = True
         mode_name = "Unknown"
         if obj_name == "ACS_SUBSYSTEM":
-            if tm.param_1 == Modes.OFF:
-                mode_name = "Off"
-            elif tm.param_1 == AcsModes.IDLE:
-                mode_name = "Idle"
-            elif tm.param_1 == AcsModes.DETUMBLE:
-                mode_name = "Detumble"
-            elif tm.param_1 == AcsModes.SAFE:
-                mode_name = "Safe"
-            elif tm.param_1 == AcsModes.TARGET_PT:
-                mode_name = "Target Pointing"
+            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 tm.param_1 == Modes.OFF:
+            if event_def.param1 == Mode.OFF:
                 mode_name = "Off"
-            elif tm.param_1 == Modes.ON:
+            elif event_def.param1 == Mode.ON:
                 mode_name = "On"
-            elif tm.param_1 == Modes.NORMAL:
+            elif event_def.param1 == Mode.NORMAL:
                 mode_name = "Normal"
-            elif tm.param_1 == Modes.RAW:
+            elif event_def.param1 == Mode.RAW:
                 mode_name = "Raw"
-        pw.dlog(f"Mode Number {tm.param_1}, Mode Name {mode_name}")
-        pw.dlog(f"Submode: {tm.param_2}")
-    else:
-        specific_handler = False
-        if info.info != "":
-            additional_event_info = (
-                f"Additional info: {info.info} | P1: {tm.param_1} | P2: {tm.param_2}"
+            pw.dlog(
+                f"Mode Number {event_def.param1}, Mode Name {mode_name}, "
+                f"Submode: {event_def.param2}"
             )
-            pw.dlog(additional_event_info)
+    if info.name == "INDIVIDUAL_BOOT_COUNTS":
+        boot_count_00 = (event_def.param1 >> 16) & 0xFFFF
+        boot_count_01 = event_def.param1 & 0xFFFF
+        boot_count_10 = (event_def.param2 >> 16) & 0xFFFF
+        boot_count_11 = event_def.param2 & 0xFFFF
+        pw.dlog(f"Boot count 0 0: {boot_count_00}")
+        pw.dlog(f"Boot count 0 1: {boot_count_01}")
+        pw.dlog(f"Boot count 1 0: {boot_count_10}")
+        pw.dlog(f"Boot count 1 1: {boot_count_11}")
+    if info.name == "REBOOT_COUNTER":
+        boot_count = (event_def.param1 << 32) | event_def.param2
+        pw.dlog(f"Total boot count: {boot_count}")
+    if info.name == "VERSION_INFO" or info.name == "FIRMWARE_INFO":
+        specific_handler = True
+        ver_major = (event_def.param1 >> 24) & 0xFF
+        ver_minor = (event_def.param1 >> 16) & 0xFF
+        ver_rev = (event_def.param1 >> 8) & 0xFF
+        has_git_sha = bool(event_def.param1 & 0xFF)
+        git_sha = ""
+        if has_git_sha:
+            p2_as_bytes = event_def.param2.to_bytes(4, sys.byteorder)
+            git_sha = p2_as_bytes.decode("ascii")
+        if info.name == "VERSION_INFO":
+            name = "OBSW version: "
+        else:
+            name = "Firmware version: "
+        pw.dlog(f"{name} v{ver_major}.{ver_minor}.{ver_rev}")
+        if has_git_sha:
+            pw.dlog(f"Git SHA first four letters: {git_sha}")
+    if info.name == "CLOCK_SET":
+        specific_handler = True
+        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}")
+    if info.name == "CLOCK_DUMP":
+        specific_handler = True
+        # 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}")
+    if info.name == "ACTIVE_SD_INFO":
+        sd_0_state = (event_def.param2 >> 16) & 0xFFFF
+        sd_1_state = event_def.param2 & 0xFFFF
+        active_sd = event_def.param1
+        try:
+            active_sd = SdCardSelect(event_def.param1)
+            sd_0_state = SdState((event_def.param2 >> 16) & 0xFFFF)
+            sd_1_state = SdState(event_def.param2 & 0xFFFF)
+        except IndexError:
+            _LOGGER.error(f"Received invalid event fields for event {event_def}")
+        finally:
+            pw.dlog(
+                f"Active SD card {active_sd!r} | SD 0 State {sd_0_state!r} | SD 1 "
+                f"State {sd_1_state!r}"
+            )
+    if info.name == "HEALTH_INFO":
+        specific_handler = True
+        health = FsfwHealth(event_def.param1)
+        pw.dlog(f"{obj_name}: {health!r}")
+    if info.name == "CHANGING_MODE":
+        mode = event_def.param1
+        submode = event_def.param2
+        pw.dlog(f"Mode Number {mode}, Submode: {submode}")
     if not specific_handler:
-        printer.handle_long_tm_print(packet_if=tm, info_if=tm)
+        additional_event_info = (
+            f"Additional info: {info.info} | P1: {event_def.param1} | "
+            f"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

@@ -1,77 +0,0 @@
-"""Core EIVE TM handler module
-"""
-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 tmtccmd import get_console_logger
-from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
-from tmtccmd.pus import VerificationWrapper
-from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm
-from tmtccmd.tm.pus_200_fsfw_modes import Subservices as ModeSubservices
-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 = get_console_logger()
-
-
-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)
-    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(raw_telemetry=packet)
-        if tm_packet.subservice == 2:
-            verif_wrapper.dlog("Received Ping Reply TM[17,2]")
-        dedicated_handler = True
-    elif service == 20:
-        tm_packet = Service20FsfwTm.unpack(raw_telemetry=packet)
-        dedicated_handler = False
-    elif service == 200:
-        tm_packet = Service200FsfwTm.unpack(raw_telemetry=packet)
-        if tm_packet.subservice == ModeSubservices.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_handler.py

@@ -0,0 +1,192 @@
+"""HK Handling for EIVE OBSW"""
+import logging
+
+from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_hk_data
+from eive_tmtc.tmtc.internal_err_reporter import handle_ier_hk_data
+from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_ploc_mpsoc_hk_data
+from eive_tmtc.tmtc.tcs.rtd import RTD_NAMES, handle_rtd_hk
+from eive_tmtc.tmtc.acs.star_tracker import handle_str_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 eive_tmtc.tmtc.tcs.tmp1075 import handle_tmp_1075_hk_data
+from spacepackets.ecss import PusTelemetry
+from tmtccmd.tm.pus_3_fsfw_hk import (
+    Service3Base,
+    HkContentType,
+    Service3FsfwTm,
+)
+from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT
+
+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,
+    handle_pcdu_hk,
+)
+from eive_tmtc.tmtc.acs.imtq import (
+    handle_imtq_hk,
+)
+from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter, PrintWrapper
+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 = logging.getLogger(__name__)
+
+
+FORWARD_SENSOR_TEMPS = False
+
+
+def handle_hk_packet(
+    raw_tm: bytes, obj_id_dict: ObjectIdDictT, printer: FsfwTmTcPrinter, hk_level: int
+):
+    tm_packet = Service3FsfwTm.unpack(raw_telemetry=raw_tm, custom_hk_handling=False)
+    named_obj_id = obj_id_dict.get(tm_packet.object_id.as_bytes)
+    if named_obj_id is None:
+        named_obj_id = tm_packet.object_id
+    if tm_packet.subservice == 25 or tm_packet.subservice == 26:
+        hk_data = tm_packet.tm_data[8:]
+
+        printer.generic_hk_tm_print(
+            content_type=HkContentType.HK,
+            object_id=named_obj_id,
+            set_id=tm_packet.set_id,
+            hk_data=hk_data,
+        )
+
+        try:
+            if hk_level == 1:
+                pass
+            elif hk_level > 1:
+                handle_regular_hk_print(
+                    printer=printer,
+                    object_id=named_obj_id,
+                    hk_packet=tm_packet,
+                    tm=tm_packet.pus_tm,
+                    hk_data=hk_data,
+                )
+        except ValueError as e:
+            _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")
+
+
+def handle_regular_hk_print(  # noqa C901: Complexity okay here
+    printer: FsfwTmTcPrinter,
+    object_id: ObjectIdU32,
+    hk_packet: Service3Base,
+    tm: PusTelemetry,
+    hk_data: bytes,
+):
+    objb = object_id.as_bytes
+    set_id = hk_packet.set_id
+    packet_dt = tm.time_provider.as_date_time()
+    pw = PrintWrapper(printer.file_logger)
+    """This function is called when a Service 3 Housekeeping packet is received."""
+    if objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
+        return handle_rw_hk_data(pw, object_id, set_id, hk_data)
+    elif objb == obj_ids.SYRLINKS_HANDLER_ID:
+        return handle_syrlinks_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.IMTQ_HANDLER_ID:
+        return handle_imtq_hk(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.GPS_CONTROLLER:
+        return handle_gps_data(
+            pw=pw, set_id=set_id, hk_data=hk_data, packet_time=packet_dt
+        )
+    elif objb == obj_ids.PCDU_HANDLER_ID:
+        return handle_pcdu_hk(pw=pw, set_id=set_id, hk_data=hk_data)
+    elif objb == obj_ids.BPX_HANDLER_ID:
+        return handle_bpx_hk_data(hk_data=hk_data, set_id=set_id, pw=pw)
+    elif objb == obj_ids.CORE_CONTROLLER_ID:
+        return handle_core_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.PDU_1_HANDLER_ID:
+        return handle_pdu_data(pw=pw, pdu_idx=1, set_id=set_id, hk_data=hk_data)
+    elif objb == obj_ids.PDU_2_HANDLER_ID:
+        return handle_pdu_data(pw=pw, pdu_idx=2, set_id=set_id, hk_data=hk_data)
+    elif objb == obj_ids.PLOC_MPSOC_ID:
+        return handle_ploc_mpsoc_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.ACU_HANDLER_ID:
+        return handle_acu_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.INTERNAL_ERROR_REPORTER_ID:
+        return handle_ier_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.RAD_SENSOR_ID:
+        return handle_rad_sensor_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
+        return handle_rw_hk_data(
+            pw=pw, object_id=object_id, set_id=set_id, hk_data=hk_data
+        )
+    if objb in [
+        obj_ids.SUS_0_N_LOC_XFYFZM_PT_XF,
+        obj_ids.SUS_1_N_LOC_XBYFZM_PT_XB,
+        obj_ids.SUS_2_N_LOC_XFYBZB_PT_YB,
+        obj_ids.SUS_3_N_LOC_XFYBZF_PT_YF,
+        obj_ids.SUS_4_N_LOC_XMYFZF_PT_ZF,
+        obj_ids.SUS_5_N_LOC_XFYMZB_PT_ZB,
+        obj_ids.SUS_6_R_LOC_XFYBZM_PT_XF,
+        obj_ids.SUS_7_R_LOC_XBYBZM_PT_XB,
+        obj_ids.SUS_8_R_LOC_XBYBZB_PT_YB,
+        obj_ids.SUS_9_R_LOC_XBYBZB_PT_YF,
+        obj_ids.SUS_10_R_LOC_XMYBZF_PT_ZF,
+        obj_ids.SUS_11_R_LOC_XBYMZB_PT_ZB,
+    ]:
+        return handle_sus_hk(object_id=object_id, hk_data=hk_data, pw=pw, set_id=set_id)
+    elif objb in RTD_NAMES.keys():
+        return handle_rtd_hk(object_id=objb, hk_data=hk_data, pw=pw)
+    elif objb == obj_ids.P60_DOCK_HANDLER:
+        return handle_p60_hk_data(pw=pw, set_id=set_id, hk_data=hk_data)
+    elif objb in [
+        obj_ids.GYRO_0_ADIS_HANDLER_ID,
+        obj_ids.GYRO_1_L3G_HANDLER_ID,
+        obj_ids.GYRO_2_ADIS_HANDLER_ID,
+        obj_ids.GYRO_3_L3G_HANDLER_ID,
+    ]:
+        return handle_gyros_hk_data(
+            object_id=object_id, hk_data=hk_data, pw=pw, set_id=set_id
+        )
+    elif objb in [
+        obj_ids.MGM_0_LIS3_HANDLER_ID,
+        obj_ids.MGM_1_RM3100_HANDLER_ID,
+        obj_ids.MGM_2_LIS3_HANDLER_ID,
+        obj_ids.MGM_3_RM3100_HANDLER_ID,
+    ]:
+        return handle_mgm_hk_data(
+            object_id=object_id, hk_data=hk_data, pw=pw, set_id=set_id
+        )
+    elif objb == obj_ids.PL_PCDU_ID:
+        return handle_plpcdu_hk(set_id=set_id, hk_data=hk_data, pw=pw)
+    elif objb == obj_ids.THERMAL_CONTROLLER_ID:
+        return handle_thermal_controller_hk_data(
+            object_id=object_id, pw=pw, set_id=set_id, hk_data=hk_data
+        )
+    elif objb == obj_ids.STAR_TRACKER_ID:
+        return handle_str_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
+    elif objb == obj_ids.PLOC_SUPV_ID:
+        return handle_supv_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
+    elif objb in [
+        obj_ids.TMP1075_HANDLER_TCS_BRD_0_ID,
+        obj_ids.TMP1075_HANDLER_TCS_BRD_1_ID,
+        obj_ids.TMP1075_HANDLER_IF_BRD_ID,
+        obj_ids.TMP1075_HANDLER_PLPCDU_0_ID,
+        obj_ids.TMP1075_HANDLER_PLPCDU_1_ID,
+    ]:
+        return handle_tmp_1075_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
+    elif objb == obj_ids.ACS_CONTROLLER:
+        return handle_acs_ctrl_hk_data(
+            pw=pw, set_id=set_id, hk_data=hk_data, packet_time=packet_dt
+        )
+    else:
+        _LOGGER.info(
+            f"Service 3 TM: Parsing for object {object_id} and set ID {set_id} "
+            "has not been implemented."
+        )

eive_tmtc/pus_tm/hk_handling.py

@@ -1,183 +0,0 @@
-"""HK Handling for EIVE OBSW"""
-# from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
-from eive_tmtc.tmtc.acs.acs_ctrl import handle_raw_mgm_data, handle_acs_ctrl_hk_data
-from eive_tmtc.pus_tm.devs.plpcdu import handle_plpcdu_hk
-from eive_tmtc.pus_tm.devs.rad_sensor import handle_rad_sensor_data
-from eive_tmtc.pus_tm.devs.sus import handle_sus_hk
-from eive_tmtc.pus_tm.system.tcs import handle_thermal_controller_hk_data
-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 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 eive_tmtc.pus_tm.devs.bpx_bat import handle_bpx_hk_data
-from eive_tmtc.pus_tm.devs.gps import handle_gps_data
-from eive_tmtc.pus_tm.devs.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.pus_tm.devs.syrlinks import handle_syrlinks_hk_data
-from eive_tmtc.tmtc.acs.imtq import (
-    ImtqSetIds,
-    handle_self_test_data,
-    handle_eng_set,
-    handle_calibrated_mtm_measurement,
-    handle_raw_mtm_measurement,
-)
-from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter
-from eive_tmtc.tmtc.core import handle_core_hk_data
-from eive_tmtc.pus_tm.devs.mgms import handle_mgm_hk_data
-import eive_tmtc.config.object_ids as obj_ids
-
-
-LOGGER = get_console_logger()
-
-
-FORWARD_SENSOR_TEMPS = False
-
-
-def handle_hk_packet(
-    raw_tm: bytes,
-    obj_id_dict: ObjectIdDictT,
-    printer: FsfwTmTcPrinter,
-):
-    tm_packet = Service3FsfwTm.unpack(raw_telemetry=raw_tm, custom_hk_handling=False)
-    named_obj_id = obj_id_dict.get(tm_packet.object_id.as_bytes)
-    if named_obj_id is None:
-        named_obj_id = tm_packet.object_id
-    if tm_packet.subservice == 25 or tm_packet.subservice == 26:
-        hk_data = tm_packet.tm_data[8:]
-        if FORWARD_SENSOR_TEMPS:
-            # TODO: Maybe use singleton?
-            # TCP_SEVER_SENSOR_TEMPERATURES.report_raw_hk_data(
-            #     object_id=named_obj_id, set_id=tm_packet.set_id, hk_data=hk_data
-            # )
-            pass
-        printer.generic_hk_tm_print(
-            content_type=HkContentType.HK,
-            object_id=named_obj_id,
-            set_id=tm_packet.set_id,
-            hk_data=hk_data,
-        )
-        try:
-            handle_regular_hk_print(
-                printer=printer,
-                object_id=named_obj_id,
-                hk_packet=tm_packet,
-                hk_data=hk_data,
-            )
-        except ValueError as e:
-            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")
-
-
-def handle_regular_hk_print(
-    printer: FsfwTmTcPrinter,
-    object_id: ObjectIdU32,
-    hk_packet: Service3Base,
-    hk_data: bytes,
-):
-    objb = object_id.as_bytes
-    set_id = hk_packet.set_id
-    """This function is called when a Service 3 Housekeeping packet is received."""
-    if objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
-        handle_rw_hk_data(printer, object_id, set_id, hk_data)
-    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
-        ):
-            return handle_self_test_data(printer, hk_data)
-        elif set_id == ImtqSetIds.ENG_HK_SET:
-            return handle_eng_set(printer, hk_data)
-        elif set_id == ImtqSetIds.CAL_MTM_SET:
-            return handle_calibrated_mtm_measurement(printer, hk_data)
-        elif set_id == ImtqSetIds.RAW_MTM_SET:
-            return handle_raw_mtm_measurement(printer, hk_data)
-        else:
-            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:
-        handle_bpx_hk_data(hk_data=hk_data, set_id=set_id, printer=printer)
-    elif objb == obj_ids.CORE_CONTROLLER_ID:
-        return handle_core_hk_data(printer=printer, hk_data=hk_data, set_id=set_id)
-    elif objb == obj_ids.PDU_1_HANDLER_ID:
-        return handle_pdu_data(
-            printer=printer, pdu_idx=1, set_id=set_id, hk_data=hk_data
-        )
-    elif objb == obj_ids.PDU_2_HANDLER_ID:
-        return handle_pdu_data(
-            printer=printer, pdu_idx=2, set_id=set_id, hk_data=hk_data
-        )
-    elif objb == obj_ids.ACU_HANDLER_ID:
-        return handle_acu_hk_data(printer=printer, hk_data=hk_data, set_id=set_id)
-    elif objb == obj_ids.RAD_SENSOR_ID:
-        return handle_rad_sensor_data(printer=printer, hk_data=hk_data, set_id=set_id)
-    elif objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
-        return handle_rw_hk_data(
-            printer=printer, object_id=object_id, set_id=set_id, hk_data=hk_data
-        )
-    if objb in [
-        obj_ids.SUS_0_N_LOC_XFYFZM_PT_XF,
-        obj_ids.SUS_1_N_LOC_XBYFZM_PT_XB,
-        obj_ids.SUS_2_N_LOC_XFYBZB_PT_YB,
-        obj_ids.SUS_3_N_LOC_XFYBZF_PT_YF,
-        obj_ids.SUS_4_N_LOC_XMYFZF_PT_ZF,
-        obj_ids.SUS_5_N_LOC_XFYMZB_PT_ZB,
-        obj_ids.SUS_6_R_LOC_XFYBZM_PT_XF,
-        obj_ids.SUS_7_R_LOC_XBYBZM_PT_XB,
-        obj_ids.SUS_8_R_LOC_XBYBZB_PT_YB,
-        obj_ids.SUS_9_R_LOC_XBYBZB_PT_YF,
-        obj_ids.SUS_10_R_LOC_XMYBZF_PT_ZF,
-        obj_ids.SUS_11_R_LOC_XBYMZB_PT_ZB,
-    ]:
-        handle_sus_hk(
-            object_id=object_id, hk_data=hk_data, printer=printer, set_id=set_id
-        )
-    elif objb == obj_ids.P60_DOCK_HANDLER:
-        handle_p60_hk_data(printer=printer, set_id=set_id, hk_data=hk_data)
-    elif objb in [
-        obj_ids.GYRO_0_ADIS_HANDLER_ID,
-        obj_ids.GYRO_1_L3G_HANDLER_ID,
-        obj_ids.GYRO_2_ADIS_HANDLER_ID,
-        obj_ids.GYRO_3_L3G_HANDLER_ID,
-    ]:
-        handle_gyros_hk_data(
-            object_id=object_id, hk_data=hk_data, printer=printer, set_id=set_id
-        )
-    elif objb in [
-        obj_ids.MGM_0_LIS3_HANDLER_ID,
-        obj_ids.MGM_1_RM3100_HANDLER_ID,
-        obj_ids.MGM_2_LIS3_HANDLER_ID,
-        obj_ids.MGM_3_RM3100_HANDLER_ID,
-    ]:
-        handle_mgm_hk_data(
-            object_id=object_id, hk_data=hk_data, printer=printer, set_id=set_id
-        )
-    elif objb == obj_ids.PL_PCDU_ID:
-        handle_plpcdu_hk(set_id=set_id, hk_data=hk_data, printer=printer)
-    elif objb == obj_ids.THERMAL_CONTROLLER_ID:
-        handle_thermal_controller_hk_data(
-            object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
-        )
-    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_hk_data(printer, set_id, hk_data)
-    else:
-        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/pus_demux.py

@@ -0,0 +1,120 @@
+"""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.fsfw.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_handler import handle_hk_packet
+from .action_reply_handler import handle_action_reply
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def pus_factory_hook(  # noqa C901 : Complexity okay here
+    packet: bytes,
+    verif_wrapper: VerificationWrapper,
+    printer: FsfwTmTcPrinter,
+    raw_logger: RawTmtcTimedLogWrapper,
+    hk_level: int,
+):
+    if len(packet) < 8:
+        _LOGGER.warning("Detected packet shorter than 8 bytes!")
+        return
+    try:
+        tm_packet = PusTelemetry.unpack(packet, CdsShortTimestamp.empty())
+        # _LOGGER.info(f"Sequence count: {tm_packet.seq_count}")
+    except ValueError as value_error:
+        _LOGGER.warning(f"{value_error}")
+        _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.file_logger)
+    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, hk_level=hk_level
+        )
+    elif service == 5:
+        handle_event_packet(raw_tm=packet, pw=pw)
+    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(f"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(
+                        "Received vector or matrix data:"
+                        f" {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/system/tcs.py

@@ -1,123 +0,0 @@
-import enum
-import pprint
-import struct
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.util import ObjectIdU32
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-
-
-class SetIds(enum.IntEnum):
-    SENSOR_TEMPERATURE_SET = 0
-    DEVICE_TEMPERATURE_SET = 1
-    SUS_TEMPERATURE_SET = 2
-
-
-def handle_thermal_controller_hk_data(
-    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
-):
-    # need a better solutuon for this is this is used again..
-    """
-    if TCP_TEMP_SENS_SERVER is None:
-        TCP_TEMP_SENS_SERVER = TmTcpServer("localhost", 7305)
-    if TCP_TEMP_DEV_SERVER:
-        TCP_TEMP_DEV_SERVER = TmTcpServer("localhost", 7306)
-    """
-    if set_id == SetIds.SENSOR_TEMPERATURE_SET:
-        pw = PrintWrapper(printer)
-        pw.dlog("Received sensor temperature data")
-
-        # get all the floats
-        tm_data = struct.unpack("!fffffffffffffffffffff", hk_data[: 21 * 4])
-        parsed_data = {
-            "SENSOR_PLOC_HEATSPREADER": tm_data[0],
-            "SENSOR_PLOC_MISSIONBOARD": tm_data[1],
-            "SENSOR_4K_CAMERA": tm_data[2],
-            "SENSOR_DAC_HEATSPREADER": tm_data[3],
-            "SENSOR_STARTRACKER": tm_data[4],
-            "SENSOR_RW1": tm_data[5],
-            "SENSOR_DRO": tm_data[6],
-            "SENSOR_SCEX": tm_data[7],
-            "SENSOR_X8": tm_data[8],
-            "SENSOR_HPA": tm_data[9],
-            "SENSOR_TX_MODUL": tm_data[10],
-            "SENSOR_MPA": tm_data[11],
-            "SENSOR_ACU": tm_data[12],
-            "SENSOR_PLPCDU_HEATSPREADER": tm_data[13],
-            "SENSOR_TCS_BOARD": tm_data[14],
-            "SENSOR_MAGNETTORQUER": tm_data[15],
-            "TMP1075 TCS 0": tm_data[16],
-            "TMP1075 TCS 1": tm_data[17],
-            "TMP1075 PL PCDU 0": tm_data[18],
-            "TMP1075 PL PCDU 1": tm_data[19],
-            "TMP1075 IF BOARD": tm_data[20],
-        }
-        printer.file_logger.info(str(parsed_data))
-        pp = pprint.PrettyPrinter(depth=4)
-        pp.pprint(parsed_data)
-        # tcp_server_sensor_temperatures.report_parsed_hk_data(
-        #    object_id, set_id, parsed_data
-        # )
-    elif set_id == SetIds.DEVICE_TEMPERATURE_SET:
-        pw = PrintWrapper(printer)
-        pw.dlog("Received device temperature data")
-        fmt_str = "!fhhhhiiiifffhffffffffffffff"
-        tm_data = struct.unpack(fmt_str, hk_data[:98])
-        parsed_data = {
-            "Q7S_TEMPERATURE": tm_data[0],
-            "BATTERY_TEMPERATURE_1": tm_data[1],
-            "BATTERY_TEMPERATURE_2": tm_data[2],
-            "BATTERY_TEMPERATURE_3": tm_data[3],
-            "BATTERY_TEMPERATURE_4": tm_data[4],
-            "RW_1_TEMPERATURE": tm_data[5],
-            "RW_2_TEMPERATURE": tm_data[6],
-            "RW_3_TEMPERATURE": tm_data[7],
-            "RW_4_TEMPERATURE": tm_data[8],
-            "STARTRACKER_TEMPERATURE": tm_data[9],
-            "SYRLINKS_POWER_AMPLIFIER_TEMPERATURE": tm_data[10],
-            "SYRLINKS_BASEBAND_BOARD_TEMPERATURE": tm_data[11],
-            "MGT_TEMPERATURE": tm_data[12],
-            "ACU_TEMPERATURE_1": tm_data[13],
-            "ACU_TEMPERATURE_2": tm_data[14],
-            "ACU_TEMPERATURE_3": tm_data[15],
-            "PDU1_TEMPERATURE": tm_data[16],
-            "PDU2_TEMPERATURE": tm_data[17],
-            "P60DOCK_TEMPERATURE_1": tm_data[18],
-            "P60DOCK_TEMPERATURE_2": tm_data[19],
-            "GYRO_0_TEMPERATURE": tm_data[20],
-            "GYRO_1_TEMPERATURE": tm_data[21],
-            "GYRO_2_TEMPERATURE": tm_data[22],
-            "GYRO_3_TEMPERATURE": tm_data[23],
-            "MGM_0_TEMPERATURE": tm_data[24],
-            "MGM_1_TEMPERATURE": tm_data[25],
-            "ADC_PL_PCDU_TEMPERATURE": tm_data[26],
-        }
-        printer.file_logger.info(str(parsed_data))
-        pp = pprint.PrettyPrinter(depth=4)
-        pp.pprint(parsed_data)
-        # print(parsed_data)
-        # tcp_server_device_temperatures.report_parsed_hk_data(
-        #    object_id, set_id, parsed_data
-        # )
-    elif set_id == SetIds.SUS_TEMPERATURE_SET:
-        pass
-        # pw = PrintWrapper(printer)
-        # pw.dlog("Received SUS temperature data")
-        # fmt_str = "!ffffffffffffffffff"
-        # tm_data = struct.unpack(fmt_str, hk_data[:4 * 18])
-        # parsed_data = {
-        #     "SUS_0": tm_data[0],
-        #     "SUS_1": tm_data[1],
-        #     "SUS_2": tm_data[2],
-        #     "SUS_3": tm_data[3],
-        #     "SUS_4": tm_data[4],
-        #     "SUS_5": tm_data[5],
-        #     "SUS_6": tm_data[6],
-        #     "SUS_7": tm_data[7],
-        #     "SUS_8": tm_data[8],
-        #     "SUS_9": tm_data[9],
-        #     "SUS_10": tm_data[10],
-        #     "SUS_11": tm_data[11],
-        # }
-        # print(parsed_data)
-        # TODO: Forward data to space simulator

eive_tmtc/pus_tm/tm_tcp_server.py

@@ -1,18 +1,17 @@
+import logging
 import socket
 from typing import Optional
 import json
 import base64
 
-from tmtccmd.logging import get_console_logger
 from tmtccmd.util.obj_id import ObjectIdU32
 from dle_encoder import DleEncoder
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
 class TmTcpServer:
     def __init__(self, ip_address: str, port: int):
-
         self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
         self.server_socket.bind((ip_address, port))
@@ -29,8 +28,8 @@ class TmTcpServer:
     def __del__(self):
         try:
             self.close()
-        except:
-            LOGGER.warning("Could not close sockets!")
+        except IOError:
+            _LOGGER.warning("Could not close sockets!")
 
     def close(self):
         self.server_socket.close()
@@ -45,8 +44,7 @@ class TmTcpServer:
                 (self.client_connection, _) = self.server_socket.accept()
                 self.client_connection.setblocking(False)
                 print("Client connected")
-            except:
-                # no client waiting
+            except IOError:
                 return
 
         data_json_bytes = json.dumps(dictionary).encode()
@@ -57,7 +55,7 @@ class TmTcpServer:
 
         try:
             sent_length = self.client_connection.send(data_json_bytes)
-        except:
+        except IOError:
             self.client_connection = None
             return
         if sent_length == 0:
@@ -65,7 +63,6 @@ class TmTcpServer:
             self.client_connection = None
 
     def report_raw_hk_data(self, object_id: ObjectIdU32, set_id: int, hk_data: bytes):
-
         data_dict = {
             "type": "TM",
             "tmType": "Raw HK",

eive_tmtc/pus_tm/verification_handler.py

@@ -1,12 +1,13 @@
+import logging
 from typing import List, Optional
 
+from spacepackets.ccsds import CdsShortTimestamp
 from spacepackets.ecss.pus_1_verification import UnpackParams, Service1Tm
-from tmtccmd.logging import get_console_logger
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tm.pus_1_verification import Service1FsfwWrapper
 from eive_tmtc.config.retvals import get_retval_dict
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
 def handle_service_1_fsfw_packet(wrapper: VerificationWrapper, raw_tm: bytes):
@@ -15,15 +16,17 @@ def handle_service_1_fsfw_packet(wrapper: VerificationWrapper, raw_tm: bytes):
             "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(1, 2))
+    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(
+        _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}")
+        _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)
@@ -45,7 +48,7 @@ def generic_retval_printout(
     if retval_info is None:
         raw_err = retval
         return [
-            f"No returnvalue information found for error code  with "
+            "No returnvalue information found for error code  with "
             f"subsystem ID {(raw_err >> 8) & 0xff} and unique ID {raw_err & 0xff}"
         ]
     else:
@@ -55,9 +58,9 @@ def generic_retval_printout(
         )
         string_list = [retval_string]
         if p1:
-            error_param_1_str = f"Error Parameter 1: hex {p1:#010x} " f"dec {p1} "
+            error_param_1_str = f"Error Parameter 1: hex {p1:#010x} 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}"
+            error_param_2_str = f"Error Parameter 2: hex {p2:#010x} dec {p2}"
             string_list.append(error_param_2_str)
         return string_list

eive_tmtc/tmtc/__init__.py

@@ -1,2 +1,8 @@
-from .payload.pl_subsystem import add_payload_subsystem_cmds
+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
+from .system import add_system_cmd_defs
+from .tm_store import add_persistent_tm_store_cmd_defs
+from .tcs import add_tmp_sens_cmds

eive_tmtc/tmtc/acs/__init__.py

@@ -0,0 +1 @@
+from .gyros import add_gyr_cmd_defs

eive_tmtc/tmtc/acs/acs_board.py

@@ -8,7 +8,7 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider, DefaultPusQueueHelper
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+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
@@ -24,7 +24,7 @@ class AcsOpCodes:
     ACS_ASS_DUAL_ON = ["6", "do"]
 
 
-class DualSideSubmodes(enum.IntEnum):
+class DualSideSubmode(enum.IntEnum):
     A_SIDE = 0
     B_SIDE = 1
     DUAL_SIDE = 2
@@ -34,55 +34,55 @@ 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=Modes.NORMAL,
-            submode=DualSideSubmodes.A_SIDE,
+            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=Modes.NORMAL,
-            submode=DualSideSubmodes.B_SIDE,
+            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=Modes.NORMAL,
-            submode=DualSideSubmodes.DUAL_SIDE,
+            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=Modes.ON,
-            submode=DualSideSubmodes.A_SIDE,
+            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=Modes.ON,
-            submode=DualSideSubmodes.B_SIDE,
+            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=Modes.ON,
-            submode=DualSideSubmodes.B_SIDE,
+            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=Modes.OFF,
+            mode=Mode.OFF,
             submode=0,
             q=q,
             info="Switching to ACS board assembly off",

eive_tmtc/tmtc/acs/defs.py

@@ -0,0 +1,16 @@
+import enum
+
+
+class AcsMode(enum.IntEnum):
+    OFF = 0
+    SAFE = 10
+    IDLE = 11
+    PTG_NADIR = 12
+    PTG_TARGET = 13
+    PTG_TARGET_GS = 14
+    PTG_INERTIAL = 15
+
+
+class SafeSubmode(enum.IntEnum):
+    DEFAULT = 0
+    DETUMBLE = 1

eive_tmtc/tmtc/acs/gps.py

@@ -0,0 +1,260 @@
+import datetime
+import enum
+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.pus_200_fsfw_mode import create_mode_command, Mode
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    create_request_one_hk_command,
+    create_enable_periodic_hk_command_with_interval_with_diag,
+    create_disable_periodic_hk_command_with_diag,
+)
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class GpsInfo:
+    MAX_SATELLITES = 30
+
+
+class OpCode:
+    OFF = "off"
+    ON = "on"
+    REQ_CORE_HK = ["core_hk_request"]
+    ENABLE_CORE_HK = ["core_hk_enable"]
+    DISABLE_CORE_HK = ["core_hk_disable"]
+    REQ_SKYVIEW_HK = ["skyview_hk_request"]
+    ENABLE_SKYVIEW_HK = ["skyview_hk_enable"]
+    DISABLE_SKYVIEW_HK = ["skyview_hk_disable"]
+    RESET_GNSS = ["reset"]
+
+
+class Info:
+    OFF = "Off"
+    ON = "On"
+    REQ_CORE_HK = "Request Core HK"
+    ENABLE_CORE_HK = "Enable Core HK"
+    DISABLE_CORE_HK = "Disable Core HK"
+    REQ_SKYVIEW_HK = "Request Skyview HK"
+    ENABLE_SKYVIEW_HK = "Enable Skyview HK"
+    DISABLE_SKYVIEW_HK = "Disable Skyview HK"
+    RESET_GNSS = "Reset GNSS using reset pin"
+
+
+class SetId(enum.IntEnum):
+    CORE_HK = 0
+    SKYVIEW_HK = 1
+
+
+@tmtc_definitions_provider
+def add_gps_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.OFF, info=Info.OFF)
+    oce.add(keys=OpCode.ON, info=Info.ON)
+    oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
+    oce.add(keys=OpCode.REQ_CORE_HK, info=Info.REQ_CORE_HK)
+    oce.add(keys=OpCode.ENABLE_CORE_HK, info=Info.ENABLE_CORE_HK)
+    oce.add(keys=OpCode.DISABLE_CORE_HK, info=Info.DISABLE_CORE_HK)
+    oce.add(keys=OpCode.REQ_SKYVIEW_HK, info=Info.REQ_SKYVIEW_HK)
+    oce.add(keys=OpCode.ENABLE_SKYVIEW_HK, info=Info.ENABLE_SKYVIEW_HK)
+    oce.add(keys=OpCode.DISABLE_SKYVIEW_HK, info=Info.DISABLE_SKYVIEW_HK)
+    defs.add_service(
+        name=CustomServiceList.GPS_CTRL.value,
+        info="GPS/GNSS Controller",
+        op_code_entry=oce,
+    )
+
+
+def pack_gps_command(  # noqa: C901
+    object_id: bytes, q: DefaultPusQueueHelper, op_code: str
+):  # noqa: C901:
+    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.ENABLE_CORE_HK:
+        interval = float(input("Please specify interval in floating point seconds: "))
+        if interval <= 0:
+            raise ValueError("invalid interval")
+        q.add_log_cmd(f"GPS: {Info.ENABLE_CORE_HK}")
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=False,
+            sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_CORE_HK:
+        q.add_log_cmd(f"gps: {Info.DISABLE_CORE_HK}")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                diag=False, sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)
+            )
+        )
+    if op_code in OpCode.REQ_CORE_HK:
+        q.add_log_cmd(f"GPS: {Info.REQ_CORE_HK}")
+        q.add_pus_tc(
+            create_request_one_hk_command(
+                sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)
+            )
+        )
+    if op_code in OpCode.ENABLE_SKYVIEW_HK:
+        interval = float(input("Please specify interval in floating point seconds: "))
+        if interval <= 0:
+            raise ValueError("invalid interval")
+        q.add_log_cmd(f"GPS: {Info.ENABLE_SKYVIEW_HK}")
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=False,
+            sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_SKYVIEW_HK:
+        q.add_log_cmd(f"gps: {Info.DISABLE_SKYVIEW_HK}")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                diag=False, sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)
+            )
+        )
+    if op_code in OpCode.REQ_SKYVIEW_HK:
+        q.add_log_cmd(f"GPS: {Info.REQ_SKYVIEW_HK}")
+        q.add_pus_tc(
+            create_request_one_hk_command(
+                sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)
+            )
+        )
+    if op_code in OpCode.ON:
+        q.add_log_cmd(f"GPS: {Info.ON}")
+        q.add_pus_tc(create_mode_command(object_id, Mode.ON, 0))
+    if op_code in OpCode.OFF:
+        q.add_log_cmd(f"GPS: {Info.OFF}")
+        q.add_pus_tc(create_mode_command(object_id, Mode.OFF, 0))
+
+
+def handle_gps_data(
+    pw: PrintWrapper,
+    set_id: int,
+    hk_data: bytes,
+    packet_time: datetime.datetime,
+):
+    pw.ilog(_LOGGER, f"Received GPS CTRL HK with packet time {packet_time}")
+    match set_id:
+        case SetId.CORE_HK:
+            handle_core_data(pw, hk_data)
+        case SetId.SKYVIEW_HK:
+            handle_skyview_data(pw, hk_data)
+
+
+def handle_core_data(pw: PrintWrapper, hk_data: bytes):
+    if len(hk_data) < 4 * 8 + 4 + 2 + 8:
+        pw.dlog(
+            f"GPS Core dataset with size {len(hk_data)} does not have expected size"
+            f" of {4*8+4+2+8} bytes"
+        )
+        return
+    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
+    if year == 0:
+        date_string = "No date string, year is 0"
+    else:
+        date_string = datetime.datetime(
+            year=year, month=month, day=day, hour=hours, minute=minutes, second=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}")
+    FsfwTmTcPrinter.get_validity_buffer(
+        validity_buffer=hk_data[current_idx:], num_vars=14
+    )
+
+
+def handle_skyview_data(pw: PrintWrapper, hk_data: bytes):
+    data_length = 8 + GpsInfo.MAX_SATELLITES * (8 + 3 * 2 + 1)
+    if len(hk_data) < data_length:
+        pw.dlog(
+            f"GPS Skyview dataset with size {len(hk_data)} does not have expected size"
+            f" of {data_length} bytes"
+        )
+        return
+    current_idx = 0
+    fmt_str_unix = "!d"
+    fmt_str_int16 = "!" + "h" * GpsInfo.MAX_SATELLITES
+    fmt_str_double = "!" + "d" * GpsInfo.MAX_SATELLITES
+    fmt_str_uint8 = "!" + "B" * GpsInfo.MAX_SATELLITES
+    inc_len_unix = struct.calcsize(fmt_str_unix)
+    inc_len_int16 = struct.calcsize(fmt_str_int16)
+    inc_len_double = struct.calcsize(fmt_str_double)
+    inc_len_uint8 = struct.calcsize(fmt_str_uint8)
+    unix = struct.unpack(
+        fmt_str_unix, hk_data[current_idx : current_idx + inc_len_unix]
+    )[0]
+    current_idx += inc_len_unix
+    prn_id = struct.unpack(
+        fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )
+    current_idx += inc_len_int16
+    azimuth = struct.unpack(
+        fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )
+    current_idx += inc_len_int16
+    elevation = struct.unpack(
+        fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )
+    current_idx += inc_len_int16
+    signal_to_noise = struct.unpack(
+        fmt_str_double, hk_data[current_idx : current_idx + inc_len_double]
+    )
+    current_idx += inc_len_double
+    used = struct.unpack(
+        fmt_str_uint8, hk_data[current_idx : current_idx + inc_len_uint8]
+    )
+    current_idx += inc_len_uint8
+    pw.dlog(f"Skyview Time: {unix} unix-sec")
+    pw.dlog(
+        "{:<8} {:<8} {:<8} {:<8} {:<8}".format(
+            "PRN_ID", "AZ [°]", "EL [°]", "S2N [dBHz]", "USED"
+        )
+    )
+    for idx in range(GpsInfo.MAX_SATELLITES):
+        pw.dlog(
+            "{:<8} {:<8} {:<8} {:<8} {:<8}".format(
+                prn_id[idx],
+                azimuth[idx],
+                elevation[idx],
+                signal_to_noise[idx],
+                used[idx],
+            )
+        )
+    FsfwTmTcPrinter.get_validity_buffer(
+        validity_buffer=hk_data[current_idx:], num_vars=6
+    )

eive_tmtc/tmtc/acs/gyros.py

@@ -0,0 +1,188 @@
+import enum
+import logging
+import struct
+
+from spacepackets.ecss import PusTelecommand
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_201_fsfw_health import pack_set_health_cmd_data, FsfwHealth
+from tmtccmd.pus.s201_fsfw_health import Subservice
+
+import eive_tmtc.config.object_ids as obj_ids
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
+from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_hk_command, make_sid
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    OpCodeEntry,
+    TmtcDefinitionWrapper,
+)
+from eive_tmtc.config.object_ids import (
+    GYRO_0_ADIS_HANDLER_ID,
+    GYRO_1_L3G_HANDLER_ID,
+    GYRO_2_ADIS_HANDLER_ID,
+    GYRO_3_L3G_HANDLER_ID,
+)
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+from tmtccmd.util import ObjectIdU32
+
+
+class OpCode:
+    NML = "normal"
+    OFF = "off"
+    CORE_HK = "core_hk"
+    CFG_HK = "cfg_hk"
+    SET_FAULTY = "set_faulty"
+
+
+class AdisGyroSetId(enum.IntEnum):
+    CORE_HK = 0
+    CFG_HK = 1
+
+
+class L3gGyroSetId(enum.IntEnum):
+    CORE_HK = 0
+
+
+class GyrSel(enum.IntEnum):
+    GYR_0_ADIS = 0
+    GYR_1_L3G = 1
+    GYR_2_ADIS = 2
+    GYR_3_L3G = 3
+
+
+GYR_SEL_DICT = {
+    GyrSel.GYR_0_ADIS: ("GYRO_0_ADIS", GYRO_0_ADIS_HANDLER_ID),
+    GyrSel.GYR_1_L3G: ("GYRO_1_L3G", GYRO_1_L3G_HANDLER_ID),
+    GyrSel.GYR_2_ADIS: ("GYRO_2_ADIS", GYRO_2_ADIS_HANDLER_ID),
+    GyrSel.GYR_3_L3G: ("GYRO_3_L3G", GYRO_3_L3G_HANDLER_ID),
+}
+
+
+def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):
+    print("Please select the Gyro Device")
+    for k, v in GYR_SEL_DICT.items():
+        print(f"{k}: {v[0]}")
+    sel_idx = int(input("Select gyro device by index: "))
+    gyr_info = GYR_SEL_DICT[GyrSel(sel_idx)]
+    gyr_obj_id = gyr_info[1]
+    is_adis = False
+    if sel_idx == GyrSel.GYR_0_ADIS or sel_idx == GyrSel.GYR_2_ADIS:
+        is_adis = True
+        core_hk_id = AdisGyroSetId.CORE_HK
+    else:
+        core_hk_id = L3gGyroSetId.CORE_HK
+    if op_code == OpCode.NML:
+        q.add_log_cmd(f"Gyro {gyr_info[0]} NORMAL mode")
+        q.add_pus_tc(create_mode_command(gyr_obj_id, Mode.NORMAL, 0))
+    if op_code == OpCode.OFF:
+        q.add_log_cmd(f"Gyro {gyr_info[0]} OFF mode")
+        q.add_pus_tc(create_mode_command(gyr_obj_id, Mode.OFF, 0))
+    elif op_code == OpCode.CORE_HK:
+        q.add_log_cmd(f"Gyro  {gyr_info[0]} Core HK")
+        q.add_pus_tc(create_request_one_hk_command(make_sid(gyr_obj_id, core_hk_id)))
+    elif op_code == OpCode.CFG_HK:
+        if not is_adis:
+            raise ValueError("No config HK for L3 device")
+        q.add_log_cmd(f"Gyro {gyr_info[0]} CFG HK")
+        q.add_pus_tc(
+            create_request_one_hk_command(make_sid(gyr_obj_id, AdisGyroSetId.CFG_HK))
+        )
+    elif op_code == OpCode.SET_FAULTY:
+        q.add_log_cmd(f"Gyro {gyr_info[0]} set faulty")
+        q.add_pus_tc(
+            PusTelecommand(
+                service=201,
+                subservice=Subservice.TC_SET_HEALTH,
+                app_data=pack_set_health_cmd_data(
+                    object_id=gyr_obj_id, health=FsfwHealth.FAULTY
+                ),
+            )
+        )
+    else:
+        logging.getLogger(__name__).warning(
+            f"invalid op code {op_code} for gyro command"
+        )
+
+
+def handle_gyros_hk_data(
+    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+):
+    if object_id.as_bytes in [
+        obj_ids.GYRO_0_ADIS_HANDLER_ID,
+        obj_ids.GYRO_2_ADIS_HANDLER_ID,
+    ]:
+        handle_adis_gyro_hk(object_id=object_id, pw=pw, set_id=set_id, hk_data=hk_data)
+    elif object_id.as_bytes in [
+        obj_ids.GYRO_1_L3G_HANDLER_ID,
+        obj_ids.GYRO_3_L3G_HANDLER_ID,
+    ]:
+        handle_l3g_gyro_hk(object_id=object_id, pw=pw, set_id=set_id, hk_data=hk_data)
+
+
+def handle_adis_gyro_hk(
+    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+):
+    if set_id == AdisGyroSetId.CORE_HK:
+        fmt_str = "!ddddddf"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            ang_veloc_x,
+            ang_veloc_y,
+            ang_veloc_z,
+            accel_x,
+            accel_y,
+            accel_z,
+            temp,
+        ) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
+        pw.dlog(f"Received ADIS1650X Gyro HK data from object {object_id}")
+        pw.dlog(
+            f"Angular Velocities (degrees per second): X {ang_veloc_x} | "
+            f"Y {ang_veloc_y} | Z {ang_veloc_z}"
+        )
+        pw.dlog(f"Acceleration (m/s^2): X {accel_x} | Y {accel_y} | Z {accel_z}")
+        pw.dlog(f"Temperature {temp} C")
+    if set_id == AdisGyroSetId.CFG_HK:
+        fmt_str = "!HBHHH"
+        inc_len = struct.calcsize(fmt_str)
+        print(len(hk_data))
+        (
+            diag_stat_reg,
+            filter_setting,
+            range_mdl,
+            msc_ctrl_reg,
+            dec_rate_reg,
+        ) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
+        pw.dlog(f"Diagnostic Status Register {diag_stat_reg:#018b}")
+        pw.dlog(f"Range MDL {range_mdl}")
+        pw.dlog(f"Filter Settings {filter_setting:#010b}")
+        pw.dlog(f"Miscellaneous Control Register {msc_ctrl_reg:#018b}")
+        pw.dlog(f"Decimation Rate {dec_rate_reg:#06x}")
+
+
+def handle_l3g_gyro_hk(
+    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+):
+    if set_id == L3gGyroSetId.CORE_HK:
+        fmt_str = "!ffff"
+        inc_len = struct.calcsize(fmt_str)
+        (angVelocX, angVelocY, angVelocZ, temp) = struct.unpack(
+            fmt_str, hk_data[0 : 0 + inc_len]
+        )
+        pw.dlog(f"Received L3GD20H Gyro HK data from object {object_id}")
+        pw.dlog(
+            f"Angular Velocities (degrees per second): X {angVelocX} | "
+            f"Y {angVelocY} | Z {angVelocZ}"
+        )
+        pw.dlog(f"Temperature {temp} °C")
+
+
+@tmtc_definitions_provider
+def add_gyr_cmd_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.CORE_HK, info="Request Core HK")
+    oce.add(keys=OpCode.CFG_HK, info="Request CFG HK")
+    oce.add(keys=OpCode.NML, info="Normal Mode")
+    oce.add(keys=OpCode.OFF, info="Off Mode")
+    oce.add(keys=OpCode.SET_FAULTY, info="Set Faulty")
+    defs.add_service(CustomServiceList.GYRO, info="Gyro", op_code_entry=oce)

eive_tmtc/tmtc/acs/imtq.py

@@ -5,6 +5,8 @@
 @author J. Meier
 @date   25.03.2021
 """
+import enum
+import logging
 import struct
 from typing import List
 
@@ -21,32 +23,61 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
     generate_one_diag_command,
     generate_one_hk_command,
+    create_request_one_diag_command,
+    create_enable_periodic_hk_command_with_interval_with_diag,
+    create_disable_periodic_hk_command_with_diag,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
 
-class OpCodes:
-    ON = ["on"]
-    NORMAL = ["normal"]
-    OFF = ["off"]
-    SET_DIPOLE = ["set_dipole"]
+_LOGGER = logging.getLogger(__name__)
 
 
-class ImtqSetIds:
-    ENG_HK_SET = 1
-    CAL_MTM_SET = 2
-    RAW_MTM_SET = 3
-    POSITIVE_X_TEST = 4
-    NEGATIVE_X_TEST = 5
-    POSITIVE_Y_TEST = 6
-    NEGATIVE_Y_TEST = 7
-    POSITIVE_Z_TEST = 8
-    NEGATIVE_Z_TEST = 9
+class OpCode:
+    ON = "on"
+    NORMAL = "normal"
+    OFF = "off"
+    SET_DIPOLE = "set_dipole"
+    REQUEST_ENG_HK_NO_TORQUE = "hk_os_eng_hk_no_torque"
+    REQUEST_ENG_HK_WITH_TORQUE = "hk_os_eng_hk_with_torque"
+    REQUEST_MGM_RAW_NO_TORQUE = "hk_os_mgm_raw_no_torque"
+    ENABLE_MGM_RAW_NO_TORQUE = "enb_mgm_raw_no_torque"
+    DISABLE_MGM_RAW_NO_TORQUE = "dis_mgm_raw_no_torque"
+    REQUEST_MGM_RAW_WITH_TORQUE = "hk_os_mgm_raw_with_torque"
+    ENABLE_MGM_RAW_WITH_TORQUE = "enb_mgm_raw_with_torque"
+    DISABLE_MGM_RAW_WITH_TORQUE = "dis_mgm_raw_with_torque"
+    ENABLE_ENG_HK_NO_TORQUE = "enb_eng_hk_no_torque"
+    DISABLE_ENG_HK_NO_TORQUE = "dis_eng_hk_no_torque"
+    ENABLE_ENG_HK_WITH_TORQUE = "enb_eng_hk_with_torque"
+    DISABLE_ENG_HK_WITH_TORQUE = "dis_eng_hk_with_torque"
+    POS_X_SELF_TEST = "self_test_pos_x"
+    NEG_X_SELF_TEST = "self_test_neg_x"
+    POS_Y_SELF_TEST = "self_test_pos_y"
+    NEG_Y_SELF_TEST = "self_test_neg_y"
+    POS_Z_SELF_TEST = "self_test_pos_z"
+    NEG_Z_SELF_TEST = "self_test_neg_z"
 
 
-class ImtqActionIds:
+class ImtqSetId(enum.IntEnum):
+    ENG_HK_NO_TORQUE = 1
+    RAW_MTM_NO_TORQUE = 2
+    ENG_HK_SET_WITH_TORQUE = 3
+    RAW_MTM_WITH_TORQUE = 4
+    STATUS_SET = 5
+    DIPOLES = 6
+
+    CAL_MTM_SET = 9
+    POSITIVE_X_TEST = 10
+    NEGATIVE_X_TEST = 11
+    POSITIVE_Y_TEST = 12
+    NEGATIVE_Y_TEST = 13
+    POSITIVE_Z_TEST = 14
+    NEGATIVE_Z_TEST = 15
+
+
+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])
@@ -63,126 +94,146 @@ class ImtqActionIds:
 @tmtc_definitions_provider
 def add_imtq_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(OpCodes.OFF, "Mode Off")
-    oce.add(OpCodes.ON, "Mode On")
-    oce.add(OpCodes.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(OpCodes.SET_DIPOLE, "IMTQ command dipole")
+    oce.add(OpCode.OFF, "Mode Off")
+    oce.add(OpCode.ON, "Mode On")
+    oce.add(OpCode.NORMAL, "Mode Normal")
+    oce.add(OpCode.REQUEST_ENG_HK_NO_TORQUE, "Request Engineering HK One Shot")
+    oce.add(
+        OpCode.REQUEST_ENG_HK_WITH_TORQUE,
+        "Request Engineering HK One Shot during Torque",
+    )
+    oce.add(OpCode.ENABLE_ENG_HK_NO_TORQUE, "Enable ENG HK not torque")
+    oce.add(OpCode.ENABLE_ENG_HK_WITH_TORQUE, "Enable ENG HK with torque")
+    oce.add(OpCode.DISABLE_ENG_HK_NO_TORQUE, "Disable ENG HK not torque")
+    oce.add(OpCode.DISABLE_ENG_HK_WITH_TORQUE, "Disable ENG HK with torque")
+    oce.add(
+        OpCode.REQUEST_MGM_RAW_NO_TORQUE, "Request MGM Raw Without Torque HK One Shot"
+    )
+    oce.add(OpCode.ENABLE_MGM_RAW_NO_TORQUE, "Enable MGM Raw Without Torque HK")
+    oce.add(OpCode.DISABLE_MGM_RAW_NO_TORQUE, "Disable MGM Raw Without Torque HK")
+    oce.add(
+        OpCode.REQUEST_MGM_RAW_WITH_TORQUE, "Request MGM Raw With Torque HK One Shot"
+    )
+    oce.add(OpCode.ENABLE_MGM_RAW_WITH_TORQUE, "Enable MGM Raw With Torque HK")
+    oce.add(OpCode.DISABLE_MGM_RAW_WITH_TORQUE, "Disable MGM Raw With Torque HK")
+    oce.add(OpCode.POS_X_SELF_TEST, "IMTQ perform pos X self test")
+    oce.add(OpCode.NEG_X_SELF_TEST, "IMTQ perform neg X self test")
+    oce.add(OpCode.POS_Y_SELF_TEST, "IMTQ perform pos Y self test")
+    oce.add(OpCode.NEG_Y_SELF_TEST, "IMTQ perform neg Y self test")
+    oce.add(OpCode.POS_Z_SELF_TEST, "IMTQ perform pos Z self test")
+    oce.add(OpCode.NEG_Z_SELF_TEST, "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):
+def pack_imtq_test_into(  # noqa C901
+    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 OpCodes.OFF:
+    if op_code == OpCode.OFF:
         q.add_log_cmd("IMTQ: Set mode 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:
+    if op_code == OpCode.ON:
         q.add_log_cmd("IMTQ: Set mode 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:
+    if op_code == OpCode.NORMAL:
         q.add_log_cmd("IMTQ: Mode Normal")
-        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 == "3":
+    if op_code == OpCode.POS_X_SELF_TEST:
         q.add_log_cmd("IMTQ: Perform positive x self test")
-        command = object_id.as_bytes + ImtqActionIds.perform_positive_x_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 + ImtqActionIds.read_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, ImtqSetIds.POSITIVE_X_TEST)
+        sid = make_sid(object_id.as_bytes, ImtqSetId.POSITIVE_X_TEST)
         q.add_pus_tc(generate_one_hk_command(sid))
 
-    if op_code == "4":
+    if op_code == OpCode.NEG_X_SELF_TEST:
         q.add_log_cmd("IMTQ: Perform negative x self test")
-        command = object_id.as_bytes + ImtqActionIds.perform_negative_x_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 + ImtqActionIds.read_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, ImtqSetIds.NEGATIVE_X_TEST)
+        sid = make_sid(object_id.as_bytes, ImtqSetId.NEGATIVE_X_TEST)
         q.add_pus_tc(generate_one_hk_command(sid))
 
-    if op_code == "5":
+    if op_code == OpCode.POS_Y_SELF_TEST:
         q.add_log_cmd("IMTQ: Perform positive y self test")
-        command = object_id.as_bytes + ImtqActionIds.perform_positive_y_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 + ImtqActionIds.read_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, ImtqSetIds.POSITIVE_Y_TEST)
+        sid = make_sid(object_id.as_bytes, ImtqSetId.POSITIVE_Y_TEST)
         q.add_pus_tc(generate_one_hk_command(sid))
 
-    if op_code == "6":
+    if op_code == OpCode.NEG_Y_SELF_TEST:
         q.add_log_cmd("IMTQ: Perform negative y self test")
-        command = object_id.as_bytes + ImtqActionIds.perform_negative_y_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 + ImtqActionIds.read_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, ImtqSetIds.NEGATIVE_Y_TEST)
+        sid = make_sid(object_id.as_bytes, ImtqSetId.NEGATIVE_Y_TEST)
         q.add_pus_tc(generate_one_hk_command(sid))
 
-    if op_code == "7":
+    if op_code == OpCode.POS_Z_SELF_TEST:
         q.add_log_cmd("IMTQ: Perform positive z self test")
-        command = object_id.as_bytes + ImtqActionIds.perform_positive_z_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 + ImtqActionIds.read_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, ImtqSetIds.POSITIVE_Y_TEST)
+        sid = make_sid(object_id.as_bytes, ImtqSetId.POSITIVE_Y_TEST)
         q.add_pus_tc(generate_one_hk_command(sid))
 
-    if op_code == "8":
+    if op_code == OpCode.NEG_Z_SELF_TEST:
         q.add_log_cmd("IMTQ: Perform negative z self test")
-        command = object_id.as_bytes + ImtqActionIds.perform_negative_z_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 + ImtqActionIds.read_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, ImtqSetIds.NEGATIVE_Z_TEST)
+        sid = make_sid(object_id.as_bytes, ImtqSetId.NEGATIVE_Z_TEST)
         q.add_pus_tc(generate_one_hk_command(sid))
 
-    if op_code in OpCodes.SET_DIPOLE:
+    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]: "
+                "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}"
+            f"IMTQ: Commanding dipole X={x_dipole}, Y={y_dipole}, Z={y_dipole},"
+            f" duration={dur_str}"
         )
         q.add_pus_tc(
             pack_dipole_command(
@@ -190,38 +241,126 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod
             )
         )
 
-    if op_code == "10":
+    if op_code == "10":  # doesnt seem to work anymore
         q.add_log_cmd("IMTQ: Get commanded dipole")
-        command = object_id.as_bytes + ImtqActionIds.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")
+    if op_code == OpCode.ENABLE_ENG_HK_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Enable ENG HK")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_NO_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.DISABLE_ENG_HK_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Disable ENG HK (No Torque)")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                True, make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_NO_TORQUE)
+            )
+        )
+    if op_code == OpCode.REQUEST_ENG_HK_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Get engineering hk set with torque")
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                sid=make_sid(
+                    object_id=object_id.as_bytes,
+                    set_id=ImtqSetId.ENG_HK_SET_WITH_TORQUE,
+                )
+            )
+        )
+    if op_code == OpCode.ENABLE_ENG_HK_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Enable ENG HK with torque")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_SET_WITH_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.DISABLE_ENG_HK_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Disable ENG HK with Torque")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                True, make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_SET_WITH_TORQUE)
+            )
+        )
+    if op_code == OpCode.REQUEST_ENG_HK_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Get engineering hk set (no torque)")
         q.add_pus_tc(
             generate_one_diag_command(
-                sid=make_sid(object_id=object_id.as_bytes, set_id=ImtqSetIds.ENG_HK_SET)
+                sid=make_sid(
+                    object_id=object_id.as_bytes, set_id=ImtqSetId.ENG_HK_NO_TORQUE
+                )
             )
         )
 
     if op_code == "12":
         q.add_log_cmd("IMTQ: Get calibrated MTM hk set")
         q.add_pus_tc(
-            generate_one_diag_command(
+            create_request_one_diag_command(
+                sid=make_sid(object_id=object_id.as_bytes, set_id=ImtqSetId.CAL_MTM_SET)
+            )
+        )
+
+    if op_code == OpCode.REQUEST_MGM_RAW_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Get raw MTM hk set")
+        q.add_pus_tc(
+            create_request_one_diag_command(
                 sid=make_sid(
-                    object_id=object_id.as_bytes, set_id=ImtqSetIds.CAL_MTM_SET
+                    object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_NO_TORQUE
                 )
             )
         )
 
-    if op_code == "13":
+    if op_code == OpCode.DISABLE_MGM_RAW_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Disable MGM RAW HK (No Torque)")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                True, make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_NO_TORQUE)
+            )
+        )
+    if op_code == OpCode.ENABLE_MGM_RAW_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Enable MGM RAW HK (No Torque)")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_NO_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.REQUEST_MGM_RAW_WITH_TORQUE:
         q.add_log_cmd("IMTQ: Get raw MTM hk set")
         q.add_pus_tc(
-            generate_one_diag_command(
+            create_request_one_diag_command(
                 sid=make_sid(
-                    object_id=object_id.as_bytes, set_id=ImtqSetIds.RAW_MTM_SET
+                    object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_WITH_TORQUE
                 )
             )
         )
+    if op_code == OpCode.ENABLE_MGM_RAW_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Enable MGM RAW HK (No Torque)")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_WITH_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.DISABLE_MGM_RAW_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Disable MGM RAW HK (No Torque)")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                True, make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_WITH_TORQUE)
+            )
+        )
 
 
 def pack_dipole_command(
@@ -236,7 +375,7 @@ def pack_dipole_command(
                      When set to 0, the dipole will be generated until a new dipole actuation
                      command is sent.
     """
-    action_id = ImtqActionIds.start_actuation_dipole
+    action_id = ImtqActionId.start_actuation_dipole
     command = object_id + action_id
     x_dipole = int(round(x_dipole))
     y_dipole = int(round(y_dipole))
@@ -250,7 +389,8 @@ def pack_dipole_command(
     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}"
+            f"Duration in ms of {duration} smaller than 0 or larger than allowed"
+            f" {pow(2, 16) - 1}"
         )
     command += struct.pack("!h", x_dipole)
     command += struct.pack("!h", y_dipole)
@@ -262,10 +402,19 @@ def pack_dipole_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"
+        f"{dipole_str} {value} negative or larger than maximum allowed 2000 *"
+        " 10^-4*Am^2"
     )
 
 
+STATUS_HEADERS = [
+    "Status Byte Mode",
+    "Status Byte Error",
+    "Status Byte Config",
+    "Status Byte Uptime [s]",
+]
+
+
 ENG_HK_HEADERS = [
     "Digital Voltage [mV]",
     "Analog Voltage [mV]",
@@ -281,6 +430,52 @@ ENG_HK_HEADERS = [
 ]
 
 
+def handle_imtq_hk(pw: PrintWrapper, hk_data: bytes, set_id: int):
+    if (set_id >= ImtqSetId.POSITIVE_X_TEST) and (set_id <= ImtqSetId.NEGATIVE_Z_TEST):
+        return handle_self_test_data(pw, hk_data)
+    elif set_id == ImtqSetId.ENG_HK_NO_TORQUE:
+        return handle_eng_set(pw, hk_data, False)
+    elif set_id == ImtqSetId.ENG_HK_SET_WITH_TORQUE:
+        return handle_eng_set(pw, hk_data, True)
+    elif set_id == ImtqSetId.CAL_MTM_SET:
+        return handle_calibrated_mtm_measurement(pw, hk_data)
+    elif set_id == ImtqSetId.RAW_MTM_NO_TORQUE:
+        return handle_raw_mtm_measurement(pw, hk_data, False)
+    elif set_id == ImtqSetId.RAW_MTM_WITH_TORQUE:
+        return handle_raw_mtm_measurement(pw, hk_data, True)
+    elif set_id == ImtqSetId.DIPOLES:
+        return handle_dipole_set(pw, hk_data)
+    elif set_id == ImtqSetId.STATUS_SET:
+        return handle_status_set(pw, hk_data)
+    else:
+        pw.wlog(
+            _LOGGER,
+            f"IMTQ handler HK reply with unknown or unimplemented set id {set_id}",
+        )
+
+
+def unpack_status_set(hk_data: bytes) -> List:
+    status_mode = hk_data[0]
+    status_error = hk_data[1]
+    status_conf = hk_data[2]
+    status_uptime = struct.unpack("!I", hk_data[3:7])[0]
+    return [status_mode, status_error, status_conf, status_uptime]
+
+
+def handle_dipole_set(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received iMTQ dipole set")
+    fmt_str = "!hhhH"
+    fmt_len = struct.calcsize(fmt_str)
+    (dipole_x, dipole_y, dipole_z, current_torque_duration) = struct.unpack(
+        fmt_str, hk_data[0:8]
+    )
+    pw.dlog(f"Dipole X: {dipole_x}")
+    pw.dlog(f"Dipole Y: {dipole_y}")
+    pw.dlog(f"Dipole Z: {dipole_z}")
+    pw.dlog(f"Current torque duration: {current_torque_duration}")
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[fmt_len:], 2)
+
+
 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]
@@ -309,19 +504,36 @@ def unpack_eng_hk(hk_data: bytes) -> List:
     return content_list
 
 
-def handle_eng_set(printer: FsfwTmTcPrinter, hk_data: bytes):
-    pw = PrintWrapper(printer)
+def handle_eng_set(pw: PrintWrapper, hk_data: bytes, torque_on: bool):
+    pw.dlog(f"Found engineering HK. Torque Status: {torque_on}")
     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)
+    for k, v in zip(ENG_HK_HEADERS, content_list):
+        pw.dlog(f"{k.ljust(30)}: {v}")
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=num_of_vars
+        )
+    )
 
 
-def handle_calibrated_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
-    pw = PrintWrapper(printer)
+def handle_status_set(pw: PrintWrapper, hk_data: bytes):
+    content_list = unpack_status_set(hk_data)
+    validity_buffer = hk_data[7:]
+
+    num_of_vars = 4
+    for k, v in zip(STATUS_HEADERS, content_list):
+        pw.dlog(f"{k.ljust(30)}: {v}")
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=num_of_vars
+        )
+    )
+
+
+def handle_calibrated_mtm_measurement(pw: PrintWrapper, hk_data: bytes):
     header_list = [
         "Calibrated MTM X [nT]",
         "Calibrated MTM Y [nT]",
@@ -337,11 +549,15 @@ def handle_calibrated_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
     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)
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=num_of_vars
+        )
+    )
 
 
-def handle_raw_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
-    pw = PrintWrapper(printer)
+def handle_raw_mtm_measurement(pw: PrintWrapper, hk_data: bytes, torque_status: bool):
+    pw.dlog(f"Found raw MTM measurement. Torque Status: {torque_status}")
     header_list = [
         "Raw MTM X [nT]",
         "Raw MTM Y [nT]",
@@ -357,11 +573,14 @@ def handle_raw_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
     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)
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=num_of_vars
+        )
+    )
 
 
-def handle_self_test_data(printer: FsfwTmTcPrinter, hk_data: bytes):
-    pw = PrintWrapper(printer)
+def handle_self_test_data(pw: PrintWrapper, hk_data: bytes):
     header_list = [
         "Init Err",
         "Init Raw Mag X [nT]",
@@ -465,7 +684,7 @@ def handle_self_test_data(printer: FsfwTmTcPrinter, hk_data: bytes):
         init_coil_z_temperature,
         err,
         raw_mag_x,
-        init_raw_mag_y,
+        raw_mag_y,
         raw_mag_z,
         cal_mag_x,
         cal_mag_y,
@@ -493,4 +712,8 @@ def handle_self_test_data(printer: FsfwTmTcPrinter, hk_data: bytes):
     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)
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=num_of_vars
+        )
+    )

eive_tmtc/tmtc/acs/mgms.py

@@ -0,0 +1,115 @@
+import enum
+import struct
+
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config import OpCodeEntry
+
+import eive_tmtc.config.object_ids as obj_ids
+from eive_tmtc.config.object_ids import (
+    MGM_0_LIS3_HANDLER_ID,
+    MGM_1_RM3100_HANDLER_ID,
+    MGM_2_LIS3_HANDLER_ID,
+    MGM_3_RM3100_HANDLER_ID,
+)
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from tmtccmd.config.tmtc import tmtc_definitions_provider, TmtcDefinitionWrapper
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
+from tmtccmd.util import ObjectIdU32
+
+
+class OpCode:
+    NORMAL = "normal"
+    OFF = "off"
+
+
+class MgmLis3SetId(enum.IntEnum):
+    CORE_HK = 0
+
+
+class MgmRm3100SetId(enum.IntEnum):
+    CORE_HK = 0
+
+
+class MgmSel(enum.IntEnum):
+    MGM_0_LIS3 = 0
+    MGM_1_RM3100 = 1
+    MGM_2_LIS3 = 2
+    MGM_3_RM3100 = 3
+
+
+MGM_SEL_DICT = {
+    MgmSel.MGM_0_LIS3: ("MGM_0_LIS3", MGM_0_LIS3_HANDLER_ID),
+    MgmSel.MGM_1_RM3100: ("MGM_1_RM3100", MGM_1_RM3100_HANDLER_ID),
+    MgmSel.MGM_2_LIS3: ("MGM_2_LIS3", MGM_2_LIS3_HANDLER_ID),
+    MgmSel.MGM_3_RM3100: ("MGM_3_RM3100", MGM_3_RM3100_HANDLER_ID),
+}
+
+
+def handle_mgm_cmd(q: DefaultPusQueueHelper, op_code: str):
+    print("Please select the MGM Device")
+    for k, v in MGM_SEL_DICT.items():
+        print(f"{k}: {v[0]}")
+    sel_idx = int(input("Select MGM device by index: "))
+    mgm_info = MGM_SEL_DICT[MgmSel(sel_idx)]
+    mgm_obj_id = mgm_info[1]
+    if op_code == OpCode.NORMAL:
+        q.add_log_cmd(f"Gyro {mgm_info[0]} NORMAL mode")
+        q.add_pus_tc(create_mode_command(mgm_obj_id, Mode.NORMAL, 0))
+    if op_code == OpCode.OFF:
+        q.add_log_cmd(f"Gyro {mgm_info[0]} OFF mode")
+        q.add_pus_tc(create_mode_command(mgm_obj_id, Mode.OFF, 0))
+
+
+def handle_mgm_hk_data(
+    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+):
+    if object_id.as_bytes in [
+        obj_ids.MGM_0_LIS3_HANDLER_ID,
+        obj_ids.MGM_2_LIS3_HANDLER_ID,
+    ]:
+        handle_mgm_lis3_hk_data(object_id, pw, set_id, hk_data)
+    elif object_id.as_bytes in [
+        obj_ids.MGM_1_RM3100_HANDLER_ID,
+        obj_ids.MGM_3_RM3100_HANDLER_ID,
+    ]:
+        handle_mgm_rm3100_hk_data(object_id, pw, set_id, hk_data)
+    pass
+
+
+def handle_mgm_lis3_hk_data(
+    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+):
+    if set_id == MgmLis3SetId.CORE_HK:
+        fmt_str = "!ffff"
+        inc_len = struct.calcsize(fmt_str)
+        (field_x, field_y, field_z, temp) = struct.unpack(
+            fmt_str, hk_data[0 : 0 + inc_len]
+        )
+        pw.dlog(f"Received MGM LIS3 from object {object_id}")
+        pw.dlog(
+            f"Field strengths in micro Tesla X {field_x} | Y {field_y} | Z {field_z}"
+        )
+        pw.dlog(f"Temperature {temp} C")
+
+
+def handle_mgm_rm3100_hk_data(
+    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+):
+    if set_id == MgmRm3100SetId.CORE_HK:
+        fmt_str = "!fff"
+        inc_len = struct.calcsize(fmt_str)
+        (field_x, field_y, field_z) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
+        pw.dlog(f"Received MGM RM3100 from object {object_id}")
+        pw.dlog(
+            f"Field strengths in micro Tesla X {field_x} | Y {field_y} | Z {field_z}"
+        )
+
+
+@tmtc_definitions_provider
+def add_mgm_cmd_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.NORMAL, info="Normal Mode")
+    oce.add(keys=OpCode.OFF, info="Off Mode")
+    defs.add_service(CustomServiceList.MGMS, info="MGMs", op_code_entry=oce)

eive_tmtc/tmtc/acs/reaction_wheels.py

@@ -4,6 +4,7 @@
 @author J. Meier
 @date   20.06.2021
 """
+import enum
 import struct
 from typing import List
 
@@ -19,31 +20,34 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     enable_periodic_hk_command_with_interval,
     disable_periodic_hk_command,
 )
+from tmtccmd.tc.pus_8_fsfw_funccmd import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+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
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
 
-class OpCodesDevs:
-    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 OpCodesDev:
+    SPEED = "speed"
+    ON = "on"
+    NML = "nml"
+    OFF = "off"
+    GET_STATUS = "status"
+    GET_TM = "get_tm_set"
+    REQ_TM = "req_tm_set"
+    ENABLE_STATUS_HK = "enable_status_hk"
+    DISABLE_STATUS_HK = "disable_status_hk"
 
 
-class InfoDevs:
+class InfoDev:
     SPEED = "Set speed"
     ON = "Set On"
     NML = "Set Normal"
     OFF = "Set Off"
     GET_STATUS = "Get Status HK"
     GET_TM = "Get TM HK"
+    REQ_TM = "Request TM HK"
     ENABLE_STATUS_HK = "Enable Status HK"
     DISABLE_STATUS_HK = "Disable Status HK"
 
@@ -56,6 +60,10 @@ class OpCodesAss:
     ALL_SPEED_OFF = ["4", "speed_off"]
 
 
+class ActionId:
+    REQUEST_TM = 9
+
+
 class InfoAss:
     ON = "Mode On: 3/4 RWs min. on"
     NML = "Mode Normal: 3/4 RWs min. normal"
@@ -64,14 +72,14 @@ class InfoAss:
     ALL_SPEED_OFF = "Speed down to 0"
 
 
-class RwSetIds:
+class RwSetId(enum.IntEnum):
     STATUS_SET_ID = 4
     TEMPERATURE_SET_ID = 8
     LAST_RESET = 2
     TM_SET = 9
 
 
-class RwCommandIds:
+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])
@@ -94,14 +102,15 @@ class RampTime:
 @tmtc_definitions_provider
 def add_rw_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(info=InfoDevs.SPEED, keys=OpCodesDevs.SPEED)
-    oce.add(info=InfoDevs.ON, keys=OpCodesDevs.ON)
-    oce.add(info=InfoDevs.OFF, keys=OpCodesDevs.OFF)
-    oce.add(info=InfoDevs.NML, keys=OpCodesDevs.NML)
-    oce.add(info=InfoDevs.GET_STATUS, keys=OpCodesDevs.GET_STATUS)
-    oce.add(info=InfoDevs.GET_TM, keys=OpCodesDevs.GET_TM)
-    oce.add(info=InfoDevs.ENABLE_STATUS_HK, keys=OpCodesDevs.ENABLE_STATUS_HK)
-    oce.add(info=InfoDevs.DISABLE_STATUS_HK, keys=OpCodesDevs.DISABLE_STATUS_HK)
+    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.REQ_TM, keys=OpCodesDev.REQ_TM)
+    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",
@@ -135,83 +144,88 @@ def add_rw_cmds(defs: TmtcDefinitionWrapper):
     )
 
 
-def pack_single_rw_test_into(
+def pack_single_rw_test_into(  # noqa C901: Complexity is okay here.
     object_id: bytes, rw_idx: int, q: DefaultPusQueueHelper, op_code: str
 ):
-    if op_code in OpCodesDevs.SPEED:
+    if op_code == OpCodesDev.SPEED:
         speed, ramp_time = prompt_speed_ramp_time()
         q.add_log_cmd(
-            f"RW {rw_idx}: {InfoDevs.SPEED} with target "
+            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 OpCodesDevs.ON:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.ON}")
-        mode_data = pack_mode_data(object_id, Modes.ON, 0)
+    if op_code == 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 OpCodesDevs.NML:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.NML}")
-        mode_data = pack_mode_data(object_id, Modes.NORMAL, 0)
+    if op_code == 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 OpCodesDevs.OFF:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.OFF}")
-        mode_data = pack_mode_data(object_id, Modes.OFF, 0)
+    if op_code == 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 OpCodesDevs.GET_TM:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.GET_TM}")
+    if op_code == 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=RwSetIds.TM_SET)
+                sid=make_sid(object_id=object_id, set_id=RwSetId.TM_SET)
             )
         )
-    if op_code in OpCodesDevs.GET_STATUS:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.GET_STATUS}")
+    if op_code == OpCodesDev.REQ_TM:
+        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.REQ_TM}")
+        q.add_pus_tc(
+            create_action_cmd(object_id=object_id, action_id=ActionId.REQUEST_TM)
+        )
+    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=RwSetIds.STATUS_SET_ID)
+                sid=make_sid(object_id=object_id, set_id=RwSetId.STATUS_SET_ID)
             )
         )
-    if op_code in OpCodesDevs.ENABLE_STATUS_HK:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.ENABLE_STATUS_HK}")
+    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, RwSetIds.STATUS_SET_ID), interval
+            True, make_sid(object_id, RwSetId.STATUS_SET_ID), interval
         )
         for cmd in cmds:
             q.add_pus_tc(cmd)
-    if op_code in OpCodesDevs.DISABLE_STATUS_HK:
-        q.add_log_cmd(f"RW {rw_idx}: {InfoDevs.DISABLE_STATUS_HK}")
+    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, RwSetIds.STATUS_SET_ID)
+                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=Modes.OFF, submode=0)
+        data = pack_mode_data(object_id=object_id, mode=Mode.OFF, submode=0)
         q.add_pus_tc(
             PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data
+                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=Modes.ON, submode=0)
+        data = pack_mode_data(object_id=object_id, mode=Mode.ON, submode=0)
         q.add_pus_tc(
             PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data
+                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=Modes.NORMAL, submode=0)
+        data = pack_mode_data(object_id=object_id, mode=Mode.NORMAL, submode=0)
         q.add_pus_tc(
             PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=data
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=data
             )
         )
     if op_code in OpCodesAss.ALL_SPEED_UP:
@@ -247,14 +261,12 @@ def pack_set_speed_command(
     if speed > 0:
         if speed < 1000 or speed > 65000:
             raise ValueError(
-                "Invalid RW speed specified. "
-                "Allowed range is [1000, 65000] 0.1 * RPM"
+                "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"
+                "Invalid RW speed specified. Allowed range is [-65000, -1000] 0.1 * RPM"
             )
     else:
         # Speed is 0
@@ -264,7 +276,7 @@ def pack_set_speed_command(
         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 = RwCommandIds.SET_SPEED
+    command_id = RwCommandId.SET_SPEED
     command = bytearray()
     command += object_id + command_id
     command = command + struct.pack("!i", speed)
@@ -274,12 +286,10 @@ def pack_set_speed_command(
 
 
 def handle_rw_hk_data(
-    printer: FsfwTmTcPrinter, object_id: ObjectIdU32, set_id: int, hk_data: bytes
+    pw: PrintWrapper, object_id: ObjectIdU32, set_id: int, hk_data: bytes
 ):
-
-    pw = PrintWrapper(printer)
     current_idx = 0
-    if set_id == RwSetIds.STATUS_SET_ID:
+    if set_id == RwSetId.STATUS_SET_ID:
         pw.dlog(
             f"Received Status HK (ID {set_id}) from Reaction Wheel {object_id.name}"
         )
@@ -292,18 +302,19 @@ def handle_rw_hk_data(
         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"
+            f"Temperature {temp} C | Speed {speed_rpm} rpm | Reference Speed"
+            f" {ref_speed_rpm} rpm"
         )
         pw.dlog(
             f"State {state}. 0: Error, 1: Idle, 2: Coasting, 3: Running, speed stable, "
-            f"4: Running, speed  changing"
+            "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)"
+            "1: High Current Mode (0.6 A)"
         )
-        printer.print_validity_buffer(hk_data[current_idx:], 5)
-    if set_id == RwSetIds.LAST_RESET:
+        pw.dlog(FsfwTmTcPrinter.get_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}"
         )
@@ -317,7 +328,7 @@ def handle_rw_hk_data(
             f"Last Non-Cleared (Cached) Reset Status {last_not_cleared_reset_status} | "
             f"Current Reset Status {current_reset_status}"
         )
-    if set_id == RwSetIds.TM_SET:
+    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)
@@ -349,22 +360,24 @@ def handle_rw_hk_data(
         ) = 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"
+            f"MCU Temperature {mcu_temp} | Pressure Sensore Temperature"
+            f" {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)"
+            "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"
+            "4: Running, speed  changing"
         )
-        pw.dlog(f"Number Of Invalid Packets:")
+        pw.dlog("Number Of Invalid Packets:")
         pw.dlog("CRC | Length | CMD")
         pw.dlog(
-            f"{num_invalid_crc_packets} | {num_invalid_len_packets} | {num_invalid_cmd_packets}"
+            f"{num_invalid_crc_packets} | {num_invalid_len_packets} |"
+            f" {num_invalid_cmd_packets}"
         )
         pw.dlog(
             f"Num Of CMD Executed Requests {num_of_cmd_executed_requests} | "
@@ -372,23 +385,26 @@ def handle_rw_hk_data(
         )
         pw.dlog("UART COM information:")
         pw.dlog(
-            f"NumBytesWritten | NumBytesRead | ParityErrs | NoiseErrs | FrameErrs | "
-            f"RegOverrunErrs | TotalErrs"
+            "NumBytesWritten | NumBytesRead | ParityErrs | NoiseErrs | FrameErrs | "
+            "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}"
+            f"{uart_num_of_bytes_written} | {uart_num_of_bytes_read} |"
+            f" {uart_num_parity_errors} | {uart_num_noise_errors} |"
+            f" {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("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}"
+            f"{spi_num_bytes_written} | {spi_num_bytes_read} |"
+            f" {spi_num_reg_overrun_errors} | {spi_total_num_errors}"
         )
         if current_idx > 0:
-            printer.print_validity_buffer(
-                validity_buffer=hk_data[current_idx:], num_vars=27
+            pw.dlog(
+                FsfwTmTcPrinter.get_validity_buffer(
+                    validity_buffer=hk_data[current_idx:], num_vars=27
+                )
             )
 
 

eive_tmtc/tmtc/acs/star_tracker.py

@@ -5,21 +5,28 @@
 @author J. Meier
 @date   14.08.2021
 """
+import datetime
+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 import DefaultPusQueueHelper
-from tmtccmd.util import ObjectIdU32
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.utility.input_helper import InputHelper
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config.tmtc import tmtc_definitions_provider
+from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_diag_command, make_sid
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.util import ObjectIdU32
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from eive_tmtc.config.object_ids import STR_ASSEMBLY, STAR_TRACKER_ID
+
+_LOGGER = logging.getLogger(__name__)
 
 
-LOGGER = get_console_logger()
-
-
-class StarTrackerActionIds:
+class StarTrackerActionId(enum.IntEnum):
     PING = 0
     BOOT = 1
     REQ_VERSION = 2
@@ -58,7 +65,6 @@ class StarTrackerActionIds:
     CHANGE_DOWNLOAD_IMAGE = 57
     SET_JSON_FILE_NAME = 58
     SET_FLASH_READ_FILENAME = 59
-    SET_TIME = 60
     DOWNLOAD_DBIMAGE = 61
     DOWNLOAD_BLOBPIXEL = 62
     DOWNLOAD_FPGA_IMAGE = 63
@@ -83,14 +89,46 @@ class StarTrackerActionIds:
     LOG_SUBSCRIPTION = 82
     DEBUG_CAMERA = 83
     FIRMWARE_UPDATE = 84
+    SET_TIME_FROM_SYS_TIME = 87
 
 
 class OpCodes:
-    NORMAL = ["2", "nml"]
+    ON_BOOTLOADER = "on_bootloader"
+    ON_FIRMWARE = "on_firmware"
+    NORMAL = "nml"
+    OFF = "off"
+    PING = "ping"
+    REQUEST_SOLUTION_SET_HK = "hk_req_sol"
+    REQUEST_SOLUTION_SET_ACTION = "action_req_sol"
+    TAKE_IMAGE = "take_image"
+    UPLOAD_IMAGE = "upload_image"
+    SET_IMG_PROCESSOR_MODE = "set_img_proc_mode"
+    FW_UPDATE = "fw_update"
+    SET_TIME_FROM_SYS_TIME = "set_time"
 
 
-class SetIds:
+class Info:
+    REQUEST_SOLUTION_SET_HK = "Request Solution Set HK once"
+    REQUEST_SOLUTION_SET_ACTION = "Request Solution Set Action"
+    UPLOAD_IMAGE = "Upload Image"
+    TAKE_IMAGE = "Take Image"
+    SET_IMG_PROCESSOR_MODE = "Set Image Processor Mode"
+    FW_UPDATE = "Firmware Update"
+    SET_TIME_FROM_SYS_TIME = "Set time from system time"
+
+
+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:
@@ -102,39 +140,42 @@ class FileDefs:
     egse_histogram_upload_img_config = (
         "/home/pi/arcsec/json/upload-image-histogram.json"
     )
-    q7s_ground_config = "/mnt/sd0/startracker/json/ground-config.json"
+    q7s_ground_config = "/mnt/sd0/startracker/ground-config.json"
     q7s_flight_config = "/mnt/sd0/startracker/flight-config.json"
     firmware2_1 = "/home/pi/arcsec/firmware/sagitta-2-1.bin"
     firmware22_1 = "/home/pi/arcsec/firmware/sagitta-22-1.bin"
     firmware_origin = "/home/pi/arcsec/firmware/sagitta-origin.bin"
+    FW_SLOT_Q7S = "/mnt/sd0/startracker/updates/sagitta-update.bin"
 
 
 json_dict = {
-    "1": ["Q7S flight config", FileDefs.q7s_flight_config],
-    "2": ["Q7S ground config", FileDefs.q7s_ground_config],
-    "3": ["EGSE flight config", FileDefs.egse_flight_config],
-    "4": ["EGSE ground config", FileDefs.egse_ground_config],
-    "5": [
+    "1": ("Q7S flight config", FileDefs.q7s_flight_config),
+    "2": ("Q7S ground config", FileDefs.q7s_ground_config),
+    "3": ("EGSE flight config", FileDefs.egse_flight_config),
+    "4": ("EGSE ground config", FileDefs.egse_ground_config),
+    "5": (
         "EGSE get solution, upload image config",
         FileDefs.egse_solution_upload_img_config,
-    ],
-    "6": [
+    ),
+    "6": (
         "EGSE get histogram, upload image config",
         FileDefs.egse_solution_upload_img_config,
-    ],
+    ),
 }
 
-firmware_dict = {
-    "1": ["Firmware Major = 2, Minor = 1", FileDefs.firmware2_1],
-    "2": ["Firmware Major = 22, Minor = 1", FileDefs.firmware22_1],
-    "3": ["Firmware Origin", FileDefs.firmware_origin],
+FW_DICT = {
+    "0": ("Firmware Update Q7S", FileDefs.FW_SLOT_Q7S),
+    "1": ("Firmware Major = 2, Minor = 1", FileDefs.firmware2_1),
+    "2": ("Firmware Major = 22, Minor = 1", FileDefs.firmware22_1),
+    "3": ("Firmware Origin", FileDefs.firmware_origin),
 }
 
-upload_image_dict = {
-    "1": ["q7s gemma", "/mnt/sd0/startracker/gemma.bin"],
-    "2": ["egse gemma", "/home/pi/arcsec/star-images/gemma.bin"],
-    "3": ["q7s polaris", "/mnt/sd0/startracker/polaris.bin"],
-    "4": ["egse polaris", "/home/pi/arcsec/star-images/polaris.bin"],
+UPLOAD_IMAGE_DICT = {
+    "0": ("custom path", "Custom Path"),
+    "1": ("q7s gemma", "/mnt/sd0/startracker/gemma.bin"),
+    "2": ("egse gemma", "/home/pi/arcsec/star-images/gemma.bin"),
+    "3": ("q7s polaris", "/mnt/sd0/startracker/polaris.bin"),
+    "4": ("egse polaris", "/home/pi/arcsec/star-images/polaris.bin"),
 }
 
 
@@ -149,91 +190,103 @@ class PartitionSize:
     STAR_TRACKER_FIRMWARE = 464572
 
 
-class Submode:
+class Submode(enum.IntEnum):
+    DEFAULT = 0
     BOOTLOADER = 1
     FIRMWARE = 2
 
 
-def pack_star_tracker_commands(
+def prompt_object_id_mode_cmd() -> bytes:
+    cmd_assy = input("Command Assembly (0) or Device Handler (1) ?: ")
+    if cmd_assy == "0":
+        return STR_ASSEMBLY
+    else:
+        return STAR_TRACKER_ID
+
+
+def pack_star_tracker_commands(  # noqa C901
     object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
     q.add_log_cmd(
         f"Generate command for star tracker with object id: {object_id.as_hex_string}"
     )
     obyt = object_id.as_bytes
-    if op_code == "0":
+    if op_code == OpCodes.ON_BOOTLOADER:
         q.add_log_cmd("Star tracker: Mode On, Submode Bootloader")
-        data = pack_mode_data(obyt, Modes.ON, Submode.BOOTLOADER)
+        data = pack_mode_data(prompt_object_id_mode_cmd(), Mode.ON, Submode.BOOTLOADER)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "1":
+    if op_code == OpCodes.ON_FIRMWARE:
         q.add_log_cmd("Star tracker: Mode On, Submode Firmware")
-        data = pack_mode_data(obyt, Modes.ON, Submode.FIRMWARE)
+        data = pack_mode_data(prompt_object_id_mode_cmd(), Mode.ON, Submode.FIRMWARE)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "2":
+    if op_code == OpCodes.NORMAL:
         q.add_log_cmd("Star tracker: Mode Normal")
-        data = pack_mode_data(obyt, Modes.NORMAL, 0)
+        data = pack_mode_data(prompt_object_id_mode_cmd(), Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "3":
+    if op_code == OpCodes.OFF:
         q.add_log_cmd("Star tracker: Mode Off")
-        data = pack_mode_data(obyt, Modes.OFF, 0)
+        data = pack_mode_data(prompt_object_id_mode_cmd(), Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
+    if op_code == OpCodes.REQUEST_SOLUTION_SET_HK:
+        q.add_log_cmd(Info.REQUEST_SOLUTION_SET_HK)
+        q.add_pus_tc(create_request_one_diag_command(make_sid(obyt, SetId.SOLUTION)))
+    if op_code == OpCodes.REQUEST_SOLUTION_SET_ACTION:
+        q.add_log_cmd("Star tracker: Request solution")
+        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_SOLUTION)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, 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":
+    if op_code == OpCodes.PING:
         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)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "15":
+    if op_code == OpCodes.UPLOAD_IMAGE:
         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 +297,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 +306,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 +315,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 +324,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 +333,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 +342,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 +351,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 +360,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 +369,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,46 +378,48 @@ 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))
-    if op_code == "27":
+    if op_code == OpCodes.TAKE_IMAGE:
         q.add_log_cmd("Star tracker: Take image")
-        actionid = int(input("Specify parameter ID (take image - 4): "))
+        actionid = int(
+            input("Specify parameter ID (4: take image, 7: get histogram): ")
+        )
         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 +432,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))
@@ -385,21 +440,16 @@ def pack_star_tracker_commands(
         q.add_log_cmd("Star tracker: Get checksum")
         data = pack_checksum_command(obyt)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "38":
-        q.add_log_cmd("Star tracker: Set time")
-        unix_time = 1640783543
-        data = (
-            obyt
-            + struct.pack("!I", StarTrackerActionIds.SET_TIME)
-            + struct.pack("!Q", unix_time)
-        )
+    if op_code == OpCodes.SET_TIME_FROM_SYS_TIME:
+        q.add_log_cmd(Info.SET_TIME_FROM_SYS_TIME)
+        data = obyt + struct.pack("!I", StarTrackerActionId.SET_TIME_FROM_SYS_TIME)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "39":
         q.add_log_cmd("Star tracker: Download Centroid")
         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 +458,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 +467,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,66 +477,38 @@ 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)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "44":
-        q.add_log_cmd("Star tracker: Download FPGA Image")
-        position = int(input("Start position: "))
-        length = int(input("Size to download: "))
-        data = (
-            obyt
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
-            + struct.pack("!I", position)
-            + struct.pack("!I", length)
-            + bytearray(FileDefs.downloadFpgaImagePath, "utf-8")
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "45":
-        q.add_log_cmd("Star tracker: Change donwload FPGA image file name")
-        data = (
-            obyt
-            + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
-            + bytearray(FileDefs.downloadFpgaImageName, "utf-8")
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "46":
-        q.add_log_cmd("Star tracker: Upload FPGA image")
-        data = (
-            obyt
-            + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
-            + bytearray(FileDefs.uploadFpgaImageName, "utf-8")
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "47":
         q.add_log_cmd("Star tracker: FPGA action")
         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")
+    if op_code == OpCodes.SET_IMG_PROCESSOR_MODE:
+        q.add_log_cmd(Info.SET_IMG_PROCESSOR_MODE)
         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 +516,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 +524,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 +591,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,31 +600,19 @@ 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))
-    if op_code == "69":
-        q.add_log_cmd("Star tracker: Firmware update")
+    if op_code == OpCodes.FW_UPDATE:
+        q.add_log_cmd(Info.FW_UPDATE)
         firmware = get_firmware()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionIds.FIRMWARE_UPDATE)
-            + bytearray(firmware, "utf-8")
+            + struct.pack("!I", StarTrackerActionId.FIRMWARE_UPDATE)
+            + firmware.encode()
         )
         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
-        )
-        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
-        )
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
 
 
 def pack_read_command(object_id: bytes) -> bytearray:
@@ -613,7 +623,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 +637,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 +646,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,16 +654,207 @@ def get_config_file() -> str:
 
 
 def get_firmware() -> str:
-    LOGGER.info("Specify firmware file")
-    input_helper = InputHelper(firmware_dict)
-    key = input_helper.get_key()
-    firmware = firmware_dict[key][1]
+    _LOGGER.info("Specify firmware file")
+    bin_select = int(input("Use hardcoded paths (0) or specify path manually (1) ?: "))
+    if bin_select == 0:
+        input_helper = InputHelper(FW_DICT)
+        key = input_helper.get_key()
+        firmware = FW_DICT[key][1]
+    else:
+        firmware = input("Specify absolute path of the firmware update file: ")
     return firmware
 
 
 def get_upload_image() -> str:
-    LOGGER.info("Specify image to upload")
-    input_helper = InputHelper(upload_image_dict)
+    _LOGGER.info("Specify image to upload")
+    input_helper = InputHelper(UPLOAD_IMAGE_DICT)
     key = input_helper.get_key()
-    image = upload_image_dict[key][1]
+    if UPLOAD_IMAGE_DICT[key][0] == "custom path":
+        image = input("Please specify custom absolute path: ")
+    else:
+        image = UPLOAD_IMAGE_DICT[key][1]
     return image
+
+
+def handle_str_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
+    pw.dlog(f"Received STR HK set with set ID {set_id}")
+    if set_id == SetId.SOLUTION:
+        handle_solution_set(hk_data, pw)
+    elif set_id == SetId.TEMPERATURE:
+        handle_temperature_set(hk_data, pw)
+    else:
+        _LOGGER.warning(f"HK parsing for Star Tracker set ID {set_id} unimplemented")
+
+
+def unpack_time_hk(hk_data: bytes, current_idx: int, pw: PrintWrapper) -> int:
+    ticks_time_fmt = "!IQ"
+    fmt_len = struct.calcsize(ticks_time_fmt)
+    (ticks, unix_time) = struct.unpack(
+        ticks_time_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    unix_as_dt = datetime.datetime.fromtimestamp(
+        int(round(unix_time / 1e6)), tz=datetime.timezone.utc
+    )
+    pw.dlog(f"Ticks: {ticks} | UNIX time: {unix_time}")
+    pw.dlog(f"UNIX as datetime: {unix_as_dt}")
+    current_idx += fmt_len
+    return current_idx
+
+
+def handle_temperature_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received temperature set")
+    if len(hk_data) < 24:
+        _LOGGER.warning(f"Temperature dataset HK with length {len(hk_data)} too short")
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    temps_fmt = "!fff"
+    fmt_len = struct.calcsize(temps_fmt)
+    (mcu_temp, cmos_temp, fpga_temp) = struct.unpack(
+        temps_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    pw.dlog(f"MCU Temperature: {mcu_temp}")
+    pw.dlog(f"CMOS Temperature: {cmos_temp}")
+    pw.dlog(f"FPGA Temperature: {fpga_temp}")
+    current_idx += fmt_len
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 5)
+
+
+def handle_solution_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received solution set")
+    if len(hk_data) < 78:
+        _LOGGER.warning(
+            f"Solution dataset HK data with length {len(hk_data)} too short"
+        )
+        return
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    calib_quaternions_fmt = "!ffff"
+    fmt_len = struct.calcsize(calib_quaternions_fmt)
+    (calib_q_w, calib_q_x, calib_q_y, calib_q_z) = struct.unpack(
+        calib_quaternions_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    pw.dlog("Calibrated Quaternions")
+    pw.dlog(f"Quaternion w: {calib_q_w}")
+    pw.dlog(f"Quaternion x: {calib_q_x}")
+    pw.dlog(f"Quaternion y: {calib_q_y}")
+    pw.dlog(f"Quaternion z: {calib_q_z}")
+    current_idx += fmt_len
+    track_fmt = "!fffff"
+    fmt_len = struct.calcsize(track_fmt)
+    (track_confidence, track_q_w, track_q_x, track_q_y, track_q_z) = struct.unpack(
+        track_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    pw.dlog(f"Track Confidence: {track_confidence}")
+    pw.dlog(f"Track QW: {track_q_w}")
+    pw.dlog(f"Track QX: {track_q_x}")
+    pw.dlog(f"Track QY: {track_q_y}")
+    pw.dlog(f"Track QZ: {track_q_z}")
+    current_idx += fmt_len
+    track_removed = hk_data[current_idx]
+    pw.dlog(f"Number of stars removed from tracking solution: {track_removed}")
+    current_idx += 1
+    stars_centroided = hk_data[current_idx]
+    pw.dlog(f"Centroided stars: {stars_centroided}")
+    current_idx += 1
+    stars_matched_database = hk_data[current_idx]
+    pw.dlog(f"Stars matched: {stars_matched_database}")
+    current_idx += 1
+    # Result of LISA: Lost in space algorithm
+    lisa_fmt = "!fffffB"
+    fmt_len = struct.calcsize(lisa_fmt)
+    (
+        lisa_q_w,
+        lisa_q_x,
+        lisa_q_y,
+        lisa_q_z,
+        lisa_percentage_close_stars,
+        lisa_number_close_stars,
+    ) = struct.unpack(lisa_fmt, hk_data[current_idx : current_idx + fmt_len])
+    pw.dlog(f"LISA QW: {lisa_q_w}")
+    pw.dlog(f"LISA QX: {lisa_q_x}")
+    pw.dlog(f"LISA QY: {lisa_q_y}")
+    pw.dlog(f"LISA QZ: {lisa_q_z}")
+    pw.dlog(
+        f"Percentage of close stars in LISA solution: {lisa_percentage_close_stars}"
+    )
+    pw.dlog(f"Number of close stars in LISA solution: {lisa_number_close_stars}")
+    current_idx += fmt_len
+    str_mode = hk_data[current_idx]
+    pw.dlog(f"STR mode: {str_mode}")
+    current_idx += 1
+    is_trustworthy = hk_data[current_idx]
+    pw.dlog(f"Trustworthy solution: {is_trustworthy}")
+    current_idx += 1
+    stable_count = struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+    pw.dlog(f"Stable count: {stable_count}")
+    current_idx += 4
+    solution_strategy = hk_data[current_idx]
+    pw.dlog(f"Solution strategy: {solution_strategy}")
+    current_idx += 1
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 23)
+
+
+@tmtc_definitions_provider
+def add_str_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCodes.ON_BOOTLOADER, "Mode On, Submode Bootloader")
+    oce.add(OpCodes.ON_FIRMWARE, "Mode On, Submode Firmware")
+    oce.add(OpCodes.NORMAL, "Mode Normal")
+    oce.add(OpCodes.OFF, "Mode Off")
+    # oce.add("4", "Star Tracker: Mode Raw")
+    oce.add(OpCodes.PING, "Star Tracker: Ping")
+    oce.add(OpCodes.TAKE_IMAGE, "Take Image")
+    oce.add(OpCodes.REQUEST_SOLUTION_SET_HK, Info.REQUEST_SOLUTION_SET_HK)
+    oce.add(OpCodes.REQUEST_SOLUTION_SET_ACTION, Info.REQUEST_SOLUTION_SET_ACTION)
+    oce.add(OpCodes.UPLOAD_IMAGE, Info.UPLOAD_IMAGE)
+    oce.add(OpCodes.SET_IMG_PROCESSOR_MODE, Info.SET_IMG_PROCESSOR_MODE)
+    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("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("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("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(OpCodes.FW_UPDATE, Info.FW_UPDATE)
+    oce.add("70", "Star Tracker: Disable timestamp generation")
+    oce.add("71", "Star Tracker: Enable timestamp generation")
+    oce.add(OpCodes.SET_TIME_FROM_SYS_TIME, Info.SET_TIME_FROM_SYS_TIME)
+    defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)

eive_tmtc/tmtc/acs/str_img_helper.py

@@ -4,7 +4,8 @@
 @brief  Commanding of the star tracker image helper object which is responsible for uploading
         and downloading images to/from the star tracker.
 @details    Images to uplaod must be previously transferred to the OBC with the CFDP protocol.
-            Also downloaded images will be stored on the filesystem of the OBC and can be transferred via CFDP.
+            Also downloaded images will be stored on the filesystem of the OBC and can be
+            transferred via CFDP.
 @author J. Meier
 @date   29.11.2021
 """

eive_tmtc/tmtc/acs/subsystem.py

@@ -1,6 +1,7 @@
 import enum
 from typing import Tuple, Dict
 
+from eive_tmtc.tmtc.acs.defs import AcsMode, SafeSubmode
 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
@@ -10,42 +11,44 @@ from tmtccmd.config.tmtc import (
     TmtcDefinitionWrapper,
     OpCodeEntry,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 
 
-class OpCodes(str, enum.Enum):
+class OpCode(str, enum.Enum):
     OFF = "off"
     SAFE = "safe"
     DETUMBLE = "detumble"
     IDLE = "idle"
-    TARGET_PT = "target"
+    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 AcsModes(enum.IntEnum):
-    OFF = 0
-    SAFE = 1 << 24
-    DETUMBLE = 2 << 24
-    IDLE = 3 << 24
-    TARGET_PT = 4 << 24
-
-
 class Info(str, enum.Enum):
     OFF = "Off Command"
     SAFE = "Safe Mode Command"
     DETUMBLE = "Detumble Mode Command"
     IDLE = "Idle Mode Command"
-    TARGET_PT = "Target Pointing 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]] = {
-    OpCodes.OFF: (AcsModes.OFF, Info.OFF),
-    OpCodes.IDLE: (AcsModes.IDLE, Info.IDLE),
-    OpCodes.SAFE: (AcsModes.SAFE, Info.SAFE),
-    OpCodes.DETUMBLE: (AcsModes.DETUMBLE, Info.DETUMBLE),
+HANDLER_LIST: Dict[str, Tuple[int, int, str]] = {
+    OpCode.OFF: (AcsMode.OFF, 0, Info.OFF),
+    OpCode.SAFE: (AcsMode.SAFE, SafeSubmode.DEFAULT, Info.SAFE),
+    OpCode.DETUMBLE: (AcsMode.SAFE, SafeSubmode.DETUMBLE, Info.DETUMBLE),
+    OpCode.IDLE: (AcsMode.IDLE, 0, Info.IDLE),
+    OpCode.PTG_TARGET: (AcsMode.PTG_TARGET, 0, Info.PTG_TARGET),
+    OpCode.PTG_TARGET_GS: (AcsMode.PTG_TARGET_GS, 0, Info.PTG_TARGET_GS),
+    OpCode.PTG_TARGET_NADIR: (AcsMode.PTG_NADIR, 0, Info.PTG_TARGET_NADIR),
+    OpCode.PTG_TARGET_INERTIAL: (AcsMode.PTG_INERTIAL, 0, Info.PTG_TARGET_INERTIAL),
 }
 
 
@@ -54,7 +57,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
     op_code = p.op_code
     q = p.queue_helper
     info_prefix = "ACS Subsystem"
-    if op_code in OpCodes.REPORT_ALL_MODES:
+    if op_code in OpCode.REPORT_ALL_MODES:
         q.add_log_cmd(f"{info_prefix}: {Info.REPORT_ALL_MODES}")
         q.add_pus_tc(
             PusTelecommand(
@@ -68,9 +71,9 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
         return
     pack_mode_cmd_with_info(
         object_id=ACS_SUBSYSTEM_ID,
-        info=f"{info_prefix}: {mode_info_tup[1]}",
-        submode=0,
+        info=f"{info_prefix}: {mode_info_tup[2]}",
         mode=mode_info_tup[0],
+        submode=mode_info_tup[1],
         q=q,
     )
 
@@ -78,8 +81,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
 @tmtc_definitions_provider
 def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(OpCodes.OFF, Info.OFF)
-    oce.add(OpCodes.SAFE, Info.SAFE)
-    oce.add(OpCodes.IDLE, Info.IDLE)
-    oce.add(OpCodes.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
+    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 enum
 import struct
 
 from eive_tmtc.pus_tm.defs import PrintWrapper
-from eive_tmtc.pus_tc.devs.sus import SetIds
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+
+class SetId(enum.IntEnum):
+    HK = 3
 
 
 def handle_sus_hk(
-    object_id: ObjectIdU32, hk_data: bytes, printer: FsfwTmTcPrinter, set_id: int
+    object_id: ObjectIdU32, hk_data: bytes, pw: PrintWrapper, 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
@@ -20,7 +23,9 @@ def handle_sus_hk(
             channels.append(struct.unpack("!H", hk_data[current_idx : current_idx + 2]))
             current_idx += 2
         pw.dlog(f"Temperature: {temperature} C")
-        pw.dlog(f"AIN Channel | Raw Value (hex) | Raw Value (dec)")
+        pw.dlog("AIN Channel | Raw Value (hex) | Raw Value (dec)")
         for idx, val in enumerate(channels):
             pw.dlog(f"{idx} | {val[0]:#06x} |" + str(val[0]).ljust(5))
-        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=7)
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=hk_data[current_idx:], num_vars=7
+        )

eive_tmtc/tmtc/acs/sus_board.py

@@ -1,6 +1,6 @@
 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 DualSideSubmodes
+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,
@@ -9,10 +9,10 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider, DefaultPusQueueHelper
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 
 
-class SusOpCodes:
+class SusOpCode:
     SUS_ASS_NOM_SIDE = ["0", "nom"]
     SUS_ASS_RED_SIDE = ["1", "red"]
     SUS_ASS_DUAL_MODE = ["2", "dual"]
@@ -20,35 +20,35 @@ class SusOpCodes:
 
 
 def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in SusOpCodes.SUS_ASS_NOM_SIDE:
+    if op_code in SusOpCode.SUS_ASS_NOM_SIDE:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.A_SIDE,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.A_SIDE,
             q=q,
             info="Switching to SUS board to nominal side",
         )
-    if op_code in SusOpCodes.SUS_ASS_RED_SIDE:
+    if op_code in SusOpCode.SUS_ASS_RED_SIDE:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.B_SIDE,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.B_SIDE,
             q=q,
             info="Switching to SUS board to redundant side",
         )
-    if op_code in SusOpCodes.SUS_ASS_OFF:
+    if op_code in SusOpCode.SUS_ASS_OFF:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.OFF,
+            mode=Mode.OFF,
             submode=0,
             q=q,
             info="Switching SUS board off",
         )
-    if op_code in SusOpCodes.SUS_ASS_DUAL_MODE:
+    if op_code in SusOpCode.SUS_ASS_DUAL_MODE:
         pack_mode_cmd_with_info(
             object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.DUAL_SIDE,
+            mode=Mode.NORMAL,
+            submode=DualSideSubmode.DUAL_SIDE,
             q=q,
             info="Switching to SUS board to dual side",
         )
@@ -65,19 +65,19 @@ def pack_sus_cmds_prvoider(p: ServiceProviderParams):
 def add_sus_board_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(
-        keys=SusOpCodes.SUS_ASS_NOM_SIDE,
+        keys=SusOpCode.SUS_ASS_NOM_SIDE,
         info="Switch SUS board to nominal side",
     )
     oce.add(
-        keys=SusOpCodes.SUS_ASS_RED_SIDE,
+        keys=SusOpCode.SUS_ASS_RED_SIDE,
         info="Switch SUS board to redundant side",
     )
     oce.add(
-        keys=SusOpCodes.SUS_ASS_OFF,
+        keys=SusOpCode.SUS_ASS_OFF,
         info="Switch off SUS board",
     )
     oce.add(
-        keys=SusOpCodes.SUS_ASS_DUAL_MODE,
+        keys=SusOpCode.SUS_ASS_DUAL_MODE,
         info="Switch SUS board to dual mode",
     )
     defs.add_service(

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
+
+
+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
+    DATARATE_DEFAULT = 3
+
+
+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_command(  # noqa C901
+    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/defs.py

@@ -0,0 +1,10 @@
+import enum
+
+
+class Mode(enum.IntEnum):
+    NONE = 0
+    RX_ONLY = 10
+    RX_AND_TX_DEF_DATARATE = 11
+    RX_AND_TX_LOW_DATARATE = 12
+    RX_AND_TX_HIGH_DATARATE = 13
+    RX_AND_TX_CARRIER_WAVE = 14

eive_tmtc/tmtc/com/pdec_handler.py

@@ -0,0 +1,123 @@
+# -*- coding: utf-8 -*-
+"""
+@file   pdec_handler.py
+@brief  Test commanding of PDEC Handler
+@author J. Meier
+@date   22.11.2021
+"""
+import enum
+
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc import DefaultPusQueueHelper
+
+from tmtccmd.tc.pus_20_fsfw_param import create_load_param_cmd
+from tmtccmd.tc.pus_8_fsfw_funccmd import create_action_cmd
+from tmtccmd.pus.s20_fsfw_param_defs import create_scalar_u8_parameter
+
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+
+from eive_tmtc.config.definitions import CustomServiceList
+
+
+class CommandId:
+    # prints the clcw to the console. Useful for debugging
+    PRINT_CLCW = bytearray([0x0, 0x0, 0x0, 0x0])
+    # Print PDEC monitor register
+    PRINT_PDEC_MON = bytearray([0x0, 0x0, 0x0, 0x1])
+
+
+class ParameterId(enum.IntEnum):
+    POSITIVE_WINDOW = 0
+    NEGATIVE_WINDOW = 1
+
+
+class ActionId(enum.IntEnum):
+    RESET_NO_INIT = 2
+    RESET_WITH_INIT = 3
+
+
+class OpCode:
+    PRINT_CLCW = "print_clcw"
+    PRINT_MON_REG = "print_mon_reg"
+    POSITIVE_WINDOW = "positive_window"
+    NEGATIVE_WINDOW = "negative_window"
+    RESET_WITH_INIT = "reset_with_init"
+    RESET_NO_INIT = "reset_no_init"
+
+
+class Info:
+    PRINT_CLCW = "Will cause the OBSW to print the current CLCW to the debug console"
+    PRINT_MON_REG = (
+        "Will cause the OBSW to print the PDEC monitor register to the console"
+    )
+    POSITIVE_WINDOW = "Change positive window parameter for AD frames"
+    NEGATIVE_WINDOW = "Change negative window parameter for AD frames"
+    RESET_WITH_INIT = "Reset with full initialization"
+    RESET_NO_INIT = "Reset with mandatory initialization"
+
+
+def pack_pdec_handler_test(
+    object_id: bytearray, q: DefaultPusQueueHelper, op_code: str
+):
+    q.add_log_cmd(f"Testing PDEC handler with object id: {object_id.hex()}")
+    prefix = "PDEC Handler "
+    if op_code == OpCode.PRINT_CLCW:
+        q.add_log_cmd(f"{prefix}: {Info.PRINT_CLCW}")
+        command = object_id + CommandId.PRINT_CLCW
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == OpCode.PRINT_MON_REG:
+        q.add_log_cmd(f"{prefix}: {Info.PRINT_MON_REG}")
+        command = object_id + CommandId.PRINT_PDEC_MON
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == OpCode.POSITIVE_WINDOW:
+        q.add_log_cmd(f"{prefix}: {Info.POSITIVE_WINDOW}")
+        pw = int(input("Specify positive window to set: "))
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_u8_parameter(
+                    object_id,
+                    0,
+                    ParameterId.POSITIVE_WINDOW,
+                    pw,
+                )
+            )
+        )
+    if op_code == OpCode.NEGATIVE_WINDOW:
+        q.add_log_cmd(f"{prefix}: {Info.NEGATIVE_WINDOW}")
+        nw = int(input("Specify negative window to set: "))
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_u8_parameter(
+                    object_id,
+                    0,
+                    ParameterId.NEGATIVE_WINDOW,
+                    nw,
+                )
+            )
+        )
+    if op_code == OpCode.RESET_NO_INIT:
+        q.add_log_cmd(f"{prefix}: {Info.RESET_NO_INIT}")
+        q.add_pus_tc(
+            create_action_cmd(object_id=object_id, action_id=ActionId.RESET_NO_INIT)
+        )
+    if op_code == OpCode.RESET_WITH_INIT:
+        q.add_log_cmd(f"{prefix}: {Info.RESET_WITH_INIT}")
+        q.add_pus_tc(
+            create_action_cmd(object_id=object_id, action_id=ActionId.RESET_WITH_INIT)
+        )
+
+
+@tmtc_definitions_provider
+def add_pdec_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.PRINT_CLCW, Info.PRINT_CLCW)
+    oce.add(OpCode.PRINT_MON_REG, Info.PRINT_MON_REG)
+    oce.add(OpCode.POSITIVE_WINDOW, Info.POSITIVE_WINDOW)
+    oce.add(OpCode.NEGATIVE_WINDOW, Info.NEGATIVE_WINDOW)
+    oce.add(OpCode.RESET_WITH_INIT, Info.RESET_WITH_INIT)
+    oce.add(OpCode.RESET_NO_INIT, Info.RESET_NO_INIT)
+    defs.add_service(CustomServiceList.PDEC_HANDLER.value, "PDEC Handler", oce)

eive_tmtc/tmtc/com/subsystem.py

@@ -0,0 +1,152 @@
+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.pus.s20_fsfw_param_defs import create_scalar_u8_parameter
+
+from .defs import Mode as ComMode
+
+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,
+    create_read_mode_command,
+    create_announce_mode_command,
+    create_announce_mode_recursive_command,
+)
+from tmtccmd.tc.pus_20_fsfw_param import (
+    create_load_param_cmd,
+)
+
+from tmtccmd.pus.s20_fsfw_param import create_scalar_u32_parameter
+
+
+class ParameterId(enum.IntEnum):
+    DATARATE = 0
+    TRANSMITTER_TIMEOUT = 1
+
+
+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"
+    CHANGE_TRANSMITTER_TIMEOUT = "change_transmitter_timeout"
+    READ_MODE = "read_mode"
+    ANNOUNCE_MODE = "announce_mode"
+    ANNOUNCE_MODE_RECURSIVE = "announce_mode_recursive"
+
+
+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)"
+    CHANGE_TRANSMITTER_TIMEOUT = "Changes the transmitter timeout"
+    READ_MODE = "Read Mode"
+    ANNOUNCE_MODE = "Announce Mode"
+    ANNOUNCE_MODE_RECURSIVE = "Announce mode recursively"
+
+
+@service_provider(CustomServiceList.COM_SS)
+def build_com_subsystem_cmd(p: ServiceProviderParams):  # noqa C901
+    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, ComMode.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, ComMode.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, ComMode.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, ComMode.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(
+                create_scalar_u8_parameter(
+                    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(
+                create_scalar_u8_parameter(
+                    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, ComMode.RX_AND_TX_CARRIER_WAVE, 0)
+        )
+    elif o == OpCode.CHANGE_TRANSMITTER_TIMEOUT:
+        timeout = int(input("Specify timeout to set [ms]: "))
+        q.add_log_cmd(Info.CHANGE_TRANSMITTER_TIMEOUT)
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_u32_parameter(
+                    COM_SUBSYSTEM_ID,
+                    0,
+                    ParameterId.TRANSMITTER_TIMEOUT,
+                    timeout,
+                )
+            )
+        )
+    elif o == OpCode.READ_MODE:
+        q.add_log_cmd(Info.READ_MODE)
+        q.add_pus_tc(create_read_mode_command(COM_SUBSYSTEM_ID))
+    elif o == OpCode.ANNOUNCE_MODE:
+        q.add_log_cmd(Info.ANNOUNCE_MODE)
+        q.add_pus_tc(create_announce_mode_command(COM_SUBSYSTEM_ID))
+    elif o == OpCode.ANNOUNCE_MODE_RECURSIVE:
+        q.add_log_cmd(Info.ANNOUNCE_MODE_RECURSIVE)
+        q.add_pus_tc(create_announce_mode_recursive_command(COM_SUBSYSTEM_ID))
+
+
+@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)
+    oce.add(OpCode.CHANGE_TRANSMITTER_TIMEOUT, Info.CHANGE_TRANSMITTER_TIMEOUT)
+    oce.add(OpCode.READ_MODE, Info.READ_MODE)
+    oce.add(OpCode.ANNOUNCE_MODE, Info.ANNOUNCE_MODE)
+    oce.add(OpCode.ANNOUNCE_MODE_RECURSIVE, Info.ANNOUNCE_MODE_RECURSIVE)
+    defs.add_service(CustomServiceList.COM_SS, "COM Subsystem", oce)

eive_tmtc/tmtc/com/syrlinks_handler.py

@@ -0,0 +1,428 @@
+# -*- coding: utf-8 -*-
+"""
+@file   syrlinks_hk_handler.py
+@brief  Syrlinks Hk Handler tests
+@author J. Meier
+@date   13.12.2020
+"""
+import enum
+import logging
+import math
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.tmtc.com.defs import Mode as ComMode
+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_request_one_hk_command,
+    create_enable_periodic_hk_command_with_interval_with_diag,
+    create_disable_periodic_hk_command_with_diag,
+)
+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.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+
+class SetId(enum.IntEnum):
+    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"
+    HK_TEMPS = "hk_temps"
+    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"
+    HK_TEMPS = "Request Temperatures HK"
+    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 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(OpCode.HK_TEMPS, Info.HK_TEMPS)
+    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(  # noqa C901: Complexity okay here.
+    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, ComMode.RX_ONLY))
+    if op_code == OpCode.NORMAL_RX_ONLY:
+        normal_mode_cmd(q, Info.NORMAL_RX_ONLY, ComMode.RX_ONLY)
+    if op_code == OpCode.NORMAL_RX_AND_TX_LOW_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_LOW_DATARATE, ComMode.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, ComMode.RX_AND_TX_DEF_DATARATE
+        )
+    if op_code == OpCode.NORMAL_RX_AND_TX_HIGH_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_HIGH_DATARATE, ComMode.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, ComMode.RX_AND_TX_CARRIER_WAVE)
+    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.HK_TEMPS:
+        q.add_log_cmd(f"{prefix}: {Info.HK_TEMPS}")
+        sid = make_sid(obyt, SetId.TEMPERATURE_SET_ID)
+        q.add_pus_tc(create_request_one_hk_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_with_diag(
+            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_with_diag(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_with_diag(
+            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_with_diag(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(pw: PrintWrapper, set_id: int, hk_data: bytes):
+    if set_id == SetId.RX_REGISTERS_DATASET:
+        return handle_syrlinks_rx_registers_dataset(pw, hk_data)
+    elif set_id == SetId.TX_REGISTERS_DATASET:
+        return handle_syrlinks_tx_registers_dataset(pw, hk_data)
+    elif set_id == SetId.TEMPERATURE_SET_ID:
+        return handle_syrlinks_temp_dataset(pw, hk_data)
+    else:
+        pw.dlog(f"Service 3 TM: Syrlinks handler reply with unknown set ID {set_id}")
+
+
+def handle_syrlinks_temp_dataset(pw: PrintWrapper, hk_data: bytes):
+    if len(hk_data) < 8:
+        raise ValueError("expected  at least 8 bytes of HK data")
+    temp_power_amplifier = struct.unpack("!f", hk_data[0:4])[0]
+    temp_baseband_board = struct.unpack("!f", hk_data[4:8])[0]
+    pw.dlog(f"Temperatur Power Amplifier [C]: {temp_power_amplifier}")
+    pw.dlog(f"Temperatur Baseband Board [C]: {temp_baseband_board}")
+    pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[8:], 2))
+
+
+def handle_syrlinks_rx_registers_dataset(pw: PrintWrapper, hk_data: bytes):
+    header_list = [
+        "RX Status",
+        "RX Sensitivity",
+        "RX Frequency Shift",
+        "RX IQ Power",
+        "RX AGC Value (Raw)",
+        "RX Demod Eb",
+        "RX Demod N0",
+        "RX Datarate [kbps]",
+    ]
+    rx_status = hk_data[0]
+    carrier_detect = rx_status & 0b1
+    carrier_lock = (rx_status >> 1) & 0b1
+    data_lock = (rx_status >> 2) & 0b1
+    data_valid = (rx_status >> 3) & 0b1
+    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_agc_inhibit = (rx_agc_value >> 15) & 0b1
+    rx_agc = rx_agc_value & 0xFFF
+    rx_demod_eb = struct.unpack("!I", hk_data[13:17])[0] & 0xFFFFFF
+    rx_demod_n0 = struct.unpack("!I", hk_data[17:21])[0] & 0xFFFFFF
+    if rx_demod_n0 > 0:
+        eb_to_n0 = 20 * math.log10(rx_demod_eb / rx_demod_n0) - 3
+    else:
+        logging.getLogger(__name__).warning(
+            "RX Demod N0 is 0, can not calculate Eb to N0"
+        )
+        eb_to_n0 = 0
+    rx_data_rate_raw = hk_data[21]
+    rx_data_rate = -1
+    if rx_data_rate_raw == 0:
+        rx_data_rate = 256
+    elif rx_data_rate_raw == 1:
+        rx_data_rate = 128
+    elif rx_data_rate_raw == 3:
+        rx_data_rate = 64
+    elif rx_data_rate_raw == 7:
+        rx_data_rate = 32
+    elif rx_data_rate_raw == 15:
+        rx_data_rate = 16
+    elif rx_data_rate_raw == 31:
+        rx_data_rate = 8
+    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}")
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(validity_buffer=validity_buffer, num_vars=8)
+    )
+    pw.dlog(f"Carrier Detect: {carrier_detect}")
+    pw.dlog(f"Carrier Lock: {carrier_lock}")
+    pw.dlog(f"Data Lock (data clock recovery loop lock status): {data_lock}")
+    pw.dlog(f"Data Valid (valid if TEB < 10e-5): {data_valid}")
+    pw.dlog(f"Data Lock (data clock recovery loop lock status): {data_lock}")
+    pw.dlog(f"RX AGC Inhibit: {rx_agc_inhibit}")
+    pw.dlog(f"RX AGC: {rx_agc}")
+    pw.dlog(f"Eb / E0RX [dB]: {eb_to_n0}")
+
+
+class TxConv(enum.IntEnum):
+    NO_CODING = 0b000
+    VITERBI_HALF_G1G2INV = 0b010
+    VITERBI_HALF = 0b111
+
+
+class TxStatus(enum.IntEnum):
+    NOT_AVAILABLE = 0b00
+    MODULATION = 0b01
+    CW = 0b10
+    STANDBY = 0b11
+
+
+class TxCfgSet(enum.IntEnum):
+    START_WITH_CURRENT_CFG = 0b00
+    START_WITH_CONF_0 = 0b01
+    START_WITH_CONF_1 = 0b10
+
+
+WAVEFORM_STRINGS = ["OFF", "CW", "QPSK", "0QPSK", "PCM/PM", "PSK/PM", "BPSK"]
+
+
+def handle_syrlinks_tx_registers_dataset(
+    pw: PrintWrapper,
+    hk_data: bytes,
+):
+    header_list = ["TX Status Raw", "TX Waveform", "TX AGC value"]
+    tx_status = hk_data[0]
+    """
+    try:
+        tx_conv = TxConv(tx_status & 0b111)
+    except ValueError:
+        logging.getLogger(__name__).warning(
+            f"invalid TX conv value {tx_status & 0b111}"
+        )
+        tx_conv = -1
+    tx_diff_encoder_enable = (tx_status >> 3) & 0b1
+    """
+    tx_status_status = TxStatus(tx_status & 0b11)
+    try:
+        tx_conf_set = TxCfgSet((tx_status >> 2) & 0b11)
+    except ValueError:
+        logging.getLogger(__name__).warning(
+            f"invalid TX conf set {(tx_status >> 2) & 0b11}"
+        )
+        tx_conf_set = -1
+    tx_clock_detect = (tx_status >> 4) & 0b1
+    tx_waveform = hk_data[1]
+    waveform = tx_waveform & 0b1111
+    try:
+        waveform_str = WAVEFORM_STRINGS[waveform]
+    except IndexError:
+        logging.getLogger(__name__).warning(f"Unknown waveform value {waveform}")
+        waveform_str = "Unknown"
+    pcm_mode = (tx_waveform >> 4) & 0b1
+    tx_agc_value = struct.unpack("!H", hk_data[2:4])[0]
+    tx_agc_inhibit = (tx_agc_value >> 15) & 0b1
+    tx_agc = tx_agc_value & 0xFFF
+    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}")
+    pw.dlog(
+        FsfwTmTcPrinter.get_validity_buffer(validity_buffer=validity_buffer, num_vars=3)
+    )
+    # pw.dlog(f"TX CONV: {tx_conv!r}")
+    # pw.dlog(f"TX DIFF (differential encoder enable): {tx_diff_encoder_enable}")
+    pw.dlog(f"TX Status: {tx_status_status!r}")
+    pw.dlog(f"TX Config Set: {tx_conf_set!r}")
+    pw.dlog(f"TX Clock Detect: {tx_clock_detect}")
+    pw.dlog(f"Waveform: {waveform_str}")
+    pw.dlog(f"PCM Mode: {pcm_mode}")
+    pw.dlog(f"TX AGC Inhibit: {tx_agc_inhibit}")
+    pw.dlog(f"TX AGC: {tx_agc}")

eive_tmtc/tmtc/common.py

@@ -2,13 +2,13 @@ from typing import Union
 
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+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, Modes],
+    mode: Union[int, Mode],
     submode: int,
     q: DefaultPusQueueHelper,
     info: str,
@@ -27,6 +27,6 @@ def pack_mode_cmd_with_info(
     )
     q.add_pus_tc(
         PusTelecommand(
-            service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=mode_data
+            service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=mode_data
         )
     )

eive_tmtc/tmtc/core.py

@@ -1,5 +1,8 @@
 import enum
+import logging
+import os
 import struct
+from pathlib import Path
 
 from eive_tmtc.pus_tm.defs import PrintWrapper
 
@@ -8,22 +11,41 @@ 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.tc.pus_20_fsfw_param import (
+    create_scalar_u8_parameter,
+    create_load_param_cmd,
+)
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
 from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 
-class ActionIds(enum.IntEnum):
-    LIST_DIR_INTO_FILE = 0
+class SdState(enum.IntEnum):
+    OFF = 0
+    ON = 1
+    MOUNTED = 2
+
+
+class SdCardSelect(enum.IntEnum):
+    SD_0 = 0
+    SD_1 = 1
+    BOTH = 2
+    NONE = 3
+
+
+class ActionId(enum.IntEnum):
+    ANNOUNCE_VERSION = 1
+    ANNOUNCE_CURRENT_IMAGE = 2
+    ANNOUNCE_BOOT_COUNTS = 3
     SWITCH_REBOOT_FILE_HANDLING = 5
     RESET_REBOOT_COUNTER = 6
     SWITCH_IMG_LOCK = 7
     SET_MAX_REBOOT_CNT = 8
+    READ_REBOOT_MECHANISM_INFO = 9
     UPDATE_OBSW_FROM_SD_0 = 10
     UPDATE_OBSW_FROM_SD_1 = 11
     UPDATE_OBSW_FROM_TMP = 12
@@ -32,46 +54,87 @@ class ActionIds(enum.IntEnum):
     SWITCH_TO_BOTH_SD_CARDS = 18
     XSC_REBOOT = 32
     FULL_REBOOT = 34
+    EXECUTE_SHELL_CMD_BLOCKING = 40
+    EXECUTE_SHELL_CMD_NON_BLOCKING = 41
+    SYSTEMCTL_CMD_EXECUTOR = 42
+    LIST_DIR_INTO_FILE = 50
+    LIST_DIR_DUMP_DIRECTLY = 51
+    CP_HELPER = 52
+    MV_HELPER = 53
+    RM_HELPER = 54
+    MKDIR_HELPER = 55
 
 
-class SetIds(enum.IntEnum):
+class ParamId(enum.IntEnum):
+    PREF_SD = 0
+
+
+class SetId(enum.IntEnum):
     HK = 5
 
 
-class OpCodes:
-    REBOOT_XSC = ["0", "reboot_xsc"]
-    XSC_REBOOT_SELF = ["1", "reboot_self"]
-    XSC_REBOOT_0_0 = ["2", "reboot_00"]
-    XSC_REBOOT_0_1 = ["3", "reboot_01"]
-    XSC_REBOOT_1_0 = ["4", "reboot_10"]
-    XSC_REBOOT_1_1 = ["5", "reboot_11"]
-    REBOOT_FULL = ["6", "reboot_regular"]
-    GET_HK = ["7", "get_hk"]
+class OpCode:
+    ANNOUNCE_VERSION = "announce_version"
+    ANNOUNCE_CURRENT_IMAGE = "announce_current_image"
+    ANNOUNCE_BOOT_COUNTS = "announce_boot_counts"
+    EXECUTE_SHELL_CMD_BLOCKING = "exec_cmd_blocking"
+    EXECUTE_SHELL_CMD_NON_BLOCKING = "exec_cmd_non_blocking"
+    SYSTEMCTL_CMD_EXECUTOR = "systemctl_cmd"
+    LIST_DIR_INTO_FILE = "list_dir_into_file"
+    LIST_DIR_DUMP_DIRECTLY = "list_dir_dump_directly"
+    CP_HELPER = "cp_helper"
+    MV_HELPER = "mv_helper"
+    RM_HELPER = "rm_helper"
+    MKDIR_HELPER = "mkdir_helper"
+    SET_PREF_SD = "set_pref_sd"
+    REBOOT_XSC = ["reboot_xsc"]
+    XSC_REBOOT_SELF = ["reboot_self"]
+    XSC_REBOOT_0_0 = ["reboot_00"]
+    XSC_REBOOT_0_1 = ["reboot_01"]
+    XSC_REBOOT_1_0 = ["reboot_10"]
+    XSC_REBOOT_1_1 = ["reboot_11"]
+    REBOOT_FULL = ["reboot_regular"]
+    GET_HK = ["get_hk"]
     OBSW_UPDATE_FROM_SD_0 = ["obsw_update_sd0"]
     OBSW_UPDATE_FROM_SD_1 = ["obsw_update_sd1"]
     OBSW_UPDATE_FROM_TMP = ["obsw_update_tmp"]
     SWITCH_TO_SD_0 = ["switch_to_sd_0"]
     SWITCH_TO_SD_1 = ["switch_to_sd_1"]
     SWITCH_TO_BOTH_SD_CARDS = ["switch_to_both_sd_cards"]
-    ENABLE_REBOOT_FILE_HANDLING = ["32", "rbh_off"]
-    DISABLE_REBOOT_FILE_HANDLING = ["33", "rbh_on"]
-    RESET_ALL_REBOOT_COUNTERS = ["34", "rbh_reset_a"]
-    RESET_REBOOT_COUNTER_00 = ["35", "rbh_reset_00"]
-    RESET_REBOOT_COUNTER_01 = ["36", "rbh_reset_01"]
-    RESET_REBOOT_COUNTER_10 = ["37", "rbh_reset_10"]
-    RESET_REBOOT_COUNTER_11 = ["38", "rbh_reset_11"]
-    SET_MAX_REBOOT_CNT = ["39", "rbh_max_cnt"]
+    READ_REBOOT_MECHANISM_INFO = "rbh_info"
+    ENABLE_REBOOT_FILE_HANDLING = "rwd_on"
+    DISABLE_REBOOT_FILE_HANDLING = "rwd_off"
+    RESET_ALL_REBOOT_COUNTERS = "rwd_reset_a"
+    RWD_RESET_REBOOT_COUNTER_00 = "rwd_reset_00"
+    RWD_RESET_REBOOT_COUNTER_01 = "rwd_reset_01"
+    RWD_RESET_REBOOT_COUNTER_10 = "rwd_reset_10"
+    RWD_RESET_REBOOT_COUNTER_11 = "rwd_reset_11"
+    RWD_SET_MAX_REBOOT_CNT = "rwd_max_cnt"
 
 
 class Info:
+    ANNOUNCE_VERSION = "Announce version"
+    ANNOUNCE_CURRENT_IMAGE = "Announce current image"
+    ANNOUNCE_BOOT_COUNTS = "Announce boot counts"
+    SYSTEMCTL_CMD_EXECUTOR = "Perform systemctl command"
+    EXECUTE_SHELL_CMD_BLOCKING = "Execute shell command blocking"
+    EXECUTE_SHELL_CMD_NON_BLOCKING = "Execute shell command non-blocking"
+    SET_PREF_SD = "Set preferred SD card"
     REBOOT_XSC = "XSC reboot with prompt"
     REBOOT_FULL = "Full regular reboot"
     OBSW_UPDATE_FROM_SD_0 = "Update OBSW from SD Card 0"
     OBSW_UPDATE_FROM_SD_1 = "Update OBSW from SD Card 1"
     OBSW_UPDATE_FROM_TMP = "Update OBSW from tmp folder"
+    READ_REBOOT_MECHANISM_INFO = "Read reboot mechansm information"
     SWITCH_TO_SD_0 = "Switch to SD card 0"
     SWITCH_TO_SD_1 = "Switch to SD card 1"
     SWITCH_TO_BOTH_SD_CARDS = "Switch to both SD cards with specified active card"
+    LIST_DIR_INTO_FILE = "List directory, dump output into file"
+    LIST_DIR_DUMP_DIRECTLY = "List directory, dump content directly"
+    CP_HELPER = "Filesystem Copy Helper"
+    MV_HELPER = "Filesystem Move Helper"
+    RM_HELPER = "Filesystem Removal Helper"
+    MKDIR_HELPER = "Filesystem Directory Creation Helper"
 
 
 class Chip(enum.IntEnum):
@@ -86,63 +149,109 @@ class Copy(enum.IntEnum):
     NONE = 2
 
 
+class SystemctlCmd(enum.IntEnum):
+    START = 0
+    STOP = 1
+    RESTART = 2
+
+
 @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=OpCodes.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
-    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=OpCode.ANNOUNCE_VERSION, info=Info.ANNOUNCE_VERSION)
+    oce.add(keys=OpCode.ANNOUNCE_CURRENT_IMAGE, info=Info.ANNOUNCE_CURRENT_IMAGE)
+    oce.add(keys=OpCode.ANNOUNCE_BOOT_COUNTS, info=Info.ANNOUNCE_BOOT_COUNTS)
+    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.SET_PREF_SD, info=Info.SET_PREF_SD)
     oce.add(
-        keys=OpCodes.GET_HK,
+        keys=OpCode.READ_REBOOT_MECHANISM_INFO, info=Info.READ_REBOOT_MECHANISM_INFO
+    )
+    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=OpCode.SYSTEMCTL_CMD_EXECUTOR, info=Info.SYSTEMCTL_CMD_EXECUTOR)
+    oce.add(
+        keys=OpCode.EXECUTE_SHELL_CMD_BLOCKING, info=Info.EXECUTE_SHELL_CMD_BLOCKING
+    )
+    oce.add(
+        keys=OpCode.EXECUTE_SHELL_CMD_NON_BLOCKING,
+        info=Info.EXECUTE_SHELL_CMD_NON_BLOCKING,
+    )
+    oce.add(
+        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.RWD_RESET_REBOOT_COUNTER_00,
         info="Reset reboot counter 0 0",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_01,
+        keys=OpCode.RWD_RESET_REBOOT_COUNTER_01,
         info="Reset reboot counter 0 1",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_10,
+        keys=OpCode.RWD_RESET_REBOOT_COUNTER_10,
         info="Reset reboot counter 1 0",
     )
     oce.add(
-        keys=OpCodes.RESET_REBOOT_COUNTER_11,
+        keys=OpCode.RWD_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.RWD_SET_MAX_REBOOT_CNT,
+        info="Reset max reboot count for reboot watchdog",
+    )
+    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)
+    oce.add(keys=OpCode.LIST_DIR_INTO_FILE, info=Info.LIST_DIR_INTO_FILE)
+    oce.add(keys=OpCode.LIST_DIR_DUMP_DIRECTLY, info=Info.LIST_DIR_DUMP_DIRECTLY)
+    oce.add(keys=OpCode.MV_HELPER, info=Info.MV_HELPER)
+    oce.add(keys=OpCode.CP_HELPER, info=Info.CP_HELPER)
+    oce.add(keys=OpCode.RM_HELPER, info=Info.RM_HELPER)
+    oce.add(keys=OpCode.MKDIR_HELPER, info=Info.MKDIR_HELPER)
     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:
+def pack_core_commands(  # noqa C901
+    q: DefaultPusQueueHelper, op_code: str
+):  # noqa: C901 , complexity okay here
+    if op_code == OpCode.ANNOUNCE_VERSION:
+        q.add_log_cmd(f"{Info.ANNOUNCE_VERSION}")
+        q.add_pus_tc(create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_VERSION))
+    elif op_code == OpCode.ANNOUNCE_CURRENT_IMAGE:
+        q.add_log_cmd(f"{Info.ANNOUNCE_CURRENT_IMAGE}")
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_CURRENT_IMAGE)
+        )
+    elif op_code == OpCode.ANNOUNCE_BOOT_COUNTS:
+        q.add_log_cmd(f"{Info.ANNOUNCE_BOOT_COUNTS}")
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_BOOT_COUNTS)
+        )
+    elif op_code in OpCode.REBOOT_XSC:
         reboot_self, chip_select, copy_select = determine_reboot_params()
         add_xsc_reboot_cmd(
             q=q,
@@ -150,126 +259,295 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
             chip=chip_select,
             copy=copy_select,
         )
-    if op_code in OpCodes.REBOOT_FULL:
+    elif op_code in OpCode.REBOOT_FULL:
         q.add_log_cmd(f"Core Command: {Info.REBOOT_FULL}")
-        q.add_pus_tc(create_full_reboot_cmds())
-    if op_code in OpCodes.XSC_REBOOT_SELF:
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID, action_id=ActionId.FULL_REBOOT
+            )
+        )
+    elif op_code in OpCode.XSC_REBOOT_SELF:
         add_xsc_reboot_cmd(q=q, reboot_self=True)
-    if op_code in OpCodes.XSC_REBOOT_0_0:
+    elif op_code == OpCode.SYSTEMCTL_CMD_EXECUTOR:
+        print("systemctl command types: ")
+        for entry in SystemctlCmd:
+            print(f"{entry}: {entry.name}")
+        systemctl_cmd = SystemctlCmd(
+            int(input("Specify systemctl command type by key: "))
+        )
+        unit_name = input("Specify unit name: ")
+        q.add_pus_tc(create_systemctl_cmd(systemctl_cmd, unit_name))
+    elif op_code == OpCode.EXECUTE_SHELL_CMD_BLOCKING:
+        custom_cmd = input("Please specify command to execute: ")
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID,
+                action_id=ActionId.EXECUTE_SHELL_CMD_BLOCKING,
+                user_data=custom_cmd.encode(),
+            )
+        )
+    elif op_code == OpCode.EXECUTE_SHELL_CMD_NON_BLOCKING:
+        custom_cmd = input("Please specify command to execute: ")
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID,
+                action_id=ActionId.EXECUTE_SHELL_CMD_NON_BLOCKING,
+                user_data=custom_cmd.encode(),
+            )
+        )
+    elif 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:
+    elif 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:
+    elif 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:
+    elif 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:
+    elif op_code == OpCode.READ_REBOOT_MECHANISM_INFO:
+        q.add_log_cmd(Info.READ_REBOOT_MECHANISM_INFO)
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID,
+                action_id=ActionId.READ_REBOOT_MECHANISM_INFO,
+            )
+        )
+    elif op_code == 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:
+    elif op_code == 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:
+    elif op_code == 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:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_00:
         reset_specific_boot_counter(q, 0, 0)
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_01:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_01:
         reset_specific_boot_counter(q, 0, 1)
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_10:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_10:
         reset_specific_boot_counter(q, 1, 0)
-    if op_code in OpCodes.RESET_REBOOT_COUNTER_11:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_11:
         reset_specific_boot_counter(q, 1, 1)
-    if op_code in OpCodes.OBSW_UPDATE_FROM_SD_0:
+    elif op_code == OpCode.RWD_SET_MAX_REBOOT_CNT:
+        max_count = int(input("Set new maximum reboot threshold [1, 50]: "))
+        if max_count < 1 or max_count > 50:
+            raise ValueError("Invalid value, must be in range 1 to 50")
+        q.add_pus_tc(
+            create_action_cmd(
+                CORE_CONTROLLER_ID,
+                ActionId.SET_MAX_REBOOT_CNT,
+                user_data=bytes([max_count]),
+            )
+        )
+    elif 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))
+    elif 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))
+    elif 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))
+    elif 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:
+    elif 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:
+    elif op_code in OpCode.SWITCH_TO_BOTH_SD_CARDS:
         while True:
-            active_sd_card = int(input("Please specify active SD cqrd [0/1]: "))
+            active_sd_card = int(input("Please specify active SD card [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:
+    elif 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))
+    elif op_code in OpCode.SET_PREF_SD:
+        q.add_log_cmd("Set preferred SD card")
+        pref_sd = int(
+            input("Specify which SD card to set as the preferred one (0/1): ")
+        )
+        if pref_sd not in [0, 1]:
+            raise ValueError("Only 0 or 1 allowed for preferred SD card")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_u8_parameter(
+                    object_id=CORE_CONTROLLER_ID,
+                    domain_id=0,
+                    unique_id=ParamId.PREF_SD,
+                    parameter=pref_sd,
+                )
+            )
+        )
+    elif op_code == OpCode.CP_HELPER:
+        cp_recursive = int(input("Copy recursively (0/1) ?: "))
+        if cp_recursive not in [0, 1]:
+            raise ValueError("Invalid value, only 0 or 1 allowed")
+        cp_force = int(input("Copy with force option(0/1) ?: "))
+        if cp_force not in [0, 1]:
+            raise ValueError("Invalid value, only 0 or 1 allowed")
+        user_data = bytearray([cp_recursive, cp_force])
+        user_data.extend(packet_source_dest_path("Copy"))
+        q.add_log_cmd(Info.CP_HELPER)
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.CP_HELPER, user_data)
+        )
+    elif op_code == OpCode.MV_HELPER:
+        user_data = packet_source_dest_path("Move")
+        q.add_log_cmd(Info.MV_HELPER)
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.MV_HELPER, user_data)
+        )
+    elif op_code == OpCode.RM_HELPER:
+        rm_recursive = int(input("Remove with recursive (-r) option (0/1) ?: "))
+        if rm_recursive not in [0, 1]:
+            raise ValueError("Invalid value, only 0 or 1 allowed")
+        rm_force = int(input("Remove with force (-f) option (0/1) ?: "))
+        if rm_force not in [0, 1]:
+            raise ValueError("Invalid value, only 0 or 1 allowed")
+        user_data = bytearray([rm_recursive, rm_force])
+        removed_file_or_dir = input("Specify absolute path to be removed: ")
+        user_data.extend(removed_file_or_dir.encode())
+        user_data.append(0)
+        q.add_log_cmd(Info.RM_HELPER)
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.RM_HELPER, user_data)
+        )
+    elif op_code == OpCode.LIST_DIR_INTO_FILE:
+        q.add_log_cmd(Info.LIST_DIR_INTO_FILE)
+        user_data = list_directory_base_user_data()
+        dest_file_path = input("Destination file path: ")
+        user_data.extend(dest_file_path.encode())
+        user_data.append(0)
+        q.add_pus_tc(
+            create_action_cmd(
+                CORE_CONTROLLER_ID, ActionId.LIST_DIR_INTO_FILE, user_data
+            )
+        )
+    elif op_code == OpCode.LIST_DIR_DUMP_DIRECTLY:
+        q.add_log_cmd(Info.LIST_DIR_DUMP_DIRECTLY)
+        user_data = list_directory_base_user_data()
+        q.add_pus_tc(
+            create_action_cmd(
+                CORE_CONTROLLER_ID, ActionId.LIST_DIR_DUMP_DIRECTLY, user_data
+            )
+        )
+    elif op_code == OpCode.MKDIR_HELPER:
+        q.add_log_cmd(Info.MKDIR_HELPER)
+        user_data = input("Specify absolute path of newly created directory: ")
+        user_data = bytearray(user_data.encode())
+        user_data.append(0)
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.MKDIR_HELPER, user_data)
+        )
+    else:
+        _LOGGER.warning(
+            f"Unknown operation code {op_code} for core controller commands"
+        )
+
+
+def create_systemctl_cmd(systemctl_cmd: SystemctlCmd, unit_name: str):
+    cmd_data = bytearray([systemctl_cmd])
+    cmd_data.extend(unit_name.encode())
+    return create_action_cmd(
+        object_id=CORE_CONTROLLER_ID,
+        action_id=ActionId.SYSTEMCTL_CMD_EXECUTOR,
+        user_data=cmd_data,
+    )
+
+
+def list_directory_base_user_data() -> bytearray:
+    all_opt = int(input("Use all (-a) option (0/1) ?: "))
+    if all_opt not in [0, 1]:
+        raise ValueError("Invalid value, only 0 or 1 allowed")
+    recursive_opt = int(input("Use recursive (-R) option (0/1) ?: "))
+    if recursive_opt not in [0, 1]:
+        raise ValueError("Invalid value, only 0 or 1 allowed")
+    compression_opt = int(input("Compress target file (0/1) ?: "))
+    if compression_opt not in [0, 1]:
+        raise ValueError("Invalid value, only 0 or 1 allowed")
+    listing_path = input("Specify listing path (absolute path): ")
+    user_data = bytearray([all_opt, recursive_opt, compression_opt])
+    user_data.extend(listing_path.encode())
+    user_data.append(0)
+    return user_data
+
+
+def packet_source_dest_path(context: str) -> bytes:
+    source = input(f"Specify {context} source file: ")
+    dest = input(f"Specify {context} destination file: ")
+    raw_src_dest = bytearray(source.encode())
+    raw_src_dest.append(0)
+    raw_src_dest.extend(dest.encode())
+    raw_src_dest.append(0)
+    return raw_src_dest
 
 
 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 make_fsfw_action_cmd(
-        object_id=CORE_CONTROLLER_ID, action_id=ActionIds.FULL_REBOOT
+    return create_action_cmd(
+        object_id=CORE_CONTROLLER_ID, action_id=ActionId.FULL_REBOOT
     )
 
 
@@ -278,9 +556,9 @@ def determine_reboot_params() -> (bool, Chip, Copy):
     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()
 
 
@@ -294,7 +572,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"]:
@@ -304,14 +582,18 @@ 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(
+    user_data = bytearray([chip, copy])
+    custom_file_name = input("Use custom filename [y/n] ?: ")
+    if custom_file_name.lower() in ["y", "yes", "1"]:
+        custom_file_name = input("Specify custom filename: ")
+        user_data.extend(custom_file_name.encode())
+    return create_action_cmd(
         object_id=CORE_CONTROLLER_ID, action_id=action_id, user_data=user_data
     )
 
@@ -341,14 +623,13 @@ def create_xsc_reboot_cmds(
         tc_data.append(False)
         tc_data.append(chip)
         tc_data.append(copy)
-    return 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 == SetIds.HK:
-        pw = PrintWrapper(printer)
+def handle_core_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+    if set_id == SetId.HK:
         fmt_str = "!fff"
         inc_len = struct.calcsize(fmt_str)
         (temperature, ps_voltage, pl_voltage) = struct.unpack(
@@ -359,4 +640,93 @@ def handle_core_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
             f"PL Voltage [mV] {pl_voltage}"
         )
         pw.dlog(printout)
-        printer.print_validity_buffer(validity_buffer=hk_data[inc_len:], num_vars=3)
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=hk_data[inc_len:], num_vars=3
+        )
+
+
+def handle_core_ctrl_action_replies(
+    action_id: int, pw: PrintWrapper, custom_data: bytes
+):
+    if action_id == ActionId.READ_REBOOT_MECHANISM_INFO:
+        handle_reboot_mechanism_info_reply(pw, custom_data)
+    elif action_id == ActionId.LIST_DIR_DUMP_DIRECTLY:
+        handle_list_dir_dump_reply(pw, custom_data)
+
+
+def handle_reboot_mechanism_info_reply(pw: PrintWrapper, custom_data: bytes):
+    pw.dlog("Received reboot mechansm information")
+    fmt_str = "!BIIIIIBBBBBBBB"
+    inc_len = struct.calcsize(fmt_str)
+    if len(custom_data) < inc_len:
+        raise ValueError(f"Received custom data shorter than expected {inc_len}")
+    (
+        enabled,
+        max_count,
+        img00_count,
+        img01_count,
+        img10_count,
+        img11_count,
+        img00_lock,
+        img01_lock,
+        img10_lock,
+        img11_lock,
+        last_chip,
+        last_copy,
+        next_chip,
+        next_copy,
+    ) = struct.unpack(fmt_str, custom_data[:inc_len])
+    pw.dlog(f"Enabled: {enabled}")
+    pw.dlog(f"Max Count: {max_count}")
+    pw.dlog(f"Count 00: {img00_count}")
+    pw.dlog(f"Count 01: {img01_count}")
+    pw.dlog(f"Count 10: {img10_count}")
+    pw.dlog(f"Count 11: {img11_count}")
+    pw.dlog(f"Lock 00: {img00_lock}")
+    pw.dlog(f"Lock 01: {img01_lock}")
+    pw.dlog(f"Lock 10: {img10_lock}")
+    pw.dlog(f"Lock 11: {img11_lock}")
+    pw.dlog(f"Last Chip: {last_chip}")
+    pw.dlog(f"Last Copy: {last_copy}")
+    pw.dlog(f"Next Chip: {next_chip}")
+    pw.dlog(f"Next Copy: {next_copy}")
+
+
+def handle_list_dir_dump_reply(pw: PrintWrapper, custom_data: bytes):
+    if len(custom_data) < 4:
+        _LOGGER.warning("Data unexpectedly small")
+        return
+    seq_idx = struct.unpack("!I", custom_data[0:4])[0]
+    total_chunks = struct.unpack("!I", custom_data[4:8])[0]
+    compressed = custom_data[8]
+    ls_cmd = custom_data[9:].split(b"\x00")[0].decode()
+    # Include length of NULL termination
+    file_data_offset = 9 + len(ls_cmd) + 1
+    pw.dlog(
+        f"Received directory listing dump for ls command {ls_cmd}. "
+        f"Chunk {seq_idx + 1}/{total_chunks}"
+    )
+
+    def remove_if_exists_and_new(seq_idx_: int, path_: Path):
+        if seq_idx_ == 0 and path_.exists():
+            os.remove(path_)
+
+    if compressed:
+        path = Path("dir_listing.txt.gz")
+        remove_if_exists_and_new(seq_idx, path)
+        pw.dlog(
+            f"Compression option: {compressed}. Dumping file into dir_listing.txt.gz"
+        )
+        with open(path, "ab") as listing_file:
+            listing_file.write(custom_data[file_data_offset:])
+    else:
+        path = Path("dir_listing.txt")
+        remove_if_exists_and_new(seq_idx, path)
+        pw.dlog(f"Compression option: {compressed}. Dumping file into dir_listing.txt")
+        with open(path, "a") as listing_file:
+            listing_file_str = custom_data[file_data_offset:].decode()
+            listing_file.write(listing_file_str)
+        if seq_idx + 1 == total_chunks:
+            pw.dlog("Full directory listing: ")
+            with open("dir_listing.txt", "r") as listing_file:
+                print(listing_file.read())

eive_tmtc/tmtc/health.py

@@ -0,0 +1,70 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.tmtc.obj_prompt import prompt_object
+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, FsfwHealth
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCode:
+    SET_HEALTH = "set_health"
+    ANNOUNCE_HEALTH_ALL = "read_health_all"
+    ANNOUNCE_HEALTH = "read_health"
+
+
+class Info:
+    SET_HEALTH = "Set health of specific object"
+    ANNOUNCE_HEALTH_ALL = "Read all health states"
+    ANNOUNCE_HEALTH = "Read health state of one object"
+
+
+def prompt_health() -> FsfwHealth:
+    for item in FsfwHealth:
+        print(f"{item}: {item.name}")
+    health_idx = int(input("Please enter health by index: "))
+    return FsfwHealth(health_idx)
+
+
+@service_provider(CustomServiceList.HEALTH)
+def pack_test_command(p: ServiceProviderParams):
+    o = p.op_code
+    q = p.queue_helper
+    if o == OpCode.SET_HEALTH:
+        app_data = bytearray(prompt_object())
+        health = prompt_health()
+        app_data.append(health)
+        q.add_log_cmd(Info.SET_HEALTH)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=201, subservice=Subservice.TC_SET_HEALTH, app_data=app_data
+            )
+        )
+    elif o == OpCode.ANNOUNCE_HEALTH:
+        app_data = bytearray(prompt_object())
+        q.add_log_cmd(Info.ANNOUNCE_HEALTH)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=201, subservice=Subservice.TC_ANNOUNCE_HEALTH, app_data=app_data
+            )
+        )
+    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)
+        )
+    else:
+        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)
+    oce.add(OpCode.SET_HEALTH, Info.SET_HEALTH)
+    defs.add_service(CustomServiceList.HEALTH, info="Health Service", op_code_entry=oce)

eive_tmtc/tmtc/internal_err_reporter.py

@@ -0,0 +1,24 @@
+import enum
+import struct
+
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+
+class SetId(enum.IntEnum):
+    ERROR_ID = 0
+
+
+def handle_ier_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
+    pw.dlog(f"Received internal error reporter HK data with set ID {set_id}")
+    if set_id == SetId.ERROR_ID:
+        fmt_str = "!III"
+        inc_len = struct.calcsize(fmt_str)
+        (tm_errors, queue_errors, store_hits) = struct.unpack(
+            fmt_str, hk_data[:inc_len]
+        )
+        pw.dlog(f"TM Errors: {tm_errors}")
+        pw.dlog(f"Queue Errors: {queue_errors}")
+        pw.dlog(f"Store Errors: {store_hits}")
+        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[inc_len:], 3))

eive_tmtc/tmtc/misc/s200_test.py

@@ -7,7 +7,7 @@
 """
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+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/obj_prompt.py

@@ -0,0 +1,84 @@
+from eive_tmtc.config.object_ids import (
+    ACS_SUBSYSTEM_ID,
+    IMTQ_HANDLER_ID,
+    GPS_0_HEALTH_DEV,
+    GYRO_0_ADIS_HANDLER_ID,
+    GYRO_1_L3G_HANDLER_ID,
+    ACS_BOARD_ASS_ID,
+    RW_ASSEMBLY,
+    SUS_BOARD_ASS_ID,
+    MGM_0_LIS3_HANDLER_ID,
+    MGM_1_RM3100_HANDLER_ID,
+    SUS_0_N_LOC_XFYFZM_PT_XF,
+    SUS_6_R_LOC_XFYBZM_PT_XF,
+    RW1_ID,
+    RW2_ID,
+    RTD_0_PLOC_HSPD,
+    TMP1075_HANDLER_TCS_BRD_1_ID,
+    TMP1075_HANDLER_TCS_BRD_0_ID,
+    TMP1075_HANDLER_PLPCDU_0_ID,
+    TMP1075_HANDLER_PLPCDU_1_ID,
+    TMP1075_HANDLER_IF_BRD_ID,
+    STR_ASSEMBLY,
+    STAR_TRACKER_ID,
+)
+
+SUBSYSTEM_DICT = {
+    0: "acs",
+    1: "tcs",
+    2: "com",
+}
+
+ACS_OBJ_DICT = {
+    0: ("Subsystem", ACS_SUBSYSTEM_ID),
+    1: ("SUS Assembly", SUS_BOARD_ASS_ID),
+    2: ("ACS Board Assembly", ACS_BOARD_ASS_ID),
+    3: ("RW Assembly", RW_ASSEMBLY),
+    4: ("STR Assembly", STR_ASSEMBLY),
+    5: ("iMTQ MGT", IMTQ_HANDLER_ID),
+    6: ("GYR 0 ADIS", GYRO_0_ADIS_HANDLER_ID),
+    7: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID),
+    8: ("MGM 0 LIS3", MGM_0_LIS3_HANDLER_ID),
+    9: ("MGM 1 RM3100", MGM_1_RM3100_HANDLER_ID),
+    10: ("GPS 0 Health Device", GPS_0_HEALTH_DEV),
+    11: ("SUS 0", SUS_0_N_LOC_XFYFZM_PT_XF),
+    12: ("SUS 6", SUS_6_R_LOC_XFYBZM_PT_XF),
+    13: ("RW 1", RW1_ID),
+    14: ("RW 2", RW2_ID),
+    15: ("STR", STAR_TRACKER_ID),
+}
+
+TCS_OBJ_DICT = {
+    0: ("RTD 0", RTD_0_PLOC_HSPD),
+    1: ("TMP1075 PL PCDU 0", TMP1075_HANDLER_PLPCDU_0_ID),
+    2: ("TMP1075 PL PCDU 1", TMP1075_HANDLER_PLPCDU_1_ID),
+    3: ("TMP1075 TCS 0", TMP1075_HANDLER_TCS_BRD_0_ID),
+    4: ("TMP1075 TCS 1", TMP1075_HANDLER_TCS_BRD_1_ID),
+    5: ("TMP1075 IF BOARD", TMP1075_HANDLER_IF_BRD_ID),
+}
+
+
+def get_obj_if_from_dict(lut: dict) -> bytes:
+    for k, v in lut.items():
+        print(f"{k}: {v[0]}")
+    obj_key = int(input("Please specify target object by key: "))
+    name_and_obj_id = lut[obj_key]
+    if name_and_obj_id is None:
+        raise ValueError("invalid key")
+    return name_and_obj_id[1]
+
+
+def prompt_object() -> bytes:
+    for k, v in SUBSYSTEM_DICT.items():
+        print(f"{k}: {v}")
+    subsystem_key = int(input("Please specify target subsystem by key: "))
+    subsystem = SUBSYSTEM_DICT[subsystem_key]
+    if subsystem is None:
+        raise ValueError("invalid key")
+    if subsystem == "acs":
+        return get_obj_if_from_dict(ACS_OBJ_DICT)
+    elif subsystem == "tcs":
+        return get_obj_if_from_dict(TCS_OBJ_DICT)
+    else:
+        print(f"No object for subsystem {subsystem}")
+        return bytes()

eive_tmtc/tmtc/payload/ploc_memory_dumper.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """
 @file   ploc_memory_dumper.py
-@brief  This file implements the command to dump memory sectors of the PLOC. Memories of the PLOC which can be dumped
-        are one MRAM, two flash memories and the SRAM.
+@brief  This file implements the command to dump memory sectors of the PLOC. Memories of the PLOC
+    which can be dumped are one MRAM, two flash memories and the SRAM.
 @author J. Meier
 @date   31.08.2021
 """
@@ -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,54 +6,71 @@
 @author J. Meier
 @date   06.03.2021
 """
+import dataclasses
+import logging
 import struct
 import enum
 
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import get_object_ids, PLOC_MPSOC_ID
+from eive_tmtc.pus_tm.defs import PrintWrapper
 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 service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from eive_tmtc.utility.input_helper import InputHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.tc.pus_8_fsfw_funccmd import create_action_cmd
 
-
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 MANUAL_INPUT = "1"
 
-flash_write_file_dict = {
-    MANUAL_INPUT: ["manual input", ""],
-    "2": ["/mnt/sd0/ploc/mpsoc/flash_write.bin", "/mnt/sd0/ploc/mpsoc/flash_write.bin"],
+OBC_WRITE_FILE_DICT = {
+    MANUAL_INPUT: ("manual input", ""),
+    "2": ("/mnt/sd0/ploc/mpsoc/flash_write.bin", "/mnt/sd0/ploc/mpsoc/flash_write.bin"),
 }
 
-mpsoc_file_dict = {
-    MANUAL_INPUT: ["manual input", ""],
-    "2": ["0:/flash", "0:/flash"],
+OBC_READ_FILE_DICT = {
+    MANUAL_INPUT: ("manual input", ""),
+    "2": ("/mnt/sd0/ploc/mpsoc/flash_read.bin", "/mnt/sd0/ploc/mpsoc/flash_read.bin"),
+}
+
+MPSOC_WRITE_FILE_DICT = {
+    MANUAL_INPUT: ("manual input", ""),
+    "2": ("0:/", "0:/"),
+}
+
+MPSOC_READ_FILE_DICT = {
+    MANUAL_INPUT: ("manual input", ""),
+    "2": ("0:/PICA", "0:/PICA"),
 }
 
 SEQ_FILE_NAMES = ["0:/EM16/231", "0:/EQ04/E-75", "0:/EQ01/E130"]
 SEQ_FILE_DICT = {
-    MANUAL_INPUT: ["manual input", ""],
-    "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]}"],
+    MANUAL_INPUT: ("manual input", ""),
+    "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 SetId(enum.IntEnum):
+    HK_ID = 0
+
+
+class ActionId(enum.IntEnum):
     TC_MEM_WRITE = 1
     TC_MEM_READ = 2
-    FLASH_WRITE = 9
+    TM_MEM_READ_RPT = 6
+    TC_FLASH_WRITE_FULL_FILE = 9
     TC_FLASH_DELETE = 10
     TC_REPLAY_START = 11
     TC_REPLAY_STOP = 12
@@ -64,20 +81,40 @@ class CommandIds(enum.IntEnum):
     TC_MODE_REPLAY = 16
     TC_CAM_CMD_SEND = 17
     TC_MODE_IDLE = 18
+    TM_CAM_CMD_RPT = 19
     SET_UART_TX_TRISTATE = 20
     RELEASE_UART_TX = 21
+    TC_CAM_TAKE_PIC = 22
+    TC_SIMPLEX_SEND_FILE = 23
+    TC_DOWNLINK_DATA_MODULATE = 24
+    TC_MODE_SNAPSHOT = 25
+    TC_FLASH_DIR_GET_CONTENT = 28
+    TM_FLASH_DIRECTORY_CONTENT = 29
+    TC_FLASH_READ_FULL_FILE = 30
 
 
-class OpCodes:
-    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 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"
+    MEM_WRITE = "memory_write"
+    MEM_READ = "memory_read"
+    DOWNLINK_PWR_OFF = "downlink_pwr_off"
+    FLASH_WRITE_FILE = "flash_write_file"
+    FLASH_READ_FILE = "flash_read_file"
+    FLASH_DELETE_FILE = "flash_delete_file"
+    FLASH_GET_DIR_CONTENT = "flash_get_dir_content"
+    REPLAY_STOP = "replay_stop"
+    REPLAY_START = "replay_start"
+    CAM_TAKE_PIC = "cam_take_pic"
+    SIMPLEX_SEND_FILE = "simplex_send_file"
+    DOWNLINK_DATA_MODULATE = "downlink_data_modulate"
+    MODE_SNAPSHOT = "mode_snapshot"
 
 
 class Info:
@@ -86,48 +123,61 @@ class Info:
     NORMAL = "Normal"
     VERIFY_BOOT = "Verify boot by reading 0xdeadbeef from DEADBEEF address"
     MODE_REPLAY = "Switch to REPLAY mode"
+    REPLAY_STOP = "Stop Replay"
     MODE_IDLE = "Switch to IDLE mode"
     REPLAY_WRITE_SEQ = "Replay write sequence"
     DOWNLINK_PWR_ON = "Downlink Power On"
+    DOWNLINK_PWR_OFF = "Downlink Power Off"
     REPLAY_START = "Replay Start"
+    CAM_TAKE_PIC = "Cam Take Picture"
+    SIMPLEX_SEND_FILE = "Simplex Send File"
+    FLASH_READ_FILE = "Copy file from MPSoC to OBC"
+    FLASH_WRITE_FILE = "Copy file from OBC to MPSoC"
+    FLASH_DELETE_FILE = "Delete file on MPSoC"
+    FLASH_GET_DIR_CONTENT = "Get flash directory content on MPSoC"
+    DOWNLINK_DATA_MODULATE = "Downlink data modulate"
+    MODE_SNAPSHOT = "Mode Snapshot"
 
 
 class MemAddresses(enum.IntEnum):
     DEADBEEF = 0x40000004
 
 
-class PlocReplyIds(enum.IntEnum):
-    TM_MEM_READ_RPT = 6
-    TM_CAM_CMD_RPT = 19
-
-
 @tmtc_definitions_provider
 def add_ploc_mpsoc_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(OpCodes.OFF, Info.OFF)
-    oce.add(OpCodes.ON, Info.ON)
-    oce.add(OpCodes.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(OpCodes.REPLAY_START, Info.REPLAY_START)
-    oce.add("8", "Ploc MPSoC: Replay stop")
-    oce.add(OpCodes.DOWNLINK_PWR_ON, Info.DOWNLINK_PWR_ON)
-    oce.add("10", "Ploc MPSoC: Downlink pwr off")
-    oce.add(OpCodes.REPLAY_WRITE_SEQ, Info.REPLAY_WRITE_SEQ)
+    oce.add(OpCode.OFF, Info.OFF)
+    oce.add(OpCode.ON, Info.ON)
+    oce.add(OpCode.NORMAL, Info.NORMAL)
+    oce.add(OpCode.MEM_WRITE, "Ploc MPSoC: Memory write")
+    oce.add(OpCode.MEM_READ, "Ploc MPSoC: Memory read")
+    oce.add(OpCode.FLASH_WRITE_FILE, Info.FLASH_WRITE_FILE)
+    oce.add(OpCode.FLASH_READ_FILE, Info.FLASH_READ_FILE)
+    oce.add(OpCode.FLASH_DELETE_FILE, Info.FLASH_DELETE_FILE)
+    oce.add(OpCode.FLASH_GET_DIR_CONTENT, Info.FLASH_GET_DIR_CONTENT)
+    oce.add(OpCode.REPLAY_START, Info.REPLAY_START)
+    oce.add(OpCode.REPLAY_STOP, Info.REPLAY_STOP)
+    oce.add(OpCode.DOWNLINK_PWR_ON, Info.DOWNLINK_PWR_ON)
+    oce.add(OpCode.DOWNLINK_PWR_OFF, Info.DOWNLINK_PWR_OFF)
+    oce.add(OpCode.REPLAY_WRITE_SEQ, Info.REPLAY_WRITE_SEQ)
     oce.add("12", "Ploc MPSoC: OBSW reset sequence count")
-    oce.add(OpCodes.VERIFY_BOOT, "Ploc MPSoC: Read DEADBEEF address")
-    oce.add(OpCodes.MODE_REPLAY, Info.MODE_REPLAY)
-    oce.add(OpCodes.MODE_IDLE, Info.MODE_IDLE)
+    oce.add(OpCode.VERIFY_BOOT, Info.VERIFY_BOOT)
+    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")
+    oce.add(OpCode.CAM_TAKE_PIC, Info.CAM_TAKE_PIC)
+    oce.add(OpCode.SIMPLEX_SEND_FILE, Info.SIMPLEX_SEND_FILE)
+    oce.add(OpCode.DOWNLINK_DATA_MODULATE, Info.DOWNLINK_DATA_MODULATE)
+    oce.add(OpCode.MODE_SNAPSHOT, Info.MODE_SNAPSHOT)
     defs.add_service(CustomServiceList.PLOC_MPSOC.value, "Ploc MPSoC", oce)
 
 
 @service_provider(CustomServiceList.PLOC_MPSOC)
-def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
+def pack_ploc_mpsoc_commands(  # noqa C901
+    p: ServiceProviderParams,
+):  # noqa C901: Complexity okay here.
     object_id = get_object_ids().get(PLOC_MPSOC_ID)
     q = p.queue_helper
     prefix = "PLOC MPSoC"
@@ -136,19 +186,19 @@ def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
         f"Generate command for PLOC MPSoC with object id: {object_id.as_hex_string}"
     )
     obyt = object_id.as_bytes
-    if op_code in OpCodes.OFF:
+    if op_code == OpCode.OFF:
         q.add_log_cmd(f"{prefix}: {Info.OFF}")
-        command = pack_mode_data(obyt, Modes.OFF, 0)
+        command = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
-    if op_code in OpCodes.ON:
+    if op_code == OpCode.ON:
         q.add_log_cmd(f"{prefix}: {Info.ON}")
-        data = pack_mode_data(obyt, Modes.ON, 0)
+        data = pack_mode_data(obyt, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code in OpCodes.NORMAL:
+    if op_code == OpCode.NORMAL:
         q.add_log_cmd(f"{prefix}: {Info.NORMAL}")
-        data = pack_mode_data(object_id.as_bytes, Modes.NORMAL, 0)
+        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":
+    if op_code == OpCode.MEM_WRITE:
         q.add_log_cmd("PLOC MPSoC: TC mem write test")
         memory_address = int(
             input("PLOC MPSoC: Tc Mem Write: Type memory address: 0x"), 16
@@ -164,72 +214,104 @@ def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
         q.add_log_cmd("PLOC MPSoC: TC mem read test")
         data = prepare_mem_read_command(object_id=object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "5":
-        q.add_log_cmd("PLOC MPSoC: Flash write")
+    if op_code == OpCode.FLASH_WRITE_FILE:
+        q.add_log_cmd(f"{prefix}: {Info.FLASH_WRITE_FILE}")
         data = prepare_flash_write_cmd(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "6":
+    if op_code == OpCode.FLASH_READ_FILE:
+        q.add_log_cmd(f"{prefix}: {Info.FLASH_READ_FILE}")
+        data = prepare_flash_read_cmd(object_id.as_bytes)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCode.FLASH_DELETE_FILE:
         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 in OpCodes.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":
+    if op_code == OpCode.REPLAY_STOP:
         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", ActionId.TC_REPLAY_STOP)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCodes.DOWNLINK_PWR_ON:
-        q.add_log_cmd(f"{prefix}: {OpCodes.DOWNLINK_PWR_ON}")
+    if op_code == 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":
+    if op_code == OpCode.DOWNLINK_PWR_OFF:
         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", ActionId.TC_DOWNLINK_PWR_OFF)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCodes.REPLAY_WRITE_SEQ:
+    if op_code == OpCode.FLASH_GET_DIR_CONTENT:
+        q.add_log_cmd(f"{prefix}: {Info.FLASH_GET_DIR_CONTENT}")
+        dir_name = input("Please specify MPSoC directory name to get information for: ")
+        dir_name = bytearray(dir_name.encode("utf-8"))
+        dir_name.append(0)
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=object_id.as_bytes,
+                action_id=ActionId.TC_FLASH_DIR_GET_CONTENT,
+                user_data=dir_name,
+            )
+        )
+    if op_code == 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", ActionId.OBSW_RESET_SEQ_COUNT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCodes.VERIFY_BOOT:
+    if op_code == OpCode.VERIFY_BOOT:
         num_words = 1
         q.add_log_cmd(f"{prefix} {Info.VERIFY_BOOT}")
         data = (
             object_id.as_bytes
-            + struct.pack("!I", CommandIds.TC_MEM_READ)
+            + struct.pack("!I", ActionId.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 in OpCodes.MODE_REPLAY:
+    if op_code == 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", ActionId.TC_MODE_REPLAY)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCodes.MODE_IDLE:
+    if op_code == 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", ActionId.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", ActionId.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", ActionId.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", ActionId.RELEASE_UART_TX)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCode.CAM_TAKE_PIC:
+        q.add_log_cmd("PLOC MPSoC: Cam take picture")
+        data = prepare_cam_take_pic_cmd(object_id.as_bytes)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCode.SIMPLEX_SEND_FILE:
+        q.add_log_cmd("PLOC MPSoC: Simplex send file")
+        data = prepare_simplex_send_file_cmd(object_id.as_bytes)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCode.DOWNLINK_DATA_MODULATE:
+        q.add_log_cmd("PLOC MPSoC: Downlink data modulate")
+        data = prepare_downlink_data_modulate_cmd(object_id.as_bytes)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCode.MODE_SNAPSHOT:
+        q.add_log_cmd("PLOC MPSoC: Mode snapshot")
+        data = object_id.as_bytes + struct.pack("!I", ActionId.TC_MODE_SNAPSHOT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
 
 
@@ -246,7 +328,7 @@ def generate_write_mem_command(
     """
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_MEM_WRITE)
+        + struct.pack("!I", ActionId.TC_MEM_WRITE)
         + struct.pack("!I", memory_address)
         + struct.pack("!H", mem_len)
         + struct.pack("!I", memory_data)
@@ -259,31 +341,48 @@ 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", ActionId.TC_MEM_READ)
         + struct.pack("!I", memory_address)
         + struct.pack("!H", num_words)
     )
     return bytearray(command)
 
 
+def prepare_flash_base_cmd(
+    obc_filename: str, mpsoc_filename: str, action_id: int, object_id: bytes
+) -> bytearray:
+    command = bytearray(object_id)
+    command.extend(struct.pack("!I", action_id))
+    command.extend(obc_filename.encode("utf-8"))
+    command.append(0)
+    command.extend(mpsoc_filename.encode("utf-8"))
+    command.append(0)
+    return command
+
+
 def prepare_flash_write_cmd(object_id: bytes) -> bytearray:
-    obcFile = get_obc_file()
-    mpsocFile = get_mpsoc_file()
-    command = (
-        object_id
-        + struct.pack("!I", CommandIds.FLASH_WRITE)
-        + bytearray(obcFile, "utf-8")
-        + bytearray(mpsocFile, "utf-8")
+    obc_file = get_obc_file(OBC_WRITE_FILE_DICT)
+    mpsoc_file = get_mpsoc_file(MPSOC_WRITE_FILE_DICT)
+    return prepare_flash_base_cmd(
+        obc_file, mpsoc_file, ActionId.TC_FLASH_WRITE_FULL_FILE, object_id
     )
-    return bytearray(command)
+
+
+def prepare_flash_read_cmd(object_id: bytes) -> bytearray:
+    mpsoc_file = get_mpsoc_file(MPSOC_READ_FILE_DICT)
+    obc_file = get_obc_file(OBC_READ_FILE_DICT)
+    cmd = prepare_flash_base_cmd(
+        obc_file, mpsoc_file, ActionId.TC_FLASH_READ_FULL_FILE, object_id
+    )
+    file_size = get_mpsoc_file_size()
+    cmd.extend(struct.pack("!I", file_size))
+    return cmd
 
 
 def prepare_flash_delete_cmd(object_id: bytes) -> bytearray:
-    file = get_mpsoc_file()
+    file = get_mpsoc_file(MPSOC_READ_FILE_DICT)
     command = (
-        object_id
-        + struct.pack("!I", CommandIds.TC_FLASH_DELETE)
-        + bytearray(file, "utf-8")
+        object_id + struct.pack("!I", ActionId.TC_FLASH_DELETE) + file.encode("utf-8")
     )
     return bytearray(command)
 
@@ -292,7 +391,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", ActionId.TC_REPLAY_START)
         + struct.pack("!B", replay)
     )
     return bytearray(command)
@@ -303,7 +402,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", ActionId.TC_DOWNLINK_PWR_ON)
         + struct.pack("!B", mode)
         + struct.pack("!B", lane_rate)
     )
@@ -315,7 +414,7 @@ def prepare_replay_write_sequence_cmd(object_id: bytes) -> bytearray:
     file = get_sequence_file()
     command = (
         object_id
-        + struct.pack("!I", CommandIds.TC_REPLAY_WRITE_SEQUENCE)
+        + struct.pack("!I", ActionId.TC_REPLAY_WRITE_SEQUENCE)
         + struct.pack("!B", use_decoding)
         + bytearray(file, "utf-8")
         # + bytes([0])
@@ -323,30 +422,100 @@ def prepare_replay_write_sequence_cmd(object_id: bytes) -> bytearray:
     return bytearray(command)
 
 
-def get_obc_file() -> str:
-    LOGGER.info("Specify OBC file ")
-    input_helper = InputHelper(flash_write_file_dict)
+def prepare_cam_take_pic_cmd(object_id: bytes) -> bytearray:
+    selection = input("Use default parameter? (Y/N): ")
+    if selection.lower() in ["y", "1", "yes"]:
+        filename = "0:/test"
+        encoder_setting_y = 7
+        quantization_y = 0
+        encoder_setting_cb = 7
+        quantization_cb = 0
+        encoder_setting_cr = 7
+        quantization_cr = 0
+        bypass_compressor = 0
+    else:
+        filename = input("Specify filename: ")
+        encoder_setting_y = int(input("Specify encoderSetting_Y: "))
+        quantization_y = int(input("Specify quantization_Y: "))
+        encoder_setting_cb = int(input("Specify encoderSetting_Cb: "))
+        quantization_cb = int(input("Specify quantization_Cb: "))
+        encoder_setting_cr = int(input("Specify encoderSetting_Cr: "))
+        quantization_cr = int(input("Specify quantization_Cr: "))
+        bypass_compressor = int(input("Specify bypassCompressor: "))
+    command = (
+        object_id
+        + struct.pack("!I", ActionId.TC_CAM_TAKE_PIC)
+        + bytearray(filename, "utf-8")
+        + bytes([0])
+        + struct.pack("!B", encoder_setting_y)
+        + struct.pack("!Q", quantization_y)
+        + struct.pack("!B", encoder_setting_cb)
+        + struct.pack("!Q", quantization_cb)
+        + struct.pack("!B", encoder_setting_cr)
+        + struct.pack("!Q", quantization_cr)
+        + struct.pack("!B", bypass_compressor)
+    )
+    return bytearray(command)
+
+
+def prepare_simplex_send_file_cmd(object_id: bytes) -> bytearray:
+    filename = input("Specify filename: ")
+    command = (
+        object_id
+        + struct.pack("!I", ActionId.TC_SIMPLEX_SEND_FILE)
+        + bytearray(filename, "utf-8")
+        + bytes([0])
+    )
+    return bytearray(command)
+
+
+def prepare_downlink_data_modulate_cmd(object_id: bytes) -> bytearray:
+    format = int(input("Specify format: "))
+    src_mem_addr = int(input("Specify srcMemAddr: "))
+    src_mem_len = int(input("Specify srcMemLen: "))
+    dest_mem_addr = int(input("Specify destMemAddr: "))
+    command = (
+        object_id
+        + struct.pack("!I", ActionId.TC_DOWNLINK_DATA_MODULATE)
+        + struct.pack("!B", format)
+        + struct.pack("!I", src_mem_addr)
+        + struct.pack("!H", src_mem_len)
+        + struct.pack("!I", dest_mem_addr)
+    )
+    return bytearray(command)
+
+
+def get_obc_file(input_dict: dict) -> str:
+    _LOGGER.info("Specify OBC filename")
+    input_helper = InputHelper(input_dict)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
         file = input("Ploc MPSoC: Specify absolute name of flash file: ")
     else:
-        file = flash_write_file_dict[key][1]
+        file = input_dict[key][1]
     return file
 
 
-def get_mpsoc_file() -> str:
-    LOGGER.info("Specify MPSoC file")
-    input_helper = InputHelper(mpsoc_file_dict)
+def get_mpsoc_file(input_dict: dict) -> str:
+    _LOGGER.info("Specify MPSoC filename")
+    input_helper = InputHelper(input_dict)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
         file = input("Ploc MPSoC: Specify absolute name file: ")
     else:
-        file = mpsoc_file_dict[key][1]
+        file = input_dict[key][1]
     return file
 
 
+def get_mpsoc_file_size() -> int:
+    file_size = int(input("Specify MPSoC file size: "))
+    if file_size <= 0:
+        raise ValueError("Invalid file size")
+    return file_size
+
+
 def get_sequence_file() -> str:
-    LOGGER.info("Specify sequence file")
+    _LOGGER.info("Specify sequence file")
     input_helper = InputHelper(SEQ_FILE_DICT)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
@@ -354,3 +523,185 @@ def get_sequence_file() -> str:
     else:
         file = SEQ_FILE_DICT[key][1]
     return file
+
+
+def handle_ploc_mpsoc_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
+    if set_id == SetId.HK_ID:
+        fmt_str = "!IBBBBBBB"
+        current_idx = 0
+        inc_len = struct.calcsize(fmt_str)
+        (
+            status,
+            mode,
+            downlink_pwr_on,
+            downlink_reply_active,
+            downlink_jesd_sync_status,
+            downlink_dac_status,
+            cam_status,
+            cam_sdi_status,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        current_idx += inc_len
+        pw.ilog(_LOGGER, "Received MPSoC HK")
+        pw.dlog(f"Status: {status}")
+        pw.dlog(f"Mode: {mode}")
+        pw.dlog(f"Downlink Power On: {downlink_pwr_on}")
+        pw.dlog(f"Downlink Reply Active: {downlink_reply_active}")
+        pw.dlog(f"Downlink JESD Sync Status: {downlink_jesd_sync_status}")
+        pw.dlog(f"Downlink DAC Status: {downlink_dac_status}")
+        pw.dlog(f"CAM Status: {cam_status}")
+        pw.dlog(f"CAM SDI Status: {cam_sdi_status}")
+
+        fmt_str = "!fffffffff"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            cam_fpga_temp,
+            cam_soc_temp,
+            sysmon_temp,
+            sysmon_vcc_int,
+            sysmon_vcc_aux,
+            sysmon_vcc_bram,
+            sysmon_vcc_paux,
+            sysmon_vcc_pint,
+            sysmon_vcc_pdro,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        current_idx += inc_len
+
+        pw.dlog(f"CAM FPGA Temperature: {cam_fpga_temp}")
+        pw.dlog(f"CAM SoC Temperature: {cam_soc_temp}")
+        pw.dlog(f"System Monitor Temperature: {sysmon_temp}")
+        pw.dlog(
+            f"SYSMON VCC INT {sysmon_vcc_int:.3f} | SYSMON VCC AUX"
+            f" {sysmon_vcc_aux:.3f} | SYSMON VCC BRAM {sysmon_vcc_bram:.3f}"
+        )
+        pw.dlog(
+            f"SYSMON VCC PAUX {sysmon_vcc_paux:.3f} | SYSMON VCC PINT"
+            f" {sysmon_vcc_pint:.3f} | SYSMON VCC PDRO {sysmon_vcc_pdro:.3f}"
+        )
+
+        fmt_str = "!fffffffffffff"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            sysmon_mb_12v,
+            sysmon_mb_3v3,
+            sysmon_mb_1v8,
+            sysmon_vcc_12v,
+            sysmon_vcc_5v,
+            sysmon_vcc_3v3,
+            sysmon_vcc_3v3va,
+            sysmon_vcc_2v5ddr,
+            sysmon_vcc_1v2ddr,
+            sysmon_vcc_0v9,
+            sysmon_vcc_0v6vtt,
+            sysmon_safe_cotr_cur,
+            sysmon_nvm4_xo_cur,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        current_idx += inc_len
+
+        pw.dlog(
+            f"SYSMON MB 12V {sysmon_mb_12v:.3f} | SYSMON MB 3V3 {sysmon_mb_3v3:.3f} | "
+            f"SYSMON MBA 1V8 {sysmon_mb_1v8:.3f}"
+        )
+        pw.dlog(
+            f"SYSMON VCC 12V {sysmon_vcc_12v:.3f} | SYSMON VCC 5V {sysmon_vcc_5v:.3f} |"
+            f" SYSMON VCC 3V3 {sysmon_vcc_3v3:.3f} | SYSMON VCC 3V3VA"
+            f" {sysmon_vcc_3v3va}"
+        )
+        pw.dlog(
+            f"SYSMON VCC 2V5DDR {sysmon_vcc_2v5ddr:.3f} | "
+            f"SYSMON VCC 1V2DDR {sysmon_vcc_1v2ddr:.3f} | "
+            f"SYSMON VCC 0V9 {sysmon_vcc_0v9:.3f} | "
+            f"SYSMON VCC 0V6VTT {sysmon_vcc_0v6vtt}"
+        )
+        pw.dlog(
+            f"SYSMON SAFE COTS CURR: {sysmon_safe_cotr_cur} | "
+            f"SYSMON NVM4XO CURR {sysmon_nvm4_xo_cur}"
+        )
+        fmt_str = "!HHBB"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            sem_uncorrectable_errs,
+            sem_correctable_errs,
+            sem_status,
+            reboot_mpsoc_required,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+
+        pw.dlog(f"SEM IP Uncorrectable Errors: {sem_uncorrectable_errs}")
+        pw.dlog(f"SEM IP Correctable Errors: {sem_correctable_errs}")
+        pw.dlog(f"SEM IP Status: {sem_status}")
+        pw.dlog(f"Reboot MPSoC required: {reboot_mpsoc_required}")
+    else:
+        _LOGGER.warning(f"Unknown set ID {set_id} for MPSoC HK")
+    pass
+
+
+@dataclasses.dataclass
+class DirElement:
+    name: str
+    attr: int
+    size: int
+
+
+def handle_mpsoc_data_reply(action_id: int, pw: PrintWrapper, custom_data: bytearray):
+    if action_id == ActionId.TM_MEM_READ_RPT:
+        header_list = [
+            "PLOC Memory Address",
+            "PLOC Mem Len",
+            "PLOC Read Memory Data",
+        ]
+        content_list = [
+            "0x" + custom_data[:4].hex(),
+            struct.unpack("!H", custom_data[4:6])[0],
+            "0x" + custom_data[6:10].hex(),
+        ]
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")
+    elif action_id == ActionId.TM_CAM_CMD_RPT:
+        header_list = ["Camera reply string", "ACK"]
+        content_list = [
+            custom_data[: len(custom_data) - 1].decode("utf-8"),
+            hex(custom_data[-1]),
+        ]
+        pw.dlog(f"{header_list}")
+        pw.dlog(f"{content_list}")
+    elif action_id == ActionId.TM_FLASH_DIRECTORY_CONTENT:
+        if len(custom_data) < 16:
+            _LOGGER.warning(
+                "PLOC MPSoC flash directory data shorter than minimum 16 bytes"
+            )
+        current_idx = 0
+        dir_name_short = custom_data[current_idx : current_idx + 12].decode("utf-8")
+        current_idx += 12
+        num_elements = struct.unpack("!I", custom_data[current_idx : current_idx + 4])[
+            0
+        ]
+        current_idx += 4
+        elem_names = []
+        elem_attrs = []
+        elem_sizes = []
+        expected_size = 16 + num_elements * 17
+        if len(custom_data) < expected_size:
+            _LOGGER.warning(
+                f"PLOC MPSoC flash directory data shorter than expected {expected_size}"
+            )
+        pw.dlog(
+            f"Received PLOC MPSoC flash directory content for path {dir_name_short} "
+            f"with {num_elements} elements"
+        )
+        # It is as weird as it looks..
+        for _ in range(num_elements):
+            end_of_str = custom_data[current_idx : current_idx + 12].index(b"\x00")
+            elem_name = custom_data[current_idx : current_idx + end_of_str].decode(
+                "utf-8"
+            )
+            current_idx += 12
+            elem_names.append(elem_name)
+        for _ in range(num_elements):
+            elem_attrs.append(custom_data[current_idx])
+            current_idx += 1
+        for _ in range(num_elements):
+            elem_sizes.append(
+                struct.unpack("!I", custom_data[current_idx : current_idx + 4])[0]
+            )
+            current_idx += 4
+        for i in range(num_elements):
+            pw.dlog(f"{DirElement(elem_names[i], elem_attrs[i], elem_sizes[i])}")

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -7,6 +7,7 @@
 @date   10.07.2021
 """
 import enum
+import logging
 import struct
 
 from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids
@@ -16,15 +17,14 @@ 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.util.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.utility.input_helper import InputHelper
 
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 
 latchup_id_dict = {
     "0": "0.85V",
@@ -83,7 +83,7 @@ FACTORY_RESET_OPS = {
 }
 
 
-class SupvActionIds:
+class SupvActionId(enum.IntEnum):
     HK_REPORT = 1
     START_MPSOC = 3
     SHUTWOWN_MPSOC = 4
@@ -130,7 +130,7 @@ class SupvActionIds:
     MEM_CHECK = 61
 
 
-class SetIds:
+class SetIds(enum.IntEnum):
     HK_REPORT = 102
     BOOT_STATUS_REPORT = 103
 
@@ -172,7 +172,6 @@ class Info(str, enum.Enum):
 
 @tmtc_definitions_provider
 def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
-
     oce = OpCodeEntry()
     oce.add(OpCodes.OFF, Info.OFF)
     oce.add(OpCodes.ON, Info.ON)
@@ -223,7 +222,7 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
 
 
 @service_provider(CustomServiceList.PLOC_SUPV)
-def pack_ploc_supv_commands(p: ServiceProviderParams):
+def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
     q = p.queue_helper
     op_code = p.op_code
     object_id = get_object_ids().get(PLOC_SUPV_ID)
@@ -232,19 +231,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}")
@@ -253,11 +252,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")
@@ -279,9 +278,9 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
                 print("Key invalid!")
             break
         q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                 object_id=PLOC_SUPV_ID,
-                action_id=SupvActionIds.FACTORY_RESET,
+                action_id=SupvActionId.FACTORY_RESET,
                 user_data=bytes([key]),
             )
         )
@@ -290,35 +289,35 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         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 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)
@@ -352,13 +351,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":
@@ -380,7 +379,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
+            "!I", SupvActionId.RESTART_SUPERVISOR
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.START_UPDATE:
@@ -394,14 +393,12 @@ 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")
@@ -409,15 +406,15 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.FACTORY_FLASH:
         q.add_log_cmd(f"{prefix}: {Info.FACTORY_FLASH}")
-        command = object_id.as_bytes + struct.pack("!I", SupvActionIds.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")
@@ -426,7 +423,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":
@@ -436,18 +433,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")
@@ -455,14 +452,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()
@@ -474,11 +471,11 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         custom_data.extend(struct.pack("!B", memory_id))
         custom_data.extend(struct.pack("!I", start_address))
         q.add_log_cmd(
-            f"{prefix}: {Info.MEM_CHECK} for file {update_file} at memory ID {memory_id} at start "
-            f"address {start_address}"
+            f"{prefix}: {Info.MEM_CHECK} for file {update_file} at memory ID"
+            f" {memory_id} at start 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)
 
@@ -486,14 +483,16 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
 def pack_sel_boot_image_cmd(
     object_id: bytes, mem: int, bp0: int, bp1: int, bp2: int
 ) -> bytearray:
-    """This function can be used to generate the command to select the image from which the MPSoC will boot
+    """This function can be used to generate the command to select the image from which the MPSoC
+    will boot.
+
     @param object_id    The object id of the PLOC supervisor handler.
     @param mem  The memory from which the MPSoC shall boot (NVM0 - 0, NVM1 - 1)
     @param bp0  Partition pin 0
     @param bp1  Partition pin 1
     @param bp2  Partition pin 2
     """
-    command = 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)
@@ -511,7 +510,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)
@@ -529,9 +528,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)
 
@@ -560,7 +559,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)
@@ -572,7 +571,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)
 
@@ -580,7 +579,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)
@@ -588,21 +587,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)
 
@@ -610,7 +609,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)
@@ -642,7 +641,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)
@@ -657,7 +656,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
@@ -666,7 +665,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
@@ -676,7 +675,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)
@@ -686,21 +685,21 @@ 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 == HARDCODED:
@@ -713,7 +712,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:
@@ -723,11 +722,42 @@ def get_event_buffer_path() -> str:
     return file
 
 
-def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
-    pw = PrintWrapper(printer)
+class SocState(enum.IntEnum):
+    OFF = 0
+    BOOTING = 1
+    OPERATIONAL = 2
+    SHUTDOWN = 3
+
+
+def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
     current_idx = 0
     if set_id == SetIds.HK_REPORT:
-        pass
+        fmt_str = "!IIIQIIIIIBBBB"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            temp_ps,
+            temp_pl,
+            temp_sup,
+            uptime,
+            cpu_load,
+            avail_heap,
+            num_tcs,
+            num_tms,
+            soc_state,
+            nvm_0_1_state,
+            nvm_3_state,
+            mission_io_state,
+            fmc_state,
+        ) = struct.unpack(fmt_str, hk_data[:inc_len])
+        pw.dlog(f"Temp PS {temp_ps} C | Temp PL {temp_pl} C | Temp SUP {temp_sup} C")
+        pw.dlog(f"Uptime {uptime} | CPU Load {cpu_load} | Avail Heap {avail_heap}")
+        pw.dlog(f"Number TCs {num_tcs} | Number TMs {num_tms}")
+        pw.dlog(f"SOC state {SocState(soc_state)}")
+        pw.dlog(f"NVM 01 State {nvm_0_1_state}")
+        pw.dlog(f"NVM 3 State {nvm_3_state}")
+        pw.dlog(f"Mission IO state {mission_io_state}")
+        pw.dlog(f"FMC state {fmc_state}")
+        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[inc_len:], 13))
     elif set_id == SetIds.BOOT_STATUS_REPORT:
         fmt_str = "!BBIIBBBBBB"
         inc_len = struct.calcsize(fmt_str)
@@ -745,7 +775,8 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
         ) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
         current_idx += inc_len
         pw.dlog(
-            f"SoC state (0:off, 1:booting, 2:update, 3:operating, 4:shutdown, 5:reset): {soc_state}"
+            "SoC state (0:off, 1:booting, 2:update, 3:operating, 4:shutdown, 5:reset):"
+            f" {soc_state}"
         )
         pw.dlog(f"Power Cycles {power_cycles}")
         pw.dlog(f"Boot after {boot_after_ms} ms | Boot timeout {boot_timeout_ms} ms")
@@ -754,7 +785,7 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
             f"BP0 State {bp_0_state} | BP1 State {bp_1_state} | BP2 State {bp_2_state}"
         )
         pw.dlog(f"Boot State {boot_state} | Boot Cycles {boot_cycles}")
-        pw.printer.print_validity_buffer(hk_data[current_idx:], 10)
+        FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 10)
     else:
         pw.dlog(f"PLOC SUPV: HK handling not implemented for set ID {set_id}")
         pw.dlog(f"Raw Data: 0x[{hk_data.hex(sep=',')}]")

eive_tmtc/tmtc/payload/rad_sensor.py

@@ -5,24 +5,27 @@
 @author J. Meier
 @date   01.07.2021
 """
+import enum
 import struct
 
 from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
 
 from spacepackets.ecss.tc import PusTelecommand
-from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Modes
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.util import ObjectIdU32
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
 
-class SetIds:
+class SetId(enum.IntEnum):
     HK = 3
 
 
-class OpCodes:
+class OpCode:
     ON = ["0", "on"]
     NORMAL = ["1", "normal"]
     OFF = ["2", "off"]
@@ -40,7 +43,7 @@ class Info:
     DEBUG_OFF = "Switch debug output off"
 
 
-class CommandIds:
+class CommandId:
     START_CONVERSIONS = 2
     READ_CONVERSIONS = 3
     ENABLE_DEBUG_OUTPUT = 4
@@ -50,12 +53,12 @@ class CommandIds:
 @tmtc_definitions_provider
 def add_rad_sens_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(info=Info.ON, keys=OpCodes.ON)
-    oce.add(info=Info.OFF, keys=OpCodes.OFF)
-    oce.add(info=Info.NORMAL, keys=OpCodes.NORMAL)
-    oce.add(info=Info.REQ_OS_HK, keys=OpCodes.REQ_HK_ONCE)
-    oce.add(info=Info.DEBUG_ON, keys=OpCodes.DEBUG_ON)
-    oce.add(info=Info.DEBUG_OFF, keys=OpCodes.DEBUG_OFF)
+    oce.add(info=Info.ON, keys=OpCode.ON)
+    oce.add(info=Info.OFF, keys=OpCode.OFF)
+    oce.add(info=Info.NORMAL, keys=OpCode.NORMAL)
+    oce.add(info=Info.REQ_OS_HK, keys=OpCode.REQ_HK_ONCE)
+    oce.add(info=Info.DEBUG_ON, keys=OpCode.DEBUG_ON)
+    oce.add(info=Info.DEBUG_OFF, keys=OpCode.DEBUG_OFF)
     defs.add_service(
         name=CustomServiceList.RAD_SENSOR.value,
         info="Radiation Sensor",
@@ -68,32 +71,50 @@ def pack_rad_sensor_test_into(
 ):
     q.add_log_cmd(f"Commanding Radiation sensor handler {object_id}")
 
-    if op_code in OpCodes.ON:
-        rad_sensor_mode_cmd(object_id, Modes.ON, Info.ON, q)
-    if op_code in OpCodes.NORMAL:
-        rad_sensor_mode_cmd(object_id, Modes.NORMAL, Info.NORMAL, q)
-    if op_code in OpCodes.OFF:
-        rad_sensor_mode_cmd(object_id, Modes.OFF, Info.OFF, q)
-    if op_code in OpCodes.REQ_HK_ONCE:
+    if op_code in OpCode.ON:
+        rad_sensor_mode_cmd(object_id, Mode.ON, Info.ON, q)
+    if op_code in OpCode.NORMAL:
+        rad_sensor_mode_cmd(object_id, Mode.NORMAL, Info.NORMAL, q)
+    if op_code in OpCode.OFF:
+        rad_sensor_mode_cmd(object_id, Mode.OFF, Info.OFF, q)
+    if op_code in OpCode.REQ_HK_ONCE:
         q.add_log_cmd(f"Rad sensor: {Info.REQ_OS_HK}")
         q.add_pus_tc(
-            generate_one_hk_command(sid=make_sid(object_id.as_bytes, set_id=SetIds.HK))
+            generate_one_hk_command(sid=make_sid(object_id.as_bytes, set_id=SetId.HK))
         )
-    if op_code in OpCodes.DEBUG_ON:
+    if op_code in OpCode.DEBUG_ON:
         q.add_log_cmd(f"Rad sensor: {Info.DEBUG_ON}")
-        command = object_id.as_bytes + struct.pack("!I", CommandIds.ENABLE_DEBUG_OUTPUT)
+        command = object_id.as_bytes + struct.pack("!I", CommandId.ENABLE_DEBUG_OUTPUT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.DEBUG_OFF:
+    if op_code in OpCode.DEBUG_OFF:
         q.add_log_cmd(f"Rad sensor: {Info.DEBUG_OFF}")
-        command = object_id.as_bytes + struct.pack(
-            "!I", CommandIds.DISABLE_DEBUG_OUTPUT
-        )
+        command = object_id.as_bytes + struct.pack("!I", CommandId.DISABLE_DEBUG_OUTPUT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
 
 
 def rad_sensor_mode_cmd(
-    object_id: ObjectIdU32, mode: Modes, info: str, q: DefaultPusQueueHelper
+    object_id: ObjectIdU32, mode: Mode, info: str, q: DefaultPusQueueHelper
 ):
     q.add_log_cmd(f"Rad sensor: {info}")
     mode_data = pack_mode_data(object_id.as_bytes, mode, 0)
     q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
+
+
+def handle_rad_sensor_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+    if set_id == SetId.HK:
+        current_idx = 0
+        pw.dlog("Received Radiation Sensor HK data")
+        fmt_str = "!fHHHHHH"
+        inc_len = struct.calcsize(fmt_str)
+        (temp, ain0, ain1, ain4, ain5, ain6, ain7) = struct.unpack(
+            fmt_str, hk_data[current_idx : current_idx + inc_len]
+        )
+        ain_dict = {0: ain0, 1: ain1, 4: ain4, 5: ain5, 6: ain6, 7: ain7}
+        pw.dlog(f"Temperature: {temp} C")
+        pw.dlog("AIN Channel | Raw Value (hex) | Raw Value (dec)")
+        for idx, val in ain_dict.items():
+            pw.dlog(f"{idx} | {val:#06x} | {str(val).ljust(5)}")
+        current_idx += inc_len
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=hk_data[current_idx:], num_vars=7
+        )

eive_tmtc/tmtc/payload/scex.py

@@ -5,10 +5,10 @@ from spacepackets.ecss import PusTelecommand
 
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
 from eive_tmtc.config.object_ids import SCEX_HANDLER_ID
 
@@ -16,21 +16,24 @@ from eive_tmtc.config.object_ids import SCEX_HANDLER_ID
 USE_SCEX_CONF_FILE = True
 
 
-class OpCodes:
-    PING = ["0", "ping"]
-    ION_CMD = ["1", "ion"]
-    TEMP_CMD = ["2", "temp"]
-    EXP_STATUS_CMD = ["3", "expstatus"]
+class OpCode:
+    PING = "ping"
+    ION_CMD = "ion"
+    TEMP_CMD = "temp"
+    EXP_STATUS_CMD = "expstatus"
 
-    ONE_CELLS_CMD = ["4", "onecell"]
-    ALL_CELLS_CMD = ["5", "allcells"]
-    FRAM = ["6", "fram"]
+    ONE_CELLS_CMD = "onecell"
+    ALL_CELLS_CMD = "allcells"
+    FRAM = "fram"
 
-    SWITCH_ON = ["7", "on"]
-    SWITCH_OFF = ["8", "off"]
+    ON = "on"
+    SWITCH_ON = "on"
+    OFF = "off"
+    SWITCH_OFF = OFF
+    NORMAL = "normal"
 
 
-class ActionIds(enum.IntEnum):
+class ActionId(enum.IntEnum):
     PING = 7
     ION_CMD = 4
     TEMP_CMD = 3
@@ -53,21 +56,23 @@ class Info:
 
     SWITCH_ON = "Switch Scex on"
     SWITCH_OFF = "Switch Scex off"
+    NORMAL = "Switch SCEX to normal mode"
 
 
 @tmtc_definitions_provider
 def add_scex_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(keys=OpCodes.PING, info=Info.PING)
-    oce.add(keys=OpCodes.ION_CMD, info=Info.ION_CMD)
-    oce.add(keys=OpCodes.TEMP_CMD, info=Info.TEMP_CMD)
-    oce.add(keys=OpCodes.EXP_STATUS_CMD, info=Info.EXP_STATUS_CMD)
-    oce.add(keys=OpCodes.ONE_CELLS_CMD, info=Info.ONE_CELLS_CMD)
+    oce.add(keys=OpCode.PING, info=Info.PING)
+    oce.add(keys=OpCode.ION_CMD, info=Info.ION_CMD)
+    oce.add(keys=OpCode.TEMP_CMD, info=Info.TEMP_CMD)
+    oce.add(keys=OpCode.EXP_STATUS_CMD, info=Info.EXP_STATUS_CMD)
+    oce.add(keys=OpCode.ONE_CELLS_CMD, info=Info.ONE_CELLS_CMD)
 
-    oce.add(keys=OpCodes.ALL_CELLS_CMD, info=Info.ALL_CELLS_CMD)
-    oce.add(keys=OpCodes.FRAM, info=Info.FRAM)
-    oce.add(keys=OpCodes.SWITCH_ON, info=Info.SWITCH_ON)
-    oce.add(keys=OpCodes.SWITCH_OFF, info=Info.SWITCH_OFF)
+    oce.add(keys=OpCode.ALL_CELLS_CMD, info=Info.ALL_CELLS_CMD)
+    oce.add(keys=OpCode.FRAM, info=Info.FRAM)
+    oce.add(keys=OpCode.ON, info=Info.SWITCH_ON)
+    oce.add(keys=OpCode.OFF, info=Info.SWITCH_OFF)
+    oce.add(keys=OpCode.NORMAL, info=Info.NORMAL)
 
     defs.add_service(
         name=CustomServiceList.SCEX.value, info="SCEX Device", op_code_entry=oce
@@ -75,51 +80,58 @@ def add_scex_cmds(defs: TmtcDefinitionWrapper):
 
 
 @service_provider(CustomServiceList.SCEX.value)
-def pack_scex_cmds(p: ServiceProviderParams):
+def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
     op_code = p.op_code
     q = p.queue_helper
-    if op_code in OpCodes.SWITCH_ON:
+    if op_code == OpCode.ON:
         q.add_log_cmd(Info.SWITCH_ON)
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
-                subservice=Subservices.TC_MODE_COMMAND,
-                app_data=pack_mode_data(SCEX_HANDLER_ID, Modes.ON, 0),
+                subservice=Subservice.TC_MODE_COMMAND,
+                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0),
             )
         )
-    if op_code in OpCodes.SWITCH_OFF:
+    if op_code == OpCode.NORMAL:
+        q.add_log_cmd(Info.NORMAL)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=Subservice.TC_MODE_COMMAND,
+                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.NORMAL, 0),
+            )
+        )
+    if op_code == OpCode.OFF:
         q.add_log_cmd(Info.SWITCH_OFF)
         q.add_pus_tc(
             PusTelecommand(
                 service=200,
-                subservice=Subservices.TC_MODE_COMMAND,
-                app_data=pack_mode_data(SCEX_HANDLER_ID, Modes.OFF, 0),
+                subservice=Subservice.TC_MODE_COMMAND,
+                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.OFF, 0),
             )
         )
-    if op_code in OpCodes.PING:
+    if op_code == OpCode.PING:
         q.add_log_cmd(Info.PING)
         app_data = bytes([0])
-        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.PING, app_data))
-    if op_code in OpCodes.ION_CMD:
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.PING, app_data))
+    if op_code == OpCode.ION_CMD:
         q.add_log_cmd(Info.ION_CMD)
         app_data = bytes([0])
-        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.ION_CMD, app_data))
-    if op_code in OpCodes.TEMP_CMD:
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.ION_CMD, app_data))
+    if op_code == OpCode.TEMP_CMD:
         q.add_log_cmd(Info.TEMP_CMD)
         app_data = bytes([0])
-        q.add_pus_tc(
-            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.TEMP_CMD, app_data)
-        )
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.TEMP_CMD, app_data))
 
-    if op_code in OpCodes.EXP_STATUS_CMD:
+    if op_code == OpCode.EXP_STATUS_CMD:
         q.add_log_cmd(Info.EXP_STATUS_CMD)
         app_data = bytes([0])
         q.add_pus_tc(
-            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.EXP_STATUS_CMD, app_data)
+            create_action_cmd(SCEX_HANDLER_ID, ActionId.EXP_STATUS_CMD, app_data)
         )
 
     # one cell
-    if op_code in OpCodes.ONE_CELLS_CMD:
+    if op_code == OpCode.ONE_CELLS_CMD:
         q.add_log_cmd(Info.ONE_CELLS_CMD)
         app_data = bytearray([0])
 
@@ -133,8 +145,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
             cell_select = int(cell_select)
             if cell_select < 1 or cell_select > 10:
                 print(
-                    f"Invalid cell number {cell_select}, "
-                    f"Please enter a valid number: "
+                    f"Invalid cell number {cell_select}, Please enter a valid number: "
                 )
                 continue
             cn = cell_select - 1
@@ -164,10 +175,10 @@ def pack_scex_cmds(p: ServiceProviderParams):
         app_data.append(dac_weight3[cn])
 
         q.add_pus_tc(
-            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.ONE_CELLS_CMD, app_data)
+            create_action_cmd(SCEX_HANDLER_ID, ActionId.ONE_CELLS_CMD, app_data)
         )
 
-    if op_code in OpCodes.ALL_CELLS_CMD:
+    if op_code == OpCode.ALL_CELLS_CMD:
         q.add_log_cmd(Info.ALL_CELLS_CMD)
         app_data = bytearray([0])
 
@@ -196,13 +207,13 @@ def pack_scex_cmds(p: ServiceProviderParams):
         app_data.append(dac_weight3[cn])
 
         q.add_pus_tc(
-            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.ALL_CELLS_CMD, app_data)
+            create_action_cmd(SCEX_HANDLER_ID, ActionId.ALL_CELLS_CMD, app_data)
         )
 
-    if op_code in OpCodes.FRAM:
+    if op_code == OpCode.FRAM:
         q.add_log_cmd(Info.FRAM)
         app_data = bytes([0])
-        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionIds.FRAM, app_data))
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.FRAM, app_data))
 
 
 def append_16_bit_val(packet: bytearray, val: int):

eive_tmtc/tmtc/payload/subsystem.py

@@ -9,25 +9,30 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice
 
 
-class OpCodes(str, enum.Enum):
+class ModeId(enum.IntEnum):
+    OFF = 0
+    SUPV_ONLY = 10
+    MPSOC_STREAM = 11
+    CAM_STREAM = 12
+    EARTH_OBSV = 13
+    SCEX = 14
+
+
+class OpCode(str, enum.Enum):
     OFF = "off"
     REPORT_ALL_MODES = "report_modes"
 
 
-class PayloadModes(enum.IntEnum):
-    OFF = 0
-
-
 class Info(str, enum.Enum):
     OFF = "Off Command"
     REPORT_ALL_MODES = "Report all modes"
 
 
 HANDLER_LIST: Dict[str, Tuple[int, str]] = {
-    OpCodes.OFF: (PayloadModes.OFF, Info.OFF),
+    OpCode.OFF: (ModeId.OFF, Info.OFF),
 }
 
 
@@ -36,12 +41,12 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
     op_code = p.op_code
     q = p.queue_helper
     info_prefix = "ACS Subsystem"
-    if op_code in OpCodes.REPORT_ALL_MODES:
+    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,
+                subservice=ModeSubservice.TC_MODE_ANNOUNCE_RECURSIVE,
                 app_data=PL_SUBSYSTEM_ID,
             )
         )
@@ -60,6 +65,6 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
 @tmtc_definitions_provider
 def add_payload_subsystem_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(OpCodes.OFF, Info.OFF)
-    oce.add(OpCodes.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
+    oce.add(OpCode.OFF, Info.OFF)
+    oce.add(OpCode.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
     defs.add_service(CustomServiceList.PL_SS, "Payload Subsystem", oce)

eive_tmtc/tmtc/power/__init__.py

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

eive_tmtc/tmtc/power/acu.py

@@ -42,7 +42,7 @@ class ACUHkTable:
     wdt_gnd_left = gs.TableEntry(bytearray([0x00, 0x74]), gs.TableEntry.uint32_size)
 
 
-class OpCodes:
+class OpCode:
     TEST = ["0", "test"]
 
 
@@ -55,7 +55,7 @@ def add_acu_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     add_gomspace_cmd_defs(oce)
 
-    oce.add(keys=OpCodes.TEST, info=Info.TEST)
+    oce.add(keys=OpCode.TEST, info=Info.TEST)
     defs.add_service(
         name=CustomServiceList.ACU.value,
         info="ACU Device",

eive_tmtc/tmtc/power/bpx_batt.py

@@ -0,0 +1,238 @@
+import enum
+import struct
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from spacepackets.ecss import PusTelecommand
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import BPX_HANDLER_ID
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
+from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+
+class BpxSetId(enum.IntEnum):
+    GET_HK_SET = 0
+    GET_CFG_SET = 5
+
+
+class BpxActionId:
+    REBOOT = 2
+    RESET_COUNTERS = 3
+    CONFIG_CMD = 4
+    GET_CFG = 5
+    SET_CFG = 6
+    MAN_HEATER_ON = 10
+    MAN_HEATER_OFF = 11
+
+
+class BpxHeaterModeSelect(enum.IntEnum):
+    OFF = 0
+    AUTO = 1
+
+
+class BpxOpCode:
+    HK = "hk"
+    OFF = "off"
+    ON = "on"
+    RST_CFG = "reset_cfg"
+    SET_CFG = "set_cfg"
+    MAN_HEATER_ON = "man_heater_on"
+    MAN_HEATER_OFF = "man_heater_off"
+    RST_BOOT_CNT = "rst_boot_cnt"
+    REQUEST_CFG = "cfg"
+    REQUEST_CFG_HK = "cfg_hk"
+    REBOOT = "reboot"
+
+
+@tmtc_definitions_provider
+def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=BpxOpCode.ON, info="On command")
+    oce.add(keys=BpxOpCode.OFF, info="Off command")
+    oce.add(keys=BpxOpCode.HK, info="Request BPX HK")
+    oce.add(keys=BpxOpCode.RST_BOOT_CNT, info="Reset Boot Count")
+    oce.add(keys=BpxOpCode.RST_CFG, info="Reset Config to stored default settings")
+    oce.add(keys=BpxOpCode.SET_CFG, info="Set BPX configuration")
+    oce.add(keys=BpxOpCode.MAN_HEATER_ON, info="Manual heater on")
+    oce.add(keys=BpxOpCode.MAN_HEATER_OFF, info="Manual heater off")
+    oce.add(keys=BpxOpCode.REQUEST_CFG, info="Request Configuration Struct (Step 1)")
+    oce.add(
+        keys=BpxOpCode.REQUEST_CFG_HK, info="Request Configuration Struct HK (Step 2)"
+    )
+    oce.add(keys=BpxOpCode.REBOOT, info="Reboot Command")
+    defs.add_service(
+        name=CustomServiceList.BPX_BATTERY.value,
+        info="BPX Battery Handler",
+        op_code_entry=oce,
+    )
+
+
+@service_provider(CustomServiceList.BPX_BATTERY.value)
+def pack_bpx_commands(p: ServiceProviderParams):  # noqa C901: Complexity is okay here.
+    op_code = p.op_code
+    q = p.queue_helper
+    if op_code == BpxOpCode.HK:
+        q.add_log_cmd("Requesting BPX battery HK set")
+        sid = make_sid(object_id=BPX_HANDLER_ID, set_id=BpxSetId.GET_HK_SET)
+        q.add_pus_tc(generate_one_hk_command(sid=sid))
+    if op_code == BpxOpCode.OFF:
+        q.add_log_cmd("Off mode")
+        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.OFF, 0)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=ModeSubservices.TC_MODE_COMMAND,
+                app_data=mode_cmd,
+            )
+        )
+    if op_code == BpxOpCode.ON:
+        q.add_log_cmd("On mode")
+        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.ON, 0)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=ModeSubservices.TC_MODE_COMMAND,
+                app_data=mode_cmd,
+            )
+        )
+    if op_code == BpxOpCode.RST_BOOT_CNT:
+        q.add_log_cmd("Resetting reboot counters")
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=BPX_HANDLER_ID, action_id=BpxActionId.RESET_COUNTERS
+            )
+        )
+    if op_code == BpxOpCode.RST_CFG:
+        q.add_log_cmd("Reset BPX configuration")
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=BPX_HANDLER_ID, action_id=BpxActionId.CONFIG_CMD
+            )
+        )
+    if op_code == BpxOpCode.SET_CFG:
+        q.add_log_cmd("Setting BPX configuration")
+        user_data = bytearray()
+        batt_mode = BpxHeaterModeSelect(
+            int(input("BPX heater mode select, 0 for OFF 1 for AUTO: "))
+        )
+        user_data.append(batt_mode)
+        lower_limit = int(input("Lower heater limit (-2 default): "))
+        user_data.append(struct.pack("!b", lower_limit)[0])
+        upper_limit = int(input("Upper heater limit (3 default): "))
+        user_data.append(struct.pack("!b", upper_limit)[0])
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=BPX_HANDLER_ID,
+                action_id=BpxActionId.SET_CFG,
+                user_data=user_data,
+            )
+        )
+    if op_code == BpxOpCode.REQUEST_CFG:
+        q.add_log_cmd("Requesting configuration struct")
+        q.add_pus_tc(
+            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.GET_CFG)
+        )
+    if op_code == BpxOpCode.REQUEST_CFG_HK:
+        q.add_log_cmd("Requesting configuration struct HK")
+        sid = make_sid(object_id=BPX_HANDLER_ID, set_id=BpxSetId.GET_CFG_SET)
+        q.add_pus_tc(generate_one_hk_command(sid=sid))
+    if op_code == BpxOpCode.REBOOT:
+        q.add_log_cmd("Rebooting BPX battery")
+        q.add_pus_tc(
+            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.REBOOT)
+        )
+    if op_code == BpxOpCode.MAN_HEATER_ON:
+        q.add_log_cmd("BPX manual heater on with seconds burntime")
+        burn_time = int(input("BPX heater burn time in seconds [1-65535]: "))
+        if burn_time < 1 or burn_time > 65535:
+            raise ValueError("Invalid burntime, smaller than 0 or larger than 65535")
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=BPX_HANDLER_ID,
+                action_id=BpxActionId.MAN_HEATER_ON,
+                user_data=struct.pack("!H", burn_time),
+            )
+        )
+    if op_code == BpxOpCode.MAN_HEATER_OFF:
+        q.add_log_cmd("BPX manual heater off")
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=BPX_HANDLER_ID, action_id=BpxActionId.MAN_HEATER_OFF
+            )
+        )
+
+
+HEADER_LIST = [
+    "Charge Current",
+    "Discharge Current",
+    "Heater Current",
+    "Battery Voltage",
+    "Batt Temp 1",
+    "Batt Temp 2",
+    "Batt Temp 3",
+    "Batt Temp 4",
+    "Reboot Counter",
+    "Boot Cause",
+]
+
+
+def handle_bpx_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+    if set_id == BpxSetId.GET_HK_SET:
+        fmt_str = "!HHHHhhhhIB"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            charge_current,
+            discharge_current,
+            heater_current,
+            batt_voltage,
+            batt_temp_1,
+            batt_temp_2,
+            batt_temp_3,
+            batt_temp_4,
+            reboot_cntr,
+            boot_cause,
+        ) = struct.unpack(fmt_str, hk_data[0:inc_len])
+        content_list = [
+            charge_current,
+            discharge_current,
+            heater_current,
+            batt_voltage,
+            batt_temp_1,
+            batt_temp_2,
+            batt_temp_3,
+            batt_temp_4,
+            reboot_cntr,
+            boot_cause,
+        ]
+        validity_buffer = hk_data[inc_len:]
+        pw.dlog(str(HEADER_LIST))
+        pw.dlog(str(content_list))
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=10
+        )
+    elif set_id == BpxSetId.GET_CFG_SET:
+        battheat_mode = hk_data[0]
+        battheat_low = struct.unpack("!b", hk_data[1:2])[0]
+        battheat_high = struct.unpack("!b", hk_data[2:3])[0]
+        header_list = [
+            "Battery Heater Mode",
+            "Battery Heater Low Limit",
+            "Battery Heater High Limit",
+        ]
+        content_list = [battheat_mode, battheat_low, battheat_high]
+        validity_buffer = hk_data[3:]
+        pw.dlog(str(header_list))
+        pw.dlog(str(content_list))
+        FsfwTmTcPrinter.get_validity_buffer(
+            validity_buffer=validity_buffer, num_vars=10
+        )