From ee2c4bb4c3bfbc722d1744cb028b556e38e94507 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 14:03:10 +0100 Subject: [PATCH 1/5] add reboot cmds for PCDU modules --- eive_tmtc/tmtc/power/common_power.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eive_tmtc/tmtc/power/common_power.py b/eive_tmtc/tmtc/power/common_power.py index 021a86c..224b7f9 100644 --- a/eive_tmtc/tmtc/power/common_power.py +++ b/eive_tmtc/tmtc/power/common_power.py @@ -10,6 +10,7 @@ from eive_tmtc.gomspace.gomspace_common import ( pack_request_config_command, pack_gnd_wdt_reset_command, ParamTypes, + pack_reboot_command, ) from eive_tmtc.gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST from spacepackets.ecss import PusTelecommand @@ -33,6 +34,7 @@ class GomspaceOpCodes: RESET_GND_WATCHDOG = ["reset_gnd_wdt"] SAVE_TABLE_DEFAULT = ["save_table_default"] LOAD_TABLE = ["load_table"] + REBOOT = ["reboot"] REQUEST_CONFIG_TABLE = ["cfg_table"] @@ -44,6 +46,7 @@ class GsInfo: SAVE_TABLE = "Save table non-volatile (file)" SAVE_TABLE_DEFAULT = "Save table non-volatile (default)" LOAD_TABLE = "Load Table" + REBOOT = "Reboot PCDU module" class PowerInfo: @@ -96,6 +99,7 @@ class PowerOpCodes: PL_CAM_ON = ["cam_on"] PL_CAM_OFF = ["cam_off"] + REBOOT = ["reboot"] INFO_CORE = ["info"] ENABLE_INFO_HK = ["info_hk_on"] DISABLE_INFO_HK = ["info_hk_off"] @@ -143,6 +147,9 @@ def pack_common_gomspace_cmds( object_id=objb, action_id=GomspaceDeviceActionIds.PRINT_SWITCH_V_I ) ) + if op_code in PowerOpCodes.REBOOT: + q.add_log_cmd(f"{prefix}: {GsInfo.REBOOT}") + q.add_pus_tc(pack_reboot_command(object_id)) if op_code in PowerOpCodes.PRINT_LATCHUPS: q.add_log_cmd(f"{prefix}: {PowerInfo.PRINT_LATCHUPS}") q.add_pus_tc( @@ -306,6 +313,7 @@ def add_gomspace_cmd_defs(oce: OpCodeEntry): ) oce.add(keys=PowerOpCodes.PRINT_LATCHUPS, info=PowerInfo.PRINT_LATCHUPS) oce.add(keys=GomspaceOpCodes.GET_PARAM, info=GsInfo.GET_PARAMETER) + oce.add(keys=GomspaceOpCodes.REBOOT, info=GsInfo.REBOOT) oce.add(keys=GomspaceOpCodes.SET_INTEGER_PARAM, info=GsInfo.SET_PARAMETER) oce.add(keys=GomspaceOpCodes.REQUEST_CONFIG_TABLE, info=GsInfo.REQUEST_CONFIG_TABLE) oce.add(keys=GomspaceOpCodes.SAVE_TABLE, info=GsInfo.SAVE_TABLE) From dcd881bc1426370d0c410a6bfd60e2e5b5358f7d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 14:03:32 +0100 Subject: [PATCH 2/5] bump changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e50a8b9..c697139 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ list yields a list of all related PRs for each release. # [unreleased] - Handle ACS CTRL HK sets +- Add reboot commands for PCDU modules # [v2.0.2] 01.12.2022 From 40831064d6a00680d76a24e430a99b7c9bf38192 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 15:27:45 +0100 Subject: [PATCH 3/5] update seq file dict --- eive_tmtc/tmtc/payload/ploc_mpsoc.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eive_tmtc/tmtc/payload/ploc_mpsoc.py b/eive_tmtc/tmtc/payload/ploc_mpsoc.py index 3e1710b..586f8ec 100644 --- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py +++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py @@ -38,12 +38,14 @@ mpsoc_file_dict = { "2": ["0:/flash", "0:/flash"], } -sequence_file_dict = { +SEQ_FILE_DICT = { MANUAL_INPUT: ["manual input", ""], - "2": ["0:/EM16/231", "0:/EM16/231"], - "3": ["0:/EQ04/E-75", "0:/EQ04/E-75"], + "2": ["16QRM On Carrier 200 MBd", "0:/EM16/231"], + "3": ["QPSK On Carrier 780 MBd", "0:/EQ04/E-75"], + "4": ["Maximum Bandwidth QPSK", "0:/EQ01/E130"] } + CARRIAGE_RETURN = 0xD @@ -344,10 +346,10 @@ def get_mpsoc_file() -> str: def get_sequence_file() -> str: LOGGER.info("Specify sequence file") - input_helper = InputHelper(sequence_file_dict) + input_helper = InputHelper(SEQ_FILE_DICT) key = input_helper.get_key() if key == MANUAL_INPUT: file = input("Ploc MPSoC: Specify absolute name file: ") else: - file = sequence_file_dict[key][1] + file = SEQ_FILE_DICT[key][1] return file From ef6a1bb263c16436f914bf7fbcfe74551dfdad42 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 15:37:15 +0100 Subject: [PATCH 4/5] make it easier to add seq files --- eive_tmtc/tmtc/payload/ploc_mpsoc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eive_tmtc/tmtc/payload/ploc_mpsoc.py b/eive_tmtc/tmtc/payload/ploc_mpsoc.py index 586f8ec..f7bb14c 100644 --- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py +++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py @@ -38,11 +38,12 @@ mpsoc_file_dict = { "2": ["0:/flash", "0:/flash"], } +SEQ_FILE_NAMES = ["0:/EM16/231", "0:/EQ04/E-75", "0:/EQ01/E130"] SEQ_FILE_DICT = { MANUAL_INPUT: ["manual input", ""], - "2": ["16QRM On Carrier 200 MBd", "0:/EM16/231"], - "3": ["QPSK On Carrier 780 MBd", "0:/EQ04/E-75"], - "4": ["Maximum Bandwidth QPSK", "0:/EQ01/E130"] + "2": [f"16QRM On Carrier 200 MBd ({SEQ_FILE_NAMES[0]})", f"{SEQ_FILE_NAMES[0]}"], + "3": [f"QPSK On Carrier 780 MBd ({SEQ_FILE_NAMES[1]})", f"{SEQ_FILE_NAMES[1]}"], + "4": [f"Maximum Bandwidth QPSK ({SEQ_FILE_NAMES[2]})", f"{SEQ_FILE_NAMES[2]}"] } From b032defa7c6450cbbf21ffe8cfc50f6d5d5bc614 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 10 Jan 2023 15:39:55 +0100 Subject: [PATCH 5/5] bump changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c697139..8c62b2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ list yields a list of all related PRs for each release. - Handle ACS CTRL HK sets - Add reboot commands for PCDU modules +- Extend MPSoC commands # [v2.0.2] 01.12.2022