Merge pull request 'prep next version' (#249) from prep_v5.10.0 into main

Reviewed-on: #249

CHANGELOG.md

@@ -10,6 +10,37 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v5.10.0] 2023-10-27
+
+- Added new STR commands to allow more debugging.
+
+# [v5.9.0] 2023-10-24
+
+## Added
+
+- Added command to update PL PCDU I and V parameter bounds commands.
+
+# [v5.8.0] 2023-10-11
+
+## Added
+
+- Xiphos WDT enable and disable command.
+
+# [v5.7.1] 2023-10-11
+
+## Added
+
+- SCEX normal command
+
+# [v5.7.0] 2023-10-10
+
+- `tmtccmd` v6.0.0
+- `spacepackets` v18.0.0
+
+## Added
+
+- Power controller commands.
+
 # [v5.6.0] 2023-09-14
 
 - `tmtccmd` v6.0.0

eive_tmtc/config/definitions.py

@@ -76,3 +76,6 @@ class CustomServiceList(str, enum.Enum):
     SCEX = "scex"
     TM_STORE = "tm_store"
     SYSTEM = "system"
+    PWR_CTRL = "pwr_ctrl"
+    EPS_SS = "eps_subsystem"
+    XIPHOS_WDT = "xiphos_wdt"

eive_tmtc/config/events.csv

@@ -100,6 +100,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/power/defs.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h
 11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;No description;mission/power/defs.h
+11304;0x2c28;DATASET_READ_FAILED;INFO;The dataset read for the inputs of the Power Controller has failed.;mission/power/defs.h
+11305;0x2c29;VOLTAGE_OUT_OF_BOUNDS;HIGH;No description;mission/power/defs.h
+11306;0x2c2a;TIMEDELTA_OUT_OF_BOUNDS;LOW;Time difference for Coulomb Counter was too large. P1: time in s * 10;mission/power/defs.h
+11307;0x2c2b;POWER_LEVEL_LOW;HIGH;The State of Charge is below the limit for payload use. Setting Payload to faulty.;mission/power/defs.h
+11308;0x2c2c;POWER_LEVEL_CRITICAL;HIGH;The State of Charge is below the limit for higher modes. Setting Reaction Wheels to faulty.;mission/power/defs.h
 11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;No description;mission/tcs/HeaterHandler.h
 11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;No description;mission/tcs/HeaterHandler.h
 11402;0x2c8a;HEATER_WENT_ON;INFO;No description;mission/tcs/HeaterHandler.h
@@ -123,6 +128,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/payload/PlocMpsocHandler.h
 11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/payload/PlocMpsocHandler.h
 11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/payload/PlocMpsocHandler.h
+11607;0x2d57;SUPV_NOT_ON;LOW;SUPV not on for boot or shutdown process. P1: 0 for OFF transition, 1 for ON transition.;linux/payload/PlocMpsocHandler.h
+11608;0x2d58;SUPV_REPLY_TIMEOUT;LOW;No description;linux/payload/PlocMpsocHandler.h
 11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h
 11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h
 11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/acs/ImtqHandler.h
@@ -306,3 +313,4 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 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
+14600;0x3908;FAULT_HANDLER_TRIGGERED;LOW;P1: CFDP fault handler code. P2: CFDP condition code.;mission/cfdp/defs.h

eive_tmtc/config/object_ids.py

@@ -136,6 +136,7 @@ ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
 PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
 TCS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x03])
 COM_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x04])
+EPS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x05])
 
 # Legacy names, kept for backwards compatibility
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
@@ -157,6 +158,8 @@ STR_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x09])
 TCS_CONTROLLER = bytes([0x43, 0x40, 0x00, 0x01])
 ACS_CONTROLLER = bytes([0x43, 0x00, 0x00, 0x02])
 CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
+PWR_CONTROLLER = bytes([0x43, 0x00, 0x00, 0x04])
+XIPHOS_WDT_ID = bytes([0x43, 0x00, 0x00, 0x07])
 
 MISC_TM_STORE = bytes([0x73, 0x02, 0x00, 0x01])
 OK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x02])

eive_tmtc/config/objects.csv

@@ -1,7 +1,9 @@
 0x00005060;P60DOCK_TEST_TASK
 0x43000002;ACS_CONTROLLER
 0x43000003;CORE_CONTROLLER
+0x43000004;POWER_CONTROLLER
 0x43000006;GLOBAL_JSON_CFG
+0x43000007;XIPHOS_WDT
 0x43400001;THERMAL_CONTROLLER
 0x44120006;MGM_0_LIS3_HANDLER
 0x44120010;GYRO_0_ADIS_HANDLER
@@ -156,11 +158,13 @@
 0x73000102;CFDP_TM_FUNNEL
 0x73000205;CFDP_HANDLER
 0x73000206;CFDP_DISTRIBUTOR
+0x73000207;CFDP_FAULT_HANDLER
 0x73010000;EIVE_SYSTEM
 0x73010001;ACS_SUBSYSTEM
 0x73010002;PL_SUBSYSTEM
 0x73010003;TCS_SUBSYSTEM
 0x73010004;COM_SUBSYSTEM
+0x73010005;EPS_SUBSYSTEM
 0x73020001;MISC_TM_STORE
 0x73020002;OK_TM_STORE
 0x73020003;NOT_OK_TM_STORE

eive_tmtc/config/returnvalues.csv

@@ -210,6 +210,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x27a8;DHI_NoReplyExpected;No description;168;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27a9;DHI_NonOpTemperature;No description;169;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27aa;DHI_CommandNotImplemented;No description;170;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
+0x27ab;DHI_NonOpStateOfCharge;No description;171;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27b0;DHI_ChecksumError;No description;176;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27b1;DHI_LengthMissmatch;No description;177;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
 0x27b2;DHI_InvalidData;No description;178;DEVICE_HANDLER_IF;fsfw/src/fsfw/devicehandlers/DeviceHandlerIF.h
@@ -614,4 +615,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x6e00;PTM_DumpDone;No description;0;PERSISTENT_TM_STORE;mission/tmtc/PersistentTmStore.h
 0x6e01;PTM_BusyDumping;No description;1;PERSISTENT_TM_STORE;mission/tmtc/PersistentTmStore.h
 0x6f00;TMS_IsBusy;No description;0;TM_SINK;mission/tmtc/DirectTmSinkIF.h
-0x7100;SCBU_KeyNotFound;No description;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
+0x6f01;TMS_PartiallyWritten;No description;1;TM_SINK;mission/tmtc/DirectTmSinkIF.h
+0x6f02;TMS_NoWriteActive;No description;2;TM_SINK;mission/tmtc/DirectTmSinkIF.h
+0x7000;VCS_ChannelDoesNotExist;No description;0;VIRTUAL_CHANNEL;mission/com/VirtualChannel.h
+0x7200;SCBU_KeyNotFound;No description;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h

eive_tmtc/config/subsystems.csv

@@ -61,3 +61,4 @@
 143;PERSISTENT_TM_STORE
 144;SYRLINKS_COM
 145;SUS_HANDLER
+146;CFDP_APP

eive_tmtc/pus_tc/procedure_packer.py

@@ -35,6 +35,7 @@ from eive_tmtc.tmtc.core import pack_core_commands
 from eive_tmtc.tmtc.acs.star_tracker import pack_star_tracker_commands
 from eive_tmtc.tmtc.com.syrlinks_handler import pack_syrlinks_command
 from eive_tmtc.tmtc.com.pdec_handler import pack_pdec_handler_test
