eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc

Browse Source
This commit is contained in:
Robin Müller 2023-01-11 14:17:02 +01:00
commit efa778c0e8
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,6 +11,8 @@ list yields a list of all related PRs for each release.
# [unreleased] # [unreleased]
- Handle ACS CTRL HK sets - Handle ACS CTRL HK sets
- Add reboot commands for PCDU modules
- Extend MPSoC commands
# [v2.0.2] 01.12.2022 # [v2.0.2] 01.12.2022

13
eive_tmtc/tmtc/payload/ploc_mpsoc.py
View File

@ -38,12 +38,15 @@ mpsoc_file_dict = {
"2": ["0:/flash", "0:/flash"], "2": ["0:/flash", "0:/flash"],
} }
sequence_file_dict = { SEQ_FILE_NAMES = ["0:/EM16/231", "0:/EQ04/E-75", "0:/EQ01/E130"]
SEQ_FILE_DICT = {
MANUAL_INPUT: ["manual input", ""], MANUAL_INPUT: ["manual input", ""],
"2": ["0:/EM16/231", "0:/EM16/231"], "2": [f"16QRM On Carrier 200 MBd ({SEQ_FILE_NAMES[0]})", f"{SEQ_FILE_NAMES[0]}"],
"3": ["0:/EQ04/E-75", "0:/EQ04/E-75"], "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]}"]
} }
CARRIAGE_RETURN = 0xD CARRIAGE_RETURN = 0xD
@ -344,10 +347,10 @@ def get_mpsoc_file() -> str:
def get_sequence_file() -> str: def get_sequence_file() -> str:
LOGGER.info("Specify sequence file") LOGGER.info("Specify sequence file")
input_helper = InputHelper(sequence_file_dict) input_helper = InputHelper(SEQ_FILE_DICT)
key = input_helper.get_key() key = input_helper.get_key()
if key == MANUAL_INPUT: if key == MANUAL_INPUT:
file = input("Ploc MPSoC: Specify absolute name file: ") file = input("Ploc MPSoC: Specify absolute name file: ")
else: else:
file = sequence_file_dict[key][1] file = SEQ_FILE_DICT[key][1]
return file return file

8
eive_tmtc/tmtc/power/common_power.py
View File

@ -10,6 +10,7 @@ from eive_tmtc.gomspace.gomspace_common import (
pack_request_config_command, pack_request_config_command,
pack_gnd_wdt_reset_command, pack_gnd_wdt_reset_command,
ParamTypes, ParamTypes,
pack_reboot_command,
) )
from eive_tmtc.gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST from eive_tmtc.gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST
from spacepackets.ecss import PusTelecommand from spacepackets.ecss import PusTelecommand
@ -33,6 +34,7 @@ class GomspaceOpCodes:
RESET_GND_WATCHDOG = ["reset_gnd_wdt"] RESET_GND_WATCHDOG = ["reset_gnd_wdt"]
SAVE_TABLE_DEFAULT = ["save_table_default"] SAVE_TABLE_DEFAULT = ["save_table_default"]
LOAD_TABLE = ["load_table"] LOAD_TABLE = ["load_table"]
REBOOT = ["reboot"]
REQUEST_CONFIG_TABLE = ["cfg_table"] REQUEST_CONFIG_TABLE = ["cfg_table"]
@ -44,6 +46,7 @@ class GsInfo:
SAVE_TABLE = "Save table non-volatile (file)" SAVE_TABLE = "Save table non-volatile (file)"
SAVE_TABLE_DEFAULT = "Save table non-volatile (default)" SAVE_TABLE_DEFAULT = "Save table non-volatile (default)"
LOAD_TABLE = "Load Table" LOAD_TABLE = "Load Table"
REBOOT = "Reboot PCDU module"
class PowerInfo: class PowerInfo:
@ -96,6 +99,7 @@ class PowerOpCodes:
PL_CAM_ON = ["cam_on"] PL_CAM_ON = ["cam_on"]
PL_CAM_OFF = ["cam_off"] PL_CAM_OFF = ["cam_off"]
REBOOT = ["reboot"]
INFO_CORE = ["info"] INFO_CORE = ["info"]
ENABLE_INFO_HK = ["info_hk_on"] ENABLE_INFO_HK = ["info_hk_on"]
DISABLE_INFO_HK = ["info_hk_off"] 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 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: if op_code in PowerOpCodes.PRINT_LATCHUPS:
q.add_log_cmd(f"{prefix}: {PowerInfo.PRINT_LATCHUPS}") q.add_log_cmd(f"{prefix}: {PowerInfo.PRINT_LATCHUPS}")
q.add_pus_tc( 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=PowerOpCodes.PRINT_LATCHUPS, info=PowerInfo.PRINT_LATCHUPS)
oce.add(keys=GomspaceOpCodes.GET_PARAM, info=GsInfo.GET_PARAMETER) 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.SET_INTEGER_PARAM, info=GsInfo.SET_PARAMETER)
oce.add(keys=GomspaceOpCodes.REQUEST_CONFIG_TABLE, info=GsInfo.REQUEST_CONFIG_TABLE) oce.add(keys=GomspaceOpCodes.REQUEST_CONFIG_TABLE, info=GsInfo.REQUEST_CONFIG_TABLE)
oce.add(keys=GomspaceOpCodes.SAVE_TABLE, info=GsInfo.SAVE_TABLE) oce.add(keys=GomspaceOpCodes.SAVE_TABLE, info=GsInfo.SAVE_TABLE)