Merge pull request 'prep v5.2.0' (#216) from prep_v5.2.0 into main

Reviewed-on: #216

CHANGELOG.md

@@ -10,6 +10,18 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v5.2.0] 2023-07-13
+
+- `tmtccmd` v5.0.0
+
+## Added
+
+- New TCS controller events
+
+## Changed
+
+- HK level can be specified as CLI argument now.
+
 # [v5.1.0] 2023-06-28
 
 ## Added

eive_tmtc/__init__.py

@@ -1,11 +1,11 @@
-__version__ = "5.1.0"
+__version__ = "5.2.0"
 
 import logging
 from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 5
-VERSION_MINOR = 1
+VERSION_MINOR = 2
 VERSION_REVISION = 0
 
 EIVE_TMTC_ROOT = Path(__file__).parent

eive_tmtc/config/definitions.py

@@ -65,7 +65,8 @@ class CustomServiceList(str, enum.Enum):
     PL_SS = "pl_subsystem"
     ACS_BRD_ASS = "acs_brd_ass"
     SUS_BRD_ASS = "sus_brd_ass"
-    TCS = "tcs"
+    TCS_SS = "tcs_subsystem"
+    TCS_CTRL = "tcs_ctrl"
     TCS_ASS = "tcs_ass"
     TIME = "time"
     PROCEDURE = "proc"

eive_tmtc/config/events.csv

@@ -280,6 +280,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14106;0x371a;PCDU_SYSTEM_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14107;0x371b;HEATER_NOT_OFF_FOR_OFF_MODE;MEDIUM;No description;mission/controller/tcsDefs.h
 14108;0x371c;MGT_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
+14109;0x371d;TCS_SWITCHING_HEATER_ON;INFO;P1: Module index. P2: Heater index;mission/controller/tcsDefs.h
+14110;0x371e;TCS_SWITCHING_HEATER_OFF;INFO;P1: Module index. P2: Heater index;mission/controller/tcsDefs.h
+14111;0x371f;TCS_HEATER_MAX_BURN_TIME_REACHED;MEDIUM;P1: Heater index. P2: Maximum burn time for heater.;mission/controller/tcsDefs.h
 14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h
 14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h

eive_tmtc/pus_tc/procedure_packer.py

@@ -6,6 +6,7 @@ from typing import cast
 from eive_tmtc.tmtc.acs.gyros import handle_gyr_cmd
 from eive_tmtc.tmtc.acs.mgms import handle_mgm_cmd
 from eive_tmtc.tmtc.power.power import pack_power_commands
+from eive_tmtc.tmtc.tcs.ctrl import pack_tcs_ctrl_commands
 from eive_tmtc.tmtc.tcs.rtd import pack_rtd_commands
 from eive_tmtc.tmtc.payload.scex import pack_scex_cmds
 from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
