Merge pull request 'v1.9.0' (#53) from develop into master

Reviewed-on: #53

.gitignore

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

.idea/runConfigurations/PLOC_SUPV.xml

@@ -13,7 +13,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s ploc_supv -t 6" />
+    <option name="PARAMETERS" value="-s ploc_supv -l -t 6" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />

config/definitions.py

@@ -45,4 +45,3 @@ class CustomServiceList(enum.Enum):
     ACS_ASS = "acs-ass"
     SUS_ASS = "sus-ass"
     TCS_ASS = "tcs-ass"
-    TIME = "time"

config/events.csv

@@ -77,112 +77,104 @@
 8901;0x22c5;CLOCK_SET_FAILURE;LOW;;fsfw/src/fsfw/pus/Service9TimeManagement.h
 9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h
 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/hal/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
-11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
-11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
-11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-11303;0x2c27;FDIR_REACTION_IGNORED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
-11400;0x2c88;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
-11401;0x2c89;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
-11402;0x2c8a;HEATER_WENT_ON;INFO;;mission/devices/HeaterHandler.h
-11403;0x2c8b;HEATER_WENT_OFF;INFO;;mission/devices/HeaterHandler.h
-11404;0x2c8c;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
-11405;0x2c8d;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
-11406;0x2c8e;MAIN_SWITCH_TIMEOUT;MEDIUM;;mission/devices/HeaterHandler.h
-11500;0x2cec;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11501;0x2ced;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
-11502;0x2cee;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11503;0x2cef;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11504;0x2cf0;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
-11601;0x2d51;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
-11602;0x2d52;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
-11603;0x2d53;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
-11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
-11605;0x2d55;MPSOC_HANDLER_SEQ_CNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h
-11606;0x2d56;MPSOC_SHUTDOWN_FAILED;HIGH;Supervisor fails to shutdown MPSoC. Requires to power off the PLOC and thus also to shutdown the supervisor.;linux/devices/ploc/PlocMPSoCHandler.h
-11701;0x2db5;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11702;0x2db6;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11703;0x2db7;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11704;0x2db8;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11705;0x2db9;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11706;0x2dba;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11707;0x2dbb;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
-11708;0x2dbc;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
-11801;0x2e19;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/RwHandler.h
-11901;0x2e7d;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
-11902;0x2e7e;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
-12001;0x2ee1;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
-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
-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
-12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
-12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
-12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
-12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
-12500;0x30d4;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
-12501;0x30d5;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
-12502;0x30d6;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
-12503;0x30d7;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
-12504;0x30d8;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
-12505;0x30d9;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
-12506;0x30da;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
-12507;0x30db;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
-12508;0x30dc;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
-12509;0x30dd;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12510;0x30de;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
-12511;0x30df;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
-12512;0x30e0;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
-12513;0x30e1;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
-12514;0x30e2;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
-12515;0x30e3;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
-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;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;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
-12702;0x319e;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12703;0x319f;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12704;0x31a0;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12705;0x31a1;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12706;0x31a2;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12707;0x31a3;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12708;0x31a4;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
-12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
-12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
-12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
-12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
-13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.h
-13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
-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
+10800;0x2a30;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
+10801;0x2a31;SWITCH_HAS_CHANGED;INFO;Indicated that a swithc state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
+10802;0x2a32;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
+10900;0x2a94;GPIO_PULL_HIGH_FAILED;LOW;;mission/devices/HeaterHandler.h
+10901;0x2a95;GPIO_PULL_LOW_FAILED;LOW;;mission/devices/HeaterHandler.h
+10902;0x2a96;SWITCH_ALREADY_ON;LOW;;mission/devices/HeaterHandler.h
+10903;0x2a97;SWITCH_ALREADY_OFF;LOW;;mission/devices/HeaterHandler.h
+10904;0x2a98;MAIN_SWITCH_TIMEOUT;LOW;;mission/devices/HeaterHandler.h
+11000;0x2af8;MAIN_SWITCH_ON_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11001;0x2af9;MAIN_SWITCH_OFF_TIMEOUT;LOW;;mission/devices/SolarArrayDeploymentHandler.h
+11002;0x2afa;DEPLOYMENT_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11003;0x2afb;DEPL_SA1_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11004;0x2afc;DEPL_SA2_GPIO_SWTICH_ON_FAILED;HIGH;;mission/devices/SolarArrayDeploymentHandler.h
+11101;0x2b5d;MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC crc failure in telemetry packet;linux/devices/ploc/PlocMPSoCHandler.h
+11102;0x2b5e;ACK_FAILURE;LOW;PLOC receive acknowledgment failure report P1: Command Id which leads the acknowledgment failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
+11103;0x2b5f;EXE_FAILURE;LOW;PLOC receive execution failure report P1: Command Id which leads the execution failure report P2: The status field inserted by the MPSoC into the data field;linux/devices/ploc/PlocMPSoCHandler.h
+11104;0x2b60;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
+11105;0x2b61;MPSOC_HANDLER_SEQ_CNT_MISMATCH;LOW;Packet sequence count in received space packet does not match expected count P1: Expected sequence count P2: Received sequence count;linux/devices/ploc/PlocMPSoCHandler.h
+11201;0x2bc1;SELF_TEST_I2C_FAILURE;LOW;Get self test result returns I2C failure P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11202;0x2bc2;SELF_TEST_SPI_FAILURE;LOW;Get self test result returns SPI failure. This concerns the MTM connectivity. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11203;0x2bc3;SELF_TEST_ADC_FAILURE;LOW;Get self test result returns failure in measurement of current and temperature. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11204;0x2bc4;SELF_TEST_PWM_FAILURE;LOW;Get self test result returns PWM failure which concerns the coil actuation. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11205;0x2bc5;SELF_TEST_TC_FAILURE;LOW;Get self test result returns TC failure (system failure) P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11206;0x2bc6;SELF_TEST_MTM_RANGE_FAILURE;LOW;Get self test result returns failure that MTM values were outside of the expected range. P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11207;0x2bc7;SELF_TEST_COIL_CURRENT_FAILURE;LOW;Get self test result returns failure indicating that the coil current was outside of the expected range P1: Indicates on which axis the failure occurred. 0 -> INIT, 1 -> +X, 2 -> -X, 3 -> +Y, 4 -> -Y, 5 -> +Z, 6 -> -Z, 7 -> FINA;mission/devices/IMTQHandler.h
+11208;0x2bc8;INVALID_ERROR_BYTE;LOW;Received invalid error byte. This indicates an error of the communication link between IMTQ and OBC.;mission/devices/IMTQHandler.h
+11301;0x2c25;ERROR_STATE;HIGH;Reaction wheel signals an error state;mission/devices/RwHandler.h
+11401;0x2c89;BOOTING_FIRMWARE_FAILED;LOW;Failed to boot firmware;linux/devices/startracker/StarTrackerHandler.h
+11402;0x2c8a;BOOTING_BOOTLOADER_FAILED;LOW;Failed to boot star tracker into bootloader mode;linux/devices/startracker/StarTrackerHandler.h
+11501;0x2ced;SUPV_MEMORY_READ_RPT_CRC_FAILURE;LOW;PLOC supervisor crc failure in telemetry packet;linux/devices/ploc/PlocSupervisorHandler.h
+11502;0x2cee;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
+11503;0x2cef;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report;linux/devices/ploc/PlocSupervisorHandler.h
+11504;0x2cf0;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
+11600;0x2d50;SANITIZATION_FAILED;LOW;;bsp_q7s/memory/SdCardManager.h
+11601;0x2d51;MOUNTED_SD_CARD;INFO;;bsp_q7s/memory/SdCardManager.h
+11700;0x2db4;UPDATE_FILE_NOT_EXISTS;LOW;;linux/devices/ploc/PlocUpdater.h
+11701;0x2db5;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
+11702;0x2db6;UPDATE_AVAILABLE_FAILED;LOW;Supervisor handler replied action message indicating a command execution failure of the update available command;linux/devices/ploc/PlocUpdater.h
+11703;0x2db7;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
+11704;0x2db8;UPDATE_VERIFY_FAILED;LOW;Supervisor failed to execute the update verify command.;linux/devices/ploc/PlocUpdater.h
+11705;0x2db9;UPDATE_FINISHED;INFO;MPSoC update successful completed;linux/devices/ploc/PlocUpdater.h
+11800;0x2e18;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
+11801;0x2e19;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
+11802;0x2e1a;MRAM_DUMP_FINISHED;LOW;MRAM dump finished successfully;linux/devices/ploc/PlocMemoryDumper.h
+11901;0x2e7d;INVALID_TC_FRAME;HIGH;;linux/obc/PdecHandler.h
+11902;0x2e7e;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/obc/PdecHandler.h
+11903;0x2e7f;CARRIER_LOCK;INFO;Carrier lock detected;linux/obc/PdecHandler.h
+11904;0x2e80;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/obc/PdecHandler.h
+12000;0x2ee0;IMAGE_UPLOAD_FAILED;LOW;Image upload failed;linux/devices/startracker/StrHelper.h
+12001;0x2ee1;IMAGE_DOWNLOAD_FAILED;LOW;Image download failed;linux/devices/startracker/StrHelper.h
+12002;0x2ee2;IMAGE_UPLOAD_SUCCESSFUL;LOW;Uploading image to star tracker was successfulop;linux/devices/startracker/StrHelper.h
+12003;0x2ee3;IMAGE_DOWNLOAD_SUCCESSFUL;LOW;Image download was successful;linux/devices/startracker/StrHelper.h
+12004;0x2ee4;FLASH_WRITE_SUCCESSFUL;LOW;Finished flash write procedure successfully;linux/devices/startracker/StrHelper.h
+12005;0x2ee5;FLASH_READ_SUCCESSFUL;LOW;Finished flash read procedure successfully;linux/devices/startracker/StrHelper.h
+12006;0x2ee6;FLASH_READ_FAILED;LOW;Flash read procedure failed;linux/devices/startracker/StrHelper.h
+12007;0x2ee7;FIRMWARE_UPDATE_SUCCESSFUL;LOW;Firmware update was successful;linux/devices/startracker/StrHelper.h
+12008;0x2ee8;FIRMWARE_UPDATE_FAILED;LOW;Firmware update failed;linux/devices/startracker/StrHelper.h
+12009;0x2ee9;STR_HELPER_READING_REPLY_FAILED;LOW;Failed to read communication interface reply data P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
+12010;0x2eea;STR_HELPER_COM_ERROR;LOW;Unexpected stop of decoding sequence P1: Return code of failed communication interface read call P1: Upload/download position for which the read call failed;linux/devices/startracker/StrHelper.h
+12011;0x2eeb;STR_HELPER_NO_REPLY;LOW;Star tracker did not send replies (maybe device is powered off) P1: Position of upload or download packet for which no reply was sent;linux/devices/startracker/StrHelper.h
+12012;0x2eec;STR_HELPER_DEC_ERROR;LOW;Error during decoding of received reply occurred P1: Return value of decoding function P2: Position of upload/download packet, or address of flash write/read request;linux/devices/startracker/StrHelper.h
+12013;0x2eed;POSITION_MISMATCH;LOW;Position mismatch P1: The expected position and thus the position for which the image upload/download failed;linux/devices/startracker/StrHelper.h
+12014;0x2eee;STR_HELPER_FILE_NOT_EXISTS;LOW;Specified file does not exist P1: Internal state of str helper;linux/devices/startracker/StrHelper.h
+12015;0x2eef;STR_HELPER_SENDING_PACKET_FAILED;LOW;;linux/devices/startracker/StrHelper.h
+12016;0x2ef0;STR_HELPER_REQUESTING_MSG_FAILED;LOW;;linux/devices/startracker/StrHelper.h
+12100;0x2f44;MPSOC_FLASH_WRITE_FAILED;LOW;Flash write fails;linux/devices/ploc/PlocMPSoCHelper.h
+12101;0x2f45;MPSOC_FLASH_WRITE_SUCCESSFUL;LOW;Flash write successful;linux/devices/ploc/PlocMPSoCHelper.h
+12102;0x2f46;SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocMPSoCHelper.h
+12103;0x2f47;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
+12104;0x2f48;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
+12105;0x2f49;MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12106;0x2f4a;MISSING_EXE;LOW;Did not receive execution report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocMPSoCHelper.h
+12107;0x2f4b;ACK_FAILURE_REPORT;LOW;Received acknowledgement failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12108;0x2f4c;EXE_FAILURE_REPORT;LOW;Received execution failure report P1: Internal state of MPSoC;linux/devices/ploc/PlocMPSoCHelper.h
+12109;0x2f4d;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
+12110;0x2f4e;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
+12111;0x2f4f;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
+12200;0x2fa8;TRANSITION_BACK_TO_OFF;MEDIUM;Could not transition properly and went back to ALL OFF;mission/devices/PayloadPcduHandler.h
+12201;0x2fa9;NEG_V_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12202;0x2faa;U_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12203;0x2fab;I_DRO_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12204;0x2fac;U_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12205;0x2fad;I_X8_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12206;0x2fae;U_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12207;0x2faf;I_TX_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12208;0x2fb0;U_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12209;0x2fb1;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12210;0x2fb2;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12211;0x2fb3;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
+12300;0x300c;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
+12301;0x300d;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
+12302;0x300e;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
+12303;0x300f;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
+12400;0x3070;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
+12401;0x3071;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
+12402;0x3072;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
+12403;0x3073;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
+12500;0x30d4;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.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

config/hook_implementations.py

@@ -1,17 +1,23 @@
-from typing import Union
+import argparse
+from typing import Union, Dict
 
 from tmtccmd.config.definitions import (
     ServiceOpCodeDictT,
+    HkReplyUnpacked,
+    DataReplyUnpacked,
 )
+from tmtccmd.tm.service_3_base import Service3Base
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.utility.retval import RetvalDictT
 from tmtccmd.pus.obj_id import ObjectIdDictT
 from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.core.backend import TmTcHandler
 from tmtccmd.config.hook import TmTcHookBase
+from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter
+from tmtccmd.config.globals import OpCodeDictKeys
 
+from config.definitions import CustomServiceList
 from config.retvals import get_retval_dict
-from pus_tc.cmd_definitions import get_eive_service_op_code_dict
 
 
 class EiveHookObject(TmTcHookBase):
@@ -55,3 +61,290 @@ class EiveHookObject(TmTcHookBase):
 
     def get_retval_dict(self) -> RetvalDictT:
         return get_retval_dict()
+
+
+def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
+    from pus_tc.cmd_definitions import (
+        add_bpx_cmd_definitions,
+        add_core_controller_definitions,
+        add_pcdu_cmds,
+        add_pl_pcdu_cmds,
+        add_imtq_cmds,
+        add_rw_cmds,
+        add_rad_sens_cmds,
+        add_ploc_mpsoc_cmds,
+        add_ploc_supv_cmds,
+        add_system_cmds,
+    )
+    from pus_tc.devs.gps import GpsOpCodes
+
+    add_bpx_cmd_definitions(cmd_dict=service_op_code_dict)
+    add_core_controller_definitions(cmd_dict=service_op_code_dict)
+    add_pl_pcdu_cmds(cmd_dict=service_op_code_dict)
+    add_pcdu_cmds(cmd_dict=service_op_code_dict)
+    add_imtq_cmds(cmd_dict=service_op_code_dict)
+    add_rad_sens_cmds(cmd_dict=service_op_code_dict)
+    add_rw_cmds(cmd_dict=service_op_code_dict)
+    add_ploc_mpsoc_cmds(cmd_dict=service_op_code_dict)
+    add_ploc_supv_cmds(cmd_dict=service_op_code_dict)
+    add_system_cmds(cmd_dict=service_op_code_dict)
+
+    op_code_dict = {
+        GpsOpCodes.RESET_GNSS.value: ("Reset GPS", {OpCodeDictKeys.TIMEOUT: 2.0})
+    }
+    service_tuple = ("GPS 0", op_code_dict)
+    service_op_code_dict[CustomServiceList.GPS_0.value] = service_tuple
+    service_op_code_dict[CustomServiceList.GPS_1.value] = service_tuple
+
+    op_code_dict = {
+        "0": ("ACU: Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "51": ("ACU: Print channel statistics", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_tuple = ("ACU Devices", op_code_dict)
+    service_op_code_dict[CustomServiceList.ACU.value] = service_tuple
+
+    op_code_dict = {
+        "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
+    }
+    service_tuple = ("TMP1075 1", op_code_dict)
+    service_op_code_dict[CustomServiceList.TMP1075_1.value] = service_tuple
+    service_tuple = ("TMP1075 2", op_code_dict)
+    service_op_code_dict[CustomServiceList.TMP1075_2.value] = service_tuple
+
+    op_code_dict_srv_heater = {
+        "0": ("Heater Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_heater_tuple = ("Heater Device", op_code_dict_srv_heater)
+
+    op_code_dict_srv_star_tracker = {
+        "0": (
+            "Star Tracker: Mode On, Submode Bootloader",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "1": ("Star Tracker: Mode On, Submode Firmware", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Star Tracker: Mode Normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Star Tracker: Mode Off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Star Tracker: Mode Raw", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": (
+            "Star Tracker: Switch to bootloader program",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "7": ("Star Tracker: Request temperature", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": ("Star Tracker: Request version", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "9": ("Star Tracker: Request interface", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "10": ("Star Tracker: Request power", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "11": (
+            "Star Tracker: Set subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "12": (
+            "Star Tracker: Boot image (requires bootloader mode)",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "13": ("Star Tracker: Request time", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "14": ("Star Tracker: Request solution", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "15": ("Star Tracker: Upload image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "16": ("Star Tracker: Download image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "17": ("Star Tracker: Set limit parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "18": ("Star Tracker: Set tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "19": ("Star Tracker: Set mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "20": ("Star Tracker: Set camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "22": (
+            "Star Tracker: Set centroiding parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "23": ("Star Tracker: Set LISA parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "24": ("Star Tracker: Set matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "25": (
+            "Star Tracker: Set validation parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "26": ("Star Tracker: Set algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "27": ("Star Tracker: Take image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "28": ("Star Tracker: Stop str helper", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "30": (
+            "Star Tracker: Set name of download image",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "31": ("Star Tracker: Request histogram", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "32": ("Star Tracker: Request contrast", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "33": ("Star Tracker: Set json filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "35": ("Star Tracker: Flash read", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "36": ("Star Tracker: Set flash read filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "37": ("Star Tracker: Get checksum", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "49": ("Star Tracker: Request camera parameter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "50": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "51": (
+            "Star Tracker: Set image processor parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "52": (
+            "Star Tracker: (EGSE only) Load camera ground config ",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "53": (
+            "Star Tracker: (EGSE only) Load camera flight config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "54": (
+            "Star Tracker: Request log level parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "55": (
+            "Star Tracker: Request mounting parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "56": (
+            "Star Tracker: Request image processor parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "57": (
+            "Star Tracker: Request centroiding parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "58": ("Star Tracker: Request lisa parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "59": (
+            "Star Tracker: Request matching parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "60": (
+            "Star Tracker: Request tracking parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "61": (
+            "Star Tracker: Request validation parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "62": ("Star Tracker: Request algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "63": (
+            "Star Tracker: Request subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "64": (
+            "Star Tracker: Request log subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "65": (
+            "Star Tracker: Request debug camera parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "66": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "67": (
+            "Star Tracker: Set log subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "68": (
+            "Star Tracker: Set debug camera parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "69": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "70": (
+            "Star Tracker: Disable timestamp generation",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "71": (
+            "Star Tracker: Enable timestamp generation",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+    }
+    service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
+
+    op_code_dict_srv_ccsds_handler = {
+        "0": ("CCSDS Handler: Set low rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("CCSDS Handler: Set high rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("CCSDS Handler: Enable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("CCSDS Handler: Disable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("CCSDS Handler: Set arbitrary bitrate", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": (
+            "CCSDS Handler: Enable tx clock manipulator",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "6": (
+            "CCSDS Handler: Disable tx clock manipulator",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "7": (
+            "CCSDS Handler: Update tx data on rising edge",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "8": (
+            "CCSDS Handler: Update tx data on falling edge",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+    }
+    service_ccsds_handler_tuple = ("CCSDS Handler", op_code_dict_srv_ccsds_handler)
+
+    op_code_dict_srv_pdec_handler = {
+        "0": ("PDEC Handler: Print CLCW", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("PDEC Handler: Print PDEC monitor", {OpCodeDictKeys.TIMEOUT: 2.0}),
+    }
+    service_pdec_handler_tuple = ("PDEC Handler", op_code_dict_srv_pdec_handler)
+
+    op_code_dict_srv_syrlinks_handler = {
+        "0": ("Syrlinks Handler: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("Syrlinks Handler: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Syrlinks Handler: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Syrlinks Handler: Set TX standby", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Syrlinks Handler: Set TX modulation", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Syrlinks Handler: Set TX carrier wave", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": ("Syrlinks Handler: Read TX status", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "7": ("Syrlinks Handler: Read TX waveform", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": (
+            "Syrlinks Handler: Read TX AGC value high byte ",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "9": (
+            "Syrlinks Handler: Read TX AGC value low byte ",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "12": (
+            "Syrlinks Handler: Write LCL config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "13": (
+            "Syrlinks Handler: Read RX status registers",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "14": (
+            "Syrlinks Handler: Read LCL config register",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "15": (
+            "Syrlinks Handler: Set waveform OQPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "16": (
+            "Syrlinks Handler: Set waveform BPSK",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "17": (
+            "Syrlinks Handler: Set second config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "18": (
+            "Syrlinks Handler: Enable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "19": (
+            "Syrlinks Handler: Disable debug output",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+    }
+    service_syrlinks_handler_tuple = (
+        "Syrlinks Handler",
+        op_code_dict_srv_syrlinks_handler,
+    )
+    service_op_code_dict[CustomServiceList.HEATER.value] = service_heater_tuple
+    service_op_code_dict[
+        CustomServiceList.STAR_TRACKER.value
+    ] = service_star_tracker_tuple
+    service_op_code_dict[
+        CustomServiceList.CCSDS_HANDLER.value
+    ] = service_ccsds_handler_tuple
+    service_op_code_dict[
+        CustomServiceList.PDEC_HANDLER.value
+    ] = service_pdec_handler_tuple
+    service_op_code_dict[
+        CustomServiceList.SYRLINKS.value
+    ] = service_syrlinks_handler_tuple

config/object_ids.py

@@ -55,7 +55,7 @@ IMTQ_HANDLER_ID = bytes([0x44, 0x14, 0x00, 0x14])
 PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
 TEST_DEVICE_ID = bytes([0x54, 0x00, 0xAF, 0xFE])
 CCSDS_HANDLER_ID = bytes([0x50, 0x00, 0x08, 0x00])
-PDEC_HANDLER_ID = bytes([0x50, 0x00, 0x07, 0x00])
+PDEC_HANDLER_ID = bytes([0x50, 0x00, 0x07, 0x04])
 
 # Payload Object IDs
 STAR_TRACKER_ID = bytes([0x44, 0x13, 0x00, 0x1])

config/objects.csv

@@ -109,14 +109,6 @@
 0x5400CAFE;DUMMY_INTERFACE
 0x54123456;LIBGPIOD_TEST
 0x54694269;TEST_TASK
-0x60000000;HEATER_0
-0x60000001;HEATER_1
-0x60000002;HEATER_2
-0x60000003;HEATER_3
-0x60000004;HEATER_4
-0x60000005;HEATER_5
-0x60000006;HEATER_6
-0x60000007;HEATER_7
 0x73000001;ACS_BOARD_ASS
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS

config/returnvalues.csv

@@ -60,7 +60,6 @@
 0x4603; HGIO_GpioTypeFailure;;3;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
 0x4604; HGIO_GpioInvalidInstance;;4;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
 0x4605; HGIO_GpioDuplicateDetected;;5;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
-0x4606; HGIO_GpioInitFailed;;6;fsfw/hal/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h;HAL_GPIO
 0x4200; UXOS_ExecutionFinished;Execution of the current command has finished;0;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
 0x4201; UXOS_CommandPending;Command is pending. This will also be returned if the user tries to load another command but a command is still pending;1;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
 0x4202; UXOS_BytesRead;Some bytes have been read from the executing process;2;fsfw/hal/src/fsfw_hal/linux/CommandExecutor.h;LINUX_OSAL
@@ -467,7 +466,6 @@
 0x69a6;MPSOCRTVIF_MpsocHelperExecuting;MPSoC helper is currently executing a command;0xA6;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
 0x69a7;MPSOCRTVIF_MpsocFilenameTooLong;Filename of MPSoC file is to long (max. 256 bytes);0xA7;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
 0x69a8;MPSOCRTVIF_InvalidParameter;Command has invalid parameter;0xA8;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
-0x69a9;MPSOCRTVIF_NameTooLong;Received command has file string with invalid length;0xA9;linux/devices/devicedefinitions/MPSoCReturnValuesIF.h;MPSOC_RETURN_VALUES_IF
 0x57e0;DWLPWRON_InvalidMode;Received command has invalid JESD mode (valid modes are 0 - 5);0xE0;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
 0x57e1;DWLPWRON_InvalidLaneRate;Received command has invalid lane rate (valid lane rate are 0 - 9);0xE1;linux/devices/devicedefinitions/PlocMPSoCDefinitions.h;DWLPWRON_CMD
 0x60a0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;0xA0;linux/devices/ploc/PlocMemoryDumper.h;PLOC_MEMORY_DUMPER
@@ -492,6 +490,7 @@
 0x59ac;PLSV_NoMramPacket;Expect reception of an MRAM dump packet but received space packet with other apid.;0xAC;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
 0x59ad;PLSV_PathDoesNotExist;Path to PLOC directory on SD card does not exist;0xAD;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
 0x59ae;PLSV_MramFileNotExists;MRAM dump file does not exists. The file should actually already have been created with the reception of the first dump packet.;0xAE;linux/devices/ploc/PlocSupervisorHandler.h;PLOC_SUPERVISOR_HANDLER
+0x59d0;PLSV_NameTooLong;Received command has file string with invalid length;0xD0;linux/devices/ploc/PlocMPSoCHandler.h;PLOC_SUPERVISOR_HANDLER
 0x6401;JSONBASE_JsonFileNotExists;Specified json file does not exist;1;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
 0x6402;JSONBASE_SetNotExists;Requested set does not exist in json file;2;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE
 0x6403;JSONBASE_ParamNotExists;Requested parameter does not exist in json file;3;linux/devices/startracker/ArcsecJsonParamBase.h;ARCSEC_JSON_BASE

gomspace/gomspace_common.py

@@ -25,25 +25,16 @@ class GomspaceDeviceActionIds(enum.IntEnum):
 
 class GomspaceOpCodes:
     # Request HK
-    REQUEST_CORE_HK_ONCE = ["hk-core", "128"]
-    REQUEST_AUX_HK_ONCE = ["hk-aux", "129"]
-    PRINT_SWITCH_V_I = ["print-switch-vi", "130"]
-    PRINT_LATCHUPS = ["print-latchups", "131"]
-
-
-class Info:
-    REQUEST_CORE_HK_ONCE = "Requesting Core HK once"
-    REQUEST_AUX_HK_ONCE = "Requesting Aux HK once"
+    REQUEST_HK_ONCE = ["req-hk-once", "128"]
+    PRINT_SWITCH_V_I = ["print-switch-vi", "129"]
+    PRINT_LATCHUPS = ["print-latchups", "130"]
 
 
 class SetIds:
-    PDU_1_CORE = 1
-    PDU_1_AUX = 2
-    PDU_2_CORE = 3
-    PDU_2_AUX = 4
-    P60_CORE = 5
-    P60_AUX = 6
-    ACU = 7
+    PDU_1 = 0x01
+    PDU_2 = 0x02
+    P60_DOCK = 0x03
+    ACU = 0x04
 
 
 class TableIds:

pus_tc/cmd_definitions.py

@@ -1,4 +1,3 @@
-from pus_tc.devs.gps import GpsOpCodes
 from tmtccmd.config import (
     add_op_code_entry,
     add_service_op_code_entry,
@@ -7,282 +6,9 @@ from tmtccmd.config import (
     OpCodeDictKeys,
 )
 from config.definitions import CustomServiceList
-from pus_tc.devs.heater import add_heater_cmds
 from pus_tc.devs.bpx_batt import BpxOpCodes
 
 
-def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
-    add_bpx_cmd_definitions(cmd_dict=service_op_code_dict)
-    add_core_controller_definitions(cmd_dict=service_op_code_dict)
-    add_pl_pcdu_cmds(cmd_dict=service_op_code_dict)
-    add_pcdu_cmds(cmd_dict=service_op_code_dict)
-    add_imtq_cmds(cmd_dict=service_op_code_dict)
-    add_rad_sens_cmds(cmd_dict=service_op_code_dict)
-    add_rw_cmds(cmd_dict=service_op_code_dict)
-    add_ploc_mpsoc_cmds(cmd_dict=service_op_code_dict)
-    add_ploc_supv_cmds(cmd_dict=service_op_code_dict)
-    add_system_cmds(cmd_dict=service_op_code_dict)
-    add_time_cmds(cmd_dict=service_op_code_dict)
-    add_syrlinks_cmds(cmd_dict=service_op_code_dict)
-    add_gps_cmds(cmd_dict=service_op_code_dict)
-    add_str_cmds(cmd_dict=service_op_code_dict)
-    add_ccsds_cmds(cmd_dict=service_op_code_dict)
-    add_pdec_cmds(cmd_dict=service_op_code_dict)
-    add_heater_cmds(cmd_dict=service_op_code_dict)
-    add_tmp_sens_cmds(cmd_dict=service_op_code_dict)
-
-
-def add_tmp_sens_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict = {
-        "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
-    }
-    service_tuple = ("TMP1075 1", op_code_dict)
-    cmd_dict[CustomServiceList.TMP1075_1.value] = service_tuple
-    service_tuple = ("TMP1075 2", op_code_dict)
-    cmd_dict[CustomServiceList.TMP1075_2.value] = service_tuple
-
-
-def add_pdec_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict_srv_pdec_handler = {
-        "0": ("PDEC Handler: Print CLCW", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "1": ("PDEC Handler: Print PDEC monitor", {OpCodeDictKeys.TIMEOUT: 2.0}),
-    }
-    service_pdec_handler_tuple = ("PDEC Handler", op_code_dict_srv_pdec_handler)
-    cmd_dict[CustomServiceList.PDEC_HANDLER.value] = service_pdec_handler_tuple
-
-
-def add_ccsds_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict_srv_ccsds_handler = {
-        "0": ("CCSDS Handler: Set low rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "1": ("CCSDS Handler: Set high rate", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "2": ("CCSDS Handler: Enable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "3": ("CCSDS Handler: Disable transmitter", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "4": ("CCSDS Handler: Set arbitrary bitrate", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "5": (
-            "CCSDS Handler: Enable tx clock manipulator",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "6": (
-            "CCSDS Handler: Disable tx clock manipulator",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "7": (
-            "CCSDS Handler: Update tx data on rising edge",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "8": (
-            "CCSDS Handler: Update tx data on falling edge",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-    }
-    service_ccsds_handler_tuple = ("CCSDS Handler", op_code_dict_srv_ccsds_handler)
-    cmd_dict[CustomServiceList.CCSDS_HANDLER.value] = service_ccsds_handler_tuple
-
-
-def add_gps_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict = {
-        GpsOpCodes.RESET_GNSS.value: ("Reset GPS", {OpCodeDictKeys.TIMEOUT: 2.0})
-    }
-    service_tuple = ("GPS 0", op_code_dict)
-    cmd_dict[CustomServiceList.GPS_0.value] = service_tuple
-    cmd_dict[CustomServiceList.GPS_1.value] = service_tuple
-
-
-def add_str_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict_srv_star_tracker = {
-        "0": (
-            "Star Tracker: Mode On, Submode Bootloader",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "1": ("Star Tracker: Mode On, Submode Firmware", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "2": ("Star Tracker: Mode Normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "3": ("Star Tracker: Mode Off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "4": ("Star Tracker: Mode Raw", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "5": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 5.0}),
-        "6": (
-            "Star Tracker: Switch to bootloader program",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "7": ("Star Tracker: Request temperature", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "8": ("Star Tracker: Request version", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "9": ("Star Tracker: Request interface", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "10": ("Star Tracker: Request power", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "11": (
-            "Star Tracker: Set subscription parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "12": (
-            "Star Tracker: Boot image (requires bootloader mode)",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "13": ("Star Tracker: Request time", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "14": ("Star Tracker: Request solution", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "15": ("Star Tracker: Upload image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "16": ("Star Tracker: Download image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "17": ("Star Tracker: Set limit parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "18": ("Star Tracker: Set tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "19": ("Star Tracker: Set mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "20": ("Star Tracker: Set camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "22": (
-            "Star Tracker: Set centroiding parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "23": ("Star Tracker: Set LISA parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "24": ("Star Tracker: Set matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "25": (
-            "Star Tracker: Set validation parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "26": ("Star Tracker: Set algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "27": ("Star Tracker: Take image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "28": ("Star Tracker: Stop str helper", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "30": (
-            "Star Tracker: Set name of download image",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "31": ("Star Tracker: Request histogram", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "32": ("Star Tracker: Request contrast", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "33": ("Star Tracker: Set json filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "35": ("Star Tracker: Flash read", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "36": ("Star Tracker: Set flash read filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "37": ("Star Tracker: Get checksum", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "49": ("Star Tracker: Request camera parameter", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "50": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "51": (
-            "Star Tracker: Set image processor parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "52": (
-            "Star Tracker: (EGSE only) Load camera ground config ",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "53": (
-            "Star Tracker: (EGSE only) Load camera flight config",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "54": (
-            "Star Tracker: Request log level parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "55": (
-            "Star Tracker: Request mounting parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "56": (
-            "Star Tracker: Request image processor parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "57": (
-            "Star Tracker: Request centroiding parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "58": ("Star Tracker: Request lisa parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "59": (
-            "Star Tracker: Request matching parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "60": (
-            "Star Tracker: Request tracking parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "61": (
-            "Star Tracker: Request validation parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "62": ("Star Tracker: Request algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "63": (
-            "Star Tracker: Request subscription parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "64": (
-            "Star Tracker: Request log subscription parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "65": (
-            "Star Tracker: Request debug camera parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "66": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "67": (
-            "Star Tracker: Set log subscription parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "68": (
-            "Star Tracker: Set debug camera parameters",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "69": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "70": (
-            "Star Tracker: Disable timestamp generation",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "71": (
-            "Star Tracker: Enable timestamp generation",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-    }
-    service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
-    cmd_dict[CustomServiceList.STAR_TRACKER.value] = service_star_tracker_tuple
-
-
-def add_syrlinks_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict_srv_syrlinks_handler = {
-        "0": ("Syrlinks Handler: Set mode off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "1": ("Syrlinks Handler: Set mode on", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "2": ("Syrlinks Handler: Set mode normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "3": ("Syrlinks Handler: Set TX standby", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "4": ("Syrlinks Handler: Set TX modulation", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "5": ("Syrlinks Handler: Set TX carrier wave", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "6": ("Syrlinks Handler: Read TX status", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "7": ("Syrlinks Handler: Read TX waveform", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "8": (
-            "Syrlinks Handler: Read TX AGC value high byte ",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "9": (
-            "Syrlinks Handler: Read TX AGC value low byte ",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "12": (
-            "Syrlinks Handler: Write LCL config",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "13": (
-            "Syrlinks Handler: Read RX status registers",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "14": (
-            "Syrlinks Handler: Read LCL config register",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "15": (
-            "Syrlinks Handler: Set waveform OQPSK",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "16": (
-            "Syrlinks Handler: Set waveform BPSK",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "17": (
-            "Syrlinks Handler: Set second config",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "18": (
-            "Syrlinks Handler: Enable debug output",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "19": (
-            "Syrlinks Handler: Disable debug output",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-    }
-    service_syrlinks_handler_tuple = (
-        "Syrlinks Handler",
-        op_code_dict_srv_syrlinks_handler,
-    )
-    cmd_dict[CustomServiceList.SYRLINKS.value] = service_syrlinks_handler_tuple
-
-
 def add_bpx_cmd_definitions(cmd_dict: ServiceOpCodeDictT):
     op_code_dict = dict()
     add_op_code_entry(
@@ -453,28 +179,10 @@ def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
 
 
-def add_time_cmds(cmd_dict: ServiceOpCodeDictT):
-    from pus_tc.system.time import OpCodes, Info
-
-    op_code_dict = dict()
-    add_op_code_entry(
-        op_code_dict=op_code_dict,
-        keys=OpCodes.SET_CURRENT_TIME,
-        info=Info.SET_CURRENT_TIME,
-    )
-    add_service_op_code_entry(
-        srv_op_code_dict=cmd_dict,
-        name=CustomServiceList.TIME.value,
-        info="Time Service",
-        op_code_entry=op_code_dict,
-    )
-
-
 def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     from pus_tc.devs.p60dock import P60OpCodes, GomspaceOpCodes, Info
     from pus_tc.devs.pdu1 import Pdu1OpCodes
     from pus_tc.devs.pdu2 import Pdu2OpCodes
-    from gomspace.gomspace_common import Info as GsInfo
 
     op_code_dict = dict()
     add_op_code_entry(
@@ -499,13 +207,8 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
-    )
-    add_op_code_entry(
-        op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
+        keys=GomspaceOpCodes.REQUEST_HK_ONCE,
+        info="P60 Dock: Request HK once",
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
@@ -608,13 +311,8 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
-    )
-    add_op_code_entry(
-        op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
+        keys=GomspaceOpCodes.REQUEST_HK_ONCE,
+        info="PDU1: Request HK once",
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
@@ -720,13 +418,8 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.REQUEST_CORE_HK_ONCE,
-        info=GsInfo.REQUEST_CORE_HK_ONCE,
-    )
-    add_op_code_entry(
-        op_code_dict=op_code_dict,
-        keys=GomspaceOpCodes.REQUEST_AUX_HK_ONCE,
-        info=GsInfo.REQUEST_AUX_HK_ONCE,
+        keys=GomspaceOpCodes.REQUEST_HK_ONCE,
+        info="PDU2: Request HK once",
     )
     add_op_code_entry(
         op_code_dict=op_code_dict,
@@ -745,12 +438,6 @@ def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT):
         info="PDU2 Device",
         op_code_entry=op_code_dict,
     )
-    op_code_dict = {
-        "0": ("ACU: Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "51": ("ACU: Print channel statistics", {OpCodeDictKeys.TIMEOUT: 2.0}),
-    }
-    service_tuple = ("ACU Devices", op_code_dict)
-    cmd_dict[CustomServiceList.ACU.value] = service_tuple
 
 
 def add_imtq_cmds(cmd_dict: ServiceOpCodeDictT):
@@ -819,8 +506,6 @@ def add_ploc_mpsoc_cmds(cmd_dict: ServiceOpCodeDictT):
         "12": ("Ploc MPSoC: OBSW reset sequence count", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "13": ("Ploc MPSoC: Read DEADBEEF address", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "14": ("Ploc MPSoC: Mode replay", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "15": ("Ploc MPSoC: Mode idle", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "16": ("Ploc MPSoC: Tc cam command send", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_ploc_mpsoc_tuple = ("Ploc MPSoC", op_code_dict_srv_ploc_mpsoc)
     cmd_dict[CustomServiceList.PLOC_MPSOC.value] = service_ploc_mpsoc_tuple
@@ -882,6 +567,11 @@ 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},
+        ),
+        "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}),
@@ -901,39 +591,7 @@ def add_ploc_supv_cmds(cmd_dict: ServiceOpCodeDictT):
             "PLOC Supervisor: Factory reset clear circular entries",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "42": ("PLOC Supervisor: Perform update", {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},
-        ),
-        "53": ("PLOC Supervisor: Logging set topic", {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}),
+        "41": ("PLOC Supervisor: CAN loopback test", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_ploc_supv_tuple = ("PLOC Supervisor", op_code_dict_srv_ploc_supv)
 

pus_tc/devs/heater.py

@@ -1,103 +1,59 @@
 # -*- coding: utf-8 -*-
-"""Command sequence to test the HeaterHandler
+"""
+@file   tmtcc_tc_heater.py
+@brief  Command sequence to test the HeaterHandler
 @author J. Meier
 @date   30.01.2021
 """
-import enum
-
-from config.definitions import CustomServiceList
-from tmtccmd.config.definitions import QueueCommands, ServiceOpCodeDictT
-from tmtccmd.tc.service_8_functional_cmd import generate_action_command
-from tmtccmd.config.globals import add_service_op_code_entry, add_op_code_entry
+from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
 
 
 class SwitchNumbers:
-    HEATER_0_OBC_BRD = 0
-    HEATER_1_PLOC_PROC_BRD = 1
-    HEATER_2_ACS_BRD = 2
-    HEATER_3_PCDU_PDU = 3
-    HEATER_4_CAMERA = 4
-    HEATER_5_STR = 5
-    HEATER_6_DRO = 6
-    HEATER_7_HPA = 7
+    HEATER_0 = 0
+    HEATER_1 = 1
+    HEATER_2 = 2
+    HEATER_3 = 3
+    HEATER_4 = 4
+    HEATER_5 = 5
+    HEATER_6 = 6
+    HEATER_7 = 7
     NUMBER_OF_SWITCHES = 8
 
 
-class OpCodes:
-    HEATER_CMD = ["0", "switch-cmd"]
-    HEATER_EXT_CTRL = ["1", "heater-ext-ctrl"]
-    HEATER_FAULTY_CMD = ["2", "set-faulty"]
+class ActionIds:
+    SWITCH_HEATER = bytearray([0x0, 0x0, 0x0, 0x0])
 
 
-class Info:
-    HEATER_CMD = "Heater Switch Command"
+def pack_heater_test_into(object_id: bytearray, tc_queue: TcQueueT):
+    tc_queue.appendleft((QueueCommands.PRINT, "Testing Heater Switching"))
 
-
-class ActionIds(enum.IntEnum):
-    SWITCH_HEATER = 0
-
-
-def add_heater_cmds(cmd_dict: ServiceOpCodeDictT):
-    op_code_dict = dict()
-    add_op_code_entry(
-        op_code_dict=op_code_dict, keys=OpCodes.HEATER_CMD, info=Info.HEATER_CMD
-    )
-    add_service_op_code_entry(
-        srv_op_code_dict=cmd_dict,
-        name=CustomServiceList.HEATER.value,
-        info="Heater Device",
-        op_code_entry=op_code_dict,
-    )
-
-
-def pack_heater_cmds(object_id: bytearray, op_code: str, tc_queue: TcQueueT):
-    if op_code in OpCodes.HEATER_CMD:
-        tc_queue.appendleft((QueueCommands.PRINT, "Heater Switching"))
-        while True:
-            heater_number = input("Type number of heater to switch [0-7]: ")
-            if not heater_number.isdigit():
-                print("Heater number not a digit")
-                continue
-            heater_number = int(heater_number)
-            if heater_number >= SwitchNumbers.NUMBER_OF_SWITCHES or heater_number < 0:
-                print("Invalid heater switch number")
-                continue
-            break
-        while True:
-            action = input("Turn switch on or off? (0 - off, 1 - on): ")
-            if not action.isdigit():
-                print("Switch action not valid")
-                continue
-            action = int(action)
-            if action != 0 and action != 1:
-                print("Invalid action defined. Must be 0 (off) or 1 (on")
-                continue
-            break
-        if action == 1:
-            act_str = "on"
-        else:
-            act_str = "off"
-        debug_string = f"Switching heater {heater_number} {act_str}"
-        tc_queue.appendleft((QueueCommands.PRINT, debug_string))
-        command = pack_switch_heater_command(object_id, heater_number, action)
-        tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in OpCodes.HEATER_EXT_CTRL:
-        pass
+    heater_number = int(input("Type number of heater to switch [0-7]: "))
+    if heater_number >= SwitchNumbers.NUMBER_OF_SWITCHES or heater_number < 0:
+        print("Invalid heater switch number")
+        return
+    action = int(input("Turn switch on or off? (0 - off, 1 - on): "))
+    if action != 0 and action != 1:
+        print("Invalid action defined. Must be 0 (off) or 1 (on")
+    debug_string = "Switching heater " + str(heater_number)
+    tc_queue.appendleft((QueueCommands.PRINT, debug_string))
+    command = pack_switch_heater_command(object_id, heater_number, action)
+    command = PusTelecommand(service=8, subservice=128, ssc=300, app_data=command)
+    tc_queue.appendleft(command.pack_command_tuple())
 
 
 def pack_switch_heater_command(
-    object_id: bytes, switch_nr: int, switch_action: int
-) -> PusTelecommand:
-    """Function to generate a heater switch command.
-    :param object_id: The object id of the HeaterHandler object.
-    :param switch_nr: The switch number identifying the heater to switch
-    :param switch_action: Action to perform. 0 - Sets switch off, 1 - Sets switch on.
+    object_id: bytearray, switch_nr: int, switch_action: int
+) -> bytearray:
+    """Function to generate the command switch a heater
+    @param object_id    The object id of the HeaterHandler object.
+    @param switch_nr    The switch number identifying the heater to switch
+    @param switch_action    Action to perform. 0 - Sets switch off, 1 - Sets switch on.
     """
+    action_id = ActionIds.SWITCH_HEATER
     command = bytearray()
+    command += object_id + action_id
     command.append(switch_nr)
     command.append(switch_action)
-    return generate_action_command(
-        object_id=object_id, action_id=ActionIds.SWITCH_HEATER, app_data=command
-    )
+    return command

pus_tc/devs/p60dock.py

@@ -90,7 +90,7 @@ class P60DockHkTable:
     wdt_gnd_left = TableEntry(bytearray([0x00, 0xA8]), TableEntry.uint32_size)
 
 
-def pack_p60dock_cmds(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+def pack_p60dock_test_into(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
     if op_code in P60OpCodes.STACK_3V3_ON:
         tc_queue.appendleft((QueueCommands.PRINT, Info.STACK_3V3_ON))
         command = pack_set_param_command(
@@ -127,18 +127,9 @@ def pack_p60dock_cmds(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "P60 Dock: Requesting HK Core HK Once")
-        )
-        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_CORE)
-        command = generate_one_hk_command(sid=hk_sid, ssc=0)
-        tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "P60 Dock: Requesting HK Aux HK Once")
-        )
-        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_AUX)
+    if op_code in GomspaceOpCodes.REQUEST_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Requesting HK Table Once"))
+        hk_sid = make_sid(object_id=P60_DOCK_HANDLER, set_id=SetIds.P60_DOCK)
         command = generate_one_hk_command(sid=hk_sid, ssc=0)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:

pus_tc/devs/pdu1.py

@@ -5,11 +5,7 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.tc.service_3_housekeeping import (
-    generate_one_hk_command,
-    make_sid,
-    generate_one_diag_command,
-)
+from tmtccmd.tc.service_3_housekeeping import generate_one_hk_command, make_sid
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
 from config.object_ids import PDU_1_HANDLER_ID
@@ -214,14 +210,9 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        tc_queue.appendleft((QueueCommands.PRINT, f"PDU1: {Info.REQUEST_CORE_HK_ONCE}"))
-        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1_CORE)
-        command = generate_one_diag_command(sid=hk_sid, ssc=0)
-        tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        tc_queue.appendleft((QueueCommands.PRINT, f"PDU1: {Info.REQUEST_AUX_HK_ONCE}"))
-        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1_AUX)
+    if op_code in GomspaceOpCodes.REQUEST_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Requesting HK Table Once"))
+        hk_sid = make_sid(object_id=PDU_1_HANDLER_ID, set_id=SetIds.PDU_1)
         command = generate_one_hk_command(sid=hk_sid, ssc=0)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:

pus_tc/devs/pdu2.py

@@ -8,11 +8,7 @@
 """
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.tc.service_3_housekeeping import (
-    generate_one_hk_command,
-    generate_one_diag_command,
-    make_sid,
-)
+from tmtccmd.tc.service_3_housekeeping import generate_one_hk_command, make_sid
 from gomspace.gomspace_common import *
 from gomspace.gomspace_pdu_definitions import *
 from config.object_ids import PDU_2_HANDLER_ID
@@ -236,14 +232,9 @@ def pack_pdu2_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
             Channel.off,
         )
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in GomspaceOpCodes.REQUEST_CORE_HK_ONCE:
-        tc_queue.appendleft((QueueCommands.PRINT, f"PDU2: {Info.REQUEST_CORE_HK_ONCE}"))
-        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2_CORE)
-        command = generate_one_diag_command(sid=hk_sid, ssc=0)
-        tc_queue.appendleft(command.pack_command_tuple())
-    if op_code in GomspaceOpCodes.REQUEST_AUX_HK_ONCE:
-        tc_queue.appendleft((QueueCommands.PRINT, f"PDU2: {Info.REQUEST_AUX_HK_ONCE}"))
-        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2_AUX)
+    if op_code in GomspaceOpCodes.REQUEST_HK_ONCE:
+        tc_queue.appendleft((QueueCommands.PRINT, "PDU2: Requesting HK Table Once"))
+        hk_sid = make_sid(object_id=PDU_2_HANDLER_ID, set_id=SetIds.PDU_2)
         command = generate_one_hk_command(sid=hk_sid, ssc=0)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code in GomspaceOpCodes.PRINT_SWITCH_V_I:

pus_tc/devs/ploc_mpsoc.py

@@ -36,8 +36,6 @@ sequence_file_dict = {
     "3": ["0:/EQ04/E-75", "0:/EQ04/E-75"],
 }
 
-CARRIAGE_RETURN = 0xD
-
 
 class CommandIds(enum.IntEnum):
     TC_MEM_WRITE = 1
@@ -51,8 +49,6 @@ class CommandIds(enum.IntEnum):
     TC_DOWNLINK_PWR_OFF = 15
     OBSW_RESET_SEQ_COUNT = 50
     TC_MODE_REPLAY = 16
-    TC_CAM_CMD_SEND = 17
-    TC_MODE_IDLE = 18
 
 
 class MemAddresses(enum.IntEnum):
@@ -164,21 +160,6 @@ def pack_ploc_mpsoc_commands(
         command = object_id + struct.pack("!I", CommandIds.TC_MODE_REPLAY)
         command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    elif op_code == "15":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC MPSoC: Tc mode idle"))
-        command = object_id + struct.pack("!I", CommandIds.TC_MODE_IDLE)
-        command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
-    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 = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
 

pus_tc/devs/ploc_supervisor.py

@@ -13,7 +13,6 @@ from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
-from utility.input_helper import InputHelper
 
 LOGGER = get_console_logger()
 
@@ -27,26 +26,6 @@ latchup_id_dict = {
     "6": "SAFECOTS",
 }
 
-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 = {
-    MANUAL_INPUT: ["manual input", ""],
-    "2": ["/mnt/sd0/ploc/supervisor", "/mnt/sd0/ploc/supervisor"],
-}
-
 
 class SupvActionIds:
     HK_REPORT = 1
@@ -86,24 +65,10 @@ class SupvActionIds:
     READ_GPIO = 35
     RESTART_SUPERVISOR = 36
     FACTORY_RESET_CLEAR_ALL = 37
-    LOGGING_REQUEST_COUNTERS = 38
+    REQUEST_LOGGING_DATA = 38
     UPDATE_IMAGE_DATA = 39
     FACTORY_RESET_CLEAR_MIRROR = 40
     FACTORY_RESET_CLEAR_CIRCULAR = 41
-    START_MPSOC_QUIET = 45
-    SET_SHUTDOWN_TIMEOUT = 46
-    FACTORY_FLASH = 47
-    PERFORM_UPDATE = 48
-    TERMINATE_SUPV_HELPER = 49
-    ENABLE_AUTO_TM = 50
-    DISABLE_AUTO_TM = 51
-    ENABLE_ADC_MONITOR_TASK = 52
-    DISABLE_ADC_MONITOR_TASK = 53
-    LOGGING_REQUEST_EVENT_BUFFERS = 54
-    LOGGING_CLEAR_COUNTERS = 55
-    LOGGING_SET_TOPIC = 56
-    REQUEST_ADC_REPORT = 57
-    RESET_PL = 58
 
 
 class SupvHkIds:
@@ -159,16 +124,16 @@ 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())
     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 = (
@@ -302,6 +267,18 @@ 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 == "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)
@@ -356,7 +333,7 @@ def pack_ploc_supv_commands(
         tc_queue.appendleft(
             (QueueCommands.PRINT, "PLOC Supervisor: Factory reset clear mirror entries")
         )
-        command = object_id + struct.pack(
+        command = command = object_id + struct.pack(
             "!I", SupvActionIds.FACTORY_RESET_CLEAR_MIRROR
         )
         command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
@@ -373,96 +350,12 @@ 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 == "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")
+    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 = 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 = 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")
-        )
-        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 = 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 = 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 = 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)
-        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)
-        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")
-        )
-        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)
-        command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
-    elif op_code == "53":
-        tc_queue.appendleft((QueueCommands.PRINT, "PLOC Supervisor: Logging set topic"))
-        command = pack_logging_set_topic(object_id)
-        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)
-        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)
-        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)
+        command = PusTelecommand(service=8, subservice=128, ssc=56, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
 
     return tc_queue
@@ -478,6 +371,7 @@ 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)
@@ -496,6 +390,7 @@ 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)
@@ -629,7 +524,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: 0x"), 16)
+    ch = int(input("Specify ch:"))
     command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.SET_ADC_ENABLED_CHANNELS)
     command = command + struct.pack("!H", ch)
@@ -647,7 +542,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)
@@ -706,39 +601,6 @@ def pack_set_debug_verbosity_cmd(object_id: bytearray) -> bytearray:
     return command
 
 
-def pack_update_command(object_id: bytearray) -> bytearray:
-    command = bytearray()
-    memory_id = int(input("Specify memory ID: "))
-    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")
-    # Adding null terminator
-    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)
-    timeout = int(input("Specify shutdown timeout (ms): "))
-    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)
-    path = get_event_buffer_path()
-    command += bytearray(path, "utf-8")
-    return command
-
-
 def get_debug_verbosity() -> int:
     tries = 0
     while tries < 3:
@@ -765,9 +627,10 @@ def get_debug_verbosity() -> int:
 
 
 def pack_set_gpio_cmd(object_id: bytearray) -> bytearray:
-    port = int(input("Specify port : 0x"), 16)
-    pin = int(input("Specify pin: 0x"), 16)
-    val = int(input("Specify val: 0x"), 16)
+    port = int(input("Specify port: "))
+    pin = int(input("Specify pin: "))
+    val = int(input("Specify val: "))
+    command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.SET_GPIO)
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
@@ -776,38 +639,10 @@ def pack_set_gpio_cmd(object_id: bytearray) -> bytearray:
 
 
 def pack_read_gpio_cmd(object_id: bytearray) -> bytearray:
-    port = int(input("Specify port: 0x"), 16)
-    pin = int(input("Specify pin: 0x"), 16)
+    port = int(input("Specify port: "))
+    pin = int(input("Specify pin: "))
+    command = bytearray()
     command = object_id + struct.pack("!I", SupvActionIds.READ_GPIO)
     command = command + struct.pack("!B", port)
     command = command + struct.pack("!B", pin)
     return command
-
-
-def pack_logging_set_topic(objetc_id: bytearray) -> bytearray:
-    command = objetc_id + struct.pack("!I", SupvActionIds.LOGGING_SET_TOPIC)
-    tpc = int(input("Specify logging topic: "))
-    command += struct.pack("!B", tpc)
-    return command
-
-
-def get_update_file() -> str:
-    LOGGER.info("Specify update file ")
-    input_helper = InputHelper(update_file_dict)
-    key = input_helper.get_key()
-    if key == MANUAL_INPUT:
-        file = input("Ploc Supervisor: Specify absolute name of update file: ")
-    else:
-        file = update_file_dict[key][1]
-    return file
-
-
-def get_event_buffer_path() -> str:
-    LOGGER.info("Specify path where to store event buffer file ")
-    input_helper = InputHelper(event_buffer_path_dict)
-    key = input_helper.get_key()
-    if key == MANUAL_INPUT:
-        file = input("Ploc Supervisor: Specify path: ")
-    else:
-        file = event_buffer_path_dict[key][1]
-    return file

pus_tc/devs/plpcdu.py

@@ -225,7 +225,7 @@ def pack_failure_injection_cmd(tc_queue: TcQueueT, param_id: int, print_str: str
     tc_queue.appendleft(cmd.pack_command_tuple())
 
 
-def pack_pl_pcdu_mode_cmd(tc_queue: TcQueueT, info: str, mode: Modes, submode: int):
+def pack_pl_pcdu_mode_cmd(tc_queue: TcQueueT, info: str, mode: int, submode: int):
     tc_queue.appendleft(
         (
             QueueCommands.PRINT,

pus_tc/devs/star_tracker.py

@@ -146,7 +146,9 @@ class Submode:
     FIRMWARE = 2
 
 
-def pack_star_tracker_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
+def pack_star_tracker_commands(
+    object_id: bytearray, tc_queue: TcQueueT, op_code: str
+) -> TcQueueT:
     tc_queue.appendleft(
         (
             QueueCommands.PRINT,

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 + 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 + 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 + 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 + 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 + 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 + 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 + 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/system/time.py

@@ -1,28 +0,0 @@
-from datetime import datetime
-
-from spacepackets.ecss import PusTelecommand
-from tmtccmd.config import QueueCommands
-from tmtccmd.tc.definitions import TcQueueT
-
-from tmtccmd.logging import get_console_logger
-
-LOGGER = get_console_logger()
-
-
-class OpCodes:
-    SET_CURRENT_TIME = ["0", "set-curr-time"]
-
-
-class Info:
-    SET_CURRENT_TIME = "Setting current time in ASCII format"
-
-
-def pack_set_current_time_ascii_command(tc_queue: TcQueueT, ssc: int):
-    time_test_current_time = datetime.utcnow().isoformat() + "Z" + "\0"
-    current_time_ascii = time_test_current_time.encode("ascii")
-    LOGGER.info(f"Current time in ASCII format: {current_time_ascii}")
-    tc_queue.appendleft((QueueCommands.PRINT, Info.SET_CURRENT_TIME))
-    command = PusTelecommand(
-        service=9, subservice=128, ssc=ssc, app_data=current_time_ascii
-    )
-    tc_queue.appendleft(command.pack_command_tuple())

pus_tc/tc_packer_hook.py

@@ -16,7 +16,7 @@ from tmtccmd.pus.service_17_test import pack_service_17_ping_command
 from tmtccmd.logging import get_current_time_string
 
 from pus_tc.service_200_mode import pack_service200_test_into
-from pus_tc.devs.p60dock import pack_p60dock_cmds
+from pus_tc.devs.p60dock import pack_p60dock_test_into
 from pus_tc.devs.pdu2 import pack_pdu2_commands
 from pus_tc.devs.pdu1 import pack_pdu1_commands
 from pus_tc.devs.bpx_batt import pack_bpx_commands
@@ -26,7 +26,7 @@ from pus_tc.devs.imtq import pack_imtq_test_into
 from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
 from pus_tc.devs.ploc_mpsoc import pack_ploc_mpsoc_commands
 from pus_tc.devs.ploc_supervisor import pack_ploc_supv_commands
-from pus_tc.devs.heater import pack_heater_cmds
+from pus_tc.devs.heater import pack_heater_test_into
 from pus_tc.devs.reaction_wheels import pack_single_rw_test_into
 from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
 from pus_tc.devs.ploc_upater import pack_ploc_updater_test_into
@@ -36,7 +36,6 @@ from pus_tc.system.core import pack_core_commands
 from pus_tc.devs.star_tracker import pack_star_tracker_commands
 from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
 from pus_tc.devs.gps import pack_gps_command
-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
@@ -102,7 +101,7 @@ def pack_service_queue_user(
         return pack_service200_test_into(tc_queue=service_queue)
     if service == CustomServiceList.P60DOCK.value:
         object_id = P60_DOCK_HANDLER
-        return pack_p60dock_cmds(
+        return pack_p60dock_test_into(
             object_id=object_id, tc_queue=service_queue, op_code=op_code
         )
     if service == CustomServiceList.PDU1.value:
@@ -134,7 +133,7 @@ def pack_service_queue_user(
         )
     if service == CustomServiceList.HEATER.value:
         object_id = HEATER_ID
-        return pack_heater_cmds(object_id=object_id, tc_queue=service_queue, op_code=op_code)
+        return pack_heater_test_into(object_id=object_id, tc_queue=service_queue)
     if service == CustomServiceList.IMTQ.value:
         object_id = IMTQ_HANDLER_ID
         return pack_imtq_test_into(
@@ -231,8 +230,6 @@ def pack_service_queue_user(
         return pack_acs_command(tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.TCS_ASS.value:
         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)
     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_as_bytes)
+    object_id = obj_id_dict.get(tm_packet.source_object_id)
     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.as_bytes == IMTQ_HANDLER_ID:
+    if object_id == IMTQ_HANDLER_ID:
         return handle_imtq_replies(action_id, printer, custom_data)
-    elif object_id.as_bytes == PLOC_MPSOC_ID:
+    elif object_id == PLOC_MPSOC_ID:
         return handle_ploc_replies(action_id, printer, custom_data)
-    elif object_id.as_bytes == PLOC_SUPV_ID:
+    elif object_id == PLOC_SUPV_ID:
         return handle_supervisor_replies(action_id, printer, custom_data)
-    elif object_id.as_bytes == STAR_TRACKER_ID:
+    elif object_id == STAR_TRACKER_ID:
         return handle_startracker_replies(action_id, printer, custom_data)
 
 

pus_tm/hk_handling.py

@@ -13,11 +13,18 @@ from tmtccmd.tm.service_3_fsfw_housekeeping import (
 from tmtccmd.logging import get_console_logger
 from pus_tc.devs.bpx_batt import BpxSetIds
 from pus_tc.devs.syrlinks_hk_handler import SetIds
-from pus_tc.devs.p60dock import SetIds
 from pus_tc.devs.imtq import ImtqSetIds
 from tmtccmd.pus.obj_id import ObjectId, ObjectIdDictT
-import config.object_ids as obj_ids
-
+from config.object_ids import (
+    SYRLINKS_HANDLER_ID,
+    IMTQ_HANDLER_ID,
+    GPS_HANDLER_0_ID,
+    GPS_HANDLER_1_ID,
+    BPX_HANDLER_ID,
+    CORE_CONTROLLER_ID,
+    P60_DOCK_HANDLER,
+    PL_PCDU_ID
+)
 
 LOGGER = get_console_logger()
 
@@ -58,37 +65,29 @@ def handle_regular_hk_print(
     object_id = 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 == 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:
+    elif object_id == 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:
+    elif object_id == GPS_HANDLER_0_ID or object_id == GPS_HANDLER_1_ID:
         handle_gps_data(printer=printer, hk_data=hk_data)
-    elif object_id == obj_ids.BPX_HANDLER_ID:
+    elif object_id == 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:
+    elif object_id == CORE_CONTROLLER_ID:
         return handle_core_hk_data(printer=printer, hk_data=hk_data)
-    elif object_id == 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:
-        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:
-        handle_p60_hk_data(printer=printer, set_id=set_id, hk_data=hk_data)
-    elif object_id == obj_ids.PL_PCDU_ID:
+    elif object_id == P60_DOCK_HANDLER:
+        handle_p60_hk_data(printer=printer, hk_data=hk_data)
+    elif object_id == 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.")
@@ -429,277 +428,134 @@ P60_INDEX_LIST = [
 
 WDT_LIST = ["GND", "I2C", "CAN", "CSP0", "CSP1"]
 
-PDU1_CHANNELS_NAMES = [
-    "TCS Board",
-    "Syrlinks",
-    "Startracker",
-    "MGT",
-    "SUS Nominal",
-    "SCEX",
-    "PLOC",
-    "ACS A Side",
-    "Unused Channel 8",
-]
 
-PDU2_CHANNELS_NAMES = [
-    "Q7S",
-    "Payload PCDU CH1",
-    "RW",
-    "TCS Heater In",
-    "SUS Redundant",
-    "Deployment Mechanism",
-    "Payload PCDU CH6",
-    "ACS B Side",
-    "Payload Camera",
-]
-
-PDU_CHANNEL_NAMES = [PDU1_CHANNELS_NAMES, PDU2_CHANNELS_NAMES]
-
-
-class WdtInfo:
-    def __init__(self):
-        self.wdt_reboots_list = []
-        self.time_pings_left_list = []
-
-    def print(self, printer: FsfwTmTcPrinter):
-        wdt_info = "WDT Type | Reboots | Time or Pings left (CSP only)"
-        log_to_both(printer, wdt_info)
-        for idx in range(len(self.wdt_reboots_list)):
-            log_to_both(
-                printer,
-                f"{WDT_LIST[idx].ljust(5)} | "
-                f"{self.wdt_reboots_list[idx]:010} | {self.time_pings_left_list[idx]:010}",
-            )
-
-    def parse(self, wdt_data: bytes, current_idx: int) -> int:
-        priv_idx = 0
-        self.wdt_reboots_list = []
-        self.time_pings_left_list = []
-        for idx in range(5):
-            self.wdt_reboots_list.append(
-                struct.unpack("!I", wdt_data[priv_idx : priv_idx + 4])[0]
-            )
-            priv_idx += 4
-            current_idx += 4
-        for idx in range(3):
-            self.time_pings_left_list.append(
-                struct.unpack("!I", wdt_data[priv_idx : priv_idx + 4])[0]
-            )
-            priv_idx += 4
-            current_idx += 4
-        for idx in range(2):
-            self.time_pings_left_list.append(wdt_data[priv_idx])
-            current_idx += 1
-            priv_idx += 1
-        return current_idx
-
-
-def handle_pdu_data(
-    printer: FsfwTmTcPrinter, pdu_idx: int, set_id: int, hk_data: bytes
-):
+def handle_p60_hk_data(printer: FsfwTmTcPrinter, hk_data: bytes):
     current_idx = 0
-    priv_idx = pdu_idx - 1
-    if set_id == SetIds.PDU_1_AUX or set_id == SetIds.PDU_2_AUX:
-        fmt_str = "!hhBBBIIH"
-        inc_len = struct.calcsize(fmt_str)
-        (
-            vcc,
-            vbat,
-            conv_enb_0,
-            conv_enb_1,
-            conv_enb_2,
-            boot_cause,
-            uptime,
-            reset_cause,
-        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-        log_to_both(printer, f"VCC {vcc} mV | VBAT {vbat} mV")
-        log_to_both(
-            printer, f"Converter Enables [{conv_enb_0},{conv_enb_1},{conv_enb_2}]"
+    current_list = []
+    for idx in range(13):
+        current_list.append(
+            struct.unpack("!h", hk_data[current_idx : current_idx + 2])[0]
         )
+        current_idx += 2
+    voltage_list = []
+    for idx in range(13):
+        voltage_list.append(
+            struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+        )
+        current_idx += 2
+    out_enb_list = []
+    for idx in range(13):
+        out_enb_list.append(hk_data[current_idx])
+        current_idx += 1
+    header_str = f"{'Name'.ljust(24)} | OutEnb | U [mV] | I [mA]"
+    print(header_str)
+    printer.file_logger.info(header_str)
+    for idx in range(13):
+        out_enb = f"{out_enb_list[idx]}".ljust(6)
+        content_line = (
+            f"{P60_INDEX_LIST[idx].ljust(24)} | {out_enb} | "
+            f"{voltage_list[idx]:05} | {current_list[idx]:04}"
+        )
+        print(content_line)
+        printer.file_logger.info(content_line)
+    fmt_str = "!hhIIIhBBB"
+    inc_len = struct.calcsize(fmt_str)
+    (
+        temp0,
+        temp1,
+        boot_cause,
+        boot_count,
+        uptime,
+        reset_cause,
+        batt_mode,
+        heater_on,
+        conv_5v_on,
+    ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    util_info = (
+        f"Batt Mode {batt_mode} | Boot Count {boot_count} |  Heater On {heater_on}"
+    )
+    util_info2 = (
+        f"Reset Cause {reset_cause} | Boot Cause {boot_cause} | Uptime {uptime} | "
+        f"Conv 5V on {conv_5v_on}"
+    )
+    print(util_info)
+    print(util_info2)
+    printer.file_logger.info(util_info)
+    printer.file_logger.info(util_info2)
+    latchup_list = []
+    for idx in range(0, 13):
+        latchup_list.append(
+            struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
+        )
+        current_idx += 2
+    fmt_str = "!HhhHhh"
+    inc_len = struct.calcsize(fmt_str)
+    (
+        dock_vbat,
+        dock_vcc_current,
+        batt_current,
+        batt_voltage,
+        batt_temp_0,
+        batt_temp_1,
+    ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    current_idx += inc_len
+    device_types = []
+    device_statuses = []
+    for idx in range(8):
+        device_types.append(hk_data[current_idx])
+        current_idx += 1
+    for idx in range(8):
+        device_statuses.append(hk_data[current_idx])
+        current_idx += 1
+    dearm_status = hk_data[current_idx]
+    current_idx += 1
+    wdt_reboots_list = []
+    for idx in range(5):
+        wdt_reboots_list.append(
+            struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+        )
+        current_idx += 4
+    time_pings_left_list = []
+    for idx in range(3):
+        time_pings_left_list.append(
+            struct.unpack("!I", hk_data[current_idx : current_idx + 4])[0]
+        )
+        current_idx += 4
+    for idx in range(2):
+        time_pings_left_list.append(hk_data[current_idx])
+        current_idx += 1
+    batt_charge_current = struct.unpack("!h", hk_data[current_idx : current_idx + 2])[0]
+    current_idx += 2
+    batt_discharge_current = struct.unpack(
+        "!h", hk_data[current_idx : current_idx + 2]
+    )[0]
+    current_idx += 2
+    ant6_depl_status = struct.unpack("!b", hk_data[current_idx : current_idx + 1])[0]
+    current_idx += 1
+    ar6_depl_status = struct.unpack("!b", hk_data[current_idx : current_idx + 1])[0]
+    current_idx += 1
+    wdt_info = "WDT Type | Reboots | Time or Pings left (CSP only)"
+    log_to_both(printer, wdt_info)
+    for idx in range(len(wdt_reboots_list)):
         log_to_both(
             printer,
-            f"Boot Cause {boot_cause} | Uptime {uptime} | Reset Cause {reset_cause}",
-        )
-        current_idx += inc_len
-        latchup_list = []
-        log_to_both(printer, "Latchups")
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            latchup_list.append(
-                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
-            )
-            content_line = (
-                f"{PDU_CHANNEL_NAMES[priv_idx][idx].ljust(24)} | {latchup_list[idx]}"
-            )
-            log_to_both(printer, content_line)
-            current_idx += 2
-        device_types = []
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            device_types.append(hk_data[current_idx])
-            current_idx += 1
-        device_statuses = []
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            device_statuses.append(hk_data[current_idx])
-            current_idx += 1
-        wdt = WdtInfo()
-        current_idx = wdt.parse(wdt_data=hk_data[current_idx:], current_idx=current_idx)
-        wdt.print(printer=printer)
-    if set_id == SetIds.PDU_1_CORE or set_id == SetIds.PDU_2_CORE:
-        log_to_both(printer, f"Received PDU HK from PDU {pdu_idx}")
-        current_list = []
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            current_list.append(
-                struct.unpack("!h", hk_data[current_idx : current_idx + 2])[0]
-            )
-            current_idx += 2
-        voltage_list = []
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            voltage_list.append(
-                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
-            )
-            current_idx += 2
-        output_enb_list = []
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            output_enb_list.append(hk_data[current_idx])
-            current_idx += 1
-        header_str = f"{'Name'.ljust(24)} | OutEnb | U [mV] | I [mA]"
-        print(header_str)
-        printer.file_logger.info(header_str)
-        for idx in range(len(PDU1_CHANNELS_NAMES)):
-            out_enb = f"{output_enb_list[idx]}".ljust(6)
-            content_line = (
-                f"{PDU_CHANNEL_NAMES[priv_idx][idx].ljust(24)} | {out_enb} | "
-                f"{voltage_list[idx]:05} | {current_list[idx]:04}"
-            )
-            log_to_both(printer, content_line)
-        fmt_str = "!IBh"
-        inc_len = struct.calcsize(fmt_str)
-        (boot_count, batt_mode, temperature) = struct.unpack(
-            fmt_str, hk_data[current_idx : current_idx + inc_len]
-        )
-        info = (
-            f"Boot Count {boot_count} | Battery Mode {batt_mode} | "
-            f"Temperature {temperature / 10.0}"
-        )
-        log_to_both(printer, info)
-
-
-def handle_p60_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
-    if set_id == SetIds.P60_CORE:
-        log_to_both(printer, "Received P60 Core HK. Voltages in mV, currents in mA")
-        current_idx = 0
-        current_list = []
-        for idx in range(13):
-            current_list.append(
-                struct.unpack("!h", hk_data[current_idx : current_idx + 2])[0]
-            )
-            current_idx += 2
-        voltage_list = []
-        for idx in range(13):
-            voltage_list.append(
-                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
-            )
-            current_idx += 2
-        out_enb_list = []
-        for idx in range(13):
-            out_enb_list.append(hk_data[current_idx])
-            current_idx += 1
-        header_str = f"{'Name'.ljust(24)} | OutEnb | U [mV] | I [mA]"
-        print(header_str)
-        printer.file_logger.info(header_str)
-        for idx in range(13):
-            out_enb = f"{out_enb_list[idx]}".ljust(6)
-            content_line = (
-                f"{P60_INDEX_LIST[idx].ljust(24)} | {out_enb} | "
-                f"{voltage_list[idx]:05} | {current_list[idx]:04}"
-            )
-            log_to_both(printer, content_line)
-        fmt_str = "!IBhHhh"
-        inc_len = struct.calcsize(fmt_str)
-        (
-            boot_count,
-            batt_mode,
-            batt_current,
-            batt_voltage,
-            temp_0,
-            temp_1,
-        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-        current_idx += inc_len
-        batt_info = (
-            f"Batt: Mode {batt_mode} | Boot Count {boot_count} | "
-            f"Charge current {batt_current} | Voltage {batt_voltage}"
-        )
-        temps = f"In C: Temp 0 {temp_0 / 10.0} | Temp 1 {temp_1 / 10.0} | "
-        log_to_both(printer, temps)
-        log_to_both(printer, batt_info)
-        printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=9)
-    if set_id == SetIds.P60_AUX:
-        log_to_both(printer, "Received P60 AUX HK. Voltages in mV, currents in mA")
-        current_idx = 0
-        latchup_list = []
-        log_to_both(printer, "P60 Dock Latchups")
-        for idx in range(0, 13):
-            latchup_list.append(
-                struct.unpack("!H", hk_data[current_idx : current_idx + 2])[0]
-            )
-            content_line = f"{P60_INDEX_LIST[idx].ljust(24)} | {latchup_list[idx]}"
-            log_to_both(printer, content_line)
-            current_idx += 2
-        fmt_str = "!IIHBBHHhhB"
-        inc_len = struct.calcsize(fmt_str)
-        (
-            boot_cause,
-            uptime,
-            reset_cause,
-            heater_on,
-            conv_5v_on,
-            dock_vbat,
-            dock_vcc_c,
-            batt_temp_0,
-            batt_temp_1,
-            dearm_status,
-        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-        current_idx += inc_len
-        wdt = WdtInfo()
-        current_idx = wdt.parse(wdt_data=hk_data[current_idx:], current_idx=current_idx)
-        fmt_str = "!hhbb"
-        inc_len = struct.calcsize(fmt_str)
-        (
-            batt_charge_current,
-            batt_discharge_current,
-            ant6_depl,
-            ar6_depl,
-        ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-        current_idx += inc_len
-        device_types = []
-        device_statuses = []
-        for idx in range(8):
-            device_types.append(hk_data[current_idx])
-            current_idx += 1
-        for idx in range(8):
-            device_statuses.append(hk_data[current_idx])
-            current_idx += 1
-        util_info = (
-            f"Reset Cause {reset_cause} | Boot Cause {boot_cause} | Uptime {uptime}"
-        )
-        util_info_2 = (
-            f"Conv 5V on {conv_5v_on} |  Heater On {heater_on} | "
-            f"Dock VBAT {dock_vbat} | DOCK VCC Current {dock_vcc_c}"
-        )
-        log_to_both(printer, util_info)
-        log_to_both(printer, util_info_2)
-        wdt.print(printer)
-        misc_info = (
-            f"Dearm {dearm_status} | ANT6 Depl {ant6_depl} | AR6 Deply {ar6_depl}"
-        )
-        log_to_both(printer, misc_info)
-        batt_info = (
-            f"Batt Temp 0 {batt_temp_0 / 10.0} | Batt Temp 1 {batt_temp_1 / 10.0} | "
-            f"Charge Current {batt_charge_current} | Discharge Current {batt_discharge_current}"
-        )
-        log_to_both(printer, batt_info)
-        printer.print_validity_buffer(
-            validity_buffer=hk_data[current_idx:], num_vars=27
+            f"{WDT_LIST[idx].ljust(5)} | "
+            f"{wdt_reboots_list[idx]:010} | {time_pings_left_list[idx]:010}",
         )
+    temps = (
+        f"In C: Temp 0 {temp0 / 10.0} | Temp 1 {temp1 / 10.0} | "
+        f"Batt Temp 0 {batt_temp_0 / 10.0} | Batt Temp 1 {batt_temp_1 / 10.0}"
+    )
+    batt_info = (
+        f"Batt: Current {batt_current} | Volt {batt_voltage} | "
+        f"Charge Current {batt_charge_current} | Discharge Current {batt_discharge_current}"
+    )
+    log_to_both(printer, temps)
+    log_to_both(printer, batt_info)
+    misc_info = f"Dearm {dearm_status} | ANT6 Depl {ant6_depl_status} | AR6 Deply {ar6_depl_status}"
+    log_to_both(printer, misc_info)
+    printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=36)
 
 
 def log_to_both(printer: FsfwTmTcPrinter, string: str):

tmtccli.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/python3
 """
 @brief      TMTC Commander entry point for command line mode.
 @details