improve supv reset cmd

Reviewed-on: #245
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -10,6 +10,12 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [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

eive_tmtc/config/events.csv

@@ -313,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/objects.csv

@@ -158,6 +158,7 @@
 0x73000102;CFDP_TM_FUNNEL
 0x73000205;CFDP_HANDLER
 0x73000206;CFDP_DISTRIBUTOR
+0x73000207;CFDP_FAULT_HANDLER
 0x73010000;EIVE_SYSTEM
 0x73010001;ACS_SUBSYSTEM
 0x73010002;PL_SUBSYSTEM

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

@@ -67,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
 

eive_tmtc/pus_tm/hk_handler.py

@@ -6,7 +6,7 @@ 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

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -151,6 +151,7 @@ class OpCodes:
     PERFORM_UPDATE = ["update"]
     FACTORY_RESET = ["factory_reset"]
     MEM_CHECK = ["mem_check"]
+    RESET_MPSOC = "reset_mpsoc"
 
 
 class Info(str, enum.Enum):
@@ -168,6 +169,7 @@ class Info(str, enum.Enum):
     REQ_BOOT_STATUS_REPORT = "Request boot status report and HK"
     MEM_CHECK = "Memory Check"
     SEL_NVM = "Select NVM"
+    RESET_MPSOC = "Reset MPSoC"
 
 
 @tmtc_definitions_provider
@@ -183,8 +185,8 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     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("8", "PLOC Supervisor: Set max restart tries")
-    oce.add("9", "PLOC Supervisor: Reset MPSoC")
     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)
@@ -268,7 +270,6 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):  # noqa C901
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code in OpCodes.FACTORY_RESET:
         q.add_log_cmd(f"{prefix}: {Info.FACTORY_RESET}")
-        key = -1
         while True:
             print("Please select the key for a factory reset operation")
             for key, val in FACTORY_RESET_OPS.items():
@@ -293,8 +294,8 @@ 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 == "9":
-        q.add_log_cmd("PLOC Supervisor: Reset MPSoC")
+    if op_code == OpCodes.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:

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/power/__init__.py

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

eive_tmtc/tmtc/power/pwr_ctrl.py

@@ -78,7 +78,7 @@ class Info:
 
 
 @tmtc_definitions_provider
-def acs_cmd_defs(defs: TmtcDefinitionWrapper):
+def pwr_cmd_defs(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(keys=OpCodes.OFF, info=Info.OFF)
     oce.add(keys=OpCodes.ON, info=Info.ON)

pyproject.toml

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