prepare v2.8.0

all import changes
move some modules
2023-02-01 18:50:51 +01:00 · 2023-02-01 16:25:17 +01:00 · 2023-02-01 15:58:34 +01:00 · 2023-02-01 11:17:38 +01:00 · 2023-02-01 11:17:04 +01:00 · 2023-01-31 21:21:08 +01:00
69 changed files with 1117 additions and 973 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,6 +10,32 @@ list yields a list of all related PRs for each release.
 # [unreleased]
 # [v2.8.0] 2023-01-01
 - Move all device modules inside `pus_tc` and `pus_tm` to `tmtc` module and respective
  subsystem submodules.
 - Move low level ACS board device modules `gyros.py` and `mgms.py`
  to the `tmtc.acs` module.
 - Bump tmtccmd to include more pythonic log usage. All related changes.
  It is recommended to use `logging.getLogger(__name__)` for module level loggers now.
 - Moved TCS components to `tmtc` module
 - Renamed `HEATER_ID` to `HEATER_CONTROLLER_ID`
 # [v2.7.0] 2023-01-31
 - tmtccmd v4.0.0a3
 # [v2.6.0 and v2.6.1] 2023-01-28
 ## Changed
 - Reworked and improved PUS 20 parameter reply handling
 ## Added
 - COM subsystem commanding. Default datarate parameter commanding
  was moved to the subsystem as well.
 # [v2.5.0] 2023-01-26
 ## Fixed
--- 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 = 5
+VERSION_MINOR = 8
 VERSION_REVISION = 0
-__version__ = "2.5.0"
+__version__ = "2.8.0"
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
--- a/eive_tmtc/config/definitions.py
+++ b/eive_tmtc/config/definitions.py
@ -17,8 +17,8 @@ CFDP_APID = 0x66
 PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID)
 CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID)
 SPACE_PACKET_IDS = (
-    PUS_PACKET_ID.raw(),
+    PUS_PACKET_ID,
-    CFDP_PACKET_ID.raw(),
+    CFDP_PACKET_ID,
 )
 CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)
@ -35,6 +35,7 @@ class CustomServiceList(str, enum.Enum):
    POWER = "power"
    ACU = "acu"
    ACS = "acs"
    COM_SS = "com"
    BPX_BATTERY = "bpx"
    TMP1075_1 = "tmp1075_1"
    TMP1075_2 = "tmp1075_2"
--- a/eive_tmtc/config/events.py
+++ b/eive_tmtc/config/events.py
@ -1,11 +1,10 @@
 import logging
 import os
 from eive_tmtc import EIVE_TMTC_ROOT
 from tmtccmd import get_console_logger
 from tmtccmd.fsfw import parse_fsfw_events_csv
 from tmtccmd.pus.s5_event import EventDictT
 LOGGER = get_console_logger()
 DEFAULT_EVENTS_CSV_PATH = EIVE_TMTC_ROOT / "config/events.csv"
 __EVENT_DICT = None
@ -16,6 +15,8 @@ def get_event_dict() -> EventDictT:
        if os.path.exists(DEFAULT_EVENTS_CSV_PATH):
            __EVENT_DICT = parse_fsfw_events_csv(DEFAULT_EVENTS_CSV_PATH)
        else:
-            LOGGER.warning(f"No Event CSV file found at {DEFAULT_EVENTS_CSV_PATH}")
+            logging.getLogger(__name__).warning(
                f"No Event CSV file found at {DEFAULT_EVENTS_CSV_PATH}"
            )
            __EVENT_DICT = dict()
    return __EVENT_DICT
--- a/eive_tmtc/config/hook.py
+++ b/eive_tmtc/config/hook.py
@ -1,8 +1,8 @@
 from typing import Optional
 from eive_tmtc.config.definitions import SPACE_PACKET_IDS
-from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend
+from tmtccmd import HookBase, CcsdsTmtcBackend
-from tmtccmd.com_if import ComInterface
+from tmtccmd.com import ComInterface
 from tmtccmd.config import TmtcDefinitionWrapper
 from eive_tmtc.config.retvals import get_retval_dict
@ -10,7 +10,7 @@ from eive_tmtc.pus_tc.cmd_definitions import get_eive_service_op_code_dict
 from tmtccmd.util import ObjectIdDictT, RetvalDictT
-class EiveHookObject(TmTcCfgHookBase):
+class EiveHookObject(HookBase):
    def __init__(self, json_cfg_path: str):
        super().__init__(json_cfg_path=json_cfg_path)
@ -18,7 +18,7 @@ class EiveHookObject(TmTcCfgHookBase):
        return get_eive_service_op_code_dict()
    def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]:
-        from tmtccmd.config.com_if import (
+        from tmtccmd.config.com import (
            create_com_interface_default,
            create_com_interface_cfg_default,
        )
--- a/eive_tmtc/config/object_ids.py
+++ b/eive_tmtc/config/object_ids.py
@ -3,15 +3,14 @@
@details    Template configuration file. Copy this folder to the TMTC commander root and adapt
            it to your needs.
 """
 import logging
 import os.path
 from eive_tmtc import EIVE_TMTC_ROOT
 from tmtccmd.util.obj_id import ObjectIdDictT
 from tmtccmd.fsfw import parse_fsfw_objects_csv
 from tmtccmd.logging import get_console_logger
 LOGGER = get_console_logger()
 DEFAULT_OBJECTS_CSV_PATH = EIVE_TMTC_ROOT / "config/objects.csv"
 __OBJECT_ID_DICT = None
@ -30,7 +29,7 @@ SCEX_HANDLER_ID = bytes([0x44, 0x33, 0x00, 0x32])
 # Thermal Object IDs
 THERMAL_CONTROLLER_ID = bytes([0x43, 0x40, 0x00, 0x01])
-HEATER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
+HEATER_CONTROLLER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
 TMP_1075_1_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x04])
 TMP_1075_2_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x05])
@ -127,6 +126,8 @@ SUS_11_R_LOC_XBYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x43])
 ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
 PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
 TCS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x03])
 COM_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x04])
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
 SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
 TCS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x03])
@ -141,7 +142,9 @@ CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
 def get_object_ids() -> ObjectIdDictT:
    global __OBJECT_ID_DICT
    if not os.path.exists(DEFAULT_OBJECTS_CSV_PATH):
-        LOGGER.warning(f"No Objects CSV file found at {DEFAULT_OBJECTS_CSV_PATH}")
+        logging.getLogger(__name__).warning(
            f"No Objects CSV file found at {DEFAULT_OBJECTS_CSV_PATH}"
        )
    if __OBJECT_ID_DICT is None:
        if os.path.exists(DEFAULT_OBJECTS_CSV_PATH):
            __OBJECT_ID_DICT = parse_fsfw_objects_csv(csv_file=DEFAULT_OBJECTS_CSV_PATH)
--- a/eive_tmtc/config/objects.csv
+++ b/eive_tmtc/config/objects.csv
@ -72,7 +72,7 @@
 0x44420029;RTD_13_IC16_PLPCDU_HEATSPREADER
 0x44420030;RTD_14_IC17_TCS_BOARD
 0x44420031;RTD_15_IC18_IMTQ
-0x445300A3;SYRLINKS_HK_HANDLER
+0x445300A3;SYRLINKS_HANDLER
 0x49000000;ARDUINO_COM_IF
 0x49010005;GPIO_IF
 0x49010006;SCEX_UART_READER
@ -147,5 +147,6 @@
 0x73010001;ACS_SUBSYSTEM
 0x73010002;PL_SUBSYSTEM
 0x73010003;TCS_SUBSYSTEM
 0x73010004;COM_SUBSYSTEM
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT
--- a/eive_tmtc/config/returnvalues.csv
+++ b/eive_tmtc/config/returnvalues.csv
@ -1,23 +1,13 @@
 Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
+0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
-0x6300;NVMB_Busy;;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.h
+0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
+0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
+0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a0;SADPL_CommandNotSupported;;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d03;GOMS_InvalidParamSize;;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a1;SADPL_DeploymentAlreadyExecuting;;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d04;GOMS_InvalidPayloadSize;;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
-0x66a2;SADPL_MainSwitchTimeoutFailure;;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x5d05;GOMS_UnknownReplyId;;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x66a3;SADPL_SwitchingDeplSa1Failed;;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x66a4;SADPL_SwitchingDeplSa2Failed;;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
 0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x52b0;RWHA_SpiWriteFailure;;176;RW_HANDLER;mission/devices/RwHandler.h
 0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/RwHandler.h
 0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/RwHandler.h
@ -30,6 +20,21 @@ 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
 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
 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
@ -39,120 +44,134 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
+0x66a0;SADPL_CommandNotSupported;;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x66a1;SADPL_DeploymentAlreadyExecuting;;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x66a2;SADPL_MainSwitchTimeoutFailure;;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x5d03;GOMS_InvalidParamSize;;3;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x66a3;SADPL_SwitchingDeplSa1Failed;;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x5d04;GOMS_InvalidPayloadSize;;4;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x66a4;SADPL_SwitchingDeplSa2Failed;;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
-0x5d05;GOMS_UnknownReplyId;;5;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
+0x6600;SADPL_Busy;;0;SA_DEPL_HANDLER;mission/system/objects/Stack5VHandler.h
-0x4fa1;HEATER_CommandNotSupported;;161;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x6601;SADPL_KalmanNoGyrMeas;;1;SA_DEPL_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x4fa2;HEATER_InitFailed;;162;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x6602;SADPL_KalmanNoModel;;2;SA_DEPL_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x4fa3;HEATER_InvalidSwitchNr;;163;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x6603;SADPL_KalmanInversionFailed;;3;SA_DEPL_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
-0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
+0x2c01;CCS_BcIsSetVrCommand;;1;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
+0x2c02;CCS_BcIsUnlockCommand;;2;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x6001;CCSDS_KalmanNoGyrMeas;;1;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x2cb0;CCS_BcIllegalCommand;;176;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x6002;CCSDS_KalmanNoModel;;2;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x2cb1;CCS_BoardReadingNotFinished;;177;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x6003;CCSDS_KalmanInversionFailed;;3;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x2cf0;CCS_NsPositiveW;;240;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4500;HSPI_OpeningFileFailed;;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x2cf1;CCS_NsNegativeW;;241;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4501;HSPI_FullDuplexTransferFailed;;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x2cf2;CCS_NsLockout;;242;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4502;HSPI_HalfDuplexTransferFailed;;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
+0x2cf3;CCS_FarmInLockout;;243;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2cf4;CCS_FarmInWait;;244;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce0;CCS_WrongSymbol;;224;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce1;CCS_DoubleStart;;225;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4804;HGIO_GpioInvalidInstance;;4;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce2;CCS_StartSymbolMissed;;226;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce3;CCS_EndWithoutStart;;227;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce4;CCS_TooLarge;;228;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
+0x2ce5;CCS_TooShort;;229;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x2ce6;CCS_WrongTfVersion;;230;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x2ce7;CCS_WrongSpacecraftId;;231;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x2ce8;CCS_NoValidFrameType;;232;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ce9;CCS_CrcFailed;;233;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.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
+0x2cea;CCS_VcNotFound;;234;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ceb;CCS_ForwardingFailed;;235;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2cec;CCS_ContentTooLarge;;236;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2ced;CCS_ResidualData;;237;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x4406;UXOS_PcloseCallError;;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
+0x2cee;CCS_DataCorrupted;;238;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2801;SM_DataTooLarge;;1;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cef;CCS_IllegalSegmentationFlag;;239;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2802;SM_DataStorageFull;;2;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cd0;CCS_IllegalFlagCombination;;208;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2803;SM_IllegalStorageId;;3;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cd1;CCS_ShorterThanHeader;;209;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2804;SM_DataDoesNotExist;;4;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cd2;CCS_TooShortBlockedPacket;;210;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2805;SM_IllegalAddress;;5;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x2cd3;CCS_TooShortMapExtraction;;211;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
-0x2806;SM_PoolTooLarge;;6;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
+0x3b00;SPH_ConnBroken;;0;SEMAPHORE_IF;fsfw/src/fsfw/osal/common/TcpTmTcServer.h
-0x0601;PP_DoItMyself;;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a01;IEC_NoConfigurationTable;;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0602;PP_PointsToVariable;;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a02;IEC_NoCpuTable;;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0603;PP_PointsToMemory;;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a03;IEC_InvalidWorkspaceAddress;;3;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0604;PP_ActivityCompleted;;4;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a04;IEC_TooLittleWorkspace;;4;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0605;PP_PointsToVectorUint8;;5;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a05;IEC_WorkspaceAllocation;;5;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0606;PP_PointsToVectorUint16;;6;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a06;IEC_InterruptStackTooSmall;;6;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0607;PP_PointsToVectorUint32;;7;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a07;IEC_ThreadExitted;;7;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x0608;PP_PointsToVectorFloat;;8;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a08;IEC_InconsistentMpInformation;;8;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06a0;PP_DumpNotSupported;;160;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a09;IEC_InvalidNode;;9;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e0;PP_InvalidSize;;224;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a0a;IEC_NoMpci;;10;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e1;PP_InvalidAddress;;225;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a0b;IEC_BadPacket;;11;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e2;PP_InvalidContent;;226;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a0c;IEC_OutOfPackets;;12;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e3;PP_UnalignedAccess;;227;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a0d;IEC_OutOfGlobalObjects;;13;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x06e4;PP_WriteProtected;;228;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
+0x2a0e;IEC_OutOfProxies;;14;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x13e0;MH_UnknownCmd;;224;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x2a0f;IEC_InvalidGlobalId;;15;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x13e1;MH_InvalidAddress;;225;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x2a10;IEC_BadStackHook;;16;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x13e2;MH_InvalidSize;;226;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x2a11;IEC_BadAttributes;;17;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x13e3;MH_StateMismatch;;227;MEMORY_HELPER;fsfw/src/fsfw/memory/MemoryHelper.h
+0x2a12;IEC_ImplementationKeyCreateInconsistency;;18;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x38a1;SGP4_InvalidEccentricity;;161;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x2a13;IEC_ImplementationBlockingOperationCancel;;19;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x38a2;SGP4_InvalidMeanMotion;;162;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x2a14;IEC_MutexObtainFromBadState;;20;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
-0x38a3;SGP4_InvalidPerturbationElements;;163;SGP4PROPAGATOR_CLASS;fsfw/src/fsfw/coordinates/Sgp4Propagator.h
+0x2a15;IEC_UnlimitedAndMaximumIs0;;21;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.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
 0x3904;MUX_WrongAttributeSetting;;4;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3905;MUX_MutexAlreadyLocked;;5;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3906;MUX_MutexNotFound;;6;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3907;MUX_MutexMaxLocks;;7;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3908;MUX_CurrThreadAlreadyOwnsMutex;;8;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3909;MUX_CurrThreadDoesNotOwnMutex;;9;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 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
 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
+0x2e01;HPA_InvalidIdentifierId;;1;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0c03;MS_TooManyElements;;3;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x2e02;HPA_InvalidDomainId;;2;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0c04;MS_CantStoreEmpty;;4;MODE_STORE_IF;fsfw/src/fsfw/subsystem/modes/ModeStoreIF.h
+0x2e03;HPA_InvalidValue;;3;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0b01;SB_ChildNotFound;;1;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2e05;HPA_ReadOnly;;5;HAS_PARAMETERS_IF;fsfw/src/fsfw/parameters/HasParametersIF.h
-0x0b02;SB_ChildInfoUpdated;;2;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d01;PAW_UnknownDatatype;;1;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0b03;SB_ChildDoesntHaveModes;;3;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d02;PAW_DatatypeMissmatch;;2;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0b04;SB_CouldNotInsertChild;;4;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d03;PAW_Readonly;;3;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0b05;SB_TableContainsInvalidObjectId;;5;SUBSYSTEM_BASE;fsfw/src/fsfw/subsystem/SubsystemBase.h
+0x2d04;PAW_TooBig;;4;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d01;SS_SequenceAlreadyExists;;1;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d05;PAW_SourceNotSet;;5;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d02;SS_TableAlreadyExists;;2;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d06;PAW_OutOfBounds;;6;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d03;SS_TableDoesNotExist;;3;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d07;PAW_NotSet;;7;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d04;SS_TableOrSequenceLengthInvalid;;4;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x2d08;PAW_ColumnOrRowsZero;;8;PARAMETER_WRAPPER;fsfw/src/fsfw/parameters/ParameterWrapper.h
-0x0d05;SS_SequenceDoesNotExist;;5;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3201;CF_ObjectHasNoFunctions;;1;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
-0x0d06;SS_TableContainsInvalidObjectId;;6;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3202;CF_AlreadyCommanding;;2;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
-0x0d07;SS_FallbackSequenceDoesNotExist;;7;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3301;HF_IsBusy;;1;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d08;SS_NoTargetTable;;8;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3302;HF_InvalidParameters;;2;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d09;SS_SequenceOrTableTooLong;;9;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3303;HF_ExecutionFinished;;3;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d0b;SS_IsFallbackSequence;;11;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x3304;HF_InvalidActionId;;4;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
-0x0d0c;SS_AccessDenied;;12;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0201;OM_InsertionFailed;;1;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0d0e;SS_TableInUse;;14;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0202;OM_NotFound;;2;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0da1;SS_TargetTableNotReached;;161;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0203;OM_ChildInitFailed;;3;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x0da2;SS_TableCheckFailed;;162;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
+0x0204;OM_InternalErrReporterUninit;;4;OBJECT_MANAGER_IF;fsfw/src/fsfw/objectmanager/ObjectManagerIF.h
-0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.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
 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
 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
 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
@ -193,9 +212,95 @@ 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
+0x2801;SM_DataTooLarge;;1;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-0x1402;SE_StreamTooShort;;2;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
+0x2802;SM_DataStorageFull;;2;STORAGE_MANAGER_IF;fsfw/src/fsfw/storagemanager/StorageManagerIF.h
-0x1403;SE_TooManyElements;;3;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.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
 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
 0x2401;MT_NoPacketFound;;1;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/DleParser.h
 0x2402;MT_PossiblePacketLoss;;2;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/DleParser.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_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
 0x0f01;CM_UnknownCommand;;1;COMMAND_MESSAGE;fsfw/src/fsfw/ipc/CommandMessageIF.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
 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
 0x3904;MUX_WrongAttributeSetting;;4;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3905;MUX_MutexAlreadyLocked;;5;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3906;MUX_MutexNotFound;;6;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3907;MUX_MutexMaxLocks;;7;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3908;MUX_CurrThreadAlreadyOwnsMutex;;8;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 0x3909;MUX_CurrThreadDoesNotOwnMutex;;9;MUTEX_IF;fsfw/src/fsfw/ipc/MutexIF.h
 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
 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
 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
 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
 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
 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
 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
 0x0d04;SS_TableOrSequenceLengthInvalid;;4;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d05;SS_SequenceDoesNotExist;;5;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d06;SS_TableContainsInvalidObjectId;;6;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d07;SS_FallbackSequenceDoesNotExist;;7;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d08;SS_NoTargetTable;;8;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d09;SS_SequenceOrTableTooLong;;9;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d0b;SS_IsFallbackSequence;;11;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 0x0d0c;SS_AccessDenied;;12;SUBSYSTEM;fsfw/src/fsfw/subsystem/Subsystem.h
 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
 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
 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
 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
@ -204,20 +309,35 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
+0x1000;TIM_UnsupportedTimeFormat;;0;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1c02;TCD_DestinationNotFound;;2;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1001;TIM_NotEnoughInformationForTargetFormat;;1;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1c03;TCD_ServiceIdAlreadyExists;;3;PACKET_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/TcDistributorBase.h
+0x1002;TIM_LengthMismatch;;2;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b00;TCC_NoDestinationFound;;0;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1003;TIM_InvalidTimeFormat;;3;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b01;TCC_InvalidCcsdsVersion;;1;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1004;TIM_InvalidDayOfYear;;4;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b02;TCC_InvalidApid;;2;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1005;TIM_TimeDoesNotFitFormat;;5;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
-0x1b03;TCC_InvalidPacketType;;3;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x3701;TSI_BadTimestamp;;1;TIME_STAMPER_IF;fsfw/src/fsfw/timemanager/TimeStampIF.h
-0x1b04;TCC_InvalidSecHeaderField;;4;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d01;ATC_ActivityStarted;;1;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b05;TCC_IncorrectPrimaryHeader;;5;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d02;ATC_InvalidSubservice;;2;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b07;TCC_IncompletePacket;;7;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d03;ATC_IllegalApplicationData;;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b08;TCC_InvalidPusVersion;;8;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d04;ATC_SendTmFailed;;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b09;TCC_IncorrectChecksum;;9;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x1d05;ATC_Timeout;;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x1b0a;TCC_IllegalPacketSubtype;;10;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x4c00;SPPA_NoPacketFound;;0;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.h
-0x1b0b;TCC_IncorrectSecondaryHeader;;11;TMTC_DISTRIBUTION;fsfw/src/fsfw/tcdistribution/definitions.h
+0x4c01;SPPA_SplitPacket;;1;SPACE_PACKET_PARSER;fsfw/src/fsfw/tmtcservices/SpacePacketParser.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
 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
 0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.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
 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
@ -225,76 +345,23 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
+0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a01;IEC_NoConfigurationTable;;1;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4301;FILS_GenericDirError;;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a02;IEC_NoCpuTable;;2;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4302;FILS_FilesystemInactive;;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a03;IEC_InvalidWorkspaceAddress;;3;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4303;FILS_GenericRenameError;;3;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a04;IEC_TooLittleWorkspace;;4;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4304;FILS_IsBusy;;4;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a05;IEC_WorkspaceAllocation;;5;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4305;FILS_InvalidParameters;;5;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a06;IEC_InterruptStackTooSmall;;6;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430a;FILS_FileDoesNotExist;;10;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a07;IEC_ThreadExitted;;7;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430b;FILS_FileAlreadyExists;;11;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a08;IEC_InconsistentMpInformation;;8;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430c;FILS_NotAFile;;12;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a09;IEC_InvalidNode;;9;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430d;FILS_FileLocked;;13;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0a;IEC_NoMpci;;10;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x430e;FILS_PermissionDenied;;14;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0b;IEC_BadPacket;;11;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4315;FILS_DirectoryDoesNotExist;;21;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0c;IEC_OutOfPackets;;12;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4316;FILS_DirectoryAlreadyExists;;22;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0d;IEC_OutOfGlobalObjects;;13;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4317;FILS_NotADirectory;;23;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0e;IEC_OutOfProxies;;14;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x4318;FILS_DirectoryNotEmpty;;24;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a0f;IEC_InvalidGlobalId;;15;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x431e;FILS_SequencePacketMissingWrite;;30;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
-0x2a10;IEC_BadStackHook;;16;INTERNAL_ERROR_CODES;fsfw/src/fsfw/osal/InternalErrorCodes.h
+0x431f;FILS_SequencePacketMissingRead;;31;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.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
@ -313,74 +380,36 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
 0x2cb1;CCS_BoardReadingNotFinished;;177;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cf0;CCS_NsPositiveW;;240;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cf1;CCS_NsNegativeW;;241;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cf2;CCS_NsLockout;;242;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cf3;CCS_FarmInLockout;;243;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cf4;CCS_FarmInWait;;244;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce0;CCS_WrongSymbol;;224;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce1;CCS_DoubleStart;;225;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce2;CCS_StartSymbolMissed;;226;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce3;CCS_EndWithoutStart;;227;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce4;CCS_TooLarge;;228;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce5;CCS_TooShort;;229;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce6;CCS_WrongTfVersion;;230;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce7;CCS_WrongSpacecraftId;;231;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce8;CCS_NoValidFrameType;;232;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ce9;CCS_CrcFailed;;233;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cea;CCS_VcNotFound;;234;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ceb;CCS_ForwardingFailed;;235;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cec;CCS_ContentTooLarge;;236;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2ced;CCS_ResidualData;;237;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cee;CCS_DataCorrupted;;238;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cef;CCS_IllegalSegmentationFlag;;239;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 0x2cd0;CCS_IllegalFlagCombination;;208;CCSDS_HANDLER_IF;fsfw/src/fsfw/datalinklayer/CCSDSReturnValuesIF.h
 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
 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
+0x0601;PP_DoItMyself;;1;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0602;PP_PointsToVariable;;2;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0603;PP_PointsToMemory;;3;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3404;DC_InvalidCookieType;;4;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0604;PP_ActivityCompleted;;4;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3405;DC_NotActive;;5;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
+0x0605;PP_PointsToVectorUint8;;5;HAS_MEMORY_IF;fsfw/src/fsfw/memory/HasMemoryIF.h
-0x3406;DC_TooMuchData;;6;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.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
 0x1201;AB_NeedSecondStep;;1;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
 0x1202;AB_NeedToReconfigure;;2;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
 0x1203;AB_ModeFallback;;3;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
 0x1204;AB_ChildNotCommandable;;4;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
 0x1205;AB_NeedToChangeHealth;;5;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
 0x12a1;AB_NotEnoughChildrenInCorrectState;;161;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.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
@ -390,12 +419,12 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x03d0;DHB_NoSwitch;;208;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03e0;DHB_ChildTimeout;;224;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
 0x03e1;DHB_SwitchFailed;;225;DEVICE_HANDLER_BASE;fsfw/src/fsfw/devicehandlers/DeviceHandlerBase.h
-0x1201;AB_NeedSecondStep;;1;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3401;DC_NoReplyReceived;;1;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1202;AB_NeedToReconfigure;;2;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3402;DC_ProtocolError;;2;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1203;AB_ModeFallback;;3;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3403;DC_Nullpointer;;3;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1204;AB_ChildNotCommandable;;4;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3404;DC_InvalidCookieType;;4;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x1205;AB_NeedToChangeHealth;;5;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3405;DC_NotActive;;5;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
-0x12a1;AB_NotEnoughChildrenInCorrectState;;161;ASSEMBLY_BASE;fsfw/src/fsfw/devicehandlers/AssemblyBase.h
+0x3406;DC_TooMuchData;;6;DEVICE_COMMUNICATION_IF;fsfw/src/fsfw/devicehandlers/DeviceCommunicationIF.h
 0x27a0;DHI_NoCommandData;;160;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27a1;DHI_CommandNotSupported;;161;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27a2;DHI_CommandAlreadySent;;162;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
@ -417,58 +446,28 @@ 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
-0x2401;MT_TooDetailedRequest;;1;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x1401;SE_BufferTooShort;;1;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x2402;MT_TooGeneralRequest;;2;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x1402;SE_StreamTooShort;;2;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x2403;MT_NoMatch;;3;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x1403;SE_TooManyElements;;3;SERIALIZE_IF;fsfw/src/fsfw/serialize/SerializeIF.h
-0x2404;MT_Full;;4;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x4500;HSPI_HalTimeoutRetval;;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x2405;MT_NewNodeCreated;;5;MATCH_TREE_CLASS;fsfw/src/fsfw/globalfunctions/matching/MatchTree.h
+0x4501;HSPI_HalBusyRetval;;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x3f01;DLEE_NoPacketFound;;1;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x4502;HSPI_HalErrorRetval;;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x3f02;DLEE_PossiblePacketLoss;;2;DLE_ENCODER;fsfw/src/fsfw/globalfunctions/DleParser.h
+0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
-0x2f01;ASC_TooLongForTargetType;;1;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
-0x2f02;ASC_InvalidCharacters;;2;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
-0x2f03;ASC_BufferTooSmall;;3;ASCII_CONVERTER;fsfw/src/fsfw/globalfunctions/AsciiConverter.h
+0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x1701;HHI_ObjectNotHealthy;;1;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x1702;HHI_InvalidHealthState;;2;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x1703;HHI_IsExternallyControlled;;3;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
+0x4804;HGIO_GpioInvalidInstance;;4;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3201;CF_ObjectHasNoFunctions;;1;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
+0x4805;HGIO_GpioDuplicateDetected;;5;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3202;CF_AlreadyCommanding;;2;COMMANDS_ACTIONS_IF;fsfw/src/fsfw/action/CommandsActionsIF.h
+0x4806;HGIO_GpioInitFailed;;6;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3301;HF_IsBusy;;1;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4807;HGIO_GpioGetValueFailed;;7;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
-0x3302;HF_InvalidParameters;;2;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4400;UXOS_ExecutionFinished;Execution of the current command has finished;0;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x3303;HF_ExecutionFinished;;3;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.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
-0x3304;HF_InvalidActionId;;4;HAS_ACTIONS_IF;fsfw/src/fsfw/action/HasActionsIF.h
+0x4402;UXOS_BytesRead;Some bytes have been read from the executing process;2;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1000;TIM_UnsupportedTimeFormat;;0;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x4403;UXOS_CommandError;Command execution failed;3;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1001;TIM_NotEnoughInformationForTargetFormat;;1;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x4404;UXOS_NoCommandLoadedOrPending;;4;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.h
-0x1002;TIM_LengthMismatch;;2;CCSDS_TIME_HELPER_CLASS;fsfw/src/fsfw/timemanager/CCSDSTime.h
+0x4406;UXOS_PcloseCallError;;6;LINUX_OSAL;fsfw/src/fsfw_hal/linux/CommandExecutor.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
@ -481,3 +480,4 @@ 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
 0x6b00;SCBU_KeyNotFound;;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
--- a/eive_tmtc/config/retvals.py
+++ b/eive_tmtc/config/retvals.py
@ -1,12 +1,11 @@
 import os
 import logging
 from eive_tmtc import EIVE_TMTC_ROOT
 from tmtccmd.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
 from tmtccmd.logging import get_console_logger
 DEFAULT_RETVAL_CSV_NAME = EIVE_TMTC_ROOT / "config/returnvalues.csv"
 __RETVAL_DICT = None
 LOGGER = get_console_logger()
 def get_retval_dict() -> RetvalDictT:
@ -17,7 +16,7 @@ def get_retval_dict() -> RetvalDictT:
                csv_file=DEFAULT_RETVAL_CSV_NAME
            )
        else:
-            LOGGER.warning(
+            logging.getLogger(__name__).warning(
                f"No Return Value CSV file found at {DEFAULT_RETVAL_CSV_NAME}"
            )
            __RETVAL_DICT = dict()
--- a/eive_tmtc/pus_tc/devs/init.py
+++ b/eive_tmtc/pus_tc/devs/init.py
@ -1 +0,0 @@
--- a/eive_tmtc/pus_tc/devs/gps.py
+++ b/eive_tmtc/pus_tc/devs/gps.py
@ -1,48 +0,0 @@
 import enum
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from tmtccmd.logging import get_console_logger
 LOGGER = get_console_logger()
 class OpCode:
    REQ_OS_HK = ["0", "hk-os"]
    RESET_GNSS = ["5", "reset"]
 class Info:
    REQ_OS_HK = "Request One-Shot HK"
    RESET_GNSS = "Reset GNSS using reset pin"
 class SetId:
    HK = 0
@tmtc_definitions_provider
 def add_gps_cmds(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
    oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
    oce.add(keys=OpCode.REQ_OS_HK, info=Info.REQ_OS_HK)
    defs.add_service(
        name=CustomServiceList.GPS_CTRL.value,
        info="GPS/GNSS Controller",
        op_code_entry=oce,
    )
 def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
    if op_code in OpCode.RESET_GNSS:
        # TODO: This needs to be re-implemented
        LOGGER.warning("Reset pin handling needs to be re-implemented")
    if op_code in OpCode.REQ_OS_HK:
        q.add_log_cmd(f"GMSS: {Info.REQ_OS_HK}")
        q.add_pus_tc(
            generate_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.HK))
        )
--- a/eive_tmtc/pus_tc/devs/gyros.py
+++ b/eive_tmtc/pus_tc/devs/gyros.py
@ -1,10 +0,0 @@
 import enum
 class AdisGyroSetId(enum.IntEnum):
    CORE_HK = 0
    CFG_HK = 1
 class L3gGyroSetId(enum.IntEnum):
    CORE_HK = 0
--- a/eive_tmtc/pus_tc/devs/mgms.py
+++ b/eive_tmtc/pus_tc/devs/mgms.py
@ -1,9 +0,0 @@
 import enum
 class MgmLis3SetId(enum.IntEnum):
    CORE_HK = 0
 class MgmRm3100SetId(enum.IntEnum):
    CORE_HK = 0
--- a/eive_tmtc/pus_tc/devs/sus.py
+++ b/eive_tmtc/pus_tc/devs/sus.py
@ -1,2 +0,0 @@
 class SetId:
    HK = 3
--- a/eive_tmtc/pus_tc/procedure_packer.py
+++ b/eive_tmtc/pus_tc/procedure_packer.py
@ -1,18 +1,18 @@
 """Hook function which packs telecommands based on service and operation code string
 """
 import logging
 from typing import cast
 from eive_tmtc.tmtc.power.power import pack_power_commands
-from eive_tmtc.pus_tc.devs.rtd import pack_rtd_commands
+from eive_tmtc.tmtc.tcs.rtd import pack_rtd_commands
-from eive_tmtc.pus_tc.devs.scex import pack_scex_cmds
+from eive_tmtc.tmtc.payload.scex import pack_scex_cmds
 from eive_tmtc.pus_tc.system.controllers import (
    pack_cmd_ctrl_to_prompted_mode,
    get_object_from_op_code,
 )
-from eive_tmtc.tmtc.tcs import pack_tcs_sys_commands
+from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 from tmtccmd.config import CoreServiceList
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.decorator import (
    route_to_registered_service_handlers,
@ -28,23 +28,17 @@ from eive_tmtc.tmtc.power.pdu2 import pack_pdu2_commands
 from eive_tmtc.tmtc.power.pdu1 import pack_pdu1_commands
 from eive_tmtc.tmtc.power.acu import pack_acu_commands
 from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into
-from eive_tmtc.pus_tc.devs.tmp1075 import pack_tmp1075_test_into
+from eive_tmtc.tmtc.tcs.heater import pack_heater_cmds
 from eive_tmtc.pus_tc.devs.heater import pack_heater_cmds
 from eive_tmtc.tmtc.acs.reaction_wheels import (
    pack_single_rw_test_into,
    pack_rw_ass_cmds,
 )
 from eive_tmtc.pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
 from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
 from eive_tmtc.tmtc.com.ccsds_handler import pack_ccsds_handler_test
 from eive_tmtc.tmtc.core import pack_core_commands
 from eive_tmtc.tmtc.acs.star_tracker import pack_star_tracker_commands
 from eive_tmtc.tmtc.com.syrlinks_handler import pack_syrlinks_command
 from eive_tmtc.pus_tc.devs.gps import pack_gps_command
 from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
 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.proc import pack_proc_commands
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import (
    P60_DOCK_HANDLER,
@ -53,7 +47,7 @@ from eive_tmtc.config.object_ids import (
    ACU_HANDLER_ID,
    TMP_1075_1_HANDLER_ID,
    TMP_1075_2_HANDLER_ID,
-    HEATER_ID,
+    HEATER_CONTROLLER_ID,
    IMTQ_HANDLER_ID,
    RW1_ID,
    RW2_ID,
@ -69,11 +63,17 @@ from eive_tmtc.config.object_ids import (
    RW_ASSEMBLY,
    get_object_ids,
 )
 from eive_tmtc.tmtc.tcs.tmp1075 import pack_tmp1075_test_into
 from eive_tmtc.tmtc.acs.gps import pack_gps_command
 from eive_tmtc.tmtc.payload.rad_sensor import pack_rad_sensor_test_into
 from eive_tmtc.tmtc.power.plpcdu import pack_pl_pcdu_commands
 from eive_tmtc.tmtc.acs.str_img_helper import pack_str_img_helper_command
 from eive_tmtc.pus_tc.system.proc import pack_proc_commands
 import eive_tmtc.config.object_ids as oids
 from tmtccmd.util import ObjectIdU32
 LOGGER = get_console_logger()
 def handle_default_procedure(
    tc_base: TcHandlerBase,
@ -114,7 +114,7 @@ def handle_default_procedure(
            object_id=object_id, q=queue_helper, op_code=op_code
        )
    if service == CustomServiceList.HEATER.value:
-        object_id = HEATER_ID
+        object_id = HEATER_CONTROLLER_ID
        return pack_heater_cmds(object_id=object_id, q=queue_helper, op_code=op_code)
    if service == CustomServiceList.IMTQ.value:
        object_id = cast(ObjectIdU32, obj_id_man.get(IMTQ_HANDLER_ID))
@ -214,4 +214,4 @@ def handle_default_procedure(
            queue_helper=queue_helper,
        ),
    ):
-        LOGGER.warning(f"Invalid Service {service}")
+        logging.getLogger(__name__).warning(f"Invalid Service {service}")
--- 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, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from eive_tmtc.config.object_ids import TEST_DEVICE_ID
 TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID
--- 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 Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
--- a/eive_tmtc/pus_tc/system/proc.py
+++ b/eive_tmtc/pus_tc/system/proc.py
@ -17,19 +17,12 @@ from tmtccmd.pus.s11_tc_sched import (
 from tmtccmd.tc.pus_3_fsfw_hk import *
 import eive_tmtc.config.object_ids as oids
-from eive_tmtc.tmtc.tcs import OpCodeAssy as TcsOpCodes, pack_tcs_sys_commands
+from eive_tmtc.tmtc.tcs.brd_assy import OpCodeAssy as TcsOpCodes
-from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetId
+from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
 from eive_tmtc.tmtc.core import SetId as CoreSetIds
 from eive_tmtc.tmtc.power.common_power import SetId as GsSetIds
 from eive_tmtc.pus_tc.devs.rad_sensor import SetId as RadSetIds
 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.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.tmtc.acs.star_tracker import SetId as StrSetIds
 from eive_tmtc.tmtc.acs.reaction_wheels import (
    RwSetId,
@ -46,6 +39,17 @@ from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command
 from eive_tmtc.tmtc.acs.star_tracker import pack_star_tracker_commands
 from eive_tmtc.tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command
 from eive_tmtc.tmtc.acs.sus import SetId
 from eive_tmtc.tmtc.power.bpx_batt import BpxSetId
 from eive_tmtc.tmtc.payload.rad_sensor import SetId as RadSetIds
 from eive_tmtc.tmtc.acs.mgms import MgmLis3SetId as MgmLis3SetIds_0_2
 from eive_tmtc.tmtc.acs.mgms import MgmRm3100SetId as MgmRm3100SetIds_1_3
 from eive_tmtc.tmtc.acs.gyros import (
    AdisGyroSetId as AdisGyroSetIds_0_2,
    L3gGyroSetId as L3gGyroSetIds_1_3,
 )
 from eive_tmtc.tmtc.acs.gps import SetId as GpsSetIds
 class OpCode:
    """FT: Functional Test"""
--- a/eive_tmtc/pus_tc/system/time.py
+++ b/eive_tmtc/pus_tc/system/time.py
@ -1,15 +1,12 @@
 import logging
 from datetime import datetime
 from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss import PusTelecommand
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
-from tmtccmd.logging import get_console_logger
+from tmtccmd.tc import service_provider
 from tmtccmd.tc import DefaultPusQueueHelper, service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 LOGGER = get_console_logger()
 class OpCode:
    SET_CURRENT_TIME = ["0", "set-curr-time"]
@ -24,6 +21,8 @@ def pack_set_current_time_ascii_command(p: ServiceProviderParams):
    q = p.queue_helper
    time_test_current_time = datetime.utcnow().isoformat() + "Z" + "\0"
    current_time_ascii = time_test_current_time.encode("ascii")
-    LOGGER.info(f"Current time in ASCII format: {current_time_ascii}")
+    logging.getLogger(__name__).info(
        f"Current time in ASCII format: {current_time_ascii}"
    )
    q.add_log_cmd(Info.SET_CURRENT_TIME)
    q.add_pus_tc(PusTelecommand(service=9, subservice=128, app_data=current_time_ascii))
--- a/eive_tmtc/pus_tm/action_reply_handler.py
+++ b/eive_tmtc/pus_tm/action_reply_handler.py
@ -6,12 +6,11 @@ from eive_tmtc.tmtc.payload.ploc_mpsoc import PlocReplyIds
 from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionId
 from eive_tmtc.tmtc.acs.star_tracker import StarTrackerActionId
 from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.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()
+_LOGGER = logging.getLogger(__name__)
 def handle_action_reply(
@ -123,7 +122,7 @@ def handle_startracker_replies(
 ):
    if action_id == StarTrackerActionId.CHECKSUM:
        if len(custom_data) != 5:
-            LOGGER.warning(
+            _LOGGER.warning(
                "Star tracker reply has invalid length {0}".format(len(custom_data))
            )
            return
--- a/eive_tmtc/pus_tm/devs/init.py
+++ b/eive_tmtc/pus_tm/devs/init.py
--- a/eive_tmtc/pus_tm/devs/bpx_bat.py
+++ b/eive_tmtc/pus_tm/devs/bpx_bat.py
@ -1,68 +0,0 @@
 import struct
 from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetId
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 HEADER_LIST = [
    "Charge Current",
    "Discharge Current",
    "Heater Current",
    "Battery Voltage",
    "Batt Temp 1",
    "Batt Temp 2",
    "Batt Temp 3",
    "Batt Temp 4",
    "Reboot Counter",
    "Boot Cause",
 ]
 def handle_bpx_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    pw = PrintWrapper(printer)
    if set_id == BpxSetId.GET_HK_SET:
        fmt_str = "!HHHHhhhhIB"
        inc_len = struct.calcsize(fmt_str)
        (
            charge_current,
            discharge_current,
            heater_current,
            batt_voltage,
            batt_temp_1,
            batt_temp_2,
            batt_temp_3,
            batt_temp_4,
            reboot_cntr,
            boot_cause,
        ) = struct.unpack(fmt_str, hk_data[0:inc_len])
        content_list = [
            charge_current,
            discharge_current,
            heater_current,
            batt_voltage,
            batt_temp_1,
            batt_temp_2,
            batt_temp_3,
            batt_temp_4,
            reboot_cntr,
            boot_cause,
        ]
        validity_buffer = hk_data[inc_len:]
        pw.dlog(str(HEADER_LIST))
        pw.dlog(str(content_list))
        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
    elif set_id == BpxSetId.GET_CFG_SET:
        battheat_mode = hk_data[0]
        battheat_low = struct.unpack("!b", hk_data[1:2])[0]
        battheat_high = struct.unpack("!b", hk_data[2:3])[0]
        header_list = [
            "Battery Heater Mode",
            "Battery Heater Low Limit",
            "Battery Heater High Limit",
        ]
        content_list = [battheat_mode, battheat_low, battheat_high]
        validity_buffer = hk_data[3:]
        pw.dlog(str(header_list))
        pw.dlog(str(content_list))
        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
--- a/eive_tmtc/pus_tm/devs/gps.py
+++ b/eive_tmtc/pus_tm/devs/gps.py
@ -1,39 +0,0 @@
 import struct
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes):
    pw = PrintWrapper(printer)
    pw.dlog(f"Received GPS data, HK data length {len(hk_data)}")
    current_idx = 0
    fmt_str = "!ddddBBBHBBBBBI"
    inc_len = struct.calcsize(fmt_str)
    (
        lat,
        long,
        alt,
        speed,
        fix,
        sats_in_use,
        sats_in_view,
        year,
        month,
        day,
        hours,
        minutes,
        seconds,
        unix_seconds,
    ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
    current_idx += inc_len
    date_string = f"{day}.{month}.{year} {hours}:{minutes}:{seconds}"
    pw.dlog(f"Lat: {lat} deg")
    pw.dlog(f"Long: {long} deg")
    pw.dlog(f"Altitude: {alt} m | Speed: {speed} m/s")
    pw.dlog(
        f"Fix Type: {fix} | Sats in View {sats_in_view} | Sats in Use {sats_in_use}"
    )
    pw.dlog(f"GNSS Date: {date_string}")
    pw.dlog(f"Unix seconds {unix_seconds}")
    printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=14)
--- a/eive_tmtc/pus_tm/devs/plpcdu.py
+++ b/eive_tmtc/pus_tm/devs/plpcdu.py
@ -1,52 +0,0 @@
 import struct
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.pus_tc.devs.plpcdu import SetId
 ADC_CHANNELS_NAMED = [
    "U BAT DIV 6",
    "U NEG V FB",
    "I HPA",
    "U HPA DIV 6",
    "I MPA",
    "U MPA DIV 6",
    "I TX",
    "U TX DIV 6",
    "I X8",
    "U X8 DIV 6",
    "I DRO",
    "U DRO DIV 6",
 ]
 def handle_plpcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    if set_id == SetId.ADC:
        pw = PrintWrapper(printer)
        current_idx = 0
        pw.dlog("Received PL PCDU ADC HK data")
        channels = []
        ch_print = "Channels Raw (hex): ["
        for i in range(12):
            channels.append(
                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
            )
            if i < 11:
                ch_print += f"{channels[i]:06x},"
            else:
                ch_print += f"{channels[i]:06x}]"
            current_idx += 2
        processed_vals = []
        for i in range(12):
            processed_vals.append(
                struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
            )
            current_idx += 4
        temp = struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
        current_idx += 4
        pw.dlog(f"Temperature: {temp} C")
        pw.dlog(ch_print)
        for i in range(12):
            pw.dlog(f"{ADC_CHANNELS_NAMED[i].ljust(24)} | {processed_vals[i]}")
        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=3)
--- a/eive_tmtc/pus_tm/devs/rad_sensor.py
+++ b/eive_tmtc/pus_tm/devs/rad_sensor.py
@ -1,24 +0,0 @@
 import struct
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.pus_tc.devs.rad_sensor import SetId
 def handle_rad_sensor_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    if set_id == SetId.HK:
        pw = PrintWrapper(printer)
        current_idx = 0
        pw.dlog("Received Radiation Sensor HK data")
        fmt_str = "!fHHHHHH"
        inc_len = struct.calcsize(fmt_str)
        (temp, ain0, ain1, ain4, ain5, ain6, ain7) = struct.unpack(
            fmt_str, hk_data[current_idx : current_idx + inc_len]
        )
        ain_dict = {0: ain0, 1: ain1, 4: ain4, 5: ain5, 6: ain6, 7: ain7}
        pw.dlog(f"Temperature: {temp} C")
        pw.dlog(f"AIN Channel | Raw Value (hex) | Raw Value (dec)")
        for idx, val in ain_dict.items():
            pw.dlog(f"{idx} | {val:#06x} | {str(val).ljust(5)}")
        current_idx += inc_len
        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=7)
--- a/eive_tmtc/pus_tm/event_handler.py
+++ b/eive_tmtc/pus_tm/event_handler.py
@ -1,88 +1,86 @@
 import logging
 from datetime import datetime
 from eive_tmtc.config.events import get_event_dict
 from eive_tmtc.config.object_ids import get_object_ids
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.pus_tm.verification_handler import generic_retval_printout
-from eive_tmtc.tmtc.acs.acs_subsystem import AcsMode
+from eive_tmtc.tmtc.acs.subsystem import AcsMode
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.tc.pus_200_fsfw_mode 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()
+_LOGGER = logging.getLogger(__name__)
 def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
    pw = PrintWrapper(printer)
    tm = Service5Tm.unpack(raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty())
    event_dict = get_event_dict()
-    info = event_dict.get(tm.event_id)
+    event_def = tm.event_definition
    info = event_dict.get(event_def.event_id)
    if info is None:
-        LOGGER.warning(f"Event ID {tm.event_id} has no information")
+        _LOGGER.warning(f"Event ID {event_def.event_id} has no information")
        info = EventInfo()
        info.name = "Unknown event"
    obj_ids = get_object_ids()
-    obj_id_obj = obj_ids.get(tm.reporter_id.as_bytes)
+    obj_id_obj = obj_ids.get(event_def.reporter_id)
    if obj_id_obj is None:
-        LOGGER.warning(f"Object ID 0x{tm.reporter_id.as_hex_string} has no name")
+        _LOGGER.warning(f"Object ID 0x{event_def.reporter_id.hex(sep=',')} has no name")
-        obj_name = tm.reporter_id.as_hex_string
+        obj_name = event_def.reporter_id.hex(sep=",")
    else:
        obj_name = obj_id_obj.name
-    generic_event_string = (
+    generic_event_string = f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x}) at {tm.time_provider.as_date_time()}"
        f"Object {obj_name} generated Event {tm.event_id} | {info.name}"
    )
    pw.printer.file_logger.info(
        f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
    )
-    LOGGER.info(generic_event_string)
+    _LOGGER.info(generic_event_string)
    specific_handler = True
    if info.name == "MODE_TRANSITION_FAILED":
-        reason = generic_retval_printout(tm.param_1)
+        reason = generic_retval_printout(event_def.param1)
        for string in reason:
            pw.dlog(f"Reason from event parameter 1: {string}")
-            pw.dlog(f"Mode, sequence or table: {tm.param_2:#08x}")
+            pw.dlog(f"Mode, sequence or table: {event_def.param2:#08x}")
    if info.name == "SUPV_UPDATE_PROGRESS" or info.name == "WRITE_MEMORY_FAILED":
        additional_event_info = f"Additional info: {info.info}"
        context = (
-            f"Progress Percent: {tm.param_1 >> 24 & 0xff} | Sequence Count: {tm.param_1 & 0xffff} "
+            f"Progress Percent: {event_def.param1 >> 24 & 0xff} | Sequence Count: {event_def.param1 & 0xffff} "
-            f"| Bytes Written: {tm.param_2}"
+            f"| Bytes Written: {event_def.param2}"
        )
        pw.dlog(additional_event_info)
        pw.dlog(context)
    if info.name == "MODE_INFO":
        mode_name = "Unknown"
        if obj_name == "ACS_SUBSYSTEM":
-            if tm.param_1 == Mode.OFF:
+            if event_def.param1 == Mode.OFF:
                mode_name = "Off"
-            elif tm.param_1 == AcsMode.IDLE:
+            elif event_def.param1 == AcsMode.IDLE:
                mode_name = "Idle"
-            elif tm.param_1 == AcsMode.DETUMBLE:
+            elif event_def.param1 == AcsMode.DETUMBLE:
                mode_name = "Detumble"
-            elif tm.param_1 == AcsMode.SAFE:
+            elif event_def.param1 == AcsMode.SAFE:
                mode_name = "Safe"
-            elif tm.param_1 == AcsMode.TARGET_PT:
+            elif event_def.param1 == AcsMode.TARGET_PT:
                mode_name = "Target Pointing"
        else:
-            if tm.param_1 == Mode.OFF:
+            if event_def.param1 == Mode.OFF:
                mode_name = "Off"
-            elif tm.param_1 == Mode.ON:
+            elif event_def.param1 == Mode.ON:
                mode_name = "On"
-            elif tm.param_1 == Mode.NORMAL:
+            elif event_def.param1 == Mode.NORMAL:
                mode_name = "Normal"
-            elif tm.param_1 == Mode.RAW:
+            elif event_def.param1 == Mode.RAW:
                mode_name = "Raw"
-        pw.dlog(f"Mode Number {tm.param_1}, Mode Name {mode_name}")
+        pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}")
-        pw.dlog(f"Submode: {tm.param_2}")
+        pw.dlog(f"Submode: {event_def.param2}")
    else:
        specific_handler = False
        if info.info != "":
-            additional_event_info = (
+            additional_event_info = f"Additional info: {info.info} | P1: {event_def.param1} | P2: {event_def.param2}"
                f"Additional info: {info.info} | P1: {tm.param_1} | P2: {tm.param_2}"
            )
            pw.dlog(additional_event_info)
    if not specific_handler:
-        printer.handle_long_tm_print(packet_if=tm, info_if=tm)
+        # printer.handle_long_tm_print(packet_if=tm.pus_tm, info_if=tm.pus_tm)
        pass
--- a/eive_tmtc/pus_tm/factory_hook.py
+++ b/eive_tmtc/pus_tm/factory_hook.py
@ -1,15 +1,18 @@
 """Core EIVE TM handler module
 """
 import logging
 from eive_tmtc.config.object_ids import get_object_ids
 from spacepackets.ecss import PusTelemetry
 from spacepackets.ecss.pus_17_test import Service17Tm
 from spacepackets.util import PrintFormats
 from spacepackets.ccsds.time import CdsShortTimestamp
 from tmtccmd 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 Subservice as ModeSubservices
+from tmtccmd.tm.pus_20_fsfw_param import Service20ParamDumpWrapper
 from tmtccmd.pus.s20_fsfw_param_defs import CustomSubservice as ParamSubservice
 from tmtccmd.tm.pus_200_fsfw_mode import Subservice as ModeSubservice
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from .defs import PrintWrapper
@ -18,7 +21,7 @@ from .verification_handler import handle_service_1_fsfw_packet, generic_retval_p
 from .hk_handling import handle_hk_packet
 from .action_reply_handler import handle_action_reply
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 def pus_factory_hook(
@ -28,13 +31,13 @@ def pus_factory_hook(
    raw_logger: RawTmtcTimedLogWrapper,
 ):
    if len(packet) < 8:
-        LOGGER.warning("Detected packet shorter than 8 bytes!")
+        _LOGGER.warning("Detected packet shorter than 8 bytes!")
        return
    try:
        tm_packet = PusTelemetry.unpack(packet, CdsShortTimestamp.empty())
    except ValueError:
-        LOGGER.warning("Could not generate PUS TM object from raw data")
+        _LOGGER.warning("Could not generate PUS TM object from raw data")
-        LOGGER.warning(f"Raw Packet: [{packet.hex(sep=',')}], REPR: {packet!r}")
+        _LOGGER.warning(f"Raw Packet: [{packet.hex(sep=',')}], REPR: {packet!r}")
        return
    service = tm_packet.service
    obj_id_dict = get_object_ids()
@ -56,15 +59,42 @@ def pus_factory_hook(
            verif_wrapper.dlog("Received Ping Reply TM[17,2]")
        dedicated_handler = True
    elif service == 20:
-        tm_packet = Service20FsfwTm.unpack(
+        param_packet = Service20FsfwTm.unpack(
            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
        )
-        dedicated_handler = False
+        if tm_packet.subservice == ParamSubservice.TM_DUMP_REPLY:
            param_wrapper = Service20ParamDumpWrapper(param_tm=param_packet)
            try:
                param = param_wrapper.get_param()
                obj = obj_id_dict.get(param_wrapper.param_tm.object_id)
                pw.dlog(f"Received parameter dump TM from {obj}")
                pw.dlog(f"Parameter: {param}")
                if param.rows == 1 and param.columns == 1:
                    try:
                        scalar_param = param.parse_scalar_param()
                        if isinstance(scalar_param, int):
                            pw.dlog(f"Scalar integer parameter: {scalar_param}")
                        elif isinstance(scalar_param, float):
                            pw.dlog(f"Scalar floating point parameter: {scalar_param}")
                    except ValueError as e:
                        pw.dlog("received {e} trying to parse scalar parameter")
                else:
                    # TODO: Could improve display further by actually displaying a matrix as a
                    #       matrix using row and column information
                    pw.dlog(
                        f"Received vector or matrix data: {param.param_raw.hex(sep=',')}"
                    )
            except ValueError as e:
                pw.dlog(f"received {e} when trying to parse parameters")
            except NotImplementedError as e:
                pw.dlog(f"received {e} when trying to parse parameters")
        else:
            pw.dlog(f"unknown subservice {tm_packet.subservice} for parameter service")
    elif service == 200:
        tm_packet = Service200FsfwTm.unpack(
            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
        )
-        if tm_packet.subservice == ModeSubservices.TM_CANT_REACH_MODE:
+        if tm_packet.subservice == ModeSubservice.TM_CANT_REACH_MODE:
            obj_id = tm_packet.object_id
            obj_id_obj = obj_id_dict.get(obj_id)
            retval = tm_packet.return_value
@ -76,7 +106,7 @@ def pus_factory_hook(
        else:
            dedicated_handler = False
    else:
-        LOGGER.info(f"The service {service} is not implemented in Telemetry Factory")
+        _LOGGER.info(f"The service {service} is not implemented in Telemetry Factory")
        tm_packet.print_source_data(PrintFormats.HEX)
        dedicated_handler = True
    if not dedicated_handler and tm_packet is not None:
--- a/eive_tmtc/pus_tm/hk_handling.py
+++ b/eive_tmtc/pus_tm/hk_handling.py
@ -1,9 +1,11 @@
 """HK Handling for EIVE OBSW"""
 import logging
 # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
 from eive_tmtc.tmtc.acs.acs_ctrl import handle_raw_mgm_data, handle_acs_ctrl_hk_data
-from eive_tmtc.pus_tm.devs.plpcdu import handle_plpcdu_hk
+from eive_tmtc.tmtc.power.plpcdu import handle_plpcdu_hk
-from eive_tmtc.pus_tm.devs.rad_sensor import handle_rad_sensor_data
+from eive_tmtc.tmtc.payload.rad_sensor import handle_rad_sensor_data
-from eive_tmtc.pus_tm.devs.sus import handle_sus_hk
+from eive_tmtc.tmtc.acs.sus import handle_sus_hk
 from eive_tmtc.tmtc.payload.ploc_supervisor import handle_supv_hk_data
 from eive_tmtc.tmtc.acs.reaction_wheels import handle_rw_hk_data
 from eive_tmtc.tmtc.com.syrlinks_handler import handle_syrlinks_hk_data
@ -14,11 +16,10 @@ from tmtccmd.tm.pus_3_fsfw_hk import (
    Service3FsfwTm,
 )
 from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT
 from tmtccmd.logging import get_console_logger
-from eive_tmtc.pus_tm.devs.bpx_bat import handle_bpx_hk_data
+from eive_tmtc.tmtc.power.bpx_batt import handle_bpx_hk_data
-from eive_tmtc.pus_tm.devs.gps import handle_gps_data
+from eive_tmtc.tmtc.acs.gps import handle_gps_data
-from eive_tmtc.pus_tm.devs.gyros import handle_gyros_hk_data
+from eive_tmtc.tmtc.acs.gyros import handle_gyros_hk_data
 from eive_tmtc.tmtc.power.tm import (
    handle_pdu_data,
    handle_p60_hk_data,
@ -33,11 +34,11 @@ from eive_tmtc.tmtc.acs.imtq import (
 )
 from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter
 from eive_tmtc.tmtc.core import handle_core_hk_data
-from eive_tmtc.pus_tm.devs.mgms import handle_mgm_hk_data
+from eive_tmtc.tmtc.acs.mgms import handle_mgm_hk_data
 import eive_tmtc.config.object_ids as obj_ids
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 FORWARD_SENSOR_TEMPS = False
@ -74,11 +75,11 @@ def handle_hk_packet(
                hk_data=hk_data,
            )
        except ValueError as e:
-            LOGGER.exception(
+            _LOGGER.exception(
                f"{e} error when parsing HK data coming from {named_obj_id}"
            )
    if tm_packet.subservice == 10 or tm_packet.subservice == 12:
-        LOGGER.warning("HK definitions printout not implemented yet")
+        _LOGGER.warning("HK definitions printout not implemented yet")
 def handle_regular_hk_print(
@ -106,7 +107,7 @@ def handle_regular_hk_print(
        elif set_id == ImtqSetId.RAW_MTM_SET:
            return handle_raw_mtm_measurement(printer, hk_data)
        else:
-            LOGGER.info("Service 3 TM: IMTQ handler reply with unknown set id")
+            _LOGGER.info("Service 3 TM: IMTQ handler reply with unknown set id")
    elif objb == obj_ids.GPS_CONTROLLER:
        return handle_gps_data(printer=printer, hk_data=hk_data)
    elif objb == obj_ids.BPX_HANDLER_ID:
@ -177,7 +178,7 @@ def handle_regular_hk_print(
    elif objb == obj_ids.ACS_CONTROLLER:
        handle_acs_ctrl_hk_data(printer, set_id, hk_data)
    else:
-        LOGGER.info(
+        _LOGGER.info(
            f"Service 3 TM: Parsing for object {object_id} and set ID {set_id} "
            f"has not been implemented."
        )
--- a/eive_tmtc/pus_tm/verification_handler.py
+++ b/eive_tmtc/pus_tm/verification_handler.py
@ -1,13 +1,13 @@
 import logging
 from typing import List, Optional
 from spacepackets.ccsds import CdsShortTimestamp
 from spacepackets.ecss.pus_1_verification import UnpackParams, Service1Tm
 from tmtccmd.logging import get_console_logger
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tm.pus_1_verification import Service1FsfwWrapper
 from eive_tmtc.config.retvals import get_retval_dict
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 def handle_service_1_fsfw_packet(wrapper: VerificationWrapper, raw_tm: bytes):
@ -22,11 +22,11 @@ def handle_service_1_fsfw_packet(wrapper: VerificationWrapper, raw_tm: bytes):
    fsfw_wrapper = Service1FsfwWrapper(tm_packet)
    res = wrapper.verificator.add_tm(tm_packet)
    if res is None:
-        LOGGER.info(
+        _LOGGER.info(
            f"Received Verification TM[{tm_packet.service}, {tm_packet.subservice}] "
            f"with Request ID {tm_packet.tc_req_id.as_u32():#08x}"
        )
-        LOGGER.warning(f"No matching telecommand found for {tm_packet.tc_req_id}")
+        _LOGGER.warning(f"No matching telecommand found for {tm_packet.tc_req_id}")
    else:
        wrapper.log_to_console(tm_packet, res)
        wrapper.log_to_file(tm_packet, res)
--- a/eive_tmtc/tmtc/init.py
+++ b/eive_tmtc/tmtc/init.py
@ -1,3 +1,3 @@
-from .payload.pl_subsystem import add_payload_subsystem_cmds
+from .payload.subsystem import add_payload_subsystem_cmds
 from .solar_array_deployment import add_sa_depl_cmds
 from .test import add_test_defs
--- 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 Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
--- a/eive_tmtc/tmtc/acs/acs_ctrl.py
+++ b/eive_tmtc/tmtc/acs/acs_ctrl.py
@ -1,4 +1,5 @@
 import enum
 import logging
 import socket
 import struct
 from socket import AF_INET
@ -7,14 +8,13 @@ from typing import Tuple
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import ACS_CONTROLLER
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd import get_console_logger
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
 from tmtccmd.tc import service_provider
-from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_command
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_command
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_3_fsfw_hk import (
    generate_one_hk_command,
@ -25,9 +25,6 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 LOGGER = get_console_logger()
 class SetId(enum.IntEnum):
    MGM_RAW_SET = 0
    MGM_PROC_SET = 1
@ -378,7 +375,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
            )
        )
    else:
-        LOGGER.info(f"Unknown op code {op_code}")
+        logging.getLogger(__name__).info(f"Unknown op code {op_code}")
 def handle_acs_ctrl_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
--- a/eive_tmtc/tmtc/acs/gps.py
+++ b/eive_tmtc/tmtc/acs/gps.py
@ -0,0 +1,84 @@
 import logging
 import struct
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 _LOGGER = logging.getLogger(__name__)
 class OpCode:
    REQ_OS_HK = ["0", "hk-os"]
    RESET_GNSS = ["5", "reset"]
 class Info:
    REQ_OS_HK = "Request One-Shot HK"
    RESET_GNSS = "Reset GNSS using reset pin"
 class SetId:
    HK = 0
@tmtc_definitions_provider
 def add_gps_cmds(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
    oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
    oce.add(keys=OpCode.REQ_OS_HK, info=Info.REQ_OS_HK)
    defs.add_service(
        name=CustomServiceList.GPS_CTRL.value,
        info="GPS/GNSS Controller",
        op_code_entry=oce,
    )
 def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
    if op_code in OpCode.RESET_GNSS:
        # TODO: This needs to be re-implemented
        _LOGGER.warning("Reset pin handling needs to be re-implemented")
    if op_code in OpCode.REQ_OS_HK:
        q.add_log_cmd(f"GMSS: {Info.REQ_OS_HK}")
        q.add_pus_tc(
            generate_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.HK))
        )
 def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes):
    pw = PrintWrapper(printer)
    pw.dlog(f"Received GPS data, HK data length {len(hk_data)}")
    current_idx = 0
    fmt_str = "!ddddBBBHBBBBBI"
    inc_len = struct.calcsize(fmt_str)
    (
        lat,
        long,
        alt,
        speed,
        fix,
        sats_in_use,
        sats_in_view,
        year,
        month,
        day,
        hours,
        minutes,
        seconds,
        unix_seconds,
    ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
    current_idx += inc_len
    date_string = f"{day}.{month}.{year} {hours}:{minutes}:{seconds}"
    pw.dlog(f"Lat: {lat} deg")
    pw.dlog(f"Long: {long} deg")
    pw.dlog(f"Altitude: {alt} m | Speed: {speed} m/s")
    pw.dlog(
        f"Fix Type: {fix} | Sats in View {sats_in_view} | Sats in Use {sats_in_use}"
    )
    pw.dlog(f"GNSS Date: {date_string}")
    pw.dlog(f"Unix seconds {unix_seconds}")
    printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=14)
--- a/eive_tmtc/pus_tm/devs/gyros.py
+++ b/eive_tmtc/pus_tm/devs/gyros.py
@ -1,11 +1,20 @@
 import enum
 import struct
 import eive_tmtc.config.object_ids as obj_ids
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetId, AdisGyroSetId
+
-import eive_tmtc.config.object_ids as obj_ids
+class AdisGyroSetId(enum.IntEnum):
    CORE_HK = 0
    CFG_HK = 1
 class L3gGyroSetId(enum.IntEnum):
    CORE_HK = 0
 def handle_gyros_hk_data(
--- 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, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
--- a/eive_tmtc/pus_tm/devs/mgms.py
+++ b/eive_tmtc/pus_tm/devs/mgms.py
@ -1,10 +1,19 @@
 import enum
 import struct
 import eive_tmtc.config.object_ids as obj_ids
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetId, MgmLis3SetId
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-import eive_tmtc.config.object_ids as obj_ids
+
 class MgmLis3SetId(enum.IntEnum):
    CORE_HK = 0
 class MgmRm3100SetId(enum.IntEnum):
    CORE_HK = 0
 def handle_mgm_hk_data(
--- 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, Mode, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
--- a/eive_tmtc/tmtc/acs/star_tracker.py
+++ b/eive_tmtc/tmtc/acs/star_tracker.py
@ -6,18 +6,18 @@
@date   14.08.2021
 """
 import enum
 import logging
 import struct
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
 from eive_tmtc.utility.input_helper import InputHelper
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 class StarTrackerActionId(enum.IntEnum):
@ -647,7 +647,7 @@ def pack_checksum_command(object_id: bytes) -> bytearray:
 def get_config_file() -> str:
-    LOGGER.info("Specify json file")
+    _LOGGER.info("Specify json file")
    input_helper = InputHelper(json_dict)
    key = input_helper.get_key()
    json_file = json_dict[key][1]
@ -655,7 +655,7 @@ def get_config_file() -> str:
 def get_firmware() -> str:
-    LOGGER.info("Specify firmware file")
+    _LOGGER.info("Specify firmware file")
    input_helper = InputHelper(firmware_dict)
    key = input_helper.get_key()
    firmware = firmware_dict[key][1]
@ -663,7 +663,7 @@ def get_firmware() -> str:
 def get_upload_image() -> str:
-    LOGGER.info("Specify image to upload")
+    _LOGGER.info("Specify image to upload")
    input_helper = InputHelper(upload_image_dict)
    key = input_helper.get_key()
    image = upload_image_dict[key][1]
--- a/eive_tmtc/pus_tc/devs/str_img_helper.py
+++ b/eive_tmtc/pus_tc/devs/str_img_helper.py
--- 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 Subservice as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
--- a/eive_tmtc/pus_tm/devs/sus.py
+++ b/eive_tmtc/pus_tm/devs/sus.py
@ -1,11 +1,14 @@
 import struct
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.pus_tc.devs.sus import SetId
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 class SetId:
    HK = 3
 def handle_sus_hk(
    object_id: ObjectIdU32, hk_data: bytes, printer: FsfwTmTcPrinter, set_id: int
 ):
--- 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 Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 class SusOpCode:
--- a/eive_tmtc/tmtc/com/init.py
+++ b/eive_tmtc/tmtc/com/init.py
@ -0,0 +1 @@
 from .subsystem import add_com_subsystem_cmds
--- a/eive_tmtc/tmtc/com/ccsds_handler.py
+++ b/eive_tmtc/tmtc/com/ccsds_handler.py
@ -16,7 +16,7 @@ from tmtccmd.config.tmtc import (
    TmtcDefinitionWrapper,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import create_mode_command, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.util import ObjectIdU32
 from eive_tmtc.config.object_ids import CCSDS_HANDLER_ID
--- a/eive_tmtc/pus_tc/devs/pdec_handler.py
+++ b/eive_tmtc/pus_tc/devs/pdec_handler.py
--- a/eive_tmtc/tmtc/com/subsystem.py
+++ b/eive_tmtc/tmtc/com/subsystem.py
@ -0,0 +1,115 @@
 import enum
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import COM_SUBSYSTEM_ID
 from eive_tmtc.tmtc.com.syrlinks_handler import Datarate
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command
 from tmtccmd.tc.pus_20_fsfw_param import (
    create_load_param_cmd,
    pack_scalar_u8_parameter_app_data,
 )
 class ParameterId(enum.IntEnum):
    DATARATE = 0
 class Submode(enum.IntEnum):
    RX_ONLY = 0
    RX_AND_TX_DEF_DATARATE = 1
    RX_AND_TX_LOW_DATARATE = 2
    RX_AND_TX_HIGH_DATARATE = 3
    RX_AND_TX_CARRIER_WAVE = 4
 class OpCode:
    RX_ONLY = "rx_only"
    TX_AND_RX_DEF_RATE = "rx_and_tx_default_rate"
    TX_AND_RX_LOW_RATE = "rx_and_tx_low_rate"
    TX_AND_RX_HIGH_RATE = "rx_and_tx_high_rate"
    TX_AND_RX_CARRIER_WAVE = "rx_and_tx_carrier_wave"
    UPDATE_DEFAULT_DATARATE_LOW = "update_default_rate_low"
    UPDATE_DEFAULT_DATARATE_HIGH = "update_default_rate_high"
 class Info:
    RX_ONLY = "Syrlinks RX Only"
    TX_AND_RX_DEF_DATARATE = "Syrlinks with TX default datarate"
    TX_AND_RX_LOW_DATARATE = "Syrlinks with TX low datarate (BPSK modulation)"
    TX_AND_RX_HIGH_DATARATE = "Syrlinks with TX high datarate (0QPSK modulation)"
    TX_AND_RX_CARRIER_WAVE = "Syrlinks with TX carrier wave"
    UPDATE_DEFAULT_DATARATE_LOW = "Configure default low datarate (BPSK modulation)"
    UPDATE_DEFAULT_DATARATE_HIGH = "Configure default high datarate (0QPSK modulation)"
@service_provider(CustomServiceList.COM_SS)
 def build_com_subsystem_cmd(p: ServiceProviderParams):
    q = p.queue_helper
    o = p.op_code
    prefix = "COM Subsystem"
    if o == OpCode.RX_ONLY:
        q.add_log_cmd(Info.RX_ONLY)
        q.add_pus_tc(create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_ONLY, 0))
    elif o == OpCode.TX_AND_RX_DEF_RATE:
        q.add_log_cmd(Info.TX_AND_RX_DEF_DATARATE)
        q.add_pus_tc(
            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_DEF_DATARATE, 0)
        )
    elif o == OpCode.TX_AND_RX_LOW_RATE:
        q.add_log_cmd(Info.TX_AND_RX_LOW_DATARATE)
        q.add_pus_tc(
            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_LOW_DATARATE, 0)
        )
    elif o == OpCode.TX_AND_RX_HIGH_RATE:
        q.add_log_cmd(Info.TX_AND_RX_HIGH_DATARATE)
        q.add_pus_tc(
            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_HIGH_DATARATE, 0)
        )
    if o == OpCode.UPDATE_DEFAULT_DATARATE_LOW:
        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_LOW}")
        q.add_pus_tc(
            create_load_param_cmd(
                pack_scalar_u8_parameter_app_data(
                    COM_SUBSYSTEM_ID,
                    0,
                    ParameterId.DATARATE,
                    Datarate.LOW_RATE_MODULATION_BPSK,
                )
            )
        )
    if o == OpCode.UPDATE_DEFAULT_DATARATE_HIGH:
        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_HIGH}")
        q.add_pus_tc(
            create_load_param_cmd(
                pack_scalar_u8_parameter_app_data(
                    COM_SUBSYSTEM_ID,
                    0,
                    ParameterId.DATARATE,
                    Datarate.HIGH_RATE_MODULATION_0QPSK,
                )
            )
        )
    elif o == OpCode.TX_AND_RX_CARRIER_WAVE:
        q.add_log_cmd(Info.TX_AND_RX_CARRIER_WAVE)
        q.add_pus_tc(
            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_CARRIER_WAVE, 0)
        )