+from eive_tmtc.tmtc.wdt import pack_wdt_commands
 from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import (
@@ -66,7 +67,7 @@ from eive_tmtc.config.object_ids import (
 from eive_tmtc.tmtc.tcs.tmp1075 import pack_tmp1075_test_into
 from eive_tmtc.tmtc.acs.gps import pack_gps_command
 from eive_tmtc.tmtc.payload.rad_sensor import pack_rad_sensor_test_into
-from eive_tmtc.tmtc.power.plpcdu import pack_pl_pcdu_commands
+from eive_tmtc.tmtc.payload.plpcdu import pack_pl_pcdu_commands
 from eive_tmtc.tmtc.acs.str_img_helper import pack_str_img_helper_command
 from eive_tmtc.pus_tc.system.proc import pack_proc_commands
 
@@ -205,6 +206,8 @@ def handle_default_procedure(  # noqa C901: Complexity okay here.
                 queue_helper=queue_helper,
             )
         )
+    if service == CustomServiceList.XIPHOS_WDT.value:
+        return pack_wdt_commands(queue_helper, op_code)
     if not route_to_registered_service_handlers(
         service,
         ServiceProviderParams(

eive_tmtc/pus_tm/action_reply_handler.py

@@ -16,7 +16,7 @@ from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.tmtc.core import handle_core_ctrl_action_replies
 from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_mpsoc_data_reply
 from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionId
-from eive_tmtc.tmtc.acs.star_tracker import StarTrackerActionId
+from eive_tmtc.tmtc.acs.star_tracker import handle_star_tracker_action_replies
 from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.tm import Service8FsfwTm
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
@@ -52,7 +52,7 @@ def handle_action_reply(
     elif object_id.as_bytes == CORE_CONTROLLER_ID:
         return handle_core_ctrl_action_replies(action_id, pw, custom_data)
     elif object_id.as_bytes == STAR_TRACKER_ID:
-        return handle_startracker_replies(action_id, pw, custom_data)
+        return handle_star_tracker_action_replies(action_id, pw, custom_data)
     elif object_id.as_bytes in [
         ACU_HANDLER_ID,
         PDU_1_HANDLER_ID,
@@ -89,20 +89,3 @@ def handle_supervisor_replies(action_id: int, pw: PrintWrapper, custom_data: byt
         content_list = [struct.unpack("!H", custom_data[:2])[0]]
         pw.dlog(f"{header_list}")
         pw.dlog(f"{content_list}")
-
-
-def handle_startracker_replies(
-    action_id: int, pw: PrintWrapper, custom_data: bytearray
-):
-    if action_id == StarTrackerActionId.CHECKSUM:
-        if len(custom_data) != 5:
-            _LOGGER.warning(
-                "Star tracker reply has invalid length {0}".format(len(custom_data))
-            )
-            return
-        header_list = ["Checksum", "Checksum valid"]
-        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}")

eive_tmtc/pus_tm/hk_handler.py

@@ -1,12 +1,14 @@
 """HK Handling for EIVE OBSW"""
+import dataclasses
 import logging
+from typing import List
 
 from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_hk_data
 from eive_tmtc.tmtc.internal_err_reporter import handle_ier_hk_data
 from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_ploc_mpsoc_hk_data
 from eive_tmtc.tmtc.tcs.rtd import RTD_NAMES, handle_rtd_hk
 from eive_tmtc.tmtc.acs.star_tracker import handle_str_hk_data
-from eive_tmtc.tmtc.power.plpcdu import handle_plpcdu_hk
+from eive_tmtc.tmtc.payload.plpcdu import handle_plpcdu_hk
 from eive_tmtc.tmtc.payload.rad_sensor import handle_rad_sensor_data
 from eive_tmtc.tmtc.acs.sus import handle_sus_hk
 from eive_tmtc.tmtc.payload.ploc_supervisor import handle_supv_hk_data
@@ -46,8 +48,18 @@ _LOGGER = logging.getLogger(__name__)
 FORWARD_SENSOR_TEMPS = False
 
 
+@dataclasses.dataclass
+class HkFilter:
+    object_ids: List[ObjectIdU32]
+    set_ids: List[int]
+
+
 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,
+    hk_filter: HkFilter,
+    hk_level: int,
 ):
     tm_packet = Service3FsfwTm.unpack(raw_telemetry=raw_tm, custom_hk_handling=False)
     named_obj_id = obj_id_dict.get(tm_packet.object_id.as_bytes)
@@ -56,17 +68,21 @@ def handle_hk_packet(
     if tm_packet.subservice == 25 or tm_packet.subservice == 26:
         hk_data = tm_packet.tm_data[8:]
 
-        printer.generic_hk_tm_print(
-            content_type=HkContentType.HK,
-            object_id=named_obj_id,
-            set_id=tm_packet.set_id,
-            hk_data=hk_data,
-        )
-
+        if named_obj_id in hk_filter.object_ids:
+            handle_regular_hk_print(
+                printer=printer,
+                object_id=named_obj_id,
+                hk_packet=tm_packet,
+                tm=tm_packet.pus_tm,
+                hk_data=hk_data,
+            )
+            return
         try:
-            if hk_level == 1:
-                pass
-            elif hk_level > 1:
+            if hk_level >= 1:
+                printer.generic_hk_tm_print(
+                    HkContentType.HK, named_obj_id, tm_packet.set_id, hk_data
+                )
+            if hk_level >= 1:
                 handle_regular_hk_print(
                     printer=printer,
                     object_id=named_obj_id,

eive_tmtc/pus_tm/pus_demux.py

@@ -18,7 +18,7 @@ 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_handler import handle_hk_packet, HkFilter
 from .action_reply_handler import handle_action_reply
 
 _LOGGER = logging.getLogger(__name__)
@@ -30,6 +30,7 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
     printer: FsfwTmTcPrinter,
     raw_logger: RawTmtcTimedLogWrapper,
     hk_level: int,
+    hk_filter: HkFilter,
 ):
     if len(packet) < 8:
         _LOGGER.warning("Detected packet shorter than 8 bytes!")
@@ -50,7 +51,11 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
         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
+            printer=printer,
+            raw_tm=packet,
+            obj_id_dict=obj_id_dict,
+            hk_level=hk_level,
+            hk_filter=hk_filter,
         )
     elif service == 5:
         handle_event_packet(raw_tm=packet, pw=pw)

eive_tmtc/tmtc/__init__.py

@@ -6,3 +6,4 @@ 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
+from .wdt import add_xiphos_wdt_defs

eive_tmtc/tmtc/acs/gps.py

@@ -242,7 +242,7 @@ def handle_skyview_data(pw: PrintWrapper, hk_data: bytes):
     pw.dlog(f"Skyview Time: {unix} unix-sec")
     pw.dlog(
         "{:<8} {:<8} {:<8} {:<8} {:<8}".format(
-            "PRN_ID", "AZ [°]", "EL [°]", "S2N [dBW]", "USED"
+            "PRN_ID", "AZ [°]", "EL [°]", "S2N [dBHz]", "USED"
         )
     )
     for idx in range(GpsInfo.MAX_SATELLITES):

eive_tmtc/tmtc/acs/star_tracker.py

@@ -16,7 +16,14 @@ from eive_tmtc.utility.input_helper import InputHelper
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_diag_command, make_sid
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    create_request_one_diag_command,
+    create_request_one_hk_command,
+    enable_periodic_hk_command_with_interval,
+    disable_periodic_hk_command,
+    make_sid,
+)
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
@@ -90,6 +97,9 @@ class StarTrackerActionId(enum.IntEnum):
     DEBUG_CAMERA = 83
     FIRMWARE_UPDATE = 84
     SET_TIME_FROM_SYS_TIME = 87
+    ADD_SECONDARY_TM_TO_NORMAL_MODE = 95
+    RESET_SECONDARY_TM_SET = 96
+    READ_SECONDARY_TM_SET = 97
 
 
 class OpCodes:
@@ -98,8 +108,12 @@ class OpCodes:
     NORMAL = "nml"
     OFF = "off"
     PING = "ping"
-    REQUEST_SOLUTION_SET_HK = "hk_req_sol"
-    REQUEST_SOLUTION_SET_ACTION = "action_req_sol"
+    ONE_SHOOT_HK = "one_shot_hk"
+    ENABLE_HK = "enable_hk"
+    DISABLE_HK = "disable_hk"
+    ADD_SECONDARY_TM_TO_NORMAL_MODE = "add_secondary_tm"
+    RESET_SECONDARY_TM_SET = "reset_secondary_tm"
+    READ_SECONDARY_TM_SET = "read_secondary_tm"
     TAKE_IMAGE = "take_image"
     UPLOAD_IMAGE = "upload_image"
     SET_IMG_PROCESSOR_MODE = "set_img_proc_mode"
@@ -108,8 +122,12 @@ class OpCodes:
 
 
 class Info:
-    REQUEST_SOLUTION_SET_HK = "Request Solution Set HK once"
-    REQUEST_SOLUTION_SET_ACTION = "Request Solution Set Action"
+    ONE_SHOOT_HK = "One shoot HK Set"
+    ENABLE_HK = "Enable Periodic HK"
+    DISABLE_HK = "Disable Periodic HK"
+    ADD_SECONDARY_TM_TO_NORMAL_MODE = "Add specific Dataset to secondary TM"
+    RESET_SECONDARY_TM_SET = "Reset secondary TM to Temperature Set only"
+    READ_SECONDARY_TM_SET = "Read list of secondary TM Sets"
     UPLOAD_IMAGE = "Upload Image"
     TAKE_IMAGE = "Take Image"
     SET_IMG_PROCESSOR_MODE = "Set Image Processor Mode"
@@ -124,11 +142,24 @@ class SetId(enum.IntEnum):
     TEMPERATURE = 25
     SOLUTION = 24
     HISTOGRAM = 28
+    CONTRAST = 29
     CHECKSUM = 50
     CAMERA = 67
     LIMITS = 68
     CENTROIDING = 72
     LISA = 73
+    AUTO_BLOB = 89
+    MATCHED_CENTROIDS = 90
+    BLOB = 91
+    BLOBS = 92
+    CENTROID = 93
+    CENTROIDS = 94
+
+
+class DataSetRequest(enum.IntEnum):
+    ONESHOT = 0
+    ENABLE = 1
+    DISABLE = 2
 
 
 class FileDefs:
@@ -227,13 +258,15 @@ def pack_star_tracker_commands(  # noqa C901
         q.add_log_cmd("Star tracker: Mode Off")
         data = pack_mode_data(prompt_object_id_mode_cmd(), Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == OpCodes.REQUEST_SOLUTION_SET_HK:
-        q.add_log_cmd(Info.REQUEST_SOLUTION_SET_HK)
-        q.add_pus_tc(create_request_one_diag_command(make_sid(obyt, SetId.SOLUTION)))
-    if op_code == OpCodes.REQUEST_SOLUTION_SET_ACTION:
-        q.add_log_cmd("Star tracker: Request solution")
-        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_SOLUTION)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCodes.ONE_SHOOT_HK:
+        q.add_log_cmd(Info.ONE_SHOOT_HK)
+        request_dataset(q, DataSetRequest.ONESHOT)
+    if op_code == OpCodes.ENABLE_HK:
+        q.add_log_cmd(Info.ENABLE_HK)
+        request_dataset(q, DataSetRequest.ENABLE)
+    if op_code == OpCodes.DISABLE_HK:
+        q.add_log_cmd(Info.DISABLE_HK)
+        request_dataset(q, DataSetRequest.DISABLE)
     if op_code == "4":
         q.add_log_cmd("Star tracker: Mode Raw")
         data = pack_mode_data(obyt, Mode.RAW, 0)
@@ -613,6 +646,79 @@ def pack_star_tracker_commands(  # noqa C901
             + firmware.encode()
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if op_code == OpCodes.ADD_SECONDARY_TM_TO_NORMAL_MODE:
+        q.add_log_cmd(Info.ADD_SECONDARY_TM_TO_NORMAL_MODE)
+        for val in SetId:
+            print("{:<2}: {:<20}".format(val, val.name))
+        set_id = int(input("Specify the dataset \n" ""))
+        q.add_pus_tc(
+            create_action_cmd(
+                STAR_TRACKER_ID,
+                StarTrackerActionId.ADD_SECONDARY_TM_TO_NORMAL_MODE,
+                struct.pack("!I", set_id),
+            )
+        )
+    if op_code == OpCodes.RESET_SECONDARY_TM_SET:
+        q.add_log_cmd(Info.RESET_SECONDARY_TM_SET)
+        q.add_pus_tc(
+            create_action_cmd(
+                STAR_TRACKER_ID,
+                StarTrackerActionId.RESET_SECONDARY_TM_SET,
+            )
+        )
+    if op_code == OpCodes.READ_SECONDARY_TM_SET:
+        q.add_log_cmd(Info.READ_SECONDARY_TM_SET)
+        q.add_pus_tc(
+            create_action_cmd(
+                STAR_TRACKER_ID, StarTrackerActionId.READ_SECONDARY_TM_SET
+            )
+        )
+
+
+def request_dataset(q: DefaultPusQueueHelper, req_type: DataSetRequest):
+    for val in SetId:
+        print("{:<2}: {:<20}".format(val, val.name))
+    set_id = int(input("Specify the dataset \n" ""))
+    if set_id in [SetId.SOLUTION, SetId.TEMPERATURE]:
+        is_diag = True
+    else:
+        is_diag = False
+    match req_type:
+        case DataSetRequest.ONESHOT:
+            if is_diag:
+                q.add_pus_tc(
+                    create_request_one_diag_command(make_sid(STAR_TRACKER_ID, set_id))
+                )
+            else:
+                q.add_pus_tc(
+                    create_request_one_hk_command(make_sid(STAR_TRACKER_ID, set_id))
+                )
+        case DataSetRequest.ENABLE:
+            interval = float(
+                input("Please specify interval in floating point seconds: ")
+            )
+
+            if is_diag:
+                cmd_tuple = enable_periodic_hk_command_with_interval(
+                    True, make_sid(STAR_TRACKER_ID, set_id), interval
+                )
+            else:
+                cmd_tuple = enable_periodic_hk_command_with_interval(
+                    False, make_sid(STAR_TRACKER_ID, set_id), interval
+                )
+            q.add_pus_tc(cmd_tuple[0])
+            q.add_pus_tc(cmd_tuple[1])
+        case DataSetRequest.DISABLE:
+            if is_diag:
+                q.add_pus_tc(
+                    disable_periodic_hk_command(True, make_sid(STAR_TRACKER_ID, set_id))
+                )
+            else:
+                q.add_pus_tc(
+                    disable_periodic_hk_command(
+                        False, make_sid(STAR_TRACKER_ID, set_id)
+                    )
+                )
 
 
 def pack_read_command(object_id: bytes) -> bytearray:
@@ -680,8 +786,24 @@ def handle_str_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
     pw.dlog(f"Received STR HK set with set ID {set_id}")
     if set_id == SetId.SOLUTION:
         handle_solution_set(hk_data, pw)
+    elif set_id == SetId.HISTOGRAM:
+        handle_histogram_set(hk_data, pw)
     elif set_id == SetId.TEMPERATURE:
         handle_temperature_set(hk_data, pw)
+    elif set_id == SetId.AUTO_BLOB:
+        handle_auto_blob_set(hk_data, pw)
+    elif set_id == SetId.MATCHED_CENTROIDS:
+        handle_matched_centroids_set(hk_data, pw)
+    elif set_id == SetId.BLOB:
+        handle_blob_set(hk_data, pw)
+    elif set_id == SetId.BLOBS:
+        handle_blobs_set(hk_data, pw)
+    elif set_id == SetId.CENTROID:
+        handle_centroid_set(hk_data, pw)
+    elif set_id == SetId.CENTROIDS:
+        handle_centroids_set(hk_data, pw)
+    elif set_id == SetId.CONTRAST:
+        handle_contrast_set(hk_data, pw)
     else:
         _LOGGER.warning(f"HK parsing for Star Tracker set ID {set_id} unimplemented")
 
@@ -692,11 +814,14 @@ def unpack_time_hk(hk_data: bytes, current_idx: int, pw: PrintWrapper) -> int:
     (ticks, unix_time) = struct.unpack(
         ticks_time_fmt, hk_data[current_idx : current_idx + fmt_len]
     )
-    unix_as_dt = datetime.datetime.fromtimestamp(
-        int(round(unix_time / 1e6)), tz=datetime.timezone.utc
-    )
-    pw.dlog(f"Ticks: {ticks} | UNIX time: {unix_time}")
-    pw.dlog(f"UNIX as datetime: {unix_as_dt}")
+    try:
+        unix_as_dt = datetime.datetime.fromtimestamp(
+            int(round(unix_time / 1e6)), tz=datetime.timezone.utc
+        )
+        pw.dlog(f"Ticks: {ticks} | UNIX time: {unix_time}")
+        pw.dlog(f"UNIX as datetime: {unix_as_dt}")
+    except ValueError as e:
+        _LOGGER.exception(e)
     current_idx += fmt_len
     return current_idx
 
@@ -792,6 +917,234 @@ def handle_solution_set(hk_data: bytes, pw: PrintWrapper):
     FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 23)
 
 
+def handle_blob_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Blob Set")
+    if len(hk_data) < 14:
+        _LOGGER.warning(f"Blob dataset HK data with length {len(hk_data)} too short")
+        return
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    blob_count = struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+    pw.dlog(f"Blob count: {blob_count}")
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx + 4 :], num_vars=3)
+
+
+def handle_blobs_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Blobs Set")
+    if len(hk_data) < 6 + 2 * 2 * 8:
+        _LOGGER.warning(f"Blobs dataset HK data with length {len(hk_data)} too short")
+        return
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    fmt_str = "!HHH"
+    inc_len = struct.calcsize(fmt_str)
+    count, count_used, nr_4lines_skipped = struct.unpack(
+        fmt_str, hk_data[current_idx : current_idx + inc_len]
+    )
+    current_idx += inc_len
+    pw.dlog(
+        f"Count {count} | Count Used {count_used} | Number of skipped 4lines {nr_4lines_skipped}"
+    )
+    fmt_coords = "!HHHHHHHH"
+    inc_len = struct.calcsize(fmt_coords)
+    x_coords = struct.unpack(fmt_coords, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    y_coords = struct.unpack(fmt_coords, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    pw.dlog("{:<8} {:<8}".format("X", "Y"))
+    for idx in range(8):
+        pw.dlog("{:<8} {:<8}".format(x_coords[idx], y_coords[idx]))
+    assert current_idx == len(hk_data) - 1
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=7)
+
+
+def handle_centroid_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Centroid Set")
+    if len(hk_data) < 14:
+        raise ValueError(
+            f"Centroid dataset HK data with length {len(hk_data)} too short"
+        )
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    centroid_count = struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+    current_idx += 4
+    pw.dlog(f"Centroid count: {centroid_count}")
+    assert current_idx == len(hk_data) - 1
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
+
+
+def handle_centroids_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Centroids Set")
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    centroids_count = struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+    current_idx += 2
+    pw.dlog(f"Centroids count: {centroids_count}")
+    fmt_coords = "!ffffffffffffffff"
+    inc_len = struct.calcsize(fmt_coords)
+    x_coords = struct.unpack(fmt_coords, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    y_coords = struct.unpack(fmt_coords, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    fmt_coords = "!BBBBBBBBBBBBBBBB"
+    inc_len = struct.calcsize(fmt_coords)
+    magnitude = struct.unpack(fmt_coords, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    pw.dlog("{:<8} {:<8} {:<8} {:<8}".format("Index", "X", "Y", "Magnitude"))
+    for idx in range(16):
+        pw.dlog(
+            "{:<8} {:<8.3f} {:<8.3f} {:<8}".format(
+                idx, x_coords[idx], y_coords[idx], magnitude[idx]
+            )
+        )
+    assert current_idx == len(hk_data) - 1
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=6)
+
+
+def handle_matched_centroids_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Matched Centroids Set")
+    if len(hk_data) < 4 + 8 + 1 + 4 * 16 * 5:
+        raise ValueError(
+            f"Matched Centroids dataset HK data with length {len(hk_data)} too short. Expected 333 bytes."
+        )
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    num_matched_centroids = hk_data[current_idx]
+    current_idx += 1
+    pw.dlog(f"Number of matched centroids {num_matched_centroids}")
+    fmt_ids = "!IIIIIIIIIIIIIIII"
+    inc_len = struct.calcsize(fmt_ids)
+    star_id = struct.unpack(fmt_ids, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    fmt_floats = "!ffffffffffffffff"
+    inc_len = struct.calcsize(fmt_floats)
+    x_coords = struct.unpack(fmt_floats, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    y_coords = struct.unpack(fmt_floats, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    x_errors = struct.unpack(fmt_floats, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    y_errors = struct.unpack(fmt_floats, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    pw.dlog(
+        "{:<8} {:<10} {:<10} {:<10} {:<10} {:<10}".format(
+            "Index", "Star ID", "X", "Y", "X Error", "Y Error"
+        )
+    )
+    for idx in range(16):
+        pw.dlog(
+            "{:<8} {:<10} {:<10.3f} {:<10.3f} {:<10.3f} {:<10.3f}".format(
+                idx,
+                star_id[idx],
+                x_coords[idx],
+                y_coords[idx],
+                x_errors[idx],
+                y_errors[idx],
+            )
+        )
+    assert current_idx == len(hk_data) - 1
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=8)
+
+
+def handle_auto_blob_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Auto Blob Set")
+    if len(hk_data) < 4 + 8 + 4:
+        raise ValueError(
+            f"Matched Centroids dataset HK data with length {len(hk_data)} too short. Expected 16 bytes."
+        )
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    fmt_threshold = "!f"
+    inc_len = struct.calcsize(fmt_threshold)
+    threshold = struct.unpack(
+        fmt_threshold, hk_data[current_idx : current_idx + inc_len]
+    )[0]
+    current_idx += inc_len
+    assert current_idx == len(hk_data) - 1
+    pw.dlog(f"Threshold {threshold}")
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
+
+
+def handle_histo_or_contrast_set(name: str, hk_data: bytes, pw: PrintWrapper):
+    pw.dlog(f"Received {name} Set")
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    fmt_str = "!IIIIIIIII"
+    bins_list = []
+    inc_len = struct.calcsize(fmt_str)
+    a_bins = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    bins_list.append(a_bins)
+    current_idx += inc_len
+    b_bins = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    bins_list.append(b_bins)
+    current_idx += inc_len
+    c_bins = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    bins_list.append(c_bins)
+    current_idx += inc_len
+    d_bins = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    bins_list.append(d_bins)
+    pw.dlog(
+        f"{name} Sections: A Upper Left | B Upper Right | C Lower Left | D Lower Right"
+    )
+    pw.dlog("{:<12} {:<10} {:<10} {:<10} {:<10}".format("Range", "A", "B", "C", "D"))
+    for idx in range(9):
+        if idx == 0:
+            val_range = "0 (0-0)"
+        elif idx == 1:
+            val_range = "1 (1-1)"
+        else:
+            val_range = f"{idx} ({pow(2, idx - 1)}-{pow(2, idx) - 1})"
+        pw.dlog(
+            "{:<12} {:<10} {:<10} {:<10} {:<10}".format(
+                val_range,
+                bins_list[0][idx],
+                bins_list[1][idx],
+                bins_list[2][idx],
+                bins_list[3][idx],
+            )
+        )
+
+
+def handle_histogram_set(hk_data: bytes, pw: PrintWrapper):
+    handle_histo_or_contrast_set("Histogram", hk_data, pw)
+
+
+def handle_contrast_set(hk_data: bytes, pw: PrintWrapper):
+    handle_histo_or_contrast_set("Contrast", hk_data, pw)
+
+
+def handle_star_tracker_action_replies(
+    action_id: int, pw: PrintWrapper, custom_data: bytes
+):
+    if action_id == StarTrackerActionId.CHECKSUM:
+        handle_checksum(pw, custom_data)
+    elif action_id == StarTrackerActionId.READ_SECONDARY_TM_SET:
+        handle_read_secondary_tm_set(pw, custom_data)
+
+
+def handle_checksum(pw: PrintWrapper, custom_data: bytes):
+    if len(custom_data) != 5:
+        _LOGGER.warning(
+            "Star tracker reply has invalid length {0}".format(len(custom_data))
+        )
+        return
+    header_list = ["Checksum", "Checksum valid"]
+    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}")
+
+
+def handle_read_secondary_tm_set(pw: PrintWrapper, custom_data: bytes):
+    pw.dlog("Received secondary TM Sets")
+    if len(custom_data) % 4 != 0:
+        raise ValueError(f"Received data of unexpected length {len(custom_data)}")
+    data_length = int(len(custom_data) / 4)
+    fmt_str = "!" + "I" * data_length
+    inc_len = struct.calcsize(fmt_str)
+    set_ids = struct.unpack(fmt_str, custom_data[:inc_len])
+    pw.dlog("The following Datasets are currently Part of the secondary TM list")
+    for set_id in set_ids:
+        if set_id in SetId._value2member_map_:
+            pw.dlog(SetId(set_id).name)
+        else:
+            pw.dlog(f"Unknown Set ID {set_id}")
+
+
 @tmtc_definitions_provider
 def add_str_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
@@ -799,62 +1152,65 @@ def add_str_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCodes.ON_FIRMWARE, "Mode On, Submode Firmware")
     oce.add(OpCodes.NORMAL, "Mode Normal")
     oce.add(OpCodes.OFF, "Mode Off")
-    # oce.add("4", "Star Tracker: Mode Raw")
     oce.add(OpCodes.PING, "Star Tracker: Ping")
     oce.add(OpCodes.TAKE_IMAGE, "Take Image")
-    oce.add(OpCodes.REQUEST_SOLUTION_SET_HK, Info.REQUEST_SOLUTION_SET_HK)
-    oce.add(OpCodes.REQUEST_SOLUTION_SET_ACTION, Info.REQUEST_SOLUTION_SET_ACTION)
+    oce.add(OpCodes.ONE_SHOOT_HK, Info.ONE_SHOOT_HK)
+    oce.add(OpCodes.ENABLE_HK, Info.ENABLE_HK)
+    oce.add(OpCodes.DISABLE_HK, Info.DISABLE_HK)
     oce.add(OpCodes.UPLOAD_IMAGE, Info.UPLOAD_IMAGE)
     oce.add(OpCodes.SET_IMG_PROCESSOR_MODE, Info.SET_IMG_PROCESSOR_MODE)
-    oce.add("6", "Star Tracker: Switch to bootloader program")
-    oce.add("7", "Star Tracker: Request temperature")
-    oce.add("8", "Star Tracker: Request version")
-    oce.add("9", "Star Tracker: Request interface")
-    oce.add("10", "Star Tracker: Request power")
-    oce.add("11", "Star Tracker: Set subscription parameters")
-    oce.add("12", "Star Tracker: Boot image (requires bootloader mode)")
-    oce.add("13", "Star Tracker: Request time")
-    oce.add("14", "Star Tracker: Request solution")
-    oce.add("16", "Star Tracker: Download image")
-    oce.add("17", "Star Tracker: Set limit parameters")
-    oce.add("17", "Star Tracker: Set limit parameters")
-    oce.add("18", "Star Tracker: Set tracking parameters")
-    oce.add("19", "Star Tracker: Set mounting parameters")
-    oce.add("20", "Star Tracker: Set camera parameters")
-    oce.add("22", "Star Tracker: Set centroiding parameters")
-    oce.add("23", "Star Tracker: Set LISA parameters")
-    oce.add("24", "Star Tracker: Set matching parameters")
-    oce.add("25", "Star Tracker: Set validation parameters")
-    oce.add("26", "Star Tracker: Set algo parameters")
-    oce.add("28", "Star Tracker: Stop str helper")
-    oce.add("30", "Star Tracker: Set name of download image")
-    oce.add("31", "Star Tracker: Request histogram")
-    oce.add("32", "Star Tracker: Request contrast")
-    oce.add("33", "Star Tracker: Set json filename")
-    oce.add("35", "Star Tracker: Flash read")
-    oce.add("36", "Star Tracker: Set flash read filename")
-    oce.add("37", "Star Tracker: Get checksum")
-    oce.add("49", "Star Tracker: Request camera parameter")
-    oce.add("50", "Star Tracker: Request limits")
-    oce.add("52", "Star Tracker: (EGSE only) Load camera ground config")
-    oce.add("53", "Star Tracker: (EGSE only) Load camera flight config")
-    oce.add("54", "Star Tracker: Request log level parameters")
-    oce.add("55", "Star Tracker: Request mounting parameters")
-    oce.add("56", "Star Tracker: Request image processor parameters")
-    oce.add("57", "Star Tracker: Request centroiding parameters")
-    oce.add("58", "Star Tracker: Request lisa parameters")
-    oce.add("59", "Star Tracker: Request matching parameters")
-    oce.add("60", "Star Tracker: Request tracking parameters")
-    oce.add("61", "Star Tracker: Request validation parameters")
-    oce.add("62", "Star Tracker: Request algo parameters")
-    oce.add("63", "Star Tracker: Request subscription parameters")
-    oce.add("64", "Star Tracker: Request log subscription parameters")
-    oce.add("65", "Star Tracker: Request debug camera parameters")
-    oce.add("66", "Star Tracker: Set log level parameters")
-    oce.add("67", "Star Tracker: Set log subscription parameters")
-    oce.add("68", "Star Tracker: Set debug camera parameters")
+    oce.add(
+        OpCodes.ADD_SECONDARY_TM_TO_NORMAL_MODE, Info.ADD_SECONDARY_TM_TO_NORMAL_MODE
+    )
+    oce.add(OpCodes.READ_SECONDARY_TM_SET, Info.READ_SECONDARY_TM_SET)
+    oce.add(OpCodes.RESET_SECONDARY_TM_SET, Info.RESET_SECONDARY_TM_SET)
+    # oce.add("6", "Star Tracker: Switch to bootloader program")
+    # oce.add("7", "Star Tracker: Request temperature")
+    # oce.add("8", "Star Tracker: Request version")
+    # oce.add("9", "Star Tracker: Request interface")
+    # oce.add("10", "Star Tracker: Request power")
+    # oce.add("11", "Star Tracker: Set subscription parameters")
+    # oce.add("12", "Star Tracker: Boot image (requires bootloader mode)")
+    # oce.add("13", "Star Tracker: Request time")
+    # oce.add("14", "Star Tracker: Request solution")
+    # oce.add("16", "Star Tracker: Download image")
+    # oce.add("17", "Star Tracker: Set limit parameters")
+    # oce.add("17", "Star Tracker: Set limit parameters")
+    # oce.add("18", "Star Tracker: Set tracking parameters")
+    # oce.add("19", "Star Tracker: Set mounting parameters")
+    # oce.add("20", "Star Tracker: Set camera parameters")
+    # oce.add("22", "Star Tracker: Set centroiding parameters")
+    # oce.add("23", "Star Tracker: Set LISA parameters")
+    # oce.add("24", "Star Tracker: Set matching parameters")
+    # oce.add("25", "Star Tracker: Set validation parameters")
+    # oce.add("26", "Star Tracker: Set algo parameters")
+    # oce.add("28", "Star Tracker: Stop str helper")
+    # oce.add("30", "Star Tracker: Set name of download image")
+    # oce.add("31", "Star Tracker: Request histogram")
+    # oce.add("32", "Star Tracker: Request contrast")
+    # oce.add("33", "Star Tracker: Set json filename")
+    # oce.add("35", "Star Tracker: Flash read")
+    # oce.add("36", "Star Tracker: Set flash read filename")
+    # oce.add("37", "Star Tracker: Get checksum")
+    # oce.add("49", "Star Tracker: Request camera parameter")
+    # oce.add("50", "Star Tracker: Request limits")
+    # oce.add("52", "Star Tracker: (EGSE only) Load camera ground config")
+    # oce.add("53", "Star Tracker: (EGSE only) Load camera flight config")
+    # oce.add("54", "Star Tracker: Request log level parameters")
+    # oce.add("55", "Star Tracker: Request mounting parameters")
+    # oce.add("56", "Star Tracker: Request image processor parameters")
+    # oce.add("57", "Star Tracker: Request centroiding parameters")
+    # oce.add("58", "Star Tracker: Request lisa parameters")
+    # oce.add("59", "Star Tracker: Request matching parameters")
+    # oce.add("60", "Star Tracker: Request tracking parameters")
+    # oce.add("61", "Star Tracker: Request validation parameters")
+    # oce.add("62", "Star Tracker: Request algo parameters")
+    # oce.add("63", "Star Tracker: Request subscription parameters")
+    # oce.add("64", "Star Tracker: Request log subscription parameters")
+    # oce.add("65", "Star Tracker: Request debug camera parameters")
+    # oce.add("66", "Star Tracker: Set log level parameters")
+    # oce.add("67", "Star Tracker: Set log subscription parameters")
+    # oce.add("68", "Star Tracker: Set debug camera parameters")
     oce.add(OpCodes.FW_UPDATE, Info.FW_UPDATE)
-    oce.add("70", "Star Tracker: Disable timestamp generation")
-    oce.add("71", "Star Tracker: Enable timestamp generation")
     oce.add(OpCodes.SET_TIME_FROM_SYS_TIME, Info.SET_TIME_FROM_SYS_TIME)
     defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)

eive_tmtc/tmtc/payload/plpcdu.py

@@ -20,7 +20,8 @@ from tmtccmd.tc.pus_11_tc_sched import (
     create_enable_tc_sched_cmd,
     create_time_tagged_cmd,
 )
-from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
+from tmtccmd.pus.s200_fsfw_mode import Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.tc.pus_20_fsfw_param import (
     create_scalar_double_parameter,
     create_load_param_cmd,
@@ -35,18 +36,22 @@ _LOGGER = logging.getLogger(__name__)
 
 class OpCode:
     SWITCH_HPA_ON_PROC = ["0", "proc_hpa"]
-    SWITCH_ON = ["2", "on"]
-    SWITCH_OFF = ["3", "off"]
-    NORMAL_SSR = ["4", "nml_ssr"]
-    NORMAL_DRO = ["5", "nml_dro"]
-    NORMAL_X8 = ["6", "nml_x8"]
-    NORMAL_TX = ["7", "nml_tx"]
-    NORMAL_MPA = ["8", "nml_mpa"]
-    NORMAL_HPA = ["9", "nml_hpa"]
+    SWITCH_ON = "on"
+    SWITCH_OFF = "off"
+    NORMAL_SSR = "nml_ssr"
+    NORMAL_DRO = "nml_dro"
+    NORMAL_X8 = "nml_x8"
+    NORMAL_TX = "nml_tx"
+    NORMAL_MPA = "nml_mpa"
+    NORMAL_HPA = "nml_hpa"
 
-    ENABLE_HK = ["enable_hk"]
-    DISABLE_HK = ["disable_hk"]
-    REQ_OS_HK = ["hk_os"]
+    ENABLE_HK = "enable_hk"
+    DISABLE_HK = "disable_hk"
+    REQ_OS_HK = "hk_os"
+
+    UPDATE_I_UPPER_LIMIT = "update_i_upper_limit"
+    UPDATE_V_LOWER_LIMIT = "update_v_lower_limit"
+    UPDATE_V_UPPER_LIMIT = "update_v_upper_limit"
 
     INJECT_SSR_TO_DRO_FAILURE = ["10", "inject_ssr_dro_fault"]
     INJECT_DRO_TO_X8_FAILURE = ["11", "inject_dro_x8_fault"]
@@ -70,6 +75,9 @@ class Info:
     SWITCH_HPA_ON_PROC = "Switch HPA on procedure"
     ENABLE_HK = "Enable HK"
     DISABLE_HK = "Disable HK"
+    UPDATE_I_UPPER_LIMIT = "Update upper current parameter"
+    UPDATE_V_LOWER_LIMIT = "Update lower voltage parameter"
+    UPDATE_V_UPPER_LIMIT = "Update upper voltage parameter"
 
 
 class SetId(enum.IntEnum):
@@ -119,7 +127,7 @@ class SubmodeForNormalMode(enum.IntEnum):
     )
 
 
-class ParamIds(enum.IntEnum):
+class ParamId(enum.IntEnum):
     NEG_V_LOWER_BOUND = 0
     NEG_V_UPPER_BOUND = 1
 
@@ -157,6 +165,15 @@ class ParamIds(enum.IntEnum):
     INJECT_ALL_ON_FAILURE = 35
 
 
+class DevSelect(enum.IntEnum):
+    SSR_NEG_V = 0
+    DRO = 1
+    X8 = 2
+    TX = 3
+    MPA = 4
+    HPA = 5
+
+
 @tmtc_definitions_provider
 def add_pl_pcdu_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
@@ -171,6 +188,9 @@ def add_pl_pcdu_cmds(defs: TmtcDefinitionWrapper):
     oce.add(keys=OpCode.NORMAL_HPA, info=Info.NORMAL_HPA)
     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.UPDATE_V_LOWER_LIMIT, info=Info.UPDATE_V_LOWER_LIMIT)
+    oce.add(keys=OpCode.UPDATE_V_UPPER_LIMIT, info=Info.UPDATE_V_UPPER_LIMIT)
+    oce.add(keys=OpCode.UPDATE_I_UPPER_LIMIT, info=Info.UPDATE_I_UPPER_LIMIT)
     oce.add(
         keys=OpCode.INJECT_SSR_TO_DRO_FAILURE,
         info="Inject failure SSR to DRO transition",
@@ -198,9 +218,9 @@ def add_pl_pcdu_cmds(defs: TmtcDefinitionWrapper):
 def pack_pl_pcdu_commands(  # noqa C901: Complexity is okay here.
     q: DefaultPusQueueHelper, op_code: str
 ):  # noqa C901: Complexity is okay here.
-    if op_code in OpCode.SWITCH_ON:
+    if op_code == 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:
+    if op_code == OpCode.SWITCH_OFF:
         pack_pl_pcdu_mode_cmd(q=q, info=Info.SWITCH_OFF, mode=Mode.OFF, submode=0)
     if op_code in OpCode.ENABLE_HK:
         interval = float(
@@ -212,13 +232,13 @@ def pack_pl_pcdu_commands(  # noqa C901: Complexity is okay here.
         q.add_log_cmd(f"Enable PL PCDU HK with interval of {interval} seconds")
         for cmd in cmds:
             q.add_pus_tc(cmd)
-    if op_code in OpCode.DISABLE_HK:
+    if op_code == OpCode.DISABLE_HK:
         cmd = disable_periodic_hk_command(
             diag=True, sid=make_sid(PL_PCDU_ID, SetId.ADC)
         )
         q.add_log_cmd("Disabling PL PCDU HK")
         q.add_pus_tc(cmd)
-    if op_code in OpCode.NORMAL_SSR:
+    if op_code == OpCode.NORMAL_SSR:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_SSR,
@@ -227,54 +247,90 @@ def pack_pl_pcdu_commands(  # noqa C901: Complexity is okay here.
                 NormalSubmodesMask.SOLID_STATE_RELAYS_ADC_ON
             ),
         )
-    if op_code in OpCode.NORMAL_DRO:
+    if op_code == OpCode.NORMAL_DRO:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_DRO,
             mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.DRO_ON),
         )
-    if op_code in OpCode.NORMAL_X8:
+    if op_code == OpCode.NORMAL_X8:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_X8,
             mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.X8_ON),
         )
-    if op_code in OpCode.NORMAL_TX:
+    if op_code == OpCode.NORMAL_TX:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_TX,
             mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.TX_ON),
         )
-    if op_code in OpCode.NORMAL_MPA:
+    if op_code == OpCode.NORMAL_MPA:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_MPA,
             mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.MPA_ON),
         )
