bump changelog

flash c ontent report works now
somethings wrong with the format
2023-05-12 16:27:16 +02:00 · 2023-05-12 16:24:45 +02:00 · 2023-05-12 16:08:57 +02:00 · 2023-05-12 15:51:17 +02:00 · 2023-05-12 13:22:58 +02:00 · 2023-05-12 11:51:47 +02:00
72 changed files with 760 additions and 1270 deletions
--- a/.flake8
+++ b/.flake8
@ -7,7 +7,6 @@ exclude =
 	.git,
 	__pycache__,
 	docs/conf.py,
-	deps
 	old,
 	build,
 	dist,
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,79 +10,12 @@ list yields a list of all related PRs for each release.

 # [unreleased]

-# [v5.3.1] 2023-07-26
-
-## Changed
-
- Adaptions for ACS CTRL strategy enum to make it compatible to software. Also make it re-usable
-  by putting it in global scope.
-
-# [v5.3.0] 2023-07-26
-
-## Added
-
- Dataset handling for new ACS fused rot rate dataset.
-
-# [v5.2.0] 2023-07-13
-
- `tmtccmd` v5.0.0
-
-## Added
-
- New TCS controller events
-
-## Changed
-
- HK level can be specified as CLI argument now.
-
-# [v5.1.0] 2023-06-28
-
-## Added
-
- Internal error reporter dataset handling.
-
-## Fixed
-
- `APP_LOGGER` is the root logger now.
-
-## Changed
-
- HK is only displayed in brief format per default now. This will soon be adaptable by CLI
-  argument.
-
-# [v5.0.0] 2023-06-22
-
-## Changed
-
- Force flag for copy helper.
-
-# [v4.1.0] 2023-06-14
-
-## Added
-
- Some BPX battery commands
-
-# [v4.0.0] 2023-06-10
-
-`tmtccmd` version: v5.0.0rc0
-
 ## Added

 - Event handling for reboot counter events.
 - Start adding new MPSoC commands, improve MPSoC commanding module a bit.
 - Handling for PLOC MPSoC flash content report.

-## Fixed
-
- Fix for PLOC power switching.
- Bump `tmtccmd` to v5.0.0rc0 for important bugfix in CFDP header.
-
-# [v3.1.2] 2023-06-19
-
-## Fixed
-
- Pin `tmtccmd` to v4.1.3 to enforce correct `spacepackets` version on install
-
 # [v3.1.1] 2023-04-17

 ## Added
--- a/automation/Dockerfile
+++ b/automation/Dockerfile
@ -1,9 +0,0 @@
-FROM python:3
-
-RUN apt-get update
-RUN apt-get --yes upgrade
-#tzdata is a dependency, won't install otherwise
-ARG DEBIAN_FRONTEND=noninteractive
-
-#pip needs a valid user to work
-RUN adduser --uid 114 jenkins
--- a/automation/Jenkinsfile
+++ b/automation/Jenkinsfile
@ -1,14 +0,0 @@
-pipeline {
-    agent {
-        docker {
-            image 'eive-tmtc-ci:d2'
-        }
-    }
-    stages {
-        stage('Package') {
-            steps {
-                sh 'pip install .'
-            }
-        }
-    }
-}
--- a/eive_tmtc/init.py
+++ b/eive_tmtc/init.py
@ -1,14 +1,14 @@
-__version__ = "5.3.1"
+__version__ = "3.1.1"

 import logging
 from pathlib import Path

 SW_NAME = "eive-tmtc"
-VERSION_MAJOR = 5
-VERSION_MINOR = 3
+VERSION_MAJOR = 3
+VERSION_MINOR = 1
 VERSION_REVISION = 1

 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

-APP_LOGGER = logging.getLogger()
+APP_LOGGER = logging.getLogger(__name__)
--- a/eive_tmtc/config/definitions.py
+++ b/eive_tmtc/config/definitions.py
@ -9,6 +9,7 @@ import enum
 from spacepackets import PacketType
 from spacepackets.ccsds import PacketId
 from spacepackets.util import UnsignedByteField
+from pathlib import Path


 PUS_APID = 0x65
@ -65,13 +66,12 @@ class CustomServiceList(str, enum.Enum):
    PL_SS = "pl_subsystem"
    ACS_BRD_ASS = "acs_brd_ass"
    SUS_BRD_ASS = "sus_brd_ass"
-    TCS_SS = "tcs_subsystem"
-    TCS_CTRL = "tcs_ctrl"
+    TCS = "tcs"
    TCS_ASS = "tcs_ass"
    TIME = "time"
    PROCEDURE = "proc"
    RTD = "rtd"
-    TMP1075 = "tmp1075"
+    TMP1075 = "tcs_tmp"
    TVTTESTPROCEDURE = "tvtestproc"
    SCEX = "scex"
    TM_STORE = "tm_store"
--- a/eive_tmtc/config/events.csv
+++ b/eive_tmtc/config/events.csv
@ -133,7 +133,6 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11802;0x2e1a;RESET_OCCURED;LOW;No description;mission/acs/rwHelpers.h
 11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h
 11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h
-11903;0x2e7f;COM_ERROR_REPLY_RECEIVED;LOW;Received COM error. P1:  Communication Error ID (datasheet p32);mission/acs/str/StarTrackerHandler.h
 12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h
 12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h
 12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h
@ -178,24 +177,20 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12515;0x30e3;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/acs/StrComHandler.h
 12516;0x30e4;STR_HELPER_SENDING_PACKET_FAILED;LOW;No description;linux/acs/StrComHandler.h
 12517;0x30e5;STR_HELPER_REQUESTING_MSG_FAILED;LOW;No description;linux/acs/StrComHandler.h
-12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/payload/PlocMpsocSpecialComHelper.h
-12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;INFO;Flash write successful;linux/payload/PlocMpsocSpecialComHelper.h
-12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
-12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
-12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
-12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
-12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocSpecialComHelper.h
-12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
-12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
-12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
-12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocSpecialComHelper.h
-12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocSpecialComHelper.h
-12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
-12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
-12614;0x3146;MPSOC_FLASH_READ_PACKET_ERROR;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
-12615;0x3147;MPSOC_FLASH_READ_FAILED;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
-12616;0x3148;MPSOC_FLASH_READ_SUCCESSFUL;INFO;No description;linux/payload/PlocMpsocSpecialComHelper.h
-12617;0x3149;MPSOC_READ_TIMEOUT;LOW;No description;linux/payload/PlocMpsocSpecialComHelper.h
+12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/payload/PlocMpsocHelper.h
+12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/payload/PlocMpsocHelper.h
+12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;No description;linux/payload/PlocMpsocHelper.h
+12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h
+12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h
+12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h
+12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/payload/PlocMpsocHelper.h
+12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h
+12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h
+12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h
+12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/payload/PlocMpsocHelper.h
+12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocHelper.h
+12612;0x3144;MPSOC_TM_SIZE_ERROR;LOW;No description;linux/payload/PlocMpsocHelper.h
+12613;0x3145;MPSOC_TM_CRC_MISSMATCH;LOW;No description;linux/payload/PlocMpsocHelper.h
 12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/payload/PayloadPcduHandler.h
 12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
 12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/payload/PayloadPcduHandler.h
@ -272,8 +267,6 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14010;0x36ba;TRYING_I2C_RECOVERY;HIGH;I2C is unavailable. Trying recovery of I2C bus by power cycling all I2C devices.;mission/sysDefs.h
 14011;0x36bb;I2C_REBOOT;HIGH;I2C is unavailable. Recovery did not work, performing full reboot.;mission/sysDefs.h
 14012;0x36bc;PDEC_REBOOT;HIGH;PDEC recovery through reset was not possible, performing full reboot.;mission/sysDefs.h
-14013;0x36bd;FIRMWARE_INFO;INFO;Version information of the firmware (not OBSW). P1: Byte 0: Major, Byte 1: Minor, Byte 2: Patch, Byte 3: Has Git Hash P2: First four letters of Git SHA is the last byte of P1 is set.;mission/sysDefs.h
-14014;0x36be;ACTIVE_SD_INFO;INFO;Active SD card info. SD States: 0: OFF, 1: ON, 2: MOUNTED. P1: Active SD Card Index, 0 if none is active P2: First two bytes: SD state of SD card 0, last two bytes SD state of SD card 1;mission/sysDefs.h
 14100;0x3714;NO_VALID_SENSOR_TEMPERATURE;MEDIUM;No description;mission/controller/tcsDefs.h
 14101;0x3715;NO_HEALTHY_HEATER_AVAILABLE;MEDIUM;No description;mission/controller/tcsDefs.h
 14102;0x3716;SYRLINKS_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
@ -281,10 +274,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14105;0x3719;CAMERA_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14106;0x371a;PCDU_SYSTEM_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14107;0x371b;HEATER_NOT_OFF_FOR_OFF_MODE;MEDIUM;No description;mission/controller/tcsDefs.h
-14108;0x371c;MGT_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
-14109;0x371d;TCS_SWITCHING_HEATER_ON;INFO;P1: Module index. P2: Heater index;mission/controller/tcsDefs.h
-14110;0x371e;TCS_SWITCHING_HEATER_OFF;INFO;P1: Module index. P2: Heater index;mission/controller/tcsDefs.h
-14111;0x371f;TCS_HEATER_MAX_BURN_TIME_REACHED;MEDIUM;P1: Heater index. P2: Maximum burn time for heater.;mission/controller/tcsDefs.h
+14108;0x371c;MGT_OVERHEATING;MEDIUM;No description;mission/controller/tcsDefs.h
 14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h
 14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h
--- a/eive_tmtc/config/object_ids.py
+++ b/eive_tmtc/config/object_ids.py
@ -8,7 +8,7 @@ import os.path
 from typing import Dict

 from eive_tmtc import EIVE_TMTC_ROOT
-from tmtccmd.util.obj_id import ObjectIdU32
+from tmtccmd.util.obj_id import ObjectIdDictT, ObjectIdU32
 from tmtccmd.fsfw import parse_fsfw_objects_csv


@ -18,7 +18,6 @@ __OBJECT_ID_DICT = None

 # Core Object IDs
 SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x00, 0xA2])
-INTERNAL_ERROR_REPORTER_ID = bytes([0x53, 0x04, 0x00, 0x00])

 # Power Object IDs
 PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])
@ -35,7 +34,6 @@ HEATER_CONTROLLER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
 TMP1075_HANDLER_TCS_BRD_0_ID = bytes([0x44, 0x42, 0x00, 0x04])
 TMP1075_HANDLER_TCS_BRD_1_ID = bytes([0x44, 0x42, 0x00, 0x05])
 TMP1075_HANDLER_PLPCDU_0_ID = bytes([0x44, 0x42, 0x00, 0x06])
-TMP1075_HANDLER_PLPCDU_1_ID = bytes([0x44, 0x42, 0x00, 0x07])
 TMP1075_HANDLER_IF_BRD_ID = bytes([0x44, 0x42, 0x00, 0x08])

 # Communication Object IDs
--- a/eive_tmtc/config/returnvalues.csv
+++ b/eive_tmtc/config/returnvalues.csv
@ -478,8 +478,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;mission/acs/str/StarTrackerHandler.h
 0x53b7;STRH_StartrackerNotRunningFirmware;Star tracker must be in firmware mode to run this command;183;STR_HANDLER;mission/acs/str/StarTrackerHandler.h
 0x53b8;STRH_StartrackerNotRunningBootloader;Star tracker must be in bootloader mode to run this command;184;STR_HANDLER;mission/acs/str/StarTrackerHandler.h
-0x54e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);224;DWLPWRON_CMD;linux/payload/plocMpsocHelpers.h
-0x54e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);225;DWLPWRON_CMD;linux/payload/plocMpsocHelpers.h
+0x54e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);224;DWLPWRON_CMD;linux/payload/plocMpscoDefs.h
+0x54e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);225;DWLPWRON_CMD;linux/payload/plocMpscoDefs.h
 0x5700;PLSPVhLP_RequestDone;No description;0;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h
 0x5701;PLSPVhLP_NoPacketFound;No description;1;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h
 0x5702;PLSPVhLP_DecodeBufTooSmall;No description;2;PLOC_SUPV_HELPER;linux/payload/PlocSupvUartMan.h
@ -543,8 +543,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.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
-0x65a0;PLMPHLP_FileWriteError;File error occured for file transfers from OBC to the MPSoC.;160;PLOC_MPSOC_HELPER;linux/payload/PlocMpsocSpecialComHelper.h
-0x65a1;PLMPHLP_FileReadError;File error occured for file transfers from MPSoC to OBC.;161;PLOC_MPSOC_HELPER;linux/payload/PlocMpsocSpecialComHelper.h
+0x65a0;PLMPHLP_FileClosedAccidentally;File accidentally close;160;PLOC_MPSOC_HELPER;linux/payload/PlocMpsocHelper.h
 0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h
 0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h
 0x66a2;SADPL_MainSwitchTimeoutFailure;No description;162;SA_DEPL_HANDLER;mission/SolarArrayDeploymentHandler.h
--- a/eive_tmtc/gomspace/gomspace_common.py
+++ b/eive_tmtc/gomspace/gomspace_common.py
@ -74,9 +74,7 @@ def pack_get_param_command(
    memory_address: Union[int, bytes],
    parameter_size: int,
 ) -> PusTelecommand:
-    """Function to generate a command to retrieve parameters like the temperature from a
-    gomspace device.
-
+    """Function to generate a command to retrieve parameters like the temperature from a gomspace device.
    @param object_id:   The object id of the gomspace device handler.
    @param table_id:    The table id of the gomspace device
    @param memory_address:  Address offset within table of the value to read.
@ -220,9 +218,9 @@ def prompt_and_pack_set_integer_param_command(

 def pack_ping_command(object_id: ObjectIdU32, data: bytearray) -> PusTelecommand:
    """ " Function to generate the command to ping a gomspace device
-    :param object_id:    Object Id of the gomspace device handler.
-    :param data: Bytearray containing the bytes to send to the gomspace device. For now the on board
-        software supports only the handling of up to 33 bytes.
+    @param object_id    Object Id of the gomspace device handler.
+    @param data Bytearray containing the bytes to send to the gomspace device. For now the on board software
+                supports only the handling of up to 33 bytes.
    @note   The ping request sends the specified data to a gompsace device. These
            data are simply copied by the device and then sent back.
    """
--- a/eive_tmtc/pus_tc/cmd_definitions.py
+++ b/eive_tmtc/pus_tc/cmd_definitions.py
@ -1,5 +1,7 @@
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry, CoreServiceList
 from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
    call_all_definitions_providers,
 )
 from tmtccmd.config.globals import get_default_tmtc_defs
--- a/eive_tmtc/pus_tc/procedure_packer.py
+++ b/eive_tmtc/pus_tc/procedure_packer.py
@ -6,7 +6,6 @@ from typing import cast
 from eive_tmtc.tmtc.acs.gyros import handle_gyr_cmd
 from eive_tmtc.tmtc.acs.mgms import handle_mgm_cmd
 from eive_tmtc.tmtc.power.power import pack_power_commands
-from eive_tmtc.tmtc.tcs.ctrl import pack_tcs_ctrl_commands
 from eive_tmtc.tmtc.tcs.rtd import pack_rtd_commands
 from eive_tmtc.tmtc.payload.scex import pack_scex_cmds
 from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
@ -30,7 +29,7 @@ from eive_tmtc.tmtc.acs.reaction_wheels import (
    pack_rw_ass_cmds,
 )
 from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
-from eive_tmtc.tmtc.com.ccsds_handler import pack_ccsds_handler_command
+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
@ -76,7 +75,7 @@ from tmtccmd.util import ObjectIdU32
 from eive_tmtc.utility.input_helper import InputHelper


