Merge pull request 'eive-tmtc-bugfixes' (#236 ) from eive-tmtc-bugfixes into main

Reviewed-on: #236
bump patch version
2023-09-12 13:50:25 +02:00 · 2023-09-12 13:49:27 +02:00 · 2023-09-12 13:48:38 +02:00 · 2023-09-12 13:47:27 +02:00 · 2023-09-12 13:35:26 +02:00 · 2023-09-12 13:06:18 +02:00
28 changed files with 494 additions and 231 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,6 +10,54 @@ list yields a list of all related PRs for each release.

 # [unreleased]

+# [v5.5.1] 2023-09-12
+
+## Fixed
+
+- Some API usage fixes related to `tmtccmd` update.
+
+# [v5.5.0] 2023-09-12
+
+- Version is not specfied dynamically anymore and can be updated in `pyproject.toml`
+- New events and returnvalues
+- Bump `tmtccmd` to v6.0.0rc0
+
+# [v5.4.3] 2023-08-15
+
+## Added
+
+- PLOC SUPV HK parsing.
+
+# [v5.4.2] 2023-08-15
+
+## Added
+
+- New NONE entry for PL PCDU submode enum.
+
+# [v5.4.1] 2023-08-15
+
+## Added
+
+- New event TLE_TOO_OLD
+
+## Changed
+
+ - PL Subsystem mode ID is int enum now.
+
+# [v5.4.0] 2023-08-15
+
+## Added
+
+- New enumeration for PL PCDU commanding.
+- Some new events
+
+# [v5.3.1] 2023-07-26
+
+## Changed
+
+- Adaptions for ACS CTRL strategy enum to make it compatible to software. Also make it re-usable
+  by putting it in global scope.
+
 # [v5.3.0] 2023-07-26

 ## Added
--- a/eive_tmtc/init.py
+++ b/eive_tmtc/init.py
@ -1,13 +1,6 @@
-__version__ = "5.3.0"
-
 import logging
 from pathlib import Path

-SW_NAME = "eive-tmtc"
-VERSION_MAJOR = 5
-VERSION_MINOR = 3
-VERSION_REVISION = 0
-
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

--- a/eive_tmtc/config/events.csv
+++ b/eive_tmtc/config/events.csv
@ -94,6 +94,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11205;0x2bc5;MEKF_AUTOMATIC_RESET;INFO;MEKF performed an automatic reset after detection of nonfinite values.;mission/acs/defs.h
 11206;0x2bc6;MEKF_INVALID_MODE_VIOLATION;HIGH;MEKF was not able to compute a solution during any pointing ACS mode for a prolonged time.;mission/acs/defs.h
 11207;0x2bc7;SAFE_MODE_CONTROLLER_FAILURE;HIGH;The ACS safe mode controller was not able to compute a solution and has failed. P1: Missing information about magnetic field, P2: Missing information about rotational rate;mission/acs/defs.h
+11208;0x2bc8;TLE_TOO_OLD;INFO;The TLE for the SGP4 Propagator has become too old.;mission/acs/defs.h
 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/power/defs.h
 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/power/defs.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h
@ -161,6 +162,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12412;0x307c;PDEC_RESET_FAILED;HIGH;Failed to pull PDEC reset to low;linux/ipcore/pdec.h
 12413;0x307d;OPEN_IRQ_FILE_FAILED;HIGH;Failed to open the IRQ uio file;linux/ipcore/pdec.h
 12414;0x307e;PDEC_INIT_FAILED;HIGH;PDEC initialization failed. This might also be due to the persistent confiuration never becoming available, for example due to SD card issues.;linux/ipcore/pdec.h
+12415;0x307f;PDEC_CONFIG_CORRUPTED;HIGH;The PDEC configuration area has been corrupted P1: The first configuration word P2: The second configuration word;linux/ipcore/pdec.h
 12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/acs/StrComHandler.h
 12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/acs/StrComHandler.h
 12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/acs/StrComHandler.h
@ -255,6 +257,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13800;0x35e8;MISSING_PACKET;LOW;No description;mission/payload/scexHelpers.h
 13801;0x35e9;EXPERIMENT_TIMEDOUT;LOW;No description;mission/payload/scexHelpers.h
 13802;0x35ea;MULTI_PACKET_COMMAND_DONE;INFO;No description;mission/payload/scexHelpers.h
+13803;0x35eb;FS_UNUSABLE;LOW;No description;mission/payload/scexHelpers.h
 13901;0x364d;SET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
 13902;0x364e;GET_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
 13903;0x364f;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
@ -300,3 +303,5 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14312;0x37e8;DUMP_MISC_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14313;0x37e9;DUMP_HK_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
 14314;0x37ea;DUMP_CFDP_CANCELLED;LOW;P1: Number of dumped packets. P2: Total dumped bytes.;mission/persistentTmStoreDefs.h
+14500;0x38a4;TEMPERATURE_ALL_ONES_START;MEDIUM;Detected invalid values, starting invalid message counting;mission/acs/SusHandler.h
+14501;0x38a5;TEMPERATURE_ALL_ONES_RECOVERY;INFO;Detected valid values again, resetting invalid message counter. P1: Invalid message counter.;mission/acs/SusHandler.h
--- a/eive_tmtc/config/subsystems.csv
+++ b/eive_tmtc/config/subsystems.csv
@ -60,3 +60,4 @@
 142;COM_SUBSYSTEM
 143;PERSISTENT_TM_STORE
 144;SYRLINKS_COM
+145;SUS_HANDLER
--- a/eive_tmtc/pus_tm/event_handler.py
+++ b/eive_tmtc/pus_tm/event_handler.py
@ -37,12 +37,13 @@ def handle_event_packet(  # noqa C901: Complexity okay here
    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()}"
+        f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x})"
+        f" at {tm.time_provider.as_date_time()}"
    )
    _LOGGER.info(generic_event_string)
    pw.file_logger.info(
-        f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
+        f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}:"
+        f" {generic_event_string}"
    )
    specific_handler = False
    if info.name == "MODE_TRANSITION_FAILED":
@ -54,8 +55,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:"
+            f" {event_def.param1 & 0xffff} | Bytes Written: {event_def.param2}"
        )
        pw.dlog(additional_event_info)
        pw.dlog(context)
--- a/eive_tmtc/pus_tm/hk_handler.py
+++ b/eive_tmtc/pus_tm/hk_handler.py
@ -101,7 +101,9 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
    elif objb == obj_ids.IMTQ_HANDLER_ID:
        return handle_imtq_hk(pw=pw, hk_data=hk_data, set_id=set_id)
    elif objb == obj_ids.GPS_CONTROLLER:
-        return handle_gps_data(pw=pw, hk_data=hk_data)
+        return handle_gps_data(
+            pw=pw, set_id=set_id, hk_data=hk_data, packet_time=packet_dt
+        )
    elif objb == obj_ids.PCDU_HANDLER_ID:
        return handle_pcdu_hk(pw=pw, set_id=set_id, hk_data=hk_data)
    elif objb == obj_ids.BPX_HANDLER_ID:
@ -186,5 +188,5 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
    else:
        _LOGGER.info(
            f"Service 3 TM: Parsing for object {object_id} and set ID {set_id} "
-            f"has not been implemented."
+            "has not been implemented."
        )
--- a/eive_tmtc/pus_tm/pus_demux.py
+++ b/eive_tmtc/pus_tm/pus_demux.py
@ -87,7 +87,8 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
                    # TODO: Could improve display further by actually displaying a matrix as a
                    #       matrix using row and column information
                    pw.dlog(
-                        f"Received vector or matrix data: {param.param_raw.hex(sep=',')}"
+                        "Received vector or matrix data:"
+                        f" {param.param_raw.hex(sep=',')}"
                    )
            except ValueError as e:
                pw.dlog(f"received {e} when trying to parse parameters")