-    if op_code in OpCode.NORMAL_HPA:
+    if op_code == OpCode.NORMAL_HPA:
         pack_pl_pcdu_mode_cmd(
             q=q,
             info=Info.NORMAL_HPA,
             mode=Mode.NORMAL,
             submode=submode_mask_to_submode(NormalSubmodesMask.HPA_ON),
         )
-    if op_code in OpCode.REQ_OS_HK:
+    if op_code == OpCode.REQ_OS_HK:
         q.add_log_cmd(f"PL PCDU: {Info.REQ_OS_HK}")
         q.add_pus_tc(
             generate_one_diag_command(
                 sid=make_sid(object_id=PL_PCDU_ID, set_id=SetId.ADC)
             )
         )
-    if op_code in OpCode.SWITCH_HPA_ON_PROC:
+    if op_code == OpCode.UPDATE_I_UPPER_LIMIT:
+        q.add_log_cmd(Info.UPDATE_I_UPPER_LIMIT)
+        print("Select device to update lower current limit for: ")
+        param_id = dev_select_to_upper_i_update_param_id(dev_select_prompt(True))
+        new_param_value = float(
+            input("Please specify new parameter value as a double: ")
+        )
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_double_parameter(PL_PCDU_ID, 0, param_id, new_param_value)
+            )
+        )
+    if op_code == OpCode.UPDATE_V_LOWER_LIMIT:
+        q.add_log_cmd(Info.UPDATE_V_LOWER_LIMIT)
+        print("Select device to update lower voltage limit for: ")
+        param_id = dev_select_to_lower_u_update_param_id(dev_select_prompt(False))
+        new_param_value = float(
+            input("Please specify new parameter value as a double: ")
+        )
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_double_parameter(PL_PCDU_ID, 0, param_id, new_param_value)
+            )
+        )
+    if op_code == OpCode.UPDATE_V_UPPER_LIMIT:
+        q.add_log_cmd(Info.UPDATE_V_UPPER_LIMIT)
+        print("Select device to update upper voltage limit for: ")
+        param_id = dev_select_to_upper_u_update_param_id(dev_select_prompt(False))
+        new_param_value = float(
+            input("Please specify new parameter value as a double: ")
+        )
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_double_parameter(PL_PCDU_ID, 0, param_id, new_param_value)
+            )
+        )
+    if op_code == OpCode.SWITCH_HPA_ON_PROC:
         hpa_on_procedure(q)