@@ -99,8 +100,10 @@ def handle_default_procedure(  # noqa C901: Complexity okay here.
     if service == CustomServiceList.ACU.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(ACU_HANDLER_ID))
         return pack_acu_commands(object_id=object_id, q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.TCS.value:
+    if service == CustomServiceList.TCS_SS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
+    if service == CustomServiceList.TCS_CTRL.value:
+        return pack_tcs_ctrl_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TMP1075.value:
         menu_dict = {
             "0": ("TMP1075 TCS Board 0", TMP1075_HANDLER_TCS_BRD_0_ID),

eive_tmtc/pus_tc/system/proc.py

@@ -765,7 +765,6 @@ def gen_disable_listen_to_hk_for_x_seconds(
 def activate_mgts_alternately(
     q: DefaultPusQueueHelper,
 ):
-
     q.add_pus_tc(
         pack_dipole_command(
             object_id=oids.IMTQ_HANDLER_ID,

eive_tmtc/pus_tm/hk_handling.py

@@ -45,14 +45,10 @@ _LOGGER = logging.getLogger(__name__)
 
 
 FORWARD_SENSOR_TEMPS = False
-# TODO: Transform this into a CLI argument
-HK_OUTPUT_LEVEL = 1
 
 
 def handle_hk_packet(
-    raw_tm: bytes,
-    obj_id_dict: ObjectIdDictT,
-    printer: FsfwTmTcPrinter,
+    raw_tm: bytes, obj_id_dict: ObjectIdDictT, printer: FsfwTmTcPrinter, 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)
@@ -73,9 +69,9 @@ def handle_hk_packet(
             hk_data=hk_data,
         )
         try:
-            if HK_OUTPUT_LEVEL == 1:
+            if hk_level == 1:
                 pass
-            elif HK_OUTPUT_LEVEL > 1:
+            elif hk_level > 1:
                 handle_regular_hk_print(
                     printer=printer,
                     object_id=named_obj_id,

eive_tmtc/pus_tm/pus_demux.py

@@ -29,6 +29,7 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
     verif_wrapper: VerificationWrapper,
     printer: FsfwTmTcPrinter,
     raw_logger: RawTmtcTimedLogWrapper,
+    hk_level: int,
 ):
     if len(packet) < 8:
         _LOGGER.warning("Detected packet shorter than 8 bytes!")
@@ -48,7 +49,9 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
     if service == 1:
         handle_service_1_fsfw_packet(wrapper=verif_wrapper, raw_tm=packet)
     elif service == 3:
-        handle_hk_packet(printer=printer, raw_tm=packet, obj_id_dict=obj_id_dict)
+        handle_hk_packet(
+            printer=printer, raw_tm=packet, obj_id_dict=obj_id_dict, hk_level=hk_level
+        )
     elif service == 5:
         handle_event_packet(raw_tm=packet, pw=pw)
     elif service == 8:

eive_tmtc/pus_tm/tm_tcp_server.py

@@ -12,7 +12,6 @@ _LOGGER = logging.getLogger(__name__)
 
 class TmTcpServer:
     def __init__(self, ip_address: str, port: int):
-
         self.server_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
         self.server_socket.bind((ip_address, port))
@@ -46,7 +45,6 @@ class TmTcpServer:
                 self.client_connection.setblocking(False)
                 print("Client connected")
             except IOError:
-
                 return
 
         data_json_bytes = json.dumps(dictionary).encode()
@@ -65,7 +63,6 @@ class TmTcpServer:
             self.client_connection = None
 
     def report_raw_hk_data(self, object_id: ObjectIdU32, set_id: int, hk_data: bytes):
-
         data_dict = {
             "type": "TM",
             "tmType": "Raw HK",

eive_tmtc/tmtc/acs/gyros.py

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

eive_tmtc/tmtc/acs/mgms.py

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

eive_tmtc/tmtc/acs/reaction_wheels.py

@@ -290,7 +290,6 @@ def pack_set_speed_command(
 def handle_rw_hk_data(
     pw: PrintWrapper, object_id: ObjectIdU32, set_id: int, hk_data: bytes
 ):
-
     current_idx = 0
     if set_id == RwSetId.STATUS_SET_ID:
         pw.dlog(

eive_tmtc/tmtc/core.py

@@ -89,14 +89,14 @@ class OpCode:
     SWITCH_TO_SD_1 = ["switch_to_sd_1"]
     SWITCH_TO_BOTH_SD_CARDS = ["switch_to_both_sd_cards"]
     READ_REBOOT_MECHANISM_INFO = "rbh_info"
-    ENABLE_REBOOT_FILE_HANDLING = "rbh_off"
-    DISABLE_REBOOT_FILE_HANDLING = "rbh_on"
-    RESET_ALL_REBOOT_COUNTERS = "rbh_reset_a"
-    RESET_REBOOT_COUNTER_00 = "rbh_reset_00"
-    RESET_REBOOT_COUNTER_01 = "rbh_reset_01"
-    RESET_REBOOT_COUNTER_10 = "rbh_reset_10"
-    RESET_REBOOT_COUNTER_11 = "rbh_reset_11"
-    SET_MAX_REBOOT_CNT = ["rbh_max_cnt"]
+    ENABLE_REBOOT_FILE_HANDLING = "rwd_on"
+    DISABLE_REBOOT_FILE_HANDLING = "rwd_off"
+    RESET_ALL_REBOOT_COUNTERS = "rwd_reset_a"
+    RWD_RESET_REBOOT_COUNTER_00 = "rwd_reset_00"
+    RWD_RESET_REBOOT_COUNTER_01 = "rwd_reset_01"
+    RWD_RESET_REBOOT_COUNTER_10 = "rwd_reset_10"
+    RWD_RESET_REBOOT_COUNTER_11 = "rwd_reset_11"
+    RWD_SET_MAX_REBOOT_CNT = "rwd_max_cnt"
 
 
 class Info:
@@ -188,21 +188,25 @@ def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
         info="Reset all reboot counters",
     )
     oce.add(
-        keys=OpCode.RESET_REBOOT_COUNTER_00,
+        keys=OpCode.RWD_RESET_REBOOT_COUNTER_00,
         info="Reset reboot counter 0 0",
     )
     oce.add(
-        keys=OpCode.RESET_REBOOT_COUNTER_01,
+        keys=OpCode.RWD_RESET_REBOOT_COUNTER_01,
         info="Reset reboot counter 0 1",
     )
     oce.add(
-        keys=OpCode.RESET_REBOOT_COUNTER_10,
+        keys=OpCode.RWD_RESET_REBOOT_COUNTER_10,
         info="Reset reboot counter 1 0",
     )
     oce.add(
-        keys=OpCode.RESET_REBOOT_COUNTER_11,
+        keys=OpCode.RWD_RESET_REBOOT_COUNTER_11,
         info="Reset reboot counter 1 1",
     )
+    oce.add(
+        keys=OpCode.RWD_SET_MAX_REBOOT_CNT,
+        info="Reset max reboot count for reboot watchdog",
+    )
     oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
     oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
     oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
@@ -336,14 +340,25 @@ def pack_core_commands(  # noqa C901
                 action_id=ActionId.RESET_REBOOT_COUNTER,
             )
         )
-    elif op_code == OpCode.RESET_REBOOT_COUNTER_00:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_00:
         reset_specific_boot_counter(q, 0, 0)
-    elif op_code == OpCode.RESET_REBOOT_COUNTER_01:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_01:
         reset_specific_boot_counter(q, 0, 1)
-    elif op_code == OpCode.RESET_REBOOT_COUNTER_10:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_10:
         reset_specific_boot_counter(q, 1, 0)
-    elif op_code == OpCode.RESET_REBOOT_COUNTER_11:
+    elif op_code == OpCode.RWD_RESET_REBOOT_COUNTER_11:
         reset_specific_boot_counter(q, 1, 1)
+    elif op_code == OpCode.RWD_SET_MAX_REBOOT_CNT:
+        max_count = int(input("Set new maximum reboot threshold [1, 50]: "))
+        if max_count < 1 or max_count > 50:
+            raise ValueError("Invalid value, must be in range 1 to 50")
+        q.add_pus_tc(
+            create_action_cmd(
+                CORE_CONTROLLER_ID,
+                ActionId.SET_MAX_REBOOT_CNT,
+                user_data=bytes([max_count]),
+            )
+        )
     elif op_code in OpCode.OBSW_UPDATE_FROM_SD_0:
         q.add_log_cmd(Info.OBSW_UPDATE_FROM_SD_0)
         q.add_pus_tc(pack_obsw_update_cmd(ActionId.UPDATE_OBSW_FROM_SD_0))

eive_tmtc/tmtc/obj_prompt.py

@@ -14,6 +14,11 @@ from eive_tmtc.config.object_ids import (
     RW1_ID,
     RW2_ID,
     RTD_0_PLOC_HSPD,
+    TMP1075_HANDLER_TCS_BRD_1_ID,
+    TMP1075_HANDLER_TCS_BRD_0_ID,
+    TMP1075_HANDLER_PLPCDU_0_ID,
+    TMP1075_HANDLER_PLPCDU_1_ID,
+    TMP1075_HANDLER_IF_BRD_ID,
 )
 
 SUBSYSTEM_DICT = {
@@ -41,6 +46,11 @@ ACS_OBJ_DICT = {
 
 TCS_OBJ_DICT = {
     0: ("RTD 0", RTD_0_PLOC_HSPD),
+    1: ("TMP1075 PL PCDU 0", TMP1075_HANDLER_PLPCDU_0_ID),
+    2: ("TMP1075 PL PCDU 1", TMP1075_HANDLER_PLPCDU_1_ID),
+    3: ("TMP1075 TCS 0", TMP1075_HANDLER_TCS_BRD_0_ID),
+    4: ("TMP1075 TCS 1", TMP1075_HANDLER_TCS_BRD_1_ID),
+    5: ("TMP1075 IF BOARD", TMP1075_HANDLER_IF_BRD_ID),
 }
 
 

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -172,7 +172,6 @@ class Info(str, enum.Enum):
 
 @tmtc_definitions_provider
 def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
-
     oce = OpCodeEntry()
     oce.add(OpCodes.OFF, Info.OFF)
     oce.add(OpCodes.ON, Info.ON)

eive_tmtc/tmtc/tcs/ctrl.py

@@ -0,0 +1,92 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import TCS_CONTROLLER
+from eive_tmtc.tmtc.tcs import CtrlSetId
+from eive_tmtc.tmtc.tcs.brd_assy import pack_tcs_ass_cmds
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    generate_one_hk_command,
+    create_request_one_diag_command,
+    create_enable_periodic_hk_command_with_interval,
+    create_request_one_hk_command,
+)
+
+
+class OpCode:
+    REQUEST_PRIMARY_TEMP_SET = "temp"
+    ENABLE_TEMP_SET = "enable_temp_set"
+    REQUEST_DEVICE_TEMP_SET = "temp_devs"
+    REQUEST_DEVICE_SUS_SET = "temp_sus"
+    REQUEST_HEATER_INFO = "heater_info"
+    REQUEST_TCS_CTRL_INFO = "tcs_ctrl_info"
+
+
+class Info:
+    ENABLE_TEMP_SET = "Enable Primary Temperature Set"
+    REQUEST_PRIMARY_TEMP_SET = "Request HK set of primary sensor temperatures"
+    REQUEST_DEVICE_TEMP_SET = "Request HK set of device sensor temperatures"
+    REQUEST_DEVICE_SUS_SET = "Request HK set of the SUS temperatures"
+    REQUEST_HEATER_INFO = "Request heater information"
+    REQUEST_TCS_CTRL_INFO = "Request TCS controller information"
+
+
+def pack_tcs_ctrl_commands(q: DefaultPusQueueHelper, op_code: str):
+    if op_code == OpCode.REQUEST_PRIMARY_TEMP_SET:
+        sensor_set_sid = make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS)
+        q.add_log_cmd(Info.REQUEST_PRIMARY_TEMP_SET)
+        q.add_pus_tc(generate_one_hk_command(sensor_set_sid))
+    if op_code == OpCode.REQUEST_DEVICE_TEMP_SET:
+        q.add_log_cmd(Info.REQUEST_DEVICE_TEMP_SET)
+        q.add_pus_tc(
+            generate_one_hk_command(make_sid(TCS_CONTROLLER, CtrlSetId.DEVICE_SENSORS))
+        )
+    if op_code == OpCode.REQUEST_DEVICE_SUS_SET:
+        q.add_log_cmd(Info.REQUEST_DEVICE_SUS_SET)
+        q.add_pus_tc(
+            generate_one_hk_command(
+                make_sid(TCS_CONTROLLER, CtrlSetId.SUS_TEMP_SENSORS)
+            )
+        )
+    if op_code == OpCode.REQUEST_HEATER_INFO:
+        q.add_log_cmd(Info.REQUEST_HEATER_INFO)
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                make_sid(TCS_CONTROLLER, CtrlSetId.HEATER_INFO)
+            )
+        )
+    if op_code == OpCode.REQUEST_TCS_CTRL_INFO:
+        q.add_log_cmd(Info.REQUEST_TCS_CTRL_INFO)
+        q.add_pus_tc(
+            create_request_one_hk_command(
+                make_sid(TCS_CONTROLLER, CtrlSetId.TCS_CTRL_INFO)
+            )
+        )
+    if op_code == OpCode.ENABLE_TEMP_SET:
+        interval_seconds = float(input("Please specify interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval(
+            False, make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS), interval_seconds
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    pack_tcs_ass_cmds(q, op_code)
+
+
+@tmtc_definitions_provider
+def add_tcs_ctrl_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.ENABLE_TEMP_SET, info=Info.ENABLE_TEMP_SET)
+    oce.add(keys=OpCode.REQUEST_PRIMARY_TEMP_SET, info=Info.REQUEST_PRIMARY_TEMP_SET)
+    oce.add(keys=OpCode.REQUEST_DEVICE_TEMP_SET, info=Info.REQUEST_DEVICE_TEMP_SET)
+    oce.add(keys=OpCode.REQUEST_DEVICE_SUS_SET, info=Info.REQUEST_DEVICE_SUS_SET)
+    oce.add(keys=OpCode.REQUEST_HEATER_INFO, info=Info.REQUEST_HEATER_INFO)
+    oce.add(keys=OpCode.REQUEST_TCS_CTRL_INFO, info=Info.REQUEST_TCS_CTRL_INFO)
+    defs.add_service(
+        name=CustomServiceList.TCS_CTRL,
+        info="TCS controller",
+        op_code_entry=oce,
+    )

eive_tmtc/tmtc/tcs/defs.py

@@ -6,3 +6,22 @@ class CtrlSetId(enum.IntEnum):
     DEVICE_SENSORS = 1
     SUS_TEMP_SENSORS = 2
     HEATER_INFO = 4
+    TCS_CTRL_INFO = 5
+
+
+class TcsSubmode(enum.IntEnum):
+    DEFAULT = 0
+    NO_HEATER_CTRL = 1
+
+
+class Heater(enum.IntEnum):
+    HEATER_0_PLOC_PROC_BRD = 0
+    HEATER_1_PCDU_BRD = 1
+    HEATER_2_ACS_BRD = 2
+    HEATER_3_OBC_BRD = 3
+    HEATER_4_CAMERA = 4
+    HEATER_5_STR = 5
+    HEATER_6_DRO = 6
+    HEATER_7_SYRLINKS = 7
+    NUMBER_OF_SWITCHES = 8
+    NONE = 0xFF

eive_tmtc/tmtc/tcs/heater.py

@@ -7,6 +7,7 @@ import enum
 
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import get_object_ids
+from eive_tmtc.tmtc.tcs.defs import Heater
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
@@ -20,18 +21,6 @@ from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
 
 
-class Heater(enum.IntEnum):
-    HEATER_0_PLOC_PROC_BRD = 0
-    HEATER_1_PCDU_BRD = 1
-    HEATER_2_ACS_BRD = 2
-    HEATER_3_OBC_BRD = 3
-    HEATER_4_CAMERA = 4
-    HEATER_5_STR = 5
-    HEATER_6_DRO = 6
-    HEATER_7_SYRLINKS = 7
-    NUMBER_OF_SWITCHES = 8
-
-
 HEATER_LOCATION = [
     "PLOC Processing Board",
     "PCDU PDU",

eive_tmtc/tmtc/tcs/subsystem.py

@@ -1,6 +1,5 @@
-from .defs import CtrlSetId
 from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.config.object_ids import TCS_CONTROLLER, TCS_SUBSYSTEM_ID
+from eive_tmtc.config.object_ids import TCS_SUBSYSTEM_ID
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
 from eive_tmtc.tmtc.tcs.brd_assy import pack_tcs_ass_cmds
 from tmtccmd.config.tmtc import (
@@ -10,74 +9,28 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_announce_mode_recursive_command
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    make_sid,
-    generate_one_hk_command,
-    create_enable_periodic_hk_command_with_interval,
-    create_request_one_diag_command,
-)
 
 
-class OpCodeSys:
-    OFF = ["off"]
-    NML = ["nml"]
-    REQUEST_PRIMARY_TEMP_SET = ["temp"]
-    ENABLE_TEMP_SET = "enable_temp_set"
-    REQUEST_DEVICE_TEMP_SET = ["temp_devs"]
-    REQUEST_DEVICE_SUS_SET = ["temp_sus"]
-    REQUEST_HEATER_INFO = "heater_info"
+class OpCode:
+    OFF = "off"
+    NML = "nml"
     ANNOUNCE_MODES = "announce_modes"
 
 
 class InfoSys:
     OFF = "Switch TCS subsystem OFF"
     NML = "Switch TCS subsystem NORMAL (nominal)"
-    ENABLE_TEMP_SET = "Enable Primary Temperature Set"
-    REQUEST_PRIMARY_TEMP_SET = "Request HK set of primary sensor temperatures"
-    REQUEST_DEVICE_TEMP_SET = "Request HK set of device sensor temperatures"
-    REQUEST_DEVICE_SUS_SET = "Request HK set of the SUS temperatures"
-    REQUEST_HEATER_INFO = "Request heater information"
     ANNOUNCE_MODES = "Announce Modes recursively"
 
 
 def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in OpCodeSys.REQUEST_PRIMARY_TEMP_SET:
-        sensor_set_sid = make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS)
-        q.add_log_cmd(InfoSys.REQUEST_PRIMARY_TEMP_SET)
-        q.add_pus_tc(generate_one_hk_command(sensor_set_sid))
-    if op_code in OpCodeSys.REQUEST_DEVICE_TEMP_SET:
-        q.add_log_cmd(InfoSys.REQUEST_DEVICE_TEMP_SET)
-        q.add_pus_tc(
-            generate_one_hk_command(make_sid(TCS_CONTROLLER, CtrlSetId.DEVICE_SENSORS))
-        )
-    if op_code in OpCodeSys.REQUEST_DEVICE_SUS_SET:
-        q.add_log_cmd(InfoSys.REQUEST_DEVICE_SUS_SET)
-        q.add_pus_tc(
-            generate_one_hk_command(
-                make_sid(TCS_CONTROLLER, CtrlSetId.SUS_TEMP_SENSORS)
-            )
-        )
-    if op_code == OpCodeSys.REQUEST_HEATER_INFO:
-        q.add_log_cmd(InfoSys.REQUEST_HEATER_INFO)
-        q.add_pus_tc(
-            create_request_one_diag_command(
-                make_sid(TCS_CONTROLLER, CtrlSetId.HEATER_INFO)
-            )
-        )
-    if op_code in OpCodeSys.OFF:
+    if op_code == OpCode.OFF:
         q.add_log_cmd(InfoSys.OFF)
         pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.OFF, 0, q, InfoSys.OFF)
-    if op_code in OpCodeSys.NML:
+    if op_code == OpCode.NML:
         q.add_log_cmd(InfoSys.NML)
         pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.NORMAL, 0, q, InfoSys.OFF)
-    if op_code == OpCodeSys.ENABLE_TEMP_SET:
-        interval_seconds = float(input("Please specify interval in seconds: "))
-        cmds = create_enable_periodic_hk_command_with_interval(
-            False, make_sid(TCS_CONTROLLER, CtrlSetId.PRIMARY_SENSORS), interval_seconds
-        )
-        for cmd in cmds:
-            q.add_pus_tc(cmd)
-    if op_code == OpCodeSys.ANNOUNCE_MODES:
+    if op_code == OpCode.ANNOUNCE_MODES:
         q.add_log_cmd(InfoSys.ANNOUNCE_MODES)
         q.add_pus_tc(create_announce_mode_recursive_command(TCS_SUBSYSTEM_ID))
     pack_tcs_ass_cmds(q, op_code)
@@ -86,20 +39,11 @@ def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
 @tmtc_definitions_provider
 def add_tcs_subsystem_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(keys=OpCodeSys.OFF, info=InfoSys.OFF)
-    oce.add(keys=OpCodeSys.NML, info=InfoSys.NML)
-    oce.add(
-        keys=OpCodeSys.REQUEST_PRIMARY_TEMP_SET, info=InfoSys.REQUEST_PRIMARY_TEMP_SET
-    )
-    oce.add(
-        keys=OpCodeSys.REQUEST_DEVICE_TEMP_SET, info=InfoSys.REQUEST_DEVICE_TEMP_SET
-    )
-    oce.add(keys=OpCodeSys.REQUEST_DEVICE_SUS_SET, info=InfoSys.REQUEST_DEVICE_SUS_SET)
-    oce.add(keys=OpCodeSys.REQUEST_HEATER_INFO, info=InfoSys.REQUEST_HEATER_INFO)
-    oce.add(keys=OpCodeSys.ANNOUNCE_MODES, info=InfoSys.ANNOUNCE_MODES)
-    oce.add(keys=OpCodeSys.ENABLE_TEMP_SET, info=InfoSys.ENABLE_TEMP_SET)
+    oce.add(keys=OpCode.OFF, info=InfoSys.OFF)
+    oce.add(keys=OpCode.NML, info=InfoSys.NML)
+    oce.add(keys=OpCode.ANNOUNCE_MODES, info=InfoSys.ANNOUNCE_MODES)
     defs.add_service(
-        name=CustomServiceList.TCS,
-        info="TCS",
+        name=CustomServiceList.TCS_SS,
+        info="TCS subsystem",
         op_code_entry=oce,
     )

eive_tmtc/tmtc/tcs/tm.py

@@ -1,7 +1,11 @@
+import dataclasses
+import datetime
+import enum
 import logging
 import struct
 
 from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.tmtc.tcs.defs import Heater
 from tmtccmd.fsfw import validity_buffer_list
 from tmtccmd.util import ObjectIdU32
 from .defs import CtrlSetId
@@ -11,7 +15,46 @@ from .heater import HEATER_LOCATION
 _LOGGER = logging.getLogger(__name__)
 
 
-def handle_thermal_controller_hk_data(
+class ThermalComponent(enum.IntEnum):
+    NONE = 0
+    ACS_BOARD = 1
+    MGT = 2
+    RW = 3
+    STR = 4
+    IF_BOARD = 5
+    TCS_BOARD = 6
+    OBC = 7
+    LEGACY_OBCIF_BOARD = 8
+    SBAND_TRANSCEIVER = 9
+    PCDUP60_BOARD = 10
+    PCDUACU = 11
+    PCDUPDU = 12
+    PLPCDU_BOARD = 13
+    PLOCMISSION_BOARD = 14
+    PLOCPROCESSING_BOARD = 15
+    DAC = 16
+    CAMERA = 17
+    DRO = 18
+    X8 = 19
+    HPA = 20
+    TX = 21
+    MPA = 22
+    SCEX_BOARD = 23
+    NUM_ENTRIES = 24
+
+
+@dataclasses.dataclass
+class TcsCtrlComponentInfo:
+    component: ThermalComponent
+    # Heater on or off?
+    state: bool
+    used_sensor_idx: int
+    used_heater: Heater
+    start_time: datetime.datetime
+    end_time: datetime.datetime
+
+
+def handle_thermal_controller_hk_data(  # noqa C901: complexity is okay.
     object_id: ObjectIdU32, pw: PrintWrapper, set_id: int, hk_data: bytes
 ):
     # need a better solutuon for this is this is used again..
@@ -119,5 +162,50 @@ def handle_thermal_controller_hk_data(
             )
         current_draw = struct.unpack("!H", hk_data[8:10])[0]
         print(f"Heater Power Channel Current Draw: {current_draw} mA")
+    elif set_id == CtrlSetId.TCS_CTRL_INFO:
+        pw.dlog("Received TCS CTRL information set")
+        current_idx = 0
+        heater_states = hk_data[0 : ThermalComponent.NUM_ENTRIES]
+        current_idx += ThermalComponent.NUM_ENTRIES
+        used_sensor_idx = hk_data[
+            current_idx : current_idx + ThermalComponent.NUM_ENTRIES
+        ]
+        current_idx += ThermalComponent.NUM_ENTRIES
+        used_heater_idx = hk_data[
+            current_idx : current_idx + ThermalComponent.NUM_ENTRIES
+        ]
+        current_idx += ThermalComponent.NUM_ENTRIES
+        start_and_end_time_fmt_str = "!IIIIIIIIIIIIIIIIIIIIIIII"
+        data_len = struct.calcsize(start_and_end_time_fmt_str)
+        start_times = struct.unpack(
+            start_and_end_time_fmt_str, hk_data[current_idx : current_idx + data_len]
+        )
+        current_idx += data_len
+        end_times = struct.unpack(
+            start_and_end_time_fmt_str, hk_data[current_idx : current_idx + data_len]
+        )
+        current_idx += data_len
+        component_list = []
+        for i in range(ThermalComponent.NUM_ENTRIES):
+            info = TcsCtrlComponentInfo(
+                component=ThermalComponent(i),
+                state=bool(heater_states[i]),
+                used_sensor_idx=used_sensor_idx[i],
+                used_heater=Heater(used_heater_idx[i]),
+                start_time=datetime.datetime.fromtimestamp(
+                    start_times[i], datetime.timezone.utc
+                ),
+                end_time=datetime.datetime.fromtimestamp(
+                    end_times[i], datetime.timezone.utc
+                ),
+            )
+            component_str = f"{info.component!r}".ljust(46)
+            state_str = "ON" if info.state else "OFF"
+            pw.dlog(
+                f"{component_str}: {state_str.ljust(4)} | Sensor Index "
+                f"{info.used_sensor_idx} | {info.used_heater!r} | Start "
+                f"{info.start_time} | End {info.end_time}"
+            )
+            component_list.append(info)
     else:
         _LOGGER.warning(f"Unimplemented set ID {set_id}")

pyproject.toml

@@ -29,9 +29,9 @@ classifiers = [
     "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-	"tmtccmd ~= 5.0.0rc0",
+	"tmtccmd ~= 5.0",
 	"python-dateutil ~= 2.8",
-	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@<gitRev>#egg=tmtccmd
+	# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@1b110d321ef85#egg=tmtccmd"
 ]
 
 [project.urls]

tmtcc.py

@@ -166,16 +166,20 @@ class PusHandler(SpecificApidHandlerBase):
         wrapper: VerificationWrapper,
         printer: FsfwTmTcPrinter,
         raw_logger: RawTmtcTimedLogWrapper,
+        hk_level: int,
     ):
         super().__init__(PUS_APID, None)
         self.printer = printer
         self.verif_wrapper = wrapper
         self.raw_logger = raw_logger
+        self.hk_level = hk_level
 
     def handle_tm(self, packet: bytes, _user_args: any):
         # with open("tc.bin", "wb") as of:
         #    of.write(packet)
-        pus_factory_hook(packet, self.verif_wrapper, self.printer, self.raw_logger)
+        pus_factory_hook(
+            packet, self.verif_wrapper, self.printer, self.raw_logger, self.hk_level
+        )
 
 
 class UnknownApidHandler(GenericApidHandlerBase):
@@ -335,13 +339,18 @@ class TcHandler(TcHandlerBase):
                 _LOGGER.info("Finished CFDP queue")
 
 
-def setup_params() -> SetupWrapper:
+def setup_params() -> (SetupWrapper, int):
     hook_obj = EiveHookObject(default_json_path())
     params = SetupParams()
     parser_wrapper = PreArgsParsingWrapper()
     parser_wrapper.create_default_parent_parser()
     parser_wrapper.create_default_parser()
-    parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
+    tmtc_parser, cfdp_parser = parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
+    tmtc_parser.add_argument(
+        "--hk",
+        help="HK output level",
+        default=2,
+    )
     post_arg_parsing_wrapper = parser_wrapper.parse(
         setup_params=params, hook_obj=hook_obj
     )
@@ -352,13 +361,14 @@ def setup_params() -> SetupWrapper:
         post_arg_parsing_wrapper.set_params_with_prompts(proc_param_wrapper)
     else:
         post_arg_parsing_wrapper.set_params_without_prompts(proc_param_wrapper)
+    hk_level = int(post_arg_parsing_wrapper.args_raw.hk)
     params.apid = PUS_APID
     if params.com_if is None:
         raise ValueError("could not determine a COM interface.")
     setup_wrapper = SetupWrapper(
         hook_obj=hook_obj, setup_params=params, proc_param_wrapper=proc_param_wrapper
     )
-    return setup_wrapper
+    return setup_wrapper, hk_level
 
 
 def setup_cfdp_handler() -> CfdpInCcsdsWrapper:
@@ -400,12 +410,13 @@ def setup_tmtc_handlers(
     printer: FsfwTmTcPrinter,
     raw_logger: RawTmtcTimedLogWrapper,
     gui: bool,
+    hk_level: int,
 ) -> (CcsdsTmHandler, TcHandler):
     cfdp_in_ccsds_wrapper = setup_cfdp_handler()
     verification_wrapper = VerificationWrapper(
         verificator, _LOGGER, printer.file_logger
     )
-    pus_handler = PusHandler(verification_wrapper, printer, raw_logger)
+    pus_handler = PusHandler(verification_wrapper, printer, raw_logger, hk_level)
     ccsds_handler = CustomCcsdsTmHandler(generic_handler=UnknownApidHandler(None))
     ccsds_handler.add_apid_handler(pus_handler)
     ccsds_handler.add_apid_handler(cfdp_in_ccsds_wrapper)
@@ -444,7 +455,7 @@ def main():  # noqa C901: Complexity okay here.
     # TODO: -V CLI argument to enable this?
     _LOGGER.setLevel(_LOG_LEVEL)
     try:
-        setup_wrapper = setup_params()
+        setup_wrapper, hk_level = setup_params()
     except KeyboardInterrupt as e:
         _LOGGER.info(f"{e}. Exiting")
         sys.exit(0)
@@ -457,7 +468,7 @@ def main():  # noqa C901: Complexity okay here.
     )
     pus_verificator = PusVerificator()
     ccsds_handler, tc_handler = setup_tmtc_handlers(
-        pus_verificator, printer, raw_logger, setup_wrapper.params.use_gui
+        pus_verificator, printer, raw_logger, setup_wrapper.params.use_gui, hk_level
     )
 
     tmtccmd.setup(setup_wrapper)