re-generate event list

Reviewed-on: #62

.gitignore

@@ -1,10 +1,8 @@
 __pycache__
+/.idea
+/venv
+
 log
 /gps_log.txt
-
-.idea/*
-!.idea/runConfigurations
-
-*.json
-
-/venv
+/config/*.json
+tmtc_conf.json

config/events.csv

@@ -111,9 +111,14 @@
 12002;0x2ee2;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
 12003;0x2ee3;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report;linux/devices/ploc/PlocSupervisorHandler.h
 12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/devices/ploc/PlocSupervisorHandler.h
 12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
 12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
+12200;0x2fa8;UPDATE_FILE_NOT_EXISTS;LOW;;linux/devices/ploc/PlocUpdater.h
+12201;0x2fa9;ACTION_COMMANDING_FAILED;LOW;Failed to send command to supervisor handler P1: Return value of CommandActionHelper::commandAction P2: Action ID of command to send;linux/devices/ploc/PlocUpdater.h
+12202;0x2faa;UPDATE_AVAILABLE_FAILED;LOW;Supervisor handler replied action message indicating a command execution failure of the update available command;linux/devices/ploc/PlocUpdater.h
+12203;0x2fab;UPDATE_TRANSFER_FAILED;LOW;Supervisor handler failed to transfer an update space packet. P1: Parameter holds the number of update packets already sent (inclusive the failed packet);linux/devices/ploc/PlocUpdater.h
+12204;0x2fac;UPDATE_VERIFY_FAILED;LOW;Supervisor failed to execute the update verify command.;linux/devices/ploc/PlocUpdater.h
+12205;0x2fad;UPDATE_FINISHED;INFO;MPSoC update successful completed;linux/devices/ploc/PlocUpdater.h
 12300;0x300c;SEND_MRAM_DUMP_FAILED;LOW;Failed to send mram dump command to supervisor handler P1: Return value of commandAction function P2: Start address of MRAM to dump with this command;linux/devices/ploc/PlocMemoryDumper.h
 12301;0x300d;MRAM_DUMP_FAILED;LOW;Received completion failure report form PLOC supervisor handler P1: MRAM start address of failing dump command;linux/devices/ploc/PlocMemoryDumper.h
 12302;0x300e;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
@@ -140,15 +145,15 @@
 12516;0x30e4;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
 12600;0x3138;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
 12601;0x3139;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
-12602;0x313a;MPSOC_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
+12602;0x313a;SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
 12603;0x313b;MPSOC_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
 12604;0x313c;MPSOC_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12605;0x313d;MPSOC_MISSING_ACK;LOW;Did not receive acknowledgment report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12606;0x313e;MPSOC_MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
-12607;0x313f;MPSOC_ACK_FAILURE_REPORT;LOW;Received acknowledgment failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12608;0x3140;MPSOC_EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12609;0x3141;MPSOC_ACK_INVALID_APID;LOW;Expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
-12610;0x3142;MPSOC_EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12605;0x313d;MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12606;0x313e;MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12607;0x313f;ACK_FAILURE_REPORT;LOW;Received acknowledgement failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12608;0x3140;EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12609;0x3141;ACK_INVALID_APID;LOW;Expected acknowledgement report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12610;0x3142;EXE_INVALID_APID;LOW;Expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
 12611;0x3143;MPSOC_HELPER_SEQ_CNT_MISMATCH;LOW;Received sequence count does not match expected sequence count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHelper.h
 12700;0x319c;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
 12701;0x319d;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
@@ -175,20 +180,7 @@
 13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
 13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
 13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
-13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvHelper.h
-13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvHelper.h
-13602;0x3522;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvHelper.h
-13603;0x3523;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvHelper.h
-13604;0x3524;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvHelper.h
-13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvHelper.h
-13606;0x3526;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13607;0x3527;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13608;0x3528;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13609;0x3529;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvHelper.h
-13610;0x352a;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13611;0x352b;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13612;0x352c;SUPV_EXE_FAILURE_REPORT;LOW;Supervisor received execution failure report P1: Internal state of supervisor;linux/devices/ploc/PlocSupvHelper.h
-13613;0x352d;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13614;0x352e;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13615;0x352f;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvHelper.h
-13616;0x3530;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvHelper.h
+13600;0x3520;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
+13601;0x3521;REBOOT_SW;MEDIUM; Software reboot occured. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+13602;0x3522;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
+13603;0x3523;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h

pus_tc/cmd_definitions.py

@@ -602,10 +602,6 @@ def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT):
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
         "27": ("PLOC Supervisor: Copy ADC data to MRAM", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "28": (
-            "PLOC Supervisor: Enable/Disable NVM0/1/3",
-            {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}),
@@ -625,21 +621,39 @@ def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT):
             "PLOC Supervisor: Factory reset clear circular entries",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "42": ("PLOC Supervisor: Perform update", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "43": ("PLOC Supervisor: Terminate supervisor process", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "43": (
+            "PLOC Supervisor: Terminate supervisor process",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "44": ("PLOC Supervisor: Start MPSoC quiet", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "45": ("PLOC Supervisor: Set shutdown timeout", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "46": ("PLOC Supervisor: Factory flash", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "47": ("PLOC Supervisor: Enable auto TM", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "48": ("PLOC Supervisor: Disable auto TM", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "49": ("PLOC Supervisor: Enable ADC monitor task", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "50": ("PLOC Supervisor: Disable ADC monitor task", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "51": ("PLOC Supervisor: Logging request event buffers", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "52": ("PLOC Supervisor: Logging clear counters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "49": (
+            "PLOC Supervisor: Enable ADC monitor task",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "50": (
+            "PLOC Supervisor: Disable ADC monitor task",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "51": (
+            "PLOC Supervisor: Logging request event buffers",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "52": (
+            "PLOC Supervisor: Logging clear counters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "53": ("PLOC Supervisor: Logging set topic", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "54": ("PLOC Supervisor: Logging request counters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "54": (
+            "PLOC Supervisor: Logging request counters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "55": ("PLOC Supervisor: Request ADC Report", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "56": ("PLOC Supervisor: Reset PL", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
 

pus_tc/devs/ploc_mpsoc.py

@@ -172,7 +172,11 @@ def pack_ploc_mpsoc_commands(
     elif op_code == "16":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Tc cam command send"))
         cam_cmd = input("Specify cam command string: ")
-        command = object_id + struct.pack("!I", CommandIds.TC_CAM_CMD_SEND) + bytearray(cam_cmd, 'utf-8')
+        command = (
+            object_id
+            + struct.pack("!I", CommandIds.TC_CAM_CMD_SEND)
+            + bytearray(cam_cmd, "utf-8")
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 

pus_tc/devs/ploc_supervisor.py

@@ -32,6 +32,8 @@ MANUAL_INPUT = "1"
 update_file_dict = {
     MANUAL_INPUT: ["manual input", ""],
     "2": ["/mnt/sd0/ploc/supervisor/update.bin", "/mnt/sd0/ploc/supervisor/update.bin"],
+    "3": ["/mnt/sd0/ploc/supervisor/update-large.bin", "/mnt/sd0/ploc/supervisor/update-large.bin"],
+    "4": ["/mnt/sd0/ploc/supervisor/update-small.bin", "/mnt/sd0/ploc/supervisor/update-small.bin"],
 }
 
 event_buffer_path_dict = {
@@ -95,6 +97,7 @@ class SupvActionIds:
     LOGGING_CLEAR_COUNTERS = 55
     LOGGING_SET_TOPIC = 56
     REQUEST_ADC_REPORT = 57
+    RESET_PL = 58
 
 
 class SupvHkIds:
@@ -150,10 +153,10 @@ def pack_ploc_supv_commands(
         tc_queue.appendleft(
             (QueueCommands.PRINT, "PLOC Supervisor: Select MPSoC boot image")
         )
-        mem = int(input("MEM (NVM0 - 0 or NVM1 - 1):"))
-        bp0 = int(input("BP0 (0 or 1):"))
-        bp1 = int(input("BP1 (0 or 1):"))
-        bp2 = int(input("BP2 (0 or 1):"))
+        mem = int(input("MEM (NVM0 - 0 or NVM1 - 1): "))
+        bp0 = int(input("BP0 (0 or 1): "))
+        bp1 = int(input("BP1 (0 or 1): "))
+        bp2 = int(input("BP2 (0 or 1): "))
         command = pack_sel_boot_image_cmd(object_id, mem, bp0, bp1, bp2)
         command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -293,13 +296,6 @@ def pack_ploc_supv_commands(
         command = object_id + struct.pack("!I", SupvActionIds.COPY_ADC_DATA_TO_MRAM)
         command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    elif op_code == "28":
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "PLOC Supervisor: Enalbe/Disable NVMs")
-        )
-        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 == "30":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Run auto EM tests"))
         command = pack_auto_em_tests_cmd(object_id)
@@ -354,7 +350,7 @@ def pack_ploc_supv_commands(
         tc_queue.appendleft(
             (QueueCommands.PRINT, "PLOC Supervisor: Factory reset clear mirror entries")
         )
-        command = command = object_id + struct.pack(
+        command = object_id + struct.pack(
             "!I", SupvActionIds.FACTORY_RESET_CLEAR_MIRROR
         )
         command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
@@ -371,82 +367,71 @@ def pack_ploc_supv_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=55, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    elif op_code == "41":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: CAN loopback test"))
-        command = command = object_id + struct.pack(
-            "!I", SupvActionIds.CAN_LOOPBACK_TEST
-        )
-        command = PusTelecommand(service=8, subservice=128, ssc=56, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "42":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Perform update"))
         command = pack_update_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=57, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "43":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Terminate supervisor process"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.TERMINATE_SUPV_HELPER
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Terminate supervisor process")
         )
+        command = object_id + struct.pack("!I", SupvActionIds.TERMINATE_SUPV_HELPER)
         command = PusTelecommand(service=8, subservice=128, ssc=58, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "44":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Start MPSoC quiet"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.START_MPSOC_QUIET
-        )
+        command = object_id + struct.pack("!I", SupvActionIds.START_MPSOC_QUIET)
         command = PusTelecommand(service=8, subservice=128, ssc=59, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "45":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Set shutdown timeout"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Set shutdown timeout")
+        )
         command = pack_set_shutdown_timeout_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=60, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "46":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Factory flash"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.FACTORY_FLASH
-        )
+        command = object_id + struct.pack("!I", SupvActionIds.FACTORY_FLASH)
         command = PusTelecommand(service=8, subservice=128, ssc=61, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "47":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Enable auto TM"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.ENABLE_AUTO_TM
-        )
+        command = object_id + struct.pack("!I", SupvActionIds.ENABLE_AUTO_TM)
         command = PusTelecommand(service=8, subservice=128, ssc=62, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "48":
         tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Disable auto TM"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.DISABLE_AUTO_TM
-        )
+        command = object_id + struct.pack("!I", SupvActionIds.DISABLE_AUTO_TM)
         command = PusTelecommand(service=8, subservice=128, ssc=63, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "49":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Enable ADC monitor task"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.ENABLE_ADC_MONITOR_TASK
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Enable ADC monitor task")
         )
+        command = object_id + struct.pack("!I", SupvActionIds.ENABLE_ADC_MONITOR_TASK)
         command = PusTelecommand(service=8, subservice=128, ssc=64, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "50":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Disable ADC monitor task"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.DISABLE_ADC_MONITOR_TASK
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Disable ADC monitor task")
         )
+        command = object_id + struct.pack("!I", SupvActionIds.DISABLE_ADC_MONITOR_TASK)
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "51":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging request event buffers"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Logging request event buffers")
+        )
         command = pack_logging_buffer_request(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=66, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "52":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging clear counters"))
-        command = object_id + struct.pack(
-            "!I", SupvActionIds.LOGGING_CLEAR_COUNTERS
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Logging clear counters")
         )
+        command = object_id + struct.pack("!I", SupvActionIds.LOGGING_CLEAR_COUNTERS)
         command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "53":
@@ -455,15 +440,24 @@ def pack_ploc_supv_commands(
         command = PusTelecommand(service=8, subservice=128, ssc=68, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "54":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging request counters"))
-        command = object_id + struct.pack('!I', SupvActionIds.LOGGING_REQUEST_COUNTERS)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Logging request counters")
+        )
+        command = object_id + struct.pack("!I", SupvActionIds.LOGGING_REQUEST_COUNTERS)
         command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     elif op_code == "55":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Request ADC report"))
-        command = object_id + struct.pack('!I', SupvActionIds.REQUEST_ADC_REPORT)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PLOC Supervisor: Request ADC report")
+        )
+        command = object_id + struct.pack("!I", SupvActionIds.REQUEST_ADC_REPORT)
         command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
+    elif op_code == "56":
+        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Reset PL"))
+        command = object_id + struct.pack('!I', SupvActionIds.RESET_PL)
+        command = PusTelecommand(service=8, subservice=128, ssc=71, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
 
@@ -478,7 +472,6 @@ def pack_sel_boot_image_cmd(
     @param bp1  Partition pin 1
     @param bp2  Partition pin 2
     """
-    command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.SEL_MPSOC_BOOT_IMAGE)
     command = command + struct.pack("!B", mem)
     command = command + struct.pack("!B", bp0)
@@ -497,7 +490,6 @@ def pack_update_available_cmd(object_id: bytearray) -> bytearray:
     image_size = 222
     image_crc = 0x0
     number_of_packets = 150
-    command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.UPDATE_AVAILABLE)
     command = command + struct.pack("!B", image_select)
     command = command + struct.pack("!B", image_partition)
@@ -631,7 +623,7 @@ def pack_set_adc_enabled_channels_cmd(object_id: bytearray) -> bytearray:
     @brief  This function packs the command to enable or disable channels of the ADC.
     @param object_id    The object id of the PLOC supervisor handler.
     """
-    ch = int(input("Specify ch:"))
+    ch = int(input("Specify ch: 0x"), 16)
     command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.SET_ADC_ENABLED_CHANNELS)
     command = command + struct.pack("!H", ch)
@@ -649,7 +641,7 @@ def pack_set_adc_window_and_stride_cmd(object_id: bytearray) -> bytearray:
 
 
 def pack_set_adc_threshold_cmd(object_id: bytearray) -> bytearray:
-    threshold = int(input("Specify threshold:"))
+    threshold = int(input("Specify threshold: "))
     command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.SET_ADC_THRESHOLD)
     command = command + struct.pack("!I", threshold)
@@ -714,30 +706,30 @@ def pack_update_command(object_id: bytearray) -> bytearray:
     start_address = int(input("Specify start address: 0x"), 16)
     update_file = get_update_file()
     command += object_id
-    command += struct.pack('!I', SupvActionIds.PERFORM_UPDATE)
-    command += bytearray(update_file, 'utf-8')
+    command += struct.pack("!I", SupvActionIds.PERFORM_UPDATE)
+    command += bytearray(update_file, "utf-8")
     # Adding null terminator
-    command += struct.pack('!B', 0)
-    command += struct.pack('!B', memory_id)
-    command += struct.pack('!I', start_address)
+    command += struct.pack("!B", 0)
+    command += struct.pack("!B", memory_id)
+    command += struct.pack("!I", start_address)
     return command
 
 
 def pack_set_shutdown_timeout_command(object_id: bytearray) -> bytearray:
     command = bytearray()
     command += object_id
-    command += struct.pack('!I', SupvActionIds.SET_SHUTDOWN_TIMEOUT)
+    command += struct.pack("!I", SupvActionIds.SET_SHUTDOWN_TIMEOUT)
     timeout = int(input("Specify shutdown timeout (ms): "))
-    command += struct.pack('!I', timeout)
+    command += struct.pack("!I", timeout)
     return command
 
 
 def pack_logging_buffer_request(object_id: bytearray) -> bytearray:
     command = bytearray()
     command += object_id
-    command += struct.pack('!I', SupvActionIds.LOGGING_REQUEST_EVENT_BUFFERS)
+    command += struct.pack("!I", SupvActionIds.LOGGING_REQUEST_EVENT_BUFFERS)
     path = get_event_buffer_path()
-    command += bytearray(path, 'utf-8')
+    command += bytearray(path, "utf-8")
     return command
 
 
@@ -767,10 +759,9 @@ def get_debug_verbosity() -> int:
 
 
 def pack_set_gpio_cmd(object_id: bytearray) -> bytearray:
-    port = int(input("Specify port: "))
-    pin = int(input("Specify pin: "))
-    val = int(input("Specify val: "))
-    command = bytearray()
+    port = int(input("Specify port : 0x"), 16)
+    pin = int(input("Specify pin: 0x"), 16)
+    val = int(input("Specify val: 0x"), 16)
     command = object_id + struct.pack("!I", SupvActionIds.SET_GPIO)
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
@@ -779,9 +770,8 @@ def pack_set_gpio_cmd(object_id: bytearray) -> bytearray:
 
 
 def pack_read_gpio_cmd(object_id: bytearray) -> bytearray:
-    port = int(input("Specify port: "))
-    pin = int(input("Specify pin: "))
-    command = bytearray()
+    port = int(input("Specify port: 0x"), 16)
+    pin = int(input("Specify pin: 0x"), 16)
     command = object_id + struct.pack("!I", SupvActionIds.READ_GPIO)
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
@@ -789,9 +779,9 @@ def pack_read_gpio_cmd(object_id: bytearray) -> bytearray:
 
 
 def pack_logging_set_topic(objetc_id: bytearray) -> bytearray:
-    command = objetc_id + struct.pack('!I', SupvActionIds.LOGGING_SET_TOPIC)
+    command = objetc_id + struct.pack("!I", SupvActionIds.LOGGING_SET_TOPIC)
     tpc = int(input("Specify logging topic: "))
-    command += struct.pack('!B', tpc)
+    command += struct.pack("!B", tpc)
     return command
 
 

pus_tc/devs/rws.py

@@ -0,0 +1,16 @@
+from config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID
+
+
+class SetIds:
+    TEMP_SET = 8
+    STATUS = 4
+    LAST_RESET = 2
+    TM_SET = 9
+
+
+class Info:
+    pass
+
+
+def pack_rw_cmds(op_code: str):
+    pass

pus_tc/devs/syrlinks_hk_handler.py

@@ -64,17 +64,17 @@ def pack_syrlinks_command(
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "3":
         tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode standby"))
-        command = object_id + struct.pack('!I', CommandIds.SET_TX_MODE_STANDBY)
+        command = object_id + struct.pack("!I", CommandIds.SET_TX_MODE_STANDBY)
         command = PusTelecommand(service=8, subservice=128, ssc=10, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "4":
         tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode modulation"))
-        command = object_id + struct.pack('!I', CommandIds.SET_TX_MODE_MODULATION)
+        command = object_id + struct.pack("!I", CommandIds.SET_TX_MODE_MODULATION)
         command = PusTelecommand(service=8, subservice=128, ssc=11, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "5":
         tc_queue.appendleft((QueueCommands.PRINT, "syrlinks: Set TX mode CW"))
-        command = object_id + struct.pack('!I', CommandIds.SET_TX_MODE_CW)
+        command = object_id + struct.pack("!I", CommandIds.SET_TX_MODE_CW)
         command = PusTelecommand(service=8, subservice=128, ssc=12, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "6":
@@ -89,26 +89,26 @@ def pack_syrlinks_command(
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "8":
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Read TX status"))
-        command = object_id + struct.pack('!I', CommandIds.READ_TX_STATUS)
+        command = object_id + struct.pack("!I", CommandIds.READ_TX_STATUS)
         command = PusTelecommand(service=8, subservice=128, ssc=13, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "9":
         tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Read TX waveform"))
-        command = object_id + struct.pack('!I', CommandIds.READ_TX_WAVEFORM)
+        command = object_id + struct.pack("!I", CommandIds.READ_TX_WAVEFORM)
         command = PusTelecommand(service=8, subservice=128, ssc=14, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "10":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Syrlinks: Read TX AGC value high byte")
         )
-        command = object_id + struct.pack('!I', CommandIds.READ_TX_AGC_VALUE_HIGH_BYTE)
+        command = object_id + struct.pack("!I", CommandIds.READ_TX_AGC_VALUE_HIGH_BYTE)
         command = PusTelecommand(service=8, subservice=128, ssc=15, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "11":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Syrlinks: Read TX AGC value low byte")
         )
-        command = object_id + struct.pack('!I', CommandIds.READ_TX_AGC_VALUE_LOW_BYTE)
+        command = object_id + struct.pack("!I", CommandIds.READ_TX_AGC_VALUE_LOW_BYTE)
         command = PusTelecommand(service=8, subservice=128, ssc=16, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "12":

pus_tc/tc_packer_hook.py

@@ -40,6 +40,7 @@ from pus_tc.system.time import pack_set_current_time_ascii_command
 from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
 from pus_tc.devs.plpcdu import pack_pl_pcdu_commands
 from pus_tc.devs.str_img_helper import pack_str_img_helper_command
+from pus_tc.devs.rws import pack_rw_cmds
 from pus_tc.system.tcs import pack_tcs_sys_commands
 from config.definitions import CustomServiceList
 from config.object_ids import (
@@ -233,6 +234,13 @@ def pack_service_queue_user(
         return pack_tcs_sys_commands(tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.TIME.value:
         return pack_set_current_time_ascii_command(tc_queue=service_queue, ssc=0)
+    if service in [
+        CustomServiceList.REACTION_WHEEL_1,
+        CustomServiceList.REACTION_WHEEL_2,
+        CustomServiceList.REACTION_WHEEL_3,
+        CustomServiceList.REACTION_WHEEL_4,
+    ]:
+        return pack_rw_cmds(op_code=op_code)
     LOGGER.warning("Invalid Service !")
 
 

pus_tm/action_reply_handler.py

@@ -20,7 +20,7 @@ def handle_action_reply(
     """
     tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm)
     printer.handle_long_tm_print(packet_if=tm_packet, info_if=tm_packet)
-    object_id = obj_id_dict.get(tm_packet.source_object_id)
+    object_id = obj_id_dict.get(tm_packet.source_object_id_as_bytes)
     custom_data = tm_packet.custom_data
     action_id = tm_packet.action_id
     generic_print_str = printer.generic_action_packet_tm_print(
@@ -28,13 +28,13 @@ def handle_action_reply(
     )
     print(generic_print_str)
     printer.file_logger.info(generic_print_str)
-    if object_id == IMTQ_HANDLER_ID:
+    if object_id.as_bytes == IMTQ_HANDLER_ID:
         return handle_imtq_replies(action_id, printer, custom_data)
-    elif object_id == PLOC_MPSOC_ID:
+    elif object_id.as_bytes == PLOC_MPSOC_ID:
         return handle_ploc_replies(action_id, printer, custom_data)
-    elif object_id == PLOC_SUPV_ID:
+    elif object_id.as_bytes == PLOC_SUPV_ID:
         return handle_supervisor_replies(action_id, printer, custom_data)
-    elif object_id == STAR_TRACKER_ID:
+    elif object_id.as_bytes == STAR_TRACKER_ID:
         return handle_startracker_replies(action_id, printer, custom_data)
 
 

pus_tm/hk_handling.py

@@ -55,40 +55,42 @@ def handle_regular_hk_print(
     hk_packet: Service3Base,
     hk_data: bytes,
 ):
-    object_id = object_id.as_bytes
+    objb = object_id.as_bytes
     set_id = hk_packet.set_id
     """This function is called when a Service 3 Housekeeping packet is received."""
-    if object_id == obj_ids.SYRLINKS_HANDLER_ID:
+    if object_id in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:
+        handle_rw_hk_data(printer, object_id, set_id, hk_data)
+    if objb == obj_ids.SYRLINKS_HANDLER_ID:
         if set_id == SetIds.RX_REGISTERS_DATASET:
             return handle_syrlinks_rx_registers_dataset(printer, hk_data)
         elif set_id == SetIds.TX_REGISTERS_DATASET:
             return handle_syrlinks_tx_registers_dataset(printer, hk_data)
         else:
             LOGGER.info("Service 3 TM: Syrlinks handler reply with unknown set id")
-    elif object_id == obj_ids.IMTQ_HANDLER_ID:
+    if objb == obj_ids.IMTQ_HANDLER_ID:
         if (set_id >= ImtqSetIds.POSITIVE_X_TEST) and (
             set_id <= ImtqSetIds.NEGATIVE_Z_TEST
         ):
             return handle_self_test_data(printer, hk_data)
         else:
             LOGGER.info("Service 3 TM: Syrlinks handler reply with unknown set id")
-    elif object_id == obj_ids.GPS_HANDLER_0_ID or object_id == obj_ids.GPS_HANDLER_1_ID:
+    if objb == obj_ids.GPS_HANDLER_0_ID or object_id == obj_ids.GPS_HANDLER_1_ID:
         handle_gps_data(printer=printer, hk_data=hk_data)
-    elif object_id == obj_ids.BPX_HANDLER_ID:
+    if objb == obj_ids.BPX_HANDLER_ID:
         handle_bpx_hk_data(hk_data=hk_data, set_id=set_id, printer=printer)
-    elif object_id == obj_ids.CORE_CONTROLLER_ID:
+    if objb == obj_ids.CORE_CONTROLLER_ID:
         return handle_core_hk_data(printer=printer, hk_data=hk_data)
-    elif object_id == obj_ids.PDU_1_HANDLER_ID:
+    if objb == obj_ids.PDU_1_HANDLER_ID:
         return handle_pdu_data(
             printer=printer, pdu_idx=1, set_id=set_id, hk_data=hk_data
         )
-    elif object_id == obj_ids.PDU_2_HANDLER_ID:
+    if objb == obj_ids.PDU_2_HANDLER_ID:
         return handle_pdu_data(
             printer=printer, pdu_idx=2, set_id=set_id, hk_data=hk_data
         )
-    elif object_id == obj_ids.P60_DOCK_HANDLER:
+    if objb == obj_ids.P60_DOCK_HANDLER:
         handle_p60_hk_data(printer=printer, set_id=set_id, hk_data=hk_data)
-    elif object_id == obj_ids.PL_PCDU_ID:
+    if objb == obj_ids.PL_PCDU_ID:
         log_to_both(printer, "Received PL PCDU HK data")
     else:
         LOGGER.info("Service 3 TM: Parsing for this SID has not been implemented.")
@@ -702,6 +704,91 @@ def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         )
 
 
+def handle_rw_hk_data(
+    printer: FsfwTmTcPrinter, object_id: ObjectId, set_id: int, hk_data: bytes
+):
+    from pus_tc.devs.rws import SetIds
+
+    current_idx = 0
+    if set_id == SetIds.TEMP_SET:
+        log_to_both(
+            printer,
+            f"Received Temperature HK (ID {set_id}) from Reaction Wheel {object_id.name}",
+        )
+        temp = struct.unpack("!I", hk_data[0:4])
+        log_to_both(printer, f"Temperature {temp}")
+        current_idx += 4
+    if set_id == SetIds.STATUS:
+        log_to_both(
+            printer,
+            f"Received Status HK (ID {set_id}) from Reaction Wheel {object_id.name}",
+        )
+        fmt_str = "!iiBB"
+        inc_len = struct.calcsize(fmt_str)
+        (speed, ref_speed, state, clc_mode) = struct.unpack(
+            fmt_str, hk_data[current_idx : current_idx + inc_len]
+        )
+        current_idx += inc_len
+        log_to_both(
+            printer,
+            f"Speed {speed} rpm | Reference Speed {ref_speed} rpm | State {state} | CLC Mode {clc_mode}",
+        )
+    if set_id == SetIds.LAST_RESET:
+        log_to_both(
+            printer,
+            f"Received Last Reset HK (ID {set_id}) from Reaction Wheel {object_id.name}",
+        )
+        fmt_str = "!BB"
+        inc_len = struct.calcsize(fmt_str)
+        (last_reset_status, curr_reset_status) = struct.unpack(
+            fmt_str, hk_data[current_idx : current_idx + inc_len]
+        )
+        current_idx += inc_len
+        log_to_both(
+            printer,
+            f"Last Reset Status {last_reset_status} | Current Reset Status {curr_reset_status}",
+        )
+    if set_id == SetIds.TM_SET:
+        log_to_both(
+            printer,
+            f"Received TM HK (ID {set_id}) from Reaction Wheel {object_id.name}",
+        )
+        fmt_str = "!BiffBBiiIIIIIIIIIIIIIIII"
+        inc_len = struct.calcsize(fmt_str)
+        (
+            last_reset_status,
+            mcu_temp,
+            pressure_sens_temp,
+            pressure,
+            state,
+            clc_mode,
+            current_speed,
+            ref_speed,
+            num_invalid_crc_packets,
+            num_invalid_len_packets,
+            num_invalid_cmd_packets,
+            num_of_cmd_executed_requests,
+            num_of_cmd_replies,
+            uart_num_of_bytes_written,
+            uart_num_of_bytes_read,
+            uart_num_parity_errors,
+            uart_num_noise_errors,
+            uart_num_frame_errors,
+            uart_num_reg_overrun_errors,
+            uart_total_num_errors,
+            spi_num_bytes_written,
+            spi_num_bytes_read,
+            spi_num_reg_overrun_errors,
+            spi_total_num_errors,
+        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+        pass
+    if current_idx > 0:
+        printer.print_validity_buffer(
+            validity_buffer=hk_data[current_idx:], num_vars=27
+        )
+    pass
+
+
 def log_to_both(printer: FsfwTmTcPrinter, string: str):
     print(string)
     printer.file_logger.info(string)