--- a/eive_tmtc/pus_tm/verification_handler.py
+++ b/eive_tmtc/pus_tm/verification_handler.py
@ -48,7 +48,7 @@ def generic_retval_printout(
    if retval_info is None:
        raw_err = retval
        return [
-            f"No returnvalue information found for error code  with "
+            "No returnvalue information found for error code  with "
            f"subsystem ID {(raw_err >> 8) & 0xff} and unique ID {raw_err & 0xff}"
        ]
    else:
@ -58,9 +58,9 @@ def generic_retval_printout(
        )
        string_list = [retval_string]
        if p1:
-            error_param_1_str = f"Error Parameter 1: hex {p1:#010x} " f"dec {p1} "
+            error_param_1_str = f"Error Parameter 1: hex {p1:#010x} dec {p1} "
            string_list.append(error_param_1_str)
        if p2:
-            error_param_2_str = f"Error Parameter 2: hex {p2:#010x} " f"dec {p2}"
+            error_param_2_str = f"Error Parameter 2: hex {p2:#010x} dec {p2}"
            string_list.append(error_param_2_str)
        return string_list
--- a/eive_tmtc/tmtc/acs/acs_ctrl.py
+++ b/eive_tmtc/tmtc/acs/acs_ctrl.py
@ -66,6 +66,37 @@ class ActionId(enum.IntEnum):
    SOLAR_ARRAY_DEPLOYMENT_SUCCESSFUL = 0
    RESET_MEKF = 1
    RESTORE_MEKF_NONFINITE_RECOVERY = 2
+    UPDATE_TLE = 3
+
+
+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",
+}
+
+GPS_COURCE_DICT = {
+    0: "NONE",
+    1: "GPS",
+    2: "GPS_EXTRAPOLATED",
+    3: "SGP4",
+}


 class OpCodes:
@ -80,6 +111,7 @@ class OpCodes:
    SAFE_PTG = ["confirm_deployment"]
    RESET_MEKF = ["reset_mekf"]
    RESTORE_MEKF_NONFINITE_RECOVERY = ["restore_mekf_nonfinite_recovery"]
+    UPDATE_TLE = ["update_tle"]
    SET_PARAMETER_SCALAR = ["set_scalar_param"]
    SET_PARAMETER_VECTOR = ["set_vector_param"]
    SET_PARAMETER_MATRIX = ["set_matrix_param"]
@ -130,6 +162,7 @@ class Info:
    SAFE_PTG = "Confirm deployment of both solar arrays"
    RESET_MEKF = "Reset the MEKF"
    RESTORE_MEKF_NONFINITE_RECOVERY = "Restore MEKF non-finite recovery"
+    UPDATE_TLE = "Update TLE"
    SET_PARAMETER_SCALAR = "Set Scalar Parameter"
    SET_PARAMETER_VECTOR = "Set Vector Parameter"
    SET_PARAMETER_MATRIX = "Set Matrix Parameter"
@ -197,6 +230,7 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper):
        keys=OpCodes.RESTORE_MEKF_NONFINITE_RECOVERY,
        info=Info.RESTORE_MEKF_NONFINITE_RECOVERY,
    )
+    oce.add(keys=OpCodes.UPDATE_TLE, info=Info.UPDATE_TLE)
    oce.add(keys=OpCodes.SET_PARAMETER_SCALAR, info=Info.SET_PARAMETER_SCALAR)
    oce.add(keys=OpCodes.SET_PARAMETER_VECTOR, info=Info.SET_PARAMETER_VECTOR)
    oce.add(keys=OpCodes.SET_PARAMETER_MATRIX, info=Info.SET_PARAMETER_MATRIX)
@ -285,6 +319,22 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):  # noqa C901
        q.add_pus_tc(
            create_action_cmd(ACS_CONTROLLER, ActionId.RESTORE_MEKF_NONFINITE_RECOVERY)
        )
+    elif op_code in OpCodes.UPDATE_TLE:
+        q.add_log_cmd(f"{Info.UPDATE_TLE}")
+        while True:
+            line1 = input("Please input the first line of the TLE: ")
+            if len(line1) == 69:
+                break
+            else:
+                print("The line does not have the required length of 69 characters")
+        while True:
+            line2 = input("Please input the second line of the TLE: ")
+            if len(line2) == 69:
+                break
+            else:
+                print("The line does not have the required length of 69 characters")
+        tle = line1.encode() + line2.encode()
+        q.add_pus_tc(create_action_cmd(ACS_CONTROLLER, ActionId.UPDATE_TLE, tle))
    elif op_code in OpCodes.SET_PARAMETER_SCALAR:
        q.add_log_cmd(f"{Info.SET_PARAMETER_SCALAR}")
        set_acs_ctrl_param_scalar(q)
@ -521,8 +571,8 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):  # noqa C901
 def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
    pt = int(
        input(
-            'Specify parameter type to set {0: "uint8", 1: "uint16", 2: "int32", 3: "float", '
-            '4: "double"}: '
+            'Specify parameter type to set {0: "uint8", 1: "uint16", 2: "int32", 3:'
+            ' "float", 4: "double"}: '
        )
    )
    sid = int(input("Specify parameter struct ID to set: "))
@ -758,8 +808,8 @@ def handle_acs_ctrl_sus_raw_data(pw: PrintWrapper, hk_data: bytes):
 def handle_acs_ctrl_sus_processed_data(pw: PrintWrapper, hk_data: bytes):
    if len(hk_data) < 3 * 4 * 12 + 3 * 8 * 3:
        pw.dlog(
-            f"SUS Processed dataset with size {len(hk_data)} does not have expected size"
-            f" of {3 * 4 * 12 + 3 * 8 * 3} bytes"
+            f"SUS Processed dataset with size {len(hk_data)} does not have expected"
+            f" size of {3 * 4 * 12 + 3 * 8 * 3} bytes"
        )
        return
    current_idx = 0
@ -796,7 +846,8 @@ def handle_raw_mgm_data(pw: PrintWrapper, hk_data: bytes):

    if len(hk_data) < 61:
        pw.dlog(
-            f"ACS CTRL HK: MGM HK data with length {len(hk_data)} shorter than expected 61 bytes"
+            f"ACS CTRL HK: MGM HK data with length {len(hk_data)} shorter than expected"
+            " 61 bytes"
        )
        pw.dlog(f"Raw Data: {hk_data.hex(sep=',')}")
        return
@ -962,11 +1013,13 @@ def handle_gyr_data_processed(pw: PrintWrapper, hk_data: bytes):

 def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
    pw.dlog("Received GPS Processed Set")
+    fmt_source = "!B"
    fmt_scalar = "!d"
    fmt_vec = "!ddd"
+    inc_len_source = struct.calcsize(fmt_source)
    inc_len_scalar = struct.calcsize(fmt_scalar)
    inc_len_vec = struct.calcsize(fmt_vec)
-    if len(hk_data) < 2 * inc_len_scalar + 2 * inc_len_vec:
+    if len(hk_data) < 3 * inc_len_scalar + 2 * inc_len_vec + inc_len_source:
        pw.dlog("Received HK set too small")
        return
    current_idx = 0
@ -1005,12 +1058,20 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
        )
    ]
    current_idx += inc_len_vec
+    source = struct.unpack(
+        fmt_source, hk_data[current_idx : current_idx + inc_len_source]
+    )[0]
+    current_idx += inc_len_source
+    if GPS_COURCE_DICT.get(source) is not None:
+        pw.dlog(f"GPS Source: {GPS_COURCE_DICT[source]}")
+    else:
+        pw.dlog(f"'GPS Source (key unknown)': {source}")
    pw.dlog(f"GPS Latitude: {lat} [deg]")
    pw.dlog(f"GPS Longitude: {long} [deg]")
    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)
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=6)


 def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
@ -1058,21 +1119,6 @@ def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):


 def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
-    ctrl_strat = {
-        0: "OFF",
-        1: "NO_MAG_FIELD_FOR_CONTROL",
-        2: "NO_SENSORS_FOR_CONTROL",
-        10: "SAFE_MEKF",
-        11: "SAFE_GYR",
-        12: "SAFE_SUSMGM",
-        13: "SAFE_ECLIPSE_DAMPING_GYR",
-        14: "SAFE_ECLIPSE_DAMPING_SUSMGM",
-        15: "SAFE_ECLIPSE_IDELING",
-        20: "DETUMBLE_FULL",
-        21: "DETUMBLE_DETERIORATED",
-        30: "PTG_MEKF",
-        31: "PTG_RAW",
-    }
    pw.dlog("Received CTRL Values Set")
    fmt_strat = "!B"
    fmt_quat = "!dddd"
@ -1118,8 +1164,8 @@ def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
        )
    ]
    current_idx += inc_len_vec
-    if ctrl_strat.get(strat) is not None:
-        pw.dlog(f"{'Safe Ctrl Strategy'.ljust(25)}: {ctrl_strat[strat]}")
+    if CTRL_STRAT_DICT.get(strat) is not None:
+        pw.dlog(f"{'Safe Ctrl Strategy'.ljust(25)}: {CTRL_STRAT_DICT[strat]}")
    else:
        pw.dlog(f"{'Safe Ctrl Strategy (key unknown)'.ljust(25)}: {strat}")
    pw.dlog(f"Control Values Target Quaternion: {tgt_quat}")
