bump changelog

Merge pull request 'fixed mgm proc output' (#128 ) from mgm-proc-fix into main
Reviewed-on: #128
2023-01-26 20:36:10 +01:00 · 2023-01-26 20:35:26 +01:00 · 2023-01-26 20:35:04 +01:00 · 2023-01-26 20:34:37 +01:00 · 2023-01-26 19:43:08 +01:00 · 2023-01-26 17:00:50 +01:00
54 changed files with 1538 additions and 1159 deletions
--- a/.run/tmtccli.run.xml
+++ b/.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" />
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,17 +8,53 @@ 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.2.0] 16.01.2023
+# [unreleased]
+
+# [v2.5.0] 2023-01-26
+
+## Fixed
+
+- Bugfix for CCSDS handler commanding: Pass correct object ID
+- Processed MGM set TM handling fix
+
+## Added
+
+- Added command to request switcher set from PCDU handler.
+- Star Tracker: Add commands to update default datarate.
+
+## Changed
+
+- Move Star Tracker module to `tmtc` folder and add some set IDs. Rename `SetIds` to `SetId`.
+- Move `syrlinks_hk_handler` and `ccsds_handler` module to `tmtc` module.
+  Rename `syrlinks_hk_handler` to `syrlinks_handler`.
+- Move `star_tracker` module into `tmtc.acs`
+- CCSDS Handler: Switch from action commands to mode commands for ON/OFF handling.
+- Star Tracker: Switch from actions commands to mode commands for RX/TX/Modulation commanding.
+
+# [v2.4.0] and [v2.4.1] 2023-01-23
+
+- Pin `tmtccmd` to v4.0.0a2
+- Unify and move Syrlinks module, some bugfixes
+- Add/Re-enable handling for SUS temp packets
+- Update SA deployment commands for OBSW https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/347
+- Extend, fix and improve Syrlinks TMTC handling a bit
+
+# [v2.3.0] and [v2.3.1] 2023-01-18
+
+- Bumped `tmtccmd` version to new alpha release, use some new features
+  and fix the breaking changes
+
+# [v2.2.0] 2023-01-16

 - A lot of consistency renaming: Single name for enums which are not flag enums, 
  e.g `ActionId` instead of `ActionIds`
 - Updated required Python version to 3.10

-# [v2.1.1] 12.01.2023
+# [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.
@ -27,22 +63,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
@ -55,7 +91,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
--- a/eive_tmtc/init.py
+++ b/eive_tmtc/init.py
@ -2,10 +2,10 @@ from pathlib import Path

 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
-VERSION_MINOR = 2
+VERSION_MINOR = 5
 VERSION_REVISION = 0

-__version__ = "2.2.0"
+__version__ = "2.5.0"

 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
--- a/eive_tmtc/config/events.csv
+++ b/eive_tmtc/config/events.csv
@ -83,6 +83,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 10800;0x2a30;STORE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
 10801;0x2a31;MSG_QUEUE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
 10802;0x2a32;SERIALIZATION_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
+11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;;mission/controller/AcsController.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
@ -225,11 +226,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 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
+13700;0x3584;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/SyrlinksDefinitions.h
+13701;0x3585;TX_ON;INFO;Transmitter is on now. P1: Submode, P2: Current default datarate.;mission/devices/devicedefinitions/SyrlinksDefinitions.h
+13702;0x3586;TX_OFF;INFO;Transmitter is off now.;mission/devices/devicedefinitions/SyrlinksDefinitions.h
 13800;0x35e8;MISSING_PACKET;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
 13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;;mission/devices/devicedefinitions/ScexDefinitions.h
 13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;;mission/devices/devicedefinitions/ScexDefinitions.h
@ -238,3 +237,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
 13904;0x3650;WRITE_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
 13905;0x3651;READ_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
+14000;0x36b0;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
+14001;0x36b1;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+14002;0x36b2;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
+14003;0x36b3;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
+14004;0x36b4;NO_SD_CARD_ACTIVE;HIGH;No SD card was active. Core controller will attempt to re-initialize a SD card.;bsp_q7s/core/CoreController.h
--- a/eive_tmtc/config/events.py
+++ b/eive_tmtc/config/events.py
@ -3,7 +3,7 @@ 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_event import EventDictT

 LOGGER = get_console_logger()
 DEFAULT_EVENTS_CSV_PATH = EIVE_TMTC_ROOT / "config/events.csv"
--- a/eive_tmtc/config/object_ids.py
+++ b/eive_tmtc/config/object_ids.py
@ -126,6 +126,7 @@ SUS_11_R_LOC_XBYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x43])
 # System and Assembly Objects
 ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
 PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
+TCS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x03])
 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])
--- a/eive_tmtc/config/objects.csv
+++ b/eive_tmtc/config/objects.csv
@ -84,8 +84,10 @@
 0x49050001;CSP_COM_IF
 0x50000100;CCSDS_PACKET_DISTRIBUTOR
 0x50000200;PUS_PACKET_DISTRIBUTOR
-0x50000300;TMTC_BRIDGE
-0x50000400;TMTC_POLLING_TASK
+0x50000300;TCP_TMTC_SERVER
+0x50000301;UDP_TMTC_SERVER
+0x50000400;TCP_TMTC_POLLING_TASK
+0x50000401;UDP_TMTC_POLLING_TASK
 0x50000500;FILE_SYSTEM_HANDLER
 0x50000550;SDC_MANAGER
 0x50000600;PTME
@ -144,5 +146,6 @@
 0x73010000;EIVE_SYSTEM
 0x73010001;ACS_SUBSYSTEM
 0x73010002;PL_SUBSYSTEM
+0x73010003;TCS_SUBSYSTEM
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT
--- a/eive_tmtc/config/returnvalues.csv
+++ b/eive_tmtc/config/returnvalues.csv
@ -1,14 +1,23 @@
 Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
+0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
+0x6300;NVMB_Busy;;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.h
+0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
+0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
 0x66a0;SADPL_CommandNotSupported;;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a1;SADPL_DeploymentAlreadyExecuting;;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a2;SADPL_MainSwitchTimeoutFailure;;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a3;SADPL_SwitchingDeplSa1Failed;;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a4;SADPL_SwitchingDeplSa2Failed;;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
-0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
+0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x52b0;RWHA_SpiWriteFailure;;176;RW_HANDLER;mission/devices/RwHandler.h
 0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/RwHandler.h
 0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/RwHandler.h
@ -21,115 +30,85 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x52a2;RWHA_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;RW_HANDLER;mission/devices/RwHandler.h
 0x52a3;RWHA_ExecutionFailed;Command execution failed;163;RW_HANDLER;mission/devices/RwHandler.h
 0x52a4;RWHA_CrcError;Reaction wheel reply has invalid crc;164;RW_HANDLER;mission/devices/RwHandler.h
-0x4fa1;HEATER_CommandNotSupported;;161;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x4fa2;HEATER_InitFailed;;162;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x4fa3;HEATER_InvalidSwitchNr;;163;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
-0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x50a0;SYRLINKS_CrcFailure;;160;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a1;SYRLINKS_UartFraminOrParityErrorAck;;161;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a2;SYRLINKS_BadCharacterAck;;162;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a3;SYRLINKS_BadParameterValueAck;;163;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a4;SYRLINKS_BadEndOfFrameAck;;164;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a5;SYRLINKS_UnknownCommandIdAck;;165;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a6;SYRLINKS_BadCrcAck;;166;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a7;SYRLINKS_ReplyWrongSize;;167;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
+0x50a8;SYRLINKS_MissingStartFrameCharacter;;168;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
 0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d03;GOMS_InvalidParamSize;;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d04;GOMS_InvalidPayloadSize;;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d05;GOMS_UnknownReplyId;;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/ImtqHandler.h
-0x50a0;SYRLINKS_CrcFailure;;160;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a1;SYRLINKS_UartFraminOrParityErrorAck;;161;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a2;SYRLINKS_BadCharacterAck;;162;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a3;SYRLINKS_BadParameterValueAck;;163;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a4;SYRLINKS_BadEndOfFrameAck;;164;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a5;SYRLINKS_UnknownCommandIdAck;;165;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a6;SYRLINKS_BadCrcAck;;166;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a7;SYRLINKS_ReplyWrongSize;;167;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x50a8;SYRLINKS_MissingStartFrameCharacter;;168;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
-0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
-0x3c00;LPIF_PoolEntryNotFound;;0;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
-0x3c01;LPIF_PoolEntryTypeConflict;;1;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
-0x3e00;HKM_QueueOrDestinationInvalid;;0;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3e01;HKM_WrongHkPacketType;;1;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3e02;HKM_ReportingStatusUnchanged;;2;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3e03;HKM_PeriodicHelperInvalid;;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3e04;HKM_PoolobjectNotFound;;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3e05;HKM_DatasetNotFound;;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
-0x3601;CFDP_InvalidTlvType;;1;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3602;CFDP_InvalidDirectiveField;;2;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3603;CFDP_InvalidPduDatafieldLen;;3;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3604;CFDP_InvalidAckDirectiveFields;;4;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3605;CFDP_MetadataCantParseOptions;;5;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3606;CFDP_NakCantParseOptions;;6;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3607;CFDP_FinishedCantParseFsResponses;;7;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3608;CFDP_FilestoreRequiresSecondFile;;8;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3609;CFDP_FilestoreResponseCantParseFsMessage;;9;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x360a;CFDP_InvalidPduFormat;;10;CFDP;fsfw/src/fsfw/cfdp/definitions.h
-0x3201;CF_ObjectHasNoFunctions;;1;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
-0x3202;CF_AlreadyCommanding;;2;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
-0x3301;HF_IsBusy;;1;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x3302;HF_InvalidParameters;;2;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x3303;HF_ExecutionFinished;;3;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x3304;HF_InvalidActionId;;4;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x1e00;PUS_InvalidPusVersion;;0;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
-0x1e01;PUS_InvalidCrc16;;1;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
-0x2e01;HPA_InvalidIdentifierId;;1;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2e02;HPA_InvalidDomainId;;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2e03;HPA_InvalidValue;;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2e05;HPA_ReadOnly;;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x2d01;PAW_UnknownDatatype;;1;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d02;PAW_DatatypeMissmatch;;2;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d03;PAW_Readonly;;3;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d04;PAW_TooBig;;4;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d05;PAW_SourceNotSet;;5;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d06;PAW_OutOfBounds;;6;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d07;PAW_NotSet;;7;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x2d08;PAW_ColumnOrRowsZero;;8;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x1701;HHI_ObjectNotHealthy;;1;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
-0x1702;HHI_InvalidHealthState;;2;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
-0x1703;HHI_IsExternallyControlled;;3;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4fa1;HEATER_CommandNotSupported;;161;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x4fa2;HEATER_InitFailed;;162;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x4fa3;HEATER_InvalidSwitchNr;;163;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
+0x6001;CCSDS_KalmanNoGyrMeas;;1;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6002;CCSDS_KalmanNoModel;;2;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6003;CCSDS_KalmanInversionFailed;;3;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x4500;HSPI_OpeningFileFailed;;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x4501;HSPI_FullDuplexTransferFailed;;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x4502;HSPI_HalfDuplexTransferFailed;;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4804;HGIO_GpioInvalidInstance;;4;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x4401;UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x4406;UXOS_PcloseCallError;;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
 0x2801;SM_DataTooLarge;;1;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
 0x2802;SM_DataStorageFull;;2;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
 0x2803;SM_IllegalStorageId;;3;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
 0x2804;SM_DataDoesNotExist;;4;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
 0x2805;SM_IllegalAddress;;5;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
 0x2806;SM_PoolTooLarge;;6;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-0x2401;MT_TooDetailedRequest;;1;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
-0x2402;MT_TooGeneralRequest;;2;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
-0x2403;MT_NoMatch;;3;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
-0x2404;MT_Full;;4;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
-0x2405;MT_NewNodeCreated;;5;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
-0x3f01;DLEE_StreamTooShort;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
-0x3f02;DLEE_DecodingError;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleEncoder.h
-0x2f01;ASC_NoPacketFound;;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h
-0x2f02;ASC_PossiblePacketLoss;;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/DleParser.h
-0x2f03;ASC_BufferTooSmall;;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
-0x4201;PUS11_InvalidTypeTimeWindow;;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x4202;PUS11_InvalidTimeWindow;;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x4203;PUS11_TimeshiftingNotPossible;;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x4204;PUS11_InvalidRelativeTime;;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
-0x1c01;TCD_PacketLost;;1;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
-0x1c02;TCD_DestinationNotFound;;2;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
-0x1c03;TCD_ServiceIdAlreadyExists;;3;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
-0x1b00;TCC_NoDestinationFound;;0;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b01;TCC_InvalidCcsdsVersion;;1;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b02;TCC_InvalidApid;;2;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b03;TCC_InvalidPacketType;;3;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b04;TCC_InvalidSecHeaderField;;4;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b05;TCC_IncorrectPrimaryHeader;;5;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b07;TCC_IncompletePacket;;7;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b08;TCC_InvalidPusVersion;;8;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b09;TCC_IncorrectChecksum;;9;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b0a;TCC_IllegalPacketSubtype;;10;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x1b0b;TCC_IncorrectSecondaryHeader;;11;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
-0x3a01;MQI_Empty;;1;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3a02;MQI_Full;No space left for more messages;2;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3a03;MQI_NoReplyPartner;Returned if a reply method was called without partner;3;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x3a04;MQI_DestinationInvalid;Returned if the target destination is invalid.;4;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
-0x0f01;CM_UnknownCommand;;1;COMMAND_MESSAGE;fsfw/src/fsfw/ipc/CommandMessageIF.h
+0x0601;PP_DoItMyself;;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0602;PP_PointsToVariable;;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0603;PP_PointsToMemory;;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0604;PP_ActivityCompleted;;4;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0605;PP_PointsToVectorUint8;;5;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0606;PP_PointsToVectorUint16;;6;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0607;PP_PointsToVectorUint32;;7;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x0608;PP_PointsToVectorFloat;;8;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06a0;PP_DumpNotSupported;;160;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e0;PP_InvalidSize;;224;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e1;PP_InvalidAddress;;225;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e2;PP_InvalidContent;;226;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e3;PP_UnalignedAccess;;227;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x06e4;PP_WriteProtected;;228;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x13e0;MH_UnknownCmd;;224;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x13e1;MH_InvalidAddress;;225;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x13e2;MH_InvalidSize;;226;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x13e3;MH_StateMismatch;;227;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x38a1;SGP4_InvalidEccentricity;;161;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a2;SGP4_InvalidMeanMotion;;162;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a3;SGP4_InvalidPerturbationElements;;163;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a4;SGP4_InvalidSemiLatusRectum;;164;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a5;SGP4_InvalidEpochElements;;165;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38a6;SGP4_SatelliteHasDecayed;;166;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38b1;SGP4_TleTooOld;;177;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x38b2;SGP4_TleNotInitialized;;178;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x1801;FF_Full;;1;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
+0x1802;FF_Empty;;2;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
+0x1601;FMM_MapFull;;1;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
+0x1602;FMM_KeyDoesNotExist;;2;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
 0x3901;MUX_NotEnoughResources;;1;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3902;MUX_InsufficientMemory;;2;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3903;MUX_NoPrivilege;;3;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
@ -142,20 +121,23 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x390a;MUX_MutexTimeout;;10;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x390b;MUX_MutexInvalidId;;11;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x390c;MUX_MutexDestroyedWhileWaiting;;12;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
-0x2901;TC_InvalidTargetState;;1;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-0x29f1;TC_AboveOperationalLimit;;241;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-0x29f2;TC_BelowOperationalLimit;;242;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
-0x0801;DPS_InvalidParameterDefinition;;1;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x0802;DPS_SetWasAlreadyRead;;2;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x0803;DPS_CommitingWithoutReading;;3;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x0804;DPS_DataSetUninitialised;;4;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x0805;DPS_DataSetFull;;5;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x0806;DPS_PoolVarNull;;6;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
-0x3da0;PVA_InvalidReadWriteMode;;160;POOL_VARIABLE_IF;fsfw/src/fsfw/datapool/PoolVariableIF.h
-0x3da1;PVA_InvalidPoolEntry;;161;POOL_VARIABLE_IF;fsfw/src/fsfw/datapool/PoolVariableIF.h
+0x3a01;MQI_Empty;;1;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3a02;MQI_Full;No space left for more messages;2;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3a03;MQI_NoReplyPartner;Returned if a reply method was called without partner;3;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x3a04;MQI_DestinationInvalid;Returned if the target destination is invalid.;4;MESSAGE_QUEUE_IF;fsfw/src/fsfw/ipc/MessageQueueIF.h
+0x0f01;CM_UnknownCommand;;1;COMMAND_MESSAGE;fsfw/src/fsfw/ipc/CommandMessageIF.h
+0x0e01;HM_InvalidMode;;1;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
+0x0e02;HM_TransNotAllowed;;2;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
+0x0e03;HM_InTransition;;3;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
+0x0e04;HM_InvalidSubmode;;4;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
 0x0c02;MS_InvalidEntry;;2;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
 0x0c03;MS_TooManyElements;;3;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
 0x0c04;MS_CantStoreEmpty;;4;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x0b01;SB_ChildNotFound;;1;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b02;SB_ChildInfoUpdated;;2;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b03;SB_ChildDoesntHaveModes;;3;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b04;SB_CouldNotInsertChild;;4;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x0b05;SB_TableContainsInvalidObjectId;;5;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
 0x0d01;SS_SequenceAlreadyExists;;1;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d02;SS_TableAlreadyExists;;2;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d03;SS_TableDoesNotExist;;3;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