-def handle_default_procedure(  # noqa C901: Complexity okay here.
+def handle_default_procedure(
    tc_base: TcHandlerBase,
    info: DefaultProcedureInfo,
    queue_helper: DefaultPusQueueHelper,
@ -100,16 +99,13 @@ def handle_default_procedure(  # noqa C901: Complexity okay here.
    if service == CustomServiceList.ACU.value:
        object_id = cast(ObjectIdU32, obj_id_man.get(ACU_HANDLER_ID))
        return pack_acu_commands(object_id=object_id, q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.TCS_SS.value:
+    if service == CustomServiceList.TCS.value:
        return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.TCS_CTRL.value:
-        return pack_tcs_ctrl_commands(q=queue_helper, op_code=op_code)
    if service == CustomServiceList.TMP1075.value:
        menu_dict = {
            "0": ("TMP1075 TCS Board 0", TMP1075_HANDLER_TCS_BRD_0_ID),
            "1": ("TMP1075 TCS Board 1", TMP1075_HANDLER_TCS_BRD_1_ID),
            "2": ("TMP1075 PL PCDU 0", TMP1075_HANDLER_PLPCDU_0_ID),
-            "3": ("TMP1075 PL PCDU 1", oids.TMP1075_HANDLER_PLPCDU_1_ID),
            "4": ("TMP1075 IF Board", TMP1075_HANDLER_IF_BRD_ID),
        }
        input_helper = InputHelper(menu_dict)
@ -174,7 +170,7 @@ def handle_default_procedure(  # noqa C901: Complexity okay here.
        )
    if service == CustomServiceList.CCSDS_HANDLER.value:
        object_id = cast(ObjectIdU32, obj_id_man.get(CCSDS_HANDLER_ID))
-        return pack_ccsds_handler_command(
+        return pack_ccsds_handler_test(
            object_id=object_id, q=queue_helper, op_code=op_code
        )
    if service == CustomServiceList.PDEC_HANDLER.value:
--- a/eive_tmtc/pus_tc/prompt_parameters.py
+++ b/eive_tmtc/pus_tc/prompt_parameters.py
@ -10,11 +10,14 @@ from PyQt5.QtWidgets import (

 from PyQt5 import QtCore

+from tmtccmd.config import CoreModeList
+from tmtccmd.core.globals_manager import get_global
+

 class Parameter:
-    def __init__(self, name: str, default_value: str, widget: QLineEdit):
+    def __init__(self, name: str, defaultValue: str, widget: QLineEdit):
        self.name = name
-        self.defaultValue = default_value
+        self.defaultValue = defaultValue
        self.widget = widget
        self.value = self.defaultValue
        self.widget.setPlaceholderText(self.defaultValue)
@ -31,9 +34,9 @@ class ParameterDialog(QDialog):

        self.setWindowTitle("Enter Parameters")

-        buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel | QDialogButtonBox.Reset
+        Buttons = QDialogButtonBox.Ok | QDialogButtonBox.Cancel | QDialogButtonBox.Reset

-        self.buttonBox = QDialogButtonBox(buttons)
+        self.buttonBox = QDialogButtonBox(Buttons)
        self.buttonBox.accepted.connect(self.accept)
        self.buttonBox.rejected.connect(self.reject)
        self.buttonBox.button(QDialogButtonBox.Reset).clicked.connect(self._reset)
@ -51,14 +54,14 @@ class ParameterDialog(QDialog):

        self.parameters = {}

-    def add_parameter(self, name: str, default_value: str):
+    def addParameter(self, name: str, defaultValue: str):
        row = self.groupLayout.rowCount() + 1
        description = QLabel(name)
        self.groupLayout.addWidget(description, row, 0)
-        value_widget = QLineEdit()
-        self.groupLayout.addWidget(value_widget, row, 1)
+        valueWidget = QLineEdit()
+        self.groupLayout.addWidget(valueWidget, row, 1)

-        parameter = Parameter(name, default_value, value_widget)
+        parameter = Parameter(name, defaultValue, valueWidget)

        self.parameters[name] = parameter

@ -66,10 +69,10 @@ class ParameterDialog(QDialog):
        for value in self.parameters.values():
            value.reset()

-    def get_parameters(self):
+    def getParameters(self):
        output = {}
        for key, parameter in self.parameters.items():
-            if parameter.widget is not None:
+            if parameter.widget != None:
                if parameter.widget.text() != "":
                    parameter.value = parameter.widget.text()
            output[key] = parameter.value
@ -100,9 +103,9 @@ def prompt_parameters_cli(param_list) -> dict:
 def _gui_prompt(param_list) -> dict:
    dialog = ParameterDialog()
    for parameter in param_list:
-        dialog.add_parameter(parameter["name"], parameter["defaultValue"])
+        dialog.addParameter(parameter["name"], parameter["defaultValue"])
    dialog.exec_()
-    return dialog.get_parameters()
+    return dialog.getParameters()


 def _cli_prompt(param_list) -> dict:
--- a/eive_tmtc/pus_tc/system/init.py
+++ b/eive_tmtc/pus_tc/system/init.py
@ -0,0 +1 @@
+
--- a/eive_tmtc/pus_tc/system/controllers.py
+++ b/eive_tmtc/pus_tc/system/controllers.py
@ -86,8 +86,9 @@ def pack_cmd_ctrl_to_nml(
 def get_object_from_op_code(op_code: str):
    try:
        return bytes.fromhex(op_code)
-    except ValueError:
+    except:
        pass
+
    if op_code in OpCode.THERMAL_CONTROLLER:
        return obj_ids.THERMAL_CONTROLLER_ID
    if op_code in OpCode.CORE_CONTROLLER:
--- a/eive_tmtc/pus_tc/system/proc.py
+++ b/eive_tmtc/pus_tc/system/proc.py
@ -1,12 +1,10 @@
 from __future__ import annotations

-import struct
 import time
 from datetime import timedelta

 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import get_object_ids
-from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider

@ -16,6 +14,7 @@ from tmtccmd.pus.s11_tc_sched import (
    create_enable_tc_sched_cmd,
    create_reset_tc_sched_cmd,
 )
+from tmtccmd.tc.pus_3_fsfw_hk import *

 import eive_tmtc.config.object_ids as oids
 from eive_tmtc.tmtc.tcs.brd_assy import OpCodeAssy as TcsOpCodes
@ -50,11 +49,6 @@ from eive_tmtc.tmtc.acs.gyros import (
    L3gGyroSetId as L3gGyroSetIds_1_3,
 )
 from eive_tmtc.tmtc.acs.gps import SetId as GpsSetIds
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    make_sid,
-    disable_periodic_hk_command,
-    create_enable_periodic_hk_command_with_interval,
-)


 class OpCode:
@ -160,7 +154,7 @@ def add_proc_cmds(defs: TmtcDefinitionWrapper):
    )


-def pack_generic_hk_listening_cmds(  # noqa C901: Complexity okay here.
+def pack_generic_hk_listening_cmds(
    q: DefaultPusQueueHelper,
    proc_key: str,
    sid_list: list[bytearray],
@ -228,9 +222,7 @@ def pack_generic_hk_listening_cmds(  # noqa C901: Complexity okay here.
    diag_list.clear()


-def pack_proc_commands(  # noqa C901: Complexity is okay here.
-    q: DefaultPusQueueHelper, op_code: str
-):  # noqa C901: Complexity okay here.
+def pack_proc_commands(q: DefaultPusQueueHelper, op_code: str):
    sid_list = []
    obj_id_dict = get_object_ids()
    if op_code in OpCode.RESET_SCHED:
@ -741,7 +733,7 @@ def enable_listen_to_hk_for_x_seconds(
    interval_seconds: float,
 ):
    q.add_log_cmd(f"Enabling periodic HK for {device}")
-    cmd_tuple = create_enable_periodic_hk_command_with_interval(
+    cmd_tuple = enable_periodic_hk_command_with_interval(
        diag=diag, sid=sid, interval_seconds=interval_seconds
    )
    for cmd in cmd_tuple:
@ -765,6 +757,7 @@ def gen_disable_listen_to_hk_for_x_seconds(
 def activate_mgts_alternately(
    q: DefaultPusQueueHelper,
 ):
+
    q.add_pus_tc(
        pack_dipole_command(
            object_id=oids.IMTQ_HANDLER_ID,
--- a/eive_tmtc/pus_tm/action_reply_handler.py
+++ b/eive_tmtc/pus_tm/action_reply_handler.py
@ -1,16 +1,5 @@
-import logging
 import struct
-from eive_tmtc.config.object_ids import (
-    ACU_HANDLER_ID,
-    PDU_1_HANDLER_ID,
-    PDU_2_HANDLER_ID,
-    IMTQ_HANDLER_ID,
-    PLOC_MPSOC_ID,
-    PLOC_SUPV_ID,
-    CORE_CONTROLLER_ID,
-    STAR_TRACKER_ID,
-    P60_DOCK_HANDLER,
-)
+from eive_tmtc.config.object_ids import *
 from eive_tmtc.tmtc.acs.imtq import ImtqActionId
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.tmtc.core import handle_core_ctrl_action_replies
@ -19,9 +8,8 @@ from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionId
 from eive_tmtc.tmtc.acs.star_tracker import StarTrackerActionId
 from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.tm import Service8FsfwTm
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from spacepackets.ccsds.time import CdsShortTimestamp
-from tmtccmd.util import ObjectIdDictT

 _LOGGER = logging.getLogger(__name__)

@ -36,7 +24,7 @@ def handle_action_reply(
        raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty()
    )
    object_id = obj_id_dict.get(tm_packet.source_object_id_as_bytes)
-    pw = PrintWrapper(printer.file_logger)
+    pw = PrintWrapper(printer)
    custom_data = tm_packet.custom_data
    action_id = tm_packet.action_id
    generic_print_str = printer.generic_action_packet_tm_print(
@ -44,15 +32,15 @@ def handle_action_reply(
    )
    pw.dlog(generic_print_str)
    if object_id.as_bytes == IMTQ_HANDLER_ID:
-        return handle_imtq_replies(action_id, pw, custom_data)
+        return handle_imtq_replies(action_id, printer, custom_data)
    elif object_id.as_bytes == PLOC_MPSOC_ID:
-        return handle_mpsoc_data_reply(action_id, pw, custom_data)
+        return handle_mpsoc_data_reply(action_id, printer, custom_data)
    elif object_id.as_bytes == PLOC_SUPV_ID:
-        return handle_supervisor_replies(action_id, pw, custom_data)
+        return handle_supervisor_replies(action_id, printer, custom_data)
    elif object_id.as_bytes == CORE_CONTROLLER_ID:
-        return handle_core_ctrl_action_replies(action_id, pw, custom_data)
+        return handle_core_ctrl_action_replies(action_id, printer, custom_data)
    elif object_id.as_bytes == STAR_TRACKER_ID:
-        return handle_startracker_replies(action_id, pw, custom_data)
+        return handle_startracker_replies(action_id, printer, custom_data)
    elif object_id.as_bytes in [
        ACU_HANDLER_ID,
        PDU_1_HANDLER_ID,
@ -65,7 +53,9 @@ def handle_action_reply(
        pw.dlog(f"Raw Data: {tm_packet.custom_data.hex(sep=',')}")


-def handle_imtq_replies(action_id: int, pw: PrintWrapper, custom_data: bytearray):
+def handle_imtq_replies(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
    if action_id == struct.unpack("!I", ImtqActionId.get_commanded_dipole)[0]:
        header_list = [
            "Commanded X-Dipole",
@ -74,25 +64,33 @@ def handle_imtq_replies(action_id: int, pw: PrintWrapper, custom_data: bytearray
        ]
        [x_dipole, y_dipole, z_dipole] = struct.unpack("!HHH", custom_data[0:6])
        content_list = [x_dipole, y_dipole, z_dipole]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)


-def handle_supervisor_replies(action_id: int, pw: PrintWrapper, custom_data: bytearray):
+def handle_supervisor_replies(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
    if action_id == SupvActionId.DUMP_MRAM:
        header_list = ["MRAM Dump"]
        content_list = [custom_data[: len(custom_data)]]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
    elif action_id == SupvActionId.READ_GPIO:
        header_list = ["GPIO state"]
        content_list = [struct.unpack("!H", custom_data[:2])[0]]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)


 def handle_startracker_replies(
-    action_id: int, pw: PrintWrapper, custom_data: bytearray
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
 ):
    if action_id == StarTrackerActionId.CHECKSUM:
        if len(custom_data) != 5:
@ -104,5 +102,7 @@ def handle_startracker_replies(
        print(custom_data[4])
        checksum_valid_flag = custom_data[4] >> 8
        content_list = ["0x" + custom_data[:4].hex(), checksum_valid_flag]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
--- a/eive_tmtc/pus_tm/defs.py
+++ b/eive_tmtc/pus_tm/defs.py
@ -1,27 +1,19 @@
 import logging
-from typing import Optional

-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class PrintWrapper:
-    def __init__(self, file_logger: Optional[logging.Logger]):
-        self.file_logger = file_logger
+    def __init__(self, printer: FsfwTmTcPrinter):
+        self.printer = printer

    def dlog(self, string: str):
        print(string)
-        if self.file_logger:
-            self.file_logger.info(string)
-
-    def wlog(self, logger: logging.Logger, string: str):
-        logger.warning(string)
-        if self.file_logger:
-            self.file_logger.warning(string)
+        self.printer.file_logger.info(string)

    def ilog(self, logger: logging.Logger, string: str):
        logger.info(string)
-        if self.file_logger:
-            self.file_logger.info(string)
+        self.printer.file_logger.info(string)


 def log_to_both(printer: FsfwTmTcPrinter, string: str):
--- a/eive_tmtc/pus_tm/event_handler.py
+++ b/eive_tmtc/pus_tm/event_handler.py
@ -1,5 +1,6 @@
 import logging
 import datetime
+import struct
 import sys

 from eive_tmtc.config.events import get_event_dict
@ -7,20 +8,19 @@ from eive_tmtc.config.object_ids import get_object_ids
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.pus_tm.verification_handler import generic_retval_printout
 from eive_tmtc.tmtc.acs.subsystem import AcsMode
-from eive_tmtc.tmtc.core import SdState, SdCardSelect
 from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.tc.pus_201_fsfw_health import FsfwHealth

 from tmtccmd.tm import Service5Tm
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.fsfw import EventInfo
 from spacepackets.ccsds.time import CdsShortTimestamp

 _LOGGER = logging.getLogger(__name__)


-def handle_event_packet(  # noqa C901: Complexity okay here
-    raw_tm: bytes, pw: PrintWrapper
-):  # noqa C901: Complexity okay here
+def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
+    pw = PrintWrapper(printer)
    tm = Service5Tm.unpack(data=raw_tm, time_reader=CdsShortTimestamp.empty())
    event_dict = get_event_dict()
    event_def = tm.event_definition
@ -36,12 +36,9 @@ def handle_event_packet(  # noqa C901: Complexity okay here
        obj_name = event_def.reporter_id.hex(sep=",")
    else:
        obj_name = obj_id_obj.name
-    generic_event_string = (
-        f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x}) "
-        f"at {tm.time_provider.as_date_time()}"
-    )
+    generic_event_string = f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x}) at {tm.time_provider.as_date_time()}"
    _LOGGER.info(generic_event_string)
-    pw.file_logger.info(
+    pw.printer.file_logger.info(
        f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
    )
    specific_handler = False
@ -54,8 +51,8 @@ def handle_event_packet(  # noqa C901: Complexity okay here
    if info.name == "SUPV_UPDATE_PROGRESS" or info.name == "WRITE_MEMORY_FAILED":
        additional_event_info = f"Additional info: {info.info}"
        context = (
-            f"Progress Percent: {event_def.param1 >> 24 & 0xff} | "
-            f"Sequence Count: {event_def.param1 & 0xffff} | Bytes Written: {event_def.param2}"
+            f"Progress Percent: {event_def.param1 >> 24 & 0xff} | Sequence Count: {event_def.param1 & 0xffff} "
+            f"| Bytes Written: {event_def.param2}"
        )
        pw.dlog(additional_event_info)
        pw.dlog(context)
@ -81,8 +78,7 @@ def handle_event_packet(  # noqa C901: Complexity okay here
            elif event_def.param1 == Mode.RAW:
                mode_name = "Raw"
            pw.dlog(
-                f"Mode Number {event_def.param1}, Mode Name {mode_name}, "
-                f"Submode: {event_def.param2}"
+                f"Mode Number {event_def.param1}, Mode Name {mode_name}, Submode: {event_def.param2}"
            )
    if info.name == "INDIVIDUAL_BOOT_COUNTS":
        boot_count_00 = (event_def.param1 >> 16) & 0xFFFF
@ -96,7 +92,7 @@ def handle_event_packet(  # noqa C901: Complexity okay here
    if info.name == "REBOOT_COUNTER":
        boot_count = (event_def.param1 << 32) | event_def.param2
        pw.dlog(f"Total boot count: {boot_count}")
-    if info.name == "VERSION_INFO" or info.name == "FIRMWARE_INFO":
+    if info.name == "VERSION_INFO":
        specific_handler = True
        ver_major = (event_def.param1 >> 24) & 0xFF
        ver_minor = (event_def.param1 >> 16) & 0xFF
@ -106,11 +102,8 @@ def handle_event_packet(  # noqa C901: Complexity okay here
        if has_git_sha:
            p2_as_bytes = event_def.param2.to_bytes(4, sys.byteorder)
            git_sha = p2_as_bytes.decode("ascii")
-        if info.name == "VERSION_INFO":
-            name = "OBSW version: "
-        else:
-            name = "Firmware version: "
-        pw.dlog(f"{name} v{ver_major}.{ver_minor}.{ver_rev}")
+        version_string = f"v{ver_major}.{ver_minor}.{ver_rev}"
+        pw.dlog(f"Version {version_string}")
        if has_git_sha:
            pw.dlog(f"Git SHA first four letters: {git_sha}")
    if info.name == "CLOCK_SET":
@ -127,21 +120,6 @@ def handle_event_packet(  # noqa C901: Complexity okay here
        time = event_def.param1 + event_def.param2 / 1000.0
        time_dt = datetime.datetime.fromtimestamp(time, datetime.timezone.utc)
        pw.dlog(f"Current time: {time_dt}")
-    if info.name == "ACTIVE_SD_INFO":
-        sd_0_state = (event_def.param2 >> 16) & 0xFFFF
-        sd_1_state = event_def.param2 & 0xFFFF
-        active_sd = event_def.param1
-        try:
-            active_sd = SdCardSelect(event_def.param1)
-            sd_0_state = SdState((event_def.param2 >> 16) & 0xFFFF)
-            sd_1_state = SdState(event_def.param2 & 0xFFFF)
-        except IndexError:
-            _LOGGER.error(f"Received invalid event fields for event {event_def}")
-        finally:
-            pw.dlog(
-                f"Active SD card {active_sd!r} | SD 0 State {sd_0_state!r} | SD 1 "
-                f"State {sd_1_state!r}"
-            )
    if info.name == "HEALTH_INFO":
        specific_handler = True
        health = FsfwHealth(event_def.param1)
@ -151,10 +129,7 @@ def handle_event_packet(  # noqa C901: Complexity okay here
        submode = event_def.param2
        pw.dlog(f"Mode Number {mode}, Submode: {submode}")
    if not specific_handler:
-        additional_event_info = (
-            f"Additional info: {info.info} | P1: {event_def.param1} | "
-            f"P2: {event_def.param2}"
-        )
+        additional_event_info = f"Additional info: {info.info} | P1: {event_def.param1} | P2: {event_def.param2}"
        pw.dlog(additional_event_info)
    if not specific_handler:
        # printer.handle_long_tm_print(packet_if=tm.pus_tm, info_if=tm.pus_tm)
--- a/eive_tmtc/pus_tm/factory_hook.py
+++ b/eive_tmtc/pus_tm/factory_hook.py
@ -13,47 +13,42 @@ from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm
 from tmtccmd.tm.pus_20_fsfw_param import Service20ParamDumpWrapper
 from tmtccmd.pus.s20_fsfw_param_defs import CustomSubservice as ParamSubservice
 from tmtccmd.tm.pus_200_fsfw_mode import Subservice as ModeSubservice
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from .defs import PrintWrapper

 from .event_handler import handle_event_packet
 from .verification_handler import handle_service_1_fsfw_packet, generic_retval_printout
-from .hk_handler import handle_hk_packet
+from .hk_handling import handle_hk_packet
 from .action_reply_handler import handle_action_reply

 _LOGGER = logging.getLogger(__name__)


-def pus_factory_hook(  # noqa C901 : Complexity okay here
+def pus_factory_hook(
    packet: bytes,
    verif_wrapper: VerificationWrapper,
    printer: FsfwTmTcPrinter,
    raw_logger: RawTmtcTimedLogWrapper,
-    hk_level: int,
 ):
    if len(packet) < 8:
        _LOGGER.warning("Detected packet shorter than 8 bytes!")
        return
    try:
        tm_packet = PusTelemetry.unpack(packet, CdsShortTimestamp.empty())
-        # _LOGGER.info(f"Sequence count: {tm_packet.seq_count}")
-    except ValueError as value_error:
-        _LOGGER.warning(f"{value_error}")
+    except ValueError:
        _LOGGER.warning("Could not generate PUS TM object from raw data")
        _LOGGER.warning(f"Raw Packet: [{packet.hex(sep=',')}], REPR: {packet!r}")
        return
    service = tm_packet.service
    obj_id_dict = get_object_ids()
-    pw = PrintWrapper(printer.file_logger)
+    pw = PrintWrapper(printer)
    dedicated_handler = True
    if service == 1:
        handle_service_1_fsfw_packet(wrapper=verif_wrapper, raw_tm=packet)
    elif service == 3:
-        handle_hk_packet(
-            printer=printer, raw_tm=packet, obj_id_dict=obj_id_dict, hk_level=hk_level
-        )
+        handle_hk_packet(printer=printer, raw_tm=packet, obj_id_dict=obj_id_dict)
    elif service == 5:
-        handle_event_packet(raw_tm=packet, pw=pw)
+        handle_event_packet(raw_tm=packet, printer=printer)
    elif service == 8:
        handle_action_reply(raw_tm=packet, printer=printer, obj_id_dict=obj_id_dict)
    elif service == 17:
@ -82,7 +77,7 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
                        elif isinstance(scalar_param, float):
                            pw.dlog(f"Scalar floating point parameter: {scalar_param}")
                    except ValueError as e:
-                        pw.dlog(f"received {e} trying to parse scalar parameter")
+                        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
--- a/eive_tmtc/pus_tm/hk_handling.py
+++ b/eive_tmtc/pus_tm/hk_handling.py
@ -1,8 +1,9 @@
 """HK Handling for EIVE OBSW"""
+import datetime
 import logging

+# from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
 from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_hk_data
-from eive_tmtc.tmtc.internal_err_reporter import handle_ier_hk_data
 from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_ploc_mpsoc_hk_data
 from eive_tmtc.tmtc.tcs.rtd import RTD_NAMES, handle_rtd_hk
 from eive_tmtc.tmtc.acs.star_tracker import handle_str_hk_data
@ -13,7 +14,6 @@ from eive_tmtc.tmtc.payload.ploc_supervisor import handle_supv_hk_data
 from eive_tmtc.tmtc.acs.reaction_wheels import handle_rw_hk_data
 from eive_tmtc.tmtc.com.syrlinks_handler import handle_syrlinks_hk_data
 from eive_tmtc.tmtc.tcs import handle_thermal_controller_hk_data
-from eive_tmtc.tmtc.tcs.tmp1075 import handle_tmp_1075_hk_data
 from spacepackets.ecss import PusTelemetry
 from tmtccmd.tm.pus_3_fsfw_hk import (
    Service3Base,
@ -34,7 +34,7 @@ from eive_tmtc.tmtc.power.tm import (
 from eive_tmtc.tmtc.acs.imtq import (
    handle_imtq_hk,
 )
-from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter, PrintWrapper
+from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter
 from eive_tmtc.tmtc.core import handle_core_hk_data
 from eive_tmtc.tmtc.acs.mgms import handle_mgm_hk_data
 import eive_tmtc.config.object_ids as obj_ids
@ -47,7 +47,9 @@ FORWARD_SENSOR_TEMPS = False


 def handle_hk_packet(
-    raw_tm: bytes, obj_id_dict: ObjectIdDictT, printer: FsfwTmTcPrinter, hk_level: int
+    raw_tm: bytes,
+    obj_id_dict: ObjectIdDictT,
+    printer: FsfwTmTcPrinter,
 ):
    tm_packet = Service3FsfwTm.unpack(raw_telemetry=raw_tm, custom_hk_handling=False)
    named_obj_id = obj_id_dict.get(tm_packet.object_id.as_bytes)
@ -55,25 +57,26 @@ def handle_hk_packet(
        named_obj_id = tm_packet.object_id
    if tm_packet.subservice == 25 or tm_packet.subservice == 26:
        hk_data = tm_packet.tm_data[8:]
-
+        if FORWARD_SENSOR_TEMPS:
+            # TODO: Maybe use singleton?
+            # TCP_SEVER_SENSOR_TEMPERATURES.report_raw_hk_data(
+            #     object_id=named_obj_id, set_id=tm_packet.set_id, hk_data=hk_data
+            # )
+            pass
        printer.generic_hk_tm_print(
            content_type=HkContentType.HK,
            object_id=named_obj_id,
            set_id=tm_packet.set_id,
            hk_data=hk_data,
        )
-
        try:
-            if hk_level == 1:
-                pass
-            elif hk_level > 1:
-                handle_regular_hk_print(
-                    printer=printer,
-                    object_id=named_obj_id,
-                    hk_packet=tm_packet,
-                    tm=tm_packet.pus_tm,
-                    hk_data=hk_data,
-                )
+            handle_regular_hk_print(
+                printer=printer,
+                object_id=named_obj_id,
+                hk_packet=tm_packet,
+                tm=tm_packet.pus_tm,
+                hk_data=hk_data,
+            )
        except ValueError as e:
            _LOGGER.exception(
                f"{e} error when parsing HK data coming from {named_obj_id}"
@ -82,7 +85,7 @@ def handle_hk_packet(
        _LOGGER.warning("HK definitions printout not implemented yet")


-def handle_regular_hk_print(  # noqa C901: Complexity okay here
+def handle_regular_hk_print(
    printer: FsfwTmTcPrinter,
    object_id: ObjectIdU32,
    hk_packet: Service3Base,
@ -92,37 +95,40 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
    objb = object_id.as_bytes
    set_id = hk_packet.set_id
    packet_dt = tm.time_provider.as_date_time()
-    pw = PrintWrapper(printer.file_logger)
    """This function is called when a Service 3 Housekeeping packet is received."""
    if objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
-        return handle_rw_hk_data(pw, object_id, set_id, hk_data)
+        return handle_rw_hk_data(printer, object_id, set_id, hk_data)
    elif objb == obj_ids.SYRLINKS_HANDLER_ID:
-        return handle_syrlinks_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+        return handle_syrlinks_hk_data(printer=printer, hk_data=hk_data, set_id=set_id)
    elif objb == obj_ids.IMTQ_HANDLER_ID:
-        return handle_imtq_hk(pw=pw, hk_data=hk_data, set_id=set_id)
+        return handle_imtq_hk(printer=printer, hk_data=hk_data, set_id=set_id)
    elif objb == obj_ids.GPS_CONTROLLER:
-        return handle_gps_data(pw=pw, hk_data=hk_data)
+        return handle_gps_data(printer=printer, hk_data=hk_data)
    elif objb == obj_ids.PCDU_HANDLER_ID:
-        return handle_pcdu_hk(pw=pw, set_id=set_id, hk_data=hk_data)
+        return handle_pcdu_hk(printer=printer, set_id=set_id, hk_data=hk_data)
    elif objb == obj_ids.BPX_HANDLER_ID:
-        return handle_bpx_hk_data(hk_data=hk_data, set_id=set_id, pw=pw)
+        return handle_bpx_hk_data(hk_data=hk_data, set_id=set_id, printer=printer)
    elif objb == obj_ids.CORE_CONTROLLER_ID:
-        return handle_core_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+        return handle_core_hk_data(printer=printer, hk_data=hk_data, set_id=set_id)
    elif objb == obj_ids.PDU_1_HANDLER_ID:
-        return handle_pdu_data(pw=pw, pdu_idx=1, set_id=set_id, hk_data=hk_data)
+        return handle_pdu_data(
+            printer=printer, pdu_idx=1, set_id=set_id, hk_data=hk_data
+        )
    elif objb == obj_ids.PDU_2_HANDLER_ID:
-        return handle_pdu_data(pw=pw, pdu_idx=2, set_id=set_id, hk_data=hk_data)
+        return handle_pdu_data(
+            printer=printer, pdu_idx=2, set_id=set_id, hk_data=hk_data
+        )
    elif objb == obj_ids.PLOC_MPSOC_ID:
-        return handle_ploc_mpsoc_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+        return handle_ploc_mpsoc_hk_data(
+            printer=printer, hk_data=hk_data, set_id=set_id
+        )
    elif objb == obj_ids.ACU_HANDLER_ID:
-        return handle_acu_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
-    elif objb == obj_ids.INTERNAL_ERROR_REPORTER_ID:
-        return handle_ier_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+        return handle_acu_hk_data(printer=printer, hk_data=hk_data, set_id=set_id)
    elif objb == obj_ids.RAD_SENSOR_ID:
-        return handle_rad_sensor_data(pw=pw, hk_data=hk_data, set_id=set_id)
+        return handle_rad_sensor_data(printer=printer, hk_data=hk_data, set_id=set_id)
    elif objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
        return handle_rw_hk_data(
-            pw=pw, object_id=object_id, set_id=set_id, hk_data=hk_data
+            printer=printer, object_id=object_id, set_id=set_id, hk_data=hk_data
        )
    if objb in [
        obj_ids.SUS_0_N_LOC_XFYFZM_PT_XF,
@ -138,11 +144,13 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
        obj_ids.SUS_10_R_LOC_XMYBZF_PT_ZF,
        obj_ids.SUS_11_R_LOC_XBYMZB_PT_ZB,
    ]:
-        return handle_sus_hk(object_id=object_id, hk_data=hk_data, pw=pw, set_id=set_id)
+        return handle_sus_hk(
+            object_id=object_id, hk_data=hk_data, printer=printer, set_id=set_id
+        )
    elif objb in RTD_NAMES.keys():
-        return handle_rtd_hk(object_id=objb, hk_data=hk_data, pw=pw)
+        return handle_rtd_hk(object_id=objb, hk_data=hk_data, printer=printer)
    elif objb == obj_ids.P60_DOCK_HANDLER:
-        return handle_p60_hk_data(pw=pw, set_id=set_id, hk_data=hk_data)
+        return handle_p60_hk_data(printer=printer, set_id=set_id, hk_data=hk_data)
    elif objb in [
        obj_ids.GYRO_0_ADIS_HANDLER_ID,
        obj_ids.GYRO_1_L3G_HANDLER_ID,
@ -150,7 +158,7 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
        obj_ids.GYRO_3_L3G_HANDLER_ID,
    ]:
        return handle_gyros_hk_data(
-            object_id=object_id, hk_data=hk_data, pw=pw, set_id=set_id
+            object_id=object_id, hk_data=hk_data, printer=printer, set_id=set_id
        )
    elif objb in [
        obj_ids.MGM_0_LIS3_HANDLER_ID,
@ -159,29 +167,21 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
        obj_ids.MGM_3_RM3100_HANDLER_ID,
    ]:
        return handle_mgm_hk_data(
-            object_id=object_id, hk_data=hk_data, pw=pw, set_id=set_id
+            object_id=object_id, hk_data=hk_data, printer=printer, set_id=set_id
        )
    elif objb == obj_ids.PL_PCDU_ID:
-        return handle_plpcdu_hk(set_id=set_id, hk_data=hk_data, pw=pw)
+        return handle_plpcdu_hk(set_id=set_id, hk_data=hk_data, printer=printer)
    elif objb == obj_ids.THERMAL_CONTROLLER_ID:
        return handle_thermal_controller_hk_data(
-            object_id=object_id, pw=pw, set_id=set_id, hk_data=hk_data
+            object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
        )
    elif objb == obj_ids.STAR_TRACKER_ID:
-        return handle_str_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
+        return handle_str_hk_data(set_id=set_id, hk_data=hk_data, printer=printer)
    elif objb == obj_ids.PLOC_SUPV_ID:
-        return handle_supv_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
-    elif objb in [
-        obj_ids.TMP1075_HANDLER_TCS_BRD_0_ID,
-        obj_ids.TMP1075_HANDLER_TCS_BRD_1_ID,
-        obj_ids.TMP1075_HANDLER_IF_BRD_ID,
-        obj_ids.TMP1075_HANDLER_PLPCDU_0_ID,
-        obj_ids.TMP1075_HANDLER_PLPCDU_1_ID,
-    ]:
-        return handle_tmp_1075_hk_data(set_id=set_id, hk_data=hk_data, pw=pw)
+        return handle_supv_hk_data(set_id=set_id, hk_data=hk_data, printer=printer)
    elif objb == obj_ids.ACS_CONTROLLER:
        return handle_acs_ctrl_hk_data(
-            pw=pw, set_id=set_id, hk_data=hk_data, packet_time=packet_dt
+            printer=printer, set_id=set_id, hk_data=hk_data, packet_time=packet_dt
        )
    else:
        _LOGGER.info(
--- a/eive_tmtc/pus_tm/tm_tcp_server.py
+++ b/eive_tmtc/pus_tm/tm_tcp_server.py
@ -1,17 +1,18 @@
-import logging
 import socket
 from typing import Optional
 import json
 import base64

+from tmtccmd.logging import get_console_logger
 from tmtccmd.util.obj_id import ObjectIdU32
 from dle_encoder import DleEncoder

-_LOGGER = logging.getLogger(__name__)
+LOGGER = get_console_logger()


 class TmTcpServer:
    def __init__(self, ip_address: str, port: int):
+
        self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)

        self.server_socket.bind((ip_address, port))
@ -28,8 +29,8 @@ class TmTcpServer:
    def __del__(self):
        try:
            self.close()
-        except IOError:
-            _LOGGER.warning("Could not close sockets!")
+        except:
+            LOGGER.warning("Could not close sockets!")

    def close(self):
        self.server_socket.close()
@ -44,7 +45,8 @@ class TmTcpServer:
                (self.client_connection, _) = self.server_socket.accept()
                self.client_connection.setblocking(False)
                print("Client connected")
-            except IOError:
+            except:
+                # no client waiting
                return

        data_json_bytes = json.dumps(dictionary).encode()
@ -55,7 +57,7 @@ class TmTcpServer:

        try:
            sent_length = self.client_connection.send(data_json_bytes)
-        except IOError:
+        except:
            self.client_connection = None
            return
        if sent_length == 0:
@ -63,6 +65,7 @@ class TmTcpServer:
            self.client_connection = None

    def report_raw_hk_data(self, object_id: ObjectIdU32, set_id: int, hk_data: bytes):
+
        data_dict = {
            "type": "TM",
            "tmType": "Raw HK",
--- a/eive_tmtc/tmtc/init.py
+++ b/eive_tmtc/tmtc/init.py
@ -5,4 +5,3 @@ from .time import add_time_cmds
 from .health import add_health_cmd_defs
 from .system import add_system_cmd_defs
 from .tm_store import add_persistent_tm_store_cmd_defs
-from .tcs import add_tmp_sens_cmds
--- a/eive_tmtc/tmtc/acs/acs_ctrl.py
+++ b/eive_tmtc/tmtc/acs/acs_ctrl.py
@ -28,7 +28,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    create_request_one_diag_command,
 )
 from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 from tmtccmd.tc.pus_20_fsfw_param import create_load_param_cmd

@ -59,7 +59,6 @@ class SetId(enum.IntEnum):
    MEKF_DATA = 7
    CTRL_VAL_DATA = 8
    ACTUATOR_CMD_DATA = 9
-    FUSED_ROT_RATE_DATA = 10


 class ActionId(enum.IntEnum):
@ -68,29 +67,6 @@ class ActionId(enum.IntEnum):
    RESTORE_MEKF_NONFINITE_RECOVERY = 2


-CTRL_STRAT_DICT = {
-    0: "OFF",
-    1: "NO_MAG_FIELD_FOR_CONTROL",
-    2: "NO_SENSORS_FOR_CONTROL",
-    # OBSW <= v6.1.0
-    10: "LEGACY_SAFE_MEKF",
-    11: "LEGACY_WITHOUT_MEKF",
-    12: "LEGACY_ECLIPSE_DAMPING",
-    13: "LEGACY_ECLIPSE_IDELING",
-    # Added in OBSW v6.2.0
-    14: "SAFE_MEKF",
-    15: "SAFE_GYR",
-    16: "SAFE_SUSMGM",
-    17: "SAFE_ECLIPSE_DAMPING_GYR",
-    18: "SAFE_ECLIPSE_DAMPING_SUSMGM",
-    19: "SAFE_ECLIPSE_IDELING",
-    20: "DETUMBLE_FULL",
-    21: "DETUMBLE_DETERIORATED",
-    30: "PTG_MEKF",
-    31: "PTG_RAW",
-}
-
-
 class OpCodes:
    OFF = ["off"]
    SAFE = ["safe"]
@ -136,9 +112,6 @@ class OpCodes:
    REQUEST_ACT_CMD_HK = ["act_cmd_hk"]
    ENABLE_ACT_CMD_HK = ["act_cmd_enable_hk"]
    DISABLE_ACT_CMD_HK = ["act_cmd_disable_hk"]
-    REQUEST_FUSED_ROT_RATE_HK = ["f_rot_rate_hk"]
-    ENABLE_FUSED_ROT_RATE_HK = ["f_rot_rate_enable_hk"]
-    DISABLE_FUSED_ROT_RATE_HK = ["f_rot_rate_disable_hk"]


 class Info:
@ -186,9 +159,6 @@ class Info:
    REQUEST_ACT_CMD_HK = "Request Actuator Commands HK"
    ENABLE_ACT_CMD_HK = "Enable Actuator Commands HK data generation"
    DISABLE_ACT_CMD_HK = "Disable Actuator Commands HK data generation"
-    REQUEST_FUSED_ROT_RATE_HK = "Request Fused Rotational Rates HK"
-    ENABLE_FUSED_ROT_RATE_HK = "Enable Fused Rotational Rates HK data generation"
-    DISABLE_FUSED_ROT_RATE_HK = "Disable Fused Rotational Rates HK data generation"


 PERFORM_MGM_CALIBRATION = False
@ -253,16 +223,13 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper):
    oce.add(keys=OpCodes.REQUEST_ACT_CMD_HK, info=Info.REQUEST_ACT_CMD_HK)
    oce.add(keys=OpCodes.ENABLE_ACT_CMD_HK, info=Info.ENABLE_ACT_CMD_HK)
    oce.add(keys=OpCodes.DISABLE_ACT_CMD_HK, info=Info.DISABLE_ACT_CMD_HK)
-    oce.add(keys=OpCodes.REQUEST_FUSED_ROT_RATE_HK, info=Info.REQUEST_FUSED_ROT_RATE_HK)
-    oce.add(keys=OpCodes.ENABLE_FUSED_ROT_RATE_HK, info=Info.ENABLE_FUSED_ROT_RATE_HK)
-    oce.add(keys=OpCodes.DISABLE_FUSED_ROT_RATE_HK, info=Info.DISABLE_FUSED_ROT_RATE_HK)
    defs.add_service(
        name=CustomServiceList.ACS_CTRL.value, info="ACS Controller", op_code_entry=oce
    )


@service_provider(CustomServiceList.ACS_CTRL.value)
-def pack_acs_ctrl_command(p: ServiceProviderParams):  # noqa C901
+def pack_acs_ctrl_command(p: ServiceProviderParams):
    op_code = p.op_code
    q = p.queue_helper
    if op_code in OpCodes.OFF:
@ -517,26 +484,6 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):  # noqa C901
                False, make_sid(ACS_CONTROLLER, SetId.ACTUATOR_CMD_DATA)
            )
        )
-    elif op_code in OpCodes.REQUEST_FUSED_ROT_RATE_HK:
-        q.add_log_cmd(Info.REQUEST_FUSED_ROT_RATE_HK)
-        q.add_pus_tc(
-            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.FUSED_ROT_RATE_DATA))
-        )
-    elif op_code in OpCodes.ENABLE_FUSED_ROT_RATE_HK:
-        interval = float(input("Please specify interval in floating point seconds: "))
-        q.add_log_cmd(Info.ENABLE_FUSED_ROT_RATE_HK)
-        cmd_tuple = enable_periodic_hk_command_with_interval(
-            False, make_sid(ACS_CONTROLLER, SetId.FUSED_ROT_RATE_DATA), interval
-        )
-        q.add_pus_tc(cmd_tuple[0])
-        q.add_pus_tc(cmd_tuple[1])
-    elif op_code in OpCodes.DISABLE_FUSED_ROT_RATE_HK:
-        q.add_log_cmd(Info.DISABLE_FUSED_ROT_RATE_HK)
-        q.add_pus_tc(
-            disable_periodic_hk_command(
-                False, make_sid(ACS_CONTROLLER, SetId.FUSED_ROT_RATE_DATA)
-            )
-        )
    else:
        logging.getLogger(__name__).info(f"Unknown op code {op_code}")

@ -560,7 +507,7 @@ def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
                        domain_id=sid,
                        unique_id=pid,
                        parameter=param,
-                    )
+                    ).pack()
                )
            )
        case 1:
@ -572,7 +519,7 @@ def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
                        domain_id=sid,
                        unique_id=pid,
                        parameter=param,
-                    )
+                    ).pack()
                )
            )
        case 2:
@ -584,7 +531,7 @@ def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
                        domain_id=sid,
                        unique_id=pid,
                        parameter=param,
-                    )
+                    ).pack()
                )
            )
        case 3:
@ -596,7 +543,7 @@ def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
                        domain_id=sid,
                        unique_id=pid,
                        parameter=param,
-                    )
+                    ).pack()
                )
            )
        case 4:
@ -608,7 +555,7 @@ def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
                        domain_id=sid,
                        unique_id=pid,
                        parameter=param,
-                    )
+                    ).pack()
                )
            )

@ -656,7 +603,7 @@ def set_acs_ctrl_param_vector(q: DefaultPusQueueHelper):
                            domain_id=sid,
                            unique_id=pid,
                            parameters=param,
-                        )
+                        ).pack()
                    )
                )
            else:
@ -689,7 +636,7 @@ def set_acs_ctrl_param_matrix(q: DefaultPusQueueHelper):
                            domain_id=sid,
                            unique_id=pid,
                            parameters=param,
-                        )
+                        ).pack()
                    )
                )
            else:
@ -716,7 +663,7 @@ def set_acs_ctrl_param_matrix(q: DefaultPusQueueHelper):
                            domain_id=sid,
                            unique_id=pid,
                            parameters=param,
-                        )
+                        ).pack()
                    )
                )
            else:
@ -725,11 +672,12 @@ def set_acs_ctrl_param_matrix(q: DefaultPusQueueHelper):


 def handle_acs_ctrl_hk_data(
-    pw: PrintWrapper,
+    printer: FsfwTmTcPrinter,
    set_id: int,
    hk_data: bytes,
    packet_time: datetime.datetime,
 ):
+    pw = PrintWrapper(printer)
    pw.ilog(_LOGGER, f"Received ACS CTRL HK with packet time {packet_time}")
    match set_id:
        case SetId.MGM_RAW_SET:
@ -752,8 +700,6 @@ def handle_acs_ctrl_hk_data(
            handle_ctrl_val_data(pw, hk_data)
        case SetId.ACTUATOR_CMD_DATA:
            handle_act_cmd_data(pw, hk_data)
-        case SetId.FUSED_ROT_RATE_DATA:
-            handle_fused_rot_rate_data(pw, hk_data)


 def handle_acs_ctrl_sus_raw_data(pw: PrintWrapper, hk_data: bytes):
@ -775,7 +721,7 @@ def handle_acs_ctrl_sus_raw_data(pw: PrintWrapper, hk_data: bytes):
        sus_list_formatted = vec_fmt.format(*sus_list)
        current_idx += length
        pw.dlog(f"SUS {idx} RAW: {sus_list_formatted}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=12)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=12)


 def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
@ -811,7 +757,7 @@ def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
    sun_ijk_model = vec_fmt.format(*sun_ijk_model)
    current_idx += inc_len
    pw.dlog(f"{'SUS ijk Model'.ljust(25)}: {sun_ijk_model}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=15)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=15)


 def handle_raw_mgm_data(pw: PrintWrapper, hk_data: bytes):
@ -866,7 +812,7 @@ def handle_raw_mgm_data(pw: PrintWrapper, hk_data: bytes):
        pw.dlog(f"{entry[0].ljust(28)}: {entry[1]}")
    current_idx += 1
    assert current_idx == 61
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=6)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=6)


 def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
@ -920,7 +866,7 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
    current_idx += inc_len
    if PERFORM_MGM_CALIBRATION:
        perform_mgm_calibration(pw, mgm_3)
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=8)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=8)


 def handle_gyr_data_raw(pw: PrintWrapper, hk_data: bytes):
@ -954,7 +900,7 @@ def handle_gyr_data_raw(pw: PrintWrapper, hk_data: bytes):
    pw.dlog(f"{'GYR 1 L3'.ljust(15)}: {float_str_fmt.format(*gyr_1_l3)}")
    pw.dlog(f"{'GYR 2 ADIS'.ljust(15)}: {float_str_fmt.format(*gyr_2_adis)}")
    pw.dlog(f"{'GYR 3 L3'.ljust(15)}: {float_str_fmt.format(*gyr_3_l3)}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 4)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], 4)


 GYR_NAMES = ["GYR 0 ADIS", "GYR 1 L3", "GYR 2 ADIS", "GYR 3 L3"]
@ -980,7 +926,7 @@ def handle_gyr_data_processed(pw: PrintWrapper, hk_data: bytes):
    ]
    pw.dlog(f"GYR Vec Total: {gyr_vec_tot}")
    current_idx += inc_len
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=5)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=5)


 def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
@ -1033,7 +979,7 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
    pw.dlog(f"GPS Altitude: {alt} [m]")
    pw.dlog(f"GPS Position: {pos} [m]")
    pw.dlog(f"GPS Velocity: {velo} [m/s]")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=5)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=5)


 def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
@ -1077,10 +1023,21 @@ def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
        pw.dlog(f"{'MEKF Raw Status (key unknown)'.ljust(25)}: {status}")
    pw.dlog(f"{'MEKF Quaternion'.ljust(25)}: {fmt_str_4.format(*quat)}")
    pw.dlog(f"{'MEKF Rotational Rate'.ljust(25)}: {fmt_str_3.format(*rates)}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)


 def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
+    safe_strat = {
+        0: "OFF",
+        1: "NO_MAG_FIELD_FOR_CONTROL",
+        2: "NO_SENSORS_FOR_CONTROL",
+        10: "ACTIVE_MEKF",
+        11: "WITHOUT_MEKF",
+        12: "ECLIPSE_DAMPING",
+        13: "ECLIPSE_IDELING",
+        20: "DETUMBLE_FULL",
+        21: "DETUMBLE_DETERIORATED",
+    }
    pw.dlog("Received CTRL Values Set")
    fmt_strat = "!B"
    fmt_quat = "!dddd"
@ -1126,15 +1083,15 @@ def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
        )
    ]
    current_idx += inc_len_vec
-    if CTRL_STRAT_DICT.get(strat) is not None:
-        pw.dlog(f"{'Safe Ctrl Strategy'.ljust(25)}: {CTRL_STRAT_DICT[strat]}")
+    if safe_strat.get(strat) is not None:
+        pw.dlog(f"{'Safe Ctrl Strategy'.ljust(25)}: {safe_strat[strat]}")
    else:
        pw.dlog(f"{'Safe Ctrl Strategy (key unknown)'.ljust(25)}: {strat}")
    pw.dlog(f"Control Values Target Quaternion: {tgt_quat}")
    pw.dlog(f"Control Values Error Quaternion: {err_quat}")
    pw.dlog(f"Control Values Error Angle: {err_ang} [deg]")
    pw.dlog(f"Control Values Target Rotational Rate: {tgt_rot} [deg/s]")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=5)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=5)


 def handle_act_cmd_data(pw: PrintWrapper, hk_data: bytes):