-    if op_code in OpCode.INJECT_ALL_ON_FAILURE:
+    if op_code == OpCode.INJECT_ALL_ON_FAILURE:
         pack_failure_injection_cmd(
             q=q,
-            param_id=ParamIds.INJECT_ALL_ON_FAILURE,
+            param_id=ParamId.INJECT_ALL_ON_FAILURE,
             print_str="All On",
         )
 
@@ -510,3 +566,72 @@ def handle_plpcdu_hk(pw: PrintWrapper, set_id: int, hk_data: bytes):
         FsfwTmTcPrinter.get_validity_buffer(
             validity_buffer=hk_data[current_idx:], num_vars=3
         )
+
+
+def dev_select_prompt(skip_ssr: bool) -> DevSelect:
+    while True:
+        for dev in DevSelect:
+            if skip_ssr and dev == DevSelect.SSR_NEG_V:
+                continue
+            print(f"{dev}: {dev.name}")
+        dev_select = int(input("Select device by index: "))
+        try:
+            return DevSelect(dev_select)
+        except IndexError:
+            _LOGGER.warn("Invalid paramter index, try again.")
+            continue
+
+
+def dev_select_to_upper_i_update_param_id(dev_select: DevSelect) -> ParamId:
+    param_id = None
+    if dev_select == DevSelect.DRO:
+        param_id = ParamId.DRO_I_UPPER_BOUND
+    elif dev_select == DevSelect.X8:
+        param_id = ParamId.X8_I_UPPER_BOUND
+    elif dev_select == DevSelect.TX:
+        param_id = ParamId.TX_I_UPPER_BOUND
+    elif dev_select == DevSelect.MPA:
+        param_id = ParamId.MPA_I_UPPER_BOUND
+    elif dev_select == DevSelect.HPA:
+        param_id = ParamId.HPA_I_UPPER_BOUND
+    if param_id is None:
+        raise ValueError("invalid parameter ID")
+    return param_id
+
+
+def dev_select_to_lower_u_update_param_id(dev_select: DevSelect) -> ParamId:
+    param_id = None
+    if dev_select == DevSelect.SSR_NEG_V:
+        param_id = ParamId.NEG_V_LOWER_BOUND
+    if dev_select == DevSelect.DRO:
+        param_id = ParamId.DRO_U_LOWER_BOUND
+    elif dev_select == DevSelect.X8:
+        param_id = ParamId.X8_U_LOWER_BOUND
+    elif dev_select == DevSelect.TX:
+        param_id = ParamId.TX_U_LOWER_BOUND
+    elif dev_select == DevSelect.MPA:
+        param_id = ParamId.MPA_U_LOWER_BOUND
+    elif dev_select == DevSelect.HPA:
+        param_id = ParamId.HPA_U_LOWER_BOUND
+    if param_id is None:
+        raise ValueError("invalid parameter ID")
+    return param_id
+
+
+def dev_select_to_upper_u_update_param_id(dev_select: DevSelect) -> ParamId:
+    param_id = None
+    if dev_select == DevSelect.SSR_NEG_V:
+        param_id = ParamId.NEG_V_UPPER_BOUND
+    if dev_select == DevSelect.DRO:
+        param_id = ParamId.DRO_U_UPPER_BOUND
+    elif dev_select == DevSelect.X8:
+        param_id = ParamId.X8_U_UPPER_BOUND
+    elif dev_select == DevSelect.TX:
+        param_id = ParamId.TX_U_UPPER_BOUND
+    elif dev_select == DevSelect.MPA:
+        param_id = ParamId.MPA_U_UPPER_BOUND
+    elif dev_select == DevSelect.HPA:
+        param_id = ParamId.HPA_U_UPPER_BOUND
+    if param_id is None:
+        raise ValueError("invalid parameter ID")
+    return param_id