@tmtc_definitions_provider
 def add_com_subsystem_cmds(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
    oce.add(OpCode.RX_ONLY, Info.RX_ONLY)
    oce.add(OpCode.TX_AND_RX_LOW_RATE, Info.TX_AND_RX_LOW_DATARATE)
    oce.add(OpCode.TX_AND_RX_HIGH_RATE, Info.TX_AND_RX_HIGH_DATARATE)
    oce.add(OpCode.TX_AND_RX_DEF_RATE, Info.TX_AND_RX_DEF_DATARATE)
    oce.add(OpCode.UPDATE_DEFAULT_DATARATE_LOW, Info.UPDATE_DEFAULT_DATARATE_LOW)
    oce.add(OpCode.UPDATE_DEFAULT_DATARATE_HIGH, Info.UPDATE_DEFAULT_DATARATE_HIGH)
    defs.add_service(CustomServiceList.COM_SS, "COM Subsystem", oce)
--- a/eive_tmtc/tmtc/com/syrlinks_handler.py
+++ b/eive_tmtc/tmtc/com/syrlinks_handler.py
@ -23,11 +23,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    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_200_fsfw_mode 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
@ -49,8 +45,6 @@ class OpCode:
    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"
@ -69,8 +63,6 @@ class Info:
    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"
@ -108,10 +100,6 @@ class Submode(enum.IntEnum):
    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
@ -127,12 +115,6 @@ def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
    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)
