diff --git a/config/objects.csv b/config/objects.csv index a19c8e7..98b1453 100644 --- a/config/objects.csv +++ b/config/objects.csv @@ -37,7 +37,6 @@ 0x44260000;BPX_BATT_HANDLER 0x44300000;PLPCDU_HANDLER 0x443200A5;RAD_SENSOR -0x44330000;PLOC_UPDATER 0x44330001;PLOC_MEMORY_DUMPER 0x44330002;STR_HELPER 0x44330003;PLOC_MPSOC_HELPER diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py index 75bee81..202601f 100644 --- a/pus_tc/cmd_definitions.py +++ b/pus_tc/cmd_definitions.py @@ -545,7 +545,6 @@ def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT): "PLOC Supervisor: Enable/Disable NVM0/1/3", {OpCodeDictKeys.TIMEOUT: 2.0}, ), - "29": ("PLOC Supervisor: Select NVM", {OpCodeDictKeys.TIMEOUT: 2.0}), "30": ("PLOC Supervisor: Run auto EM tests", {OpCodeDictKeys.TIMEOUT: 2.0}), "31": ("PLOC Supervisor: MRAM Wipe", {OpCodeDictKeys.TIMEOUT: 2.0}), "33": ("PLOC Supervisor: Print CPU stats", {OpCodeDictKeys.TIMEOUT: 2.0}), diff --git a/pus_tc/devs/ploc_supervisor.py b/pus_tc/devs/ploc_supervisor.py index 54af08d..aa7a5e2 100644 --- a/pus_tc/devs/ploc_supervisor.py +++ b/pus_tc/devs/ploc_supervisor.py @@ -163,7 +163,7 @@ def pack_ploc_supv_commands( tc_queue.appendleft(command.pack_command_tuple()) elif op_code == "8": 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:")) command = ( @@ -304,11 +304,6 @@ def pack_ploc_supv_commands( command = pack_enable_nvms_cmd(object_id) command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command) 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": tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Run auto EM tests")) 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 += bytearray(update_file, 'utf-8') # Adding null terminator - command += bytes(0) + command += struct.pack('!B', 0) command += struct.pack('!B', memory_id) command += struct.pack('!I', start_address) return command