eive_tmtc/tmtc/payload/scex.py

@@ -26,8 +26,11 @@ class OpCode:
     ALL_CELLS_CMD = "allcells"
     FRAM = "fram"
 
+    ON = "on"
     SWITCH_ON = "on"
-    SWITCH_OFF = "off"
+    OFF = "off"
+    SWITCH_OFF = OFF
+    NORMAL = "normal"
 
 
 class ActionId(enum.IntEnum):
@@ -53,6 +56,7 @@ class Info:
 
     SWITCH_ON = "Switch Scex on"
     SWITCH_OFF = "Switch Scex off"
+    NORMAL = "Switch SCEX to normal mode"
 
 
 @tmtc_definitions_provider
@@ -66,8 +70,9 @@ def add_scex_cmds(defs: TmtcDefinitionWrapper):
 
     oce.add(keys=OpCode.ALL_CELLS_CMD, info=Info.ALL_CELLS_CMD)
     oce.add(keys=OpCode.FRAM, info=Info.FRAM)
-    oce.add(keys=OpCode.SWITCH_ON, info=Info.SWITCH_ON)
-    oce.add(keys=OpCode.SWITCH_OFF, info=Info.SWITCH_OFF)
+    oce.add(keys=OpCode.ON, info=Info.SWITCH_ON)
+    oce.add(keys=OpCode.OFF, info=Info.SWITCH_OFF)
+    oce.add(keys=OpCode.NORMAL, info=Info.NORMAL)
 
     defs.add_service(
         name=CustomServiceList.SCEX.value, info="SCEX Device", op_code_entry=oce
@@ -78,7 +83,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 == OpCode.SWITCH_ON:
+    if op_code == OpCode.ON:
         q.add_log_cmd(Info.SWITCH_ON)
         q.add_pus_tc(
             PusTelecommand(
@@ -87,7 +92,16 @@ def pack_scex_cmds(p: ServiceProviderParams):  # noqa C901
                 app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.ON, 0),
             )
         )