@ -188,24 +170,6 @@ def pack_syrlinks_command(
        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:
--- a/eive_tmtc/tmtc/common.py
+++ b/eive_tmtc/tmtc/common.py
@ -2,7 +2,7 @@ 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, Mode, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
 from tmtccmd.util import ObjectIdU32
--- a/eive_tmtc/tmtc/core.py
+++ b/eive_tmtc/tmtc/core.py
@ -1,4 +1,5 @@
 import enum
 import logging
 import struct
 from eive_tmtc.pus_tm.defs import PrintWrapper
@ -15,7 +16,7 @@ from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
 from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 class ActionId(enum.IntEnum):
@ -244,7 +245,7 @@ def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
        while True:
            active_sd_card = int(input("Please specify active SD cqrd [0/1]: "))
            if active_sd_card not in [0, 1]:
-                LOGGER.warning("Invalid SD card specified. Try again")
+                _LOGGER.warning("Invalid SD card specified. Try again")
            break
        q.add_log_cmd(Info.SWITCH_TO_BOTH_SD_CARDS)
        q.add_pus_tc(
@ -282,9 +283,9 @@ def determine_reboot_params() -> (bool, Chip, Copy):
    copy_select = -1
    reboot_self = input("Reboot self? [y/n]: ")
    if reboot_self in ["y", "yes", "1"]:
-        LOGGER.info("Rebooting currently running image")
+        _LOGGER.info("Rebooting currently running image")
        return True, chip_select, copy_select
-    LOGGER.info("Rebooting image specified by chip and copy")
+    _LOGGER.info("Rebooting image specified by chip and copy")
    return False, determine_chip_and_copy()
@ -298,7 +299,7 @@ def determine_chip_and_copy() -> (int, int):
                chip_select = Chip.CHIP_1
            break
        else:
-            LOGGER.warning("Invalid chip select value. Try again")
+            _LOGGER.warning("Invalid chip select value. Try again")
    while True:
        copy_select = input("Copy select [0/1]: ")
        if copy_select in ["0", "1"]:
@ -308,7 +309,7 @@ def determine_chip_and_copy() -> (int, int):
                copy_select = Copy.COPY_1_GOLD
            break
        else:
-            LOGGER.warning("Invalid copy select value. Try again")
+            _LOGGER.warning("Invalid copy select value. Try again")
    return chip_select, copy_select
--- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py
+++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py
@ -6,6 +6,7 @@
@author J. Meier
@date   06.03.2021
 """
 import logging
 import struct
 import enum
@ -16,15 +17,14 @@ from tmtccmd.config.tmtc import (
    OpCodeEntry,
    TmtcDefinitionWrapper,
 )
 from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from eive_tmtc.utility.input_helper import InputHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 MANUAL_INPUT = "1"
@ -324,7 +324,7 @@ def prepare_replay_write_sequence_cmd(object_id: bytes) -> bytearray:
 def get_obc_file() -> str:
-    LOGGER.info("Specify OBC file ")
+    _LOGGER.info("Specify OBC file ")
    input_helper = InputHelper(flash_write_file_dict)
    key = input_helper.get_key()
    if key == MANUAL_INPUT:
@ -335,7 +335,7 @@ def get_obc_file() -> str:
 def get_mpsoc_file() -> str:
-    LOGGER.info("Specify MPSoC file")
+    _LOGGER.info("Specify MPSoC file")
    input_helper = InputHelper(mpsoc_file_dict)
    key = input_helper.get_key()
    if key == MANUAL_INPUT:
@ -346,7 +346,7 @@ def get_mpsoc_file() -> str:
 def get_sequence_file() -> str:
-    LOGGER.info("Specify sequence file")
+    _LOGGER.info("Specify sequence file")
    input_helper = InputHelper(SEQ_FILE_DICT)
    key = input_helper.get_key()
    if key == MANUAL_INPUT:
--- a/eive_tmtc/tmtc/payload/ploc_supervisor.py
+++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py
@ -7,6 +7,7 @@
@date   10.07.2021
 """
 import enum
 import logging
 import struct
 from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids
@ -16,7 +17,6 @@ from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.config import TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
@ -24,7 +24,7 @@ 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
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 latchup_id_dict = {
    "0": "0.85V",
@ -698,7 +698,7 @@ def pack_logging_set_topic(object_id: bytes) -> bytearray:
 def get_update_file() -> str:
-    LOGGER.info("Specify update file ")
+    _LOGGER.info("Specify update file ")
    input_helper = InputHelper(update_file_dict)
    key = input_helper.get_key()
    if key == HARDCODED:
@ -711,7 +711,7 @@ def get_update_file() -> str:
 def get_event_buffer_path() -> str:
-    LOGGER.info("Specify path where to store event buffer file ")
+    _LOGGER.info("Specify path where to store event buffer file ")
    input_helper = InputHelper(event_buffer_path_dict)
    key = input_helper.get_key()
    if key == MANUAL_INPUT:
--- a/eive_tmtc/tmtc/payload/rad_sensor.py
+++ b/eive_tmtc/tmtc/payload/rad_sensor.py
@ -8,6 +8,7 @@
 import struct
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
 from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Mode
@ -16,6 +17,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 class SetId:
@ -95,3 +97,22 @@ def rad_sensor_mode_cmd(
    q.add_log_cmd(f"Rad sensor: {info}")
    mode_data = pack_mode_data(object_id.as_bytes, mode, 0)
    q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
 def handle_rad_sensor_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    if set_id == SetId.HK:
        pw = PrintWrapper(printer)
        current_idx = 0
        pw.dlog("Received Radiation Sensor HK data")
        fmt_str = "!fHHHHHH"
        inc_len = struct.calcsize(fmt_str)
        (temp, ain0, ain1, ain4, ain5, ain6, ain7) = struct.unpack(
            fmt_str, hk_data[current_idx : current_idx + inc_len]
        )
        ain_dict = {0: ain0, 1: ain1, 4: ain4, 5: ain5, 6: ain6, 7: ain7}
        pw.dlog(f"Temperature: {temp} C")
        pw.dlog(f"AIN Channel | Raw Value (hex) | Raw Value (dec)")
        for idx, val in ain_dict.items():
            pw.dlog(f"{idx} | {val:#06x} | {str(val).ljust(5)}")
        current_idx += inc_len
        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=7)
--- a/eive_tmtc/tmtc/payload/scex.py
+++ b/eive_tmtc/tmtc/payload/scex.py
@ -5,7 +5,7 @@ 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 Mode, pack_mode_data, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
--- 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 Subservice as ModeSubservice
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice
 class OpCode(str, enum.Enum):
--- a/eive_tmtc/pus_tc/devs/bpx_batt.py
+++ b/eive_tmtc/pus_tc/devs/bpx_batt.py
@ -1,3 +1,6 @@
 import struct
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss import PusTelecommand
 from eive_tmtc.config.definitions import CustomServiceList
@ -11,8 +14,9 @@ from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
-from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 class BpxSetId:
@ -105,3 +109,66 @@ def pack_bpx_commands(p: ServiceProviderParams):
        q.add_pus_tc(
            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.REBOOT)
        )
 HEADER_LIST = [
    "Charge Current",
    "Discharge Current",
    "Heater Current",
    "Battery Voltage",
    "Batt Temp 1",
    "Batt Temp 2",
    "Batt Temp 3",
    "Batt Temp 4",
    "Reboot Counter",
    "Boot Cause",
 ]
 def handle_bpx_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    pw = PrintWrapper(printer)
    if set_id == BpxSetId.GET_HK_SET:
        fmt_str = "!HHHHhhhhIB"
        inc_len = struct.calcsize(fmt_str)
        (
            charge_current,
            discharge_current,
            heater_current,
            batt_voltage,
            batt_temp_1,
            batt_temp_2,
            batt_temp_3,
            batt_temp_4,
            reboot_cntr,
            boot_cause,
        ) = struct.unpack(fmt_str, hk_data[0:inc_len])
        content_list = [
            charge_current,
            discharge_current,
            heater_current,
            batt_voltage,
            batt_temp_1,
            batt_temp_2,
            batt_temp_3,
            batt_temp_4,
            reboot_cntr,
            boot_cause,
        ]
        validity_buffer = hk_data[inc_len:]
        pw.dlog(str(HEADER_LIST))
        pw.dlog(str(content_list))
        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
    elif set_id == BpxSetId.GET_CFG_SET:
        battheat_mode = hk_data[0]
        battheat_low = struct.unpack("!b", hk_data[1:2])[0]
        battheat_high = struct.unpack("!b", hk_data[2:3])[0]
        header_list = [
            "Battery Heater Mode",
            "Battery Heater Low Limit",
            "Battery Heater High Limit",
        ]
        content_list = [battheat_mode, battheat_low, battheat_high]
        validity_buffer = hk_data[3:]
        pw.dlog(str(header_list))
        pw.dlog(str(content_list))
        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
--- a/eive_tmtc/pus_tc/devs/plpcdu.py
+++ b/eive_tmtc/pus_tc/devs/plpcdu.py
@ -1,9 +1,11 @@
 import enum
 import logging
 import struct
 import time
 from typing import Optional
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.config import TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
@ -18,17 +20,17 @@ from tmtccmd.tc.pus_11_tc_sched import (
    create_enable_tc_sched_cmd,
    create_time_tagged_cmd,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
-from tmtccmd.tc.pus_20_fsfw_params import (
+from tmtccmd.tc.pus_20_fsfw_param import (
    pack_scalar_double_param_app_data,
    create_load_param_cmd,
    pack_boolean_parameter_app_data,
 )
 from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
 from eive_tmtc.config.object_ids import PL_PCDU_ID
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 class OpCode:
@ -369,10 +371,10 @@ def request_wait_time() -> Optional[float]:
        try:
            wait_time = float(wait_time)
        except ValueError:
-            LOGGER.warning("Invalid input")
+            _LOGGER.warning("Invalid input")
            continue
        if wait_time <= 0:
-            LOGGER.warning("Invalid input")
+            _LOGGER.warning("Invalid input")
        else:
            return wait_time
@ -448,3 +450,50 @@ def pack_pl_pcdu_mode_cmd(
            service=200, subservice=Subservice.TC_MODE_COMMAND, app_data=mode_data
        )
    )
 ADC_CHANNELS_NAMED = [
    "U BAT DIV 6",
    "U NEG V FB",
    "I HPA",
    "U HPA DIV 6",
    "I MPA",
    "U MPA DIV 6",
    "I TX",
    "U TX DIV 6",
    "I X8",
    "U X8 DIV 6",
    "I DRO",
    "U DRO DIV 6",
 ]
 def handle_plpcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    if set_id == SetId.ADC:
        pw = PrintWrapper(printer)
        current_idx = 0
        pw.dlog("Received PL PCDU ADC HK data")
        channels = []
        ch_print = "Channels Raw (hex): ["
        for i in range(12):
            channels.append(
                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
            )
            if i < 11:
                ch_print += f"{channels[i]:06x},"
            else:
                ch_print += f"{channels[i]:06x}]"
            current_idx += 2
        processed_vals = []
        for i in range(12):
            processed_vals.append(
                struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
            )
            current_idx += 4
        temp = struct.unpack("!f", hk_data[current_idx : current_idx + 4])[0]
        current_idx += 4
        pw.dlog(f"Temperature: {temp} C")
        pw.dlog(ch_print)
        for i in range(12):
            pw.dlog(f"{ADC_CHANNELS_NAMED[i].ljust(24)} | {processed_vals[i]}")
        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=3)
--- a/eive_tmtc/tmtc/power/power.py
+++ b/eive_tmtc/tmtc/power/power.py
@ -1,4 +1,5 @@
 import enum
 import logging
 from eive_tmtc.tmtc.power.common_power import (
    PowerOpCodes,
@ -27,7 +28,6 @@ from eive_tmtc.tmtc.power.pdu2 import (
    pdu2_switch_cmds,
    add_pdu2_cmds,
 )
 from tmtccmd import get_console_logger
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from eive_tmtc.tmtc.power.p60dock import P60OpCode, P60Info, p60_dock_req_hk_cmds
@ -37,9 +37,6 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 LOGGER = get_console_logger()
 class SetId(enum.IntEnum):
    SWITCHER_SET = 0
@ -84,7 +81,9 @@ def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
            )
        )
    if q.empty():
-        LOGGER.info(f"Queue is empty, no stack for op code {op_code}")
+        logging.getLogger(__name__).info(
            f"Queue is empty, no stack for op code {op_code}"
        )
@tmtc_definitions_provider
--- a/eive_tmtc/tmtc/solar_array_deployment.py
+++ b/eive_tmtc/tmtc/solar_array_deployment.py
@ -5,6 +5,7 @@
@author J. Meier
@date   15.02.2021
 """
 import logging
 import struct
 from eive_tmtc.config.definitions import CustomServiceList
@ -18,9 +19,6 @@ from tmtccmd.config.tmtc import (
 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
 LOGGER = get_console_logger()
 class OpCode:
@ -90,7 +88,7 @@ def pack_solar_array_deployment_test_into(p: ServiceProviderParams):
 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}")
+        logging.getLogger(__name__).warning(f"Invalid burn time {burn_time}")
        return -1
    return burn_time
@ -102,7 +100,7 @@ def prompt_dry_run() -> int:
    elif dry_run in ["no", "n", "0"]:
        return 0
    else:
-        LOGGER.warning("Invalid input for dry run parameter")
+        logging.getLogger(__name__).warning("Invalid input for dry run parameter")
        return -1
--- a/eive_tmtc/tmtc/tcs/init.py
+++ b/eive_tmtc/tmtc/tcs/init.py
@ -0,0 +1 @@
 from .tm import *  # noqa
--- a/eive_tmtc/tmtc/tcs/brd_assy.py
+++ b/eive_tmtc/tmtc/tcs/brd_assy.py
@ -0,0 +1,57 @@
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import TCS_BOARD_ASS_ID
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode
 class InfoAssy:
    TCS_BOARD_ASS_NORMAL = "Switching TCS board assembly on"
    TCS_BOARD_ASS_OFF = "Switching TCS board assembly off"
 class OpCodeAssy:
    TCS_BOARD_ASS_NORMAL = ["nml"]
    TCS_BOARD_ASS_OFF = ["off"]
@tmtc_definitions_provider
 def add_tcs_assy_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,
    )
 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,
        )
--- a/eive_tmtc/tmtc/tcs/defs.py
+++ b/eive_tmtc/tmtc/tcs/defs.py
@ -0,0 +1,7 @@
 import enum
 class CtrlSetId(enum.IntEnum):
    PRIMARY_SENSORS = 0
    DEVICE_SENSORS = 1
    SUS_TEMP_SENSORS = 2
--- a/eive_tmtc/pus_tc/devs/heater.py
+++ b/eive_tmtc/pus_tc/devs/heater.py
@ -20,7 +20,7 @@ from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
-class SwitchNumber(enum.IntEnum):
+class Heater(enum.IntEnum):
    HEATER_0_OBC_BRD = 0
    HEATER_1_PLOC_PROC_BRD = 1
    HEATER_2_ACS_BRD = 2
@ -165,7 +165,7 @@ def prompt_heater() -> int:
            print("Heater number not a digit")
            continue
        heater_number = int(heater_number)
-        if heater_number >= SwitchNumber.NUMBER_OF_SWITCHES or heater_number < 0:
+        if heater_number >= Heater.NUMBER_OF_SWITCHES or heater_number < 0:
            print("Invalid heater switch number")
            continue
        break
--- a/eive_tmtc/pus_tc/devs/rtd.py
+++ b/eive_tmtc/pus_tc/devs/rtd.py
@ -2,14 +2,13 @@ from typing import Optional
 import struct
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tc.devs.pdec_handler import CommandId
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice
 import eive_tmtc.config.object_ids as oids
 from eive_tmtc.config.object_ids import get_object_ids
--- a/eive_tmtc/tmtc/tcs/subsystem.py
+++ b/eive_tmtc/tmtc/tcs/subsystem.py
@ -0,0 +1,74 @@
 from .defs import CtrlSetId
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import TCS_CONTROLLER, TCS_SUBSYSTEM_ID
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
 from eive_tmtc.tmtc.tcs.brd_assy import pack_tcs_ass_cmds
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 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"
 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, CtrlSetId.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, CtrlSetId.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, CtrlSetId.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)
@tmtc_definitions_provider
 def add_tcs_subsystem_cmds(defs: TmtcDefinitionWrapper):
    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,
    )
--- a/eive_tmtc/tmtc/tcs/tm.py
+++ b/eive_tmtc/tmtc/tcs/tm.py
@ -1,135 +1,10 @@
 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
-
+from .defs import CtrlSetId
 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(
@ -142,7 +17,7 @@ def handle_thermal_controller_hk_data(
    if TCP_TEMP_DEV_SERVER:
        TCP_TEMP_DEV_SERVER = TmTcpServer("localhost", 7306)
    """
-    if set_id == SetId.PRIMARY_SENSORS:
+    if set_id == CtrlSetId.PRIMARY_SENSORS:
        pw = PrintWrapper(printer)
        pw.dlog("Received sensor temperature data")
@ -174,7 +49,7 @@ def handle_thermal_controller_hk_data(
        printer.file_logger.info(str(parsed_data))
        pp = pprint.PrettyPrinter(depth=4)
        pp.pprint(parsed_data)
-    elif set_id == SetId.DEVICE_SENSORS:
+    elif set_id == CtrlSetId.DEVICE_SENSORS:
        pw = PrintWrapper(printer)
        pw.dlog("Received device temperature data")
        fmt_str = "!fhhhhiiiifffhffffffffffffff"
@ -211,7 +86,7 @@ def handle_thermal_controller_hk_data(
        printer.file_logger.info(str(parsed_data))
        pp = pprint.PrettyPrinter(depth=4)
        pp.pprint(parsed_data)
-    elif set_id == SetId.SUS_TEMP_SENSORS:
+    elif set_id == CtrlSetId.SUS_TEMP_SENSORS:
        pw = PrintWrapper(printer)
        pw.dlog("Received SUS temperature data")
        fmt_str = "!ffffffffffffffffff"
--- a/eive_tmtc/pus_tc/devs/tmp1075.py
+++ b/eive_tmtc/pus_tc/devs/tmp1075.py
@ -10,7 +10,7 @@ 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 Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.pus.s8_fsfw_funccmd import make_action_id
 from tmtccmd.util import ObjectIdU32
--- a/eive_tmtc/utility/input_helper.py
+++ b/eive_tmtc/utility/input_helper.py
@ -5,10 +5,10 @@
@author J. Meier
@date   13.02.2021
 """
 import logging
 from tmtccmd.logging import get_console_logger
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 class InputHelper:
@ -25,7 +25,7 @@ class InputHelper:
        """
        key = self.menu_handler()
        while key not in self.menu:
-            LOGGER.info("Invalid key specified, try again.")
+            _LOGGER.info("Invalid key specified, try again.")
            key = self.menu_handler()
        return key
@ -36,11 +36,11 @@ class InputHelper:
        separator_string = separator_width * "-"
        key_string = "Key".ljust(key_column_width)
        description_string = "Description".ljust(description_column_width)
-        LOGGER.info(f"{key_string} | {description_string}")
+        _LOGGER.info(f"{key_string} | {description_string}")
-        LOGGER.info(separator_string)
+        _LOGGER.info(separator_string)
        for key in self.menu:
            key_string = key.ljust(key_column_width)
            description_string = self.menu[key][0].ljust(description_column_width)
-            LOGGER.info(f"{key_string} | {description_string}")
+            _LOGGER.info(f"{key_string} | {description_string}")
        key = input("Specify key: ")
        return key
--- a/setup.cfg
+++ b/setup.cfg
@ -27,8 +27,8 @@ classifiers =
 [options]
 install_requires =
-	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a2
+	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a3
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@c978286a856a2f3a59efc96887dd15c2c17bac6e#egg=tmtccmd
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@d6938b2adf0c5cbf3fe8621292b805ed2a66071e#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True
--- a/tmtcc.py
+++ b/tmtcc.py
@ -6,7 +6,6 @@ import traceback
 from pathlib import Path
 from typing import cast
 from spacepackets import SpacePacketHeader, SpacePacket
 from spacepackets.ccsds import SPACE_PACKET_HEADER_SIZE
 from spacepackets.cfdp import (
    ConditionCode,
@ -17,6 +16,7 @@ from spacepackets.cfdp import (
    PduFactory,
    PduType,
 )
 from tmtccmd.logging import add_colorlog_console_logger
 from tmtccmd.cfdp import CfdpUserBase, TransactionId
 from tmtccmd.cfdp.defs import CfdpRequestType
 from tmtccmd.cfdp.handler import CfdpInCcsdsHandler
@ -54,7 +54,7 @@ except ImportError as error:
    sys.exit(1)
 from spacepackets.ecss import PusVerificator
-from tmtccmd import get_console_logger, TcHandlerBase, BackendBase
+from tmtccmd import TcHandlerBase, BackendBase
 from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
@ -73,6 +73,7 @@ from tmtccmd.tc import (
    TcProcedureType,
    TcQueueEntryType,
    DefaultPusQueueHelper,
    QueueWrapper,
 )
 from tmtccmd.config import (
    default_json_path,
@ -95,7 +96,7 @@ from eive_tmtc.config.hook import EiveHookObject
 from eive_tmtc.pus_tm.factory_hook import pus_factory_hook
 from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure
-LOGGER = get_console_logger()
+_LOGGER = logging.getLogger(__name__)
 # Put rotating file logger parameters here for quick changes
 ROTATING_TIMED_LOGGER_INTERVAL_WHEN = TimedLogWhen.PER_MINUTE
@ -118,13 +119,13 @@ class EiveCfdpFaultHandler(DefaultFaultHandlerBase):
 class EiveCfdpUser(CfdpUserBase):
    def transaction_indication(self, transaction_id: TransactionId):
-        LOGGER.info(f"CFDP User: Start of File {transaction_id}")
+        _LOGGER.info(f"CFDP User: Start of File {transaction_id}")
    def eof_sent_indication(self, transaction_id: TransactionId):
-        LOGGER.info(f"CFDP User: EOF sent for {transaction_id}")
+        _LOGGER.info(f"CFDP User: EOF sent for {transaction_id}")
    def transaction_finished_indication(self, params: TransactionFinishedParams):
-        LOGGER.info(f"CFDP User: {params.transaction_id} finished")
+        _LOGGER.info(f"CFDP User: {params.transaction_id} finished")
    def metadata_recv_indication(self, params: MetadataRecvParams):
        pass
@ -177,7 +178,7 @@ class PusHandler(SpecificApidHandlerBase):
 class UnknownApidHandler(GenericApidHandlerBase):
    def handle_tm(self, apid: int, _packet: bytes, _user_args: any):
-        LOGGER.warning(f"Packet with unknwon APID {apid} detected")
+        _LOGGER.warning(f"Packet with unknwon APID {apid} detected")
 class CfdpInCcsdsWrapper(SpecificApidHandlerBase):
@ -191,12 +192,12 @@ class CfdpInCcsdsWrapper(SpecificApidHandlerBase):
        pdu = packet[SPACE_PACKET_HEADER_SIZE:]
        pdu_base = PduFactory.from_raw(pdu)
        if pdu_base.pdu_type == PduType.FILE_DATA:
-            LOGGER.info("Received File Data PDU TM")
+            _LOGGER.info("Received File Data PDU TM")
        else:
            if pdu_base.directive_type == DirectiveType.FINISHED_PDU:
-                LOGGER.info(f"Received Finished PDU TM")
+                _LOGGER.info(f"Received Finished PDU TM")
            else:
-                LOGGER.info(
+                _LOGGER.info(
                    f"Received File Directive PDU with type {pdu_base.directive_type!r} TM"
                )
        self.handler.pass_pdu_packet(pdu_base)
@ -221,10 +222,11 @@ class TcHandler(TcHandlerBase):
        self.pus_raw_logger = raw_pus_logger
        self.gui = gui
        self.queue_helper = DefaultPusQueueHelper(
-            queue_wrapper=None,
+            queue_wrapper=QueueWrapper.empty(),
-            pus_apid=PUS_APID,
+            default_pus_apid=PUS_APID,
            seq_cnt_provider=seq_count_provider,
            pus_verificator=pus_verificator,
            tc_sched_timestamp_len=4,
        )
        self.cfdp_in_ccsds_wrapper = cfdp_in_ccsds_wrapper
@ -247,16 +249,11 @@ class TcHandler(TcHandlerBase):
        if entry_helper.is_tc:
            if entry_helper.entry_type == TcQueueEntryType.PUS_TC:
                pus_tc_wrapper = entry_helper.to_pus_tc_entry()
-                pus_tc_wrapper.pus_tc.seq_count = (
+                # pus_tc_wrapper.pus_tc.apid = PUS_APID
                    self.seq_count_provider.get_and_increment()
                )
                pus_tc_wrapper.pus_tc.apid = PUS_APID
                # Add TC after Sequence Count stamping
                self.pus_verificator.add_tc(pus_tc_wrapper.pus_tc)
                raw_tc = pus_tc_wrapper.pus_tc.pack()
                self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc)
                tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}"
-                LOGGER.info(tc_info_string)
+                _LOGGER.info(tc_info_string)
                self.high_level_file_logger.info(
                    f"{get_current_time_string(True)}: {tc_info_string}"
                )
@ -276,7 +273,7 @@ class TcHandler(TcHandlerBase):
                # self.cfdp_counter += 1
        elif entry_helper.entry_type == TcQueueEntryType.LOG:
            log_entry = entry_helper.to_log_entry()
-            LOGGER.info(log_entry.log_str)
+            _LOGGER.info(log_entry.log_str)
            self.high_level_file_logger.info(log_entry.log_str)
    def handle_cfdp_procedure(self, info: ProcedureWrapper):
@ -288,7 +285,7 @@ class TcHandler(TcHandlerBase):
            ):
                put_req = cfdp_procedure.request_wrapper.to_put_request()
                put_req.cfg.destination_id = self.cfdp_dest_id
-                LOGGER.info(
+                _LOGGER.info(
                    f"CFDP: Starting file put request with parameters:\n{put_req}"
                )
                self.cfdp_in_ccsds_wrapper.handler.cfdp_handler.put_request(put_req)
@ -322,31 +319,33 @@ class TcHandler(TcHandlerBase):
        if info is not None:
            if info.proc_type == TcQueueEntryType.PUS_TC:
                def_proc = info.to_def_procedure()
-                LOGGER.info(
+                _LOGGER.info(
                    f"Finished queue for service {def_proc.service} and op code {def_proc.op_code}"
                )
            elif info.proc_type == TcProcedureType.CFDP:
-                LOGGER.info(f"Finished CFDP queue")
+                _LOGGER.info(f"Finished CFDP queue")
 def setup_params() -> SetupWrapper:
    print(f"-- eive tmtc v{__version__} --")
    print(f"-- spacepackets v{spacepackets.__version__} --")
    hook_obj = EiveHookObject(default_json_path())
    params = SetupParams()
    parser_wrapper = PreArgsParsingWrapper()
    parser_wrapper.create_default_parent_parser()
    parser_wrapper.create_default_parser()
    parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
-    post_arg_parsing_wrapper = parser_wrapper.parse(hook_obj)
+    post_arg_parsing_wrapper = parser_wrapper.parse(
        setup_params=params, hook_obj=hook_obj
    )
    tmtccmd.init_printout(post_arg_parsing_wrapper.use_gui)
    use_prompts = not post_arg_parsing_wrapper.use_gui
    proc_param_wrapper = ProcedureParamsWrapper()
    if use_prompts:
-        post_arg_parsing_wrapper.set_params_with_prompts(params, proc_param_wrapper)
+        post_arg_parsing_wrapper.set_params_with_prompts(proc_param_wrapper)
    else:
-        post_arg_parsing_wrapper.set_params_without_prompts(params, proc_param_wrapper)
+        post_arg_parsing_wrapper.set_params_without_prompts(proc_param_wrapper)
    params.apid = PUS_APID
    if params.com_if is None:
        raise ValueError("could not determine a COM interface.")
    setup_wrapper = SetupWrapper(
        hook_obj=hook_obj, setup_params=params, proc_param_wrapper=proc_param_wrapper
    )
@ -394,7 +393,9 @@ def setup_tmtc_handlers(
    gui: bool,
 ) -> (CcsdsTmHandler, TcHandler):
    cfdp_in_ccsds_wrapper = setup_cfdp_handler()
-    verification_wrapper = VerificationWrapper(verificator, LOGGER, printer.file_logger)
+    verification_wrapper = VerificationWrapper(
        verificator, _LOGGER, printer.file_logger
    )
    pus_handler = PusHandler(verification_wrapper, printer, raw_logger)
    ccsds_handler = CcsdsTmHandler(generic_handler=UnknownApidHandler(None))
    ccsds_handler.add_apid_handler(pus_handler)
@ -428,11 +429,15 @@ def setup_backend(
 def main():
    print(f"-- eive tmtc v{__version__} --")
    print(f"-- spacepackets v{spacepackets.__version__} --")
    add_colorlog_console_logger(_LOGGER)
    try:
        setup_wrapper = setup_params()
    except KeyboardInterrupt as e:
-        LOGGER.info(f"{e}. Exiting")
+        _LOGGER.info(f"{e}. Exiting")
        sys.exit(0)
    tmtc_logger = RegularTmtcLogWrapper()
    printer = FsfwTmTcPrinter(tmtc_logger.logger)
    raw_logger = RawTmtcTimedLogWrapper(
@ -455,11 +460,11 @@ def main():
            if state.request == BackendRequest.TERMINATION_NO_ERROR:
                sys.exit(0)
            elif state.request == BackendRequest.DELAY_IDLE:
-                LOGGER.info("TMTC Client in IDLE mode")
+                _LOGGER.info("TMTC Client in IDLE mode")
                time.sleep(3.0)
            elif state.request == BackendRequest.DELAY_LISTENER:
                if tc_handler.cfdp_done():
-                    LOGGER.info("CFDP transaction done, closing client")
+                    _LOGGER.info("CFDP transaction done, closing client")
                    sys.exit(0)
                time.sleep(0.5)
            elif state.request == BackendRequest.DELAY_CUSTOM:
Author	SHA1	Message	Date
Robin Mueller	bf06dd70f4	prepare v2.8.0	2023-02-01 18:50:51 +01:00
Robin Mueller	c8ea75b2ad	all import changes	2023-02-01 16:25:17 +01:00
Robin Mueller	6b657b5623	move some modules	2023-02-01 15:58:34 +01:00
Robin Mueller	6c663b473c	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-02-01 11:17:38 +01:00
Robin Mueller	7b5df331ef	refactor logging usage	2023-02-01 11:17:04 +01:00
Robin Mueller	c6478f05fd	bump tmtccmd to version without error file logger	2023-01-31 21:21:08 +01:00
Robin Mueller	b95204ef9e	update changelog	2023-01-31 15:59:41 +01:00
Robin Mueller	f082f05886	better name for heater controller object	2023-01-31 15:58:56 +01:00
Robin Mueller	28b3e4bec7	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-31 15:48:52 +01:00
Robin Mueller	dbd2e5d9fc	rename enumeration	2023-01-31 15:48:43 +01:00
Robin Mueller	3eeb58182b	some more re-ordering	2023-01-31 15:46:49 +01:00
Robin Mueller	48675efe3f	re-order some things	2023-01-31 15:44:51 +01:00
Robin Mueller	b98fc2f56d	import fixes	2023-01-31 15:44:09 +01:00
Robin Mueller	3c20d2ea24	restructure TCS TMTC module	2023-01-31 15:41:51 +01:00
Robin Mueller	2793b354a6	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-01-31 13:18:12 +01:00
Robin Mueller	72fee20d65	bump tmtccmd	2023-01-31 13:17:01 +01:00
Robin Mueller	98af6a7907	update tmtccmd	2023-01-31 12:56:13 +01:00
Robin Mueller	a7f11b3159	update tmtccmd	2023-01-30 17:40:25 +01:00
Robin Mueller	98ba66dba2	disable generic printer	2023-01-30 17:26:48 +01:00
Robin Mueller	28fda7cdbd	bump tmtccmd	2023-01-30 14:53:46 +01:00
Robin Mueller	619bd6b71b	update event handler for tmtccmd update	2023-01-30 14:47:25 +01:00
Robin Mueller	ece20bf177	bump tmtccmd	2023-01-30 14:31:38 +01:00
Robin Mueller	63d7f577b1	this is annoying..	2023-01-28 15:01:31 +01:00
Robin Mueller	6f783441be	retval patch release	2023-01-28 15:00:45 +01:00
Robin Mueller	db70b4bd44	update retvals	2023-01-28 14:57:32 +01:00
Robin Mueller	a4a4a6b666	this should do the job	2023-01-28 14:52:27 +01:00
Robin Mueller	f99a3ab74a	bump minor version	2023-01-28 14:51:25 +01:00
Robin Mueller	a9c23a4453	bump tmtccmd	2023-01-28 14:50:57 +01:00
Robin Mueller	407163397d	update changelog	2023-01-28 14:49:09 +01:00
Robin Mueller	65839f5aec	correct and useful	2023-01-28 14:48:36 +01:00
Robin Mueller	14ed2415a4	reworked param TM handling	2023-01-28 14:36:21 +01:00
Robin Mueller	fb6d5eeb80	move param cmd to com subsystem	2023-01-28 14:30:51 +01:00
Robin Mueller	39a9497494	add default rate command	2023-01-27 20:23:41 +01:00
Robin Mueller	f4702eb701	update objects	2023-01-27 15:56:56 +01:00
Robin Mueller	b7e6a79704	bump changelog	2023-01-27 15:42:22 +01:00
Robin Mueller	b8376c6f48	add COM subsystem commanding	2023-01-27 15:42:00 +01:00
		`@ -0,0 +1 @@`
							`from .subsystem import add_com_subsystem_cmds`