@ -1173,47 +1130,10 @@ def handle_act_cmd_data(pw: PrintWrapper, hk_data: bytes):
    pw.dlog(f"Actuator Commands RW Target Torque: {rw_tgt_torque}")
    pw.dlog(f"Actuator Commands RW Target Speed: {rw_tgt_speed}")
    pw.dlog(f"Actuator Commands MTQ Target Dipole: {mtq_tgt_dipole}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)


-def handle_fused_rot_rate_data(pw: PrintWrapper, hk_data: bytes):
-    pw.dlog("Received Fused Rotation Rates Data Set")
-    fmt_vec3_double = "!ddd"
-    inc_len_vec3_double = struct.calcsize(fmt_vec3_double)
-    if len(hk_data) < 3 * inc_len_vec3_double:
-        pw.dlog("Received HK set too small")
-        return
-    current_idx = 0
-    rot_rate_orthogonal = [
-        f"{val*180/math.pi:8.3f}"
-        for val in struct.unpack(
-            fmt_vec3_double, hk_data[current_idx : current_idx + inc_len_vec3_double]
-        )
-    ]
-    current_idx += inc_len_vec3_double
-    rot_rate_parallel = [
-        f"{val*180/math.pi:8.3f}"
-        for val in struct.unpack(
-            fmt_vec3_double, hk_data[current_idx : current_idx + inc_len_vec3_double]
-        )
-    ]
-    current_idx += inc_len_vec3_double
-    rot_rate_total = [
-        f"{val*180/math.pi:8.3f}"
-        for val in struct.unpack(
-            fmt_vec3_double, hk_data[current_idx : current_idx + inc_len_vec3_double]
-        )
-    ]
-    current_idx += inc_len_vec3_double
-    pw.dlog(f"Fused Rotational Rate Orthogonal: {rot_rate_orthogonal} [deg/s]")
-    pw.dlog(f"Fused Rotational Rate Parallel: {rot_rate_parallel} [deg/s]")
-    pw.dlog(f"Fused Rotational Rate Total: {rot_rate_total} [deg/s]")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
-
-
-def perform_mgm_calibration(  # noqa C901: Complexity okay
-    pw: PrintWrapper, mgm_tuple: Tuple
-):  # noqa C901: Complexity okay
+def perform_mgm_calibration(pw: PrintWrapper, mgm_tuple: Tuple):
    global CALIBR_SOCKET, CALIBRATION_ADDR
    try:
        declare_api_cmd = "declare_api_version 2"
@ -1227,7 +1147,7 @@ def perform_mgm_calibration(  # noqa C901: Complexity okay
            return
        else:
            if str(reply[0]) == "0":
-                pw.dlog("MGM calibration: API version 2 was not accepted")
+                pw.dlog(f"MGM calibration: API version 2 was not accepted")
                return
        if len(mgm_tuple) != 3:
            pw.dlog(f"MGM tuple has invalid length {len(mgm_tuple)}")
@ -1245,7 +1165,7 @@ def perform_mgm_calibration(  # noqa C901: Complexity okay
            return
        else:
            if str(reply[0]) == "0":
-                pw.dlog("MGM calibration: magnetmeter field format was not accepted")
+                pw.dlog(f"MGM calibration: magnetmeter field format was not accepted")
                return
        pw.dlog(f"Sent data {mgm_list} to Helmholtz Testbench successfully")
    except socket.timeout:
@ -1253,6 +1173,6 @@ def perform_mgm_calibration(  # noqa C901: Complexity okay
    except BlockingIOError as e:
        pw.dlog(f"Error {e}")
    except ConnectionResetError as e:
-        pw.dlog(f"Socket was closed: {e}")
+        pw.dlog("Socket was closed")
    except ConnectionRefusedError or OSError:
        pw.dlog("Connecting to Calibration Socket on addrss {} failed")
--- a/eive_tmtc/tmtc/acs/gps.py
+++ b/eive_tmtc/tmtc/acs/gps.py
@ -15,7 +15,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    create_enable_periodic_hk_command_with_interval,
    create_disable_periodic_hk_command,
 )
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 _LOGGER = logging.getLogger(__name__)

@ -87,7 +87,8 @@ def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
        q.add_pus_tc(create_mode_command(object_id, Mode.OFF, 0))


-def handle_gps_data(pw: PrintWrapper, hk_data: bytes):
+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"
@ -123,6 +124,4 @@ def handle_gps_data(pw: PrintWrapper, hk_data: bytes):
    )
    pw.dlog(f"GNSS Date: {date_string}")
    pw.dlog(f"Unix seconds {unix_seconds}")
-    FsfwTmTcPrinter.get_validity_buffer(
-        validity_buffer=hk_data[current_idx:], num_vars=14
-    )
+    printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=14)
--- a/eive_tmtc/tmtc/acs/gyros.py
+++ b/eive_tmtc/tmtc/acs/gyros.py
@ -25,6 +25,7 @@ from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tm.defs import PrintWrapper

 from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class OpCode:
@ -61,7 +62,7 @@ GYR_SEL_DICT = {

 def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):
    print("Please select the Gyro Device")
-    for k, v in GYR_SEL_DICT.items():
+    for (k, v) in GYR_SEL_DICT.items():
        print(f"{k}: {v[0]}")
    sel_idx = int(input("Select gyro device by index: "))
    gyr_info = GYR_SEL_DICT[GyrSel(sel_idx)]
@ -106,24 +107,29 @@ def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):


 def handle_gyros_hk_data(
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    if object_id.as_bytes in [
        obj_ids.GYRO_0_ADIS_HANDLER_ID,
        obj_ids.GYRO_2_ADIS_HANDLER_ID,
    ]:
-        handle_adis_gyro_hk(object_id=object_id, pw=pw, set_id=set_id, hk_data=hk_data)
+        handle_adis_gyro_hk(
+            object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
+        )
    elif object_id.as_bytes in [
        obj_ids.GYRO_1_L3G_HANDLER_ID,
        obj_ids.GYRO_3_L3G_HANDLER_ID,
    ]:
-        handle_l3g_gyro_hk(object_id=object_id, pw=pw, set_id=set_id, hk_data=hk_data)
+        handle_l3g_gyro_hk(
+            object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
+        )


 def handle_adis_gyro_hk(
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    if set_id == AdisGyroSetId.CORE_HK:
+        pw = PrintWrapper(printer)
        fmt_str = "!ddddddf"
        inc_len = struct.calcsize(fmt_str)
        (
@ -143,6 +149,7 @@ def handle_adis_gyro_hk(
        pw.dlog(f"Acceleration (m/s^2): X {accel_x} | Y {accel_y} | Z {accel_z}")
        pw.dlog(f"Temperature {temp} C")
    if set_id == AdisGyroSetId.CFG_HK:
+        pw = PrintWrapper(printer)
        fmt_str = "!HBHHH"
        inc_len = struct.calcsize(fmt_str)
        print(len(hk_data))
@ -161,9 +168,10 @@ def handle_adis_gyro_hk(


 def handle_l3g_gyro_hk(
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    if set_id == L3gGyroSetId.CORE_HK:
+        pw = PrintWrapper(printer)
        fmt_str = "!ffff"
        inc_len = struct.calcsize(fmt_str)
        (angVelocX, angVelocY, angVelocZ, temp) = struct.unpack(
--- a/eive_tmtc/tmtc/acs/imtq.py
+++ b/eive_tmtc/tmtc/acs/imtq.py
@ -24,12 +24,13 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    generate_one_diag_command,
    generate_one_hk_command,
    create_request_one_diag_command,
+    create_enable_periodic_hk_command,
    create_disable_periodic_hk_command,
    create_enable_periodic_hk_command_with_interval,
 )
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 _LOGGER = logging.getLogger(__name__)
@ -128,9 +129,7 @@ def add_imtq_cmds(defs: TmtcDefinitionWrapper):
    defs.add_service(CustomServiceList.IMTQ.value, "IMQT Device", oce)


-def pack_imtq_test_into(  # noqa C901
-    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
-):
+def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
    q.add_log_cmd(
        f"Testing ISIS IMTQ handler with object id: {object_id.as_hex_string}"
    )
@ -427,27 +426,26 @@ ENG_HK_HEADERS = [
 ]


-def handle_imtq_hk(pw: PrintWrapper, hk_data: bytes, set_id: int):
+def handle_imtq_hk(printer: FsfwTmTcPrinter, hk_data: bytes, set_id: int):
    if (set_id >= ImtqSetId.POSITIVE_X_TEST) and (set_id <= ImtqSetId.NEGATIVE_Z_TEST):
-        return handle_self_test_data(pw, hk_data)
+        return handle_self_test_data(printer, hk_data)
    elif set_id == ImtqSetId.ENG_HK_NO_TORQUE:
-        return handle_eng_set(pw, hk_data, False)
+        return handle_eng_set(printer, hk_data, False)
    elif set_id == ImtqSetId.ENG_HK_SET_WITH_TORQUE:
-        return handle_eng_set(pw, hk_data, True)
+        return handle_eng_set(printer, hk_data, True)
    elif set_id == ImtqSetId.CAL_MTM_SET:
-        return handle_calibrated_mtm_measurement(pw, hk_data)
+        return handle_calibrated_mtm_measurement(printer, hk_data)
    elif set_id == ImtqSetId.RAW_MTM_NO_TORQUE:
-        return handle_raw_mtm_measurement(pw, hk_data, False)
+        return handle_raw_mtm_measurement(printer, hk_data, False)
    elif set_id == ImtqSetId.RAW_MTM_WITH_TORQUE:
-        return handle_raw_mtm_measurement(pw, hk_data, True)
+        return handle_raw_mtm_measurement(printer, hk_data, True)
    elif set_id == ImtqSetId.DIPOLES:
-        return handle_dipole_set(pw, hk_data)
+        return handle_dipole_set(printer, hk_data)
    elif set_id == ImtqSetId.STATUS_SET:
-        return handle_status_set(pw, hk_data)
+        return handle_status_set(printer, hk_data)
    else:
-        pw.wlog(
-            _LOGGER,
-            f"IMTQ handler HK reply with unknown or unimplemented set id {set_id}",
+        _LOGGER.warning(
+            f"IMTQ handler HK reply with unknown or unimplemented set id {set_id}"
        )


@ -459,7 +457,8 @@ def unpack_status_set(hk_data: bytes) -> List:
    return [status_mode, status_error, status_conf, status_uptime]


-def handle_dipole_set(pw: PrintWrapper, hk_data: bytes):
+def handle_dipole_set(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
    pw.dlog("Received iMTQ dipole set")
    fmt_str = "!hhhH"
    fmt_len = struct.calcsize(fmt_str)
@ -470,7 +469,7 @@ def handle_dipole_set(pw: PrintWrapper, hk_data: bytes):
    pw.dlog(f"Dipole Y: {dipole_y}")
    pw.dlog(f"Dipole Z: {dipole_z}")
    pw.dlog(f"Current torque duration: {current_torque_duration}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[fmt_len:], 2)
+    pw.printer.print_validity_buffer(hk_data[fmt_len:], 2)


 def unpack_eng_hk(hk_data: bytes) -> List:
@ -501,7 +500,8 @@ def unpack_eng_hk(hk_data: bytes) -> List:
    return content_list


-def handle_eng_set(pw: PrintWrapper, hk_data: bytes, torque_on: bool):
+def handle_eng_set(printer: FsfwTmTcPrinter, hk_data: bytes, torque_on: bool):
+    pw = PrintWrapper(printer)
    pw.dlog(f"Found engineering HK. Torque Status: {torque_on}")
    content_list = unpack_eng_hk(hk_data)
    validity_buffer = hk_data[32:]
@ -509,28 +509,22 @@ def handle_eng_set(pw: PrintWrapper, hk_data: bytes, torque_on: bool):
    num_of_vars = len(ENG_HK_HEADERS)
    for k, v in zip(ENG_HK_HEADERS, content_list):
        pw.dlog(f"{k.ljust(30)}: {v}")
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=num_of_vars
-        )
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)


-def handle_status_set(pw: PrintWrapper, hk_data: bytes):
+def handle_status_set(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
    content_list = unpack_status_set(hk_data)
    validity_buffer = hk_data[7:]

    num_of_vars = 4
    for k, v in zip(STATUS_HEADERS, content_list):
        pw.dlog(f"{k.ljust(30)}: {v}")
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=num_of_vars
-        )
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)


-def handle_calibrated_mtm_measurement(pw: PrintWrapper, hk_data: bytes):
+def handle_calibrated_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
    header_list = [
        "Calibrated MTM X [nT]",
        "Calibrated MTM Y [nT]",
@ -546,14 +540,13 @@ def handle_calibrated_mtm_measurement(pw: PrintWrapper, hk_data: bytes):
    num_of_vars = len(header_list)
    pw.dlog(str(header_list))
    pw.dlog(str(content_list))
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=num_of_vars
-        )
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)


-def handle_raw_mtm_measurement(pw: PrintWrapper, hk_data: bytes, torque_status: bool):
+def handle_raw_mtm_measurement(
+    printer: FsfwTmTcPrinter, hk_data: bytes, torque_status: bool
+):
+    pw = PrintWrapper(printer)
    pw.dlog(f"Found raw MTM measurement. Torque Status: {torque_status}")
    header_list = [
        "Raw MTM X [nT]",
@ -570,14 +563,11 @@ def handle_raw_mtm_measurement(pw: PrintWrapper, hk_data: bytes, torque_status:
    num_of_vars = 2
    pw.dlog(str(header_list))
    pw.dlog(str(content_list))
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=num_of_vars
-        )
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)


-def handle_self_test_data(pw: PrintWrapper, hk_data: bytes):
+def handle_self_test_data(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
    header_list = [
        "Init Err",
        "Init Raw Mag X [nT]",
@ -681,7 +671,7 @@ def handle_self_test_data(pw: PrintWrapper, hk_data: bytes):
        init_coil_z_temperature,
        err,
        raw_mag_x,
-        raw_mag_y,
+        init_raw_mag_y,
        raw_mag_z,
        cal_mag_x,
        cal_mag_y,
@ -709,8 +699,4 @@ def handle_self_test_data(pw: PrintWrapper, hk_data: bytes):
    num_of_vars = len(header_list)
    pw.dlog(str(header_list))
    pw.dlog(str(content_list))
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=num_of_vars
-        )
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)
--- a/eive_tmtc/tmtc/acs/mgms.py
+++ b/eive_tmtc/tmtc/acs/mgms.py
@ -17,6 +17,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider, TmtcDefinitionWrapper
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class OpCode:
@ -49,7 +50,7 @@ MGM_SEL_DICT = {

 def handle_mgm_cmd(q: DefaultPusQueueHelper, op_code: str):
    print("Please select the MGM Device")
-    for k, v in MGM_SEL_DICT.items():
+    for (k, v) in MGM_SEL_DICT.items():
        print(f"{k}: {v[0]}")
    sel_idx = int(input("Select MGM device by index: "))
    mgm_info = MGM_SEL_DICT[MgmSel(sel_idx)]
@ -63,25 +64,26 @@ def handle_mgm_cmd(q: DefaultPusQueueHelper, op_code: str):


 def handle_mgm_hk_data(
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    if object_id.as_bytes in [
        obj_ids.MGM_0_LIS3_HANDLER_ID,
        obj_ids.MGM_2_LIS3_HANDLER_ID,
    ]:
-        handle_mgm_lis3_hk_data(object_id, pw, set_id, hk_data)
+        handle_mgm_lis3_hk_data(object_id, printer, set_id, hk_data)
    elif object_id.as_bytes in [
        obj_ids.MGM_1_RM3100_HANDLER_ID,
        obj_ids.MGM_3_RM3100_HANDLER_ID,
    ]:
-        handle_mgm_rm3100_hk_data(object_id, pw, set_id, hk_data)
+        handle_mgm_rm3100_hk_data(object_id, printer, set_id, hk_data)
    pass


 def handle_mgm_lis3_hk_data(
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    if set_id == MgmLis3SetId.CORE_HK:
+        pw = PrintWrapper(printer)
        fmt_str = "!ffff"
        inc_len = struct.calcsize(fmt_str)
        (field_x, field_y, field_z, temp) = struct.unpack(
@ -95,10 +97,11 @@ def handle_mgm_lis3_hk_data(


 def handle_mgm_rm3100_hk_data(
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    if set_id == MgmRm3100SetId.CORE_HK:
-        fmt_str = "!fff"
+        pw = PrintWrapper(printer)
+        fmt_str = f"!fff"
        inc_len = struct.calcsize(fmt_str)
        (field_x, field_y, field_z) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
        pw.dlog(f"Received MGM RM3100 from object {object_id}")
--- a/eive_tmtc/tmtc/acs/reaction_wheels.py
+++ b/eive_tmtc/tmtc/acs/reaction_wheels.py
@ -25,7 +25,7 @@ from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class OpCodesDev:
@ -144,7 +144,7 @@ def add_rw_cmds(defs: TmtcDefinitionWrapper):
    )


-def pack_single_rw_test_into(  # noqa C901: Complexity is okay here.
+def pack_single_rw_test_into(
    object_id: bytes, rw_idx: int, q: DefaultPusQueueHelper, op_code: str
 ):
    if op_code == OpCodesDev.SPEED:
@ -288,8 +288,10 @@ def pack_set_speed_command(


 def handle_rw_hk_data(
-    pw: PrintWrapper, object_id: ObjectIdU32, set_id: int, hk_data: bytes
+    printer: FsfwTmTcPrinter, object_id: ObjectIdU32, set_id: int, hk_data: bytes
 ):
+
+    pw = PrintWrapper(printer)
    current_idx = 0
    if set_id == RwSetId.STATUS_SET_ID:
        pw.dlog(
@ -314,7 +316,7 @@ def handle_rw_hk_data(
            f"Current Limit Control mode {clc_mode}. 0: Low Current Mode (0.3 A), "
            f"1: High Current Mode (0.6 A)"
        )
-        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 5))
+        printer.print_validity_buffer(hk_data[current_idx:], 5)
    if set_id == RwSetId.LAST_RESET:
        pw.dlog(
            f"Received Last Reset HK (ID {set_id}) from Reaction Wheel {object_id.name}"
@ -373,7 +375,7 @@ def handle_rw_hk_data(
            f"State {state}. 0: Error, 1: Idle, 2: Coasting, 3: Running, speed stable, "
            f"4: Running, speed  changing"
        )
-        pw.dlog("Number Of Invalid Packets:")
+        pw.dlog(f"Number Of Invalid Packets:")
        pw.dlog("CRC | Length | CMD")
        pw.dlog(
            f"{num_invalid_crc_packets} | {num_invalid_len_packets} | {num_invalid_cmd_packets}"
@ -384,8 +386,8 @@ def handle_rw_hk_data(
        )
        pw.dlog("UART COM information:")
        pw.dlog(
-            "NumBytesWritten | NumBytesRead | ParityErrs | NoiseErrs | FrameErrs | "
-            "RegOverrunErrs | TotalErrs"
+            f"NumBytesWritten | NumBytesRead | ParityErrs | NoiseErrs | FrameErrs | "
+            f"RegOverrunErrs | TotalErrs"
        )
        pw.dlog(
            f"{uart_num_of_bytes_written} | {uart_num_of_bytes_read} | {uart_num_parity_errors} | "
@ -393,16 +395,14 @@ def handle_rw_hk_data(
            f"{uart_total_num_errors}"
        )
        pw.dlog("SPI COM Info:")
-        pw.dlog("NumBytesWritten | NumBytesRead | RegOverrunErrs | TotalErrs")
+        pw.dlog(f"NumBytesWritten | NumBytesRead | RegOverrunErrs | TotalErrs")
        pw.dlog(
            f"{spi_num_bytes_written} | {spi_num_bytes_read} | {spi_num_reg_overrun_errors} | "
            f"{spi_total_num_errors}"
        )
        if current_idx > 0:
-            pw.dlog(
-                FsfwTmTcPrinter.get_validity_buffer(
-                    validity_buffer=hk_data[current_idx:], num_vars=27
-                )
+            printer.print_validity_buffer(
+                validity_buffer=hk_data[current_idx:], num_vars=27
            )


--- a/eive_tmtc/tmtc/acs/star_tracker.py
+++ b/eive_tmtc/tmtc/acs/star_tracker.py
@ -20,7 +20,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_diag_command, make_sid
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.config.object_ids import STR_ASSEMBLY, STAR_TRACKER_ID

 _LOGGER = logging.getLogger(__name__)
@ -65,6 +65,7 @@ class StarTrackerActionId(enum.IntEnum):
    CHANGE_DOWNLOAD_IMAGE = 57
    SET_JSON_FILE_NAME = 58
    SET_FLASH_READ_FILENAME = 59
+    SET_TIME = 60
    DOWNLOAD_DBIMAGE = 61
    DOWNLOAD_BLOBPIXEL = 62
    DOWNLOAD_FPGA_IMAGE = 63
@ -89,7 +90,6 @@ class StarTrackerActionId(enum.IntEnum):
    LOG_SUBSCRIPTION = 82
    DEBUG_CAMERA = 83
    FIRMWARE_UPDATE = 84
-    SET_TIME_FROM_SYS_TIME = 87


 class OpCodes:
@ -104,7 +104,6 @@ class OpCodes:
    UPLOAD_IMAGE = "upload_image"
    SET_IMG_PROCESSOR_MODE = "set_img_proc_mode"
    FW_UPDATE = "fw_update"
-    SET_TIME_FROM_SYS_TIME = "set_time"


 class Info:
@ -114,7 +113,6 @@ class Info:
    TAKE_IMAGE = "Take Image"
    SET_IMG_PROCESSOR_MODE = "Set Image Processor Mode"
    FW_UPDATE = "Firmware Update"
-    SET_TIME_FROM_SYS_TIME = "Set time from system time"


 class SetId(enum.IntEnum):
@ -204,7 +202,7 @@ def prompt_object_id_mode_cmd() -> bytes:
        return STAR_TRACKER_ID


-def pack_star_tracker_commands(  # noqa C901
+def pack_star_tracker_commands(
    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
    q.add_log_cmd(
@ -440,9 +438,14 @@ def pack_star_tracker_commands(  # noqa C901
        q.add_log_cmd("Star tracker: Get checksum")
        data = pack_checksum_command(obyt)
        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == OpCodes.SET_TIME_FROM_SYS_TIME:
-        q.add_log_cmd(Info.SET_TIME_FROM_SYS_TIME)
-        data = obyt + struct.pack("!I", StarTrackerActionId.SET_TIME_FROM_SYS_TIME)
+    if op_code == "38":
+        q.add_log_cmd("Star tracker: Set time")
+        unix_time = 1640783543
+        data = (
+            obyt
+            + struct.pack("!I", StarTrackerActionId.SET_TIME)
+            + struct.pack("!Q", unix_time)
+        )
        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
    if op_code == "39":
        q.add_log_cmd("Star tracker: Download Centroid")
@ -482,6 +485,34 @@ def pack_star_tracker_commands(  # noqa C901
            + struct.pack("!B", type)
        )
        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == "44":
+        q.add_log_cmd("Star tracker: Download FPGA Image")
+        position = int(input("Start position: "))
+        length = int(input("Size to download: "))
+        data = (
+            obyt
+            + struct.pack("!I", StarTrackerActionId.DOWNLOAD_FPGA_IMAGE)
+            + struct.pack("!I", position)
+            + struct.pack("!I", length)
+            + bytearray(FileDefs.downloadFpgaImagePath, "utf-8")
+        )
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == "45":
+        q.add_log_cmd("Star tracker: Change donwload FPGA image file name")
+        data = (
+            obyt
+            + struct.pack("!I", StarTrackerActionId.CHANGE_FPGA_DOWNLOAD_FILE)
+            + bytearray(FileDefs.downloadFpgaImageName, "utf-8")
+        )
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == "46":
+        q.add_log_cmd("Star tracker: Upload FPGA image")
+        data = (
+            obyt
+            + struct.pack("!I", StarTrackerActionId.UPLOAD_FPGA_IMAGE)
+            + bytearray(FileDefs.uploadFpgaImageName, "utf-8")
+        )
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
    if op_code == "47":
        q.add_log_cmd("Star tracker: FPGA action")
        id = 3
@ -676,7 +707,8 @@ def get_upload_image() -> str:
    return image


-def handle_str_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
+def handle_str_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
+    pw = PrintWrapper(printer)
    pw.dlog(f"Received STR HK set with set ID {set_id}")
    if set_id == SetId.SOLUTION:
        handle_solution_set(hk_data, pw)
@ -693,7 +725,7 @@ def unpack_time_hk(hk_data: bytes, current_idx: int, pw: PrintWrapper) -> int:
        ticks_time_fmt, hk_data[current_idx : current_idx + fmt_len]
    )
    unix_as_dt = datetime.datetime.fromtimestamp(
-        int(round(unix_time / 1e6)), tz=datetime.timezone.utc
+        int(round(unix_time / 10e6)), tz=datetime.timezone.utc
    )
    pw.dlog(f"Ticks: {ticks} | UNIX time: {unix_time}")
    pw.dlog(f"UNIX as datetime: {unix_as_dt}")
@ -715,7 +747,7 @@ def handle_temperature_set(hk_data: bytes, pw: PrintWrapper):
    pw.dlog(f"CMOS Temperature: {cmos_temp}")
    pw.dlog(f"FPGA Temperature: {fpga_temp}")
    current_idx += fmt_len
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 5)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], 5)


 def handle_solution_set(hk_data: bytes, pw: PrintWrapper):
@ -789,7 +821,7 @@ def handle_solution_set(hk_data: bytes, pw: PrintWrapper):
    solution_strategy = hk_data[current_idx]
    pw.dlog(f"Solution strategy: {solution_strategy}")
    current_idx += 1
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 23)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], 23)


@tmtc_definitions_provider
@ -856,5 +888,4 @@ def add_str_cmds(defs: TmtcDefinitionWrapper):
    oce.add(OpCodes.FW_UPDATE, Info.FW_UPDATE)
    oce.add("70", "Star Tracker: Disable timestamp generation")
    oce.add("71", "Star Tracker: Enable timestamp generation")
-    oce.add(OpCodes.SET_TIME_FROM_SYS_TIME, Info.SET_TIME_FROM_SYS_TIME)
    defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)
--- a/eive_tmtc/tmtc/acs/str_img_helper.py
+++ b/eive_tmtc/tmtc/acs/str_img_helper.py
@ -4,8 +4,7 @@
@brief  Commanding of the star tracker image helper object which is responsible for uploading
        and downloading images to/from the star tracker.
@details    Images to uplaod must be previously transferred to the OBC with the CFDP protocol.
-            Also downloaded images will be stored on the filesystem of the OBC and can be
-            transferred via CFDP.
+            Also downloaded images will be stored on the filesystem of the OBC and can be transferred via CFDP.
@author J. Meier
@date   29.11.2021
 """
--- a/eive_tmtc/tmtc/acs/sus.py
+++ b/eive_tmtc/tmtc/acs/sus.py
@ -3,7 +3,7 @@ import struct

 from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class SetId(enum.IntEnum):
@ -11,8 +11,9 @@ class SetId(enum.IntEnum):


 def handle_sus_hk(
-    object_id: ObjectIdU32, hk_data: bytes, pw: PrintWrapper, set_id: int
+    object_id: ObjectIdU32, hk_data: bytes, printer: FsfwTmTcPrinter, set_id: int
 ):
+    pw = PrintWrapper(printer)
    pw.dlog(f"Received SUS HK data from {object_id}")
    if set_id == SetId.HK:
        current_idx = 0
@ -23,9 +24,7 @@ def handle_sus_hk(
            channels.append(struct.unpack("!H", hk_data[current_idx : current_idx + 2]))
            current_idx += 2
        pw.dlog(f"Temperature: {temperature} C")
-        pw.dlog("AIN Channel | Raw Value (hex) | Raw Value (dec)")
+        pw.dlog(f"AIN Channel | Raw Value (hex) | Raw Value (dec)")
        for idx, val in enumerate(channels):
            pw.dlog(f"{idx} | {val[0]:#06x} |" + str(val[0]).ljust(5))
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=hk_data[current_idx:], num_vars=7
-        )
+        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=7)
--- a/eive_tmtc/tmtc/com/ccsds_handler.py
+++ b/eive_tmtc/tmtc/com/ccsds_handler.py
@ -18,6 +18,7 @@ from tmtccmd.config.tmtc import (
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.util import ObjectIdU32
+from eive_tmtc.config.object_ids import CCSDS_HANDLER_ID


 class ActionId(enum.IntEnum):
@ -66,7 +67,7 @@ class Info:
    DISABLE_ACTION = "Disable TX (legacy)"


-def pack_ccsds_handler_command(  # noqa C901
+def pack_ccsds_handler_test(
    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
    obyt = object_id.as_bytes
--- a/eive_tmtc/tmtc/com/subsystem.py
+++ b/eive_tmtc/tmtc/com/subsystem.py
@ -61,7 +61,7 @@ class Info:


@service_provider(CustomServiceList.COM_SS)
-def build_com_subsystem_cmd(p: ServiceProviderParams):  # noqa C901
+def build_com_subsystem_cmd(p: ServiceProviderParams):
    q = p.queue_helper
    o = p.op_code
    prefix = "COM Subsystem"
--- a/eive_tmtc/tmtc/com/syrlinks_handler.py
+++ b/eive_tmtc/tmtc/com/syrlinks_handler.py
@ -31,7 +31,7 @@ from eive_tmtc.config.object_ids import SYRLINKS_HANDLER_ID
 import struct

 from tmtccmd.util import ObjectIdU32
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class SetId(enum.IntEnum):
@ -142,7 +142,7 @@ def normal_mode_cmd(q: DefaultPusQueueHelper, info: str, submode: int):
    q.add_pus_tc(create_mode_command(SYRLINKS_HANDLER_ID, Mode.NORMAL, submode))


-def pack_syrlinks_command(  # noqa C901: Complexity okay here.
+def pack_syrlinks_command(
    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
    obyt = object_id.as_bytes
@ -254,28 +254,31 @@ def pack_syrlinks_command(  # noqa C901: Complexity okay here.
        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))


-def handle_syrlinks_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+def handle_syrlinks_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    if set_id == SetId.RX_REGISTERS_DATASET:
-        return handle_syrlinks_rx_registers_dataset(pw, hk_data)
+        return handle_syrlinks_rx_registers_dataset(printer, hk_data)
    elif set_id == SetId.TX_REGISTERS_DATASET:
-        return handle_syrlinks_tx_registers_dataset(pw, hk_data)
+        return handle_syrlinks_tx_registers_dataset(printer, hk_data)
    elif set_id == SetId.TEMPERATURE_SET_ID:
-        return handle_syrlinks_temp_dataset(pw, hk_data)
+        return handle_syrlinks_temp_dataset(printer, hk_data)
    else:
+        pw = PrintWrapper(printer)
        pw.dlog(f"Service 3 TM: Syrlinks handler reply with unknown set ID {set_id}")


-def handle_syrlinks_temp_dataset(pw: PrintWrapper, hk_data: bytes):
+def handle_syrlinks_temp_dataset(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
    if len(hk_data) < 8:
        raise ValueError("expected  at least 8 bytes of HK data")
    temp_power_amplifier = struct.unpack("!f", hk_data[0:4])[0]
    temp_baseband_board = struct.unpack("!f", hk_data[4:8])[0]
    pw.dlog(f"Temperatur Power Amplifier [C]: {temp_power_amplifier}")
    pw.dlog(f"Temperatur Baseband Board [C]: {temp_baseband_board}")
-    pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[8:], 2))
+    printer.print_validity_buffer(hk_data[8:], 2)


-def handle_syrlinks_rx_registers_dataset(pw: PrintWrapper, hk_data: bytes):
+def handle_syrlinks_rx_registers_dataset(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
    header_list = [
        "RX Status",
        "RX Sensitivity",
@ -335,9 +338,7 @@ def handle_syrlinks_rx_registers_dataset(pw: PrintWrapper, hk_data: bytes):
    validity_buffer = hk_data[22:]
    for header, content in zip(header_list, content_list):
        pw.dlog(f"{header}: {content}")
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(validity_buffer=validity_buffer, num_vars=8)
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=8)
    pw.dlog(f"Carrier Detect: {carrier_detect}")
    pw.dlog(f"Carrier Lock: {carrier_lock}")
    pw.dlog(f"Data Lock (data clock recovery loop lock status): {data_lock}")
@ -371,9 +372,10 @@ WAVEFORM_STRINGS = ["OFF", "CW", "QPSK", "0QPSK", "PCM/PM", "PSK/PM", "BPSK"]


 def handle_syrlinks_tx_registers_dataset(
-    pw: PrintWrapper,
+    printer: FsfwTmTcPrinter,
    hk_data: bytes,
 ):
+    pw = PrintWrapper(printer)
    header_list = ["TX Status Raw", "TX Waveform", "TX AGC value"]
    tx_status = hk_data[0]
    """
@ -410,9 +412,7 @@ def handle_syrlinks_tx_registers_dataset(
    validity_buffer = hk_data[4:]
    for header, content in zip(header_list, content_list):
        pw.dlog(f"{header}: {content}")
-    pw.dlog(
-        FsfwTmTcPrinter.get_validity_buffer(validity_buffer=validity_buffer, num_vars=3)
-    )
+    printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=3)
    # pw.dlog(f"TX CONV: {tx_conv!r}")
    # pw.dlog(f"TX DIFF (differential encoder enable): {tx_diff_encoder_enable}")
    pw.dlog(f"TX Status: {tx_status_status!r}")
--- a/eive_tmtc/tmtc/core.py
+++ b/eive_tmtc/tmtc/core.py
@ -19,24 +19,11 @@ from tmtccmd.tc.pus_20_fsfw_param import (
 )
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
 from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 _LOGGER = logging.getLogger(__name__)


-class SdState(enum.IntEnum):
-    OFF = 0
-    ON = 1
-    MOUNTED = 2
-
-
-class SdCardSelect(enum.IntEnum):
-    SD_0 = 0
-    SD_1 = 1
-    BOTH = 2
-    NONE = 3
-
-
 class ActionId(enum.IntEnum):
    ANNOUNCE_VERSION = 1
    ANNOUNCE_CURRENT_IMAGE = 2
@ -45,7 +32,6 @@ class ActionId(enum.IntEnum):
    RESET_REBOOT_COUNTER = 6
    SWITCH_IMG_LOCK = 7
    SET_MAX_REBOOT_CNT = 8
-    READ_REBOOT_MECHANISM_INFO = 9
    UPDATE_OBSW_FROM_SD_0 = 10
    UPDATE_OBSW_FROM_SD_1 = 11
    UPDATE_OBSW_FROM_TMP = 12
@ -101,15 +87,14 @@ class OpCode:
    SWITCH_TO_SD_0 = ["switch_to_sd_0"]
    SWITCH_TO_SD_1 = ["switch_to_sd_1"]
    SWITCH_TO_BOTH_SD_CARDS = ["switch_to_both_sd_cards"]
-    READ_REBOOT_MECHANISM_INFO = "rbh_info"
-    ENABLE_REBOOT_FILE_HANDLING = "rwd_on"
-    DISABLE_REBOOT_FILE_HANDLING = "rwd_off"
-    RESET_ALL_REBOOT_COUNTERS = "rwd_reset_a"
-    RWD_RESET_REBOOT_COUNTER_00 = "rwd_reset_00"
-    RWD_RESET_REBOOT_COUNTER_01 = "rwd_reset_01"
-    RWD_RESET_REBOOT_COUNTER_10 = "rwd_reset_10"
-    RWD_RESET_REBOOT_COUNTER_11 = "rwd_reset_11"
-    RWD_SET_MAX_REBOOT_CNT = "rwd_max_cnt"
+    ENABLE_REBOOT_FILE_HANDLING = ["rbh_off"]
+    DISABLE_REBOOT_FILE_HANDLING = ["rbh_on"]
+    RESET_ALL_REBOOT_COUNTERS = ["rbh_reset_a"]
+    RESET_REBOOT_COUNTER_00 = ["rbh_reset_00"]
+    RESET_REBOOT_COUNTER_01 = ["rbh_reset_01"]
+    RESET_REBOOT_COUNTER_10 = ["rbh_reset_10"]
+    RESET_REBOOT_COUNTER_11 = ["rbh_reset_11"]
+    SET_MAX_REBOOT_CNT = ["rbh_max_cnt"]


 class Info:
@ -125,7 +110,6 @@ class Info:
    OBSW_UPDATE_FROM_SD_0 = "Update OBSW from SD Card 0"
    OBSW_UPDATE_FROM_SD_1 = "Update OBSW from SD Card 1"
    OBSW_UPDATE_FROM_TMP = "Update OBSW from tmp folder"
-    READ_REBOOT_MECHANISM_INFO = "Read reboot mechansm information"
    SWITCH_TO_SD_0 = "Switch to SD card 0"
    SWITCH_TO_SD_1 = "Switch to SD card 1"
    SWITCH_TO_BOTH_SD_CARDS = "Switch to both SD cards with specified active card"
@ -170,9 +154,6 @@ def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
    oce.add(keys=OpCode.XSC_REBOOT_1_0, info="Reboot 1 0")
    oce.add(keys=OpCode.XSC_REBOOT_1_1, info="Reboot 1 1")
    oce.add(keys=OpCode.SET_PREF_SD, info=Info.SET_PREF_SD)
-    oce.add(
-        keys=OpCode.READ_REBOOT_MECHANISM_INFO, info=Info.READ_REBOOT_MECHANISM_INFO
-    )
    oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
@ -201,25 +182,21 @@ def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
        info="Reset all reboot counters",
    )
    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_00,
+        keys=OpCode.RESET_REBOOT_COUNTER_00,
        info="Reset reboot counter 0 0",
    )
    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_01,
+        keys=OpCode.RESET_REBOOT_COUNTER_01,
        info="Reset reboot counter 0 1",
    )
    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_10,
+        keys=OpCode.RESET_REBOOT_COUNTER_10,
        info="Reset reboot counter 1 0",
    )
    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_11,
+        keys=OpCode.RESET_REBOOT_COUNTER_11,
        info="Reset reboot counter 1 1",
    )
-    oce.add(
-        keys=OpCode.RWD_SET_MAX_REBOOT_CNT,
-        info="Reset max reboot count for reboot watchdog",
-    )
    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
    oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
@ -235,9 +212,7 @@ def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
    defs.add_service(CustomServiceList.CORE.value, "Core Controller", oce)


-def pack_core_commands(  # noqa C901
-    q: DefaultPusQueueHelper, op_code: str
-):  # noqa: C901 , complexity okay here
+def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
    if op_code == OpCode.ANNOUNCE_VERSION:
        q.add_log_cmd(f"{Info.ANNOUNCE_VERSION}")
        q.add_pus_tc(create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_VERSION))
@ -276,7 +251,15 @@ def pack_core_commands(  # noqa C901
            int(input("Specify systemctl command type by key: "))
        )
        unit_name = input("Specify unit name: ")
-        q.add_pus_tc(create_systemctl_cmd(systemctl_cmd, unit_name))
+        cmd_data = bytearray([systemctl_cmd])
+        cmd_data.extend(unit_name.encode())
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=CORE_CONTROLLER_ID,
+                action_id=ActionId.SYSTEMCTL_CMD_EXECUTOR,
+                user_data=cmd_data,
+            )
+        )
    elif op_code == OpCode.EXECUTE_SHELL_CMD_BLOCKING:
        custom_cmd = input("Please specify command to execute: ")
        q.add_pus_tc(
@ -317,15 +300,7 @@ def pack_core_commands(  # noqa C901
            chip=Chip.CHIP_1,
            copy=Copy.COPY_1_GOLD,
        )
-    elif op_code == OpCode.READ_REBOOT_MECHANISM_INFO:
-        q.add_log_cmd(Info.READ_REBOOT_MECHANISM_INFO)
-        q.add_pus_tc(
-            create_action_cmd(
-                object_id=CORE_CONTROLLER_ID,
-                action_id=ActionId.READ_REBOOT_MECHANISM_INFO,
-            )
-        )
-    elif op_code == OpCode.DISABLE_REBOOT_FILE_HANDLING:
+    elif op_code in OpCode.DISABLE_REBOOT_FILE_HANDLING:
        q.add_log_cmd("Disabling reboot file handling")
        user_data = bytearray([0])
        q.add_pus_tc(
@ -335,7 +310,7 @@ def pack_core_commands(  # noqa C901
                user_data=user_data,
            )
        )
-    elif op_code == OpCode.ENABLE_REBOOT_FILE_HANDLING:
+    elif op_code in OpCode.ENABLE_REBOOT_FILE_HANDLING:
        q.add_log_cmd("Enabling reboot file handling")
        user_data = bytearray([1])
        q.add_pus_tc(
@ -345,7 +320,7 @@ def pack_core_commands(  # noqa C901
                user_data=user_data,
            )
        )
-    elif op_code == OpCode.RESET_ALL_REBOOT_COUNTERS:
+    elif op_code in OpCode.RESET_ALL_REBOOT_COUNTERS:
        q.add_log_cmd("Resetting all reboot counters")
        q.add_pus_tc(
            create_action_cmd(
@ -353,25 +328,14 @@ def pack_core_commands(  # noqa C901
                action_id=ActionId.RESET_REBOOT_COUNTER,
            )
        )
-    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_00:
+    elif op_code in OpCode.RESET_REBOOT_COUNTER_00:
        reset_specific_boot_counter(q, 0, 0)
-    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_01:
+    elif op_code in OpCode.RESET_REBOOT_COUNTER_01:
        reset_specific_boot_counter(q, 0, 1)
-    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_10:
+    elif op_code in OpCode.RESET_REBOOT_COUNTER_10:
        reset_specific_boot_counter(q, 1, 0)
-    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_11:
+    elif op_code in OpCode.RESET_REBOOT_COUNTER_11:
        reset_specific_boot_counter(q, 1, 1)
-    elif op_code == OpCode.RWD_SET_MAX_REBOOT_CNT:
-        max_count = int(input("Set new maximum reboot threshold [1, 50]: "))
-        if max_count < 1 or max_count > 50:
-            raise ValueError("Invalid value, must be in range 1 to 50")
-        q.add_pus_tc(
-            create_action_cmd(
-                CORE_CONTROLLER_ID,
-                ActionId.SET_MAX_REBOOT_CNT,
-                user_data=bytes([max_count]),
-            )
-        )
    elif op_code in OpCode.OBSW_UPDATE_FROM_SD_0:
        q.add_log_cmd(Info.OBSW_UPDATE_FROM_SD_0)
        q.add_pus_tc(pack_obsw_update_cmd(ActionId.UPDATE_OBSW_FROM_SD_0))
@ -427,17 +391,14 @@ def pack_core_commands(  # noqa C901
                    domain_id=0,
                    unique_id=ParamId.PREF_SD,
                    parameter=pref_sd,
-                )
+                ).pack()
            )
        )
    elif op_code == OpCode.CP_HELPER:
        cp_recursive = int(input("Copy recursively (0/1) ?: "))
        if cp_recursive not in [0, 1]:
            raise ValueError("Invalid value, only 0 or 1 allowed")
-        cp_force = int(input("Copy with force option(0/1) ?: "))
-        if cp_force not in [0, 1]:
-            raise ValueError("Invalid value, only 0 or 1 allowed")
-        user_data = bytearray([cp_recursive, cp_force])
+        user_data = bytearray([cp_recursive])
        user_data.extend(packet_source_dest_path("Copy"))
        q.add_log_cmd(Info.CP_HELPER)
        q.add_pus_tc(
@ -497,16 +458,6 @@ def pack_core_commands(  # noqa C901
        )


-def create_systemctl_cmd(systemctl_cmd: SystemctlCmd, unit_name: str):
-    cmd_data = bytearray([systemctl_cmd])
-    cmd_data.extend(unit_name.encode())
-    return create_action_cmd(
-        object_id=CORE_CONTROLLER_ID,
-        action_id=ActionId.SYSTEMCTL_CMD_EXECUTOR,
-        user_data=cmd_data,
-    )
-
-
 def list_directory_base_user_data() -> bytearray:
    all_opt = int(input("Use all (-a) option (0/1) ?: "))
    if all_opt not in [0, 1]:
@ -628,8 +579,9 @@ def create_xsc_reboot_cmds(
    )


-def handle_core_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+def handle_core_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
    if set_id == SetId.HK:
+        pw = PrintWrapper(printer)
        fmt_str = "!fff"
        inc_len = struct.calcsize(fmt_str)
        (temperature, ps_voltage, pl_voltage) = struct.unpack(
@ -640,93 +592,50 @@ def handle_core_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
            f"PL Voltage [mV] {pl_voltage}"
        )
        pw.dlog(printout)
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=hk_data[inc_len:], num_vars=3
-        )
+        printer.print_validity_buffer(validity_buffer=hk_data[inc_len:], num_vars=3)


 def handle_core_ctrl_action_replies(
-    action_id: int, pw: PrintWrapper, custom_data: bytes
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytes
 ):
-    if action_id == ActionId.READ_REBOOT_MECHANISM_INFO:
-        handle_reboot_mechanism_info_reply(pw, custom_data)
-    elif action_id == ActionId.LIST_DIR_DUMP_DIRECTLY:
-        handle_list_dir_dump_reply(pw, custom_data)
-
-
-def handle_reboot_mechanism_info_reply(pw: PrintWrapper, custom_data: bytes):
-    pw.dlog("Received reboot mechansm information")
-    fmt_str = "!BIIIIIBBBBBBBB"
-    inc_len = struct.calcsize(fmt_str)
-    if len(custom_data) < inc_len:
-        raise ValueError(f"Received custom data shorter than expected {inc_len}")
-    (
-        enabled,
-        max_count,
-        img00_count,
-        img01_count,
-        img10_count,
-        img11_count,
-        img00_lock,
-        img01_lock,
-        img10_lock,
-        img11_lock,
-        last_chip,
-        last_copy,
-        next_chip,
-        next_copy,
-    ) = struct.unpack(fmt_str, custom_data[:inc_len])
-    pw.dlog(f"Enabled: {enabled}")
-    pw.dlog(f"Max Count: {max_count}")
-    pw.dlog(f"Count 00: {img00_count}")
-    pw.dlog(f"Count 01: {img01_count}")
-    pw.dlog(f"Count 10: {img10_count}")
-    pw.dlog(f"Count 11: {img11_count}")
-    pw.dlog(f"Lock 00: {img00_lock}")
-    pw.dlog(f"Lock 01: {img01_lock}")
-    pw.dlog(f"Lock 10: {img10_lock}")
-    pw.dlog(f"Lock 11: {img11_lock}")
-    pw.dlog(f"Last Chip: {last_chip}")
-    pw.dlog(f"Last Copy: {last_copy}")
-    pw.dlog(f"Next Chip: {next_chip}")
-    pw.dlog(f"Next Copy: {next_copy}")
-
-
-def handle_list_dir_dump_reply(pw: PrintWrapper, custom_data: bytes):
-    if len(custom_data) < 4:
-        _LOGGER.warning("Data unexpectedly small")
-        return
-    seq_idx = struct.unpack("!I", custom_data[0:4])[0]
-    total_chunks = struct.unpack("!I", custom_data[4:8])[0]
-    compressed = custom_data[8]
-    ls_cmd = custom_data[9:].split(b"\x00")[0].decode()
-    # Include length of NULL termination
-    file_data_offset = 9 + len(ls_cmd) + 1
-    pw.dlog(
-        f"Received directory listing dump for ls command {ls_cmd}. "
-        f"Chunk {seq_idx + 1}/{total_chunks}"
-    )
-
-    def remove_if_exists_and_new(seq_idx_: int, path_: Path):
-        if seq_idx_ == 0 and path_.exists():
-            os.remove(path_)
-
-    if compressed:
-        path = Path("dir_listing.txt.gz")
-        remove_if_exists_and_new(seq_idx, path)
+    pw = PrintWrapper(printer)
+    if action_id == ActionId.LIST_DIR_DUMP_DIRECTLY:
+        if len(custom_data) < 4:
+            _LOGGER.warning("Data unexpectedly small")
+            return
+        seq_idx = struct.unpack("!I", custom_data[0:4])[0]
+        total_chunks = struct.unpack("!I", custom_data[4:8])[0]
+        compressed = custom_data[8]
+        ls_cmd = custom_data[9:].split(b"\x00")[0].decode()
+        # Include length of NULL termination
+        file_data_offset = 9 + len(ls_cmd) + 1
        pw.dlog(
-            f"Compression option: {compressed}. Dumping file into dir_listing.txt.gz"
+            f"Received directory listing dump for ls command {ls_cmd}. "
+            f"Chunk {seq_idx + 1}/{total_chunks}"
        )
-        with open(path, "ab") as listing_file:
-            listing_file.write(custom_data[file_data_offset:])
-    else:
-        path = Path("dir_listing.txt")
-        remove_if_exists_and_new(seq_idx, path)
-        pw.dlog(f"Compression option: {compressed}. Dumping file into dir_listing.txt")
-        with open(path, "a") as listing_file:
-            listing_file_str = custom_data[file_data_offset:].decode()
-            listing_file.write(listing_file_str)
-        if seq_idx + 1 == total_chunks:
-            pw.dlog("Full directory listing: ")
-            with open("dir_listing.txt", "r") as listing_file:
-                print(listing_file.read())
+
+        def remove_if_exists_and_new(seq_idx_: int, path_: Path):
+            if seq_idx_ == 0 and path_.exists():
+                os.remove(path_)
+
+        if compressed:
+            path = Path("dir_listing.txt.gz")
+            remove_if_exists_and_new(seq_idx, path)
+            pw.dlog(
+                f"Compression option: {compressed}. Dumping file into dir_listing.txt.gz"
+            )
+            with open(path, "ab") as listing_file:
+                listing_file.write(custom_data[file_data_offset:])
+        else:
+            path = Path("dir_listing.txt")
+            remove_if_exists_and_new(seq_idx, path)
+            pw.dlog(
+                f"Compression option: {compressed}. Dumping file into dir_listing.txt"
+            )
+            with open(path, "a") as listing_file:
+                listing_file_str = custom_data[file_data_offset:].decode()
+                listing_file.write(listing_file_str)
+            if seq_idx + 1 == total_chunks:
+                pw.dlog("Full directory listing: ")
+                with open("dir_listing.txt", "r") as listing_file:
+                    print(listing_file.read())
--- a/eive_tmtc/tmtc/health.py
+++ b/eive_tmtc/tmtc/health.py
@ -1,3 +1,5 @@
+import struct
+
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.tmtc.obj_prompt import prompt_object
 from spacepackets.ecss import PusTelecommand
--- a/eive_tmtc/tmtc/internal_err_reporter.py
+++ b/eive_tmtc/tmtc/internal_err_reporter.py
@ -1,24 +0,0 @@
-import enum
-import struct
-
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
-
-from eive_tmtc.pus_tm.defs import PrintWrapper
-
-
-class SetId(enum.IntEnum):
-    ERROR_ID = 0
-
-
-def handle_ier_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
-    pw.dlog(f"Received internal error reporter HK data with set ID {set_id}")
-    if set_id == SetId.ERROR_ID:
-        fmt_str = "!III"
-        inc_len = struct.calcsize(fmt_str)
-        (tm_errors, queue_errors, store_hits) = struct.unpack(
-            fmt_str, hk_data[:inc_len]
-        )
-        pw.dlog(f"TM Errors: {tm_errors}")
-        pw.dlog(f"Queue Errors: {queue_errors}")
-        pw.dlog(f"Store Errors: {store_hits}")
-        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[inc_len:], 3))
--- a/eive_tmtc/tmtc/obj_prompt.py
+++ b/eive_tmtc/tmtc/obj_prompt.py
@ -1,7 +1,9 @@
 from eive_tmtc.config.object_ids import (
    ACS_SUBSYSTEM_ID,
+    ACS_CONTROLLER,
    IMTQ_HANDLER_ID,
    GPS_0_HEALTH_DEV,
+    GPS_1_HEALTH_DEV,
    GYRO_0_ADIS_HANDLER_ID,
    GYRO_1_L3G_HANDLER_ID,
    ACS_BOARD_ASS_ID,
@ -14,13 +16,6 @@ from eive_tmtc.config.object_ids import (
    RW1_ID,
    RW2_ID,
    RTD_0_PLOC_HSPD,
-    TMP1075_HANDLER_TCS_BRD_1_ID,
-    TMP1075_HANDLER_TCS_BRD_0_ID,
-    TMP1075_HANDLER_PLPCDU_0_ID,
-    TMP1075_HANDLER_PLPCDU_1_ID,
-    TMP1075_HANDLER_IF_BRD_ID,
-    STR_ASSEMBLY,
-    STAR_TRACKER_ID,
 )

 SUBSYSTEM_DICT = {
@ -34,27 +29,20 @@ ACS_OBJ_DICT = {
    1: ("SUS Assembly", SUS_BOARD_ASS_ID),
    2: ("ACS Board Assembly", ACS_BOARD_ASS_ID),
    3: ("RW Assembly", RW_ASSEMBLY),
-    4: ("STR Assembly", STR_ASSEMBLY),
-    5: ("iMTQ MGT", IMTQ_HANDLER_ID),
-    6: ("GYR 0 ADIS", GYRO_0_ADIS_HANDLER_ID),
-    7: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID),
-    8: ("MGM 0 LIS3", MGM_0_LIS3_HANDLER_ID),
-    9: ("MGM 1 RM3100", MGM_1_RM3100_HANDLER_ID),
-    10: ("GPS 0 Health Device", GPS_0_HEALTH_DEV),
-    11: ("SUS 0", SUS_0_N_LOC_XFYFZM_PT_XF),
-    12: ("SUS 6", SUS_6_R_LOC_XFYBZM_PT_XF),
-    13: ("RW 1", RW1_ID),
-    14: ("RW 2", RW2_ID),
-    15: ("STR", STAR_TRACKER_ID),
+    4: ("iMTQ MGT", IMTQ_HANDLER_ID),
+    5: ("GYR 0 ADIS", GYRO_0_ADIS_HANDLER_ID),
+    6: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID),
+    7: ("MGM 0 LIS3", MGM_0_LIS3_HANDLER_ID),
+    8: ("MGM 1 RM3100", MGM_1_RM3100_HANDLER_ID),
+    9: ("GPS 0 Health Device", GPS_0_HEALTH_DEV),
+    10: ("SUS 0", SUS_0_N_LOC_XFYFZM_PT_XF),
+    11: ("SUS 6", SUS_6_R_LOC_XFYBZM_PT_XF),
+    12: ("RW 1", RW1_ID),
+    13: ("RW 2", RW2_ID),
 }

 TCS_OBJ_DICT = {
    0: ("RTD 0", RTD_0_PLOC_HSPD),
-    1: ("TMP1075 PL PCDU 0", TMP1075_HANDLER_PLPCDU_0_ID),
-    2: ("TMP1075 PL PCDU 1", TMP1075_HANDLER_PLPCDU_1_ID),
-    3: ("TMP1075 TCS 0", TMP1075_HANDLER_TCS_BRD_0_ID),
-    4: ("TMP1075 TCS 1", TMP1075_HANDLER_TCS_BRD_1_ID),
-    5: ("TMP1075 IF BOARD", TMP1075_HANDLER_IF_BRD_ID),
 }