@ -170,53 +152,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0d0e;SS_TableInUse;;14;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0da1;SS_TargetTableNotReached;;161;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0da2;SS_TableCheckFailed;;162;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
-0x0b01;SB_ChildNotFound;;1;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
-0x0b02;SB_ChildInfoUpdated;;2;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
-0x0b03;SB_ChildDoesntHaveModes;;3;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
-0x0b04;SB_CouldNotInsertChild;;4;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
-0x0b05;SB_TableContainsInvalidObjectId;;5;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
-0x0b00;SB_ConnBroken;;0;SUBSYSTEM_BASE;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
-0x2a01;IEC_NoConfigurationTable;;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a02;IEC_NoCpuTable;;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a03;IEC_InvalidWorkspaceAddress;;3;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a04;IEC_TooLittleWorkspace;;4;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a05;IEC_WorkspaceAllocation;;5;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a06;IEC_InterruptStackTooSmall;;6;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a07;IEC_ThreadExitted;;7;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a08;IEC_InconsistentMpInformation;;8;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a09;IEC_InvalidNode;;9;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a0a;IEC_NoMpci;;10;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a0b;IEC_BadPacket;;11;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a0c;IEC_OutOfPackets;;12;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a0d;IEC_OutOfGlobalObjects;;13;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a0e;IEC_OutOfProxies;;14;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a0f;IEC_InvalidGlobalId;;15;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a10;IEC_BadStackHook;;16;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a11;IEC_BadAttributes;;17;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a12;IEC_ImplementationKeyCreateInconsistency;;18;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a13;IEC_ImplementationBlockingOperationCancel;;19;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a14;IEC_MutexObtainFromBadState;;20;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x2a15;IEC_UnlimitedAndMaximumIs0;;21;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x1401;SE_BufferTooShort;;1;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x1402;SE_StreamTooShort;;2;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x1403;SE_TooManyElements;;3;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x4c00;SPPA_NoPacketFound;;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
-0x4c01;SPPA_SplitPacket;;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
-0x1d01;ATC_ActivityStarted;;1;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d02;ATC_InvalidSubservice;;2;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d03;ATC_IllegalApplicationData;;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d04;ATC_SendTmFailed;;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1d05;ATC_Timeout;;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x2001;CSB_ExecutionComplete;;1;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2002;CSB_NoStepMessage;;2;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2003;CSB_ObjectBusy;;3;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2004;CSB_Busy;;4;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2005;CSB_InvalidTc;;5;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2006;CSB_InvalidObject;;6;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2007;CSB_InvalidReply;;7;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x2600;FDI_YourFault;;0;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
-0x2601;FDI_MyFault;;1;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
-0x2602;FDI_ConfirmLater;;2;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.h
 0x04e1;RMP_CommandNoDescriptorsAvailable;;225;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x04e2;RMP_CommandBufferFull;;226;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x04e3;RMP_CommandChannelOutOfRange;;227;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
@ -257,6 +193,153 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x040a;RMP_ReplyCommandNotImplementedOrNotAuthorised;;10;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x040b;RMP_ReplyRmwDataLengthError;;11;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
 0x040c;RMP_ReplyInvalidTargetLogicalAddress;;12;RMAP_CHANNEL;fsfw/src/fsfw/rmap/RMAP.h
+0x1401;SE_BufferTooShort;;1;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x1402;SE_StreamTooShort;;2;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x1403;SE_TooManyElements;;3;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x3da0;PVA_InvalidReadWriteMode;;160;POOL_VARIABLE_IF;fsfw/src/fsfw/datapool/PoolVariableIF.h
+0x3da1;PVA_InvalidPoolEntry;;161;POOL_VARIABLE_IF;fsfw/src/fsfw/datapool/PoolVariableIF.h
+0x0801;DPS_InvalidParameterDefinition;;1;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
+0x0802;DPS_SetWasAlreadyRead;;2;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
+0x0803;DPS_CommitingWithoutReading;;3;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
+0x0804;DPS_DataSetUninitialised;;4;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
+0x0805;DPS_DataSetFull;;5;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
+0x0806;DPS_PoolVarNull;;6;DATA_SET_CLASS;fsfw/src/fsfw/datapool/DataSetIF.h
+0x1c01;TCD_PacketLost;;1;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1c02;TCD_DestinationNotFound;;2;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1c03;TCD_ServiceIdAlreadyExists;;3;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1b00;TCC_NoDestinationFound;;0;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b01;TCC_InvalidCcsdsVersion;;1;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b02;TCC_InvalidApid;;2;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b03;TCC_InvalidPacketType;;3;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b04;TCC_InvalidSecHeaderField;;4;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b05;TCC_IncorrectPrimaryHeader;;5;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b07;TCC_IncompletePacket;;7;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b08;TCC_InvalidPusVersion;;8;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b09;TCC_IncorrectChecksum;;9;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b0a;TCC_IllegalPacketSubtype;;10;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1b0b;TCC_IncorrectSecondaryHeader;;11;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x3001;POS_InPowerTransition;;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
+0x3002;POS_SwitchStateMismatch;;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
+0x0501;PS_SwitchOn;;1;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x0500;PS_SwitchOff;;0;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x0502;PS_SwitchTimeout;;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x0503;PS_FuseOn;;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x0504;PS_FuseOff;;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
+0x3b00;SPH_ConnBroken;;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
+0x2a01;IEC_NoConfigurationTable;;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a02;IEC_NoCpuTable;;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a03;IEC_InvalidWorkspaceAddress;;3;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a04;IEC_TooLittleWorkspace;;4;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a05;IEC_WorkspaceAllocation;;5;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a06;IEC_InterruptStackTooSmall;;6;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a07;IEC_ThreadExitted;;7;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a08;IEC_InconsistentMpInformation;;8;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a09;IEC_InvalidNode;;9;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a0a;IEC_NoMpci;;10;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a0b;IEC_BadPacket;;11;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a0c;IEC_OutOfPackets;;12;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a0d;IEC_OutOfGlobalObjects;;13;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a0e;IEC_OutOfProxies;;14;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a0f;IEC_InvalidGlobalId;;15;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a10;IEC_BadStackHook;;16;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a11;IEC_BadAttributes;;17;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a12;IEC_ImplementationKeyCreateInconsistency;;18;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a13;IEC_ImplementationBlockingOperationCancel;;19;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a14;IEC_MutexObtainFromBadState;;20;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2a15;IEC_UnlimitedAndMaximumIs0;;21;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x2600;FDI_YourFault;;0;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x2601;FDI_MyFault;;1;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x2602;FDI_ConfirmLater;;2;HANDLES_FAILURES_IF;fsfw/src/fsfw/fdir/ConfirmsFailuresIF.h
+0x1e00;PUS_InvalidPusVersion;;0;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
+0x1e01;PUS_InvalidCrc16;;1;PUS_IF;fsfw/src/fsfw/tmtcpacket/pus/PusIF.h
+0x0201;OM_InsertionFailed;;1;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
+0x0202;OM_NotFound;;2;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
+0x0203;OM_ChildInitFailed;;3;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
+0x0204;OM_InternalErrReporterUninit;;4;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
+0x2201;TMF_Busy;;1;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2202;TMF_LastPacketFound;;2;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2203;TMF_StopFetch;;3;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2204;TMF_Timeout;;4;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2205;TMF_TmChannelFull;;5;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2206;TMF_NotStored;;6;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2207;TMF_AllDeleted;;7;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2208;TMF_InvalidData;;8;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2209;TMF_NotReady;;9;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
+0x2101;TMB_Busy;;1;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2102;TMB_Full;;2;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2103;TMB_Empty;;3;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2104;TMB_NullRequested;;4;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2105;TMB_TooLarge;;5;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2106;TMB_NotReady;;6;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2107;TMB_DumpError;;7;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2108;TMB_CrcError;;8;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2109;TMB_Timeout;;9;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210a;TMB_IdlePacketFound;;10;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210b;TMB_TelecommandFound;;11;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210c;TMB_NoPusATm;;12;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210d;TMB_TooSmall;;13;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210e;TMB_BlockNotFound;;14;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x210f;TMB_InvalidRequest;;15;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
+0x2d01;PAW_UnknownDatatype;;1;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d02;PAW_DatatypeMissmatch;;2;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d03;PAW_Readonly;;3;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d04;PAW_TooBig;;4;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d05;PAW_SourceNotSet;;5;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d06;PAW_OutOfBounds;;6;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d07;PAW_NotSet;;7;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2d08;PAW_ColumnOrRowsZero;;8;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
+0x2e01;HPA_InvalidIdentifierId;;1;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
+0x2e02;HPA_InvalidDomainId;;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
+0x2e03;HPA_InvalidValue;;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
+0x2e05;HPA_ReadOnly;;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
+0x3b01;SPH_SemaphoreTimeout;;1;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
+0x3b02;SPH_SemaphoreNotOwned;;2;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
+0x3b03;SPH_SemaphoreInvalid;;3;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
+0x1a01;TRC_NotEnoughSensors;;1;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
+0x1a02;TRC_LowestValueOol;;2;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
+0x1a03;TRC_HighestValueOol;;3;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
+0x1a04;TRC_BothValuesOol;;4;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
+0x1a05;TRC_DuplexOol;;5;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
+0x3101;LIM_Unchecked;;1;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3102;LIM_Invalid;;2;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3103;LIM_Unselected;;3;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3104;LIM_BelowLowLimit;;4;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3105;LIM_AboveHighLimit;;5;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3106;LIM_UnexpectedValue;;6;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3107;LIM_OutOfRange;;7;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x31a0;LIM_FirstSample;;160;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x31e0;LIM_InvalidSize;;224;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x31e1;LIM_WrongType;;225;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x31e2;LIM_WrongPid;;226;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x31e3;LIM_WrongLimitId;;227;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x31ee;LIM_MonitorNotFound;;238;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
+0x3601;CFDP_InvalidTlvType;;1;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3602;CFDP_InvalidDirectiveField;;2;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3603;CFDP_InvalidPduDatafieldLen;;3;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3604;CFDP_InvalidAckDirectiveFields;;4;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3605;CFDP_MetadataCantParseOptions;;5;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3606;CFDP_NakCantParseOptions;;6;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3607;CFDP_FinishedCantParseFsResponses;;7;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3608;CFDP_FilestoreRequiresSecondFile;;8;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x3609;CFDP_FilestoreResponseCantParseFsMessage;;9;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x360a;CFDP_InvalidPduFormat;;10;CFDP;fsfw/src/fsfw/cfdp/definitions.h
+0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4301;FILS_GenericDirError;;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4302;FILS_FilesystemInactive;;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4303;FILS_GenericRenameError;;3;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4304;FILS_IsBusy;;4;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4305;FILS_InvalidParameters;;5;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x430a;FILS_FileDoesNotExist;;10;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x430b;FILS_FileAlreadyExists;;11;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x430c;FILS_NotAFile;;12;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x430d;FILS_FileLocked;;13;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x430e;FILS_PermissionDenied;;14;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4315;FILS_DirectoryDoesNotExist;;21;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4316;FILS_DirectoryAlreadyExists;;22;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4317;FILS_NotADirectory;;23;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4318;FILS_DirectoryNotEmpty;;24;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x431e;FILS_SequencePacketMissingWrite;;30;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x431f;FILS_SequencePacketMissingRead;;31;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x2c01;CCS_BcIsSetVrCommand;;1;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2c02;CCS_BcIsUnlockCommand;;2;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cb0;CCS_BcIllegalCommand;;176;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
@ -286,99 +369,18 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x2cd1;CCS_ShorterThanHeader;;209;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cd2;CCS_TooShortBlockedPacket;;210;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cd3;CCS_TooShortMapExtraction;;211;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x38a1;SGP4_InvalidEccentricity;;161;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a2;SGP4_InvalidMeanMotion;;162;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a3;SGP4_InvalidPerturbationElements;;163;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a4;SGP4_InvalidSemiLatusRectum;;164;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a5;SGP4_InvalidEpochElements;;165;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38a6;SGP4_SatelliteHasDecayed;;166;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38b1;SGP4_TleTooOld;;177;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x38b2;SGP4_TleNotInitialized;;178;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
-0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4301;FILS_GenericDirError;;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4302;FILS_FilesystemInactive;;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4303;FILS_GenericRenameError;;3;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4304;FILS_IsBusy;;4;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4305;FILS_InvalidParameters;;5;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x430a;FILS_FileDoesNotExist;;10;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x430b;FILS_FileAlreadyExists;;11;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x430c;FILS_NotAFile;;12;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x430d;FILS_FileLocked;;13;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x430e;FILS_PermissionDenied;;14;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4315;FILS_DirectoryDoesNotExist;;21;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4316;FILS_DirectoryAlreadyExists;;22;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4317;FILS_NotADirectory;;23;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x4318;FILS_DirectoryNotEmpty;;24;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x431e;FILS_SequencePacketMissingWrite;;30;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x431f;FILS_SequencePacketMissingRead;;31;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x13e0;MH_UnknownCmd;;224;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x13e1;MH_InvalidAddress;;225;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x13e2;MH_InvalidSize;;226;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x13e3;MH_StateMismatch;;227;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
-0x0601;PP_DoItMyself;;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0602;PP_PointsToVariable;;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0603;PP_PointsToMemory;;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0604;PP_ActivityCompleted;;4;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0605;PP_PointsToVectorUint8;;5;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0606;PP_PointsToVectorUint16;;6;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0607;PP_PointsToVectorUint32;;7;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0608;PP_PointsToVectorFloat;;8;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x06a0;PP_DumpNotSupported;;160;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x06e0;PP_InvalidSize;;224;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x06e1;PP_InvalidAddress;;225;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x06e2;PP_InvalidContent;;226;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x06e3;PP_UnalignedAccess;;227;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x06e4;PP_WriteProtected;;228;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x0201;OM_InsertionFailed;;1;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0202;OM_NotFound;;2;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0203;OM_ChildInitFailed;;3;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0204;OM_InternalErrReporterUninit;;4;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0501;PS_SwitchOn;;1;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x0500;PS_SwitchOff;;0;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x0502;PS_SwitchTimeout;;2;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x0503;PS_FuseOn;;3;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x0504;PS_FuseOff;;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
-0x3001;POS_InPowerTransition;;1;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
-0x3002;POS_SwitchStateMismatch;;2;POWER_SWITCHER;fsfw/src/fsfw/power/PowerSwitcher.h
-0x1000;TIM_UnsupportedTimeFormat;;0;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1001;TIM_NotEnoughInformationForTargetFormat;;1;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1002;TIM_LengthMismatch;;2;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1003;TIM_InvalidTimeFormat;;3;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1004;TIM_InvalidDayOfYear;;4;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1005;TIM_TimeDoesNotFitFormat;;5;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x3701;TSI_BadTimestamp;;1;TIME_STAMPER_IF;fsfw/src/fsfw/timemanager/TimeStampIF.h
-0x2201;TMF_Busy;;1;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2202;TMF_LastPacketFound;;2;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2203;TMF_StopFetch;;3;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2204;TMF_Timeout;;4;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2205;TMF_TmChannelFull;;5;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2206;TMF_NotStored;;6;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2207;TMF_AllDeleted;;7;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2208;TMF_InvalidData;;8;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2209;TMF_NotReady;;9;TM_STORE_FRONTEND_IF;fsfw/src/fsfw/tmstorage/TmStoreFrontendIF.h
-0x2101;TMB_Busy;;1;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2102;TMB_Full;;2;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2103;TMB_Empty;;3;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2104;TMB_NullRequested;;4;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2105;TMB_TooLarge;;5;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2106;TMB_NotReady;;6;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2107;TMB_DumpError;;7;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2108;TMB_CrcError;;8;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x2109;TMB_Timeout;;9;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210a;TMB_IdlePacketFound;;10;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210b;TMB_TelecommandFound;;11;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210c;TMB_NoPusATm;;12;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210d;TMB_TooSmall;;13;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210e;TMB_BlockNotFound;;14;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x210f;TMB_InvalidRequest;;15;TM_STORE_BACKEND_IF;fsfw/src/fsfw/tmstorage/TmStoreBackendIF.h
-0x0e01;HM_InvalidMode;;1;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
-0x0e02;HM_TransNotAllowed;;2;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
-0x0e03;HM_InTransition;;3;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
-0x0e04;HM_InvalidSubmode;;4;HAS_MODES_IF;fsfw/src/fsfw/modes/HasModesIF.h
-0x1601;FMM_MapFull;;1;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
-0x1602;FMM_KeyDoesNotExist;;2;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
-0x1801;FF_Full;;1;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
-0x1802;FF_Empty;;2;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
+0x4201;PUS11_InvalidTypeTimeWindow;;1;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4202;PUS11_InvalidTimeWindow;;2;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4203;PUS11_TimeshiftingNotPossible;;3;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4204;PUS11_InvalidRelativeTime;;4;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4205;PUS11_ContainedTcTooSmall;;5;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x4206;PUS11_ContainedTcCrcMissmatch;;6;PUS_SERVICE_11;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
+0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x3404;DC_InvalidCookieType;;4;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x3405;DC_NotActive;;5;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x3406;DC_TooMuchData;;6;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x03a0;DHB_InvalidChannel;;160;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03b0;DHB_AperiodicReply;;176;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03b1;DHB_IgnoreReplyData;;177;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
@ -415,53 +417,60 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x27c3;DHI_DeviceReplyInvalid;;195;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27d0;DHI_InvalidCommandParameter;;208;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27d1;DHI_InvalidNumberOrLengthOfParameters;;209;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
-0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x3404;DC_InvalidCookieType;;4;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x3405;DC_NotActive;;5;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x3406;DC_TooMuchData;;6;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.h
-0x1a01;TRC_NotEnoughSensors;;1;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
-0x1a02;TRC_LowestValueOol;;2;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
-0x1a03;TRC_HighestValueOol;;3;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
-0x1a04;TRC_BothValuesOol;;4;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
-0x1a05;TRC_DuplexOol;;5;TRIPLE_REDUNDACY_CHECK;fsfw/src/fsfw/monitoring/TriplexMonitor.h
-0x3101;LIM_Unchecked;;1;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3102;LIM_Invalid;;2;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3103;LIM_Unselected;;3;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3104;LIM_BelowLowLimit;;4;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3105;LIM_AboveHighLimit;;5;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3106;LIM_UnexpectedValue;;6;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3107;LIM_OutOfRange;;7;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x31a0;LIM_FirstSample;;160;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x31e0;LIM_InvalidSize;;224;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x31e1;LIM_WrongType;;225;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x31e2;LIM_WrongPid;;226;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x31e3;LIM_WrongLimitId;;227;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x31ee;LIM_MonitorNotFound;;238;LIMITS_IF;fsfw/src/fsfw/monitoring/MonitoringIF.h
-0x3b01;SPH_SemaphoreTimeout;;1;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
-0x3b02;SPH_SemaphoreNotOwned;;2;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
-0x3b03;SPH_SemaphoreInvalid;;3;SEMAPHORE_IF;fsfw/src/fsfw/tasks/SemaphoreIF.h
-0x4500;HSPI_OpeningFileFailed;;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4501;HSPI_FullDuplexTransferFailed;;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4502;HSPI_HalfDuplexTransferFailed;;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
-0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
-0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
-0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
-0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4804;HGIO_GpioInvalidInstance;;4;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4401;UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x4406;UXOS_PcloseCallError;;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2401;MT_TooDetailedRequest;;1;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2402;MT_TooGeneralRequest;;2;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2403;MT_NoMatch;;3;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2404;MT_Full;;4;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x2405;MT_NewNodeCreated;;5;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x3f01;DLEE_NoPacketFound;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x3f02;DLEE_PossiblePacketLoss;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x2f01;ASC_TooLongForTargetType;;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x2f02;ASC_InvalidCharacters;;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x2f03;ASC_BufferTooSmall;;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x1701;HHI_ObjectNotHealthy;;1;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x1702;HHI_InvalidHealthState;;2;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x1703;HHI_IsExternallyControlled;;3;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x3201;CF_ObjectHasNoFunctions;;1;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
+0x3202;CF_AlreadyCommanding;;2;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
+0x3301;HF_IsBusy;;1;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x3302;HF_InvalidParameters;;2;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x3303;HF_ExecutionFinished;;3;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x3304;HF_InvalidActionId;;4;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x1000;TIM_UnsupportedTimeFormat;;0;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x1001;TIM_NotEnoughInformationForTargetFormat;;1;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x1002;TIM_LengthMismatch;;2;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x1003;TIM_InvalidTimeFormat;;3;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x1004;TIM_InvalidDayOfYear;;4;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x1005;TIM_TimeDoesNotFitFormat;;5;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x3701;TSI_BadTimestamp;;1;TIME_STAMPER_IF;fsfw/src/fsfw/timemanager/TimeStampIF.h
+0x3c00;LPIF_PoolEntryNotFound;;0;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
+0x3c01;LPIF_PoolEntryTypeConflict;;1;LOCAL_POOL_OWNER_IF;fsfw/src/fsfw/datapoollocal/localPoolDefinitions.h
+0x3e00;HKM_QueueOrDestinationInvalid;;0;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e01;HKM_WrongHkPacketType;;1;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e02;HKM_ReportingStatusUnchanged;;2;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e03;HKM_PeriodicHelperInvalid;;3;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e04;HKM_PoolobjectNotFound;;4;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x3e05;HKM_DatasetNotFound;;5;HOUSEKEEPING_MANAGER;fsfw/src/fsfw/datapoollocal/LocalDataPoolManager.h
+0x2901;TC_InvalidTargetState;;1;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+0x29f1;TC_AboveOperationalLimit;;241;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+0x29f2;TC_BelowOperationalLimit;;242;THERMAL_COMPONENT_IF;fsfw/src/fsfw/thermal/ThermalComponentIF.h
+0x2001;CSB_ExecutionComplete;;1;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2002;CSB_NoStepMessage;;2;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2003;CSB_ObjectBusy;;3;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2004;CSB_Busy;;4;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2005;CSB_InvalidTc;;5;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2006;CSB_InvalidObject;;6;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x2007;CSB_InvalidReply;;7;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
+0x4c00;SPPA_NoPacketFound;;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
+0x4c01;SPPA_SplitPacket;;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
+0x1d01;ATC_ActivityStarted;;1;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
+0x1d02;ATC_InvalidSubservice;;2;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
+0x1d03;ATC_IllegalApplicationData;;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
+0x1d04;ATC_SendTmFailed;;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
+0x1d05;ATC_Timeout;;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
+0x6b00;SCBU_KeyNotFound;;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
+0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
+0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
 0x6a00;SDMA_OpOngoing;;0;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
 0x6a01;SDMA_AlreadyOn;;1;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
 0x6a02;SDMA_AlreadyMounted;;2;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
