Merge branch 'main' into disable-order-check-plpcdu

CHANGELOG.md

@@ -14,6 +14,7 @@ list yields a list of all related PRs for each release.
 
 - Added new commands to disable channel order checks partially for the payload PCDU normal modes.
 - Core controller auto switch enable and disable command.
+- PLOC SUPV ADC and Counters report TM handling.
 
 # [v5.10.1] 2023-10-27
 

eive_tmtc/config/events.csv

@@ -143,14 +143,16 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11901;0x2e7d;BOOTING_FIRMWARE_FAILED_EVENT;LOW;Failed to boot firmware;mission/acs/str/StarTrackerHandler.h
 11902;0x2e7e;BOOTING_BOOTLOADER_FAILED_EVENT;LOW;Failed to boot star tracker into bootloader mode;mission/acs/str/StarTrackerHandler.h
 11903;0x2e7f;COM_ERROR_REPLY_RECEIVED;LOW;Received COM error. P1:  Communication Error ID (datasheet p32);mission/acs/str/StarTrackerHandler.h
-12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/PlocSupervisorHandler.h
-12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/PlocSupervisorHandler.h
-12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/PlocSupervisorHandler.h
-12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/PlocSupervisorHandler.h
-12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/PlocSupervisorHandler.h
-12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/PlocSupervisorHandler.h
-12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/PlocSupervisorHandler.h
+12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/payload/plocSupvDefs.h
+12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/payload/plocSupvDefs.h
+12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;No description;linux/payload/plocSupvDefs.h
+12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/payload/plocSupvDefs.h
+12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/payload/plocSupvDefs.h
+12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/payload/plocSupvDefs.h
+12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/payload/plocSupvDefs.h
+12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/payload/plocSupvDefs.h
+12009;0x2ee9;SUPV_ACK_UNKNOWN_COMMAND;LOW;Received ACK, but no related command is unknown or has not been sent  by this software instance. P1: Module APID. P2: Service ID.;linux/payload/plocSupvDefs.h
+12010;0x2eea;SUPV_EXE_ACK_UNKNOWN_COMMAND;LOW;Received ACK EXE, but no related command is unknown or has not been sent  by this software instance. P1: Module APID. P2: Service ID.;linux/payload/plocSupvDefs.h
 12100;0x2f44;SANITIZATION_FAILED;LOW;No description;bsp_q7s/fs/SdCardManager.h
 12101;0x2f45;MOUNTED_SD_CARD;INFO;No description;bsp_q7s/fs/SdCardManager.h
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/payload/PlocMemoryDumper.h

eive_tmtc/config/object_ids.py

@@ -167,6 +167,9 @@ NOT_OK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x03])
 HK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x04])
 CFDP_TM_STORE = bytes([0x73, 0x03, 0x00, 0x00])
 
+
+SUPV_FILTER_SET = [PLOC_SUPV_ID, PDU_2_HANDLER_ID, PDU_1_HANDLER_ID]
+
 ObjectIdDict = Dict[bytes, ObjectIdU32]
 
 

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -10,23 +10,24 @@ import enum
 import logging
 import struct
 
-from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids
-from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.pus.tc.s3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.config import TmtcDefinitionWrapper
-from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry
+from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.pus.s8_fsfw_action import create_action_cmd
+from tmtccmd.pus.s200_fsfw_mode import Mode, pack_mode_data
+from tmtccmd.pus.tc.s3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.tmtc import service_provider
 from tmtccmd.tmtc.decorator import ServiceProviderParams
-from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
-from tmtccmd.pus.s8_fsfw_action import create_action_cmd
-from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.utility.input_helper import InputHelper
 
 _LOGGER = logging.getLogger(__name__)
 