--- a/eive_tmtc/tmtc/payload/ploc_memory_dumper.py
+++ b/eive_tmtc/tmtc/payload/ploc_memory_dumper.py
@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 """
@file   ploc_memory_dumper.py
-@brief  This file implements the command to dump memory sectors of the PLOC. Memories of the PLOC
-    which can be dumped are one MRAM, two flash memories and the SRAM.
+@brief  This file implements the command to dump memory sectors of the PLOC. Memories of the PLOC which can be dumped
+        are one MRAM, two flash memories and the SRAM.
@author J. Meier
@date   31.08.2021
 """
--- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py
+++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py
@ -25,29 +25,20 @@ from tmtccmd.tc.decorator import ServiceProviderParams
 from eive_tmtc.utility.input_helper import InputHelper
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.tc.pus_8_fsfw_funccmd import create_action_cmd
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 _LOGGER = logging.getLogger(__name__)

 MANUAL_INPUT = "1"

-OBC_WRITE_FILE_DICT = {
+FLASH_WRITE_FILE_DICT = {
    MANUAL_INPUT: ("manual input", ""),
    "2": ("/mnt/sd0/ploc/mpsoc/flash_write.bin", "/mnt/sd0/ploc/mpsoc/flash_write.bin"),
 }

-OBC_READ_FILE_DICT = {
+MPSOC_FILE_DICT = {
    MANUAL_INPUT: ("manual input", ""),
-    "2": ("/mnt/sd0/ploc/mpsoc/flash_read.bin", "/mnt/sd0/ploc/mpsoc/flash_read.bin"),
-}
-
-MPSOC_WRITE_FILE_DICT = {
-    MANUAL_INPUT: ("manual input", ""),
-    "2": ("0:/", "0:/"),
-}
-
-MPSOC_READ_FILE_DICT = {
-    MANUAL_INPUT: ("manual input", ""),
-    "2": ("0:/PICA", "0:/PICA"),
+    "2": ("0:/flash", "0:/flash"),
 }

 SEQ_FILE_NAMES = ["0:/EM16/231", "0:/EQ04/E-75", "0:/EQ01/E130"]
@ -175,9 +166,7 @@ def add_ploc_mpsoc_cmds(defs: TmtcDefinitionWrapper):


@service_provider(CustomServiceList.PLOC_MPSOC)
-def pack_ploc_mpsoc_commands(  # noqa C901
-    p: ServiceProviderParams,
-):  # noqa C901: Complexity okay here.
+def pack_ploc_mpsoc_commands(p: ServiceProviderParams):
    object_id = get_object_ids().get(PLOC_MPSOC_ID)
    q = p.queue_helper
    prefix = "PLOC MPSoC"
@ -348,39 +337,31 @@ def prepare_mem_read_command(object_id: bytes) -> bytearray:
    return bytearray(command)


-def prepare_flash_base_cmd(
-    obc_filename: str, mpsoc_filename: str, action_id: int, object_id: bytes
-) -> bytearray:
+def prepare_flash_base_cmd(action_id: int, object_id: bytes) -> bytearray:
+    obc_file = get_obc_file()
+    mpsoc_file = get_mpsoc_file()
    command = bytearray(object_id)
    command.extend(struct.pack("!I", action_id))
-    command.extend(obc_filename.encode("utf-8"))
+    command.extend(obc_file.encode("utf-8"))
    command.append(0)
-    command.extend(mpsoc_filename.encode("utf-8"))
+    command.extend(mpsoc_file.encode("utf-8"))
    command.append(0)
    return command


 def prepare_flash_write_cmd(object_id: bytes) -> bytearray:
-    obc_file = get_obc_file(OBC_WRITE_FILE_DICT)
-    mpsoc_file = get_mpsoc_file(MPSOC_WRITE_FILE_DICT)
-    return prepare_flash_base_cmd(
-        obc_file, mpsoc_file, ActionId.TC_FLASH_WRITE_FULL_FILE, object_id
-    )
+    return prepare_flash_base_cmd(ActionId.TC_FLASH_WRITE_FULL_FILE, object_id)


 def prepare_flash_read_cmd(object_id: bytes) -> bytearray:
-    mpsoc_file = get_mpsoc_file(MPSOC_READ_FILE_DICT)
-    obc_file = get_obc_file(OBC_READ_FILE_DICT)
-    cmd = prepare_flash_base_cmd(
-        obc_file, mpsoc_file, ActionId.TC_FLASH_READ_FULL_FILE, object_id
-    )
+    cmd = prepare_flash_base_cmd(ActionId.TC_FLASH_READ_FULL_FILE, object_id)
    file_size = get_mpsoc_file_size()
    cmd.extend(struct.pack("!I", file_size))
    return cmd


 def prepare_flash_delete_cmd(object_id: bytes) -> bytearray:
-    file = get_mpsoc_file(MPSOC_READ_FILE_DICT)
+    file = get_mpsoc_file()
    command = (
        object_id + struct.pack("!I", ActionId.TC_FLASH_DELETE) + file.encode("utf-8")
    )
@ -424,7 +405,7 @@ def prepare_replay_write_sequence_cmd(object_id: bytes) -> bytearray:

 def prepare_cam_take_pic_cmd(object_id: bytes) -> bytearray:
    selection = input("Use default parameter? (Y/N): ")
-    if selection.lower() in ["y", "1", "yes"]:
+    if selection is "Y" or selection is "y":
        filename = "0:/test"
        encoder_setting_y = 7
        quantization_y = 0
@ -485,30 +466,30 @@ def prepare_downlink_data_modulate_cmd(object_id: bytes) -> bytearray:
    return bytearray(command)


-def get_obc_file(input_dict: dict) -> str:
-    _LOGGER.info("Specify OBC filename")
-    input_helper = InputHelper(input_dict)
+def get_obc_file() -> str:
+    _LOGGER.info("Specify OBC file ")
+    input_helper = InputHelper(FLASH_WRITE_FILE_DICT)
    key = input_helper.get_key()
    if key == MANUAL_INPUT:
        file = input("Ploc MPSoC: Specify absolute name of flash file: ")
    else:
-        file = input_dict[key][1]
+        file = FLASH_WRITE_FILE_DICT[key][1]
    return file


-def get_mpsoc_file(input_dict: dict) -> str:
-    _LOGGER.info("Specify MPSoC filename")
-    input_helper = InputHelper(input_dict)
+def get_mpsoc_file() -> str:
+    _LOGGER.info("Specify MPSoC file")
+    input_helper = InputHelper(MPSOC_FILE_DICT)
    key = input_helper.get_key()
    if key == MANUAL_INPUT:
        file = input("Ploc MPSoC: Specify absolute name file: ")
    else:
-        file = input_dict[key][1]
+        file = MPSOC_FILE_DICT[key][1]
    return file


 def get_mpsoc_file_size() -> int:
-    file_size = int(input("Specify MPSoC file size: "))
+    file_size = int(input("Specify MPSoC file size"))
    if file_size <= 0:
        raise ValueError("Invalid file size")
    return file_size
@ -525,7 +506,8 @@ def get_sequence_file() -> str:
    return file


-def handle_ploc_mpsoc_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
+def handle_ploc_mpsoc_hk_data(printer: FsfwTmTcPrinter, hk_data: bytes, set_id: int):
+    pw = PrintWrapper(printer)
    if set_id == SetId.HK_ID:
        fmt_str = "!IBBBBBBB"
        current_idx = 0
@ -640,7 +622,10 @@ class DirElement:
    size: int


-def handle_mpsoc_data_reply(action_id: int, pw: PrintWrapper, custom_data: bytearray):
+def handle_mpsoc_data_reply(
+    action_id: int, printer: FsfwTmTcPrinter, custom_data: bytearray
+):
+    pw = PrintWrapper(printer)
    if action_id == ActionId.TM_MEM_READ_RPT:
        header_list = [
            "PLOC Memory Address",
@ -652,16 +637,20 @@ def handle_mpsoc_data_reply(action_id: int, pw: PrintWrapper, custom_data: bytea
            struct.unpack("!H", custom_data[4:6])[0],
            "0x" + custom_data[6:10].hex(),
        ]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
    elif action_id == ActionId.TM_CAM_CMD_RPT:
        header_list = ["Camera reply string", "ACK"]
        content_list = [
            custom_data[: len(custom_data) - 1].decode("utf-8"),
            hex(custom_data[-1]),
        ]
-        pw.dlog(f"{header_list}")
-        pw.dlog(f"{content_list}")
+        print(header_list)
+        print(content_list)
+        printer.file_logger.info(header_list)
+        printer.file_logger.info(content_list)
    elif action_id == ActionId.TM_FLASH_DIRECTORY_CONTENT:
        if len(custom_data) < 16:
            _LOGGER.warning(
--- a/eive_tmtc/tmtc/payload/ploc_supervisor.py
+++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py
@ -21,7 +21,7 @@ from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.utility.input_helper import InputHelper

 _LOGGER = logging.getLogger(__name__)
@ -172,6 +172,7 @@ class Info(str, enum.Enum):

@tmtc_definitions_provider
 def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
+
    oce = OpCodeEntry()
    oce.add(OpCodes.OFF, Info.OFF)
    oce.add(OpCodes.ON, Info.ON)
@ -222,7 +223,7 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):


@service_provider(CustomServiceList.PLOC_SUPV)
-def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
+def pack_ploc_supv_commands(p: ServiceProviderParams):
    q = p.queue_helper
    op_code = p.op_code
    object_id = get_object_ids().get(PLOC_SUPV_ID)
@ -483,9 +484,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
 def pack_sel_boot_image_cmd(
    object_id: bytes, mem: int, bp0: int, bp1: int, bp2: int
 ) -> bytearray:
-    """This function can be used to generate the command to select the image from which the MPSoC
-    will boot.
-
+    """This function can be used to generate the command to select the image from which the MPSoC will boot
    @param object_id    The object id of the PLOC supervisor handler.
    @param mem  The memory from which the MPSoC shall boot (NVM0 - 0, NVM1 - 1)
    @param bp0  Partition pin 0
@ -722,7 +721,8 @@ def get_event_buffer_path() -> str:
    return file


-def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
+def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
+    pw = PrintWrapper(printer)
    current_idx = 0
    if set_id == SetIds.HK_REPORT:
        pass
@ -752,7 +752,7 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
            f"BP0 State {bp_0_state} | BP1 State {bp_1_state} | BP2 State {bp_2_state}"
        )
        pw.dlog(f"Boot State {boot_state} | Boot Cycles {boot_cycles}")
-        FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 10)
+        pw.printer.print_validity_buffer(hk_data[current_idx:], 10)
    else:
        pw.dlog(f"PLOC SUPV: HK handling not implemented for set ID {set_id}")
        pw.dlog(f"Raw Data: 0x[{hk_data.hex(sep=',')}]")
--- a/eive_tmtc/tmtc/payload/rad_sensor.py
+++ b/eive_tmtc/tmtc/payload/rad_sensor.py
@ -18,7 +18,7 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class SetId(enum.IntEnum):
@ -100,8 +100,9 @@ def rad_sensor_mode_cmd(
    q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))