@ -472,6 +481,3 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x6a0d;SDMA_UnmountError;;13;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
 0x6a0e;SDMA_SystemCallError;;14;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
 0x6a0f;SDMA_PopenCallError;;15;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
-0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
-0x6b00;SCBU_KeyNotFound;;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
--- a/eive_tmtc/gomspace/gomspace_common.py
+++ b/eive_tmtc/gomspace/gomspace_common.py
@ -12,7 +12,7 @@ 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


@ -63,7 +63,7 @@ class Channel:


 def pack_request_config_command(object_id: bytes) -> PusTelecommand:
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=object_id, action_id=GomspaceDeviceActionId.REQUEST_CONFIG_TABLE
    )

@ -88,7 +88,7 @@ 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=GomspaceDeviceActionId.PARAM_GET,
        user_data=app_data,
@ -103,7 +103,7 @@ def pack_set_float_param_command(
    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
    )

@ -116,7 +116,7 @@ def pack_set_u8_param_command(
    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
    )

@ -129,7 +129,7 @@ def pack_set_i8_param_command(
    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
    )

@ -142,7 +142,7 @@ def pack_set_u16_param_command(
    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
    )

@ -155,7 +155,7 @@ def pack_set_i16_param_command(
    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
    )

@ -166,7 +166,7 @@ def pack_set_u32_param_command(object_id: bytes, memory_address: bytes, paramete
    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
    )

@ -177,7 +177,7 @@ def pack_set_i32_param_command(object_id: bytes, memory_address: bytes, paramete
    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
    )

@ -224,7 +224,7 @@ def pack_ping_command(object_id: ObjectIdU32, data: bytearray) -> PusTelecommand
    @note   The ping request sends the specified data to a gompsace device. These
            data are simply copied by the device and then sent back.
    """
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=object_id.as_bytes,
        action_id=GomspaceDeviceActionId.PING,
        user_data=data,
@ -235,7 +235,7 @@ 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(
+    return create_action_cmd(
        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionId.WDT_RESET
    )

@ -244,7 +244,7 @@ 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(
+    return create_action_cmd(
        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionId.REBOOT
    )

@ -254,6 +254,6 @@ def pack_request_full_hk_table_command(object_id: ObjectIdU32) -> PusTelecommand
        device.
    @param object_id    The object id of the gomspace device handler.
    """
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=object_id.as_bytes, action_id=GomspaceDeviceActionId.REQUEST_HK_TABLE
    )
--- a/eive_tmtc/pus_tc/cmd_definitions.py
+++ b/eive_tmtc/pus_tc/cmd_definitions.py
@ -39,21 +39,6 @@ def add_pdec_cmds(defs: TmtcDefinitionWrapper):
    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()
--- a/eive_tmtc/pus_tc/devs/bpx_batt.py
+++ b/eive_tmtc/pus_tc/devs/bpx_batt.py
@ -9,10 +9,10 @@ from tmtccmd.config.tmtc import (
 )
 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.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
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices


 class BpxSetId:
@ -66,7 +66,7 @@ def pack_bpx_commands(p: ServiceProviderParams):
        q.add_pus_tc(generate_one_hk_command(sid=sid))
    if op_code in BpxOpCode.OFF:
        q.add_log_cmd("Off mode")
-        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Modes.OFF, 0)
+        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.OFF, 0)
        q.add_pus_tc(
            PusTelecommand(
                service=200,
@ -76,7 +76,7 @@ def pack_bpx_commands(p: ServiceProviderParams):
        )
    if op_code in BpxOpCode.ON:
        q.add_log_cmd("On mode")
-        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Modes.ON, 0)
+        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.ON, 0)
        q.add_pus_tc(
            PusTelecommand(
                service=200,
@ -87,16 +87,14 @@ def pack_bpx_commands(p: ServiceProviderParams):
    if op_code in BpxOpCode.RST_BOOT_CNT:
        q.add_log_cmd("Resetting reboot counters")
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=BPX_HANDLER_ID, action_id=BpxActionId.RESET_COUNTERS
            )
        )
    if op_code in BpxOpCode.REQUEST_CFG:
        q.add_log_cmd("Requesting configuration struct")
        q.add_pus_tc(
-            make_fsfw_action_cmd(
-                object_id=BPX_HANDLER_ID, action_id=BpxActionId.GET_CFG
-            )
+            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.GET_CFG)
        )
    if op_code in BpxOpCode.REQUEST_CFG_HK:
        q.add_log_cmd("Requesting configuration struct HK")
@ -105,5 +103,5 @@ def pack_bpx_commands(p: ServiceProviderParams):
    if op_code in BpxOpCode.REBOOT:
        q.add_log_cmd("Rebooting BPX battery")
        q.add_pus_tc(
-            make_fsfw_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.REBOOT)
+            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.REBOOT)
        )
--- a/eive_tmtc/pus_tc/devs/ccsds_handler.py
+++ b/eive_tmtc/pus_tc/devs/ccsds_handler.py
@ -1,81 +0,0 @@
-# -*- 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 spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.util import ObjectIdU32
-
-
-class CommandId(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)
-    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", CommandId.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", CommandId.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", CommandId.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", CommandId.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", CommandId.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", CommandId.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", CommandId.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", CommandId.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", CommandId.UPDATE_ON_FALLING_EDGE)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
--- a/eive_tmtc/pus_tc/devs/heater.py
+++ b/eive_tmtc/pus_tc/devs/heater.py
@ -11,12 +11,12 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util.obj_id import ObjectIdU32
-from tmtccmd.tc.pus_201_fsfw_health import (
+from tmtccmd.pus.s201_fsfw_health import (
    pack_set_health_cmd_data,
    FsfwHealth,
-    Subservices,
+    Subservice,
 )
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand


@ -183,7 +183,7 @@ def health_cmd(
    app_data = pack_set_health_cmd_data(object_id=object_id.as_bytes, health=health)
    q.add_pus_tc(
        PusTelecommand(
-            service=201, subservice=Subservices.TC_SET_HEALTH, app_data=app_data
+            service=201, subservice=Subservice.TC_SET_HEALTH, app_data=app_data
        )
    )

@ -200,6 +200,6 @@ def pack_switch_heater_command(
    command.append(switch_nr)
    command.append(switch_action)
    command.append(COMMAND_SOURCE_PARAM_EXTERNAL)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=object_id, action_id=ActionIds.SWITCH_HEATER, user_data=command
    )
--- a/eive_tmtc/pus_tc/devs/plpcdu.py
+++ b/eive_tmtc/pus_tc/devs/plpcdu.py
@ -15,13 +15,13 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    disable_periodic_hk_command,
 )
 from tmtccmd.tc.pus_11_tc_sched import (
-    generate_enable_tc_sched_cmd,
-    generate_time_tagged_cmd,
+    create_enable_tc_sched_cmd,
+    create_time_tagged_cmd,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
-from tmtccmd.tc.pus_20_params import (
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
+from tmtccmd.tc.pus_20_fsfw_params import (
    pack_scalar_double_param_app_data,
-    pack_fsfw_load_param_cmd,
+    create_load_param_cmd,
    pack_boolean_parameter_app_data,
 )
 from tmtccmd.logging import get_console_logger
@ -161,9 +161,9 @@ def add_pl_pcdu_cmds(defs: TmtcDefinitionWrapper):

 def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
    if op_code in OpCode.SWITCH_ON:
-        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_ON, mode=Modes.ON, submode=0)
+        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_ON, mode=Mode.ON, submode=0)
    if op_code in OpCode.SWITCH_OFF:
-        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_OFF, mode=Modes.OFF, submode=0)
+        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_OFF, mode=Mode.OFF, submode=0)
    if op_code in OpCode.ENABLE_HK:
        interval = float(
            input("Please enter HK collection interval in floating point seconds: ")
@ -184,7 +184,7 @@ def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
        pack_pl_pcdu_mode_cmd(
            q=q,
            info=Info.NORMAL_SSR,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(
                NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
            ),
@ -193,35 +193,35 @@ def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
        pack_pl_pcdu_mode_cmd(
            q=q,
            info=Info.NORMAL_DRO,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.DRO_ON),
        )
    if op_code in OpCode.NORMAL_X8:
        pack_pl_pcdu_mode_cmd(
            q=q,
            info=Info.NORMAL_X8,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.X8_ON),
        )
    if op_code in OpCode.NORMAL_TX:
        pack_pl_pcdu_mode_cmd(
            q=q,
            info=Info.NORMAL_TX,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.TX_ON),
        )
    if op_code in OpCode.NORMAL_MPA:
        pack_pl_pcdu_mode_cmd(
            q=q,
            info=Info.NORMAL_MPA,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.MPA_ON),
        )
    if op_code in OpCode.NORMAL_HPA:
        pack_pl_pcdu_mode_cmd(
            q=q,
            info=Info.NORMAL_HPA,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.HPA_ON),
        )
    if op_code in OpCode.REQ_OS_HK:
@ -251,15 +251,15 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
    )
    pl_pcdu_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
-        app_data=pack_mode_data(object_id=PL_PCDU_ID, mode=Modes.ON, submode=0),
+        subservice=Subservice.TC_MODE_COMMAND,
+        app_data=pack_mode_data(object_id=PL_PCDU_ID, mode=Mode.ON, submode=0),
    )
    ssr_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
        app_data=pack_mode_data(
            object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(
                NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
            ),
@ -267,95 +267,95 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
    )
    dro_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
        app_data=pack_mode_data(
            object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.DRO_ON),
        ),
    )
    x8_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
        app_data=pack_mode_data(
            object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.X8_ON),
        ),
    )
    tx_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
        app_data=pack_mode_data(
            object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.TX_ON),
        ),
    )
    mpa_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
        app_data=pack_mode_data(
            object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.MPA_ON),
        ),
    )
    hpa_on = PusTelecommand(
        service=200,
-        subservice=Subservices.TC_MODE_COMMAND,
+        subservice=Subservice.TC_MODE_COMMAND,
        app_data=pack_mode_data(
            object_id=PL_PCDU_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=submode_mask_to_submode(NormalSubmodesMask.HPA_ON),
        ),
    )
    current_time = time.time()

-    enb_sched = generate_enable_tc_sched_cmd()
+    enb_sched = create_enable_tc_sched_cmd()

    sched_time = int(round(current_time + 10))
    q.add_pus_tc(enb_sched)
-    tagged_on_cmd = generate_time_tagged_cmd(
+    tagged_on_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time),
        tc_to_insert=pl_pcdu_on,
    )
    q.add_pus_tc(tagged_on_cmd)

    sched_time += 5
-    tagged_ssr_cmd = generate_time_tagged_cmd(
+    tagged_ssr_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time),
        tc_to_insert=ssr_on,
    )
    q.add_pus_tc(tagged_ssr_cmd)

    sched_time += 5
-    tagged_dro_cmd = generate_time_tagged_cmd(
+    tagged_dro_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time), tc_to_insert=dro_on
    )
    q.add_pus_tc(tagged_dro_cmd)

    sched_time += delay_dro_to_x8
    sched_time = int(round(sched_time))
-    tagged_x8_cmd = generate_time_tagged_cmd(
+    tagged_x8_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time), tc_to_insert=x8_on
    )
    q.add_pus_tc(tagged_x8_cmd)

    sched_time += 5
-    tagged_tx_cmd = generate_time_tagged_cmd(
+    tagged_tx_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time), tc_to_insert=tx_on
    )
    q.add_pus_tc(tagged_tx_cmd)

    sched_time += 5
-    tagged_mpa_cmd = generate_time_tagged_cmd(
+    tagged_mpa_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time), tc_to_insert=mpa_on
    )
    q.add_pus_tc(tagged_mpa_cmd)

    sched_time += 5
-    tagged_hpa_cmd = generate_time_tagged_cmd(
+    tagged_hpa_cmd = create_time_tagged_cmd(
        release_time=struct.pack("!I", sched_time), tc_to_insert=hpa_on
    )
    q.add_pus_tc(tagged_hpa_cmd)
@ -427,7 +427,7 @@ def pack_wait_time_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str):
        unique_id=param_id,
        parameter=wait_time,
    )
-    q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=param_data))
+    q.add_pus_tc(create_load_param_cmd(app_data=param_data))


 def pack_failure_injection_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str):
@ -435,16 +435,16 @@ def pack_failure_injection_cmd(q: DefaultPusQueueHelper, param_id: int, print_st
    param_data = pack_boolean_parameter_app_data(
        object_id=PL_PCDU_ID, domain_id=0, unique_id=param_id, parameter=True
    )
-    q.add_pus_tc(pack_fsfw_load_param_cmd(app_data=param_data))
+    q.add_pus_tc(create_load_param_cmd(app_data=param_data))


 def pack_pl_pcdu_mode_cmd(
-    q: DefaultPusQueueHelper, info: str, mode: Modes, submode: int
+    q: DefaultPusQueueHelper, info: str, mode: Mode, submode: int
 ):
    q.add_log_cmd(info)
    mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=mode, submode=submode)
    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
        )
    )
--- a/eive_tmtc/pus_tc/devs/rad_sensor.py
+++ b/eive_tmtc/pus_tc/devs/rad_sensor.py
@ -10,7 +10,7 @@ import struct
 from eive_tmtc.config.definitions import CustomServiceList

 from spacepackets.ecss.tc import PusTelecommand
-from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Modes
+from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Mode
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
@ -69,11 +69,11 @@ def pack_rad_sensor_test_into(
    q.add_log_cmd(f"Commanding Radiation sensor handler {object_id}")

    if op_code in OpCode.ON:
-        rad_sensor_mode_cmd(object_id, Modes.ON, Info.ON, q)
+        rad_sensor_mode_cmd(object_id, Mode.ON, Info.ON, q)
    if op_code in OpCode.NORMAL:
-        rad_sensor_mode_cmd(object_id, Modes.NORMAL, Info.NORMAL, q)
+        rad_sensor_mode_cmd(object_id, Mode.NORMAL, Info.NORMAL, q)
    if op_code in OpCode.OFF:
-        rad_sensor_mode_cmd(object_id, Modes.OFF, Info.OFF, q)
+        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(
@ -90,7 +90,7 @@ def pack_rad_sensor_test_into(


 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)
--- a/eive_tmtc/pus_tc/devs/rtd.py
+++ b/eive_tmtc/pus_tc/devs/rtd.py
@ -1,4 +1,5 @@
 from typing import Optional
+import struct

 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tc.devs.pdec_handler import CommandId
@ -8,7 +9,7 @@ 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
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
 import eive_tmtc.config.object_ids as oids
 from eive_tmtc.config.object_ids import get_object_ids

@ -32,18 +33,22 @@ RTD_IDS = [
 ]


+class CommandId:
+    WRITE_CONFIG = 6
+
+
 class OpCode:
    ON = ["0", "on"]
    OFF = ["1", "off"]
    NORMAL = ["2", "normal"]
-    CONFIG_CMD = ["3", "Write config"]
+    WRITE_CONFIG = ["3", "Write config"]


 class Info:
    ON = "Switch handler on"
    OFF = "Switch handler off"
    NORMAL = "Switch handler normal"
-    WIRTE_CONFIG = "Write config"
+    WRITE_CONFIG = "Write config"


@tmtc_definitions_provider
@ -52,6 +57,7 @@ def specify_rtd_cmds(defs: TmtcDefinitionWrapper):
    oce.add(keys=OpCode.ON, info=Info.ON)
    oce.add(keys=OpCode.NORMAL, info=Info.NORMAL)
    oce.add(keys=OpCode.OFF, info=Info.OFF)
+    oce.add(keys=OpCode.WRITE_CONFIG, info=Info.WRITE_CONFIG)
    defs.add_service(
        name=CustomServiceList.RTD.value, info="RTD commands", op_code_entry=oce
    )
@ -68,34 +74,32 @@ def pack_rtd_commands(
        object_id_dict = get_object_ids()
        object_id = object_id_dict.get(RTD_IDS[tgt_rtd_idx])
    if op_code in OpCode.ON:
-        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.ON, submode=0
-        )
+        app_data = pack_mode_data(object_id=object_id.as_bytes, mode=Mode.ON, submode=0)
        q.add_pus_tc(
            PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
            )
        )
    if op_code in OpCode.NORMAL:
        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.NORMAL, submode=0
+            object_id=object_id.as_bytes, mode=Mode.NORMAL, submode=0
        )
        q.add_pus_tc(
            PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
            )
        )
    if op_code in OpCode.OFF:
        app_data = pack_mode_data(
-            object_id=object_id.as_bytes, mode=Modes.OFF, submode=0
+            object_id=object_id.as_bytes, mode=Mode.OFF, submode=0
        )
        q.add_pus_tc(
            PusTelecommand(
-                service=200, subservice=Subservices.TC_MODE_COMMAND, app_data=app_data
+                service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=app_data
            )
        )