@ -1231,8 +1277,8 @@ def perform_mgm_calibration(  # noqa C901: Complexity okay
        reply = CALIBR_SOCKET.recv(1024)
        if len(reply) != 2:
            pw.dlog(
-                f"MGM calibration: Reply received command magnetometer_field has invalid "
-                f"length {len(reply)}"
+                "MGM calibration: Reply received command magnetometer_field has"
+                f" invalid length {len(reply)}"
            )
            return
        else:
--- a/eive_tmtc/tmtc/acs/gps.py
+++ b/eive_tmtc/tmtc/acs/gps.py
@ -12,45 +12,59 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import (
    make_sid,
    create_request_one_hk_command,
-    create_enable_periodic_hk_command_with_interval,
-    create_disable_periodic_hk_command,
+    create_enable_periodic_hk_command_with_interval_with_diag,
+    create_disable_periodic_hk_command_with_diag,
 )
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter

 _LOGGER = logging.getLogger(__name__)


+class GpsInfo:
+    MAX_SATELLITES = 30
+
+
 class OpCode:
    OFF = "off"
    ON = "on"
-    REQ_OS_HK = ["hk"]
-    ENABLE_HK = ["enable_hk"]
-    DISABLE_HK = ["disable_hk"]
+    REQ_CORE_HK = ["core_hk_request"]
+    ENABLE_CORE_HK = ["core_hk_enable"]
+    DISABLE_CORE_HK = ["core_hk_disable"]
+    REQ_SKYVIEW_HK = ["skyview_hk_request"]
+    ENABLE_SKYVIEW_HK = ["skyview_hk_enable"]
+    DISABLE_SKYVIEW_HK = ["skyview_hk_disable"]
    RESET_GNSS = ["reset"]


 class Info:
    OFF = "Off"
    ON = "On"
-    REQ_OS_HK = "Request One-Shot HK"
-    ENABLE_HK = "Enable HK"
-    DISABLE_HK = "Disable HK"
+    REQ_CORE_HK = "Request Core HK"
+    ENABLE_CORE_HK = "Enable Core HK"
+    DISABLE_CORE_HK = "Disable Core HK"
+    REQ_SKYVIEW_HK = "Request Skyview HK"
+    ENABLE_SKYVIEW_HK = "Enable Skyview HK"
+    DISABLE_SKYVIEW_HK = "Disable Skyview HK"
    RESET_GNSS = "Reset GNSS using reset pin"


 class SetId(enum.IntEnum):
-    HK = 0
+    CORE_HK = 0
+    SKYVIEW_HK = 1


@tmtc_definitions_provider
 def add_gps_cmds(defs: TmtcDefinitionWrapper):
    oce = OpCodeEntry()
-    oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
-    oce.add(keys=OpCode.REQ_OS_HK, info=Info.REQ_OS_HK)
-    oce.add(keys=OpCode.ENABLE_HK, info=Info.ENABLE_HK)
-    oce.add(keys=OpCode.DISABLE_HK, info=Info.DISABLE_HK)
    oce.add(keys=OpCode.OFF, info=Info.OFF)
    oce.add(keys=OpCode.ON, info=Info.ON)
+    oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
+    oce.add(keys=OpCode.REQ_CORE_HK, info=Info.REQ_CORE_HK)
+    oce.add(keys=OpCode.ENABLE_CORE_HK, info=Info.ENABLE_CORE_HK)
+    oce.add(keys=OpCode.DISABLE_CORE_HK, info=Info.DISABLE_CORE_HK)
+    oce.add(keys=OpCode.REQ_SKYVIEW_HK, info=Info.REQ_SKYVIEW_HK)
+    oce.add(keys=OpCode.ENABLE_SKYVIEW_HK, info=Info.ENABLE_SKYVIEW_HK)
+    oce.add(keys=OpCode.DISABLE_SKYVIEW_HK, info=Info.DISABLE_SKYVIEW_HK)
    defs.add_service(
        name=CustomServiceList.GPS_CTRL.value,
        info="GPS/GNSS Controller",
@ -58,27 +72,64 @@ def add_gps_cmds(defs: TmtcDefinitionWrapper):
    )


-def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
-    sid = make_sid(object_id=object_id, set_id=SetId.HK)
+def pack_gps_command(  # noqa: C901
+    object_id: bytes, q: DefaultPusQueueHelper, op_code: str
+):  # noqa: C901:
    if op_code in OpCode.RESET_GNSS:
        # TODO: This needs to be re-implemented
        _LOGGER.warning("Reset pin handling needs to be re-implemented")
-    if op_code in OpCode.ENABLE_HK:
+    if op_code in OpCode.ENABLE_CORE_HK:
        interval = float(input("Please specify interval in floating point seconds: "))
        if interval <= 0:
            raise ValueError("invalid interval")
-        q.add_log_cmd(f"GPS: {Info.ENABLE_HK}")
-        cmds = create_enable_periodic_hk_command_with_interval(
-            diag=False, sid=sid, interval_seconds=interval
+        q.add_log_cmd(f"GPS: {Info.ENABLE_CORE_HK}")
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=False,
+            sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK),
+            interval_seconds=interval,
        )
        for cmd in cmds:
            q.add_pus_tc(cmd)
-    if op_code in OpCode.DISABLE_HK:
-        q.add_log_cmd(f"gps: {Info.DISABLE_HK}")
-        q.add_pus_tc(create_disable_periodic_hk_command(diag=False, sid=sid))
-    if op_code in OpCode.REQ_OS_HK:
-        q.add_log_cmd(f"GPS: {Info.REQ_OS_HK}")
-        q.add_pus_tc(create_request_one_hk_command(sid=sid))
+    if op_code in OpCode.DISABLE_CORE_HK:
+        q.add_log_cmd(f"gps: {Info.DISABLE_CORE_HK}")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                diag=False, sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)
+            )
+        )
+    if op_code in OpCode.REQ_CORE_HK:
+        q.add_log_cmd(f"GPS: {Info.REQ_CORE_HK}")
+        q.add_pus_tc(
+            create_request_one_hk_command(
+                sid=make_sid(object_id=object_id, set_id=SetId.CORE_HK)
+            )
+        )
+    if op_code in OpCode.ENABLE_SKYVIEW_HK:
+        interval = float(input("Please specify interval in floating point seconds: "))
+        if interval <= 0:
+            raise ValueError("invalid interval")
+        q.add_log_cmd(f"GPS: {Info.ENABLE_SKYVIEW_HK}")
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            diag=False,
+            sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_SKYVIEW_HK:
+        q.add_log_cmd(f"gps: {Info.DISABLE_SKYVIEW_HK}")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command_with_diag(
+                diag=False, sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)
+            )
+        )
+    if op_code in OpCode.REQ_SKYVIEW_HK:
+        q.add_log_cmd(f"GPS: {Info.REQ_SKYVIEW_HK}")
+        q.add_pus_tc(
+            create_request_one_hk_command(
+                sid=make_sid(object_id=object_id, set_id=SetId.SKYVIEW_HK)
+            )
+        )
    if op_code in OpCode.ON:
        q.add_log_cmd(f"GPS: {Info.ON}")
        q.add_pus_tc(create_mode_command(object_id, Mode.ON, 0))
@ -87,8 +138,27 @@ 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):
-    pw.dlog(f"Received GPS data, HK data length {len(hk_data)}")
+def handle_gps_data(
+    pw: PrintWrapper,
+    set_id: int,
+    hk_data: bytes,
+    packet_time: datetime.datetime,
+):
+    pw.ilog(_LOGGER, f"Received GPS CTRL HK with packet time {packet_time}")
+    match set_id:
+        case SetId.CORE_HK:
+            handle_core_data(pw, hk_data)
+        case SetId.SKYVIEW_HK:
+            handle_skyview_data(pw, hk_data)
+
+
+def handle_core_data(pw: PrintWrapper, hk_data: bytes):
+    if len(hk_data) < 4 * 8 + 4 + 2 + 8:
+        pw.dlog(
+            f"GPS Core dataset with size {len(hk_data)} does not have expected size"
+            f" of {4*8+4+2+8} bytes"
+        )
+        return
    current_idx = 0
    fmt_str = "!ddddBBBHBBBBBI"
    inc_len = struct.calcsize(fmt_str)
