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

MPSoC and Supervisor TCs #58

Merged
muellerr merged 9 commits from meier/ploc into develop 2022-04-22 11:12:03 +02:00
Conversation 0 Commits 9 Files Changed 7 +2 -9
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit edee0c1aa3 - Show all commits

1
config/objects.csv
View File

@ -37,7 +37,6 @@
0x44260000;BPX_BATT_HANDLER 0x44260000;BPX_BATT_HANDLER
0x44300000;PLPCDU_HANDLER 0x44300000;PLPCDU_HANDLER
0x443200A5;RAD_SENSOR 0x443200A5;RAD_SENSOR
0x44330000;PLOC_UPDATER
0x44330001;PLOC_MEMORY_DUMPER 0x44330001;PLOC_MEMORY_DUMPER
0x44330002;STR_HELPER 0x44330002;STR_HELPER
0x44330003;PLOC_MPSOC_HELPER 0x44330003;PLOC_MPSOC_HELPER

1 0x00005060 P60DOCK_TEST_TASK
37 0x44260000 BPX_BATT_HANDLER
38 0x44300000 PLPCDU_HANDLER
39 0x443200A5 RAD_SENSOR
0x44330000 PLOC_UPDATER
40 0x44330001 PLOC_MEMORY_DUMPER
41 0x44330002 STR_HELPER
42 0x44330003 PLOC_MPSOC_HELPER

1
pus_tc/cmd_definitions.py
View File

@ -545,7 +545,6 @@ def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT):
"PLOC Supervisor: Enable/Disable NVM0/1/3", "PLOC Supervisor: Enable/Disable NVM0/1/3",
{OpCodeDictKeys.TIMEOUT: 2.0}, {OpCodeDictKeys.TIMEOUT: 2.0},
), ),
"29": ("PLOC Supervisor: Select NVM", {OpCodeDictKeys.TIMEOUT: 2.0}),
"30": ("PLOC Supervisor: Run auto EM tests", {OpCodeDictKeys.TIMEOUT: 2.0}), "30": ("PLOC Supervisor: Run auto EM tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
"31": ("PLOC Supervisor: MRAM Wipe", {OpCodeDictKeys.TIMEOUT: 2.0}), "31": ("PLOC Supervisor: MRAM Wipe", {OpCodeDictKeys.TIMEOUT: 2.0}),
"33": ("PLOC Supervisor: Print CPU stats", {OpCodeDictKeys.TIMEOUT: 2.0}), "33": ("PLOC Supervisor: Print CPU stats", {OpCodeDictKeys.TIMEOUT: 2.0}),

9
pus_tc/devs/ploc_supervisor.py
View File

@ -163,7 +163,7 @@ def pack_ploc_supv_commands(
tc_queue.appendleft(command.pack_command_tuple()) tc_queue.appendleft(command.pack_command_tuple())
elif op_code == "8": elif op_code == "8":
tc_queue.appendleft( tc_queue.appendleft(
(QueueCommands.PRINT, "PLOC Supervisor: Set max restart tries") (QueueCommands.PRINT, "PLOC Supervisor: Set max restart tries: ")
) )
restart_tries = int(input("Set maximum restart tries:")) restart_tries = int(input("Set maximum restart tries:"))
command = ( command = (
@ -304,11 +304,6 @@ def pack_ploc_supv_commands(
command = pack_enable_nvms_cmd(object_id) command = pack_enable_nvms_cmd(object_id)
command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command) command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
tc_queue.appendleft(command.pack_command_tuple()) tc_queue.appendleft(command.pack_command_tuple())
elif op_code == "29":
tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Select NVM"))
command = pack_select_nvm_cmd(object_id)
command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
tc_queue.appendleft(command.pack_command_tuple())
elif op_code == "30": elif op_code == "30":
tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Run auto EM tests")) tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Run auto EM tests"))
command = pack_auto_em_tests_cmd(object_id) command = pack_auto_em_tests_cmd(object_id)
@ -721,7 +716,7 @@ def pack_update_command(object_id: bytearray) -> bytearray:
command += struct.pack('!I', SupvActionIds.PERFORM_UPDATE) command += struct.pack('!I', SupvActionIds.PERFORM_UPDATE)
command += bytearray(update_file, 'utf-8') command += bytearray(update_file, 'utf-8')
# Adding null terminator # Adding null terminator
command += bytes(0) command += struct.pack('!B', 0)
command += struct.pack('!B', memory_id) command += struct.pack('!B', memory_id)
command += struct.pack('!I', start_address) command += struct.pack('!I', start_address)
return command return command