-    if op_code in OpCode.CONFIG_CMD:
-        command = object_id.as_bytes + CommandId.PRINT_CLCW
+    if op_code in OpCode.WRITE_CONFIG:
+        command = object_id.as_bytes + struct.pack("!I", CommandId.WRITE_CONFIG)
        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))


--- a/eive_tmtc/pus_tc/devs/scex.py
+++ b/eive_tmtc/pus_tc/devs/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_modes 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

@ -83,8 +83,8 @@ def pack_scex_cmds(p: ServiceProviderParams):
        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 OpCode.SWITCH_OFF:
@ -92,28 +92,28 @@ def pack_scex_cmds(p: ServiceProviderParams):
        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 OpCode.PING:
        q.add_log_cmd(Info.PING)
        app_data = bytes([0])
-        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionId.PING, app_data))
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.PING, app_data))
    if op_code in 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, ActionId.ION_CMD, app_data))
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.ION_CMD, app_data))
    if op_code in 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, ActionId.TEMP_CMD, app_data))
+        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.TEMP_CMD, app_data))

    if op_code in 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, ActionId.EXP_STATUS_CMD, app_data)
+            create_action_cmd(SCEX_HANDLER_ID, ActionId.EXP_STATUS_CMD, app_data)
        )

    # one cell
@ -162,7 +162,7 @@ def pack_scex_cmds(p: ServiceProviderParams):
        app_data.append(dac_weight3[cn])

        q.add_pus_tc(
-            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionId.ONE_CELLS_CMD, app_data)
+            create_action_cmd(SCEX_HANDLER_ID, ActionId.ONE_CELLS_CMD, app_data)
        )

    if op_code in OpCode.ALL_CELLS_CMD:
@ -194,13 +194,13 @@ def pack_scex_cmds(p: ServiceProviderParams):
        app_data.append(dac_weight3[cn])

        q.add_pus_tc(
-            make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionId.ALL_CELLS_CMD, app_data)
+            create_action_cmd(SCEX_HANDLER_ID, ActionId.ALL_CELLS_CMD, app_data)
        )

    if op_code in OpCode.FRAM:
        q.add_log_cmd(Info.FRAM)
        app_data = bytes([0])
-        q.add_pus_tc(make_fsfw_action_cmd(SCEX_HANDLER_ID, ActionId.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):
--- a/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py
+++ b/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py
@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-@file   syrlinks_hk_handler.py
-@brief  Syrlinks Hk Handler tests
-@author J. Meier
-@date   13.12.2020
-"""
-import enum
-
-from eive_tmtc.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 SetId:
-    RX_REGISTERS_DATASET = 1
-    TX_REGISTERS_DATASET = 2
-
-
-class OpCode:
-    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 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
-
-
-@tmtc_definitions_provider
-def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(OpCode.OFF, "Syrlinks Handler: Set mode off")
-    oce.add(OpCode.ON, "Syrlinks Handler: Set mode on")
-    oce.add(OpCode.NORMAL, "Syrlinks Handler: Set mode normal")
-    oce.add(OpCode.STANDBY, "Syrlinks Handler: Set TX standby")
-    oce.add(OpCode.MODULATION, "Syrlinks Handler: Set TX modulation")
-    oce.add(OpCode.HK_RX_REGS, Info.HK_RX_REGS)
-    oce.add(OpCode.HK_TX_REGS, Info.HK_TX_REGS)
-    oce.add(OpCode.SET_CW, Info.SET_CW)
-    oce.add(OpCode.TX_STATUS, Info.TX_STATUS)
-    oce.add(OpCode.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 == OpCode.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 == OpCode.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 == OpCode.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 == OpCode.STANDBY:
-        q.add_log_cmd(f"{prefix}: Set TX mode standby")
-        data = obyt + struct.pack("!I", CommandId.SET_TX_MODE_STANDBY)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == OpCode.MODULATION:
-        q.add_log_cmd(f"{prefix}: Set TX mode modulation")
-        data = obyt + struct.pack("!I", CommandId.SET_TX_MODE_MODULATION)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCode.SET_CW:
-        q.add_log_cmd(f"{prefix}: {Info.SET_CW}")
-        data = obyt + struct.pack("!I", CommandId.SET_TX_MODE_CW)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    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(generate_one_hk_command(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(generate_one_hk_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))
--- a/eive_tmtc/pus_tc/devs/tmp1075.py
+++ b/eive_tmtc/pus_tc/devs/tmp1075.py
@ -5,10 +5,13 @@
@author J. Meier
@date   06.01.2021
 """
+import enum
+
 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.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.pus.s8_fsfw_funccmd import make_action_id
 from tmtccmd.util import ObjectIdU32


@ -28,9 +31,9 @@ class Tmp1075TestProcedure:
    set_mode_on = False  # If mode is MODE_ON, temperature will only be read on command


-class Tmp1075ActionId:
-    get_temp = bytearray([0x0, 0x0, 0x0, 0x01])
-    start_adc_conversion = bytearray([0x0, 0x0, 0x0, 0x02])
+class Tmp1075ActionId(enum.IntEnum):
+    GET_TEMP = 1
+    START_ADC_CONV = 2


 def pack_tmp1075_test_into(
@ -42,21 +45,21 @@ def pack_tmp1075_test_into(
    obyt = object_id.as_bytes
    if Tmp1075TestProcedure.all or Tmp1075TestProcedure.start_adc_conversion:
        q.add_log_cmd("TMP1075: Starting new temperature conversion")
-        command = obyt + Tmp1075ActionId.start_adc_conversion
+        command = obyt + make_action_id(Tmp1075ActionId.GET_TEMP)
        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 + Tmp1075ActionId.get_temp
+        command = obyt + make_action_id(Tmp1075ActionId.START_ADC_CONV)
        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)
+        mode_data = pack_mode_data(obyt, Mode.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)
+        mode_data = pack_mode_data(obyt, Mode.ON, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))

    return q
--- a/eive_tmtc/pus_tc/procedure_packer.py
+++ b/eive_tmtc/pus_tc/procedure_packer.py
@ -9,6 +9,7 @@ from eive_tmtc.pus_tc.system.controllers import (
    pack_cmd_ctrl_to_prompted_mode,
    get_object_from_op_code,
 )
+from eive_tmtc.tmtc.tcs import pack_tcs_sys_commands
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 from tmtccmd.config import CoreServiceList
 from tmtccmd.logging import get_console_logger
@ -20,7 +21,6 @@ from tmtccmd.tc.decorator import (
 from tmtccmd.tc.pus_5_event import (
    pack_generic_service_5_test_into,
 )
-from tmtccmd.pus.pus_17_test import pack_service_17_ping_command

 from eive_tmtc.pus_tc.service_200_mode import pack_service_200_test_into
 from eive_tmtc.tmtc.power.p60dock import pack_p60dock_cmds
@ -36,16 +36,14 @@ from eive_tmtc.tmtc.acs.reaction_wheels import (
 )
 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_test
 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.tmtc.acs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.tmtc.com.syrlinks_handler import pack_syrlinks_command
 from eive_tmtc.pus_tc.devs.gps import pack_gps_command
 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 (
@ -168,8 +166,9 @@ def handle_default_procedure(
            object_id=oids.GPS_CONTROLLER, q=queue_helper, op_code=op_code
        )
    if service == CustomServiceList.CCSDS_HANDLER.value:
+        object_id = cast(ObjectIdU32, obj_id_man.get(CCSDS_HANDLER_ID))
        return pack_ccsds_handler_test(
-            object_id=CCSDS_HANDLER_ID, q=queue_helper, op_code=op_code
+            object_id=object_id, q=queue_helper, op_code=op_code
        )
    if service == CustomServiceList.PDEC_HANDLER.value:
        return pack_ccsds_handler_test(
--- a/eive_tmtc/pus_tc/service_200_mode.py
+++ b/eive_tmtc/pus_tc/service_200_mode.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_modes 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))
--- a/eive_tmtc/pus_tc/system/controllers.py
+++ b/eive_tmtc/pus_tc/system/controllers.py
@ -1,7 +1,7 @@
 from typing import Union

 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode
 from tmtccmd.util import ObjectIdU32, ObjectIdBase

 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
@ -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",
--- a/eive_tmtc/pus_tc/system/proc.py
+++ b/eive_tmtc/pus_tc/system/proc.py
@ -5,21 +5,19 @@ 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 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 OpCode as TcsOpCodes
+from eive_tmtc.tmtc.tcs import OpCodeAssy as TcsOpCodes, pack_tcs_sys_commands
 from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetId
 from eive_tmtc.tmtc.core import SetId as CoreSetIds
 from eive_tmtc.tmtc.power.common_power import SetId as GsSetIds
@ -28,11 +26,11 @@ from eive_tmtc.pus_tc.devs.mgms import MgmLis3SetId as MgmLis3SetIds_0_2
 from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetId as MgmRm3100SetIds_1_3
 from eive_tmtc.pus_tc.devs.gyros import AdisGyroSetId as AdisGyroSetIds_0_2
 from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetId as L3gGyroSetIds_1_3
-from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetId as SyrlinksSetIds
+from eive_tmtc.tmtc.com.syrlinks_handler import SetId as SyrlinksSetIds
 from eive_tmtc.pus_tc.devs.gps import SetId as GpsSetIds
 from eive_tmtc.tmtc.acs.imtq import ImtqSetId
 from eive_tmtc.pus_tc.devs.sus import SetId
-from eive_tmtc.pus_tc.devs.star_tracker import SetIds as StrSetIds
+from eive_tmtc.tmtc.acs.star_tracker import SetId as StrSetIds
 from eive_tmtc.tmtc.acs.reaction_wheels import (
    RwSetId,
    rw_speed_up_cmd_consec,
@ -45,7 +43,7 @@ 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


@ -209,7 +207,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
                )
            )
@ -225,7 +223,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
    obj_id_dict = get_object_ids()
    if op_code in OpCode.RESET_SCHED:
        q.add_log_cmd("Resetting/Clearing TC schedule")
-        q.add_pus_tc(generate_reset_tc_sched_cmd())
+        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, BpxSetId.GET_HK_SET))
@ -300,7 +298,7 @@ def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):

    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))
@ -736,7 +734,7 @@ def enable_listen_to_hk_for_x_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),
    )
--- a/eive_tmtc/pus_tc/system/tcs.py
+++ b/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 OpCode:
-    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 SetId(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=OpCode.TCS_BOARD_ASS_NORMAL,
-        info=Info.TCS_BOARD_ASS_NORMAL,
-    )
-    oce.add(
-        keys=OpCode.TCS_BOARD_ASS_OFF,
-        info=Info.TCS_BOARD_ASS_OFF,
-    )
-    oce.add(keys=OpCode.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 OpCode.REQUEST_SENSOR_TEMP_SET:
-        sensor_set_sid = make_sid(TCS_CONTROLLER, SetId.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 OpCode.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 OpCode.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,
-        )
--- a/eive_tmtc/pus_tm/action_reply_handler.py
+++ b/eive_tmtc/pus_tm/action_reply_handler.py
@ -4,11 +4,12 @@ from eive_tmtc.tmtc.acs.imtq import ImtqActionId
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.tmtc.payload.ploc_mpsoc import PlocReplyIds
 from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionId
-from eive_tmtc.pus_tc.devs.star_tracker import StarTrackerActionId
+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 spacepackets.ccsds.time import CdsShortTimestamp

 LOGGER = get_console_logger()

@ -19,7 +20,9 @@ def handle_action_reply(
    """Core Action reply handler
    :return:
    """
-    tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm)
+    tm_packet = Service8FsfwTm.unpack(
+        raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty()
+    )
    printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
    object_id = obj_id_dict.get(tm_packet.source_object_id_as_bytes)
    pw = PrintWrapper(printer)
--- a/eive_tmtc/pus_tm/devs/syrlinks.py
+++ b/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 SetId
-from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-
-
-def handle_syrlinks_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
-    if set_id == SetId.RX_REGISTERS_DATASET:
-        return handle_syrlinks_rx_registers_dataset(printer, hk_data)
-    elif set_id == SetId.TX_REGISTERS_DATASET:
-        return handle_syrlinks_tx_registers_dataset(printer, hk_data)
-    else:
-        pw = PrintWrapper(printer)
-        pw.dlog(f"Service 3 TM: Syrlinks handler reply with unknown set ID {set_id}")
-
-
-def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: bytes):
-    pw = PrintWrapper(printer)
-    header_list = [
-        "RX Status",
-        "RX Sensitivity",
-        "RX Frequency Shift",
-        "RX IQ Power",
-        "RX AGC Value",
-        "RX Demod Eb",
-        "RX Demod N0",
-        "RX Datarate",
-    ]
-    rx_status = hk_data[0]
-    rx_sensitivity = struct.unpack("!I", hk_data[1:5])
-    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)
--- a/eive_tmtc/pus_tm/event_handler.py
+++ b/eive_tmtc/pus_tm/event_handler.py
@ -5,19 +5,20 @@ 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 AcsMode
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from tmtccmd.tc.pus_200_fsfw_modes import Mode

 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()


 def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
    pw = PrintWrapper(printer)
-    tm = Service5Tm.unpack(raw_telemetry=raw_tm)
+    tm = Service5Tm.unpack(raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty())
    event_dict = get_event_dict()
    info = event_dict.get(tm.event_id)
    if info is None:
@ -55,7 +56,7 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
    if info.name == "MODE_INFO":
        mode_name = "Unknown"
        if obj_name == "ACS_SUBSYSTEM":
-            if tm.param_1 == Modes.OFF:
+            if tm.param_1 == Mode.OFF:
                mode_name = "Off"
            elif tm.param_1 == AcsMode.IDLE:
                mode_name = "Idle"
@ -66,13 +67,13 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
            elif tm.param_1 == AcsMode.TARGET_PT:
                mode_name = "Target Pointing"
        else:
-            if tm.param_1 == Modes.OFF:
+            if tm.param_1 == Mode.OFF:
                mode_name = "Off"
-            elif tm.param_1 == Modes.ON:
+            elif tm.param_1 == Mode.ON:
                mode_name = "On"
-            elif tm.param_1 == Modes.NORMAL:
+            elif tm.param_1 == Mode.NORMAL:
                mode_name = "Normal"
-            elif tm.param_1 == Modes.RAW:
+            elif tm.param_1 == Mode.RAW:
                mode_name = "Raw"
        pw.dlog(f"Mode Number {tm.param_1}, Mode Name {mode_name}")
        pw.dlog(f"Submode: {tm.param_2}")
--- a/eive_tmtc/pus_tm/factory_hook.py
+++ b/eive_tmtc/pus_tm/factory_hook.py
@ -4,11 +4,12 @@ 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 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.tm.pus_200_fsfw_modes import Subservice as ModeSubservices
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from .defs import PrintWrapper