@ -126,3 +196,65 @@ def handle_gps_data(pw: PrintWrapper, hk_data: bytes):
    FsfwTmTcPrinter.get_validity_buffer(
        validity_buffer=hk_data[current_idx:], num_vars=14
    )
+
+
+def handle_skyview_data(pw: PrintWrapper, hk_data: bytes):
+    data_length = 8 + GpsInfo.MAX_SATELLITES * (8 + 3 * 2 + 1)
+    if len(hk_data) < data_length:
+        pw.dlog(
+            f"GPS Skyview dataset with size {len(hk_data)} does not have expected size"
+            f" of {data_length} bytes"
+        )
+        return
+    current_idx = 0
+    fmt_str_unix = "!d"
+    fmt_str_int16 = "!" + "h" * GpsInfo.MAX_SATELLITES
+    fmt_str_double = "!" + "d" * GpsInfo.MAX_SATELLITES
+    fmt_str_uint8 = "!" + "B" * GpsInfo.MAX_SATELLITES
+    inc_len_unix = struct.calcsize(fmt_str_unix)
+    inc_len_int16 = struct.calcsize(fmt_str_int16)
+    inc_len_double = struct.calcsize(fmt_str_double)
+    inc_len_uint8 = struct.calcsize(fmt_str_uint8)
+    unix = struct.unpack(
+        fmt_str_unix, hk_data[current_idx : current_idx + inc_len_unix]
+    )[0]
+    current_idx += inc_len_unix
+    prn_id = struct.unpack(
+        fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )
+    current_idx += inc_len_int16
+    azimuth = struct.unpack(
+        fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )
+    current_idx += inc_len_int16
+    elevation = struct.unpack(
+        fmt_str_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )
+    current_idx += inc_len_int16
+    signal_to_noise = struct.unpack(
+        fmt_str_double, hk_data[current_idx : current_idx + inc_len_double]
+    )
+    current_idx += inc_len_double
+    used = struct.unpack(
+        fmt_str_uint8, hk_data[current_idx : current_idx + inc_len_uint8]
+    )
+    current_idx += inc_len_uint8
+    pw.dlog(f"Skyview Time: {unix} unix-sec")
+    pw.dlog(
+        "{:<8} {:<8} {:<8} {:<8} {:<8}".format(
+            "PRN_ID", "AZ [°]", "EL [°]", "S2N [dBW]", "USED"
+        )
+    )
+    for idx in range(GpsInfo.MAX_SATELLITES):
+        pw.dlog(
+            "{:<8} {:<8} {:<8} {:<8} {:<8}".format(
+                prn_id[idx],
+                azimuth[idx],
+                elevation[idx],
+                signal_to_noise[idx],
+                used[idx],
+            )
+        )
+    FsfwTmTcPrinter.get_validity_buffer(
+        validity_buffer=hk_data[current_idx:], num_vars=6
+    )
--- a/eive_tmtc/tmtc/acs/imtq.py
+++ b/eive_tmtc/tmtc/acs/imtq.py
@ -24,8 +24,8 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
    generate_one_diag_command,
    generate_one_hk_command,
    create_request_one_diag_command,