-latchup_id_dict = {
+LATCHUP_ID_DICT = {
     "0": "0.85V",
     "1": "1.8V",
     "2": "MISC",
@@ -40,7 +41,7 @@ HARDCODED = "0"
 MANUAL_INPUT = "1"
 HARDCODED_FILE = "/home/rmueller/EIVE/mpsoc_boot.bin"
 
-update_file_dict = {
+UPDATE_FILE_DICT = {
     HARDCODED: ["hardcoded", ""],
     MANUAL_INPUT: ["manual input", ""],
     "2": ["/mnt/sd0/ploc/supervisor/update.bin", "/mnt/sd0/ploc/supervisor/update.bin"],
@@ -58,7 +59,7 @@ update_file_dict = {
     ],
 }
 
-event_buffer_path_dict = {
+EVENT_BUFFER_PATH_DICT = {
     MANUAL_INPUT: ["manual input", ""],
     "2": ["/mnt/sd0/ploc/supervisor", "/mnt/sd0/ploc/supervisor"],
 }
@@ -84,7 +85,7 @@ FACTORY_RESET_OPS = {
 
 
 class SupvActionId(enum.IntEnum):
-    HK_REPORT = 1
+    REQUEST_HK_REPORT = 1
     START_MPSOC = 3
     SHUTWOWN_MPSOC = 4
     SEL_MPSOC_BOOT_IMAGE = 5
@@ -111,7 +112,7 @@ class SupvActionId(enum.IntEnum):
     SET_GPIO = 34
     READ_GPIO = 35
     RESTART_SUPERVISOR = 36
-    LOGGING_REQUEST_COUNTERS = 38
+    REQUEST_LOGGING_COUNTERS = 38
     FACTORY_RESET = 39
     START_MPSOC_QUIET = 45
     SET_SHUTDOWN_TIMEOUT = 46
@@ -130,27 +131,32 @@ class SupvActionId(enum.IntEnum):
     MEM_CHECK = 61
 
 
-class SetIds(enum.IntEnum):
+class SetId(enum.IntEnum):
     HK_REPORT = 102
     BOOT_STATUS_REPORT = 103
+    LATCHUP_REPORT = 104
+    COUNTERS_REPORT = 105
+    ADC_REPORT = 106
+    UPDATE_STATUS_REPORT = 107
 
 
-class OpCodes:
-    OFF = ["0", "off"]
-    ON = ["1", "on"]
-    NORMAL = ["2", "nml"]
-    HK_TO_OBC = ["3", "hk_to_obc"]
-    REQUEST_HK = ["4", "req_hk"]
-    START_MPSOC = ["5", "start_mpsoc"]
-    SHUTDOWN_MPSOC = ["6", "stop_mpsoc"]
-    SEL_NVM = ["7", "sel_nvm"]
-    SET_TIME_REF = ["set_time_ref"]
-    FACTORY_FLASH = ["factory_flash"]
-    REQ_BOOT_STATUS_REPORT = ["13", "boot_report"]
-    START_UPDATE = ["42", "start_update"]
-    PERFORM_UPDATE = ["update"]
-    FACTORY_RESET = ["factory_reset"]
-    MEM_CHECK = ["mem_check"]
+class OpCode:
+    OFF = "off"
+    ON = "on"
+    NORMAL = "nml"
+    HK_TO_OBC = "hk_to_obc"
+    REQUEST_HK_SET_FROM_DEV = "req_hk_from_dev"
+    REQUEST_HK_SET = "req_hk"
+    START_MPSOC = "start_mpsoc"
+    SHUTDOWN_MPSOC = "stop_mpsoc"
+    SEL_NVM = "sel_nvm"
+    SET_TIME_REF = "set_time_ref"
+    FACTORY_FLASH = "factory_flash"
+    REQ_BOOT_STATUS_REPORT = "boot_report"
+    START_UPDATE = "start_update"
+    PERFORM_UPDATE = "update"
+    FACTORY_RESET = "factory_reset"
+    MEM_CHECK = "mem_check"
     RESET_MPSOC = "reset_mpsoc"
 
 
@@ -160,7 +166,8 @@ class Info(str, enum.Enum):
     ON = "Switch On"
     NML = "Switch Normal"
     HK_TO_OBC = "Request  HK from PLOC SUPV"
-    REQUEST_HK = "Request HK set from PLOC Handler"
+    REQUEST_HK_SET_FROM_DEV = "Request HK set from the device to the PLOC Handler"
+    REQUEST_HK_SET = "Request HK set from PLOC Handler"
     SET_TIME_REF = "Set time reference"
     FACTORY_FLASH = "Factory Flash Mode"
     PERFORM_UPDATE = "Start or continue MPSoC SW update at starting bytes"
@@ -175,21 +182,22 @@ 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)
-    oce.add(OpCodes.NORMAL, Info.NML)
-    oce.add(OpCodes.HK_TO_OBC, Info.HK_TO_OBC)
-    oce.add(OpCodes.REQUEST_HK, Info.REQUEST_HK)
-    oce.add(OpCodes.START_MPSOC, "PLOC Supervisor: Start MPSoC")
-    oce.add(OpCodes.SHUTDOWN_MPSOC, "PLOC Supervisor: Shutdown MPSoC")
-    oce.add(OpCodes.SEL_NVM, Info.SEL_NVM)
-    oce.add(OpCodes.SET_TIME_REF, Info.SET_TIME_REF)
-    oce.add(OpCodes.FACTORY_RESET, Info.FACTORY_RESET)
-    oce.add(OpCodes.RESET_MPSOC, Info.RESET_MPSOC)
+    oce.add(OpCode.OFF, Info.OFF)
+    oce.add(OpCode.ON, Info.ON)
+    oce.add(OpCode.NORMAL, Info.NML)
+    oce.add(OpCode.HK_TO_OBC, Info.HK_TO_OBC)
+    oce.add(OpCode.REQUEST_HK_SET, Info.REQUEST_HK_SET)
+    oce.add(OpCode.REQUEST_HK_SET_FROM_DEV, Info.REQUEST_HK_SET_FROM_DEV)
+    oce.add(OpCode.START_MPSOC, "PLOC Supervisor: Start MPSoC")
+    oce.add(OpCode.SHUTDOWN_MPSOC, "PLOC Supervisor: Shutdown MPSoC")
+    oce.add(OpCode.SEL_NVM, Info.SEL_NVM)
+    oce.add(OpCode.SET_TIME_REF, Info.SET_TIME_REF)
+    oce.add(OpCode.FACTORY_RESET, Info.FACTORY_RESET)
+    oce.add(OpCode.RESET_MPSOC, Info.RESET_MPSOC)
     oce.add("8", "PLOC Supervisor: Set max restart tries")
     oce.add("11", "PLOC Supervisor: Set boot timeout")
     oce.add("12", "PLOC Supervisor: Disable Hk")
-    oce.add(OpCodes.REQ_BOOT_STATUS_REPORT, Info.REQ_BOOT_STATUS_REPORT)
+    oce.add(OpCode.REQ_BOOT_STATUS_REPORT, Info.REQ_BOOT_STATUS_REPORT)
     oce.add("17", "PLOC Supervisor: Enable latchup alert")
     oce.add("18", "PLOC Supervisor: Disable latchup alert")
     oce.add("20", "PLOC Supervisor: Set alert limit")
@@ -203,12 +211,12 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     oce.add("35", "PLOC Supervisor: Set GPIO")
     oce.add("36", "PLOC Supervisor: Read GPIO")
     oce.add("37", "PLOC Supervisor: Restart supervisor")
-    oce.add(OpCodes.PERFORM_UPDATE, Info.PERFORM_UPDATE)
-    oce.add(OpCodes.START_UPDATE, Info.START_UPDATE)
+    oce.add(OpCode.PERFORM_UPDATE, Info.PERFORM_UPDATE)
+    oce.add(OpCode.START_UPDATE, Info.START_UPDATE)
     oce.add("43", "PLOC Supervisor: Terminate supervisor process")
     oce.add("44", "PLOC Supervisor: Start MPSoC quiet")
     oce.add("45", "PLOC Supervisor: Set shutdown timeout")
-    oce.add(OpCodes.FACTORY_FLASH, Info.FACTORY_FLASH)
+    oce.add(OpCode.FACTORY_FLASH, Info.FACTORY_FLASH)
     oce.add("47", "PLOC Supervisor: Enable auto TM")
     oce.add("48", "PLOC Supervisor: Disable auto TM")
     oce.add("51", "PLOC Supervisor: Logging request event buffers")
@@ -219,7 +227,7 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     oce.add("56", "PLOC Supervisor: Reset PL")
     oce.add("57", "PLOC Supervisor: Enable NVMs")
     oce.add("58", "PLOC Supervisor: Continue update")
-    oce.add(OpCodes.MEM_CHECK, Info.MEM_CHECK)
+    oce.add(OpCode.MEM_CHECK, Info.MEM_CHECK)
     defs.add_service(CustomServiceList.PLOC_SUPV.value, "PLOC Supervisor", oce)
 
 
@@ -228,39 +236,56 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
     q = p.queue_helper
     op_code = p.op_code
     object_id = get_object_ids().get(PLOC_SUPV_ID)
+    assert object_id is not None
     q.add_log_cmd(f"Testing PLOC Supervisor with object id: {object_id.as_hex_string}")
     obyt = object_id.as_bytes
     prefix = "PLOC Supervisor"
-    if op_code in OpCodes.OFF:
+    if op_code == OpCode.OFF:
         q.add_log_cmd(f"{prefix}: {Info.OFF}")
         command = pack_mode_data(object_id.as_bytes, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
-    if op_code in OpCodes.ON:
+    if op_code == OpCode.ON:
         q.add_log_cmd(f"{prefix}: {Info.ON}")
         command = pack_mode_data(object_id.as_bytes, Mode.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
-    if op_code in OpCodes.NORMAL:
+    if op_code == OpCode.NORMAL:
         q.add_log_cmd(f"{prefix}: {Info.NML}")
         command = pack_mode_data(object_id.as_bytes, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=command))
-    if op_code in OpCodes.HK_TO_OBC:
+    if op_code == OpCode.HK_TO_OBC:
         q.add_log_cmd(f"{prefix}: {Info.HK_TO_OBC}")
-        command = obyt + struct.pack("!I", SupvActionId.HK_REPORT)
+        command = obyt + struct.pack("!I", SupvActionId.REQUEST_HK_REPORT)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.REQUEST_HK:
-        q.add_log_cmd(f"{prefix}: {Info.REQUEST_HK}")
-        sid = make_sid(object_id.as_bytes, SetIds.HK_REPORT)
+    if op_code == OpCode.REQUEST_HK_SET:
+        q.add_log_cmd(f"{prefix}: {Info.REQUEST_HK_SET}")
+        sid = make_sid(object_id.as_bytes, prompt_set_id())
         cmd = generate_one_hk_command(sid)
         q.add_pus_tc(cmd)
-    elif op_code in OpCodes.START_MPSOC:
+    if op_code == OpCode.REQUEST_HK_SET_FROM_DEV:
+        q.add_log_cmd(f"{prefix}: {Info.REQUEST_HK_SET_FROM_DEV}")
+        set_id = prompt_set_id()
+        action_cmd = None
+        if set_id == SetId.HK_REPORT:
+            action_cmd = create_action_cmd(PLOC_SUPV_ID, SupvActionId.REQUEST_HK_REPORT)
+        if set_id == SetId.ADC_REPORT:
+            action_cmd = create_action_cmd(
+                PLOC_SUPV_ID, SupvActionId.REQUEST_ADC_REPORT
+            )
+        if set_id == SetId.COUNTERS_REPORT:
+            action_cmd = create_action_cmd(
+                PLOC_SUPV_ID, SupvActionId.REQUEST_LOGGING_COUNTERS
+            )
+        assert action_cmd is not None
+        q.add_pus_tc(action_cmd)
+    elif op_code == OpCode.START_MPSOC:
         q.add_log_cmd("PLOC Supervisor: Start MPSoC")
         command = obyt + struct.pack("!I", SupvActionId.START_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.SHUTDOWN_MPSOC:
+    if op_code == OpCode.SHUTDOWN_MPSOC:
         q.add_log_cmd("PLOC Supervisor: Shutdown MPSoC")
         command = object_id.as_bytes + struct.pack("!I", SupvActionId.SHUTWOWN_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.SEL_NVM:
+    if op_code == OpCode.SEL_NVM:
         q.add_log_cmd("PLOC Supervisor: Select MPSoC boot image")
         mem = int(input("MEM (NVM0 - 0 or NVM1 - 1): "))
         bp0 = int(input("BP0 (0 or 1): "))
@@ -268,7 +293,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
         bp2 = int(input("BP2 (0 or 1): "))
         command = pack_sel_boot_image_cmd(object_id.as_bytes, mem, bp0, bp1, bp2)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.FACTORY_RESET:
+    if op_code == OpCode.FACTORY_RESET:
         q.add_log_cmd(f"{prefix}: {Info.FACTORY_RESET}")
         while True:
             print("Please select the key for a factory reset operation")
@@ -294,11 +319,11 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
             + struct.pack("!B", restart_tries)
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == OpCodes.RESET_MPSOC:
+    if op_code == OpCode.RESET_MPSOC:
         q.add_log_cmd(Info.RESET_MPSOC)
         command = object_id.as_bytes + struct.pack("!I", SupvActionId.RESET_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.SET_TIME_REF:
+    if op_code == OpCode.SET_TIME_REF:
         q.add_log_cmd("PLOC Supervisor: Set time reference")
         command = object_id.as_bytes + struct.pack("!I", SupvActionId.SET_TIME_REF)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
@@ -315,14 +340,14 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
         q.add_log_cmd("PLOC Supervisor: Disable HK")
         command = object_id.as_bytes + struct.pack("!I", SupvActionId.DISABLE_HK)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.REQ_BOOT_STATUS_REPORT:
+    if op_code in OpCode.REQ_BOOT_STATUS_REPORT:
         q.add_log_cmd(f"{prefix}:  {Info.REQ_BOOT_STATUS_REPORT}")
         command = object_id.as_bytes + struct.pack(
             "!I", SupvActionId.GET_BOOT_STATUS_REPORT
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
         q.add_wait_seconds(2.0)
-        sid = make_sid(object_id.as_bytes, SetIds.BOOT_STATUS_REPORT)
+        sid = make_sid(object_id.as_bytes, SetId.BOOT_STATUS_REPORT)
         req_hk = generate_one_hk_command(sid)
         q.add_pus_tc(req_hk)
     if op_code == "17":
@@ -383,11 +408,11 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
             "!I", SupvActionId.RESTART_SUPERVISOR
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.START_UPDATE:
+    if op_code in OpCode.START_UPDATE:
         q.add_log_cmd("PLOC Supversior: Start new MPSoC SW update")
         command = pack_update_command(object_id.as_bytes, True)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.PERFORM_UPDATE:
+    if op_code in OpCode.PERFORM_UPDATE:
         q.add_log_cmd("PLOC Supervisor: Perform MPSoC SW update")
         command = pack_update_command(object_id.as_bytes, False)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
@@ -405,7 +430,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
         q.add_log_cmd("PLOC Supervisor: Set shutdown timeout")
         command = pack_set_shutdown_timeout_command(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.FACTORY_FLASH:
+    if op_code in OpCode.FACTORY_FLASH:
         q.add_log_cmd(f"{prefix}: {Info.FACTORY_FLASH}")
         command = object_id.as_bytes + struct.pack("!I", SupvActionId.FACTORY_FLASH)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
@@ -434,7 +459,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
     if op_code == "54":
         q.add_log_cmd("PLOC Supervisor: Logging request counters")
         command = object_id.as_bytes + struct.pack(
-            "!I", SupvActionId.LOGGING_REQUEST_COUNTERS
+            "!I", SupvActionId.REQUEST_LOGGING_COUNTERS
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "55":
@@ -462,7 +487,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
         q.add_log_cmd("PLOC Supervisor: Continue update")
         command = object_id.as_bytes + struct.pack("!I", SupvActionId.CONTINUE_UPDATE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code in OpCodes.MEM_CHECK:
+    if op_code == OpCode.MEM_CHECK:
         custom_data = bytearray()
         update_file = get_update_file()
         memory_id = int(input("Specify memory ID: "))
@@ -481,6 +506,20 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
         q.add_pus_tc(command)
 
 
+def prompt_set_id() -> SetId:
+    for set_id in SetId:
+        print(f"{set_id}: {set_id.name}")
+    while True:
+        set_id = int(input("Please select the set ID to request: "))
+        try:
+            set_id_typed = SetId(set_id)
+        except ValueError:
+            _LOGGER.warning("invalid set ID, try again")
+            continue
+        break
+    return set_id_typed
+
+
 def pack_sel_boot_image_cmd(
     object_id: bytes, mem: int, bp0: int, bp1: int, bp2: int
 ) -> bytearray:
@@ -545,9 +584,9 @@ def get_latchup_id() -> int:
     description_string = "Description".ljust(description_column_width)
     print(f"{key_string} | {description_string}")
     print(separator_string)
-    for key in latchup_id_dict:
+    for key in LATCHUP_ID_DICT:
         key_string = key.ljust(key_column_width)
-        description_string = latchup_id_dict[key].ljust(description_column_width)
+        description_string = LATCHUP_ID_DICT[key].ljust(description_column_width)
         print(f"{key_string} | {description_string}")
     return int(input("Specify latchup ID: "))
 
@@ -676,10 +715,10 @@ def pack_set_gpio_cmd(object_id: bytes) -> bytearray:
     port = int(input("Specify port: 0x"), 16)
     pin = int(input("Specify pin: 0x"), 16)
     val = int(input("Specify val: 0x"), 16)
-    command = object_id + struct.pack("!I", SupvActionId.SET_GPIO)
-    command = command + struct.pack("!B", port)
-    command = command + struct.pack("!B", pin)
-    command = command + struct.pack("!B", val)
+    command = bytearray(object_id + struct.pack("!I", SupvActionId.SET_GPIO))
+    command.append(port)
+    command.append(pin)
+    command.append(val)
     return bytearray(command)
 
 
@@ -701,25 +740,25 @@ def pack_logging_set_topic(object_id: bytes) -> bytearray:
 
 def get_update_file() -> str:
     _LOGGER.info("Specify update file ")
-    input_helper = InputHelper(update_file_dict)
+    input_helper = InputHelper(UPDATE_FILE_DICT)
     key = input_helper.get_key()
     if key == HARDCODED:
         file = HARDCODED_FILE
     elif key == MANUAL_INPUT:
         file = input("Ploc Supervisor: Specify absolute name of update file: ")
     else:
-        file = update_file_dict[key][1]
+        file = UPDATE_FILE_DICT[key][1]
     return file
 
 
 def get_event_buffer_path() -> str:
     _LOGGER.info("Specify path where to store event buffer file ")
-    input_helper = InputHelper(event_buffer_path_dict)
+    input_helper = InputHelper(EVENT_BUFFER_PATH_DICT)
     key = input_helper.get_key()
     if key == MANUAL_INPUT:
         file = input("Ploc Supervisor: Specify path: ")
     else:
-        file = event_buffer_path_dict[key][1]
+        file = EVENT_BUFFER_PATH_DICT[key][1]
     return file
 
 
@@ -731,8 +770,20 @@ class SocState(enum.IntEnum):
 
 
 def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
-    current_idx = 0
-    if set_id == SetIds.HK_REPORT:
+    if set_id == SetId.HK_REPORT:
+        handle_hk_report(hk_data, pw)
+    elif set_id == SetId.BOOT_STATUS_REPORT:
+        handle_boot_report(hk_data, pw)
+    elif set_id == SetId.ADC_REPORT:
+        handle_adc_report(hk_data)
+    elif set_id == SetId.COUNTERS_REPORT:
+        handle_counters_report(hk_data)
+    else:
+        pw.dlog(f"PLOC SUPV: HK handling not implemented for set ID {set_id}")
+        pw.dlog(f"Raw Data: 0x[{hk_data.hex(sep=',')}]")
+
+
+def handle_hk_report(hk_data: bytes, pw: PrintWrapper):
     fmt_str = "!IIIQIIIIIBBBB"
     inc_len = struct.calcsize(fmt_str)
     (
@@ -759,7 +810,10 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
     pw.dlog(f"Mission IO state {mission_io_state}")
     pw.dlog(f"FMC state {fmc_state}")
     pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[inc_len:], 13))
-    elif set_id == SetIds.BOOT_STATUS_REPORT:
+
+
+def handle_boot_report(hk_data: bytes, pw: PrintWrapper):
+    current_idx = 0
     fmt_str = "!BBIIBBBBBB"
     inc_len = struct.calcsize(fmt_str)
     (
@@ -782,11 +836,86 @@ def handle_supv_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
     pw.dlog(f"Power Cycles {power_cycles}")
     pw.dlog(f"Boot after {boot_after_ms} ms | Boot timeout {boot_timeout_ms} ms")
     pw.dlog(f"Active NVM: {active_nvm}")
-        pw.dlog(
-            f"BP0 State {bp_0_state} | BP1 State {bp_1_state} | BP2 State {bp_2_state}"
-        )
+    pw.dlog(f"BP0 State {bp_0_state} | BP1 State {bp_1_state} | BP2 State {bp_2_state}")
     pw.dlog(f"Boot State {boot_state} | Boot Cycles {boot_cycles}")
     FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], 10)
-    else:
-        pw.dlog(f"PLOC SUPV: HK handling not implemented for set ID {set_id}")
-        pw.dlog(f"Raw Data: 0x[{hk_data.hex(sep=',')}]")
+
+
+def handle_adc_report(hk_data: bytes):
+    if len(hk_data) < 64:
+        _LOGGER.warning("ADC report smaller than 64 bytes")
+    current_idx = 0
+    adc_raw = []
+    adc_eng = []
+    for _ in range(16):
+        adc_raw.append(struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0])
+        current_idx += 2
+    for _ in range(16):
+        adc_eng.append(struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0])
+        current_idx += 2
+
+    print(f"{'Index'.ljust(10)} | {'ADC RAW'.ljust(10)} | {'ADC ENG'.ljust(10)}")
+    for i in range(16):
+        print(f"{i: >10} | {adc_raw[i]: >10} | {adc_eng[i]: >10}")
+
+
+def handle_counters_report(hk_data: bytes):
+    current_idx = 0
+    signature = struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+    current_idx += 4
+    latchup_counters = []
+    for _ in range(7):
+        latchup_counters.append(
+            struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+        )
+        current_idx += 4
+    fmt_str = "!IIIIIIIIIIIIIIIIIIII"
+    inc_len = struct.calcsize(fmt_str)
+    (
+        adc_deviation_triggers_cnt,
+        tc_received_cnt,
+        tm_available_cnt,
+        supervisor_boots,
+        mpsoc_boots,
+        mpsoc_boot_failed_attempts,
+        mpsoc_powerup,
+        mpsoc_updates,
+        mpsoc_heartbeat_resets,
+        cpu_wdt_resets,
+        ps_heartbeats_lost,
+        pl_heartbeats_lost,
+        eb_task_lost,
+        bm_task_lost,
+        lm_task_lost,
+        am_task_lost,
+        tctmm_task_lost,
+        mm_task_lost,
+        hk_task_lost,
+        dl_task_lost,
+    ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    _redwire_tasks_lost = []
+    for _ in range(3):
+        _redwire_tasks_lost.append(
+            struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+        )
+    print(f"Signature: {signature}")
+    print(f"Latchup Counters: {latchup_counters}")
+    print(f"ADC Deviation Triggers Count: {adc_deviation_triggers_cnt}")
+    print(f"TCs received: {tc_received_cnt} | TMs Available: {tm_available_cnt}")
+    print(f"Supervisor Boots: {supervisor_boots} | MPSoC boots: {mpsoc_boots}")
+    print(f"MPSoC boot failed attempts: {mpsoc_boot_failed_attempts}")
+    print(f"MPSoC powerup: {mpsoc_powerup}")
+    print(f"MPSoC updates: {mpsoc_updates}")
+    print(f"MPSoC heartbeat resets: {mpsoc_heartbeat_resets}")
+    print(f"CPU WDT resets: {cpu_wdt_resets}")
+    print(f"PS heartbeats lost: {ps_heartbeats_lost}")
+    print(f"PL heartbeats lost: {pl_heartbeats_lost}")
+    print(f"EB task lost: {eb_task_lost}")
+    print(f"BM task lost: {bm_task_lost}")
+    print(f"LM task lost: {lm_task_lost}")
+    print(f"AM task lost: {am_task_lost}")
+    print(f"TCTMM task lost: {tctmm_task_lost}")
+    print(f"MM task lost: {mm_task_lost}")
+    print(f"HK task lost: {hk_task_lost}")
+    print(f"DL task lost: {dl_task_lost}")

eive_tmtc/tmtc/power/p60dock.py

@@ -28,10 +28,12 @@ from tmtccmd.util import ObjectIdU32
 
 
 class P60OpCode:
-    STACK_3V3_ON = ["stack_3v3_on", "1"]
-    STACK_3V3_OFF = ["stack_3v3_off", "2"]
-    STACK_5V_ON = ["stack_5v_on", "3"]
-    STACK_5V_OFF = ["stack_5v_off", "4"]
+    STACK_3V3_ON = "stack_3v3_on"
+    STACK_3V3_OFF = "stack_3v3_off"
+    STACK_5V_ON = "stack_5v_on"
+    STACK_5V_OFF = "stack_5v_off"
+    ACU_OFF = "acu_off"
+    ACU_ON = "acu_on"
     TEST = ["test", "0"]
 
 

eive_tmtc/tmtc/tm_store.py

@@ -3,6 +3,7 @@ import enum
 import logging
 import math
 import struct
+from typing import Tuple
 
 from eive_tmtc.config.object_ids import (
     HK_TM_STORE,
@@ -19,20 +20,25 @@ from tmtccmd.tmtc import service_provider
 from tmtccmd.tmtc.decorator import ServiceProviderParams
 from dateutil.parser import parse
 
-from spacepackets.ecss import PusService  # noqa
 from spacepackets.ecss.tc import PusTelecommand
 from spacepackets.ecss.pus_15_tm_storage import Subservice
 from tmtccmd.util import ObjectIdU32
 
 
+class CustomSubservice(enum.IntEnum):
+    DELETE_BY_TIME_RANGE = 128
+
+
 class OpCode:
     RETRIEVAL_BY_TIME_RANGE = "retrieval_time_range"
     DELETE_UP_TO = "delete_up_to"
+    DELETE_BY_TIME_RANGE = "delete_time_range"
 
 
 class Info:
     RETRIEVAL_BY_TIME_RANGE = "Dump Telemetry Packets by time range"
     DELETE_UP_TO = "Delete Telemetry Packets up to time"
+    DELETE_BY_TIME_RANGE = "Delete Telemetry by time range"
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -43,7 +49,7 @@ def pack_tm_store_commands(p: ServiceProviderParams):
     q = p.queue_helper
     o = p.op_code
     if o == OpCode.DELETE_UP_TO:
-        obj_id, store_string = store_select_prompt()
+        obj_id, _ = store_select_prompt()
         app_data = bytearray(obj_id.as_bytes)
         delete_up_to_time = time_prompt("Determining deletion end time")
         end_stamp = int(math.floor(delete_up_to_time.timestamp()))
@@ -58,7 +64,7 @@ def pack_tm_store_commands(p: ServiceProviderParams):
         )
     elif o == OpCode.RETRIEVAL_BY_TIME_RANGE:
         q.add_log_cmd(Info.RETRIEVAL_BY_TIME_RANGE)
-        obj_id, store_string = store_select_prompt()
+        obj_id, _ = store_select_prompt()
         app_data = bytearray(obj_id.as_bytes)
         start_of_dump_time = time_prompt("Determining retrieval start time")
         start_stamp = int(math.floor(start_of_dump_time.timestamp()))
@@ -78,6 +84,28 @@ def pack_tm_store_commands(p: ServiceProviderParams):
                 app_data=app_data,
             )
         )
+    elif o == OpCode.DELETE_BY_TIME_RANGE:
+        q.add_log_cmd(Info.DELETE_BY_TIME_RANGE)
+        obj_id, _ = store_select_prompt()
+        app_data = bytearray(obj_id.as_bytes)
+        start_of_dump_time = time_prompt("Determining deletion start time")
+        start_stamp = int(math.floor(start_of_dump_time.timestamp()))
+        end_of_dump_time = time_prompt("Determining deletion end time")
+        end_stamp = int(math.floor(end_of_dump_time.timestamp()))
+        app_data.extend(struct.pack("!I", start_stamp))
+        app_data.extend(struct.pack("!I", end_stamp))
+        q.add_log_cmd(Info.DELETE_BY_TIME_RANGE)
+        q.add_log_cmd(f"Selected Store: {obj_id}")
+        q.add_log_cmd(
+            f"Deletion from time {start_of_dump_time} up to time {end_of_dump_time}"
+        )
+        q.add_pus_tc(
+            PusTelecommand(
+                service=15,
+                subservice=CustomSubservice.DELETE_BY_TIME_RANGE,
+                app_data=app_data,
+            )
+        )
 
 
 @tmtc_definitions_provider
@@ -85,6 +113,7 @@ def add_persistent_tm_store_cmd_defs(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(keys=OpCode.DELETE_UP_TO, info=Info.DELETE_UP_TO)
     oce.add(keys=OpCode.RETRIEVAL_BY_TIME_RANGE, info=Info.RETRIEVAL_BY_TIME_RANGE)
+    oce.add(keys=OpCode.DELETE_BY_TIME_RANGE, info=Info.DELETE_BY_TIME_RANGE)
     defs.add_service(
         CustomServiceList.TM_STORE, "Persistent TM Store", op_code_entry=oce
     )
@@ -130,6 +159,8 @@ def time_prompt(info_str: str) -> datetime.datetime:
         return time_prompt_fully_manually()
     elif time_input_key == 2:
         return time_prompt_offset_from_now()
+    else:
+        raise ValueError()
 
 
 def time_prompt_fully_manually() -> datetime.datetime:
@@ -160,7 +191,7 @@ def time_prompt_offset_from_now() -> datetime.datetime:
     return time_now_with_offset
 
 
-def store_select_prompt() -> (ObjectIdU32, str):
+def store_select_prompt() -> Tuple[ObjectIdU32, str]:
     obj_id_dict = get_object_ids()
     print("Available TM stores:")
     for k, v in STORE_DICT.items():