@ -30,7 +31,7 @@ def pus_factory_hook(
        LOGGER.warning("Detected packet shorter than 8 bytes!")
        return
    try:
-        tm_packet = PusTelemetry.unpack(packet)
+        tm_packet = PusTelemetry.unpack(packet, CdsShortTimestamp.empty())
    except ValueError:
        LOGGER.warning("Could not generate PUS TM object from raw data")
        LOGGER.warning(f"Raw Packet: [{packet.hex(sep=',')}], REPR: {packet!r}")
@ -48,15 +49,21 @@ def pus_factory_hook(
    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)
+        tm_packet = Service17Tm.unpack(
+            raw_telemetry=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:
-        tm_packet = Service20FsfwTm.unpack(raw_telemetry=packet)
+        tm_packet = Service20FsfwTm.unpack(
+            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
+        )
        dedicated_handler = False
    elif service == 200:
-        tm_packet = Service200FsfwTm.unpack(raw_telemetry=packet)
+        tm_packet = Service200FsfwTm.unpack(
+            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
+        )
        if tm_packet.subservice == ModeSubservices.TM_CANT_REACH_MODE:
            obj_id = tm_packet.object_id
            obj_id_obj = obj_id_dict.get(obj_id)
--- a/eive_tmtc/pus_tm/hk_handling.py
+++ b/eive_tmtc/pus_tm/hk_handling.py
@ -4,9 +4,10 @@ from eive_tmtc.tmtc.acs.acs_ctrl import handle_raw_mgm_data, handle_acs_ctrl_hk_
 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 eive_tmtc.tmtc.com.syrlinks_handler import handle_syrlinks_hk_data
+from eive_tmtc.tmtc.tcs import handle_thermal_controller_hk_data
 from tmtccmd.tm.pus_3_fsfw_hk import (
    Service3Base,
    HkContentType,
@ -23,7 +24,6 @@ from eive_tmtc.tmtc.power.tm import (
    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 (
    ImtqSetId,
    handle_self_test_data,
--- a/eive_tmtc/pus_tm/system/tcs.py
+++ b/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 SetId(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 == SetId.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 == SetId.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 == SetId.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
--- a/eive_tmtc/pus_tm/verification_handler.py
+++ b/eive_tmtc/pus_tm/verification_handler.py
@ -1,5 +1,6 @@
 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
@ -15,7 +16,9 @@ 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:
--- a/eive_tmtc/tmtc/init.py
+++ b/eive_tmtc/tmtc/init.py
@ -1,2 +1,3 @@
 from .payload.pl_subsystem import add_payload_subsystem_cmds
+from .solar_array_deployment import add_sa_depl_cmds
 from .test import add_test_defs
--- a/eive_tmtc/tmtc/acs/acs_board.py
+++ b/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_modes import Mode
 from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID

 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
@ -34,7 +34,7 @@ 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,
+            mode=Mode.NORMAL,
            submode=DualSideSubmode.A_SIDE,
            q=q,
            info="Switching to ACS board assembly A side",
@ -42,7 +42,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
    if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
        pack_mode_cmd_with_info(
            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=DualSideSubmode.B_SIDE,
            q=q,
            info="Switching to ACS board assembly B side",
@ -50,7 +50,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
    if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
        pack_mode_cmd_with_info(
            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=DualSideSubmode.DUAL_SIDE,
            q=q,
            info="Switching to ACS board assembly dual mode",
@ -58,7 +58,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
    if op_code in AcsOpCodes.ACS_ASS_A_ON:
        pack_mode_cmd_with_info(
            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
+            mode=Mode.ON,
            submode=DualSideSubmode.A_SIDE,
            q=q,
            info="Switching ACS board assembly A side on",
@ -66,7 +66,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
    if op_code in AcsOpCodes.ACS_ASS_B_ON:
        pack_mode_cmd_with_info(
            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
+            mode=Mode.ON,
            submode=DualSideSubmode.B_SIDE,
            q=q,
            info="Switching ACS board assembly B side on",
@ -74,7 +74,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
    if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
        pack_mode_cmd_with_info(
            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
+            mode=Mode.ON,
            submode=DualSideSubmode.B_SIDE,
            q=q,
            info="Switching ACS board assembly dual side on",
@ -82,7 +82,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
    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",
--- a/eive_tmtc/tmtc/acs/acs_ctrl.py
+++ b/eive_tmtc/tmtc/acs/acs_ctrl.py
@ -13,8 +13,8 @@ from tmtccmd.config.tmtc import (
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
-from tmtccmd.tc.pus_20_params import pack_scalar_boolean_parameter_app_data
 from tmtccmd.tc import service_provider
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_command
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_3_fsfw_hk import (
    generate_one_hk_command,
@ -41,40 +41,54 @@ class SetId(enum.IntEnum):
    ACTUATOR_CMD_DATA = 9


+class Submode(enum.IntEnum):
+    SAFE = 2
+    DETUMBLE = 3
+    IDLE = 4
+
+
 class OpCodes:
+    OFF = ["off"]
+    SAFE = ["normal_safe"]
+    DTBL = ["normal_detumble"]
+    IDLE = ["normal_idle"]
    REQUEST_RAW_MGM_HK = ["0", "mgm_raw_hk"]
-    ENABLE_RAW_MGM_HK = ["1", "enable_mgm_raw_hk"]
-    DISABLE_RAW_MGM_HK = ["2", "disable_mgm_raw_hk"]
+    ENABLE_RAW_MGM_HK = ["1", "mgm_raw_enable_hk"]
+    DISABLE_RAW_MGM_HK = ["2", "mgm_raw_disable_hk"]
    REQUEST_PROC_MGM_HK = ["3", "mgm_proc_hk"]
-    ENABLE_PROC_MGM_HK = ["4", "enable_mgm_proc_hk"]
-    DISABLE_PROC_MGM_HK = ["5", "disable_mgm_proc_hk"]
+    ENABLE_PROC_MGM_HK = ["4", "mgm_proc_enable_hk"]
+    DISABLE_PROC_MGM_HK = ["5", "mgm_proc_disable_hk"]
    REQUEST_RAW_SUS_HK = ["6", "sus_raw_hk"]
-    ENABLE_RAW_SUS_HK = ["7", "enable_sus_raw_hk"]
-    DISABLE_RAW_SUS_HK = ["8", "disable_sus_raw_hk"]
+    ENABLE_RAW_SUS_HK = ["7", "sus_raw_enable_hk"]
+    DISABLE_RAW_SUS_HK = ["8", "sus_raw_disable_hk"]
    REQUEST_PROC_SUS_HK = ["9", "sus_proc_hk"]
-    ENABLE_PROC_SUS_HK = ["10", "enable_sus_proc_hk"]
-    DISABLE_PROC_SUS_HK = ["11", "disable_sus_proc_hk"]
+    ENABLE_PROC_SUS_HK = ["10", "sus_proc_enable_hk"]
+    DISABLE_PROC_SUS_HK = ["11", "sus_proc_disable_hk"]
    REQUEST_RAW_GYR_HK = ["12", "gyr_raw_hk"]
-    ENABLE_RAW_GYR_HK = ["13", "enable_gyr_raw_hk"]
-    DISABLE_RAW_GYR_HK = ["14", "disable_gyr_raw_hk"]
+    ENABLE_RAW_GYR_HK = ["13", "gyr_raw_enable_hk"]
+    DISABLE_RAW_GYR_HK = ["14", "gyr_raw_disable_hk"]
    REQUEST_PROC_GYR_HK = ["15", "gyr_proc_hk"]
-    ENABLE_PROC_GYR_HK = ["16", "enable_gyr_proc_hk"]
-    DISABLE_PROC_GYR_HK = ["17", "disable_gyr_proc_hk"]
+    ENABLE_PROC_GYR_HK = ["16", "gyr_proc_enable_hk"]
+    DISABLE_PROC_GYR_HK = ["17", "gyr_proc_disable_hk"]
    REQUEST_PROC_GPS_HK = ["18", "gps_proc_hk"]
-    ENABLE_PROC_GPS_HK = ["19", "enable_gps_proc_hk"]
-    DISABLE_PROC_GPS_HK = ["20", "disable_gps_proc_hk"]
+    ENABLE_PROC_GPS_HK = ["19", "gps_proc_enable_hk"]
+    DISABLE_PROC_GPS_HK = ["20", "gps_proc_disable_hk"]
    REQUEST_MEKF_HK = ["21", "mekf_hk"]
-    ENABLE_MEKF_HK = ["22", "enable_mekf_hk"]
-    DISABLE_MEKF_HK = ["23", "disable_mekf_hk"]
+    ENABLE_MEKF_HK = ["22", "mekf_enable_hk"]
+    DISABLE_MEKF_HK = ["23", "mekf_disable_hk"]
    REQUEST_CTRL_VAL_HK = ["24", "ctrl_val_hk"]
-    ENABLE_CTRL_VAL_HK = ["25", "enable_ctrl_val_hk"]
-    DISABLE_CTRL_VAL_HK = ["26", "disable_ctrl_val_hk"]
+    ENABLE_CTRL_VAL_HK = ["25", "ctrl_val_enable_hk"]
+    DISABLE_CTRL_VAL_HK = ["26", "ctrl_val_disable_hk"]
    REQUEST_ACT_CMD_HK = ["27", "act_cmd_hk"]
-    ENABLE_ACT_CMD_HK = ["28", "enable act_cmd_hk"]
-    DISABLE_ACT_CMD_HK = ["29", "disable act_cmd_hk"]
+    ENABLE_ACT_CMD_HK = ["28", "act_cmd_enable_hk"]
+    DISABLE_ACT_CMD_HK = ["29", "act_cmd_disable_hk"]


 class Info:
+    OFF = "Switch ACS CTRL off"
+    SAFE = "Switch ACS CTRL normal safe"
+    DTBL = "Switch ACS CTRL normal detumble"
+    IDLE = "Switch ACS CTRL normal idle"
    REQUEST_RAW_MGM_HK = "Request Raw MGM HK once"
    ENABLE_RAW_MGM_HK = "Enable Raw MGM HK data generation"
    DISABLE_RAW_MGM_HK = "Disable Raw MGM HK data generation"
@ -122,6 +136,10 @@ if PERFORM_MGM_CALIBRATION:
@tmtc_definitions_provider
 def acs_cmd_defs(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
+    oce.add(keys=OpCodes.OFF, info=Info.OFF)
+    oce.add(keys=OpCodes.SAFE, info=Info.SAFE)
+    oce.add(keys=OpCodes.DTBL, info=Info.DTBL)
+    oce.add(keys=OpCodes.IDLE, info=Info.IDLE)
    oce.add(keys=OpCodes.REQUEST_RAW_MGM_HK, info=Info.REQUEST_RAW_MGM_HK)
    oce.add(keys=OpCodes.ENABLE_RAW_MGM_HK, info=Info.ENABLE_RAW_MGM_HK)
    oce.add(keys=OpCodes.DISABLE_RAW_MGM_HK, info=Info.DISABLE_RAW_MGM_HK)
@ -161,7 +179,19 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper):
 def pack_acs_ctrl_command(p: ServiceProviderParams):
    op_code = p.op_code
    q = p.queue_helper
-    if op_code in OpCodes.REQUEST_RAW_MGM_HK:
+    if op_code in OpCodes.OFF:
+        q.add_log_cmd(f"{Info.OFF}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.OFF, 0))
+    elif op_code in OpCodes.SAFE:
+        q.add_log_cmd(f"{Info.SAFE}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.SAFE))
+    elif op_code in OpCodes.DTBL:
+        q.add_log_cmd(f"{Info.DTBL}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.DETUMBLE))
+    elif op_code in OpCodes.IDLE:
+        q.add_log_cmd(f"{Info.IDLE}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.IDLE))
+    elif op_code in OpCodes.REQUEST_RAW_MGM_HK:
        q.add_log_cmd(Info.REQUEST_RAW_MGM_HK)
        q.add_pus_tc(
            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.MGM_RAW_SET))
@ -245,7 +275,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
    elif op_code in OpCodes.ENABLE_RAW_GYR_HK:
        q.add_log_cmd(Info.ENABLE_RAW_GYR_HK)
        cmd_tuple = enable_periodic_hk_command_with_interval(
-            False, make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET), 2.0
+            True, make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET), 2.0
        )
        q.add_pus_tc(cmd_tuple[0])
        q.add_pus_tc(cmd_tuple[1])
@ -253,7 +283,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
        q.add_log_cmd(Info.DISABLE_RAW_GYR_HK)
        q.add_pus_tc(
            disable_periodic_hk_command(
-                False, make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET)
+                True, make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET)
            )
        )
    elif op_code in OpCodes.REQUEST_PROC_GYR_HK:
@ -300,16 +330,14 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
    elif op_code in OpCodes.ENABLE_MEKF_HK:
        q.add_log_cmd(Info.ENABLE_MEKF_HK)
        cmd_tuple = enable_periodic_hk_command_with_interval(
-            False, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA), 2.0
+            True, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA), 2.0
        )
        q.add_pus_tc(cmd_tuple[0])
        q.add_pus_tc(cmd_tuple[1])
    elif op_code in OpCodes.DISABLE_MEKF_HK:
        q.add_log_cmd(Info.DISABLE_MEKF_HK)
        q.add_pus_tc(
-            disable_periodic_hk_command(
-                False, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA)
-            )
+            disable_periodic_hk_command(True, make_sid(ACS_CONTROLLER, SetId.MEKF_DATA))
        )
    elif op_code in OpCodes.REQUEST_CTRL_VAL_HK:
        q.add_log_cmd(Info.REQUEST_CTRL_VAL_HK)
@ -417,10 +445,9 @@ def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
        pw.dlog(f"SUS {idx} CALIB: {sus_list_formatted}")
    fmt_str = "!ddd"
    inc_len = struct.calcsize(fmt_str)
-    sus_vec_tot = list(
-        struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-    )
-    sus_vec_tot = [f"{val:8.3f}" for val in {sus_vec_tot}]
+    sus_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+
+    sus_vec_tot = [f"{val:8.3f}" for val in sus_vec_tot]
    current_idx += inc_len
    pw.dlog(f"SUS Vector Total: {sus_vec_tot}")
    sus_vec_tot_deriv = struct.unpack(
@ -429,10 +456,8 @@ def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
    sus_vec_tot_deriv = [f"{val:8.3f}" for val in {sus_vec_tot_deriv}]
    current_idx += inc_len
    pw.dlog(f"SUS Vector Derivative: {sus_vec_tot_deriv}")
-    sun_ijk_model = list(
-        struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-    )
-    sun_ijk_model = [f"{val:8.3f}" for val in {sun_ijk_model}]
+    sun_ijk_model = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    sun_ijk_model = [f"{val:8.3f}" for val in sun_ijk_model]
    current_idx += inc_len
    pw.dlog(f"SUS ijk Model: {sun_ijk_model}")
    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=15)
@ -509,6 +534,7 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
        mgm_vec = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
        mgm_vec = [f"{val:8.3f}" for val in mgm_vec]
        pw.dlog(f"MGM {i}: {mgm_vec}")
+        current_idx += inc_len
    fmt_str = "!ddd"
    inc_len = struct.calcsize(fmt_str)
    mgm_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
--- a/eive_tmtc/tmtc/acs/acs_subsystem.py
+++ b/eive_tmtc/tmtc/acs/acs_subsystem.py
@ -10,7 +10,7 @@ from tmtccmd.config.tmtc import (
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams

--- a/eive_tmtc/tmtc/acs/imtq.py
+++ b/eive_tmtc/tmtc/acs/imtq.py
@ -22,7 +22,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    generate_one_diag_command,
    generate_one_hk_command,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

@ -87,15 +87,15 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod

    if op_code in 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 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 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":
        q.add_log_cmd("IMTQ: Perform positive x self test")
--- a/eive_tmtc/tmtc/acs/reaction_wheels.py
+++ b/eive_tmtc/tmtc/acs/reaction_wheels.py
@ -20,7 +20,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    disable_periodic_hk_command,
 )
 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_modes 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
@ -148,17 +148,17 @@ def pack_single_rw_test_into(

    if op_code in OpCodesDev.ON:
        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.ON}")
-        mode_data = pack_mode_data(object_id, Modes.ON, 0)
+        mode_data = pack_mode_data(object_id, Mode.ON, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))

    if op_code in OpCodesDev.NML:
        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.NML}")
-        mode_data = pack_mode_data(object_id, Modes.NORMAL, 0)
+        mode_data = pack_mode_data(object_id, Mode.NORMAL, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))

    if op_code in OpCodesDev.OFF:
        q.add_log_cmd(f"RW {rw_idx}: {InfoDev.OFF}")
-        mode_data = pack_mode_data(object_id, Modes.OFF, 0)
+        mode_data = pack_mode_data(object_id, Mode.OFF, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))

    if op_code in OpCodesDev.GET_TM:
@ -194,24 +194,24 @@ def pack_single_rw_test_into(

 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:
--- a/eive_tmtc/pus_tc/devs/star_tracker.py
+++ b/eive_tmtc/pus_tc/devs/star_tracker.py
@ -9,7 +9,7 @@ import enum
 import struct

 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
 from tmtccmd.logging import get_console_logger

 from tmtccmd.tc import DefaultPusQueueHelper
@ -90,8 +90,18 @@ class OpCodes:
    NORMAL = ["2", "nml"]


-class SetIds:
+class SetId(enum.IntEnum):
+    VERSION = 2
+    INTERFACE = 3
+    POWER = 11
    TEMPERATURE = 25
+    SOLUTION = 24
+    HISTOGRAM = 28
+    CHECKSUM = 50
+    CAMERA = 67
+    LIMITS = 68
+    CENTROIDING = 72
+    LISA = 73


 class FileDefs:
@ -164,23 +174,23 @@ def pack_star_tracker_commands(
    obyt = object_id.as_bytes
    if op_code == "0":
        q.add_log_cmd("Star tracker: Mode On, Submode Bootloader")
-        data = pack_mode_data(obyt, Modes.ON, Submode.BOOTLOADER)
+        data = pack_mode_data(obyt, Mode.ON, Submode.BOOTLOADER)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
    if op_code == "1":
        q.add_log_cmd("Star tracker: Mode On, Submode Firmware")
-        data = pack_mode_data(obyt, Modes.ON, Submode.FIRMWARE)
+        data = pack_mode_data(obyt, Mode.ON, Submode.FIRMWARE)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
    if op_code == "2":
        q.add_log_cmd("Star tracker: Mode Normal")
-        data = pack_mode_data(obyt, Modes.NORMAL, 0)
+        data = pack_mode_data(obyt, Mode.NORMAL, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
    if op_code == "3":
        q.add_log_cmd("Star tracker: Mode Off")
-        data = pack_mode_data(obyt, Modes.OFF, 0)
+        data = pack_mode_data(obyt, Mode.OFF, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
    if op_code == "4":
        q.add_log_cmd("Star tracker: Mode Raw")
-        data = pack_mode_data(obyt, Modes.RAW, 0)
+        data = pack_mode_data(obyt, Mode.RAW, 0)
        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
    if op_code == "5":
        q.add_log_cmd("Star tracker: Ping")
--- a/eive_tmtc/tmtc/acs/sus_board.py
+++ b/eive_tmtc/tmtc/acs/sus_board.py
@ -9,7 +9,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_modes import Mode


 class SusOpCode:
@ -23,7 +23,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
    if op_code in SusOpCode.SUS_ASS_NOM_SIDE:
        pack_mode_cmd_with_info(
            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=DualSideSubmode.A_SIDE,
            q=q,
            info="Switching to SUS board to nominal side",
@ -31,7 +31,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
    if op_code in SusOpCode.SUS_ASS_RED_SIDE:
        pack_mode_cmd_with_info(
            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=DualSideSubmode.B_SIDE,
            q=q,
            info="Switching to SUS board to redundant side",
@ -39,7 +39,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
    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",
@ -47,7 +47,7 @@ def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
    if op_code in SusOpCode.SUS_ASS_DUAL_MODE:
        pack_mode_cmd_with_info(
            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
+            mode=Mode.NORMAL,
            submode=DualSideSubmode.DUAL_SIDE,
            q=q,
            info="Switching to SUS board to dual side",
--- a/eive_tmtc/tmtc/com/init.py
+++ b/eive_tmtc/tmtc/com/init.py
--- a/eive_tmtc/tmtc/com/ccsds_handler.py
+++ b/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_modes import create_mode_command, Mode
+from tmtccmd.util import ObjectIdU32
+from eive_tmtc.config.object_ids import CCSDS_HANDLER_ID
+
+
+class ActionId(enum.IntEnum):
+    # Configures input rate of syrlinks to 400 Khz (results in downlink rate of 200 kbps)
+    # SET_LOW_RATE = 0
+    # Configures input rate of syrlinks to 2000 Khz (results in downlink rate of 1000 kbps)
+    # SET_HIGH_RATE = 1
+    # Enables the syrlinks transmitter (by using RS485 enables lines). Please note that this
+    # is a legacy command. It is recommended to use mode commands instead
+    EN_TRANSMITTER = 2
+    # Disables the syrlinks transmitter (by using RS485 enables lines). Please note that this is
+    # a legacy command. It is recommended to use mode commands instead.
+    DIS_TRANSMITTER = 3
+    # Sets an arbitrary bitrate. Normally only set low and set high rate commands should be
+    # required
+    ARBITRARY_BITRATE = 4
+    ENABLE_TX_CLK_MANIPULATOR = 5
+    DISABLE_TX_CLK_MANIPULATOR = 6
+    # Tx data will be updated on rising edge of tx clock
+    UPDATE_ON_RISING_EDGE = 7
+    # Tx data will be updated on falling edge of tx clock
+    UPDATE_ON_FALLING_EDGE = 8
+
+
+class Submode(enum.IntEnum):
+    # Informative, do not command this.
+    UNSET = 0
+    DATARATE_LOW = 1
+    DATARATE_HIGH = 2
+
+
+class OpCode:
+    ENABLE_WITH_LOW_DATARATE = ["enable_low_datarate"]
+    ENABLE_WITH_HIGH_DATARATE = ["enable_high_datarate"]
+    DISABLE = ["disable"]
+    ENABLE_ACTION = ["legacy_enable_tx"]
+    DISABLE_ACTION = ["legacy_disable_tx"]
+
+
+class Info:
+    ENABLE_WITH_LOW_DATARATE = "Enable TX with low datarate"
+    ENABLE_WITH_HIGH_DATARATE = "Enable TX with high datarate"
+    DISABLE = "Disable TX"
+    ENABLE_ACTION = "Enable TX (legacy)"
+    DISABLE_ACTION = "Disable TX (legacy)"
+
+
+def pack_ccsds_handler_test(
+    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
+):
+    obyt = object_id.as_bytes
+    prefix = "CCSDS Handler"
+    q.add_log_cmd(f"Testing CCSDS handler with object id: {object_id.as_hex_string}")
+    if op_code in OpCode.ENABLE_WITH_LOW_DATARATE:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_WITH_LOW_DATARATE}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, Submode.DATARATE_LOW))
+    if op_code in OpCode.ENABLE_WITH_HIGH_DATARATE:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_WITH_HIGH_DATARATE}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, Submode.DATARATE_HIGH))
+    if op_code in OpCode.DISABLE:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.OFF, 0))
+    if op_code in OpCode.ENABLE_ACTION:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_ACTION}")
+        command = obyt + struct.pack("!I", ActionId.EN_TRANSMITTER)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code in OpCode.DISABLE_ACTION:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_ACTION}")
+        command = obyt + struct.pack("!I", ActionId.DIS_TRANSMITTER)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "4":
+        q.add_log_cmd("CCSDS Handler: Set arbitrary bitrate")
+        bitrate = int(input("Specify bit rate (bps): "))
+        command = (
+            obyt
+            + struct.pack("!I", ActionId.ARBITRARY_BITRATE)
+            + struct.pack("!I", bitrate)
+        )
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "5":
+        q.add_log_cmd("CCSDS Handler: Enable tx clock manipulator")
+        command = obyt + struct.pack("!I", ActionId.ENABLE_TX_CLK_MANIPULATOR)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "6":
+        q.add_log_cmd("CCSDS Handler: Disable tx clock manipulator")
+        command = obyt + struct.pack("!I", ActionId.DISABLE_TX_CLK_MANIPULATOR)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "7":
+        q.add_log_cmd("CCSDS Handler: Update tx data on rising edge of tx clock")
+        command = obyt + struct.pack("!I", ActionId.UPDATE_ON_RISING_EDGE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "8":
+        q.add_log_cmd("CCSDS Handler: Update tx data on falling edge of tx clock")
+        command = obyt + struct.pack("!I", ActionId.UPDATE_ON_FALLING_EDGE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+
+@tmtc_definitions_provider
+def add_ccsds_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.ENABLE_WITH_LOW_DATARATE, Info.ENABLE_WITH_LOW_DATARATE)
+    oce.add(OpCode.ENABLE_WITH_HIGH_DATARATE, Info.ENABLE_WITH_HIGH_DATARATE)
+    oce.add(OpCode.DISABLE, Info.DISABLE)
+    oce.add(OpCode.ENABLE_ACTION, Info.ENABLE_ACTION)
+    oce.add(OpCode.DISABLE_ACTION, Info.DISABLE_ACTION)
+    oce.add("4", "CCSDS Handler: Set arbitrary bitrate")
+    oce.add("5", "CCSDS Handler: Enable tx clock manipulator")
+    oce.add("6", "CCSDS Handler: Disable tx clock manipulator")
+    oce.add("7", "CCSDS Handler: Update tx data on rising edge")
+    oce.add("8", "CCSDS Handler: Update tx data on falling edge")
+    defs.add_service(CustomServiceList.CCSDS_HANDLER.value, "CCSDS Handler", oce)
--- a/eive_tmtc/tmtc/com/syrlinks_handler.py
+++ b/eive_tmtc/tmtc/com/syrlinks_handler.py
@ -0,0 +1,352 @@
+# -*- coding: utf-8 -*-
+"""
+@file   syrlinks_hk_handler.py
+@brief  Syrlinks Hk Handler tests
+@author J. Meier
+@date   13.12.2020
+"""
+import enum
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    create_request_one_diag_command,
+    create_enable_periodic_hk_command_with_interval,
+    create_disable_periodic_hk_command,
+)
+from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.tc.pus_200_fsfw_modes import Mode, create_mode_command
+from tmtccmd.tc.pus_20_fsfw_params import (
+    pack_scalar_u8_parameter_app_data,
+    create_load_param_cmd,
+)
+from eive_tmtc.config.object_ids import SYRLINKS_HANDLER_ID
+import struct
+
+from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+
+class SetId:
+    RX_REGISTERS_DATASET = 1
+    TX_REGISTERS_DATASET = 2
+    TEMPERATURE_SET_ID = 3
+
+
+class OpCode:
+    OFF = "off"
+    ON = "on"
+    NORMAL_RX_ONLY = "nml_rx_only"
+    NORMAL_RX_AND_TX_CW = "nml_carrier_wave"
+    NORMAL_RX_AND_TX_DEF_DATARATE = "nml_default_datarate"
+    NORMAL_RX_AND_TX_LOW_DATARATE = "nml_low_datarate"
+    NORMAL_RX_AND_TX_HIGH_DATARATE = "nml_high_datarate"
+    UPDATE_DEFAULT_DATARATE_LOW_RATE = "param_low_datarate"
+    UPDATE_DEFAULT_DATARATE_HIGH_RATE = "param_high_datarate"
+    HK_RX_REGS = "hk_rx_regs"
+    ENABLE_HK_RX_REGS = "enable_hk_rx"
+    DISABLE_HK_RX_REGS = "disable_hk_rx"
+    ENABLE_HK_TX_REGS = "enable_hk_tx"
+    DISABLE_HK_TX_REGS = "disable_hk_tx"
+    HK_TX_REGS = "hk_tx_regs"
+    TX_STATUS = "tx_status"
+    RX_STATUS = "rx_status"
+
+
+class Info:
+    OFF = "Switch OFF"
+    ON = "Switch ON"
+    NORMAL_RX_ONLY = "NORMAL RX Only, set TX to standby"
+    NORMAL_RX_AND_TX_CW = "NORMAL RX and TX, TX Carrier Wave"
+    NORMAL_RX_AND_TX_DEF_DATARATE = "NORMAL RX and TX, TX with default datarate"
+    NORMAL_RX_AND_TX_LOW_DATARATE = "NORMAL RX and TX, TX with low datarate"
+    NORMAL_RX_AND_TX_HIGH_DATARATE = "NORMAL RX and TX, TX with high datarate"
+    UPDATE_DEFAULT_DATARATE_LOW_RATE = "Update default datarate to low rate (BPSK)"
+    UPDATE_DEFAULT_DATARATE_HIGH_RATE = "Update default datarate to high rate (0QPSK)"
+    HK_RX_REGS = "Request RX register set"
+    HK_TX_REGS = "Request TX register set"
+    ENABLE_HK_RX_REGS = "Enable periodic RX register HK"
+    DISABLE_HK_RX_REGS = "Disable periodic RX register HK"
+    ENABLE_HK_TX_REGS = "Enable periodic TX register HK"
+    DISABLE_HK_TX_REGS = "Disable periodic TX register HK"
+    TX_STATUS = "Read TX status (always read in normal mode)"
+    RX_STATUS = "Read RX status (always read in normal mode)"
+    SET_CW = "Set TX carrier wave"
+
+
+class CommandId(enum.IntEnum):
+    READ_RX_STATUS_REGISTERS = 2
+    SET_TX_MODE_STANDBY = 3
+    SET_TX_MODE_MODULATION = 4
+    SET_TX_MODE_CW = 5
+    READ_TX_STATUS = 7
+    READ_TX_WAVEFORM = 8
+    READ_TX_AGC_VALUE_HIGH_BYTE = 9
+    READ_TX_AGC_VALUE_LOW_BYTE = 10
+    WRITE_LCL_CONFIG = 11
+    READ_LCL_CONFIG_REGISTER = 12
+    SET_WAVEFORM_OQPSK = 17
+    SET_WAVEFORM_BPSK = 18
+    SET_SECOND_CONFIG = 19
+    ENABLE_DEBUG = 20
+    DISABLE_DEBUG = 21
+
+
+class Submode(enum.IntEnum):
+    RX_ONLY = 0
+    RX_AND_TX_DEFAULT_DATARATE = 1
+    RX_AND_TX_LOW_DATARATE = 2
+    RX_AND_TX_HIGH_DATARATE = 3
+    RX_AND_TX_CW = 4
+
+
+class ParameterId(enum.IntEnum):
+    DATARATE = 0
+
+
+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.UPDATE_DEFAULT_DATARATE_LOW_RATE, Info.UPDATE_DEFAULT_DATARATE_LOW_RATE
+    )
+    oce.add(
+        OpCode.UPDATE_DEFAULT_DATARATE_HIGH_RATE, Info.UPDATE_DEFAULT_DATARATE_HIGH_RATE
+    )
+    oce.add(OpCode.HK_RX_REGS, Info.HK_RX_REGS)
+    oce.add(OpCode.HK_TX_REGS, Info.HK_TX_REGS)
+    oce.add(OpCode.TX_STATUS, Info.TX_STATUS)
+    oce.add(OpCode.RX_STATUS, Info.RX_STATUS)
+    oce.add(OpCode.ENABLE_HK_RX_REGS, Info.ENABLE_HK_RX_REGS)
+    oce.add(OpCode.DISABLE_HK_RX_REGS, Info.DISABLE_HK_RX_REGS)
+    oce.add(OpCode.ENABLE_HK_TX_REGS, Info.ENABLE_HK_TX_REGS)
+    oce.add(OpCode.DISABLE_HK_TX_REGS, Info.DISABLE_HK_TX_REGS)
+    oce.add("7", "Syrlinks Handler: Read TX waveform")
+    oce.add("8", "Syrlinks Handler: Read TX AGC value high byte")
+    oce.add("9", "Syrlinks Handler: Read TX AGC value low byte")
+    oce.add("12", "Syrlinks Handler: Write LCL config")
+    oce.add("14", "Syrlinks Handler: Read LCL config register")
+    oce.add("15", "Syrlinks Handler: Set waveform OQPSK")
+    oce.add("16", "Syrlinks Handler: Set waveform BPSK")
+    oce.add("17", "Syrlinks Handler: Set second config")
+    oce.add("18", "Syrlinks Handler: Enable debug output")
+    oce.add("19", "Syrlinks Handler: Disable debug output")
+    defs.add_service(CustomServiceList.SYRLINKS.value, "Syrlinks Handler", oce)
+
+
+_PREFIX = "Syrlinks"
+
+
+def normal_mode_cmd(q: DefaultPusQueueHelper, info: str, submode: int):
+    q.add_log_cmd(f"{_PREFIX}: {info}")
+    q.add_pus_tc(create_mode_command(SYRLINKS_HANDLER_ID, Mode.NORMAL, submode))
+
+
+def pack_syrlinks_command(
+    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
+):
+    obyt = object_id.as_bytes
+    prefix = "Syrlinks"
+    q.add_log_cmd(f"Testing Syrlinks with object id: {object_id.as_hex_string}")
+    if op_code == OpCode.OFF:
+        q.add_log_cmd(f"{prefix}: {Info.OFF}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.OFF, 0))
+    if op_code == OpCode.ON:
+        q.add_log_cmd(f"{prefix}: {Info.ON}")
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, 0))
+    if op_code == OpCode.NORMAL_RX_ONLY:
+        normal_mode_cmd(q, Info.NORMAL_RX_ONLY, Submode.RX_ONLY)
+    if op_code == OpCode.NORMAL_RX_AND_TX_LOW_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_LOW_DATARATE, Submode.RX_AND_TX_LOW_DATARATE
+        )
+    if op_code == OpCode.NORMAL_RX_AND_TX_DEF_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_DEF_DATARATE, Submode.RX_AND_TX_DEFAULT_DATARATE
+        )
+    if op_code == OpCode.NORMAL_RX_AND_TX_HIGH_DATARATE:
+        normal_mode_cmd(
+            q, Info.NORMAL_RX_AND_TX_HIGH_DATARATE, Submode.RX_AND_TX_HIGH_DATARATE
+        )
+    if op_code == OpCode.UPDATE_DEFAULT_DATARATE_LOW_RATE:
+        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_LOW_RATE}")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                pack_scalar_u8_parameter_app_data(
+                    obyt, 0, ParameterId.DATARATE, Datarate.LOW_RATE_MODULATION_BPSK
+                )
+            )
+        )
+    if op_code == OpCode.UPDATE_DEFAULT_DATARATE_HIGH_RATE:
+        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_HIGH_RATE}")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                pack_scalar_u8_parameter_app_data(
+                    obyt, 0, ParameterId.DATARATE, Datarate.HIGH_RATE_MODULATION_0QPSK
+                )
+            )
+        )
+    if op_code in OpCode.NORMAL_RX_AND_TX_CW:
+        normal_mode_cmd(q, Info.NORMAL_RX_AND_TX_CW, Submode.RX_AND_TX_CW)
+    if op_code in OpCode.HK_RX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.HK_RX_REGS}")
+        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
+        q.add_pus_tc(create_request_one_diag_command(sid))
+    if op_code in OpCode.ENABLE_HK_RX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_RX_REGS}")
+        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
+        interval = float(input("HK interval in floating point seconds"))
+        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_HK_RX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_RX_REGS}")
+        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
+        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+    if op_code in OpCode.ENABLE_HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        interval = float(input("HK interval in floating point seconds"))
+        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+    if op_code in OpCode.HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        q.add_pus_tc(create_request_one_diag_command(sid))
+    if op_code in OpCode.TX_STATUS:
+        q.add_log_cmd(f"{prefix}: {Info.TX_STATUS}")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_STATUS)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "9":
+        q.add_log_cmd("Syrlinks: Read TX waveform")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_WAVEFORM)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "10":
+        q.add_log_cmd("Syrlinks: Read TX AGC value high byte")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_AGC_VALUE_HIGH_BYTE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "11":
+        q.add_log_cmd("Syrlinks: Read TX AGC value low byte")
+        command = obyt + struct.pack("!I", CommandId.READ_TX_AGC_VALUE_LOW_BYTE)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "12":
+        q.add_log_cmd("Syrlinks: Write LCL config")
+        command = obyt + struct.pack("!I", CommandId.WRITE_LCL_CONFIG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "13":
+        q.add_log_cmd("Syrlinks: Read RX status registers")
+        command = obyt + struct.pack("!I", CommandId.READ_RX_STATUS_REGISTERS)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "14":
+        q.add_log_cmd("Syrlinks: Read LCL config register")
+        command = obyt + struct.pack("!I", CommandId.READ_LCL_CONFIG_REGISTER)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "15":
+        q.add_log_cmd("Syrlinks: Set waveform OQPSK")
+        command = obyt + struct.pack("!I", CommandId.SET_WAVEFORM_OQPSK)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "16":
+        q.add_log_cmd("Syrlinks: Set waveform BPSK")
+        command = obyt + struct.pack("!I", CommandId.SET_WAVEFORM_BPSK)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "17":
+        q.add_log_cmd("Syrlinks: Set second config")
+        command = obyt + struct.pack("!I", CommandId.SET_SECOND_CONFIG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "18":
+        q.add_log_cmd("Syrlinks: Enable debug printout")
+        command = obyt + struct.pack("!I", CommandId.ENABLE_DEBUG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == "19":
+        q.add_log_cmd("Syrlinks: Disable debug printout")
+        command = obyt + struct.pack("!I", CommandId.DISABLE_DEBUG)
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+
+
+def handle_syrlinks_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    if set_id == SetId.RX_REGISTERS_DATASET:
+        return handle_syrlinks_rx_registers_dataset(printer, hk_data)
+    elif set_id == SetId.TX_REGISTERS_DATASET:
+        return handle_syrlinks_tx_registers_dataset(printer, hk_data)
+    else:
+        pw = PrintWrapper(printer)
+        pw.dlog(f"Service 3 TM: Syrlinks handler reply with unknown set ID {set_id}")
+
+
+def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    header_list = [
+        "RX Status",
+        "RX Sensitivity",
+        "RX Frequency Shift",
+        "RX IQ Power",
+        "RX AGC Value",
+        "RX Demod Eb",
+        "RX Demod N0",
+        "RX Datarate",
+    ]
+    rx_status = hk_data[0]
+    rx_sensitivity = struct.unpack("!I", hk_data[1:5])[0]
+    rx_frequency_shift = struct.unpack("!i", hk_data[5:9])[0]
+    freq_shift_hz = rx_frequency_shift / 8.0
+    freq_shift_printout = f"Raw: {rx_frequency_shift}, Eng: {freq_shift_hz} Hz"
+    rx_iq_power = struct.unpack("!H", hk_data[9:11])[0]
+    rx_agc_value = struct.unpack("!H", hk_data[11:13])[0]
+    rx_demod_eb = struct.unpack("!I", hk_data[13:17])[0]
+    rx_demod_n0 = struct.unpack("!I", hk_data[17:21])[0]
+    rx_data_rate = hk_data[21]
+    content_list = [
+        rx_status,
+        rx_sensitivity,
+        freq_shift_printout,
+        rx_iq_power,
+        rx_agc_value,
+        rx_demod_eb,
+        rx_demod_n0,
+        rx_data_rate,
+    ]
+    validity_buffer = hk_data[22:]
+    for header, content in zip(header_list, content_list):
+        pw.dlog(f"{header}: {content}")
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=8)
+
+
+def handle_syrlinks_tx_registers_dataset(
+    printer: FsfwTmTcPrinter,
+    hk_data: bytes,
+):
+    pw = PrintWrapper(printer)
+    header_list = ["TX Status", "TX Waveform", "TX AGC value"]
+    tx_status = hk_data[0]
+    tx_waveform = hk_data[1]
+    tx_agc_value = struct.unpack("!H", hk_data[2:4])[0]
+    content_list = [tx_status, tx_waveform, tx_agc_value]
+    validity_buffer = hk_data[4:]
+    for header, content in zip(header_list, content_list):
+        pw.dlog(f"{header}: {content}")
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=3)
--- a/eive_tmtc/tmtc/common.py
+++ b/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_modes 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
        )
    )