-    create_disable_periodic_hk_command,
-    create_enable_periodic_hk_command_with_interval,
+    create_enable_periodic_hk_command_with_interval_with_diag,
+    create_disable_periodic_hk_command_with_diag,
 )
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
@ -227,12 +227,13 @@ def pack_imtq_test_into(  # noqa C901
        duration = int(
            input(
                f"Specify torque duration [range [0, {pow(2, 16) - 1}, "
-                f"0 for continuous generation until update]: "
+                "0 for continuous generation until update]: "
            )
        )
        dur_str = "infinite" if duration == 0 else str(duration)
        q.add_log_cmd(
-            f"IMTQ: Commanding dipole X={x_dipole}, Y={y_dipole}, Z={y_dipole}, duration={dur_str}"
+            f"IMTQ: Commanding dipole X={x_dipole}, Y={y_dipole}, Z={y_dipole},"
+            f" duration={dur_str}"
        )
        q.add_pus_tc(
            pack_dipole_command(
@ -248,7 +249,7 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.ENABLE_ENG_HK_NO_TORQUE:
        q.add_log_cmd("IMTQ: Enable ENG HK")
        interval = float(input("Please enter collection interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
            diag=True,
            sid=make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_NO_TORQUE),
            interval_seconds=interval,
@ -258,7 +259,7 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.DISABLE_ENG_HK_NO_TORQUE:
        q.add_log_cmd("IMTQ: Disable ENG HK (No Torque)")
        q.add_pus_tc(
-            create_disable_periodic_hk_command(
+            create_disable_periodic_hk_command_with_diag(
                True, make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_NO_TORQUE)
            )
        )
@ -275,7 +276,7 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.ENABLE_ENG_HK_WITH_TORQUE:
        q.add_log_cmd("IMTQ: Enable ENG HK with torque")
        interval = float(input("Please enter collection interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
            diag=True,
            sid=make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_SET_WITH_TORQUE),
            interval_seconds=interval,
@ -285,7 +286,7 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.DISABLE_ENG_HK_WITH_TORQUE:
        q.add_log_cmd("IMTQ: Disable ENG HK with Torque")
        q.add_pus_tc(
-            create_disable_periodic_hk_command(
+            create_disable_periodic_hk_command_with_diag(
                True, make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_SET_WITH_TORQUE)
            )
        )
@ -320,14 +321,14 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.DISABLE_MGM_RAW_NO_TORQUE:
        q.add_log_cmd("IMTQ: Disable MGM RAW HK (No Torque)")
        q.add_pus_tc(
-            create_disable_periodic_hk_command(
+            create_disable_periodic_hk_command_with_diag(
                True, make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_NO_TORQUE)
            )
        )
    if op_code == OpCode.ENABLE_MGM_RAW_NO_TORQUE:
        q.add_log_cmd("IMTQ: Enable MGM RAW HK (No Torque)")
        interval = float(input("Please enter collection interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
            diag=True,
            sid=make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_NO_TORQUE),
            interval_seconds=interval,
@ -346,7 +347,7 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.ENABLE_MGM_RAW_WITH_TORQUE:
        q.add_log_cmd("IMTQ: Enable MGM RAW HK (No Torque)")
        interval = float(input("Please enter collection interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
            diag=True,
            sid=make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_WITH_TORQUE),
            interval_seconds=interval,
@ -356,7 +357,7 @@ def pack_imtq_test_into(  # noqa C901
    if op_code == OpCode.DISABLE_MGM_RAW_WITH_TORQUE:
        q.add_log_cmd("IMTQ: Disable MGM RAW HK (No Torque)")
        q.add_pus_tc(
-            create_disable_periodic_hk_command(
+            create_disable_periodic_hk_command_with_diag(
                True, make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_WITH_TORQUE)
            )
        )
@ -388,7 +389,8 @@ def pack_dipole_command(
    duration = int(round(duration))
    if duration < 0 or duration > pow(2, 16) - 1:
        raise ValueError(
-            f"Duration in ms of {duration} smaller than 0 or larger than allowed {pow(2, 16) - 1}"
+            f"Duration in ms of {duration} smaller than 0 or larger than allowed"
+            f" {pow(2, 16) - 1}"
        )
    command += struct.pack("!h", x_dipole)
    command += struct.pack("!h", y_dipole)
@ -400,7 +402,8 @@ def pack_dipole_command(

 def raise_dipole_error(dipole_str: str, value: int):
    raise ValueError(
-        f"{dipole_str} {value} negative or larger than maximum allowed 2000 * 10^-4*Am^2"
+        f"{dipole_str} {value} negative or larger than maximum allowed 2000 *"
+        " 10^-4*Am^2"
    )


--- a/eive_tmtc/tmtc/acs/reaction_wheels.py
+++ b/eive_tmtc/tmtc/acs/reaction_wheels.py
@ -261,14 +261,12 @@ def pack_set_speed_command(
    if speed > 0:
        if speed < 1000 or speed > 65000:
            raise ValueError(
-                "Invalid RW speed specified. "
-                "Allowed range is [1000, 65000] 0.1 * RPM"
+                "Invalid RW speed specified. Allowed range is [1000, 65000] 0.1 * RPM"
            )
    elif speed < 0:
        if speed < -65000 or speed > -1000:
            raise ValueError(
-                "Invalid RW speed specified. "
-                "Allowed range is [-65000, -1000] 0.1 * RPM"
+                "Invalid RW speed specified. Allowed range is [-65000, -1000] 0.1 * RPM"
            )
    else:
        # Speed is 0
@ -304,15 +302,16 @@ def handle_rw_hk_data(
        speed_rpm = speed / 10.0
        ref_speed_rpm = ref_speed / 10.0
        pw.dlog(
-            f"Temperature {temp} C | Speed {speed_rpm} rpm | Reference Speed {ref_speed_rpm} rpm"
+            f"Temperature {temp} C | Speed {speed_rpm} rpm | Reference Speed"
+            f" {ref_speed_rpm} rpm"
        )
        pw.dlog(
            f"State {state}. 0: Error, 1: Idle, 2: Coasting, 3: Running, speed stable, "
-            f"4: Running, speed  changing"
+            "4: Running, speed  changing"
        )
        pw.dlog(
            f"Current Limit Control mode {clc_mode}. 0: Low Current Mode (0.3 A), "
-            f"1: High Current Mode (0.6 A)"
+            "1: High Current Mode (0.6 A)"
        )
        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 5))
    if set_id == RwSetId.LAST_RESET:
@ -361,22 +360,24 @@ def handle_rw_hk_data(
        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])

        pw.dlog(
-            f"MCU Temperature {mcu_temp} | Pressure Sensore Temperature {pressure_sens_temp} C"
+            f"MCU Temperature {mcu_temp} | Pressure Sensore Temperature"
+            f" {pressure_sens_temp} C"
        )
        pw.dlog(f"Last Reset Status {last_reset_status}")
        pw.dlog(
            f"Current Limit Control mode {clc_mode}. 0: Low Current Mode (0.3 A), "
-            f"1: High Current Mode (0.6 A)"
+            "1: High Current Mode (0.6 A)"
        )
        pw.dlog(f"Speed {current_speed} rpm | Reference Speed {ref_speed} rpm")
        pw.dlog(
            f"State {state}. 0: Error, 1: Idle, 2: Coasting, 3: Running, speed stable, "
-            f"4: Running, speed  changing"
+            "4: Running, speed  changing"
        )
        pw.dlog("Number Of Invalid Packets:")
        pw.dlog("CRC | Length | CMD")
        pw.dlog(
-            f"{num_invalid_crc_packets} | {num_invalid_len_packets} | {num_invalid_cmd_packets}"
+            f"{num_invalid_crc_packets} | {num_invalid_len_packets} |"
+            f" {num_invalid_cmd_packets}"
        )
        pw.dlog(
            f"Num Of CMD Executed Requests {num_of_cmd_executed_requests} | "
@ -388,15 +389,16 @@ def handle_rw_hk_data(
            "RegOverrunErrs | TotalErrs"
        )
        pw.dlog(
-            f"{uart_num_of_bytes_written} | {uart_num_of_bytes_read} | {uart_num_parity_errors} | "
-            f"{uart_num_noise_errors} | {uart_num_frame_errors} | {uart_num_reg_overrun_errors} | "
-            f"{uart_total_num_errors}"
+            f"{uart_num_of_bytes_written} | {uart_num_of_bytes_read} |"
+            f" {uart_num_parity_errors} | {uart_num_noise_errors} |"
+            f" {uart_num_frame_errors} | {uart_num_reg_overrun_errors} |"
+            f" {uart_total_num_errors}"
        )
        pw.dlog("SPI COM Info:")
        pw.dlog("NumBytesWritten | NumBytesRead | RegOverrunErrs | TotalErrs")
        pw.dlog(
-            f"{spi_num_bytes_written} | {spi_num_bytes_read} | {spi_num_reg_overrun_errors} | "
-            f"{spi_total_num_errors}"
+            f"{spi_num_bytes_written} | {spi_num_bytes_read} |"
+            f" {spi_num_reg_overrun_errors} | {spi_total_num_errors}"
        )
        if current_idx > 0:
            pw.dlog(
--- a/eive_tmtc/tmtc/com/pdec_handler.py
+++ b/eive_tmtc/tmtc/com/pdec_handler.py
@ -83,7 +83,7 @@ def pack_pdec_handler_test(
                    0,
                    ParameterId.POSITIVE_WINDOW,
                    pw,
-                ).pack()
+                )
            )
        )
    if op_code == OpCode.NEGATIVE_WINDOW:
@ -96,7 +96,7 @@ def pack_pdec_handler_test(
                    0,
                    ParameterId.NEGATIVE_WINDOW,
                    nw,
-                ).pack()
+                )
            )
        )
    if op_code == OpCode.RESET_NO_INIT:
--- a/eive_tmtc/tmtc/com/subsystem.py
+++ b/eive_tmtc/tmtc/com/subsystem.py
@ -3,6 +3,7 @@ import enum
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import COM_SUBSYSTEM_ID
 from eive_tmtc.tmtc.com.syrlinks_handler import Datarate
+from tmtccmd.pus.s20_fsfw_param_defs import create_scalar_u8_parameter

 from .defs import Mode as ComMode

@ -21,7 +22,6 @@ from tmtccmd.tc.pus_200_fsfw_mode import (
 )
 from tmtccmd.tc.pus_20_fsfw_param import (
    create_load_param_cmd,
-    pack_scalar_u8_parameter_app_data,
 )

 from tmtccmd.pus.s20_fsfw_param import create_scalar_u32_parameter
@ -87,7 +87,7 @@ def build_com_subsystem_cmd(p: ServiceProviderParams):  # noqa C901
        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_LOW}")
        q.add_pus_tc(
            create_load_param_cmd(
-                pack_scalar_u8_parameter_app_data(
+                create_scalar_u8_parameter(
                    COM_SUBSYSTEM_ID,
                    0,
                    ParameterId.DATARATE,
@ -99,7 +99,7 @@ def build_com_subsystem_cmd(p: ServiceProviderParams):  # noqa C901
        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_HIGH}")
        q.add_pus_tc(
            create_load_param_cmd(
-                pack_scalar_u8_parameter_app_data(
+                create_scalar_u8_parameter(
                    COM_SUBSYSTEM_ID,
                    0,
                    ParameterId.DATARATE,
@ -122,7 +122,7 @@ def build_com_subsystem_cmd(p: ServiceProviderParams):  # noqa C901
                    0,
                    ParameterId.TRANSMITTER_TIMEOUT,
                    timeout,
-                ).pack()
+                )
            )
        )
    elif o == OpCode.READ_MODE:
--- a/eive_tmtc/tmtc/com/syrlinks_handler.py
+++ b/eive_tmtc/tmtc/com/syrlinks_handler.py
@ -21,9 +21,9 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import (
    make_sid,
    create_request_one_diag_command,
-    create_enable_periodic_hk_command_with_interval,
-    create_disable_periodic_hk_command,
    create_request_one_hk_command,
+    create_enable_periodic_hk_command_with_interval_with_diag,
+    create_disable_periodic_hk_command_with_diag,
 )
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_mode_command
@ -182,24 +182,28 @@ def pack_syrlinks_command(  # noqa C901: Complexity okay here.
        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_RX_REGS}")
        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
        interval = float(input("HK interval in floating point seconds"))
-        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            True, sid, interval
+        )
        for cmd in cmds:
            q.add_pus_tc(cmd)
    if op_code in OpCode.DISABLE_HK_RX_REGS:
        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_RX_REGS}")
        sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
-        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+        q.add_pus_tc(create_disable_periodic_hk_command_with_diag(True, sid))
    if op_code in OpCode.ENABLE_HK_TX_REGS:
        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_TX_REGS}")
        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
        interval = float(input("HK interval in floating point seconds"))
-        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
+            True, sid, interval
+        )
        for cmd in cmds:
            q.add_pus_tc(cmd)
    if op_code in OpCode.DISABLE_HK_TX_REGS:
        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_TX_REGS}")
        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
-        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+        q.add_pus_tc(create_disable_periodic_hk_command_with_diag(True, sid))
    if op_code in OpCode.HK_TX_REGS:
        q.add_log_cmd(f"{prefix}: {Info.HK_TX_REGS}")
        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
--- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py
+++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py
@ -570,12 +570,12 @@ def handle_ploc_mpsoc_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
        pw.dlog(f"CAM SoC Temperature: {cam_soc_temp}")
        pw.dlog(f"System Monitor Temperature: {sysmon_temp}")
        pw.dlog(
-            f"SYSMON VCC INT {sysmon_vcc_int:.3f} | SYSMON VCC AUX {sysmon_vcc_aux:.3f} | "
-            f"SYSMON VCC BRAM {sysmon_vcc_bram:.3f}"
+            f"SYSMON VCC INT {sysmon_vcc_int:.3f} | SYSMON VCC AUX"
+            f" {sysmon_vcc_aux:.3f} | SYSMON VCC BRAM {sysmon_vcc_bram:.3f}"
        )
        pw.dlog(
-            f"SYSMON VCC PAUX {sysmon_vcc_paux:.3f} | SYSMON VCC PINT {sysmon_vcc_pint:.3f} | "
-            f"SYSMON VCC PDRO {sysmon_vcc_pdro:.3f}"
+            f"SYSMON VCC PAUX {sysmon_vcc_paux:.3f} | SYSMON VCC PINT"
+            f" {sysmon_vcc_pint:.3f} | SYSMON VCC PDRO {sysmon_vcc_pdro:.3f}"
        )

        fmt_str = "!fffffffffffff"
@ -602,8 +602,9 @@ def handle_ploc_mpsoc_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
            f"SYSMON MBA 1V8 {sysmon_mb_1v8:.3f}"
        )
        pw.dlog(
-            f"SYSMON VCC 12V {sysmon_vcc_12v:.3f} | SYSMON VCC 5V {sysmon_vcc_5v:.3f} | "
-            f"SYSMON VCC 3V3 {sysmon_vcc_3v3:.3f} | SYSMON VCC 3V3VA {sysmon_vcc_3v3va}"
+            f"SYSMON VCC 12V {sysmon_vcc_12v:.3f} | SYSMON VCC 5V {sysmon_vcc_5v:.3f} |"
+            f" SYSMON VCC 3V3 {sysmon_vcc_3v3:.3f} | SYSMON VCC 3V3VA"
+            f" {sysmon_vcc_3v3va}"
        )
        pw.dlog(
            f"SYSMON VCC 2V5DDR {sysmon_vcc_2v5ddr:.3f} | "
--- a/eive_tmtc/tmtc/payload/ploc_supervisor.py
+++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py
@ -471,8 +471,8 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
        custom_data.extend(struct.pack("!B", memory_id))
        custom_data.extend(struct.pack("!I", start_address))
        q.add_log_cmd(
-            f"{prefix}: {Info.MEM_CHECK} for file {update_file} at memory ID {memory_id} at start "
-            f"address {start_address}"
+            f"{prefix}: {Info.MEM_CHECK} for file {update_file} at memory ID"
+            f" {memory_id} at start address {start_address}"
        )
        command = create_action_cmd(
            object_id.as_bytes, SupvActionId.MEM_CHECK, custom_data
@ -722,10 +722,42 @@ def get_event_buffer_path() -> str:
    return file


+class SocState(enum.IntEnum):
+    OFF = 0
+    BOOTING = 1
+    OPERATIONAL = 2
+    SHUTDOWN = 3
+
+
 def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
    current_idx = 0
    if set_id == SetIds.HK_REPORT:
-        pass
+        fmt_str = "!IIIQIIIIIBBBB"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            temp_ps,
+            temp_pl,
+            temp_sup,
+            uptime,
+            cpu_load,
+            avail_heap,
+            num_tcs,
+            num_tms,
+            soc_state,
+            nvm_0_1_state,
+            nvm_3_state,
+            mission_io_state,
+            fmc_state,
+        ) = struct.unpack(fmt_str, hk_data[:inc_len])
+        pw.dlog(f"Temp PS {temp_ps} C | Temp PL {temp_pl} C | Temp SUP {temp_sup} C")
+        pw.dlog(f"Uptime {uptime} | CPU Load {cpu_load} | Avail Heap {avail_heap}")
+        pw.dlog(f"Number TCs {num_tcs} | Number TMs {num_tms}")
+        pw.dlog(f"SOC state {SocState(soc_state)}")
+        pw.dlog(f"NVM 01 State {nvm_0_1_state}")
+        pw.dlog(f"NVM 3 State {nvm_3_state}")
+        pw.dlog(f"Mission IO state {mission_io_state}")
+        pw.dlog(f"FMC state {fmc_state}")
+        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[inc_len:], 13))
    elif set_id == SetIds.BOOT_STATUS_REPORT:
        fmt_str = "!BBIIBBBBBB"
        inc_len = struct.calcsize(fmt_str)