-    if op_code == OpCode.SWITCH_OFF:
+    if op_code == OpCode.NORMAL:
+        q.add_log_cmd(Info.NORMAL)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=Subservice.TC_MODE_COMMAND,
+                app_data=pack_mode_data(SCEX_HANDLER_ID, Mode.NORMAL, 0),
+            )
+        )
+    if op_code == OpCode.OFF:
         q.add_log_cmd(Info.SWITCH_OFF)
         q.add_pus_tc(
             PusTelecommand(

eive_tmtc/tmtc/power/__init__.py

@@ -0,0 +1,2 @@
+from .subsystem import add_eps_subsystem_cmds
+from .pwr_ctrl import pwr_cmd_defs

eive_tmtc/tmtc/power/pwr_ctrl.py

@@ -0,0 +1,302 @@
+import datetime
+import enum
+import logging
+import struct
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import PWR_CONTROLLER
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.queue import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_command
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    generate_one_hk_command,
+    make_sid,
+    enable_periodic_hk_command_with_interval,
+    disable_periodic_hk_command,
+)
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+from tmtccmd.tc.pus_20_fsfw_param import create_load_param_cmd
+
+from tmtccmd.pus.s20_fsfw_param_defs import (
+    create_scalar_float_parameter,
+    create_scalar_double_parameter,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class SetId(enum.IntEnum):
+    CORE_HK_SET = 0
+    ENABLE_PL_SET = 1
+
+
+# class ActionId(enum.IntEnum):
+
+
+class ParamId(enum.IntEnum):
+    BATTERY_INTERNAL_RESISTANCE = 0
+    BATTERY_MAXIMUM_CAPACITY = 1
+    COULOMB_COUNTER_VOLTAGE_UPPER_THRESHOLD = 2
+    MAX_ALLOWED_TIME_DIFF = 3
+    PAYLOAD_OP_LIMIT_ON = 4
+    PAYLOAD_OP_LIMIT_LOW = 5
+    HIGHER_MODES_LIMIT = 6
+
+
+class OpCodes:
+    OFF = ["mode_off"]
+    ON = ["mode_on"]
+    NML = ["mode_normal"]
+    SET_PARAMETER = ["set_parameter"]
+    REQUEST_CORE_HK = ["core_hk"]
+    ENABLE_CORE_HK = ["core_enable_hk"]
+    DISABLE_CORE_HK = ["core_disable_hk"]
+    REQUEST_ENABLE_PL_HK = ["enable_pl_hk"]
+    ENABLE_ENABLE_PL_HK = ["enable_pl_enable_hk"]
+    DISABLE_ENABLE_PL_HK = ["enable_pl_disable_hk"]
+
+
+class Info:
+    OFF = "PWR Ctrl Mode to OFF"
+    ON = "PWR Ctrl Mode to ON"
+    NML = "PWR Ctrl Mode to NORMAL"
+    SET_PARAMETER = "Set Parameter"
+    REQUEST_CORE_HK = "Request Core HK once"
+    ENABLE_CORE_HK = "Enable Core HK Data Generation"
+    DISABLE_CORE_HK = "Disable Core HK Data Generation"
+    REQUEST_ENABLE_PL_HK = "Request Enable PL HK once"
+    ENABLE_ENABLE_PL_HK = "Enable Enable PL HK Data Generation"
+    DISABLE_ENABLE_PL_HK = "Disable Enable PL HK Data Generation"
+
+
+@tmtc_definitions_provider
+def pwr_cmd_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCodes.OFF, info=Info.OFF)
+    oce.add(keys=OpCodes.ON, info=Info.ON)
+    oce.add(keys=OpCodes.NML, info=Info.NML)
+    oce.add(keys=OpCodes.SET_PARAMETER, info=Info.SET_PARAMETER)
+    oce.add(keys=OpCodes.REQUEST_CORE_HK, info=Info.REQUEST_CORE_HK)
+    oce.add(keys=OpCodes.ENABLE_CORE_HK, info=Info.ENABLE_CORE_HK)
+    oce.add(keys=OpCodes.DISABLE_CORE_HK, info=Info.DISABLE_CORE_HK)
+    oce.add(keys=OpCodes.REQUEST_ENABLE_PL_HK, info=Info.REQUEST_ENABLE_PL_HK)
+    oce.add(keys=OpCodes.ENABLE_ENABLE_PL_HK, info=Info.ENABLE_ENABLE_PL_HK)
+    oce.add(keys=OpCodes.DISABLE_ENABLE_PL_HK, info=Info.DISABLE_ENABLE_PL_HK)
+    defs.add_service(
+        name=CustomServiceList.PWR_CTRL.value, info="PWR Controller", op_code_entry=oce
+    )
+
+
+@service_provider(CustomServiceList.PWR_CTRL.value)
+def pack_acs_ctrl_command(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    if op_code in OpCodes.OFF:
+        q.add_log_cmd(f"{Info.OFF}")
+        q.add_pus_tc(pack_mode_command(PWR_CONTROLLER, Mode.OFF, 0))
+    elif op_code in OpCodes.ON:
+        q.add_log_cmd(f"{Info.ON}")
+        q.add_pus_tc(pack_mode_command(PWR_CONTROLLER, Mode.ON, 0))
+    elif op_code in OpCodes.NML:
+        q.add_log_cmd(f"{Info.NML}")
+        q.add_pus_tc(pack_mode_command(PWR_CONTROLLER, Mode.NORMAL, 0))
+    elif op_code in OpCodes.SET_PARAMETER:
+        q.add_log_cmd(f"{Info.SET_PARAMETER}")
+        set_pwr_ctrl_param(q)
+    elif op_code in OpCodes.REQUEST_CORE_HK:
+        q.add_log_cmd(Info.REQUEST_CORE_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(PWR_CONTROLLER, SetId.CORE_HK_SET))
+        )
+    elif op_code in OpCodes.ENABLE_CORE_HK:
+        interval = float(input("Please specify interval in floating point seconds: "))
+        q.add_log_cmd(Info.ENABLE_CORE_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(PWR_CONTROLLER, SetId.CORE_HK_SET), interval
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_CORE_HK:
+        q.add_log_cmd(Info.DISABLE_CORE_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(PWR_CONTROLLER, SetId.CORE_HK_SET)
+            )
+        )
+    elif op_code in OpCodes.REQUEST_ENABLE_PL_HK:
+        q.add_log_cmd(Info.REQUEST_ENABLE_PL_HK)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(PWR_CONTROLLER, SetId.ENABLE_PL_SET))
+        )
+    elif op_code in OpCodes.ENABLE_ENABLE_PL_HK:
+        interval = float(input("Please specify interval in floating point seconds: "))
+        q.add_log_cmd(Info.ENABLE_ENABLE_PL_HK)
+        cmd_tuple = enable_periodic_hk_command_with_interval(
+            False, make_sid(PWR_CONTROLLER, SetId.ENABLE_PL_SET), interval
+        )
+        q.add_pus_tc(cmd_tuple[0])
+        q.add_pus_tc(cmd_tuple[1])
+    elif op_code in OpCodes.DISABLE_ENABLE_PL_HK:
+        q.add_log_cmd(Info.DISABLE_ENABLE_PL_HK)
+        q.add_pus_tc(
+            disable_periodic_hk_command(
+                False, make_sid(PWR_CONTROLLER, SetId.ENABLE_PL_SET)
+            )
+        )
+
+
+def set_pwr_ctrl_param(q: DefaultPusQueueHelper):
+    for val in ParamId:
+        print("{:<2}: {:<20}".format(val, val.name))
+    param = int(input("Specify parameter to set \n" ""))
+    match param:
+        case ParamId.BATTERY_INTERNAL_RESISTANCE:
+            value = float(input("Specify parameter value to set [Ohm]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.BATTERY_INTERNAL_RESISTANCE,
+                        parameter=value,
+                    )
+                )
+            )
+        case ParamId.BATTERY_MAXIMUM_CAPACITY:
+            value = float(input("Specify parameter value to set [Ah]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.BATTERY_MAXIMUM_CAPACITY,
+                        parameter=value,
+                    )
+                )
+            )
+        case ParamId.COULOMB_COUNTER_VOLTAGE_UPPER_THRESHOLD:
+            value = float(input("Specify parameter value to set [V]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.COULOMB_COUNTER_VOLTAGE_UPPER_THRESHOLD,
+                        parameter=value,
+                    )
+                )
+            )
+        case ParamId.MAX_ALLOWED_TIME_DIFF:
+            value = float(input("Specify parameter value to set [s]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_double_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.MAX_ALLOWED_TIME_DIFF,
+                        parameter=value,
+                    )
+                )
+            )
+        case ParamId.PAYLOAD_OP_LIMIT_ON:
+            value = float(input("Specify parameter value to set [1]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.PAYLOAD_OP_LIMIT_ON,
+                        parameter=value,
+                    )
+                )
+            )
+        case ParamId.PAYLOAD_OP_LIMIT_LOW:
+            value = float(input("Specify parameter value to set [1]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.PAYLOAD_OP_LIMIT_LOW,
+                        parameter=value,
+                    )
+                )
+            )
+        case ParamId.HIGHER_MODES_LIMIT:
+            value = float(input("Specify parameter value to set [1]: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=PWR_CONTROLLER,
+                        domain_id=0,
+                        unique_id=ParamId.HIGHER_MODES_LIMIT,
+                        parameter=value,
+                    )
+                )
+            )
+
+
+def handle_pwr_ctrl_hk_data(
+    pw: PrintWrapper,
+    set_id: int,
+    hk_data: bytes,
+    packet_time: datetime.datetime,
+):
+    pw.ilog(_LOGGER, f"Received PWR CTRL HK with packet time {packet_time}")
+    match set_id:
+        case SetId.CORE_HK_SET:
+            handle_core_hk_data(pw, hk_data)
+        case SetId.ENABLE_PL_SET:
+            handle_enable_pl_data(pw, hk_data)
+
+
+def handle_core_hk_data(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received Core HK Set")
+    fmt_int16 = "!h"
+    fmt_float = "!f"
+    inc_len_int16 = struct.calcsize(fmt_int16)
+    inc_len_float = struct.calcsize(fmt_float)
+    if len(hk_data) < inc_len_int16 + 2 * inc_len_float:
+        pw.dlog("Received HK set too small")
+        return
+    current_idx = 0
+    total_battery_current = struct.unpack(
+        fmt_int16, hk_data[current_idx : current_idx + inc_len_int16]
+    )[0]
+    current_idx += inc_len_int16
+    open_circuit_voltage_charge = struct.unpack(
+        fmt_float, hk_data[current_idx : current_idx + inc_len_float]
+    )[0]
+    current_idx += inc_len_float
+    coulomb_counter_charge = struct.unpack(
+        fmt_float, hk_data[current_idx : current_idx + inc_len_float]
+    )[0]
+    current_idx += inc_len_float
+    pw.dlog(f"Total Battery Current: {total_battery_current} [mA]")
+    pw.dlog(f"Open Circuit Voltage Charge: {open_circuit_voltage_charge*100:8.3f} [%]")
+    pw.dlog(f"Coulomb Counter Charge: {coulomb_counter_charge*100:8.3f} [%]")
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=3)
+
+
+def handle_enable_pl_data(pw: PrintWrapper, hk_data: bytes):
+    pw.dlog("Received Enable PL HK Set")
+    fmt_uint16 = "!B"
+    inc_len_uint16 = struct.calcsize(fmt_uint16)
+    if len(hk_data) < inc_len_uint16:
+        pw.dlog("Received HK set too small")
+        return
+    current_idx = 0
+    pl_use_allowed = struct.unpack(
+        fmt_uint16, hk_data[current_idx : current_idx + inc_len_uint16]
+    )[0]
+    current_idx += inc_len_uint16
+    pw.dlog(f"PL Use Allowed: {pl_use_allowed}")
+    FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=1)