--- a/eive_tmtc/tmtc/core.py
+++ b/eive_tmtc/tmtc/core.py
@ -8,7 +8,7 @@ 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.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
@ -152,7 +152,11 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
        )
    if op_code in OpCode.REBOOT_FULL:
        q.add_log_cmd(f"Core Command: {Info.REBOOT_FULL}")
-        q.add_pus_tc(create_full_reboot_cmds())
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID, action_id=ActionId.FULL_REBOOT
+            )
+        )
    if op_code in OpCode.XSC_REBOOT_SELF:
        add_xsc_reboot_cmd(q=q, reboot_self=True)
    if op_code in OpCode.XSC_REBOOT_0_0:
@ -181,7 +185,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
        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=ActionId.SWITCH_REBOOT_FILE_HANDLING,
                user_data=user_data,
@ -191,7 +195,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
        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=ActionId.SWITCH_REBOOT_FILE_HANDLING,
                user_data=user_data,
@ -200,7 +204,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
    if op_code in OpCode.RESET_ALL_REBOOT_COUNTERS:
        q.add_log_cmd("Resetting all reboot counters")
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=CORE_CONTROLLER_ID,
                action_id=ActionId.RESET_REBOOT_COUNTER,
            )
@ -225,14 +229,14 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
    if op_code in OpCode.SWITCH_TO_SD_0:
        q.add_log_cmd(Info.SWITCH_TO_SD_0)
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=CORE_CONTROLLER_ID, action_id=ActionId.SWITCH_TO_SD_0
            )
        )
    if op_code in OpCode.SWITCH_TO_SD_1:
        q.add_log_cmd(Info.SWITCH_TO_SD_1)
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=CORE_CONTROLLER_ID, action_id=ActionId.SWITCH_TO_SD_1
            )
        )