@ -743,7 +775,8 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
        ) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
        current_idx += inc_len
        pw.dlog(
-            f"SoC state (0:off, 1:booting, 2:update, 3:operating, 4:shutdown, 5:reset): {soc_state}"
+            "SoC state (0:off, 1:booting, 2:update, 3:operating, 4:shutdown, 5:reset):"
+            f" {soc_state}"
        )
        pw.dlog(f"Power Cycles {power_cycles}")
        pw.dlog(f"Boot after {boot_after_ms} ms | Boot timeout {boot_timeout_ms} ms")
--- a/eive_tmtc/tmtc/payload/scex.py
+++ b/eive_tmtc/tmtc/payload/scex.py
@ -17,17 +17,17 @@ USE_SCEX_CONF_FILE = True


 class OpCode:
-    PING = ["0", "ping"]
-    ION_CMD = ["1", "ion"]
-    TEMP_CMD = ["2", "temp"]
-    EXP_STATUS_CMD = ["3", "expstatus"]
+    PING = "ping"
+    ION_CMD = "ion"
+    TEMP_CMD = "temp"
+    EXP_STATUS_CMD = "expstatus"

-    ONE_CELLS_CMD = ["4", "onecell"]
-    ALL_CELLS_CMD = ["5", "allcells"]
-    FRAM = ["6", "fram"]
+    ONE_CELLS_CMD = "onecell"
+    ALL_CELLS_CMD = "allcells"
+    FRAM = "fram"

-    SWITCH_ON = ["7", "on"]
-    SWITCH_OFF = ["8", "off"]
+    SWITCH_ON = "on"
+    SWITCH_OFF = "off"


 class ActionId(enum.IntEnum):
@ -78,7 +78,7 @@ def add_scex_cmds(defs: TmtcDefinitionWrapper):
 def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
    op_code = p.op_code
    q = p.queue_helper
-    if op_code in OpCode.SWITCH_ON:
+    if op_code == OpCode.SWITCH_ON:
        q.add_log_cmd(Info.SWITCH_ON)
        q.add_pus_tc(
            PusTelecommand(
@ -87,7 +87,7 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0),
            )
        )
-    if op_code in OpCode.SWITCH_OFF:
+    if op_code == OpCode.SWITCH_OFF:
        q.add_log_cmd(Info.SWITCH_OFF)
        q.add_pus_tc(
            PusTelecommand(
@ -96,20 +96,20 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.OFF, 0),
            )
        )
-    if op_code in OpCode.PING:
+    if op_code == OpCode.PING:
        q.add_log_cmd(Info.PING)
        app_data = bytes([0])
        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.PING, app_data))
-    if op_code in OpCode.ION_CMD:
+    if op_code == OpCode.ION_CMD:
        q.add_log_cmd(Info.ION_CMD)
        app_data = bytes([0])
        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.ION_CMD, app_data))
-    if op_code in OpCode.TEMP_CMD:
+    if op_code == OpCode.TEMP_CMD:
        q.add_log_cmd(Info.TEMP_CMD)
        app_data = bytes([0])
        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.TEMP_CMD, app_data))

-    if op_code in OpCode.EXP_STATUS_CMD:
+    if op_code == OpCode.EXP_STATUS_CMD:
        q.add_log_cmd(Info.EXP_STATUS_CMD)
        app_data = bytes([0])
        q.add_pus_tc(
@ -117,7 +117,7 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
        )

    # one cell
-    if op_code in OpCode.ONE_CELLS_CMD:
+    if op_code == OpCode.ONE_CELLS_CMD:
        q.add_log_cmd(Info.ONE_CELLS_CMD)
        app_data = bytearray([0])

@ -131,8 +131,7 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
            cell_select = int(cell_select)
            if cell_select < 1 or cell_select > 10:
                print(
-                    f"Invalid cell number {cell_select}, "
-                    f"Please enter a valid number: "
+                    f"Invalid cell number {cell_select}, Please enter a valid number: "
                )
                continue
            cn = cell_select - 1
@ -165,7 +164,7 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
            create_action_cmd(SCEX_HANDLER_ID, ActionId.ONE_CELLS_CMD, app_data)
        )

