bump changelog

Reviewed-on: #117

.gitignore

@@ -9,3 +9,21 @@ log
 /scex_conf.json
 /tmtc_conf.json
 /seqcnt*.txt
+
+# Distribution / packaging
+/.Python
+/build/
+/develop-eggs/
+/downloads/
+/eggs/
+/.eggs/
+/parts/
+/sdist/
+/var/
+/wheels/
+/pip-wheel-metadata/
+/share/python-wheels/
+/*.egg-info/
+/.installed.cfg
+/*.egg
+/MANIFEST

.run/ACU.run.xml

@@ -21,4 +21,26 @@
     <option name="INPUT_FILE" value="" />
     <method v="2" />
   </configuration>
+  <configuration default="false" name="ACU" type="PythonConfigurationType" factoryName="Python" folderName="Power">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acu -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
 </component>

.run/PLOC SUPV With Listener.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV With Listener" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s ploc_supv -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/SCEX All Cells.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="SCEX All Cells" type="PythonConfigurationType" factoryName="Python" folderName="SCEX">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s scex -o allcells -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Subsystem IDLE.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem IDLE" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o idle -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Subsystem OFF.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem OFF" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o safe -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/Subsystem SAFE.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Subsystem SAFE" type="PythonConfigurationType" factoryName="Python" folderName="ACS">
+    <module name="tmtc" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
+    <option name="PARAMETERS" value="-s acs_subsystem -o safe -l" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

.run/tmtc listener.run.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$/tmtcc.py" />
-    <option name="PARAMETERS" value="-l" />
+    <option name="PARAMETERS" value="tmtc -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

CHANGELOG.md

@@ -8,8 +8,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 The [milestone](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestones)
 list yields a list of all related PRs for each release.
 
-# [unreleased]
+# [v2.0.0] 29.11.2022
 
+- The tmtc program is installable now, which allow re-using it in other Python applications
 - Bugfixes for IMTQ TM handling
 - Updates S/A deployment command
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/118

config/__init__.py

@@ -1,6 +0,0 @@
-SW_NAME = "eive"
-VERSION_MAJOR = 1
-VERSION_MINOR = 13
-VERSION_SUBMINOR = 0
-
-__version__ = "1.13.0"

eive_tmtc/__init__.py

@@ -0,0 +1,6 @@
+SW_NAME = "eive-tmtc"
+VERSION_MAJOR = 2
+VERSION_MINOR = 0
+VERSION_SUBMINOR = 0
+
+__version__ = "2.0.0"

eive_tmtc/config/definitions.py

@@ -58,8 +58,10 @@ class CustomServiceList(str, enum.Enum):
     STR_IMG_HELPER = "str_img_helper"
     SYRLINKS = "syrlinks"
     ACS_CTRL = "acs_ctrl"
-    ACS_ASS = "acs_ass"
-    SUS_ASS = "sus_ass"
+    ACS_SS = "acs_subsystem"
+    PL_SS = "pl_subsystem"
+    ACS_BRD_ASS = "acs_brd_ass"
+    SUS_BRD_ASS = "sus_brd_ass"
     TCS = "tcs"
     TCS_ASS = "tcs_ass"
     TIME = "time"

eive_tmtc/config/events.csv

@@ -80,6 +80,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 9100;0x238c;TC_DELETION_FAILED;MEDIUM;Deletion of a TC from the map failed. P1: First 32 bit of request ID, P2. Last 32 bit of Request ID;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 9700;0x25e4;TEST;INFO;;fsfw/src/fsfw/pus/Service17Test.h
 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
+10800;0x2a30;STORE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
+10801;0x2a31;MSG_QUEUE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
+10802;0x2a32;SERIALIZATION_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.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 switch 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
@@ -107,34 +110,38 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11604;0x2d54;MPSOC_HANDLER_CRC_FAILURE;LOW;PLOC reply has invalid crc;linux/devices/ploc/PlocMPSoCHandler.h
 11605;0x2d55;MPSOC_HANDLER_SEQUENCE_COUNT_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
+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/devicedefinitions/RwDefinitions.h
 11802;0x2e1a;RESET_OCCURED;LOW;;mission/devices/devicedefinitions/RwDefinitions.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 P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h
-12004;0x2ee4;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
-12005;0x2ee5;SUPV_MPSOC_SHUWDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h
+12002;0x2ee2;SUPV_UNKNOWN_TM;LOW;Unhandled event. P1: APID, P2: Service ID;linux/devices/ploc/PlocSupervisorHandler.h
+12003;0x2ee3;SUPV_UNINIMPLEMENTED_TM;LOW;;linux/devices/ploc/PlocSupervisorHandler.h
+12004;0x2ee4;SUPV_ACK_FAILURE;LOW;PLOC supervisor received acknowledgment failure report;linux/devices/ploc/PlocSupervisorHandler.h
+12005;0x2ee5;SUPV_EXE_FAILURE;LOW;PLOC received execution failure report P1: ID of command for which the execution failed P2: Status code sent by the supervisor handler;linux/devices/ploc/PlocSupervisorHandler.h
+12006;0x2ee6;SUPV_CRC_FAILURE_EVENT;LOW;PLOC supervisor reply has invalid crc;linux/devices/ploc/PlocSupervisorHandler.h
+12007;0x2ee7;SUPV_HELPER_EXECUTING;LOW;Supervisor helper currently executing a command;linux/devices/ploc/PlocSupervisorHandler.h
+12008;0x2ee8;SUPV_MPSOC_SHUTDOWN_BUILD_FAILED;LOW;Failed to build the command to shutdown the MPSoC;linux/devices/ploc/PlocSupervisorHandler.h
 12100;0x2f44;SANITIZATION_FAILED;LOW;;bsp_q7s/fs/SdCardManager.h
 12101;0x2f45;MOUNTED_SD_CARD;INFO;;bsp_q7s/fs/SdCardManager.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
-12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/obc/PdecHandler.h
-12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/obc/PdecHandler.h
+12401;0x3071;INVALID_TC_FRAME;HIGH;;linux/ipcore/PdecHandler.h
+12402;0x3072;INVALID_FAR;HIGH;Read invalid FAR from PDEC after startup;linux/ipcore/PdecHandler.h
+12403;0x3073;CARRIER_LOCK;INFO;Carrier lock detected;linux/ipcore/PdecHandler.h
+12404;0x3074;BIT_LOCK_PDEC;INFO;Bit lock detected (data valid);linux/ipcore/PdecHandler.h
+12405;0x3075;LOST_CARRIER_LOCK_PDEC;INFO;Lost carrier lock;linux/ipcore/PdecHandler.h
+12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/ipcore/PdecHandler.h
+12407;0x3077;POLL_ERROR_PDEC;MEDIUM;;linux/ipcore/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
@@ -191,31 +198,33 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
 13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
 13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
-13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvHelper.h
-13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvHelper.h
-13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/devices/ploc/PlocSupvHelper.h
-13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/devices/ploc/PlocSupvHelper.h
-13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvHelper.h
-13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvHelper.h
-13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvHelper.h
-13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvHelper.h
-13608;0x3528;SUPV_MEM_CHECK_OK;INFO;;linux/devices/ploc/PlocSupvHelper.h
-13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;;linux/devices/ploc/PlocSupvHelper.h
-13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvHelper.h
-13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvHelper.h
-13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvHelper.h
-13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvHelper.h
-13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvHelper.h
-13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvHelper.h
-13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvHelper.h
-13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvHelper.h
+13600;0x3520;SUPV_UPDATE_FAILED;LOW;update failed;linux/devices/ploc/PlocSupvUartMan.h
+13601;0x3521;SUPV_UPDATE_SUCCESSFUL;LOW;update successful;linux/devices/ploc/PlocSupvUartMan.h
+13602;0x3522;SUPV_CONTINUE_UPDATE_FAILED;LOW;Continue update command failed;linux/devices/ploc/PlocSupvUartMan.h
+13603;0x3523;SUPV_CONTINUE_UPDATE_SUCCESSFUL;LOW;Continue update command successful;linux/devices/ploc/PlocSupvUartMan.h
+13604;0x3524;TERMINATED_UPDATE_PROCEDURE;LOW;Terminated update procedure by command;linux/devices/ploc/PlocSupvUartMan.h
+13605;0x3525;SUPV_EVENT_BUFFER_REQUEST_SUCCESSFUL;LOW;Requesting event buffer was successful;linux/devices/ploc/PlocSupvUartMan.h
+13606;0x3526;SUPV_EVENT_BUFFER_REQUEST_FAILED;LOW;Requesting event buffer failed;linux/devices/ploc/PlocSupvUartMan.h
+13607;0x3527;SUPV_EVENT_BUFFER_REQUEST_TERMINATED;LOW;Terminated event buffer request by command P1: Number of packets read before process was terminated;linux/devices/ploc/PlocSupvUartMan.h
+13608;0x3528;SUPV_MEM_CHECK_OK;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13609;0x3529;SUPV_MEM_CHECK_FAIL;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13616;0x3530;SUPV_SENDING_COMMAND_FAILED;LOW;;linux/devices/ploc/PlocSupvUartMan.h
+13617;0x3531;SUPV_HELPER_REQUESTING_REPLY_FAILED;LOW;Request receive message of communication interface failed P1: Return value returned by the communication interface requestReceiveMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13618;0x3532;SUPV_HELPER_READING_REPLY_FAILED;LOW;Reading receive message of communication interface failed P1: Return value returned by the communication interface readingReceivedMessage function P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13619;0x3533;SUPV_MISSING_ACK;LOW;Did not receive acknowledgement report P1: Number of bytes missing P2: Internal state of MPSoC helper;linux/devices/ploc/PlocSupvUartMan.h
+13620;0x3534;SUPV_MISSING_EXE;LOW;Supervisor did not receive execution report P1: Number of bytes missing P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13621;0x3535;SUPV_ACK_FAILURE_REPORT;LOW;Supervisor received acknowledgment failure report P1: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13622;0x3536;SUPV_EXE_FAILURE_REPORT;LOW;Execution report failure P1:;linux/devices/ploc/PlocSupvUartMan.h
+13623;0x3537;SUPV_ACK_INVALID_APID;LOW;Supervisor expected acknowledgment report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13624;0x3538;SUPV_EXE_INVALID_APID;LOW;Supervisor helper expected execution report but received space packet with other apid P1: Apid of received space packet P2: Internal state of supervisor helper;linux/devices/ploc/PlocSupvUartMan.h
+13625;0x3539;ACK_RECEPTION_FAILURE;LOW;Failed to receive acknowledgment report P1: Return value P2: Apid of command for which the reception of the acknowledgment report failed;linux/devices/ploc/PlocSupvUartMan.h
+13626;0x353a;EXE_RECEPTION_FAILURE;LOW;Failed to receive execution report P1: Return value P2: Apid of command for which the reception of the execution report failed;linux/devices/ploc/PlocSupvUartMan.h
+13627;0x353b;WRITE_MEMORY_FAILED;LOW;Update procedure failed when sending packet. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h
+13628;0x353c;SUPV_REPLY_SIZE_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvUartMan.h
+13629;0x353d;SUPV_REPLY_CRC_MISSMATCH;LOW;;linux/devices/ploc/PlocSupvUartMan.h
+13630;0x353e;SUPV_UPDATE_PROGRESS;INFO;Will be triggered every 5 percent of the update progress. P1: First byte percent, third and fourth byte Sequence Count, P2: Bytes written;linux/devices/ploc/PlocSupvUartMan.h
+13631;0x353f;HDLC_FRAME_REMOVAL_ERROR;INFO;;linux/devices/ploc/PlocSupvUartMan.h
+13632;0x3540;HDLC_CRC_ERROR;INFO;;linux/devices/ploc/PlocSupvUartMan.h
 13700;0x3584;ALLOC_FAILURE;MEDIUM;;bsp_q7s/core/CoreController.h
 13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 13702;0x3586;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

eive_tmtc/config/hook.py

@@ -1,12 +1,12 @@
 from typing import Optional
 
-from config.definitions import SPACE_PACKET_IDS
+from eive_tmtc.config.definitions import SPACE_PACKET_IDS
 from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend
 from tmtccmd.com_if import ComInterface
 from tmtccmd.config import TmtcDefinitionWrapper
 
-from config.retvals import get_retval_dict
-from pus_tc.cmd_definitions import get_eive_service_op_code_dict
+from eive_tmtc.config.retvals import get_retval_dict
+from eive_tmtc.pus_tc.cmd_definitions import get_eive_service_op_code_dict
 from tmtccmd.util import ObjectIdDictT, RetvalDictT
 
 
@@ -31,12 +31,12 @@ class EiveHookObject(TmTcCfgHookBase):
         return create_com_interface_default(cfg)
 
     def perform_mode_operation(self, tmtc_backend: CcsdsTmtcBackend, mode: int):
-        from config.custom_mode_op import custom_mode_operation
+        from eive_tmtc.config.custom_mode_op import custom_mode_operation
 
         custom_mode_operation(tmtc_backend, mode)
 
     def get_object_ids(self) -> ObjectIdDictT:
-        from config.object_ids import get_object_ids
+        from eive_tmtc.config.object_ids import get_object_ids
 
         return get_object_ids()
 

eive_tmtc/config/object_ids.py

@@ -122,6 +122,8 @@ SUS_5_N_LOC_XFYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x37])
 SUS_11_R_LOC_XBYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x43])
 
 # System and Assembly Objects
+ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
+PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
 SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
 TCS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x03])

eive_tmtc/config/objects.csv

@@ -50,8 +50,12 @@
 0x44330032;SCEX
 0x444100A2;SOLAR_ARRAY_DEPL_HANDLER
 0x444100A4;HEATER_HANDLER
-0x44420004;TMP1075_HANDLER_1
-0x44420005;TMP1075_HANDLER_2
+0x44420004;TMP1075_HANDLER_TCS_0
+0x44420005;TMP1075_HANDLER_TCS_1
+0x44420006;TMP1075_HANDLER_PLPCDU_0
+0x44420007;TMP1075_HANDLER_PLPCDU_1
+0x44420008;TMP1075_HANDLER_IF_BOARD
+0x44420009;TMP1075_HANDLER_OBC_IF_BOARD
 0x44420016;RTD_0_IC3_PLOC_HEATSPREADER
 0x44420017;RTD_1_IC4_PLOC_MISSIONBOARD
 0x44420018;RTD_2_IC5_4K_CAMERA
@@ -131,10 +135,14 @@
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS
 0x73000004;RW_ASS
+0x73000006;CAM_SWITCHER
 0x73000100;TM_FUNNEL
+0x73000101;PUS_TM_FUNNEL
+0x73000102;CFDP_TM_FUNNEL
+0x73000205;CFDP_HANDLER
+0x73000206;CFDP_DISTRIBUTOR
 0x73010000;EIVE_SYSTEM
 0x73010001;ACS_SUBSYSTEM
-0x7302000;CFDP_HANDLER
-0x73020001;CFDP_DISTRIBUTOR
+0x73010002;PL_SUBSYSTEM
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT

eive_tmtc/config/returnvalues.csv

@@ -1,7 +1,7 @@
 Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CCSDSHandler.h
+0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
 0x5d00;GOMS_PacketTooLong;;0;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d01;GOMS_InvalidTableId;;1;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
 0x5d02;GOMS_InvalidAddress;;2;GOM_SPACE_HANDLER;mission/devices/GomspaceDeviceHandler.h
@@ -27,14 +27,14 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x58a0;SUSS_ErrorUnlockMutex;;160;SUS_HANDLER;mission/devices/SusHandler.h
 0x58a1;SUSS_ErrorLockMutex;;161;SUS_HANDLER;mission/devices/SusHandler.h
-0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/IMTQHandler.h
-0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/IMTQHandler.h
+0x51a0;IMTQ_InvalidCommandCode;;160;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a1;IMTQ_ParameterMissing;;161;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a2;IMTQ_ParameterInvalid;;162;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a3;IMTQ_CcUnavailable;;163;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a4;IMTQ_InternalProcessingError;;164;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a5;IMTQ_RejectedWithoutReason;;165;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a6;IMTQ_CmdErrUnknown;;166;IMTQ_HANDLER;mission/devices/ImtqHandler.h
+0x51a7;IMTQ_UnexpectedSelfTestReply;The status reply to a self test command was received but no self test command has been sent. This should normally never happen.;167;IMTQ_HANDLER;mission/devices/ImtqHandler.h
 0x50a0;SYRLINKS_CrcFailure;;160;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
 0x50a1;SYRLINKS_UartFraminOrParityErrorAck;;161;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
 0x50a2;SYRLINKS_BadCharacterAck;;162;SYRLINKS_HANDLER;mission/devices/SyrlinksHkHandler.h
@@ -326,14 +326,10 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x2005;CSB_InvalidTc;;5;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
 0x2006;CSB_InvalidObject;;6;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
 0x2007;CSB_InvalidReply;;7;COMMAND_SERVICE_BASE;fsfw/src/fsfw/tmtcservices/CommandingServiceBase.h
-0x1101;AL_Full;;1;ARRAY_LIST;fsfw/src/fsfw/container/ArrayList.h
 0x1801;FF_Full;;1;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
 0x1802;FF_Empty;;2;FIFO_CLASS;fsfw/src/fsfw/container/FIFOBase.h
 0x1601;FMM_MapFull;;1;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
 0x1602;FMM_KeyDoesNotExist;;2;FIXED_MULTIMAP;fsfw/src/fsfw/container/FixedOrderedMultimap.h
-0x1501;FM_KeyAlreadyExists;;1;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1502;FM_MapFull;;2;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
-0x1503;FM_KeyDoesNotExist;;3;FIXED_MAP;fsfw/src/fsfw/container/FixedMap.h
 0x2501;EV_ListenerNotFound;;1;EVENT_MANAGER_IF;fsfw/src/fsfw/events/EventManagerIF.h
 0x1701;HHI_ObjectNotHealthy;;1;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
 0x1702;HHI_InvalidHealthState;;2;HAS_HEALTH_IF;fsfw/src/fsfw/health/HasHealthIF.h
@@ -347,6 +343,7 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0504;PS_FuseOff;;4;POWER_SWITCH_IF;fsfw/src/fsfw/power/PowerSwitchIF.h
 0x4300;FILS_GenericFileError;;0;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4301;FILS_GenericDirError;;1;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
+0x4302;FILS_FilesystemInactive;;2;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4303;FILS_GenericRenameError;;3;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4304;FILS_IsBusy;;4;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
 0x4305;FILS_InvalidParameters;;5;FILE_SYSTEM;fsfw/src/fsfw/filesystem/HasFileSystemIF.h
@@ -449,9 +446,9 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4500;HSPI_HalTimeoutRetval;;0;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
 0x4501;HSPI_HalBusyRetval;;1;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
 0x4502;HSPI_HalErrorRetval;;2;HAL_SPI;fsfw/src/fsfw_hal/stm32h7/spi/spiDefinitions.h
-0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
-0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/uart/UartComIF.h
+0x4601;HURT_UartReadFailure;;1;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4602;HURT_UartReadSizeMissmatch;;2;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
+0x4603;HURT_UartRxBufferTooSmall;;3;HAL_UART;fsfw/src/fsfw_hal/linux/serial/SerialComIF.h
 0x4801;HGIO_UnknownGpioId;;1;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4802;HGIO_DriveGpioFailure;;2;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h
 0x4803;HGIO_GpioTypeFailure;;3;HAL_GPIO;fsfw/src/fsfw_hal/linux/gpio/LinuxLibgpioIF.h

eive_tmtc/gomspace/gomspace_pdu_definitions.py

@@ -1,4 +1,4 @@
-from gomspace.gomspace_common import TableEntry
+from eive_tmtc.gomspace.gomspace_common import TableEntry
 
 
 class PduConfigTable:

eive_tmtc/pus_tc/cmd_definitions.py

@@ -1,6 +1,6 @@
-from pus_tc.devs.bpx_batt import BpxOpCodes
+from eive_tmtc.pus_tc.devs.bpx_batt import BpxOpCodes
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry, CoreServiceList
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
@@ -21,13 +21,6 @@ def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
         info="PUS Service 5 Event",
         op_code_entry=srv_5,
     )
-    srv_17 = OpCodeEntry()
-    srv_17.add("0", "Ping Test")
-    def_wrapper.add_service(
-        name=CoreServiceList.SERVICE_17_ALT,
-        info="PUS Service 17 Test",
-        op_code_entry=srv_17,
-    )
     call_all_definitions_providers(def_wrapper)
     return def_wrapper
 
@@ -128,30 +121,6 @@ def add_str_cmds(defs: TmtcDefinitionWrapper):
     defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)
 
 
-@tmtc_definitions_provider
-def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add("0", "Syrlinks Handler: Set mode off")
-    oce.add("1", "Syrlinks Handler: Set mode on")
-    oce.add("2", "Syrlinks Handler: Set mode normal")
-    oce.add("3", "Syrlinks Handler: Set TX standby")
-    oce.add("4", "Syrlinks Handler: Set TX modulation")
-    oce.add("5", "Syrlinks Handler: Set TX carrier wave")
-    oce.add("6", "Syrlinks Handler: Read TX status")
-    oce.add("7", "Syrlinks Handler: Read TX waveform")
-    oce.add("8", "Syrlinks Handler: Read TX AGC value high byte")
-    oce.add("9", "Syrlinks Handler: Read TX AGC value low byte")
-    oce.add("12", "Syrlinks Handler: Write LCL config")
-    oce.add("13", "Syrlinks Handler: Read RX status registers")
-    oce.add("14", "Syrlinks Handler: Read LCL config register")
-    oce.add("15", "Syrlinks Handler: Set waveform OQPSK")
-    oce.add("16", "Syrlinks Handler: Set waveform BPSK")
-    oce.add("17", "Syrlinks Handler: Set second config")
-    oce.add("18", "Syrlinks Handler: Enable debug output")
-    oce.add("19", "Syrlinks Handler: Disable debug output")
-    defs.add_service(CustomServiceList.SYRLINKS.value, "Syrlinks Handler", oce)
-
-
 @tmtc_definitions_provider
 def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
@@ -171,7 +140,7 @@ def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper):
 
 @tmtc_definitions_provider
 def add_time_cmds(defs: TmtcDefinitionWrapper):
-    from pus_tc.system.time import OpCodes, Info
+    from eive_tmtc.pus_tc.system.time import OpCodes, Info
 
     oce = OpCodeEntry()
     oce.add(
@@ -187,64 +156,7 @@ def add_time_cmds(defs: TmtcDefinitionWrapper):
 
 @tmtc_definitions_provider
 def add_system_cmds(defs: TmtcDefinitionWrapper):
-    from pus_tc.system.acs import AcsOpCodes, SusOpCodes
-    import pus_tc.system.controllers as controllers
-
-    oce = OpCodeEntry()
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_A_SIDE,
-        info="Switch to ACS board A side",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_B_SIDE,
-        info="Switch to ACS board B side",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_DUAL_MODE,
-        info="Switch to ACS board dual mode",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_A_ON,
-        info="Switch ACS board A side on",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_B_ON,
-        info="Switch ACS board B side on",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_DUAL_ON,
-        info="Switch ACS board dual mode on",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_OFF,
-        info="Switch off ACS board",
-    )
-    defs.add_service(
-        name=CustomServiceList.ACS_ASS.value, info="ACS Assemblies", op_code_entry=oce
-    )
-
-    oce = OpCodeEntry()
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_NOM_SIDE,
-        info="Switch SUS board to nominal side",
-    )
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_RED_SIDE,
-        info="Switch SUS board to redundant side",
-    )
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_OFF,
-        info="Switch off SUS board",
-    )
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_DUAL_MODE,
-        info="Switch SUS board to dual mode",
-    )
-    defs.add_service(
-        name=CustomServiceList.SUS_ASS.value,
-        info="SUS Assembly",
-        op_code_entry=oce,
-    )
+    import eive_tmtc.pus_tc.system.controllers as controllers
 
     oce = OpCodeEntry()
     oce.add(

eive_tmtc/pus_tc/devs/bpx_batt.py

@@ -1,7 +1,6 @@
-from config.definitions import CustomServiceList
-from config.object_ids import BPX_HANDLER_ID
-from tmtccmd import DefaultProcedureInfo, TcHandlerBase
-from tmtccmd.tc import DefaultPusQueueHelper, service_provider
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import BPX_HANDLER_ID
+from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid

eive_tmtc/pus_tc/devs/gps.py

@@ -1,6 +1,6 @@
 import enum
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper

eive_tmtc/pus_tc/devs/heater.py

@@ -5,8 +5,8 @@
 """
 import enum
 
-from config.definitions import CustomServiceList
-from config.object_ids import get_object_ids
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import get_object_ids
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
@@ -122,7 +122,7 @@ def pack_heater_cmds(object_id: bytearray, op_code: str, q: DefaultPusQueueHelpe
 
 
 def heater_idx_to_obj(heater: int) -> ObjectIdU32:
-    from config.object_ids import (
+    from eive_tmtc.config.object_ids import (
         HEATER_0_OBC_BRD,
         HEATER_1_PLOC_PROC_BRD,
         HEATER_2_ACS_BRD,

eive_tmtc/pus_tc/devs/plpcdu.py

@@ -3,7 +3,7 @@ import struct
 import time
 from typing import Optional
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper
 
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
@@ -26,7 +26,7 @@ from tmtccmd.tc.pus_20_params import (
 )
 from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
-from config.object_ids import PL_PCDU_ID
+from eive_tmtc.config.object_ids import PL_PCDU_ID
 
 LOGGER = get_console_logger()
 

eive_tmtc/pus_tc/devs/rad_sensor.py

@@ -7,10 +7,10 @@
 """
 import struct
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 
 from spacepackets.ecss.tc import PusTelecommand
-from pus_tc.service_200_mode import pack_mode_data, Modes
+from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Modes
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper

eive_tmtc/pus_tc/devs/rtd.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
-from config.definitions import CustomServiceList
-from pus_tc.devs.pdec_handler import CommandIds
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tc.devs.pdec_handler import CommandIds
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
@@ -9,8 +9,8 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
-import config.object_ids as oids
-from config.object_ids import get_object_ids
+import eive_tmtc.config.object_ids as oids
+from eive_tmtc.config.object_ids import get_object_ids
 
 RTD_IDS = [
     oids.RTD_0_PLOC_HSPD,

eive_tmtc/pus_tc/devs/scex.py

@@ -3,14 +3,14 @@ import json
 
 from spacepackets.ecss import PusTelecommand
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
-from config.object_ids import SCEX_HANDLER_ID
+from eive_tmtc.config.object_ids import SCEX_HANDLER_ID
 
 
 USE_SCEX_CONF_FILE = True

eive_tmtc/pus_tc/devs/star_tracker.py

@@ -13,7 +13,7 @@ from tmtccmd.logging import get_console_logger
 
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
-from utility.input_helper import InputHelper
+from eive_tmtc.utility.input_helper import InputHelper
 
 
 LOGGER = get_console_logger()

eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py

@@ -5,6 +5,12 @@
 @author J. Meier
 @date   13.12.2020
 """
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from spacepackets.ecss.tc import PusTelecommand
@@ -20,7 +26,11 @@ class SetIds:
 
 
 class OpCodes:
-    NORMAL = ["2", "nml"]
+    OFF = "off"
+    ON = "on"
+    NORMAL = "nml"
+    STANDBY = "standby"
+    MODULATION = "modulation"
 
 
 class CommandIds:
@@ -41,28 +51,52 @@ class CommandIds:
     DISABLE_DEBUG = 21
 
 
+@tmtc_definitions_provider
+def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCodes.OFF, "Syrlinks Handler: Set mode off")
+    oce.add(OpCodes.ON, "Syrlinks Handler: Set mode on")
+    oce.add(OpCodes.NORMAL, "Syrlinks Handler: Set mode normal")
+    oce.add(OpCodes.STANDBY, "Syrlinks Handler: Set TX standby")
+    oce.add(OpCodes.MODULATION, "Syrlinks Handler: Set TX modulation")
+    oce.add("5", "Syrlinks Handler: Set TX carrier wave")
+    oce.add("6", "Syrlinks Handler: Read TX status")
+    oce.add("7", "Syrlinks Handler: Read TX waveform")
+    oce.add("8", "Syrlinks Handler: Read TX AGC value high byte")
+    oce.add("9", "Syrlinks Handler: Read TX AGC value low byte")
+    oce.add("12", "Syrlinks Handler: Write LCL config")
+    oce.add("13", "Syrlinks Handler: Read RX status registers")
+    oce.add("14", "Syrlinks Handler: Read LCL config register")
+    oce.add("15", "Syrlinks Handler: Set waveform OQPSK")
+    oce.add("16", "Syrlinks Handler: Set waveform BPSK")
+    oce.add("17", "Syrlinks Handler: Set second config")
+    oce.add("18", "Syrlinks Handler: Enable debug output")
+    oce.add("19", "Syrlinks Handler: Disable debug output")
+    defs.add_service(CustomServiceList.SYRLINKS.value, "Syrlinks Handler", oce)
+
+
 def pack_syrlinks_command(
     object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str
 ):
     obyt = object_id.as_bytes
     q.add_log_cmd(f"Testing Syrlinks with object id: {object_id.as_hex_string}")
-    if op_code == "0":
+    if op_code == OpCodes.OFF:
         q.add_log_cmd("Syrlinks: Set mode off")
         data = pack_mode_data(obyt, Modes.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "1":
+    if op_code == OpCodes.ON:
         q.add_log_cmd("Syrlinks: Set mode on")
         data = pack_mode_data(obyt, Modes.ON, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "2":
+    if op_code == OpCodes.NORMAL:
         q.add_log_cmd("Syrlinks: Mode Normal")
         data = pack_mode_data(obyt, Modes.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "3":
+    if op_code == OpCodes.STANDBY:
         q.add_log_cmd("syrlinks: Set TX mode standby")
         data = obyt + struct.pack("!I", CommandIds.SET_TX_MODE_STANDBY)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == "4":
+    if op_code == OpCodes.MODULATION:
         q.add_log_cmd("syrlinks: Set TX mode modulation")
         data = obyt + struct.pack("!I", CommandIds.SET_TX_MODE_MODULATION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))

eive_tmtc/pus_tc/devs/tmp1075.py

@@ -6,7 +6,7 @@
 @date   06.01.2021
 """
 from spacepackets.ecss.tc import PusTelecommand
-from pus_tc.service_200_mode import pack_mode_data
+from eive_tmtc.pus_tc.service_200_mode import pack_mode_data
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 from tmtccmd.util import ObjectIdU32

eive_tmtc/pus_tc/procedure_packer.py

@@ -2,10 +2,10 @@
 """
 from typing import cast
 
-from tmtc.power.power import pack_power_commands
-from pus_tc.devs.rtd import pack_rtd_commands
-from pus_tc.devs.scex import pack_scex_cmds
-from pus_tc.system.controllers import (
+from eive_tmtc.tmtc.power.power import pack_power_commands
+from eive_tmtc.pus_tc.devs.rtd import pack_rtd_commands
+from eive_tmtc.pus_tc.devs.scex import pack_scex_cmds
+from eive_tmtc.pus_tc.system.controllers import (
     pack_cmd_ctrl_to_prompted_mode,
     get_object_from_op_code,
 )
@@ -22,29 +22,33 @@ from tmtccmd.tc.pus_5_event import (
 )
 from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
 
-from pus_tc.service_200_mode import pack_service_200_test_into
-from tmtc.power.p60dock import pack_p60dock_cmds
-from tmtc.power.pdu2 import pack_pdu2_commands
-from tmtc.power.pdu1 import pack_pdu1_commands
-from tmtc.power.acu import pack_acu_commands
-from tmtc.acs.imtq import pack_imtq_test_into
-from pus_tc.devs.tmp1075 import pack_tmp1075_test_into
-from pus_tc.devs.heater import pack_heater_cmds
-from tmtc.acs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds
-from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
-from tmtc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
-from pus_tc.devs.ccsds_handler import pack_ccsds_handler_test
-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.acs import pack_acs_command, pack_sus_cmds
-from pus_tc.devs.plpcdu import pack_pl_pcdu_commands
-from pus_tc.devs.str_img_helper import pack_str_img_helper_command
-from pus_tc.system.tcs import pack_tcs_sys_commands
-from pus_tc.system.proc import pack_proc_commands
-from config.definitions import CustomServiceList
-from config.object_ids import (
+from eive_tmtc.pus_tc.service_200_mode import pack_service_200_test_into
+from eive_tmtc.tmtc.power.p60dock import pack_p60dock_cmds
+from eive_tmtc.tmtc.power.pdu2 import pack_pdu2_commands
+from eive_tmtc.tmtc.power.pdu1 import pack_pdu1_commands
+from eive_tmtc.tmtc.power.acu import pack_acu_commands
+from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into
+from eive_tmtc.pus_tc.devs.tmp1075 import pack_tmp1075_test_into
+from eive_tmtc.pus_tc.devs.heater import pack_heater_cmds
+from eive_tmtc.tmtc.acs.reaction_wheels import (
+    pack_single_rw_test_into,
+    pack_rw_ass_cmds,
+)
+from eive_tmtc.pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
+from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
+from eive_tmtc.pus_tc.devs.ccsds_handler import pack_ccsds_handler_test
+from eive_tmtc.pus_tc.system.core import pack_core_commands
+from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
+from eive_tmtc.pus_tc.devs.gps import pack_gps_command
+from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
+from eive_tmtc.tmtc.acs.sus_board import pack_sus_cmds
+from eive_tmtc.pus_tc.devs.plpcdu import pack_pl_pcdu_commands
+from eive_tmtc.pus_tc.devs.str_img_helper import pack_str_img_helper_command
+from eive_tmtc.pus_tc.system.tcs import pack_tcs_sys_commands
+from eive_tmtc.pus_tc.system.proc import pack_proc_commands
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import (
     P60_DOCK_HANDLER,
     PDU_1_HANDLER_ID,
     PDU_2_HANDLER_ID,
@@ -67,7 +71,7 @@ from config.object_ids import (
     RW_ASSEMBLY,
     get_object_ids,
 )
-import config.object_ids as oids
+import eive_tmtc.config.object_ids as oids
 from tmtccmd.util import ObjectIdU32
 
 LOGGER = get_console_logger()
@@ -83,11 +87,6 @@ def handle_default_procedure(
     obj_id_man = get_object_ids()
     if service == CoreServiceList.SERVICE_5.value:
         return pack_generic_service_5_test_into(q=queue_helper)
-    if (
-        service == CoreServiceList.SERVICE_17
-        or service == CoreServiceList.SERVICE_17_ALT
-    ):
-        return queue_helper.add_pus_tc(pack_service_17_ping_command())
     if service == CoreServiceList.SERVICE_200.value:
         return pack_service_200_test_into(q=queue_helper)
     if service == CustomServiceList.P60DOCK.value:
@@ -104,8 +103,6 @@ def handle_default_procedure(
     if service == CustomServiceList.ACU.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(ACU_HANDLER_ID))
         return pack_acu_commands(object_id=object_id, q=queue_helper, op_code=op_code)
-    # if service == CustomServiceList.BPX_BATTERY.value:
-    #    return pack_bpx_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TMP1075_1.value:
@@ -185,12 +182,8 @@ def handle_default_procedure(
         )
     if service == CustomServiceList.PROCEDURE.value:
         return pack_proc_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.SUS_ASS.value:
-        return pack_sus_cmds(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PL_PCDU.value:
         return pack_pl_pcdu_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.ACS_ASS.value:
-        return pack_acs_command(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS_ASS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.RW_ASSEMBLY.value:

eive_tmtc/pus_tc/service_200_mode.py

@@ -8,7 +8,7 @@
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
-from config.object_ids import TEST_DEVICE_ID
+from eive_tmtc.config.object_ids import TEST_DEVICE_ID
 
 TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID
 

eive_tmtc/pus_tc/system/controllers.py

@@ -4,10 +4,13 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
-from .common import command_mode
-import config.object_ids as obj_ids
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+import eive_tmtc.config.object_ids as obj_ids
 
-from pus_tc.prompt_parameters import prompt_parameters_cli, prompt_parameters_gui
+from eive_tmtc.pus_tc.prompt_parameters import (
+    prompt_parameters_cli,
+    prompt_parameters_gui,
+)
 
 
 class OpCodes:
@@ -36,7 +39,7 @@ def pack_cmd_ctrl_to_prompted_mode(
         print("Invalid Mode, defaulting to OFF")
         mode = 0
     submode = int(parameters["Submode"])
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=mode,
         submode=submode,
@@ -48,7 +51,7 @@ def pack_cmd_ctrl_to_prompted_mode(
 def pack_cmd_ctrl_to_off(
     q: DefaultPusQueueHelper, object_id: Union[ObjectIdBase, ObjectIdU32]
 ):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=Modes.OFF,
         submode=0,
@@ -58,7 +61,7 @@ def pack_cmd_ctrl_to_off(
 
 
 def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=Modes.ON,
         submode=0,
@@ -70,7 +73,7 @@ def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
 def pack_cmd_ctrl_to_nml(
     q: DefaultPusQueueHelper, object_id: Union[ObjectIdBase, ObjectIdU32]
 ):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=Modes.NORMAL,
         submode=0,

eive_tmtc/pus_tc/system/core.py

@@ -1,6 +1,6 @@
 import enum
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper
 
@@ -9,7 +9,7 @@ from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
-from config.object_ids import CORE_CONTROLLER_ID
+from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
 
 
 LOGGER = get_console_logger()

eive_tmtc/pus_tc/system/proc.py

@@ -3,9 +3,9 @@ from __future__ import annotations
 import time
 from datetime import timedelta
 
-from config.definitions import CustomServiceList
-from config.object_ids import get_object_ids
-from pus_tc.system.tcs import pack_tcs_sys_commands
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import get_object_ids
+from eive_tmtc.pus_tc.system.tcs import pack_tcs_sys_commands
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
@@ -17,27 +17,31 @@ from tmtccmd.tc.pus_11_tc_sched import (
 )
 from tmtccmd.tc.pus_3_fsfw_hk import *
 
-import config.object_ids as oids
-from pus_tc.system.tcs import OpCodes as TcsOpCodes
-from pus_tc.devs.bpx_batt import BpxSetIds
-from pus_tc.system.core import SetIds as CoreSetIds
-from tmtc.power.common_power import SetIds as GsSetIds
-from pus_tc.devs.rad_sensor import SetIds as RadSetIds
-from pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
-from pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
-from pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2
-from pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3
-from pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds
-from pus_tc.devs.gps import SetIds as GpsSetIds
-from tmtc.acs.imtq import ImtqSetIds
-from pus_tc.devs.sus import SetIds
-from pus_tc.devs.star_tracker import SetIds as StrSetIds
-from tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec
-from pus_tc.system.controllers import pack_cmd_ctrl_to_off, pack_cmd_ctrl_to_nml
-from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
-from tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command
-from pus_tc.devs.star_tracker import pack_star_tracker_commands
-from tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command
+import eive_tmtc.config.object_ids as oids
+from eive_tmtc.pus_tc.system.tcs import OpCodes as TcsOpCodes
+from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds
+from eive_tmtc.pus_tc.system.core import SetIds as CoreSetIds
+from eive_tmtc.tmtc.power.common_power import SetIds as GsSetIds
+from eive_tmtc.pus_tc.devs.rad_sensor import SetIds as RadSetIds
+from eive_tmtc.pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
+from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
+from eive_tmtc.pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2
+from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3
+from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds
+from eive_tmtc.pus_tc.devs.gps import SetIds as GpsSetIds
+from eive_tmtc.tmtc.acs.imtq import ImtqSetIds
+from eive_tmtc.pus_tc.devs.sus import SetIds
+from eive_tmtc.pus_tc.devs.star_tracker import SetIds as StrSetIds
+from eive_tmtc.tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec
+from eive_tmtc.pus_tc.system.controllers import (
+    pack_cmd_ctrl_to_off,
+    pack_cmd_ctrl_to_nml,
+)
+from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
+from eive_tmtc.tmtc.acs.sus_board import pack_sus_cmds
+from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command
+from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command
 
 
 class OpCodes:

eive_tmtc/pus_tc/system/tcs.py

@@ -1,18 +1,17 @@
 import enum
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
-    generate_one_diag_command,
     generate_one_hk_command,
 )
 
-from .common import command_mode
-from config.object_ids import TCS_BOARD_ASS_ID, TCS_CONTROLLER
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from eive_tmtc.config.object_ids import TCS_BOARD_ASS_ID, TCS_CONTROLLER
 
 
 class OpCodes:
@@ -62,7 +61,7 @@ def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
 
 def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCodes.TCS_BOARD_ASS_NORMAL:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=TCS_BOARD_ASS_ID,
             mode=Modes.NORMAL,
             submode=0,
@@ -70,7 +69,7 @@ def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
             info=Info.TCS_BOARD_ASS_NORMAL,
         )
     if op_code in OpCodes.TCS_BOARD_ASS_OFF:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=TCS_BOARD_ASS_ID,
             mode=Modes.OFF,
             submode=0,

eive_tmtc/pus_tc/system/time.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss import PusTelecommand
 from tmtccmd import DefaultProcedureInfo, TcHandlerBase
 

eive_tmtc/pus_tm/action_reply_handler.py

@@ -1,11 +1,11 @@
 import struct
-from config.object_ids import *
-from tmtc.acs.imtq import ImtqActionIds
-from pus_tm.defs import PrintWrapper
-from tmtc.ploc_mpsoc import PlocReplyIds
-from tmtc.ploc_supervisor import SupvActionIds
-from pus_tc.devs.star_tracker import StarTrackerActionIds
-from tmtc.power.tm import handle_get_param_data_reply
+from eive_tmtc.config.object_ids import *
+from eive_tmtc.tmtc.acs.imtq import ImtqActionIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.tmtc.payload.ploc_mpsoc import PlocReplyIds
+from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionIds
+from eive_tmtc.pus_tc.devs.star_tracker import StarTrackerActionIds
+from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tm import Service8FsfwTm
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

eive_tmtc/pus_tm/devs/bpx_bat.py

@@ -1,7 +1,7 @@
 import struct
 
-from pus_tc.devs.bpx_batt import BpxSetIds
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 

eive_tmtc/pus_tm/devs/gps.py

@@ -1,6 +1,6 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 

eive_tmtc/pus_tm/devs/gyros.py

@@ -1,11 +1,11 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
-from pus_tc.devs.gyros import L3gGyroSetIds, AdisGyroSetIds
-import config.object_ids as obj_ids
+from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetIds, AdisGyroSetIds
+import eive_tmtc.config.object_ids as obj_ids
 
 
 def handle_gyros_hk_data(

eive_tmtc/pus_tm/devs/mgms.py

@@ -1,10 +1,10 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
-from pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-import config.object_ids as obj_ids
+import eive_tmtc.config.object_ids as obj_ids
 
 
 def handle_mgm_hk_data(

eive_tmtc/pus_tm/devs/plpcdu.py

@@ -1,8 +1,8 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from pus_tc.devs.plpcdu import SetIds
+from eive_tmtc.pus_tc.devs.plpcdu import SetIds
 
 
 ADC_CHANNELS_NAMED = [

eive_tmtc/pus_tm/devs/rad_sensor.py

@@ -1,8 +1,8 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from pus_tc.devs.rad_sensor import SetIds
+from eive_tmtc.pus_tc.devs.rad_sensor import SetIds
 
 
 def handle_rad_sensor_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):

eive_tmtc/pus_tm/devs/sus.py

@@ -1,7 +1,7 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
-from pus_tc.devs.sus import SetIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tc.devs.sus import SetIds
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 

eive_tmtc/pus_tm/devs/syrlinks.py

@@ -1,7 +1,7 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
-from pus_tc.devs.syrlinks_hk_handler import SetIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetIds
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 

eive_tmtc/pus_tm/event_handler.py

@@ -1,8 +1,11 @@
 import logging
 import os.path
 from datetime import datetime
-from config.object_ids import get_object_ids
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.config.object_ids import get_object_ids
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.verification_handler import generic_retval_printout
+from eive_tmtc.tmtc.acs.acs_subsystem import AcsModes
+from tmtccmd.tc.pus_200_fsfw_modes import Modes
 
 from tmtccmd.tm import Service5Tm
 from tmtccmd.logging import get_console_logger
@@ -50,6 +53,11 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     )
     LOGGER.info(generic_event_string)
     specific_handler = True
+    if info.name == "MODE_TRANSITION_FAILED":
+        reason = generic_retval_printout(tm.param_1)
+        for string in reason:
+            pw.dlog(f"Reason from event parameter 1: {string}")
+            pw.dlog(f"Mode, sequence or table: {tm.param_2:#08x}")
     if info.name == "SUPV_UPDATE_PROGRESS" or info.name == "WRITE_MEMORY_FAILED":
         additional_event_info = f"Additional info: {info.info}"
         context = (
@@ -59,7 +67,28 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
         pw.dlog(additional_event_info)
         pw.dlog(context)
     if info.name == "MODE_INFO":
-        pw.dlog(f"Mode: {tm.param_1}")
+        mode_name = "Unknown"
+        if obj_name == "ACS_SUBSYSTEM":
+            if tm.param_1 == Modes.OFF:
+                mode_name = "Off"
+            elif tm.param_1 == AcsModes.IDLE:
+                mode_name = "Idle"
+            elif tm.param_1 == AcsModes.DETUMBLE:
+                mode_name = "Detumble"
+            elif tm.param_1 == AcsModes.SAFE:
+                mode_name = "Safe"
+            elif tm.param_1 == AcsModes.TARGET_PT:
+                mode_name = "Target Pointing"
+        else:
+            if tm.param_1 == Modes.OFF:
+                mode_name = "Off"
+            elif tm.param_1 == Modes.ON:
+                mode_name = "On"
+            elif tm.param_1 == Modes.NORMAL:
+                mode_name = "Normal"
+            elif tm.param_1 == Modes.RAW:
+                mode_name = "Raw"
+        pw.dlog(f"Mode Number {tm.param_1}, Mode Name {mode_name}")
         pw.dlog(f"Submode: {tm.param_2}")
     else:
         specific_handler = False

eive_tmtc/pus_tm/factory_hook.py

@@ -1,6 +1,6 @@
 """Core EIVE TM handler module
 """
-from config.object_ids import get_object_ids
+from eive_tmtc.config.object_ids import get_object_ids
 from spacepackets.ecss import PusTelemetry
 from spacepackets.ecss.pus_17_test import Service17Tm
 from spacepackets.util import PrintFormats
@@ -8,11 +8,12 @@ from tmtccmd import get_console_logger
 from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm
-from tmtccmd.tm.pus_17_test import Service17TmExtended
+from tmtccmd.tm.pus_200_fsfw_modes import Subservices as ModeSubservices
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
+from .defs import PrintWrapper
 
 from .event_handler import handle_event_packet
-from .verification_handler import handle_service_1_fsfw_packet
+from .verification_handler import handle_service_1_fsfw_packet, generic_retval_printout
 from .hk_handling import handle_hk_packet
 from .action_reply_handler import handle_action_reply
 
@@ -36,6 +37,7 @@ def pus_factory_hook(
         return
     service = tm_packet.service
     obj_id_dict = get_object_ids()
+    pw = PrintWrapper(printer)
     dedicated_handler = True
     if service == 1:
         handle_service_1_fsfw_packet(wrapper=verif_wrapper, raw_tm=packet)
@@ -55,7 +57,17 @@ def pus_factory_hook(
         dedicated_handler = False
     elif service == 200:
         tm_packet = Service200FsfwTm.unpack(raw_telemetry=packet)
-        dedicated_handler = False
+        if tm_packet.subservice == ModeSubservices.TM_CANT_REACH_MODE:
+            obj_id = tm_packet.object_id
+            obj_id_obj = obj_id_dict.get(obj_id)
+            retval = tm_packet.return_value
+            string_list = generic_retval_printout(retval)
+            pw.dlog(f"Received Mode Reply from {obj_id_obj}: Can't reach mode.")
+            for string in string_list:
+                pw.dlog(f"Reason: {string}")
+            dedicated_handler = True
+        else:
+            dedicated_handler = False
     else:
         LOGGER.info(f"The service {service} is not implemented in Telemetry Factory")
         tm_packet.print_source_data(PrintFormats.HEX)

eive_tmtc/pus_tm/hk_handling.py

@@ -1,12 +1,12 @@
 """HK Handling for EIVE OBSW"""
 # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
-from tmtc.acs_ctrl import handle_acs_ctrl_mgm_data
-from pus_tm.devs.plpcdu import handle_plpcdu_hk
-from pus_tm.devs.rad_sensor import handle_rad_sensor_data
-from pus_tm.devs.sus import handle_sus_hk
-from pus_tm.system.tcs import handle_thermal_controller_hk_data
-from tmtc.ploc_supervisor import handle_supv_hk_data
-from tmtc.acs.reaction_wheels import handle_rw_hk_data
+from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_mgm_data
+from eive_tmtc.pus_tm.devs.plpcdu import handle_plpcdu_hk
+from eive_tmtc.pus_tm.devs.rad_sensor import handle_rad_sensor_data
+from eive_tmtc.pus_tm.devs.sus import handle_sus_hk
+from eive_tmtc.pus_tm.system.tcs import handle_thermal_controller_hk_data
+from eive_tmtc.tmtc.payload.ploc_supervisor import handle_supv_hk_data
+from eive_tmtc.tmtc.acs.reaction_wheels import handle_rw_hk_data
 from tmtccmd.tm.pus_3_fsfw_hk import (
     Service3Base,
     HkContentType,
@@ -15,22 +15,26 @@ from tmtccmd.tm.pus_3_fsfw_hk import (
 from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT
 from tmtccmd.logging import get_console_logger
 
-from pus_tm.devs.bpx_bat import handle_bpx_hk_data
-from pus_tm.devs.gps import handle_gps_data
-from pus_tm.devs.gyros import handle_gyros_hk_data
-from tmtc.power.tm import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data
-from pus_tm.devs.syrlinks import handle_syrlinks_hk_data
-from tmtc.acs.imtq import (
+from eive_tmtc.pus_tm.devs.bpx_bat import handle_bpx_hk_data
+from eive_tmtc.pus_tm.devs.gps import handle_gps_data
+from eive_tmtc.pus_tm.devs.gyros import handle_gyros_hk_data
+from eive_tmtc.tmtc.power.tm import (
+    handle_pdu_data,
+    handle_p60_hk_data,
+    handle_acu_hk_data,
+)
+from eive_tmtc.pus_tm.devs.syrlinks import handle_syrlinks_hk_data
+from eive_tmtc.tmtc.acs.imtq import (
     ImtqSetIds,
     handle_self_test_data,
     handle_eng_set,
     handle_calibrated_mtm_measurement,
     handle_raw_mtm_measurement,
 )
-from pus_tm.defs import FsfwTmTcPrinter
-from pus_tm.system.core import handle_core_hk_data
-from pus_tm.devs.mgms import handle_mgm_hk_data
-import config.object_ids as obj_ids
+from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter
+from eive_tmtc.pus_tm.system.core import handle_core_hk_data
+from eive_tmtc.pus_tm.devs.mgms import handle_mgm_hk_data
+import eive_tmtc.config.object_ids as obj_ids
 
 
 LOGGER = get_console_logger()

eive_tmtc/pus_tm/system/core.py

@@ -1,7 +1,7 @@
 import struct
 
-from pus_tm.defs import PrintWrapper
-from pus_tc.system.core import SetIds
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tc.system.core import SetIds
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 

eive_tmtc/pus_tm/system/tcs.py

@@ -2,7 +2,7 @@ import enum
 import pprint
 import struct
 
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 

eive_tmtc/pus_tm/verification_handler.py

@@ -0,0 +1,63 @@
+from typing import List, Optional
+
+from spacepackets.ecss.pus_1_verification import UnpackParams, Service1Tm
+from tmtccmd.logging import get_console_logger
+from tmtccmd.pus import VerificationWrapper
+from tmtccmd.tm.pus_1_verification import Service1FsfwWrapper
+from eive_tmtc.config.retvals import get_retval_dict
+
+LOGGER = get_console_logger()
+
+
+def handle_service_1_fsfw_packet(wrapper: VerificationWrapper, raw_tm: bytes):
+    if wrapper.console_logger is None or wrapper.file_logger is None:
+        raise ValueError(
+            "Console logger or file logger not valid. Please set a valid one"
+        )
+    # Error code with length 2 is FSFW specific
+    tm_packet = Service1Tm.unpack(data=raw_tm, params=UnpackParams(1, 2))
+    fsfw_wrapper = Service1FsfwWrapper(tm_packet)
+    res = wrapper.verificator.add_tm(tm_packet)
+    if res is None:
+        LOGGER.info(
+            f"Received Verification TM[{tm_packet.service}, {tm_packet.subservice}] "
+            f"with Request ID {tm_packet.tc_req_id.as_u32():#08x}"
+        )
+        LOGGER.warning(f"No matching telecommand found for {tm_packet.tc_req_id}")
+    else:
+        wrapper.log_to_console(tm_packet, res)
+        wrapper.log_to_file(tm_packet, res)
+    if tm_packet.has_failure_notice:
+        str_list = generic_retval_printout(
+            tm_packet.error_code.val,
+            fsfw_wrapper.error_param_1,
+            fsfw_wrapper.error_param_2,
+        )
+        for string in str_list:
+            wrapper.dlog(string)
+
+
+def generic_retval_printout(
+    retval: int, p1: Optional[int] = None, p2: Optional[int] = None
+) -> List[str]:
+    retval_dict = get_retval_dict()
+    retval_info = retval_dict.get(retval)
+    if retval_info is None:
+        raw_err = retval
+        return [
+            f"No returnvalue information found for error code  with "
+            f"subsystem ID {(raw_err >> 8) & 0xff} and unique ID {raw_err & 0xff}"
+        ]
+    else:
+        retval_string = (
+            f"Error Code information for code {retval:#06x} | "
+            f"Name: {retval_info.name} | Info: {retval_info.info}"
+        )
+        string_list = [retval_string]
+        if p1:
+            error_param_1_str = f"Error Parameter 1: hex {p1:#010x} " f"dec {p1} "
+            string_list.append(error_param_1_str)
+        if p2:
+            error_param_2_str = f"Error Parameter 2: hex {p2:#010x} " f"dec {p2}"
+            string_list.append(error_param_2_str)
+        return string_list

eive_tmtc/tmtc/__init__.py

@@ -0,0 +1,2 @@
+from .payload.pl_subsystem import add_payload_subsystem_cmds
+from .test import add_test_defs

eive_tmtc/tmtc/acs/acs_board.py

@@ -1,27 +1,27 @@
 import enum
 
-from tmtccmd.tc import DefaultPusQueueHelper
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
-from config.object_ids import ACS_BOARD_ASS_ID, SUS_BOARD_ASS_ID
+from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID
 
-from .common import command_mode
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
 
 
 class AcsOpCodes:
     ACS_ASS_A_SIDE = ["0", "a"]
     ACS_ASS_B_SIDE = ["1", "b"]
-    ACS_ASS_DUAL_MODE = ["2", "dual"]
+    ACS_ASS_DUAL_MODE = ["2", "d"]
     ACS_ASS_OFF = ["3", "off"]
-    ACS_ASS_A_ON = ["4", "a_on"]
-    ACS_ASS_B_ON = ["5", "b_on"]
-    ACS_ASS_DUAL_ON = ["6", "dual_on"]
-
-
-class SusOpCodes:
-    SUS_ASS_NOM_SIDE = ["0", "nom"]
-    SUS_ASS_RED_SIDE = ["1", "red"]
-    SUS_ASS_DUAL_MODE = ["2", "dual"]
-    SUS_ASS_OFF = ["3", "off"]
+    ACS_ASS_A_ON = ["4", "ao"]
+    ACS_ASS_B_ON = ["5", "bo"]
+    ACS_ASS_DUAL_ON = ["6", "do"]
 
 
 class DualSideSubmodes(enum.IntEnum):
@@ -30,9 +30,12 @@ class DualSideSubmodes(enum.IntEnum):
     DUAL_SIDE = 2
 
 
-def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
+@service_provider(CustomServiceList.ACS_BRD_ASS)
+def pack_acs_command(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
     if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.NORMAL,
             submode=DualSideSubmodes.A_SIDE,
@@ -40,7 +43,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
             info="Switching to ACS board assembly A side",
         )
     if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.NORMAL,
             submode=DualSideSubmodes.B_SIDE,
@@ -48,7 +51,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
             info="Switching to ACS board assembly B side",
         )
     if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.NORMAL,
             submode=DualSideSubmodes.DUAL_SIDE,
@@ -56,7 +59,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
             info="Switching to ACS board assembly dual mode",
         )
     if op_code in AcsOpCodes.ACS_ASS_A_ON:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.ON,
             submode=DualSideSubmodes.A_SIDE,
@@ -64,7 +67,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
             info="Switching ACS board assembly A side on",
         )
     if op_code in AcsOpCodes.ACS_ASS_B_ON:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.ON,
             submode=DualSideSubmodes.B_SIDE,
@@ -72,7 +75,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
             info="Switching ACS board assembly B side on",
         )
     if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.ON,
             submode=DualSideSubmodes.B_SIDE,
@@ -80,7 +83,7 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
             info="Switching ACS board assembly dual side on",
         )
     if op_code in AcsOpCodes.ACS_ASS_OFF:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=ACS_BOARD_ASS_ID,
             mode=Modes.OFF,
             submode=0,
@@ -89,36 +92,39 @@ def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
         )
 
 
-def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in SusOpCodes.SUS_ASS_NOM_SIDE:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.A_SIDE,
-            q=q,
-            info="Switching to SUS board to nominal side",
-        )
-    if op_code in SusOpCodes.SUS_ASS_RED_SIDE:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.B_SIDE,
-            q=q,
-            info="Switching to SUS board to redundant side",
-        )
-    if op_code in SusOpCodes.SUS_ASS_OFF:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.OFF,
-            submode=0,
-            q=q,
-            info="Switching SUS board off",
-        )
-    if op_code in SusOpCodes.SUS_ASS_DUAL_MODE:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.DUAL_SIDE,
-            q=q,
-            info="Switching to SUS board to dual side",
-        )
+@tmtc_definitions_provider
+def add_acs_board_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_A_SIDE,
+        info="Switch to ACS board A side",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_B_SIDE,
+        info="Switch to ACS board B side",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_DUAL_MODE,
+        info="Switch to ACS board dual mode",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_A_ON,
+        info="Switch ACS board A side on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_B_ON,
+        info="Switch ACS board B side on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_DUAL_ON,
+        info="Switch ACS board dual mode on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_OFF,
+        info="Switch off ACS board",
+    )
+    defs.add_service(
+        name=CustomServiceList.ACS_BRD_ASS.value,
+        info="ACS Board Assemblie",
+        op_code_entry=oce,
+    )

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -2,11 +2,11 @@ import enum
 import socket
 import struct
 from socket import AF_INET
-from typing import Tuple, Optional
+from typing import Tuple
 
-from config.definitions import CustomServiceList
-from config.object_ids import ACS_CONTROLLER
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import ACS_CONTROLLER
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd import get_console_logger
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,

eive_tmtc/tmtc/acs/acs_subsystem.py

@@ -0,0 +1,85 @@
+import enum
+from typing import Tuple, Dict
+
+from spacepackets.ecss import PusTelecommand
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from eive_tmtc.config.object_ids import ACS_SUBSYSTEM_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCodes(str, enum.Enum):
+    OFF = "off"
+    SAFE = "safe"
+    DETUMBLE = "detumble"
+    IDLE = "idle"
+    TARGET_PT = "target"
+    REPORT_ALL_MODES = "all_modes"
+
+
+class AcsModes(enum.IntEnum):
+    OFF = 0
+    SAFE = 1 << 24
+    DETUMBLE = 2 << 24
+    IDLE = 3 << 24
+    TARGET_PT = 4 << 24
+
+
+class Info(str, enum.Enum):
+    OFF = "Off Command"
+    SAFE = "Safe Mode Command"
+    DETUMBLE = "Detumble Mode Command"
+    IDLE = "Idle Mode Command"
+    TARGET_PT = "Target Pointing Mode Command"
+    REPORT_ALL_MODES = "Report All Modes Recursively"
+
+
+HANDLER_LIST: Dict[str, Tuple[int, str]] = {
+    OpCodes.OFF: (AcsModes.OFF, Info.OFF),
+    OpCodes.IDLE: (AcsModes.IDLE, Info.IDLE),
+    OpCodes.SAFE: (AcsModes.SAFE, Info.SAFE),
+    OpCodes.DETUMBLE: (AcsModes.DETUMBLE, Info.DETUMBLE),
+}
+
+
+@service_provider(CustomServiceList.ACS_SS.value)
+def build_acs_subsystem_cmd(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    info_prefix = "ACS Subsystem"
+    if op_code in OpCodes.REPORT_ALL_MODES:
+        q.add_log_cmd(f"{info_prefix}: {Info.REPORT_ALL_MODES}")
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=ModeSubservices.TC_MODE_ANNOUNCE_RECURSIVE,
+                app_data=ACS_SUBSYSTEM_ID,
+            )
+        )
+    mode_info_tup = HANDLER_LIST.get(op_code)
+    if mode_info_tup is None:
+        return
+    pack_mode_cmd_with_info(
+        object_id=ACS_SUBSYSTEM_ID,
+        info=f"{info_prefix}: {mode_info_tup[1]}",
+        submode=0,
+        mode=mode_info_tup[0],
+        q=q,
+    )
+
+
+@tmtc_definitions_provider
+def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCodes.OFF, Info.OFF)
+    oce.add(OpCodes.SAFE, Info.SAFE)
+    oce.add(OpCodes.IDLE, Info.IDLE)
+    oce.add(OpCodes.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
+    defs.add_service(CustomServiceList.ACS_SS, "ACS Subsystem", oce)

eive_tmtc/tmtc/acs/imtq.py

@@ -7,8 +7,8 @@
 """
 import struct
 
-from config.definitions import CustomServiceList
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,

eive_tmtc/tmtc/acs/reaction_wheels.py

@@ -7,8 +7,8 @@
 import struct
 from typing import List
 
-from pus_tm.defs import PrintWrapper
-from config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
@@ -21,7 +21,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
 )
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 

eive_tmtc/tmtc/acs/sus_board.py

@@ -0,0 +1,83 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import SUS_BOARD_ASS_ID
+from eive_tmtc.tmtc.acs.acs_board import DualSideSubmodes
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_modes import Modes
+
+
+class SusOpCodes:
+    SUS_ASS_NOM_SIDE = ["0", "nom"]
+    SUS_ASS_RED_SIDE = ["1", "red"]
+    SUS_ASS_DUAL_MODE = ["2", "dual"]
+    SUS_ASS_OFF = ["3", "off"]
+
+
+@service_provider(CustomServiceList.SUS_BRD_ASS)
+def pack_sus_cmds(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    if op_code in SusOpCodes.SUS_ASS_NOM_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.A_SIDE,
+            q=q,
+            info="Switching to SUS board to nominal side",
+        )
+    if op_code in SusOpCodes.SUS_ASS_RED_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.B_SIDE,
+            q=q,
+            info="Switching to SUS board to redundant side",
+        )
+    if op_code in SusOpCodes.SUS_ASS_OFF:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.OFF,
+            submode=0,
+            q=q,
+            info="Switching SUS board off",
+        )
+    if op_code in SusOpCodes.SUS_ASS_DUAL_MODE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.DUAL_SIDE,
+            q=q,
+            info="Switching to SUS board to dual side",
+        )
+
+
+@tmtc_definitions_provider
+def add_sus_board_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_NOM_SIDE,
+        info="Switch SUS board to nominal side",
+    )
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_RED_SIDE,
+        info="Switch SUS board to redundant side",
+    )
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_OFF,
+        info="Switch off SUS board",
+    )
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_DUAL_MODE,
+        info="Switch SUS board to dual mode",
+    )
+    defs.add_service(
+        name=CustomServiceList.SUS_BRD_ASS.value,
+        info="SUS Board Assembly",
+        op_code_entry=oce,
+    )

eive_tmtc/tmtc/common.py

@@ -3,18 +3,25 @@ from typing import Union
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+from tmtccmd.util import ObjectIdU32
 
 
-def command_mode(
-    object_id: bytes,
+def pack_mode_cmd_with_info(
+    object_id: Union[ObjectIdU32, bytes],
     mode: Union[int, Modes],
     submode: int,
     q: DefaultPusQueueHelper,
     info: str,
 ):
+    if isinstance(object_id, ObjectIdU32):
+        object_id_bytes = object_id.as_bytes
+    elif isinstance(object_id, bytes):
+        object_id_bytes = object_id
+    else:
+        raise ValueError("Invalid Object ID type")
     q.add_log_cmd(info)
     mode_data = pack_mode_data(
-        object_id=object_id,
+        object_id=object_id_bytes,
         mode=mode,
         submode=submode,
     )

eive_tmtc/tmtc/payload/pl_subsystem.py

@@ -0,0 +1,65 @@
+import enum
+from typing import Dict, Tuple
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import PL_SUBSYSTEM_ID
+from spacepackets.ecss import PusTelecommand
+from eive_tmtc.tmtc.common import pack_mode_cmd_with_info
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config.tmtc import tmtc_definitions_provider
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_modes import Subservices as ModeSubservices
+
+
+class OpCodes(str, enum.Enum):
+    OFF = "off"
+    REPORT_ALL_MODES = "report_modes"
+
+
+class PayloadModes(enum.IntEnum):
+    OFF = 0
+
+
+class Info(str, enum.Enum):
+    OFF = "Off Command"
+    REPORT_ALL_MODES = "Report all modes"
+
+
+HANDLER_LIST: Dict[str, Tuple[int, str]] = {
+    OpCodes.OFF: (PayloadModes.OFF, Info.OFF),
+}
+
+
+@service_provider(CustomServiceList.PL_SS)
+def build_acs_subsystem_cmd(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    info_prefix = "ACS Subsystem"
+    if op_code in OpCodes.REPORT_ALL_MODES:
+        q.add_log_cmd(f"{info_prefix}: {Info.REPORT_ALL_MODES}")
+        q.add_pus_tc(
+            PusTelecommand(
+                service=200,
+                subservice=ModeSubservices.TC_MODE_ANNOUNCE_RECURSIVE,
+                app_data=PL_SUBSYSTEM_ID,
+            )
+        )
+    mode_info_tup = HANDLER_LIST.get(op_code)
+    if mode_info_tup is None:
+        return
+    pack_mode_cmd_with_info(
+        object_id=PL_SUBSYSTEM_ID,
+        info=f"{info_prefix}: {mode_info_tup[1]}",
+        submode=0,
+        mode=mode_info_tup[0],
+        q=q,
+    )
+
+
+@tmtc_definitions_provider
+def add_payload_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCodes.OFF, Info.OFF)
+    oce.add(OpCodes.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
+    defs.add_service(CustomServiceList.PL_SS, "Payload Subsystem", oce)

eive_tmtc/tmtc/payload/ploc_memory_dumper.py

@@ -8,7 +8,7 @@
 """
 import struct
 
-from config.definitions import CustomServiceList
+from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config import TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry

eive_tmtc/tmtc/payload/ploc_mpsoc.py

@@ -9,8 +9,8 @@
 import struct
 import enum
 
-from config.definitions import CustomServiceList
-from config.object_ids import get_object_ids, PLOC_MPSOC_ID
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import get_object_ids, PLOC_MPSOC_ID
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
     OpCodeEntry,
@@ -18,10 +18,9 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc import DefaultPusQueueHelper, service_provider
+from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.util import ObjectIdU32
-from utility.input_helper import InputHelper
+from eive_tmtc.utility.input_helper import InputHelper
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
 
 LOGGER = get_console_logger()

eive_tmtc/tmtc/payload/ploc_supervisor.py

@@ -9,9 +9,9 @@
 import enum
 import struct
 
-from config.object_ids import PLOC_SUPV_ID, get_object_ids
-from config.definitions import CustomServiceList
-from pus_tm.defs import PrintWrapper
+from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
 from tmtccmd.config import TmtcDefinitionWrapper
@@ -22,7 +22,7 @@ from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
 from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from utility.input_helper import InputHelper
+from eive_tmtc.utility.input_helper import InputHelper
 
 LOGGER = get_console_logger()
 
@@ -36,9 +36,12 @@ latchup_id_dict = {
     "6": "SAFECOTS",
 }
 
+HARDCODED = "0"
 MANUAL_INPUT = "1"
+HARDCODED_FILE = "/home/rmueller/EIVE/mpsoc_boot.bin"
 
 update_file_dict = {
+    HARDCODED: ["hardcoded", ""],
     MANUAL_INPUT: ["manual input", ""],
     "2": ["/mnt/sd0/ploc/supervisor/update.bin", "/mnt/sd0/ploc/supervisor/update.bin"],
     "3": [
@@ -125,6 +128,8 @@ class OpCodes:
     START_MPSOC = ["5", "start_mpsoc"]
     SHUTDOWN_MPSOC = ["6", "stop_mpsoc"]
     SEL_NVM = ["7", "sel_nvm"]
+    SET_TIME_REF = ["set_time_ref"]
+    FACTORY_FLASH = ["factory_flash"]
     REQ_BOOT_STATUS_REPORT = ["13", "boot_report"]
     START_UPDATE = ["42", "start_update"]
     PERFORM_UPDATE = ["update"]
@@ -138,6 +143,8 @@ class Info(str, enum.Enum):
     NML = "Switch Normal"
     HK_TO_OBC = "Request  HK from PLOC SUPV"
     REQUEST_HK = "Request HK set from PLOC Handler"
+    SET_TIME_REF = "Set time reference"
+    FACTORY_FLASH = "Factory Flash Mode"
     PERFORM_UPDATE = "Start or continue MPSoC SW update at starting bytes"
     START_UPDATE = "Start new MPSoC SW update"
     REQ_BOOT_STATUS_REPORT = "Request boot status report and HK"
@@ -157,9 +164,9 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCodes.START_MPSOC, "PLOC Supervisor: Start MPSoC")
     oce.add(OpCodes.SHUTDOWN_MPSOC, "PLOC Supervisor: Shutdown MPSoC")
     oce.add(OpCodes.SEL_NVM, Info.SEL_NVM)
+    oce.add(OpCodes.SET_TIME_REF, Info.SET_TIME_REF)
     oce.add("8", "PLOC Supervisor: Set max restart tries")
     oce.add("9", "PLOC Supervisor: Reset MPSoC")
-    oce.add("10", "PLOC Supervisor: Set time reference")
     oce.add("11", "PLOC Supervisor: Set boot timeout")
     oce.add("12", "PLOC Supervisor: Disable Hk")
     oce.add(OpCodes.REQ_BOOT_STATUS_REPORT, Info.REQ_BOOT_STATUS_REPORT)
@@ -184,7 +191,7 @@ def add_ploc_supv_cmds(defs: TmtcDefinitionWrapper):
     oce.add("43", "PLOC Supervisor: Terminate supervisor process")
     oce.add("44", "PLOC Supervisor: Start MPSoC quiet")
     oce.add("45", "PLOC Supervisor: Set shutdown timeout")
-    oce.add("46", "PLOC Supervisor: Factory flash")
+    oce.add(OpCodes.FACTORY_FLASH, Info.FACTORY_FLASH)
     oce.add("47", "PLOC Supervisor: Enable auto TM")
     oce.add("48", "PLOC Supervisor: Disable auto TM")
     oce.add("51", "PLOC Supervisor: Logging request event buffers")
@@ -257,7 +264,7 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         q.add_log_cmd("PLOC Supervisor: Reset MPSoC")
         command = object_id.as_bytes + struct.pack("!I", SupvActionIds.RESET_MPSOC)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "10":
+    if op_code in OpCodes.SET_TIME_REF:
         q.add_log_cmd("PLOC Supervisor: Set time reference")
         command = object_id.as_bytes + struct.pack("!I", SupvActionIds.SET_TIME_REF)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
@@ -384,8 +391,8 @@ def pack_ploc_supv_commands(p: ServiceProviderParams):
         q.add_log_cmd("PLOC Supervisor: Set shutdown timeout")
         command = pack_set_shutdown_timeout_command(object_id.as_bytes)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "46":
-        q.add_log_cmd("PLOC Supervisor: Factory flash")
+    if op_code in OpCodes.FACTORY_FLASH:
+        q.add_log_cmd(f"{prefix}: {Info.FACTORY_FLASH}")
         command = object_id.as_bytes + struct.pack("!I", SupvActionIds.FACTORY_FLASH)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
     if op_code == "47":
@@ -680,7 +687,9 @@ 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:
+    if key == HARDCODED:
+        file = HARDCODED_FILE
+    elif key == MANUAL_INPUT:
         file = input("Ploc Supervisor: Specify absolute name of update file: ")
     else:
         file = update_file_dict[key][1]

eive_tmtc/tmtc/power/acu.py

@@ -3,21 +3,25 @@
 @author J. Meier, R. Mueller
 @date   21.12.2020
 """
+import struct
 
-from config.definitions import CustomServiceList
-from tmtc.power.common_power import (
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.tmtc.power.common_power import (
     pack_common_gomspace_cmds,
     add_gomspace_cmd_defs,
     req_hk_cmds,
     pack_common_power_cmds,
     SetIds,
+    OBC_ENDIANNESS,
+    unpack_array_in_data,
 )
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 
 from tmtccmd.tc import DefaultPusQueueHelper
-import gomspace.gomspace_common as gs
-from config.object_ids import ACU_HANDLER_ID
+import eive_tmtc.gomspace.gomspace_common as gs
+from eive_tmtc.config.object_ids import ACU_HANDLER_ID
 from tmtccmd.util import ObjectIdU32
 
 
@@ -165,3 +169,22 @@ def pack_test_cmds(object_id: ObjectIdU32, q: DefaultPusQueueHelper):
                 ACUConfigTable.ov_mode.parameter_size,
             )
         )
+
+
+def acu_config_table_handler(pw: PrintWrapper, custom_data: bytes):
+    mppt_mode = custom_data[0]
+    mppt_delta_mode = custom_data[1]
+    vboost_list = unpack_array_in_data(custom_data, 0x02, 2, 6, "H")
+    vbat_max_hi = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x10 : 0x10 + 2])[0]
+    vbat_max_lo = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x12 : 0x12 + 2])[0]
+    mppt_period = struct.unpack(f"{OBC_ENDIANNESS}I", custom_data[0x14 : 0x14 + 4])[0]
+    max_dv = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x18 : 0x18 + 2])[0]
+    ov_mode = custom_data[0x1A]
+    pw.dlog(f"{'mppt_mode'.ljust(15)}: {mppt_mode}")
+    pw.dlog(f"{'mppt_delta_mode'.ljust(15)}: {mppt_delta_mode}")
+    pw.dlog(f"{'vboost_list'.ljust(15)}: {vboost_list}")
+    pw.dlog(f"{'vbat_max_hi'.ljust(15)}: {vbat_max_hi}")
+    pw.dlog(f"{'vbat_max_lo'.ljust(15)}: {vbat_max_lo}")
+    pw.dlog(f"{'mppt_period'.ljust(15)}: {mppt_period}")
+    pw.dlog(f"{'max_dv'.ljust(15)}: {max_dv}")
+    pw.dlog(f"{'ov_mode'.ljust(15)}: {ov_mode}")

eive_tmtc/tmtc/power/common_power.py

@@ -1,4 +1,7 @@
-from gomspace.gomspace_common import (
+import struct
+from typing import List
+
+from eive_tmtc.gomspace.gomspace_common import (
     pack_set_u8_param_command,
     Channel,
     GomspaceDeviceActionIds,
@@ -8,7 +11,7 @@ from gomspace.gomspace_common import (
     pack_gnd_wdt_reset_command,
     ParamTypes,
 )
-from gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST
+from eive_tmtc.gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config import OpCodeEntry
 from tmtccmd.tc import DefaultPusQueueHelper
@@ -309,3 +312,18 @@ def add_gomspace_cmd_defs(oce: OpCodeEntry):
     oce.add(keys=GomspaceOpCodes.SAVE_TABLE_DEFAULT, info=GsInfo.SAVE_TABLE_DEFAULT)
     oce.add(keys=GomspaceOpCodes.LOAD_TABLE, info=GsInfo.LOAD_TABLE)
     oce.add(keys=GomspaceOpCodes.RESET_GND_WATCHDOG, info=GsInfo.RESET_GND_WATCHDOG)
+
+
+OBC_ENDIANNESS = "<"
+
+
+def unpack_array_in_data(
+    data: bytes, start_addr: int, width: int, entries: int, struct_spec: str
+) -> List:
+    return [
+        struct.unpack(
+            f"{OBC_ENDIANNESS}{struct_spec}",
+            data[start_addr + (i * width) : start_addr + ((i + 1) * width)],
+        )[0]
+        for i in range(entries)
+    ]

eive_tmtc/tmtc/power/p60dock.py

@@ -5,14 +5,14 @@
 @author J. Meier
 @date   13.12.2020
 """
-from tmtc.power.common_power import (
+from eive_tmtc.tmtc.power.common_power import (
     pack_common_gomspace_cmds,
     req_hk_cmds,
     pack_common_power_cmds,
     SetIds,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
-from gomspace.gomspace_common import (
+from eive_tmtc.gomspace.gomspace_common import (
     TableEntry,
     Channel,
     TableIds,
@@ -23,7 +23,7 @@ from gomspace.gomspace_common import (
     pack_set_u8_param_command,
     pack_set_u16_param_command,
 )
-from config.object_ids import P60_DOCK_HANDLER
+from eive_tmtc.config.object_ids import P60_DOCK_HANDLER
 from tmtccmd.util import ObjectIdU32
 
 

eive_tmtc/tmtc/power/pdu1.py

@@ -3,9 +3,9 @@
 @author J. Meier
 @date   17.12.2020
 """
-from config.definitions import CustomServiceList
-from config.object_ids import PDU_1_HANDLER_ID
-from tmtc.power.common_power import (
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import PDU_1_HANDLER_ID
+from eive_tmtc.tmtc.power.common_power import (
     pack_common_gomspace_cmds,
     req_hk_cmds,
     PowerOpCodes,
@@ -20,8 +20,8 @@ from tmtc.power.common_power import (
     SetIds,
 )
 
-from gomspace.gomspace_common import *
-from gomspace.gomspace_pdu_definitions import *
+from eive_tmtc.gomspace.gomspace_common import *
+from eive_tmtc.gomspace.gomspace_pdu_definitions import *
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 

eive_tmtc/tmtc/power/pdu2.py

@@ -6,8 +6,8 @@
 @author J. Meier
 @date   17.12.2020
 """
-from config.object_ids import PDU_2_HANDLER_ID
-from tmtc.power.common_power import (
+from eive_tmtc.config.object_ids import PDU_2_HANDLER_ID
+from eive_tmtc.tmtc.power.common_power import (
     pack_common_gomspace_cmds,
     req_hk_cmds,
     PowerOpCodes,
@@ -18,8 +18,8 @@ from tmtc.power.common_power import (
     SetIds,
     add_common_power_defs,
 )
-from gomspace.gomspace_common import *
-from gomspace.gomspace_pdu_definitions import *
+from eive_tmtc.gomspace.gomspace_common import *
+from eive_tmtc.gomspace.gomspace_pdu_definitions import *
 from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 

eive_tmtc/tmtc/power/power.py

@@ -1,24 +1,24 @@
-from tmtc.power.common_power import (
+from eive_tmtc.tmtc.power.common_power import (
     PowerOpCodes,
     PowerInfo,
     add_gomspace_cmd_defs,
     pack_reset_gnd_wdt_cmd,
 )
-from config.definitions import CustomServiceList
-from config.object_ids import (
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import (
     P60_DOCK_HANDLER,
     ACU_HANDLER_ID,
     PDU_1_HANDLER_ID,
     PDU_2_HANDLER_ID,
     get_object_ids,
 )
-from tmtc.power.pdu1 import (
+from eive_tmtc.tmtc.power.pdu1 import (
     pdu1_req_hk_cmds,
     pdu1_switch_cmds,
     add_pdu1_common_defs,
     add_pdu1_cmds,
 )
-from tmtc.power.pdu2 import (
+from eive_tmtc.tmtc.power.pdu2 import (
     pdu2_req_hk_cmds,
     add_pdu2_common_defs,
     pdu2_cmds,
@@ -27,8 +27,8 @@ from tmtc.power.pdu2 import (
 from tmtccmd import get_console_logger
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 
-from tmtc.power.p60dock import P60OpCodes, P60Info, p60_dock_req_hk_cmds
-from tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds
+from eive_tmtc.tmtc.power.p60dock import P60OpCodes, P60Info, p60_dock_req_hk_cmds
+from eive_tmtc.tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 

eive_tmtc/tmtc/power/tm.py

@@ -1,12 +1,17 @@
 import struct
 from typing import List, Tuple
 
-from tmtc.power.common_power import SetIds
+from eive_tmtc.tmtc.power.acu import acu_config_table_handler
+from eive_tmtc.tmtc.power.common_power import (
+    SetIds,
+    unpack_array_in_data,
+    OBC_ENDIANNESS,
+)
 from tmtccmd.util import ObjectIdBase
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
-from pus_tm.defs import PrintWrapper
-from gomspace.gomspace_common import GomspaceDeviceActionIds
-from config.object_ids import (
+from eive_tmtc.pus_tm.defs import PrintWrapper
+from eive_tmtc.gomspace.gomspace_common import GomspaceDeviceActionIds
+from eive_tmtc.config.object_ids import (
     PDU_1_HANDLER_ID,
     PDU_2_HANDLER_ID,
     P60_DOCK_HANDLER,
@@ -431,9 +436,6 @@ def handle_acu_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
         printer.print_validity_buffer(validity_buffer=hk_data[current_idx:], num_vars=8)
 
 
-OBC_ENDIANNESS = "<"
-
-
 def handle_get_param_data_reply(
     obj_id: ObjectIdBase, action_id: int, pw: PrintWrapper, custom_data: bytearray
 ):
@@ -514,25 +516,6 @@ def pdu_config_table_handler(
     pw.dlog(f"{'wdt_can'.ljust(15)}: {wdt_can}")
 
 
-def acu_config_table_handler(pw: PrintWrapper, custom_data: bytes):
-    mppt_mode = custom_data[0]
-    mppt_delta_mode = custom_data[1]
-    vboost_list = unpack_array_in_data(custom_data, 0x02, 2, 6, "H")
-    vbat_max_hi = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x10 : 0x10 + 2])[0]
-    vbat_max_lo = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x12 : 0x12 + 2])[0]
-    mppt_period = struct.unpack(f"{OBC_ENDIANNESS}I", custom_data[0x14 : 0x14 + 4])[0]
-    max_dv = struct.unpack(f"{OBC_ENDIANNESS}H", custom_data[0x18 : 0x18 + 2])[0]
-    ov_mode = custom_data[0x1A]
-    pw.dlog(f"{'mppt_mode'.ljust(15)}: {mppt_mode}")
-    pw.dlog(f"{'mppt_delta_mode'.ljust(15)}: {mppt_delta_mode}")
-    pw.dlog(f"{'vboost_list'.ljust(15)}: {vboost_list}")
-    pw.dlog(f"{'vbat_max_hi'.ljust(15)}: {vbat_max_hi}")
-    pw.dlog(f"{'vbat_max_lo'.ljust(15)}: {vbat_max_lo}")
-    pw.dlog(f"{'mppt_period'.ljust(15)}: {mppt_period}")
-    pw.dlog(f"{'max_dv'.ljust(15)}: {max_dv}")
-    pw.dlog(f"{'ov_mode'.ljust(15)}: {ov_mode}")
-
-
 def p60_dock_config_table_handler(pw: PrintWrapper, custom_data: bytes):
     ch_names = parse_name_list(custom_data[0:0x68], 13)
     out_on_cnt = unpack_array_in_data(custom_data, 0x76, 2, 13, "H")
@@ -571,15 +554,3 @@ def parse_name_list(data: bytes, name_len: int):
             idx += len(name)
         idx += 1
     return ch_list
-
-
-def unpack_array_in_data(
-    data: bytes, start_addr: int, width: int, entries: int, struct_spec: str
-) -> List:
-    return [
-        struct.unpack(
-            f"{OBC_ENDIANNESS}{struct_spec}",
-            data[start_addr + (i * width) : start_addr + ((i + 1) * width)],
-        )[0]
-        for i in range(entries)
-    ]

eive_tmtc/tmtc/test.py

@@ -0,0 +1,65 @@
+from spacepackets.ecss import PusTelecommand, PusServices
+from tmtccmd.config import CoreServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.pus.pus_17_test import pack_service_17_ping_command
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCodes:
+    PING = "ping"
+    TRIGGER_EVENT = "trig_event"
+    PING_WITH_DATA = "ping_with_data"
+
+
+class Info:
+    PING = "Simple Ping and Connection Test"
+    TRIGGER_EVENT = "Trigger an event"
+    PING_WITH_DATA = "Ping with data. Size of sent data is sent back"
+
+
+@tmtc_definitions_provider
+def add_test_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCodes.PING, info=Info.PING)
+    oce.add(keys=OpCodes.TRIGGER_EVENT, info=Info.TRIGGER_EVENT)
+    oce.add(keys=OpCodes.PING_WITH_DATA, info=Info.PING_WITH_DATA)
+
+    defs.add_service(
+        name=CoreServiceList.SERVICE_17_ALT,
+        info="PUS 17 Test Service",
+        op_code_entry=oce,
+    )
+
+
+@service_provider(CoreServiceList.SERVICE_17_ALT)
+def pack_test_command(p: ServiceProviderParams):
+    info = p.info
+    q = p.queue_helper
+    if info.op_code == OpCodes.PING:
+        q.add_log_cmd("Sending PUS TC [17,1]")
+        q.add_pus_tc(pack_service_17_ping_command())
+    if info.op_code == OpCodes.TRIGGER_EVENT:
+        q.add_log_cmd("Sending PUS TC Event Trigger [17, 128]")
+        q.add_pus_tc(PusTelecommand(service=PusServices.S17_TEST, subservice=128))
+    if info.op_code == OpCodes.PING_WITH_DATA:
+        q.add_log_cmd("Sending Ping With Data, Size Reported Back [17, 129]")
+        while True:
+            data_size = int(input("Please specify data size [0-1024]: "))
+            if data_size < 0 or data_size > 1024:
+                print("Invalid data size")
+            break
+        dummy_data = bytearray()
+        next_byte = True
+        for i in range(data_size):
+            dummy_data.append(int(next_byte))
+            next_byte = not next_byte
+        q.add_pus_tc(
+            PusTelecommand(
+                service=PusServices.S17_TEST, subservice=130, app_data=dummy_data
+            )
+        )