@ -244,7 +248,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
            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=ActionId.SWITCH_TO_BOTH_SD_CARDS,
                user_data=bytes([active_sd_card]),
@ -259,7 +263,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
 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=ActionId.RESET_REBOOT_COUNTER,
            user_data=bytes([chip, copy]),
@ -268,7 +272,7 @@ def reset_specific_boot_counter(q: DefaultPusQueueHelper, chip: int, copy: int):


 def create_full_reboot_cmds() -> PusTelecommand:
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=CORE_CONTROLLER_ID, action_id=ActionId.FULL_REBOOT
    )

@ -311,7 +315,7 @@ def determine_chip_and_copy() -> (int, int):
 def pack_obsw_update_cmd(action_id: int) -> PusTelecommand:
    chip, copy = determine_chip_and_copy()
    user_data = bytes([chip, copy])
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=CORE_CONTROLLER_ID, action_id=action_id, user_data=user_data
    )

@ -341,7 +345,7 @@ def create_xsc_reboot_cmds(
        tc_data.append(False)
        tc_data.append(chip)
        tc_data.append(copy)
-    return make_fsfw_action_cmd(
+    return create_action_cmd(
        object_id=CORE_CONTROLLER_ID, action_id=ActionId.XSC_REBOOT, user_data=tc_data
    )

--- a/eive_tmtc/tmtc/payload/pl_subsystem.py
+++ b/eive_tmtc/tmtc/payload/pl_subsystem.py
@ -9,7 +9,7 @@ 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_modes import Subservice as ModeSubservice


 class OpCode(str, enum.Enum):
@ -41,7 +41,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
        q.add_pus_tc(
            PusTelecommand(
                service=200,
-                subservice=ModeSubservices.TC_MODE_ANNOUNCE_RECURSIVE,
+                subservice=ModeSubservice.TC_MODE_ANNOUNCE_RECURSIVE,
                app_data=PL_SUBSYSTEM_ID,
            )
        )
--- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py
+++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py
@ -21,7 +21,7 @@ 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_modes import pack_mode_data, Mode


 LOGGER = get_console_logger()
@ -138,15 +138,15 @@ def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
    obyt = object_id.as_bytes
    if op_code in 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 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 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":
        q.add_log_cmd("PLOC MPSoC: TC mem write test")
--- a/eive_tmtc/tmtc/payload/ploc_supervisor.py
+++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py
@ -19,8 +19,8 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.utility.input_helper import InputHelper

@ -232,15 +232,15 @@ 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}")
@ -279,7 +279,7 @@ 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=SupvActionId.FACTORY_RESET,
                user_data=bytes([key]),
@ -475,7 +475,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
            f"{prefix}: {Info.MEM_CHECK} for file {update_file} at memory ID {memory_id} at start "
            f"address {start_address}"
        )
-        command = make_fsfw_action_cmd(
+        command = create_action_cmd(
            object_id.as_bytes, SupvActionId.MEM_CHECK, custom_data
        )
        q.add_pus_tc(command)
--- a/eive_tmtc/tmtc/power/common_power.py
+++ b/eive_tmtc/tmtc/power/common_power.py
@ -23,7 +23,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    enable_periodic_hk_command_with_interval,
    disable_periodic_hk_command,
 )
-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


@ -53,6 +53,7 @@ class PowerInfo:
    INFO_CORE = "Core Information"
    INFO_AUX = "Auxiliary Information"
    INFO_ALL = "All Information"
+    REQUEST_SWITCHER_SET = "Request Switcher Information"
    ENABLE_INFO_HK = "Enable Core Info HK"
    DISABLE_INFO_HK = "Disable Core Info HK"
    RESET_ALL_GND_WDTS = "Reset all Ground Watchdogs"
@ -101,6 +102,7 @@ class PowerOpCodes:

    REBOOT = ["reboot"]
    INFO_CORE = ["info"]
+    REQUEST_SWITCHER_SET = ["request_switchers"]
    ENABLE_INFO_HK = ["info_hk_on"]
    DISABLE_INFO_HK = ["info_hk_off"]
    INFO_AUX = ["info_aux"]
@ -143,7 +145,7 @@ def pack_common_gomspace_cmds(
    if op_code in PowerOpCodes.PRINT_SWITCH_V_I:
        q.add_log_cmd(f"{prefix}: {PowerInfo.PRINT_SWITCH_V_I}")
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=objb, action_id=GomspaceDeviceActionId.PRINT_SWITCH_V_I
            )
        )
@ -153,7 +155,7 @@ def pack_common_gomspace_cmds(
    if op_code in PowerOpCodes.PRINT_LATCHUPS:
        q.add_log_cmd(f"{prefix}: {PowerInfo.PRINT_LATCHUPS}")
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=objb, action_id=GomspaceDeviceActionId.PRINT_LATCHUPS
            )
        )
@ -187,7 +189,7 @@ def pack_common_gomspace_cmds(
        ))
        """
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=object_id.as_bytes,
                action_id=GomspaceDeviceActionId.SAVE_TABLE,
                user_data=bytes([source_table]),
@ -202,7 +204,7 @@ def pack_common_gomspace_cmds(
        if source_table not in [0, 1, 2]:
            raise ValueError("Invalid source table index")
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=object_id.as_bytes,
                action_id=GomspaceDeviceActionId.SAVE_TABLE_DEFAULT,
                user_data=bytes([source_table]),
@ -230,7 +232,7 @@ def pack_common_gomspace_cmds(
            # Will be ignored
            source_table = 4
        q.add_pus_tc(
-            make_fsfw_action_cmd(
+            create_action_cmd(
                object_id=object_id.as_bytes,
                action_id=GomspaceDeviceActionId.LOAD_TABLE,
                user_data=bytes([source_table, target_table]),
--- a/eive_tmtc/tmtc/power/pdu2.py
+++ b/eive_tmtc/tmtc/power/pdu2.py
@ -79,7 +79,7 @@ class PDU2TestProcedure:
 def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
    q.add_log_cmd("Testing PDU2")
    objb = object_id.as_bytes
-    pdu2_cmds(q, op_code)
+    pdu2_switch_cmds(q, op_code)
    pdu2_req_hk_cmds(q, op_code)
    pack_common_power_cmds("PDU2", object_id, q, op_code)
    pack_common_gomspace_cmds("PDU2", object_id, q, op_code)
@ -159,7 +159,7 @@ def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
    )


-def pdu2_cmds(q: DefaultPusQueueHelper, op_code: str):
+def pdu2_switch_cmds(q: DefaultPusQueueHelper, op_code: str):
    if op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_ON:
        pl_pcdu_bat_nom_on_cmd(q)
    elif op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_OFF:
--- a/eive_tmtc/tmtc/power/power.py
+++ b/eive_tmtc/tmtc/power/power.py
@ -1,3 +1,5 @@
+import enum
+
 from eive_tmtc.tmtc.power.common_power import (
    PowerOpCodes,
    PowerInfo,
@ -10,6 +12,7 @@ from eive_tmtc.config.object_ids import (
    ACU_HANDLER_ID,
    PDU_1_HANDLER_ID,
    PDU_2_HANDLER_ID,
+    PCDU_HANDLER_ID,
    get_object_ids,
 )
 from eive_tmtc.tmtc.power.pdu1 import (
@ -21,7 +24,7 @@ from eive_tmtc.tmtc.power.pdu1 import (
 from eive_tmtc.tmtc.power.pdu2 import (
    pdu2_req_hk_cmds,
    add_pdu2_common_defs,
-    pdu2_cmds,
+    pdu2_switch_cmds,
    add_pdu2_cmds,
 )
 from tmtccmd import get_console_logger
@ -29,6 +32,7 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry

 from eive_tmtc.tmtc.power.p60dock import P60OpCode, P60Info, p60_dock_req_hk_cmds
 from eive_tmtc.tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds
+from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_diag_command, make_sid
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper

@ -36,9 +40,13 @@ from tmtccmd.tc import DefaultPusQueueHelper
 LOGGER = get_console_logger()


+class SetId(enum.IntEnum):
+    SWITCHER_SET = 0
+
+
 def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
    pdu1_switch_cmds(q, op_code)
-    pdu2_cmds(q, op_code)
+    pdu2_switch_cmds(q, op_code)
    if op_code in PowerOpCodes.INFO_CORE:
        pdu1_req_hk_cmds(q, PowerOpCodes.REQUEST_CORE_HK_ONCE[0])
        pdu2_req_hk_cmds(q, PowerOpCodes.REQUEST_CORE_HK_ONCE[0])
@ -68,6 +76,13 @@ def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
        pack_reset_gnd_wdt_cmd(q, "PDU1", oids[PDU_1_HANDLER_ID])
        pack_reset_gnd_wdt_cmd(q, "PDU2", oids[PDU_2_HANDLER_ID])
        q.add_wait_seconds(5.0)
+    elif op_code in PowerOpCodes.REQUEST_SWITCHER_SET:
+        q.add_log_cmd("PCDU: Requesting Switcher Set")
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                make_sid(PCDU_HANDLER_ID, SetId.SWITCHER_SET)
+            )
+        )
    if q.empty():
        LOGGER.info(f"Queue is empty, no stack for op code {op_code}")

@ -94,6 +109,7 @@ def add_power_cmd_defs(defs: TmtcDefinitionWrapper):
    oce.add(keys=PowerOpCodes.INFO_ALL, info=PowerInfo.INFO_ALL)
    oce.add(keys=PowerOpCodes.INFO_CORE, info=PowerInfo.INFO_CORE)
    oce.add(keys=PowerOpCodes.INFO_AUX, info=PowerInfo.INFO_AUX)
+    oce.add(keys=PowerOpCodes.REQUEST_SWITCHER_SET, info=PowerInfo.REQUEST_SWITCHER_SET)
    oce.add(keys=PowerOpCodes.RESET_ALL_GND_WDTS, info=PowerInfo.RESET_ALL_GND_WDTS)
    defs.add_service(
        name=CustomServiceList.POWER.value,
--- a/eive_tmtc/tmtc/solar_array_deployment.py
+++ b/eive_tmtc/tmtc/solar_array_deployment.py
@ -7,15 +7,16 @@
 """
 import struct

-from config.definitions import CustomServiceList
-from config.object_ids import SOLAR_ARRAY_DEPLOYMENT_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import SOLAR_ARRAY_DEPLOYMENT_ID
+from spacepackets.ecss import PusTelecommand
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
-from tmtccmd.tc import service_provider
-from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
+from tmtccmd.tc import service_provider, DefaultPusQueueHelper
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd import get_console_logger

@ -24,10 +25,14 @@ LOGGER = get_console_logger()

 class OpCode:
    MANUAL_DEPLOYMENT = "man_depl"
+    BURN_SA_0_ONLY = "burn_sa_0"
+    BURN_SA_1_ONLY = "burn_sa_1"


 class Info:
    MANUAL_DEPLOYMENT = "Manual Solar Array Deployment"
+    BURN_SA_0_ONLY = "Only burn SA0"
+    BURN_SA_1_ONLY = "Only burn SA1"


 class ActionId:
@ -35,9 +40,11 @@ class ActionId:


@tmtc_definitions_provider
-def pack_sa_depl_cmds(defs: TmtcDefinitionWrapper):
+def add_sa_depl_cmds(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
    oce.add(keys=OpCode.MANUAL_DEPLOYMENT, info=Info.MANUAL_DEPLOYMENT)
+    oce.add(keys=OpCode.BURN_SA_0_ONLY, info=Info.BURN_SA_0_ONLY)
+    oce.add(keys=OpCode.BURN_SA_1_ONLY, info=Info.BURN_SA_1_ONLY)
    defs.add_service(
        name=CustomServiceList.SA_DEPLYOMENT,
        info="Solar Array Deployment",
@ -48,31 +55,102 @@ def pack_sa_depl_cmds(defs: TmtcDefinitionWrapper):
@service_provider(CustomServiceList.SA_DEPLYOMENT)
 def pack_solar_array_deployment_test_into(p: ServiceProviderParams):
    q = p.queue_helper
-    user_data = bytearray()
-    while True:
-        burn_time = int(input("Please specify burn time in seconds [0-120 secs]: "))
-        if burn_time < 0 or burn_time > 120:
-            LOGGER.warning(f"Invalid burn time {burn_time}")
-            continue
-        user_data.extend(struct.pack("!I", burn_time))
-        break
-    while True:
-        dry_run = input("Dry run? [y/n]: ")
-        if dry_run in ["yes", "y", "1"]:
-            dry_run = 1
-        elif dry_run in ["no", "n", "0"]:
-            dry_run = 0
+    op_code = p.op_code
+    switch_interval_ms = 0
+    if op_code == OpCode.MANUAL_DEPLOYMENT:
+        while True:
+            burn_time_secs = prompt_burn_time()
+            if burn_time_secs < 0:
+                continue
+            # Default configuration: Burn each side for half of the burn time.
+            switch_interval_ms = int(round(burn_time_secs * 0.5 * 1000))
+            break
+        while True:
+            dry_run = prompt_dry_run()
+            if dry_run < 0:
+                continue
+            dry_run = bool(dry_run)
+            break
+        if dry_run:
+            dry_run_str = " as dry run"
        else:
-            LOGGER.warning("Invalid input for dry run parameter")
+            dry_run_str = ""
+        q.add_log_cmd(
+            f"Testing S/A Deployment with burn time {burn_time_secs}{dry_run_str}"
+        )
+        q.add_pus_tc(
+            pack_manual_array_depl_cmd(burn_time_secs, switch_interval_ms, dry_run)
+        )
+    elif op_code in OpCode.BURN_SA_0_ONLY:
+        burn_one_channel_only(q, 0)
+    elif op_code in OpCode.BURN_SA_1_ONLY:
+        burn_one_channel_only(q, 1)
+
+
+def prompt_burn_time() -> int:
+    burn_time = int(input("Please specify burn time in seconds [0-120 secs]: "))
+    if burn_time < 0 or burn_time > 120:
+        LOGGER.warning(f"Invalid burn time {burn_time}")
+        return -1
+    return burn_time
+
+
+def prompt_dry_run() -> int:
+    dry_run = input("Dry run? [y/n]: ")
+    if dry_run in ["yes", "y", "1"]:
+        return 1
+    elif dry_run in ["no", "n", "0"]:
+        return 0
+    else:
+        LOGGER.warning("Invalid input for dry run parameter")
+        return -1
+
+
+def burn_one_channel_only(q: DefaultPusQueueHelper, channel: int):
+    while True:
+        burn_time_secs = prompt_burn_time()
+        if burn_time_secs < 0:
            continue
-        user_data.append(dry_run)
        break
-    if dry_run == 1:
+    while True:
+        dry_run = prompt_dry_run()
+        if dry_run < 0:
+            continue
+        dry_run = bool(dry_run)
+        break
+    if dry_run:
        dry_run_str = " as dry run"
    else:
        dry_run_str = ""
-    q.add_log_cmd(f"Testing S/A Deployment with burn time {burn_time}{dry_run_str}")
-    command = make_fsfw_action_cmd(
+    q.add_log_cmd(
+        f"Testing S/A Deployment Channel {channel} only with "
+        f"burn time {burn_time_secs}{dry_run_str}"
+    )
+    q.add_pus_tc(pack_one_channel_only_cmd(burn_time_secs, channel, dry_run))
+
+
+def pack_one_channel_only_cmd(
+    burn_time_seconds: int, channel: int, dry_run: bool
+) -> PusTelecommand:
+    user_data = bytearray()
+    user_data.extend(struct.pack("!I", burn_time_seconds))
+    # Burn channel for the entire time
+    user_data.extend(struct.pack("!I", round(int((burn_time_seconds + 1) * 1000))))
+    user_data.append(channel)
+    user_data.append(dry_run)
+    return create_action_cmd(
+        SOLAR_ARRAY_DEPLOYMENT_ID, ActionId.MANUAL_DEPLOYMENT, user_data
+    )
+
+
+def pack_manual_array_depl_cmd(
+    burn_time_seconds: int, channel_switch_interval_ms: int, dry_run: bool
+) -> PusTelecommand:
+    user_data = bytearray()
+    user_data.extend(struct.pack("!I", burn_time_seconds))
+    user_data.extend(struct.pack("!I", channel_switch_interval_ms))
+    user_data.append(0)
+    user_data.append(dry_run)
+    return create_action_cmd(
        SOLAR_ARRAY_DEPLOYMENT_ID, ActionId.MANUAL_DEPLOYMENT, user_data
    )
-    q.add_pus_tc(command)
--- a/eive_tmtc/tmtc/tcs.py
+++ b/eive_tmtc/tmtc/tcs.py
@ -0,0 +1,235 @@
+import enum
+import pprint
+import struct
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+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 Mode
+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,
+    TCS_SUBSYSTEM_ID,
+)
+from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+
+
+class OpCodeAssy:
+    TCS_BOARD_ASS_NORMAL = ["nml"]
+    TCS_BOARD_ASS_OFF = ["off"]
+
+
+class OpCodeSys:
+    OFF = ["off"]
+    NML = ["nml"]
+    REQUEST_PRIMARY_TEMP_SET = ["temp"]
+    REQUEST_DEVICE_TEMP_SET = ["temp_devs"]
+    REQUEST_DEVICE_SUS_SET = ["temp_sus"]
+
+
+class InfoSys:
+    OFF = "Switch TCS subsystem OFF"
+    NML = "Switch TCS subsystem NORMAL (nominal)"
+    REQUEST_PRIMARY_TEMP_SET = "Request HK set of primary sensor temperatures"
+    REQUEST_DEVICE_TEMP_SET = "Request HK set of device sensor temperatures"
+    REQUEST_DEVICE_SUS_SET = "Request HK set of the SUS temperatures"
+
+
+class InfoAssy:
+    TCS_BOARD_ASS_NORMAL = "Switching TCS board assembly on"
+    TCS_BOARD_ASS_OFF = "Switching TCS board assembly off"
+
+
+class SetId(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=OpCodeAssy.TCS_BOARD_ASS_NORMAL,
+        info=InfoAssy.TCS_BOARD_ASS_NORMAL,
+    )
+    oce.add(
+        keys=OpCodeAssy.TCS_BOARD_ASS_OFF,
+        info=InfoAssy.TCS_BOARD_ASS_OFF,
+    )
+    defs.add_service(
+        name=CustomServiceList.TCS_ASS.value,
+        info="TCS Board Assembly",
+        op_code_entry=oce,
+    )
+    oce = OpCodeEntry()
+    oce.add(keys=OpCodeSys.OFF, info=InfoSys.OFF)
+    oce.add(keys=OpCodeSys.NML, info=InfoSys.NML)
+    oce.add(
+        keys=OpCodeSys.REQUEST_PRIMARY_TEMP_SET, info=InfoSys.REQUEST_PRIMARY_TEMP_SET
+    )
+    oce.add(
+        keys=OpCodeSys.REQUEST_DEVICE_TEMP_SET, info=InfoSys.REQUEST_DEVICE_TEMP_SET
+    )
+    oce.add(keys=OpCodeSys.REQUEST_DEVICE_SUS_SET, info=InfoSys.REQUEST_DEVICE_SUS_SET)
+    defs.add_service(
+        name=CustomServiceList.TCS,
+        info="TCS Board",
+        op_code_entry=oce,
+    )
+
+
+def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
+    if op_code in OpCodeSys.REQUEST_PRIMARY_TEMP_SET:
+        sensor_set_sid = make_sid(TCS_CONTROLLER, SetId.PRIMARY_SENSORS)
+        q.add_log_cmd(InfoSys.REQUEST_PRIMARY_TEMP_SET)
+        q.add_pus_tc(generate_one_hk_command(sensor_set_sid))
+    if op_code in OpCodeSys.REQUEST_DEVICE_TEMP_SET:
+        q.add_log_cmd(InfoSys.REQUEST_DEVICE_TEMP_SET)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(TCS_CONTROLLER, SetId.DEVICE_SENSORS))
+        )
+    if op_code in OpCodeSys.REQUEST_DEVICE_SUS_SET:
+        q.add_log_cmd(InfoSys.REQUEST_DEVICE_SUS_SET)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(TCS_CONTROLLER, SetId.SUS_TEMP_SENSORS))
+        )
+    if op_code in OpCodeSys.OFF:
+        q.add_log_cmd(InfoSys.OFF)
+        pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.OFF, 0, q, InfoSys.OFF)
+    if op_code in OpCodeSys.NML:
+        q.add_log_cmd(InfoSys.NML)
+        pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.NORMAL, 0, q, InfoSys.OFF)
+    pack_tcs_ass_cmds(q, op_code)
+
+
+def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
+    if op_code in OpCodeAssy.TCS_BOARD_ASS_NORMAL:
+        pack_mode_cmd_with_info(
+            object_id=TCS_BOARD_ASS_ID,
+            mode=Mode.NORMAL,
+            submode=0,
+            q=q,
+            info=InfoAssy.TCS_BOARD_ASS_NORMAL,
+        )
+    if op_code in OpCodeAssy.TCS_BOARD_ASS_OFF:
+        pack_mode_cmd_with_info(
+            object_id=TCS_BOARD_ASS_ID,
+            mode=Mode.OFF,
+            submode=0,
+            q=q,
+            info=InfoAssy.TCS_BOARD_ASS_OFF,
+        )
+
+
+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 == SetId.PRIMARY_SENSORS:
+        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)
+    elif set_id == SetId.DEVICE_SENSORS:
+        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)
+    elif set_id == SetId.SUS_TEMP_SENSORS:
+        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],
+        }
+        printer.file_logger.info(str(parsed_data))
+        pp = pprint.PrettyPrinter(depth=4)
+        pp.pprint(parsed_data)
--- a/eive_tmtc/tmtc/test.py
+++ b/eive_tmtc/tmtc/test.py
@ -1,11 +1,11 @@
-from spacepackets.ecss import PusTelecommand, PusServices
+from spacepackets.ecss import PusTelecommand, PusService
 from tmtccmd.config import CoreServiceList
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
-from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
+from tmtccmd.pus.s17_test import create_service_17_ping_command
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams

@ -42,10 +42,10 @@ def pack_test_command(p: ServiceProviderParams):
    q = p.queue_helper
    if info.op_code == OpCodes.PING:
        q.add_log_cmd("Sending PUS TC [17,1]")
-        q.add_pus_tc(pack_service_17_ping_command())
+        q.add_pus_tc(create_service_17_ping_command())
    if info.op_code == OpCodes.TRIGGER_EVENT:
        q.add_log_cmd("Sending PUS TC Event Trigger [17, 128]")
-        q.add_pus_tc(PusTelecommand(service=PusServices.S17_TEST, subservice=128))
+        q.add_pus_tc(PusTelecommand(service=PusService.S17_TEST, subservice=128))
    if info.op_code == OpCodes.PING_WITH_DATA:
        q.add_log_cmd("Sending Ping With Data, Size Reported Back [17, 129]")
        while True:
@ -60,6 +60,6 @@ def pack_test_command(p: ServiceProviderParams):
            next_byte = not next_byte
        q.add_pus_tc(
            PusTelecommand(
-                service=PusServices.S17_TEST, subservice=130, app_data=dummy_data
+                service=PusService.S17_TEST, subservice=130, app_data=dummy_data
            )
        )
--- a/setup.cfg
+++ b/setup.cfg
@ -5,7 +5,7 @@ version = attr: eive_tmtc.__version__
 long_description = file: README.md
 long_description_content_type = text/markdown
 license = Apache-2.0
-author = Robin Mueller
+author = Robin Mueller, Jakob Meier
 author_email = muellerr@irs.uni-stuttgart.de
 platform = any

@ -27,7 +27,8 @@ classifiers =

 [options]
 install_requires =
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a1
+	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a2
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@c978286a856a2f3a59efc96887dd15c2c17bac6e#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True
Author	SHA1	Message	Date
Robin Mueller	8b6039e15d	bump changelog	2023-01-26 20:36:10 +01:00
Robin Müller	e4963fb712	Merge pull request 'fixed mgm proc output' (#128 ) from mgm-proc-fix into main Reviewed-on: #128	2023-01-26 20:35:26 +01:00
Robin Müller	feacfeaf65	Merge branch 'main' into mgm-proc-fix	2023-01-26 20:35:04 +01:00
Robin Mueller	47480a7959	bump minor version	2023-01-26 20:34:37 +01:00
Robin Mueller	67c6b86baf	update retvals	2023-01-26 19:43:08 +01:00
Robin Mueller	df1bbe9ded	pack syrlinks command correctly	2023-01-26 17:00:50 +01:00
Robin Mueller	39dfac2520	added new events	2023-01-26 16:44:01 +01:00
Robin Mueller	b8a8f4b5a3	event update	2023-01-26 16:21:11 +01:00
Robin Mueller	733fc19d78	update retvals	2023-01-26 16:18:58 +01:00
Robin Mueller	83f10ed253	add command to configure default data rate	2023-01-26 16:16:09 +01:00
Robin Mueller	c4329558c9	better op codes	2023-01-26 15:50:19 +01:00
Robin Mueller	72c577e991	update of tmtccmd	2023-01-26 15:47:39 +01:00
Robin Mueller	0fe6cec54c	update submodes	2023-01-26 15:45:25 +01:00
Robin Mueller	2ac182e753	add commands to update default data rate	2023-01-26 14:34:21 +01:00
Robin Mueller	ffdc6a68bb	bump tmtccmd dependency	2023-01-26 14:29:56 +01:00
Robin Mueller	99d5ed014b	add new submode for default data rate	2023-01-26 14:00:03 +01:00
Robin Mueller	05f22ae4ce	small tweak	2023-01-26 13:45:59 +01:00
Robin Mueller	69e2b82c8e	bump changelog	2023-01-26 13:44:58 +01:00
Robin Mueller	8a5e779e23	update syrlinks commands	2023-01-26 13:43:57 +01:00
Robin Mueller	c36c7ca5bb	move CCSDS handler definitions	2023-01-26 11:31:26 +01:00
Robin Mueller	8a7880bc35	add new CCSDS handler mode commands	2023-01-25 14:51:32 +01:00
Robin Mueller	cac68dba7f	bump changelog	2023-01-25 14:15:55 +01:00
Robin Mueller	4323b0659d	move startracker module into acs folder	2023-01-25 14:15:25 +01:00
Robin Mueller	55cecdf81c	move some modules	2023-01-25 14:14:22 +01:00
Marius Eggert	82c6b60af2	this should be better	2023-01-25 13:45:11 +01:00
Marius Eggert	35a485d79e	fixed mgm proc output	2023-01-25 13:43:08 +01:00
Robin Mueller	49ccb4be8d	add enable/disable for TX regs as well	2023-01-24 19:07:11 +01:00
Robin Mueller	8341ccc99d	better names	2023-01-24 17:49:59 +01:00
Robin Mueller	5998aa12a4	bump changelog	2023-01-24 13:06:36 +01:00
Robin Mueller	5a05eb4825	added command to request switcher set	2023-01-24 13:06:08 +01:00
Robin Mueller	f8299b91cd	import replacements	2023-01-24 12:41:50 +01:00
Robin Mueller	45253bc9b8	update changelog	2023-01-24 12:39:23 +01:00
Robin Mueller	7537388f6e	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-24 12:38:50 +01:00
Robin Mueller	fe19284a8e	move str file and add some set IDs	2023-01-24 12:38:32 +01:00
Robin Mueller	49f27c9923	forgot bumping version again	2023-01-23 17:43:22 +01:00
Robin Mueller	0010ac581a	always forggetting it..	2023-01-23 17:42:50 +01:00
Robin Mueller	0a7feff169	bump changelog	2023-01-23 17:40:27 +01:00
Robin Mueller	9b30d290a7	pin tmtccmd on v4.0.0a2	2023-01-23 17:38:14 +01:00
Robin Mueller	d23201466c	syrlinks cmd updates	2023-01-23 15:35:24 +01:00
Robin Mueller	8bcee7c094	add enable/disable HK syrlinks	2023-01-23 15:04:06 +01:00
Robin Mueller	033c8927c0	update generated files	2023-01-23 11:30:45 +01:00
Robin Mueller	220cb5e9f4	small tweak for TCS system info	2023-01-23 11:25:29 +01:00
Robin Mueller	7387ae3583	bump tmtccmd	2023-01-20 16:28:44 +01:00
Robin Mueller	2f33a43937	changelog	2023-01-20 14:22:54 +01:00
Robin Müller	a2cd9245a2	Merge pull request 'Update SA DEPL commands' (#127 ) from update_sa_depl_cmds into main Reviewed-on: #127	2023-01-20 14:21:59 +01:00
Robin Mueller	5a0feff284	add missing cmds	2023-01-20 13:55:13 +01:00
Robin Mueller	912728474a	that should do the job	2023-01-20 12:19:57 +01:00
Robin Müller	2b5ad32fdd	Merge pull request 'fixes fixes fixes' (#126 ) from acs-ctrl-fixes into main Reviewed-on: #126 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-01-20 11:28:31 +01:00
Robin Mueller	b3b98eb2d2	add TCS subsystem commands	2023-01-20 11:28:07 +01:00
Robin Müller	7d068d85c8	Merge branch 'main' into acs-ctrl-fixes	2023-01-20 10:52:48 +01:00
Robin Müller	d6c35262bf	Merge pull request 'Add SUS temps handling' (#124 ) from mueller_add_sus_temps into main Reviewed-on: #124	2023-01-20 10:51:40 +01:00
Robin Müller	1317441c03	Merge branch 'main' into mueller_add_sus_temps	2023-01-20 10:51:30 +01:00
Robin Müller	cd8fdc4865	Merge branch 'main' into acs-ctrl-fixes	2023-01-20 10:51:22 +01:00
Robin Mueller	3a60fd2d6d	black	2023-01-20 10:35:30 +01:00
Marius Eggert	d77ccbf8e9	fixes fixes fixes - improved cmd OpCodes naming - removed normal mode without submode which gets rejected anyways - added normal mode with submodes - fixed bugs in sus hk handling	2023-01-20 09:44:51 +01:00
Robin Müller	f3c0b7567a	Merge pull request 'rtd command to rewrite config' (#125 ) from meier/rtd into main Reviewed-on: #125 Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>	2023-01-19 16:49:22 +01:00
Robin Müller	485f0015d7	Merge branch 'main' into meier/rtd	2023-01-19 16:49:08 +01:00
Robin Mueller	a3eb34a73d	some ACS sets are diagnostic now	2023-01-19 16:41:49 +01:00
Robin Mueller	dfa5cad8a6	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-19 16:28:30 +01:00
Robin Mueller	1cab6dc065	bump used tmtccmd version	2023-01-19 16:28:22 +01:00
Robin Mueller	a5337b5293	replace deprecated API	2023-01-19 13:29:01 +01:00
Jakob Meier	887312371b	rtd command to rewrite config	2023-01-19 13:21:12 +01:00
Robin Mueller	c2f43c90fb	hmm this command disappeared	2023-01-19 13:11:28 +01:00
Robin Mueller	b9b1769bc5	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-19 09:19:27 +01:00
Robin Mueller	118b439272	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-18 16:51:31 +01:00
Robin Mueller	612383ade1	bump installed tmtccmd again	2023-01-18 16:50:56 +01:00
Robin Mueller	2e40e31c15	bump changelog	2023-01-18 16:31:47 +01:00
Robin Mueller	aba0dd8ebb	add SUS temp handling	2023-01-18 16:30:11 +01:00
Robin Mueller	c9790911ef	make syrlinks hk a bit more readable	2023-01-18 15:52:35 +01:00
Robin Mueller	8001156a02	move and improve syrlinks module	2023-01-18 15:43:02 +01:00
Robin Mueller	db0cbf620e	bugfix for syrlinks HK code	2023-01-18 15:36:09 +01:00
Robin Mueller	43e6f0cefa	re-run generators	2023-01-18 14:03:05 +01:00
Robin Mueller	0c67ce5b08	bump release	2023-01-18 11:50:40 +01:00
Robin Mueller	9cccefc938	another small bump for tmtccmd	2023-01-18 11:48:51 +01:00
Robin Mueller	404082c38d	this version uses a concrete spacepackets version	2023-01-18 11:38:15 +01:00
Robin Mueller	5021a88112	update setup.cfg again	2023-01-18 11:35:07 +01:00
Robin Mueller	15fbfd0f95	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-18 11:32:21 +01:00
Robin Mueller	4a02e284b3	changes for updated tmtccmd	2023-01-18 11:12:07 +01:00
Robin Mueller	bd9c134729	bump tmtccmd	2023-01-17 19:08:00 +01:00
Robin Mueller	44f15eced7	bump tmtccmd	2023-01-17 18:37:16 +01:00
Robin Mueller	ff72c02508	annoying	2023-01-17 18:32:53 +01:00
Robin Mueller	f14bb81c9b	and yet another bump	2023-01-17 11:16:16 +01:00
Robin Mueller	136aaecb77	should be the last of renamings	2023-01-17 11:10:52 +01:00
Robin Mueller	32db4fabdc	bump tmtccmd again	2023-01-17 10:48:57 +01:00
Robin Mueller	484deb0f97	bump tmtccmd again	2023-01-17 10:44:26 +01:00
Robin Mueller	ead4c91769	bump tmtccmd again	2023-01-16 17:45:46 +01:00
Robin Mueller	e5e19a8c04	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-16 17:11:29 +01:00
Robin Mueller	92ef500f42	restructure TCS module a bit	2023-01-16 17:11:20 +01:00
Robin Mueller	43ca7de786	bump setup.cfg again	2023-01-16 15:37:32 +01:00
Robin Mueller	4839ab4365	update tmtccmd dependency	2023-01-16 15:05:33 +01:00
Robin Mueller	7bc49f1ff7	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-16 14:53:46 +01:00
Robin Mueller	74a439955f	use specific commit	2023-01-16 14:53:38 +01:00
Robin Mueller	aff3ced2c2	start adding acs ctrl modes	2023-01-16 14:48:12 +01:00
Robin Mueller	e1cd0e9b5c	update author field	2023-01-16 14:22:25 +01:00