-    if op_code in OpCode.ALL_CELLS_CMD:
+    if op_code == OpCode.ALL_CELLS_CMD:
        q.add_log_cmd(Info.ALL_CELLS_CMD)
        app_data = bytearray([0])

@ -197,7 +196,7 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
            create_action_cmd(SCEX_HANDLER_ID, ActionId.ALL_CELLS_CMD, app_data)
        )

-    if op_code in OpCode.FRAM:
+    if op_code == OpCode.FRAM:
        q.add_log_cmd(Info.FRAM)
        app_data = bytes([0])
        q.add_pus_tc(create_action_cmd(SCEX_HANDLER_ID, ActionId.FRAM, app_data))
--- a/eive_tmtc/tmtc/payload/subsystem.py
+++ b/eive_tmtc/tmtc/payload/subsystem.py
@ -12,7 +12,7 @@ from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice


-class ModeId:
+class ModeId(enum.IntEnum):
    OFF = 0
    SUPV_ONLY = 10
    MPSOC_STREAM = 11
--- a/eive_tmtc/tmtc/power/common_power.py
+++ b/eive_tmtc/tmtc/power/common_power.py
@ -200,7 +200,8 @@ def pack_common_gomspace_cmds(  # noqa C901: Complexity is okay here.
    if op_code in GomspaceOpCode.SAVE_TABLE_DEFAULT:
        source_table = int(
            input(
-                "Source table [0: Board Config, 1: Module Config, 2: Calibration Parameter]: "
+                "Source table [0: Board Config, 1: Module Config, 2: Calibration"
+                " Parameter]: "
            )
        )
        if source_table not in [0, 1, 2]:
@ -215,8 +216,8 @@ def pack_common_gomspace_cmds(  # noqa C901: Complexity is okay here.
    if op_code in GomspaceOpCode.LOAD_TABLE:
        target_table = int(
            input(
-                "Target table ID [0: Board Config, 1: Module Config, 2: Calibration Parameter, "
-                "4: HK TM]: "
+                "Target table ID [0: Board Config, 1: Module Config, 2: Calibration"
+                " Parameter, 4: HK TM]: "
            )
        )
        if target_table not in [0, 1, 2, 4]:
@ -224,8 +225,8 @@ def pack_common_gomspace_cmds(  # noqa C901: Complexity is okay here.
        if target_table != 4:
            source_table = int(
                input(
-                    "Source table (file or default) [0: Board Config, 1: Module Config, "
-                    "2: Calibration Parameter, value + 4 for default table]: "
+                    "Source table (file or default) [0: Board Config, 1: Module Config,"
+                    " 2: Calibration Parameter, value + 4 for default table]: "
                )
            )
            if source_table not in [0, 1, 2, 4, 5, 6]:
--- a/eive_tmtc/tmtc/power/plpcdu.py
+++ b/eive_tmtc/tmtc/power/plpcdu.py
@ -85,6 +85,40 @@ class NormalSubmodesMask(enum.IntEnum):
    HPA_ON = 5


+class SubmodeForNormalMode(enum.IntEnum):
+    NONE = 0
+    SSR_ON = 1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
+    DRO_ON = 1 << NormalSubmodesMask.DRO_ON | (
+        1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
+    )
+    X8_ON = (
+        1 << NormalSubmodesMask.DRO_ON
+        | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+        | (1 << NormalSubmodesMask.X8_ON)
+    )
+    TX_ON = (
+        1 << NormalSubmodesMask.DRO_ON
+        | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+        | (1 << NormalSubmodesMask.X8_ON)
+        | (1 << NormalSubmodesMask.TX_ON)
+    )
+    MPA_ON = (
+        1 << NormalSubmodesMask.DRO_ON
+        | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+        | (1 << NormalSubmodesMask.X8_ON)
+        | (1 << NormalSubmodesMask.TX_ON)
+        | (1 << NormalSubmodesMask.MPA_ON)
+    )
+    HPA_ON = (
+        1 << NormalSubmodesMask.DRO_ON
+        | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
+        | (1 << NormalSubmodesMask.X8_ON)
+        | (1 << NormalSubmodesMask.TX_ON)
+        | (1 << NormalSubmodesMask.MPA_ON)
+        | (1 << NormalSubmodesMask.HPA_ON)
+    )
+
+
 class ParamIds(enum.IntEnum):
    NEG_V_LOWER_BOUND = 0
    NEG_V_UPPER_BOUND = 1
@ -250,7 +284,7 @@ def hpa_on_procedure(q: DefaultPusQueueHelper):
    if delay_dro_to_x8 is None:
        delay_dro_to_x8 = 900
    q.add_log_cmd(
-        f"Starting procedure to switch on PL PCDU HPA with DRO to X8 "
+        "Starting procedure to switch on PL PCDU HPA with DRO to X8 "
        f"delay of {delay_dro_to_x8} seconds"
    )
    pl_pcdu_on = PusTelecommand(
@ -383,41 +417,17 @@ def request_wait_time() -> Optional[float]:

 def submode_mask_to_submode(on_tgt: NormalSubmodesMask) -> int:
    if on_tgt == NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON:
-        return 1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
+        return SubmodeForNormalMode.SSR_ON
    if on_tgt == NormalSubmodesMask.DRO_ON:
-        return 1 << NormalSubmodesMask.DRO_ON | (
-            1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
-        )
+        return SubmodeForNormalMode.DRO_ON
    if on_tgt == NormalSubmodesMask.X8_ON:
-        return (
-            1 << NormalSubmodesMask.DRO_ON
-            | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
-            | (1 << NormalSubmodesMask.X8_ON)
-        )
+        return SubmodeForNormalMode.X8_ON
    if on_tgt == NormalSubmodesMask.TX_ON:
-        return (
-            1 << NormalSubmodesMask.DRO_ON
-            | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
-            | (1 << NormalSubmodesMask.X8_ON)
-            | (1 << NormalSubmodesMask.TX_ON)
-        )
+        return SubmodeForNormalMode.TX_ON
    if on_tgt == NormalSubmodesMask.MPA_ON:
-        return (
-            1 << NormalSubmodesMask.DRO_ON
-            | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
-            | (1 << NormalSubmodesMask.X8_ON)
-            | (1 << NormalSubmodesMask.TX_ON)
-            | (1 << NormalSubmodesMask.MPA_ON)
-        )
+        return SubmodeForNormalMode.MPA_ON
    if on_tgt == NormalSubmodesMask.HPA_ON:
-        return (
-            1 << NormalSubmodesMask.DRO_ON
-            | (1 << NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON)
-            | (1 << NormalSubmodesMask.X8_ON)
-            | (1 << NormalSubmodesMask.TX_ON)
-            | (1 << NormalSubmodesMask.MPA_ON)
-            | (1 << NormalSubmodesMask.HPA_ON)
-        )
+        return SubmodeForNormalMode.HPA_ON


 def pack_wait_time_cmd(q: DefaultPusQueueHelper, param_id: int, print_str: str):
--- a/eive_tmtc/tmtc/power/tm.py
+++ b/eive_tmtc/tmtc/power/tm.py
@ -75,8 +75,8 @@ class WdtInfo:
        self.pw.dlog(wdt_info)
        for idx in range(len(self.wdt_reboots_list)):
            self.pw.dlog(
-                f"{WDT_LIST[idx].ljust(5)} | "
-                f"{self.wdt_reboots_list[idx]:010} | {self.time_pings_left_list[idx]:010}",
+                f"{WDT_LIST[idx].ljust(5)} | {self.wdt_reboots_list[idx]:010} |"
+                f" {self.time_pings_left_list[idx]:010}",
            )

    def parse(self, wdt_data: bytes, current_idx: int) -> int:
@ -327,8 +327,9 @@ def handle_p60_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        )
        pw.dlog(misc_info)
        batt_info = (
-            f"Batt Temp 0 {batt_temp_0 / 10.0} | Batt Temp 1 {batt_temp_1 / 10.0} | "
-            f"Charge Current {batt_charge_current} | Discharge Current {batt_discharge_current}"
+            f"Batt Temp 0 {batt_temp_0 / 10.0} | Batt Temp 1 {batt_temp_1 / 10.0} |"
+            f" Charge Current {batt_charge_current} | Discharge Current"
+            f" {batt_discharge_current}"
        )
        pw.dlog(batt_info)
        pw.dlog(
@ -419,12 +420,12 @@ def handle_acu_hk_data(pw: PrintWrapper, set_id: int, hk_data: bytes):
        )
        pw.dlog(f"Boot Cause {boot_cause} | Reset Cause {reset_cause}")
        pw.dlog(
-            f"Ground WDT: Reboot Count {wdt_cnt_gnd} | Time Left {wdt_gnd_time_left} sec"
+            f"Ground WDT: Reboot Count {wdt_cnt_gnd} | Time Left"
+            f" {wdt_gnd_time_left} sec"
        )

        pw.dlog(
-            "ACU Dev Types: 0:FRAM|1:ADC|2:ADC|3:DAC|4:DAC|"
-            "5:DAC|6:TempSens|7:Reserved"
+            "ACU Dev Types: 0:FRAM|1:ADC|2:ADC|3:DAC|4:DAC|5:DAC|6:TempSens|7:Reserved"
        )
        dev_parser.print(pw=pw)
        FsfwTmTcPrinter.get_validity_buffer(
@ -474,7 +475,8 @@ def pdu_config_table_handler(
        pw.dlog("[tcs, syrlinks, str, mgt, sus-n, scex, ploc, acs-a, unused]")
    elif obj_id.as_bytes == PDU_2_HANDLER_ID:
        pw.dlog(
-            "[obc, pl-pcdu-bat-nom, rw, heaters, sus-r, sa-depl, pl-pcdu-bat-red, acs-b, pl-cam]"
+            "[obc, pl-pcdu-bat-nom, rw, heaters, sus-r, sa-depl, pl-pcdu-bat-red,"
+            " acs-b, pl-cam]"
        )
    out_on_cnt = unpack_array_in_data(custom_data, 0x52, 2, 9, "H")
    out_off_cnt = unpack_array_in_data(custom_data, 0x64, 2, 9, "H")
--- a/eive_tmtc/tmtc/tcs/ctrl.py
+++ b/eive_tmtc/tmtc/tcs/ctrl.py
@ -12,8 +12,8 @@ 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,
+    create_enable_periodic_hk_command_with_interval_with_diag,
 )


@ -68,7 +68,7 @@ def pack_tcs_ctrl_commands(q: DefaultPusQueueHelper, op_code: str):
        )
    if op_code == OpCode.ENABLE_TEMP_SET:
        interval_seconds = float(input("Please specify interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
+        cmds = create_enable_periodic_hk_command_with_interval_with_diag(
            False, make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS), interval_seconds
        )
        for cmd in cmds:
--- a/eive_tmtc/tmtc/tm_store.py
+++ b/eive_tmtc/tmtc/tm_store.py
@ -148,8 +148,8 @@ 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/lint.py
+++ b/lint.py
@ -32,8 +32,8 @@ def main():
    if not os.path.exists("setup.cfg"):
        additional_flags_second_step += " --max-line-length=100"
    flake8_second_step_cmd = (
-        f"{python_exe} flake8 . {additional_flags_both_steps}  {additional_flags_second_step}"
-        f" {exclude_dirs_flag}"
+        f"{python_exe} flake8 . {additional_flags_both_steps} "
+        f" {additional_flags_second_step} {exclude_dirs_flag}"
    )
    os.system(flake8_second_step_cmd)

--- a/pyproject.toml
+++ b/pyproject.toml
@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "eive-tmtc"
 description = "TMTC Commander EIVE"
 readme = "README.md"
-dynamic = ["version"]
+version = "5.5.1"
 requires-python = ">=3.10"
 license = {text = "Apache-2.0"}
 authors = [
@ -29,9 +29,8 @@ classifiers = [
    "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-	"tmtccmd ~= 5.0",
+	"tmtccmd == 6.0.0rc0",
 	"python-dateutil ~= 2.8",
-	# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@1b110d321ef85#egg=tmtccmd"
 ]

 [project.urls]
@ -40,9 +39,6 @@ dependencies = [
 [tool.setuptools]
 include-package-data = true

-[tool.setuptools.dynamic]
-version = {attr = "eive_tmtc.__version__"}
-
 # Auto-Discovery is problematic for some reason, so use custom-discovery
 [tool.setuptools.packages]
 find = {}
--- a/release-checklist.md
+++ b/release-checklist.md
@ -3,7 +3,7 @@ Checklist for new releases

 # Pre-Release

-1. Bump version inside the `eive_tmtc/__init__.py` file.
+1. Bump version inside the `pyproject.toml` file.
 2. Update `CHANGELOG.md`: Convert `unreleased` section into version section
   with date and new `unreleased`section.
 3. Run auto-formatter with `black .`
--- a/tmtcc.py
+++ b/tmtcc.py
@ -2,10 +2,11 @@
 import logging
 import sys
 import time
-import traceback
 from pathlib import Path
 from typing import cast

+from spacepackets.ecss import PusVerificator
+from spacepackets.version import get_version as get_sp_version
 from spacepackets.ccsds import SPACE_PACKET_HEADER_SIZE
 from spacepackets.cfdp import (
    ConditionCode,
@ -16,6 +17,8 @@ from spacepackets.cfdp import (
    PduFactory,
    PduType,
 )
+
+import tmtccmd
 from tmtccmd.logging import add_colorlog_console_logger
 from tmtccmd.cfdp import CfdpUserBase, TransactionId
 from tmtccmd.cfdp.defs import CfdpRequestType
@ -32,28 +35,6 @@ from tmtccmd.cfdp.user import (
    FileSegmentRecvdParams,
 )
 from tmtccmd.tc.handler import SendCbParams
-
-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)
-
-try:
-    import tmtccmd
-except ImportError:
-    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)
-
-from spacepackets.ecss import PusVerificator
 from tmtccmd import TcHandlerBase, BackendBase
 from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
@ -86,7 +67,7 @@ from tmtccmd.config.args import (
    ProcedureParamsWrapper,
 )
 from eive_tmtc import APP_LOGGER
-from eive_tmtc import __version__
+from importlib.metadata import version
 from eive_tmtc.config.definitions import (
    PUS_APID,
    CFDP_APID,
@ -211,7 +192,8 @@ class CfdpInCcsdsWrapper(SpecificApidHandlerBase):
                _LOGGER.info("Received Finished PDU TM")
            else:
                _LOGGER.info(
-                    f"Received File Directive PDU with type {pdu_base.directive_type!r} TM"
+                    "Received File Directive PDU with type"
+                    f" {pdu_base.directive_type!r} TM"
                )
        self.handler.pass_pdu_packet(pdu_base)

@ -311,7 +293,7 @@ class TcHandler(TcHandlerBase):
                        if pdu.pdu_directive_type == DirectiveType.METADATA_PDU:
                            metadata = pdu.to_metadata_pdu()
                            self.queue_helper.add_log_cmd(
-                                f"CFDP Source: Sending Metadata PDU for file with size "
+                                "CFDP Source: Sending Metadata PDU for file with size "
                                f"{metadata.file_size}"
                            )
                        elif pdu.pdu_directive_type == DirectiveType.EOF_PDU:
@ -321,7 +303,7 @@ class TcHandler(TcHandlerBase):
                    else:
                        fd_pdu = pdu.to_file_data_pdu()
                        self.queue_helper.add_log_cmd(
-                            f"CFDP Source: Sending File Data PDU for segment at offset "
+                            "CFDP Source: Sending File Data PDU for segment at offset "
                            f"{fd_pdu.offset} with length {len(fd_pdu.file_data)}"
                        )
                    self.queue_helper.add_ccsds_tc(sp)
@ -333,7 +315,8 @@ class TcHandler(TcHandlerBase):
            if info.proc_type == TcQueueEntryType.PUS_TC:
                def_proc = info.to_def_procedure()
                _LOGGER.info(
-                    f"Finished queue for service {def_proc.service} and op code {def_proc.op_code}"
+                    f"Finished queue for service {def_proc.service} and op code"
+                    f" {def_proc.op_code}"
                )
            elif info.proc_type == TcProcedureType.CFDP:
                _LOGGER.info("Finished CFDP queue")
@ -449,8 +432,8 @@ def setup_backend(


 def main():  # noqa C901: Complexity okay here.
-    print(f"-- eive tmtc v{__version__} --")
-    print(f"-- spacepackets v{spacepackets.__version__} --")
+    print(f"-- eive tmtc v{version('eive-tmtc')} --")
+    print(f"-- spacepackets v{get_sp_version()} --")
    add_colorlog_console_logger(_LOGGER)
    # TODO: -V CLI argument to enable this?
    _LOGGER.setLevel(_LOG_LEVEL)