-def handle_rad_sensor_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+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"
@ -111,10 +112,8 @@ def handle_rad_sensor_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        )
        ain_dict = {0: ain0, 1: ain1, 4: ain4, 5: ain5, 6: ain6, 7: ain7}
        pw.dlog(f"Temperature: {temp} C")
-        pw.dlog("AIN Channel | Raw Value (hex) | Raw Value (dec)")
+        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
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=hk_data[current_idx:], num_vars=7
-        )
+        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
@ -75,7 +75,7 @@ def add_scex_cmds(defs: TmtcDefinitionWrapper):


@service_provider(CustomServiceList.SCEX.value)
-def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
+def pack_scex_cmds(p: ServiceProviderParams):
    op_code = p.op_code
    q = p.queue_helper
    if op_code in OpCode.SWITCH_ON:
--- a/eive_tmtc/tmtc/power/bpx_batt.py
+++ b/eive_tmtc/tmtc/power/bpx_batt.py
@ -17,7 +17,7 @@ from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter


 class BpxSetId(enum.IntEnum):
@ -28,30 +28,18 @@ class BpxSetId(enum.IntEnum):
 class BpxActionId:
    REBOOT = 2
    RESET_COUNTERS = 3
-    CONFIG_CMD = 4
+    SET_CFG = 4
    GET_CFG = 5
-    SET_CFG = 6
-    MAN_HEATER_ON = 10
-    MAN_HEATER_OFF = 11
-
-
-class BpxHeaterModeSelect(enum.IntEnum):
-    OFF = 0
-    AUTO = 1


 class BpxOpCode:
-    HK = "hk"
-    OFF = "off"
-    ON = "on"
-    RST_CFG = "reset_cfg"
-    SET_CFG = "set_cfg"
-    MAN_HEATER_ON = "man_heater_on"
-    MAN_HEATER_OFF = "man_heater_off"
-    RST_BOOT_CNT = "rst_boot_cnt"
-    REQUEST_CFG = "cfg"
-    REQUEST_CFG_HK = "cfg_hk"
-    REBOOT = "reboot"
+    HK = ["0", "hk"]
+    OFF = ["off"]
+    ON = ["on"]
+    RST_BOOT_CNT = ["1", "rst_boot_cnt"]
+    REQUEST_CFG = ["2", "cfg"]
+    REQUEST_CFG_HK = ["3", "cfg_hk"]
+    REBOOT = ["4", "reboot"]


@tmtc_definitions_provider
@ -61,10 +49,6 @@ def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper):
    oce.add(keys=BpxOpCode.OFF, info="Off command")
    oce.add(keys=BpxOpCode.HK, info="Request BPX HK")
    oce.add(keys=BpxOpCode.RST_BOOT_CNT, info="Reset Boot Count")
-    oce.add(keys=BpxOpCode.RST_CFG, info="Reset Config to stored default settings")
-    oce.add(keys=BpxOpCode.SET_CFG, info="Set BPX configuration")
-    oce.add(keys=BpxOpCode.MAN_HEATER_ON, info="Manual heater on")
-    oce.add(keys=BpxOpCode.MAN_HEATER_OFF, info="Manual heater off")
    oce.add(keys=BpxOpCode.REQUEST_CFG, info="Request Configuration Struct (Step 1)")
    oce.add(
        keys=BpxOpCode.REQUEST_CFG_HK, info="Request Configuration Struct HK (Step 2)"
@ -78,14 +62,14 @@ def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper):


@service_provider(CustomServiceList.BPX_BATTERY.value)
-def pack_bpx_commands(p: ServiceProviderParams):  # noqa C901: Complexity is okay here.
+def pack_bpx_commands(p: ServiceProviderParams):
    op_code = p.op_code
    q = p.queue_helper
-    if op_code == BpxOpCode.HK:
+    if op_code in BpxOpCode.HK:
        q.add_log_cmd("Requesting BPX battery HK set")
        sid = make_sid(object_id=BPX_HANDLER_ID, set_id=BpxSetId.GET_HK_SET)
        q.add_pus_tc(generate_one_hk_command(sid=sid))
-    if op_code == BpxOpCode.OFF:
+    if op_code in BpxOpCode.OFF:
        q.add_log_cmd("Off mode")
        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.OFF, 0)
        q.add_pus_tc(
@ -95,7 +79,7 @@ def pack_bpx_commands(p: ServiceProviderParams):  # noqa C901: Complexity is oka
                app_data=mode_cmd,
            )
        )
-    if op_code == BpxOpCode.ON:
+    if op_code in BpxOpCode.ON:
        q.add_log_cmd("On mode")
        mode_cmd = pack_mode_data(BPX_HANDLER_ID, Mode.ON, 0)
        q.add_pus_tc(
@ -105,71 +89,27 @@ def pack_bpx_commands(p: ServiceProviderParams):  # noqa C901: Complexity is oka
                app_data=mode_cmd,
            )
        )
-    if op_code == BpxOpCode.RST_BOOT_CNT:
+    if op_code in BpxOpCode.RST_BOOT_CNT:
        q.add_log_cmd("Resetting reboot counters")
        q.add_pus_tc(
            create_action_cmd(
                object_id=BPX_HANDLER_ID, action_id=BpxActionId.RESET_COUNTERS
            )
        )
-    if op_code == BpxOpCode.RST_CFG:
-        q.add_log_cmd("Reset BPX configuration")
-        q.add_pus_tc(
-            create_action_cmd(
-                object_id=BPX_HANDLER_ID, action_id=BpxActionId.CONFIG_CMD
-            )
-        )
-    if op_code == BpxOpCode.SET_CFG:
-        q.add_log_cmd("Setting BPX configuration")
-        user_data = bytearray()
-        batt_mode = BpxHeaterModeSelect(
-            int(input("BPX heater mode select, 0 for OFF 1 for AUTO: "))
-        )
-        user_data.append(batt_mode)
-        lower_limit = int(input("Lower heater limit (-2 default): "))
-        user_data.append(struct.pack("!b", lower_limit)[0])
-        upper_limit = int(input("Upper heater limit (3 default): "))
-        user_data.append(struct.pack("!b", upper_limit)[0])
-        q.add_pus_tc(
-            create_action_cmd(
-                object_id=BPX_HANDLER_ID,
-                action_id=BpxActionId.SET_CFG,
-                user_data=user_data,
-            )
-        )
-    if op_code == BpxOpCode.REQUEST_CFG:
+    if op_code in BpxOpCode.REQUEST_CFG:
        q.add_log_cmd("Requesting configuration struct")
        q.add_pus_tc(
            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.GET_CFG)
        )
-    if op_code == BpxOpCode.REQUEST_CFG_HK:
+    if op_code in BpxOpCode.REQUEST_CFG_HK:
        q.add_log_cmd("Requesting configuration struct HK")
        sid = make_sid(object_id=BPX_HANDLER_ID, set_id=BpxSetId.GET_CFG_SET)
        q.add_pus_tc(generate_one_hk_command(sid=sid))
-    if op_code == BpxOpCode.REBOOT:
+    if op_code in BpxOpCode.REBOOT:
        q.add_log_cmd("Rebooting BPX battery")
        q.add_pus_tc(
            create_action_cmd(object_id=BPX_HANDLER_ID, action_id=BpxActionId.REBOOT)
        )