eive_tmtc/tmtc/power/subsystem.py

@@ -0,0 +1,68 @@
+import enum
+from typing import Tuple, Dict
+
+from spacepackets.ecss import PusTelecommand
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from eive_tmtc.config.object_ids import EPS_SUBSYSTEM_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices, Mode
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCode(str, enum.Enum):
+    OFF = "off"
+    NML = "normal"
+    REPORT_ALL_MODES = "all_modes"
+
+
+class Info(str, enum.Enum):
+    OFF = "Off Mode Command"
+    NML = "Normal Mode Command"
+    REPORT_ALL_MODES = "Report All Modes Recursively"
+
+
+HANDLER_LIST: Dict[str, Tuple[int, int, str]] = {
+    OpCode.OFF: (Mode.OFF, 0, Info.OFF),
+    OpCode.NML: (Mode.NORMAL, 0, Info.NML),
+}
+
+
+@service_provider(CustomServiceList.EPS_SS.value)
+def build_eps_subsystem_cmd(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    info_prefix = "EPS Subsystem"
+    if op_code in OpCode.REPORT_ALL_MODES:
+        q.add_log_cmd(f"{info_prefix}: {Info.REPORT_ALL_MODES}")
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=ModeSubservices.TC_MODE_ANNOUNCE_RECURSIVE,
+                app_data=EPS_SUBSYSTEM_ID,
+            )
+        )
+    mode_info_tup = HANDLER_LIST.get(op_code)
+    if mode_info_tup is None:
+        return
+    pack_mode_cmd_with_info(
+        object_id=EPS_SUBSYSTEM_ID,
+        info=f"{info_prefix}: {mode_info_tup[2]}",
+        mode=mode_info_tup[0],
+        submode=mode_info_tup[1],
+        q=q,
+    )
+
+
+@tmtc_definitions_provider
+def add_eps_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    for op_code, (_, _, info) in HANDLER_LIST.items():
+        oce.add(op_code, info)
+    oce.add(OpCode.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
+    defs.add_service(CustomServiceList.EPS_SS, "EPS Subsystem", oce)

eive_tmtc/tmtc/wdt.py

@@ -0,0 +1,43 @@
+import enum
+from tmtccmd.config.tmtc import (
+    OpCodeEntry,
+    TmtcDefinitionWrapper,
+    tmtc_definitions_provider,
+)
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
+from tmtccmd.tc import DefaultPusQueueHelper
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import XIPHOS_WDT_ID
+
+
+class OpCode:
+    ENABLE = "enable"
+    DISABLE = "disable"
+
+
+class Info:
+    ENABLE = "Enable WDT"
+    DISABLE = "Disable WDT"
+
+
+class ActionId(enum.IntEnum):
+    ENABLE = 0
+    DISABLE = 1
+
+
+def pack_wdt_commands(q: DefaultPusQueueHelper, op_code: str):
+    if op_code == OpCode.ENABLE:
+        q.add_pus_tc(create_action_cmd(XIPHOS_WDT_ID, ActionId.ENABLE))
+    if op_code == OpCode.DISABLE:
+        q.add_pus_tc(create_action_cmd(XIPHOS_WDT_ID, ActionId.DISABLE))
+
+
+@tmtc_definitions_provider
+def add_xiphos_wdt_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.ENABLE, info=Info.ENABLE)
+    oce.add(keys=OpCode.DISABLE, info=Info.DISABLE)
+    defs.add_service(
+        CustomServiceList.XIPHOS_WDT, info="Xiphos Watchdog Timer", op_code_entry=oce
+    )

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "eive-tmtc"
 description = "TMTC Commander EIVE"
 readme = "README.md"