-    if op_code == BpxOpCode.MAN_HEATER_ON:
-        q.add_log_cmd("BPX manual heater on with seconds burntime")
-        burn_time = int(input("BPX heater burn time in seconds [1-65535]: "))
-        if burn_time < 1 or burn_time > 65535:
-            raise ValueError("Invalid burntime, smaller than 0 or larger than 65535")
-        q.add_pus_tc(
-            create_action_cmd(
-                object_id=BPX_HANDLER_ID,
-                action_id=BpxActionId.MAN_HEATER_ON,
-                user_data=struct.pack("!H", burn_time),
-            )
-        )
-    if op_code == BpxOpCode.MAN_HEATER_OFF:
-        q.add_log_cmd("BPX manual heater off")
-        q.add_pus_tc(
-            create_action_cmd(
-                object_id=BPX_HANDLER_ID, action_id=BpxActionId.MAN_HEATER_OFF
-            )
-        )


 HEADER_LIST = [
@ -186,7 +126,8 @@ HEADER_LIST = [
 ]


-def handle_bpx_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+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)
@ -217,9 +158,7 @@ def handle_bpx_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        validity_buffer = hk_data[inc_len:]
        pw.dlog(str(HEADER_LIST))
        pw.dlog(str(content_list))
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=10
-        )
+        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]
@ -233,6 +172,4 @@ def handle_bpx_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        validity_buffer = hk_data[3:]
        pw.dlog(str(header_list))
        pw.dlog(str(content_list))
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=validity_buffer, num_vars=10
-        )
+        printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=10)
--- a/eive_tmtc/tmtc/power/common_power.py
+++ b/eive_tmtc/tmtc/power/common_power.py
@ -140,7 +140,7 @@ def pack_common_power_cmds(
        q.add_pus_tc(disable_periodic_hk_command(True, make_sid(objb, SetId.CORE)))


-def pack_common_gomspace_cmds(  # noqa C901: Complexity is okay here.
+def pack_common_gomspace_cmds(
    prefix: str, object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
    objb = object_id.as_bytes
--- a/eive_tmtc/tmtc/power/p60dock.py
+++ b/eive_tmtc/tmtc/power/p60dock.py
@ -98,9 +98,7 @@ class P60DockHkTable:
    wdt_gnd_left = TableEntry(bytearray([0x00, 0xA8]), TableEntry.uint32_size)


-def pack_p60dock_cmds(  # noqa C901: Complexity okay here.
-    object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
-):
+def pack_p60dock_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
    objb = object_id.as_bytes
    pack_common_power_cmds("P60 Dock", object_id, q, op_code)
    pack_common_gomspace_cmds("P60 Dock", object_id, q, op_code)
--- a/eive_tmtc/tmtc/power/pdu1.py
+++ b/eive_tmtc/tmtc/power/pdu1.py
@ -3,16 +3,8 @@
@author J. Meier
@date   17.12.2020
 """
-import enum
-
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import PDU_1_HANDLER_ID
-from eive_tmtc.gomspace.gomspace_common import (
-    pack_ping_command,
-    TableIds,
-    pack_get_param_command,
-)
-from eive_tmtc.gomspace.gomspace_pdu_definitions import PduHkTable
 from eive_tmtc.tmtc.power.common_power import (
    pack_common_gomspace_cmds,
    req_hk_cmds,
@ -25,15 +17,15 @@ from eive_tmtc.tmtc.power.common_power import (
    pack_common_power_cmds,
    GomspaceOpCode,
    GsInfo,
+    PowerInfo,
    add_common_power_defs,
    SetId,
 )
-from spacepackets.ecss import PusTelecommand

+from eive_tmtc.gomspace.gomspace_common import *
+from eive_tmtc.gomspace.gomspace_pdu_definitions import *
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.util import ObjectIdU32


 class Pdu1InfoBase:
@ -110,9 +102,7 @@ def info_off_pdu1(base: str) -> str:
    return "PDU1: " + base + " off"


-def pdu1_switch_cmds(  # noqa C901: Complexity is okay here.
-    q: DefaultPusQueueHelper, op_code: str
-):  # noqa C901: Complexity okay here
+def pdu1_switch_cmds(q: DefaultPusQueueHelper, op_code: str):
    if op_code in PowerOpCodes.TCS_ON:
        tcs_on_cmd(q)
    elif op_code in PowerOpCodes.TCS_OFF:
@ -191,7 +181,6 @@ PDU1_DICT = {
    Pdu1ChIndex.SYRLINKS: Pdu1InfoBase.SYRLINKS,
    Pdu1ChIndex.MGT: Pdu1InfoBase.MGT,
    Pdu1ChIndex.SCEX: Pdu1InfoBase.SCEX,
-    Pdu1ChIndex.PLOC: Pdu1InfoBase.PLOC,
    Pdu1ChIndex.ACS_A: Pdu1InfoBase.ACS_A,
    Pdu1ChIndex.SUS_N: Pdu1InfoBase.SUS_N,
 }
--- a/eive_tmtc/tmtc/power/pdu2.py
+++ b/eive_tmtc/tmtc/power/pdu2.py
@ -6,18 +6,7 @@
@author J. Meier
@date   17.12.2020
 """
-import enum
-
 from eive_tmtc.config.object_ids import PDU_2_HANDLER_ID
-from eive_tmtc.gomspace.gomspace_common import (
-    pack_reboot_command,
-    pack_ping_command,
-    pack_gnd_wdt_reset_command,
-    pack_get_param_command,
-    TableIds,
-    pack_request_full_hk_table_command,
-)
-from eive_tmtc.gomspace.gomspace_pdu_definitions import PduHkTable, PduConfigTable
 from eive_tmtc.tmtc.power.common_power import (
    pack_common_gomspace_cmds,
    req_hk_cmds,
@ -31,11 +20,10 @@ from eive_tmtc.tmtc.power.common_power import (
    SetId,
    add_common_power_defs,
 )
-from spacepackets.ecss import PusTelecommand
+from eive_tmtc.gomspace.gomspace_common import *
+from eive_tmtc.gomspace.gomspace_pdu_definitions import *
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.util import ObjectIdU32


 class Pdu2InfoBase:
@ -171,7 +159,7 @@ def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
    )


-def pdu2_switch_cmds(q: DefaultPusQueueHelper, op_code: str):  # noqa C901
+def pdu2_switch_cmds(q: DefaultPusQueueHelper, op_code: str):
    if op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_ON:
        pl_pcdu_bat_nom_on_cmd(q)
    elif op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_OFF:
--- a/eive_tmtc/tmtc/power/plpcdu.py
+++ b/eive_tmtc/tmtc/power/plpcdu.py
@ -22,13 +22,13 @@ from tmtccmd.tc.pus_11_tc_sched import (
 )
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
 from tmtccmd.tc.pus_20_fsfw_param import (
-    create_scalar_double_parameter,
+    pack_scalar_double_param_app_data,
    create_load_param_cmd,
-    create_scalar_boolean_parameter,
+    pack_boolean_parameter_app_data,
 )
 from spacepackets.ecss.tc import PusTelecommand
 from eive_tmtc.config.object_ids import PL_PCDU_ID
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 _LOGGER = logging.getLogger(__name__)

@ -161,9 +161,7 @@ def add_pl_pcdu_cmds(defs: TmtcDefinitionWrapper):
    defs.add_service(CustomServiceList.PL_PCDU.value, "PL PCDU", oce)


-def pack_pl_pcdu_commands(  # noqa C901: Complexity is okay here.
-    q: DefaultPusQueueHelper, op_code: str
-):  # noqa C901: Complexity is okay here.
+def pack_pl_pcdu_commands(q: DefaultPusQueueHelper, op_code: str):
    if op_code in OpCode.SWITCH_ON:
        pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_ON, mode=Mode.ON, submode=0)
    if op_code in OpCode.SWITCH_OFF:
@ -425,21 +423,21 @@ def pack_wait_time_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str):
    q.add_log_cmd(f"Updating {print_str} wait time to {wait_time}")
    if wait_time is None:
        return
-    param_data = create_scalar_double_parameter(
+    param_data = pack_scalar_double_param_app_data(
        object_id=PL_PCDU_ID,
        domain_id=0,
        unique_id=param_id,
        parameter=wait_time,
    )
-    q.add_pus_tc(create_load_param_cmd(param_data))
+    q.add_pus_tc(create_load_param_cmd(app_data=param_data))


 def pack_failure_injection_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str):
    q.add_log_cmd(f"Inserting {print_str} error")
-    param_data = create_scalar_boolean_parameter(
+    param_data = pack_boolean_parameter_app_data(
        object_id=PL_PCDU_ID, domain_id=0, unique_id=param_id, parameter=True
    )
-    q.add_pus_tc(create_load_param_cmd(param_data))
+    q.add_pus_tc(create_load_param_cmd(app_data=param_data))


 def pack_pl_pcdu_mode_cmd(
@ -470,8 +468,9 @@ ADC_CHANNELS_NAMED = [
 ]


-def handle_plpcdu_hk(pw: PrintWrapper, set_id: int, hk_data: bytes):
+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 = []
@ -497,6 +496,4 @@ def handle_plpcdu_hk(pw: PrintWrapper, set_id: int, hk_data: bytes):
        pw.dlog(ch_print)
        for i in range(12):
            pw.dlog(f"{ADC_CHANNELS_NAMED[i].ljust(24)} | {processed_vals[i]}")
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=hk_data[current_idx:], num_vars=3
-        )
+        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
@ -35,6 +35,7 @@ from eive_tmtc.tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds
 from tmtccmd.tc.pus_3_fsfw_hk import (
    create_request_one_diag_command,
    make_sid,
+    create_request_one_hk_command,
 )
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
--- a/eive_tmtc/tmtc/power/tm.py
+++ b/eive_tmtc/tmtc/power/tm.py
@ -9,7 +9,7 @@ from eive_tmtc.tmtc.power.common_power import (
 )
 from eive_tmtc.tmtc.power.power import PcduSetIds
 from tmtccmd.util import ObjectIdBase
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.gomspace.gomspace_common import GomspaceDeviceActionId
 from eive_tmtc.config.object_ids import (
@ -119,7 +119,7 @@ class DevicesInfoParser:
        return current_idx

    def print(self, pw: PrintWrapper):
-        pw.dlog("Device Type | Device State (0:None | 1:OK | 3:ERROR | 4:NOT FOUND)")
+        pw.dlog(f"Device Type | Device State (0:None | 1:OK | 3:ERROR | 4:NOT FOUND)")
        for i in range(len(self.dev_types)):
            pw.dlog(
                f"{self.map_idx_to_type(self.dev_types[i])} | {self.dev_statuses[i]}"
@ -146,13 +146,18 @@ class DevicesInfoParser:
        return "Unknown Type"


-def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes):
+def handle_pdu_data(
+    printer: FsfwTmTcPrinter, pdu_idx: int, set_id: int, hk_data: bytes
+):
+    pw = PrintWrapper(printer=printer)
    current_idx = 0
    priv_idx = pdu_idx - 1
    if set_id == SetId.AUX or set_id == SetId.AUX:
-        fmt_str = "!BBBIIH"
+        fmt_str = "!hhBBBIIH"
        inc_len = struct.calcsize(fmt_str)
        (
+            vcc,
+            vbat,
            conv_enb_0,
            conv_enb_1,
            conv_enb_2,
@ -160,6 +165,7 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
            uptime,
            reset_cause,
        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        pw.dlog(f"VCC {vcc} mV | VBAT {vbat} mV")
        pw.dlog(f"Converter Enables [{conv_enb_0},{conv_enb_1},{conv_enb_2}]")
        pw.dlog(
            f"Boot Cause {boot_cause} | Uptime {uptime} | Reset Cause {reset_cause}",
@ -181,7 +187,7 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
        wdt = WdtInfo(pw=pw)
        current_idx = wdt.parse(wdt_data=hk_data[current_idx:], current_idx=current_idx)
        wdt.print()
-        pw.dlog("PDU Device Types: 0:FRAM|1:ADC|2:ADC|3:TempSens|4,5,6,7:Reserved")
+        pw.dlog(f"PDU Device Types: 0:FRAM|1:ADC|2:ADC|3:TempSens|4,5,6,7:Reserved")
        dev_parser.print(pw=pw)
    if set_id == SetId.CORE or set_id == SetId.CORE:
        pw.dlog(f"Received PDU HK from PDU {pdu_idx}")
@ -210,19 +216,20 @@ def handle_pdu_data(pw: PrintWrapper, pdu_idx: int, set_id: int, hk_data: bytes)
                f"{voltage_list[idx]:05} | {current_list[idx]:04}"
            )
            pw.dlog(content_line)
-        fmt_str = "!IBfhh"
+        fmt_str = "!IBf"
        inc_len = struct.calcsize(fmt_str)
-        (boot_count, batt_mode, temperature, vcc, vbat) = struct.unpack(
+        (boot_count, batt_mode, temperature) = struct.unpack(
            fmt_str, hk_data[current_idx : current_idx + inc_len]
        )
        info = (
            f"Boot Count {boot_count} | Battery Mode {batt_mode} | "
-            f"Temperature {temperature} | VCC {vcc} | VBAT {vbat}"
+            f"Temperature {temperature}"
        )
        pw.dlog(info)


-def handle_p60_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    pw = PrintWrapper(printer=printer)
    if set_id == SetId.CORE:
        pw.dlog("Received P60 Core HK. Voltages in mV, currents in mA")
        current_idx = 0
@ -269,9 +276,7 @@ def handle_p60_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        temps = f"In C: Temp 0 {temp_0} | Temp 1 {temp_1} | "
        pw.dlog(temps)
        pw.dlog(batt_info)
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=hk_data[current_idx:], num_vars=9
-        )
+        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=9)
    if set_id == SetId.AUX:
        pw.dlog("Received P60 AUX HK. Voltages in mV, currents in mA")
        current_idx = 0
@ -336,7 +341,7 @@ def handle_p60_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
            "6:TempSens(BatPack)|7:TempSens(BatPack)"
        )
        dev_parser.print(pw=pw)
-        FsfwTmTcPrinter.get_validity_buffer(
+        printer.print_validity_buffer(
            validity_buffer=hk_data[current_idx:], num_vars=27
        )

@ -349,7 +354,8 @@ def gen_six_entry_u16_list(hk_data: bytes, current_idx: int) -> Tuple[int, List[
    return current_idx, u16_list


-def handle_acu_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
+def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    pw = PrintWrapper(printer=printer)
    if set_id == SetId.CORE:
        mppt_mode = hk_data[0]
        current_idx = 1
@ -377,7 +383,9 @@ def handle_acu_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        current_idx += inc_len
        pw.dlog("Received ACU Core HK. Voltages in mV, currents in mA")
        pw.dlog(f"VCC {vcc} mV | VBAT {vbat} mV | MPPT Mode {mppt_mode}")
-        header_str = "Channel | Input U [mV] | Input I [mA] | U Boost [mV] | Power [mW]"
+        header_str = (
+            f"Channel | Input U [mV] | Input I [mA] | U Boost [mV] | Power [mW]"
+        )
        pw.dlog(header_str)
        for i in range(6):
            pw.dlog(
@ -389,7 +397,7 @@ def handle_acu_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
            f"Boot Count {bootcnt} | Uptime {uptime} sec | "
            f"MPPT Time {mppt_time} msec | MPPT Period {mppt_period} msec"
        )
-        FsfwTmTcPrinter.get_validity_buffer(
+        printer.print_validity_buffer(
            validity_buffer=hk_data[current_idx:], num_vars=12
        )
    if set_id == SetId.AUX:
@ -414,8 +422,7 @@ def handle_acu_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        pw.dlog("Received ACU Aux HK. Voltages in mV, currents in mA")

        pw.dlog(
-            f"DAC Enable States: DAC 0 {dac_enb_str[0]} | DAC 1 {dac_enb_str[1]} | "
-            f"DAC 2 {dac_enb_str[2]}"
+            f"DAC Enable States: DAC 0 {dac_enb_str[0]} | DAC 1 {dac_enb_str[1]} | DAC 2 {dac_enb_str[2]}"
        )
        pw.dlog(f"Boot Cause {boot_cause} | Reset Cause {reset_cause}")
        pw.dlog(
@ -423,13 +430,11 @@ def handle_acu_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        )

        pw.dlog(
-            "ACU Dev Types: 0:FRAM|1:ADC|2:ADC|3:DAC|4:DAC|"
-            "5:DAC|6:TempSens|7:Reserved"
+            f"ACU Dev Types: 0:FRAM|1:ADC|2:ADC|3:DAC|4:DAC|"
+            f"5:DAC|6:TempSens|7:Reserved"
        )
        dev_parser.print(pw=pw)
-        FsfwTmTcPrinter.get_validity_buffer(
-            validity_buffer=hk_data[current_idx:], num_vars=8
-        )
+        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=8)


 def handle_get_param_data_reply(
@ -552,7 +557,8 @@ def parse_name_list(data: bytes, name_len: int):
    return ch_list


-def handle_pcdu_hk(pw: PrintWrapper, set_id: int, hk_data: bytes):
+def handle_pcdu_hk(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
+    pw = PrintWrapper(printer)
    pw.dlog("Received PCDU HK")
    if set_id == PcduSetIds.SWITCHER_SET:
        current_idx = 0
@ -572,4 +578,4 @@ def handle_pcdu_hk(pw: PrintWrapper, set_id: int, hk_data: bytes):
            pw.dlog(f"{name.ljust(25)}: {val}")
        pw.dlog(f"{'P60 Dock 5V Stack'.ljust(25)}: {p60_stack_5v_val}")
        pw.dlog(f"{'P60 Dock 3V3 Stack'.ljust(25)}: {p60_stack_3v3_val}")
-        FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 4)
+        pw.printer.print_validity_buffer(hk_data[current_idx:], 4)
--- a/eive_tmtc/tmtc/solar_array_deployment.py
+++ b/eive_tmtc/tmtc/solar_array_deployment.py
@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 """
@file   solar_array_deployment.py
-@brief  The test function in this file simply returns a command which triggers the solar array
-    deployment.
+@brief  The test function in this file simply returns a command which triggers the solar array deployment.
@author J. Meier
@date   15.02.2021
 """
--- a/eive_tmtc/tmtc/system.py
+++ b/eive_tmtc/tmtc/system.py
@ -11,6 +11,7 @@ from tmtccmd.tc import service_provider
 from eive_tmtc.config.object_ids import EIVE_SYSTEM_ID
 from tmtccmd.tc.pus_200_fsfw_mode import (
    create_mode_command,
+    Mode,
    create_announce_mode_recursive_command,
 )
 from tmtccmd.tc.pus_8_fsfw_funccmd import create_action_cmd
--- a/eive_tmtc/tmtc/tcs/init.py
+++ b/eive_tmtc/tmtc/tcs/init.py
@ -1,2 +1 @@
 from .tm import *  # noqa
-from .tmp1075 import add_tmp_sens_cmds
--- a/eive_tmtc/tmtc/tcs/ctrl.py
+++ b/eive_tmtc/tmtc/tcs/ctrl.py
@ -1,92 +0,0 @@
-from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.config.object_ids import TCS_CONTROLLER
-from eive_tmtc.tmtc.tcs import CtrlSetId
-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_3_fsfw_hk import (
-    make_sid,
-    generate_one_hk_command,
-    create_request_one_diag_command,
-    create_enable_periodic_hk_command_with_interval,
-    create_request_one_hk_command,
-)
-
-
-class OpCode:
-    REQUEST_PRIMARY_TEMP_SET = "temp"
-    ENABLE_TEMP_SET = "enable_temp_set"
-    REQUEST_DEVICE_TEMP_SET = "temp_devs"
-    REQUEST_DEVICE_SUS_SET = "temp_sus"
-    REQUEST_HEATER_INFO = "heater_info"
-    REQUEST_TCS_CTRL_INFO = "tcs_ctrl_info"
-
-
-class Info:
-    ENABLE_TEMP_SET = "Enable Primary Temperature Set"
-    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"
-    REQUEST_HEATER_INFO = "Request heater information"
-    REQUEST_TCS_CTRL_INFO = "Request TCS controller information"
-
-
-def pack_tcs_ctrl_commands(q: DefaultPusQueueHelper, op_code: str):
-    if op_code == OpCode.REQUEST_PRIMARY_TEMP_SET:
-        sensor_set_sid = make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS)
-        q.add_log_cmd(Info.REQUEST_PRIMARY_TEMP_SET)
-        q.add_pus_tc(generate_one_hk_command(sensor_set_sid))
-    if op_code == OpCode.REQUEST_DEVICE_TEMP_SET:
-        q.add_log_cmd(Info.REQUEST_DEVICE_TEMP_SET)
-        q.add_pus_tc(
-            generate_one_hk_command(make_sid(TCS_CONTROLLER, CtrlSetId.DEVICE_SENSORS))
-        )
-    if op_code == OpCode.REQUEST_DEVICE_SUS_SET:
-        q.add_log_cmd(Info.REQUEST_DEVICE_SUS_SET)
-        q.add_pus_tc(
-            generate_one_hk_command(
-                make_sid(TCS_CONTROLLER, CtrlSetId.SUS_TEMP_SENSORS)
-            )
-        )
-    if op_code == OpCode.REQUEST_HEATER_INFO:
-        q.add_log_cmd(Info.REQUEST_HEATER_INFO)
-        q.add_pus_tc(
-            create_request_one_diag_command(
-                make_sid(TCS_CONTROLLER, CtrlSetId.HEATER_INFO)
-            )
-        )
-    if op_code == OpCode.REQUEST_TCS_CTRL_INFO:
-        q.add_log_cmd(Info.REQUEST_TCS_CTRL_INFO)
-        q.add_pus_tc(
-            create_request_one_hk_command(
-                make_sid(TCS_CONTROLLER, CtrlSetId.TCS_CTRL_INFO)
-            )
-        )
-    if op_code == OpCode.ENABLE_TEMP_SET:
-        interval_seconds = float(input("Please specify interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
-            False, make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS), interval_seconds
-        )
-        for cmd in cmds:
-            q.add_pus_tc(cmd)
-    pack_tcs_ass_cmds(q, op_code)
-
-
-@tmtc_definitions_provider
-def add_tcs_ctrl_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(keys=OpCode.ENABLE_TEMP_SET, info=Info.ENABLE_TEMP_SET)
-    oce.add(keys=OpCode.REQUEST_PRIMARY_TEMP_SET, info=Info.REQUEST_PRIMARY_TEMP_SET)
-    oce.add(keys=OpCode.REQUEST_DEVICE_TEMP_SET, info=Info.REQUEST_DEVICE_TEMP_SET)
-    oce.add(keys=OpCode.REQUEST_DEVICE_SUS_SET, info=Info.REQUEST_DEVICE_SUS_SET)
-    oce.add(keys=OpCode.REQUEST_HEATER_INFO, info=Info.REQUEST_HEATER_INFO)
-    oce.add(keys=OpCode.REQUEST_TCS_CTRL_INFO, info=Info.REQUEST_TCS_CTRL_INFO)
-    defs.add_service(
-        name=CustomServiceList.TCS_CTRL,
-        info="TCS controller",
-        op_code_entry=oce,
-    )
--- a/eive_tmtc/tmtc/tcs/defs.py
+++ b/eive_tmtc/tmtc/tcs/defs.py
@ -6,22 +6,3 @@ class CtrlSetId(enum.IntEnum):
    DEVICE_SENSORS = 1
    SUS_TEMP_SENSORS = 2
    HEATER_INFO = 4
-    TCS_CTRL_INFO = 5
-
-
-class TcsSubmode(enum.IntEnum):
-    DEFAULT = 0
-    NO_HEATER_CTRL = 1
-
-
-class Heater(enum.IntEnum):
-    HEATER_0_PLOC_PROC_BRD = 0
-    HEATER_1_PCDU_BRD = 1
-    HEATER_2_ACS_BRD = 2
-    HEATER_3_OBC_BRD = 3
-    HEATER_4_CAMERA = 4
-    HEATER_5_STR = 5
-    HEATER_6_DRO = 6
-    HEATER_7_SYRLINKS = 7
-    NUMBER_OF_SWITCHES = 8
-    NONE = 0xFF
--- a/eive_tmtc/tmtc/tcs/heater.py
+++ b/eive_tmtc/tmtc/tcs/heater.py
@ -7,7 +7,6 @@ import enum

 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import get_object_ids
-from eive_tmtc.tmtc.tcs.defs import Heater
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
@ -21,6 +20,18 @@ from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand


+class Heater(enum.IntEnum):
+    HEATER_0_PLOC_PROC_BRD = 0
+    HEATER_1_PCDU_BRD = 1
+    HEATER_2_ACS_BRD = 2
+    HEATER_3_OBC_BRD = 3
+    HEATER_4_CAMERA = 4
+    HEATER_5_STR = 5
+    HEATER_6_DRO = 6
+    HEATER_7_SYRLINKS = 7
+    NUMBER_OF_SWITCHES = 8
+
+
 HEATER_LOCATION = [
    "PLOC Processing Board",
    "PCDU PDU",
--- a/eive_tmtc/tmtc/tcs/rtd.py
+++ b/eive_tmtc/tmtc/tcs/rtd.py
@ -13,7 +13,7 @@ from tmtccmd.util import ObjectIdU32
 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
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 RTD_IDS = [
    oids.RTD_0_PLOC_HSPD,
@ -147,7 +147,8 @@ def pack_rtd_commands(
        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))


-def handle_rtd_hk(object_id: bytes, hk_data: bytes, pw: PrintWrapper):
+def handle_rtd_hk(object_id: bytes, hk_data: bytes, printer: FsfwTmTcPrinter):
+    pw = PrintWrapper(printer)
    rtd_name = RTD_NAMES.get(object_id)
    if rtd_name is None:
        rtd_name = "unknown RTD device"
@ -161,7 +162,7 @@ def handle_rtd_hk(object_id: bytes, hk_data: bytes, pw: PrintWrapper):
    pw.dlog(f"RTD Value: {rtd_val}")
    pw.dlog(f"Error Byte: {error_byte}")
    pw.dlog(f"Last Error Byte: {last_err_byte}")
-    FsfwTmTcPrinter.get_validity_buffer(hk_data[fmt_len:], 4)
+    pw.printer.print_validity_buffer(hk_data[fmt_len:], 4)


 def prompt_rtd_idx():
--- a/eive_tmtc/tmtc/tcs/subsystem.py
+++ b/eive_tmtc/tmtc/tcs/subsystem.py
@ -1,5 +1,6 @@
+from .defs import CtrlSetId
 from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.config.object_ids import TCS_SUBSYSTEM_ID
+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 (
@ -9,28 +10,64 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_announce_mode_recursive_command
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    generate_one_hk_command,
+    create_request_one_diag_command,
+)


-class OpCode:
-    OFF = "off"
-    NML = "nml"
+class OpCodeSys:
+    OFF = ["off"]
+    NML = ["nml"]
+    REQUEST_PRIMARY_TEMP_SET = ["temp"]
+    REQUEST_DEVICE_TEMP_SET = ["temp_devs"]
+    REQUEST_DEVICE_SUS_SET = ["temp_sus"]
+    REQUEST_HEATER_INFO = "heater_info"
    ANNOUNCE_MODES = "announce_modes"


 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"
+    REQUEST_HEATER_INFO = "Request heater information"
    ANNOUNCE_MODES = "Announce Modes recursively"


 def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
-    if op_code == OpCode.OFF:
+    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 == OpCodeSys.REQUEST_HEATER_INFO:
+        q.add_log_cmd(InfoSys.REQUEST_HEATER_INFO)
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                make_sid(TCS_CONTROLLER, CtrlSetId.HEATER_INFO)
+            )
+        )
+    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 == OpCode.NML:
+    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)
-    if op_code == OpCode.ANNOUNCE_MODES:
+    if op_code == OpCodeSys.ANNOUNCE_MODES:
        q.add_log_cmd(InfoSys.ANNOUNCE_MODES)
        q.add_pus_tc(create_announce_mode_recursive_command(TCS_SUBSYSTEM_ID))
    pack_tcs_ass_cmds(q, op_code)
@ -39,11 +76,19 @@ def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
@tmtc_definitions_provider
 def add_tcs_subsystem_cmds(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
-    oce.add(keys=OpCode.OFF, info=InfoSys.OFF)
-    oce.add(keys=OpCode.NML, info=InfoSys.NML)
-    oce.add(keys=OpCode.ANNOUNCE_MODES, info=InfoSys.ANNOUNCE_MODES)
+    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)
+    oce.add(keys=OpCodeSys.REQUEST_HEATER_INFO, info=InfoSys.REQUEST_HEATER_INFO)
+    oce.add(keys=OpCodeSys.ANNOUNCE_MODES, info=InfoSys.ANNOUNCE_MODES)
    defs.add_service(
-        name=CustomServiceList.TCS_SS,
-        info="TCS subsystem",
+        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,13 +1,11 @@
-import dataclasses
-import datetime
-import enum
 import logging
+import pprint
 import struct

 from eive_tmtc.pus_tm.defs import PrintWrapper
-from eive_tmtc.tmtc.tcs.defs import Heater
 from tmtccmd.fsfw import validity_buffer_list
 from tmtccmd.util import ObjectIdU32
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from .defs import CtrlSetId
 from .heater import HEATER_LOCATION

@ -15,47 +13,8 @@ from .heater import HEATER_LOCATION
 _LOGGER = logging.getLogger(__name__)


-class ThermalComponent(enum.IntEnum):
-    NONE = 0
-    ACS_BOARD = 1
-    MGT = 2
-    RW = 3
-    STR = 4
-    IF_BOARD = 5
-    TCS_BOARD = 6
-    OBC = 7
-    LEGACY_OBCIF_BOARD = 8
-    SBAND_TRANSCEIVER = 9
-    PCDUP60_BOARD = 10
-    PCDUACU = 11
-    PCDUPDU = 12
-    PLPCDU_BOARD = 13
-    PLOCMISSION_BOARD = 14
-    PLOCPROCESSING_BOARD = 15
-    DAC = 16
-    CAMERA = 17
-    DRO = 18
-    X8 = 19
-    HPA = 20
-    TX = 21
-    MPA = 22
-    SCEX_BOARD = 23
-    NUM_ENTRIES = 24
-
-
-@dataclasses.dataclass
-class TcsCtrlComponentInfo:
-    component: ThermalComponent
-    # Heater on or off?
-    state: bool
-    used_sensor_idx: int
-    used_heater: Heater
-    start_time: datetime.datetime
-    end_time: datetime.datetime
-
-
-def handle_thermal_controller_hk_data(  # noqa C901: complexity is okay.
-    object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
+def handle_thermal_controller_hk_data(
+    object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
    # need a better solutuon for this is this is used again..
    """
@ -65,6 +24,7 @@ def handle_thermal_controller_hk_data(  # noqa C901: complexity is okay.
        TCP_TEMP_DEV_SERVER = TmTcpServer("localhost", 7306)
    """
    if set_id == CtrlSetId.PRIMARY_SENSORS:
+        pw = PrintWrapper(printer)
        pw.dlog("Received sensor temperature data")

        # get all the floats
@ -98,6 +58,7 @@ def handle_thermal_controller_hk_data(  # noqa C901: complexity is okay.
        for idx, (k, v) in enumerate(parsed_data.items()):
            print(f"{str(k).ljust(30)}: Valid: {valid_list[idx]}, Value: {v}")
    elif set_id == CtrlSetId.DEVICE_SENSORS:
+        pw = PrintWrapper(printer)
        pw.dlog("Received device temperature data")
        fmt_str = "!fhhhhiiiifffhffffffffffffff"
        fmt_len = struct.calcsize(fmt_str)
@ -133,6 +94,7 @@ def handle_thermal_controller_hk_data(  # noqa C901: complexity is okay.
        for idx, (k, v) in enumerate(parsed_data.items()):
            print(f"{str(k).ljust(30)}: Valid: {valid_list[idx]}, Value: {v}")
    elif set_id == CtrlSetId.SUS_TEMP_SENSORS:
+        pw = PrintWrapper(printer)
        pw.dlog("Received SUS temperature data")
        fmt_str = "!ffffffffffff"
        fmt_len = struct.calcsize(fmt_str)
@ -162,50 +124,5 @@ def handle_thermal_controller_hk_data(  # noqa C901: complexity is okay.
            )
        current_draw = struct.unpack("!H", hk_data[8:10])[0]
        print(f"Heater Power Channel Current Draw: {current_draw} mA")
-    elif set_id == CtrlSetId.TCS_CTRL_INFO:
-        pw.dlog("Received TCS CTRL information set")
-        current_idx = 0
-        heater_states = hk_data[0 : ThermalComponent.NUM_ENTRIES]
-        current_idx += ThermalComponent.NUM_ENTRIES
-        used_sensor_idx = hk_data[
-            current_idx : current_idx + ThermalComponent.NUM_ENTRIES
-        ]
-        current_idx += ThermalComponent.NUM_ENTRIES
-        used_heater_idx = hk_data[
-            current_idx : current_idx + ThermalComponent.NUM_ENTRIES
-        ]
-        current_idx += ThermalComponent.NUM_ENTRIES
-        start_and_end_time_fmt_str = "!IIIIIIIIIIIIIIIIIIIIIIII"
-        data_len = struct.calcsize(start_and_end_time_fmt_str)
-        start_times = struct.unpack(
-            start_and_end_time_fmt_str, hk_data[current_idx : current_idx + data_len]
-        )
-        current_idx += data_len
-        end_times = struct.unpack(
-            start_and_end_time_fmt_str, hk_data[current_idx : current_idx + data_len]
-        )
-        current_idx += data_len
-        component_list = []
-        for i in range(ThermalComponent.NUM_ENTRIES):
-            info = TcsCtrlComponentInfo(
-                component=ThermalComponent(i),
-                state=bool(heater_states[i]),
-                used_sensor_idx=used_sensor_idx[i],
-                used_heater=Heater(used_heater_idx[i]),
-                start_time=datetime.datetime.fromtimestamp(
-                    start_times[i], datetime.timezone.utc
-                ),
-                end_time=datetime.datetime.fromtimestamp(
-                    end_times[i], datetime.timezone.utc
-                ),
-            )
-            component_str = f"{info.component!r}".ljust(46)
-            state_str = "ON" if info.state else "OFF"
-            pw.dlog(
-                f"{component_str}: {state_str.ljust(4)} | Sensor Index "
-                f"{info.used_sensor_idx} | {info.used_heater!r} | Start "
-                f"{info.start_time} | End {info.end_time}"
-            )
-            component_list.append(info)
    else:
        _LOGGER.warning(f"Unimplemented set ID {set_id}")
--- a/eive_tmtc/tmtc/tcs/tmp1075.py
+++ b/eive_tmtc/tmtc/tcs/tmp1075.py
@ -6,17 +6,14 @@
@date   06.01.2021
 """
 import enum
-import struct

 from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config.tmtc import (
    tmtc_definitions_provider,
    TmtcDefinitionWrapper,
    OpCodeEntry,
 )
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data
 from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_hk_command, make_sid
@ -79,10 +76,3 @@ def add_tmp_sens_cmds(defs: TmtcDefinitionWrapper):
    oce.add(OpCode.NML, Info.NML)
    oce.add(OpCode.HK, Info.HK)
    defs.add_service(CustomServiceList.TMP1075.value, "TMP1075 Temperature Sensor", oce)
-
-
-def handle_tmp_1075_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
-    if set_id == SetId.TEMPERATURE:
-        temp = struct.unpack("!f", hk_data[0:4])[0]
-        pw.dlog(f"TMP1075 Temperature: {temp}")
-        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[4:], 1))
--- a/eive_tmtc/tmtc/tm_store.py
+++ b/eive_tmtc/tmtc/tm_store.py
@ -148,8 +148,7 @@ def time_prompt_offset_from_now() -> datetime.datetime:
    seconds_offset = math.floor(
        float(
            input(
-                "Please enter the time as a offset from now in seconds. Negative offset is "
-                "allowed: "
+                "Please enter the time as a offset from now in seconds. Negative offset is allowed: "
            )
        )
    )
--- a/eive_tmtc/utility/input_helper.py
+++ b/eive_tmtc/utility/input_helper.py
@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 """
@file   input_helper.py
-@brief  This class can be used to get user input. A dictionary must be provided which describes the
-    input options.
+@brief  This class can be used to get user input. A dictionary must be provided which describes the input options.
@author J. Meier
@date   13.02.2021
 """
--- a/filetest/eive-sw-update.tar.xz
+++ b/filetest/eive-sw-update.tar.xz
--- a/filetest/fake_10kb.bin
+++ b/filetest/fake_10kb.bin
--- a/filetest/fake_20kb.bin
+++ b/filetest/fake_20kb.bin
--- a/filetest/fake_2_5kb.bin
+++ b/filetest/fake_2_5kb.bin
--- a/pyproject.toml
+++ b/pyproject.toml
@ -29,9 +29,9 @@ classifiers = [
    "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-	"tmtccmd ~= 5.0",
+	"tmtccmd ~= 4.1",
 	"python-dateutil ~= 2.8",
-	# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@1b110d321ef85#egg=tmtccmd"
+	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@<gitRev>#egg=tmtccmd
 ]

 [project.urls]
--- a/release-checklist.md
+++ b/release-checklist.md
@ -1,15 +0,0 @@
-Checklist for new releases
-========
-
-# Pre-Release
-
-1. Bump version inside the `eive_tmtc/__init__.py` file.
-2. Update `CHANGELOG.md`: Convert `unreleased` section into version section
-   with date and new `unreleased`section.
-3. Run auto-formatter with `black .`
-4. Run linter with `flake8 .`
-
-# Post-Release
-
-1. Create new release on `EGit` based on the release branch. This also creates
-   a tag.
--- a/tmtcc.py
+++ b/tmtcc.py
@ -45,7 +45,7 @@ except ImportError as error:

 try:
    import tmtccmd
-except ImportError:
+except ImportError as error:
    run_tmtc_commander = None
    initialize_tmtc_commander = None
    tb = traceback.format_exc()
@ -56,7 +56,7 @@ except ImportError:
 from spacepackets.ecss import PusVerificator
 from tmtccmd import TcHandlerBase, BackendBase
 from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

 from tmtccmd.logging.pus import (
    RawTmtcTimedLogWrapper,
@ -94,7 +94,7 @@ from eive_tmtc.config.definitions import (
    CFDP_REMOTE_ENTITY_ID,
 )
 from eive_tmtc.config.hook import EiveHookObject
-from eive_tmtc.pus_tm.pus_demux import pus_factory_hook
+from eive_tmtc.pus_tm.factory_hook import pus_factory_hook
 from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure

 _LOGGER = APP_LOGGER
@ -166,20 +166,16 @@ class PusHandler(SpecificApidHandlerBase):
        wrapper: VerificationWrapper,
        printer: FsfwTmTcPrinter,
        raw_logger: RawTmtcTimedLogWrapper,
-        hk_level: int,
    ):
        super().__init__(PUS_APID, None)
        self.printer = printer
        self.verif_wrapper = wrapper
        self.raw_logger = raw_logger
-        self.hk_level = hk_level

    def handle_tm(self, packet: bytes, _user_args: any):
        # with open("tc.bin", "wb") as of:
        #    of.write(packet)
-        pus_factory_hook(
-            packet, self.verif_wrapper, self.printer, self.raw_logger, self.hk_level
-        )
+        pus_factory_hook(packet, self.verif_wrapper, self.printer, self.raw_logger)


 class UnknownApidHandler(GenericApidHandlerBase):
@ -208,7 +204,7 @@ class CfdpInCcsdsWrapper(SpecificApidHandlerBase):
            _LOGGER.info("Received File Data PDU TM")
        else:
            if pdu_base.directive_type == DirectiveType.FINISHED_PDU:
-                _LOGGER.info("Received Finished PDU TM")
+                _LOGGER.info(f"Received Finished PDU TM")
            else:
                _LOGGER.info(
                    f"Received File Directive PDU with type {pdu_base.directive_type!r} TM"
@ -316,7 +312,7 @@ class TcHandler(TcHandlerBase):
                            )
                        elif pdu.pdu_directive_type == DirectiveType.EOF_PDU:
                            self.queue_helper.add_log_cmd(
-                                "CFDP Source: Sending EOF PDU"
+                                f"CFDP Source: Sending EOF PDU"
                            )
                    else:
                        fd_pdu = pdu.to_file_data_pdu()
@ -336,21 +332,16 @@ class TcHandler(TcHandlerBase):
                    f"Finished queue for service {def_proc.service} and op code {def_proc.op_code}"
                )
            elif info.proc_type == TcProcedureType.CFDP:
-                _LOGGER.info("Finished CFDP queue")
+                _LOGGER.info(f"Finished CFDP queue")


-def setup_params() -> (SetupWrapper, int):
+def setup_params() -> SetupWrapper:
    hook_obj = EiveHookObject(default_json_path())
    params = SetupParams()
    parser_wrapper = PreArgsParsingWrapper()
    parser_wrapper.create_default_parent_parser()
    parser_wrapper.create_default_parser()
-    tmtc_parser, cfdp_parser = parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
-    tmtc_parser.add_argument(
-        "--hk",
-        help="HK output level",
-        default=2,
-    )
+    parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
    post_arg_parsing_wrapper = parser_wrapper.parse(
        setup_params=params, hook_obj=hook_obj
    )
@ -361,14 +352,13 @@ def setup_params() -> (SetupWrapper, int):
        post_arg_parsing_wrapper.set_params_with_prompts(proc_param_wrapper)
    else:
        post_arg_parsing_wrapper.set_params_without_prompts(proc_param_wrapper)
-    hk_level = int(post_arg_parsing_wrapper.args_raw.hk)
    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
    )
-    return setup_wrapper, hk_level
+    return setup_wrapper


 def setup_cfdp_handler() -> CfdpInCcsdsWrapper:
@ -410,13 +400,12 @@ def setup_tmtc_handlers(
    printer: FsfwTmTcPrinter,
    raw_logger: RawTmtcTimedLogWrapper,
    gui: bool,
-    hk_level: int,
 ) -> (CcsdsTmHandler, TcHandler):
    cfdp_in_ccsds_wrapper = setup_cfdp_handler()
    verification_wrapper = VerificationWrapper(
        verificator, _LOGGER, printer.file_logger
    )
-    pus_handler = PusHandler(verification_wrapper, printer, raw_logger, hk_level)
+    pus_handler = PusHandler(verification_wrapper, printer, raw_logger)
    ccsds_handler = CustomCcsdsTmHandler(generic_handler=UnknownApidHandler(None))
    ccsds_handler.add_apid_handler(pus_handler)
    ccsds_handler.add_apid_handler(cfdp_in_ccsds_wrapper)
@ -448,14 +437,14 @@ def setup_backend(
    return tmtc_backend


-def main():  # noqa C901: Complexity okay here.
+def main():
    print(f"-- eive tmtc v{__version__} --")
    print(f"-- spacepackets v{spacepackets.__version__} --")
    add_colorlog_console_logger(_LOGGER)
    # TODO: -V CLI argument to enable this?
    _LOGGER.setLevel(_LOG_LEVEL)
    try:
-        setup_wrapper, hk_level = setup_params()
+        setup_wrapper = setup_params()
    except KeyboardInterrupt as e:
        _LOGGER.info(f"{e}. Exiting")
        sys.exit(0)
@ -468,7 +457,7 @@ def main():  # noqa C901: Complexity okay here.
    )
    pus_verificator = PusVerificator()
    ccsds_handler, tc_handler = setup_tmtc_handlers(
-        pus_verificator, printer, raw_logger, setup_wrapper.params.use_gui, hk_level
+        pus_verificator, printer, raw_logger, setup_wrapper.params.use_gui
    )

    tmtccmd.setup(setup_wrapper)
--- a/tmtcloop.py
+++ b/tmtcloop.py
@ -0,0 +1,87 @@
+#!/usr/bin/env python3
+"""EIVE TMTC Commander"""
+import sys
+import traceback
+
+try:
+    import tmtccmd.runner as tmtccmd
+    from tmtccmd.config import default_json_path, SetupArgs, CoreGlobalIds
+    from tmtccmd.config.definitions import CoreModeList
+    from tmtccmd.config.args import (
+        create_default_args_parser,
+        add_default_tmtccmd_args,
+        parse_default_input_arguments,
+        handle_unspecified_args,
+    )
+    from tmtccmd.ccsds.handler import CcsdsTmHandler, ApidHandler
+    from tmtccmd.logging import get_console_logger
+    from tmtccmd.logging.pus import create_tmtc_logger
+except ImportError as error:
+    run_tmtc_commander = None
+    initialize_tmtc_commander = None
+    tb = traceback.format_exc()
+    print(tb)
+    print("Python tmtccmd submodule could not be imported")
+    sys.exit(1)
+
+try:
+    import spacepackets
+except ImportError as error:
+    print(error)
+    print("Python spacepackets module could not be imported")
+    print(
+        'Install with "cd spacepackets && python3 -m pip intall -e ." for interative installation'
+    )
+    sys.exit(1)
+
+from config.definitions import PUS_APID
+from pus_tc.procedure_packer import pre_tc_send_cb
+from pus_tm.factory_hook import ccsds_tm_handler
+from tmtcc import tmtcc_pre_args
+
+
+def main():
+    hook_obj = tmtcc_pre_args()
+    arg_parser = create_default_args_parser()
+    add_default_tmtccmd_args(arg_parser)
+    args = parse_default_input_arguments(arg_parser, hook_obj)
+    setup_args = SetupArgs(
+        hook_obj=hook_obj, use_gui=False, apid=PUS_APID, cli_args=args
+    )
+    apid_handler = ApidHandler(cb=ccsds_tm_handler, queue_len=50, user_args=None)
+    ccsds_handler = CcsdsTmHandler()
+    ccsds_handler.add_tm_handler(apid=PUS_APID, handler=apid_handler)
+    tmtccmd.setup(setup_args=setup_args)
+    tmtccmd.add_ccsds_handler(ccsds_handler)
+    tmtc_backend = tmtccmd.create_default_tmtc_backend(
+        setup_args=setup_args,
+        tm_handler=ccsds_handler,
+    )
+    tmtc_file_logger = create_tmtc_logger()
+    tmtc_backend.usr_send_wrapper = (pre_tc_send_cb, tmtc_file_logger)
+
+    tmtc_backend.set_mode(CoreModeList.CONTINUOUS_MODE)
+
+    # get_console_logger().info("Disabling console logger for continuous operation")
+    # get_console_logger().setLevel("ERROR")
+
+    tmtccmd.init_and_start_daemons(tmtc_backend=tmtc_backend)
+    tmtc_backend.perform_operation()
+
+    # remove cmdline args so that we can reuse code
+    sys.argv = sys.argv[:1]
+
+    while True:
+        args.service = None
+        args.op_code = None
+        handle_unspecified_args(args, hook_obj.get_service_op_code_dictionary())
+
+        tmtc_backend.set_service(args.service)
+        tmtc_backend.set_opcode(args.op_code)
+        tmtc_backend.set_mode(CoreModeList.CONTINUOUS_MODE)
+
+        tmtc_backend.perform_operation()
+
+
+if __name__ == "__main__":
+    main()
Author	SHA1	Message	Date
Robin Mueller	0c1bfc6fd3	bump changelog	2023-05-12 16:27:16 +02:00
Robin Mueller	04bbe057e7	flash c ontent report works now	2023-05-12 16:24:45 +02:00
Robin Mueller	e05a54b076	somethings wrong with the format	2023-05-12 16:08:57 +02:00
Robin Mueller	ef0adef04a	start adding action reply handler for MPSoC	2023-05-12 15:51:17 +02:00
Robin Mueller	377e98b5c2	bugfix MPSoC HK parsing	2023-05-12 13:22:58 +02:00
Robin Mueller	87e5abe8eb	add missing command list of PLOC MPSoC commands	2023-05-12 11:51:47 +02:00
Marius Eggert	13fd9a7d84	Merge pull request 'impl MPSoC HK parsing' (#188 ) from mpsoc_commands into main Reviewed-on: #188 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-05-04 15:30:49 +02:00
Robin Mueller	bbcc0f9de7	Merge branch 'mpsoc_commands' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mpsoc_commands	2023-05-04 15:17:12 +02:00
Robin Mueller	a0aa6525e4	fix	2023-05-04 15:17:00 +02:00
Robin Müller	1ab8710040	Merge branch 'main' into mpsoc_commands	2023-05-04 14:51:13 +02:00
Robin Mueller	f480d86fbd	impl MPSoC HK parsing	2023-05-04 14:50:38 +02:00
Marius Eggert	4d921e01af	Merge pull request 'MPSoC module update' (#187 ) from mpsoc_commands into main Reviewed-on: #187 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>	2023-05-04 12:01:43 +02:00
Marius Eggert	b505524e0b	Merge branch 'main' into mpsoc_commands	2023-05-04 12:01:33 +02:00
Robin Mueller	e0e9a310b9	add command to get flash dir content	2023-05-04 11:51:50 +02:00
Robin Mueller	0e9ebefc87	new mpsoc commands	2023-05-04 11:27:12 +02:00
Marius Eggert	e85d1a1966	Merge pull request 'most important bugfix' (#186 ) from most-important-bugfix into main Reviewed-on: #186	2023-05-03 13:36:31 +02:00
meggert	4ff50b6559	bub	2023-05-03 13:34:14 +02:00
Robin Müller	60fba8b6d9	Merge pull request 'more system modes' (#185 ) from more-system-modes into main Reviewed-on: #185	2023-04-28 10:25:35 +02:00
meggert	1707f24612	more system modes	2023-04-19 15:10:44 +02:00
Robin Mueller	5fbd19bb6c	Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc	2023-04-17 18:41:08 +02:00