-version = "5.6.0"
+version = "5.10.0"
 requires-python = ">=3.10"
 license = {text = "Apache-2.0"}
 authors = [

tmtcc.py

@@ -16,6 +16,7 @@ from spacepackets.cfdp import (
 )
 
 from eive_tmtc.pus_tc.tc_handler import TcHandler
+from eive_tmtc.pus_tm.hk_handler import HkFilter
 from tmtccmd.logging import add_colorlog_console_logger
 from tmtccmd.cfdp.handler import CfdpInCcsdsHandler
 from tmtccmd.cfdp.mib import (
@@ -24,7 +25,7 @@ from tmtccmd.cfdp.mib import (
     RemoteEntityCfg,
 )
 from tmtccmd import BackendBase
-from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider
+from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider 
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
 from tmtccmd.logging.pus import (
@@ -77,12 +78,19 @@ class PusHandler(SpecificApidHandlerBase):
         self.verif_wrapper = wrapper
         self.raw_logger = raw_logger
         self.hk_level = hk_level
+        self.these_objs_hk_only = []
+        self.hk_filter = HkFilter(object_ids=self.these_objs_hk_only, set_ids=[])
 
     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
+            packet,
+            self.verif_wrapper,
+            self.printer,
+            self.raw_logger,
+            self.hk_level,
+            self.hk_filter,
         )
 
 
@@ -249,7 +257,7 @@ def main():  # noqa C901: Complexity okay here.
     try:
         while True:
             state = tmtc_backend.periodic_op(None)
-            tc_handler.cfdp_in_ccsds_handler.fsm()
+            tc_handler.cfdp_in_ccsds_handler.state_machine()
             if state.request == BackendRequest.TERMINATION_NO_ERROR:
                 sys.exit(0)
             elif state.request == BackendRequest.DELAY_IDLE: