prep v2.17.3

Reviewed-on: #160

.run/CFDP Test File Large.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="cfdp filetest/obsw_update.bin /tmp/obsw_update.bin -d 0.3" />
+    <option name="PARAMETERS" value="cfdp filetest/obsw_update.bin /tmp/obsw_update.bin -d 0.1" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

.run/CFDP Test File Small Closure.run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CFDP Test File Small Closure" type="PythonConfigurationType" factoryName="Python" folderName="CFDP">
+    <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="cfdp filetest/cfdp_test.txt /tmp/cfdp_test.txt -d 0.2" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

CHANGELOG.md

@@ -10,6 +10,78 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v2.17.3] 2023-03-09
+
+## Fixed
+
+- Fixed the heater object ID names completely. Also,
+  the HPA heater is now the Syrlinks heater.
+
+# [v2.17.2] 2023-03-07
+
+- Updated CSVs
+- New events for core controller
+
+# [v2.17.1] 2023-03-07
+
+## Added
+
+- `MGT_ASSEMBLY` object ID
+
+# [v2.17.0] 2023-03-07
+
+## Added
+
+- Health set and health announce commands
+- Camera Switcher, Syrlinks Assembly, IMTQ assembly and Star Tracker assembly object IDs added
+
+## Changed
+
+- Breaking typo fix in TMP1075 `SetId`
+
+# [v2.16.4] 2023-03-04
+
+## Added
+
+- Some more IMTQ commands
+
+# [v2.16.3] 2023-03-03
+
+## Added
+
+- Syrlinks ASSY object ID
+
+# [v2.16.2] 2023-03-01
+
+## Added
+
+- Added ACS action cmds
+- Added new ACS hk values
+- Added ACS set parameter cmds
+
+## Fixed
+
+- Correction for ACS CTRL raw data requests HK type
+- Fixed diag related ACS hk cmds
+
+## Added
+
+- Basic MGM commanding (modes)
+
+# [v2.16.1] 2023-02-24
+
+- Updated CSVs for new persistent TM store
+
+# [v2.16.0] 2023-02-23
+
+## Added
+
+- PDEC parameter commands to change size of positive and negative window of AD frames.
+
+## Fixed
+
+- Added missing skip directive for private resultcode.
+
 # [v2.15.2] 2023-02-23
 
 - Update of generated returnvalue and event files.
@@ -294,4 +366,4 @@ tmtccmd v4.0.0rc0
 - Extended heater commands for more informative output which component is heated
 
 See [milestones](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/milestones)
-and [releases](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/releases)
+and [releases](https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/releases)

eive_tmtc/__init__.py

@@ -1,12 +1,12 @@
-__version__ = "2.15.2"
+__version__ = "2.17.3"
 
 import logging
 from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
-VERSION_MINOR = 15
-VERSION_REVISION = 2
+VERSION_MINOR = 17
+VERSION_REVISION = 3
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

eive_tmtc/config/definitions.py

@@ -37,6 +37,7 @@ class CustomServiceList(str, enum.Enum):
     ACU = "acu"
     ACS = "acs"
     GYRO = "gyro"
+    MGMS = "mgms"
     COM_SS = "com"
     BPX_BATTERY = "bpx"
     HEATER = "heater"

eive_tmtc/config/events.csv

@@ -84,6 +84,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 10800;0x2a30;STORE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
 10801;0x2a31;MSG_QUEUE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
 10802;0x2a32;SERIALIZATION_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
+10803;0x2a33;FILESTORE_ERROR;LOW;No description;fsfw/src/fsfw/cfdp/handler/defs.h
+10804;0x2a34;FILENAME_TOO_LARGE_ERROR;LOW;P1: Transaction step ID, P2: 0 for source file name, 1 for dest file name;fsfw/src/fsfw/cfdp/handler/defs.h
 11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;No description;mission/acsDefs.h
 11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;No description;mission/acsDefs.h
 11202;0x2bc2;MULTIPLE_RW_INVALID;HIGH;No description;mission/acsDefs.h
@@ -149,7 +151,9 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12406;0x3076;LOST_BIT_LOCK_PDEC;INFO;Lost bit lock;linux/ipcore/PdecHandler.h
 12407;0x3077;TOO_MANY_IRQS;MEDIUM;Too many IRQs over the time window of one second. P1: Allowed TCs;linux/ipcore/PdecHandler.h
 12408;0x3078;POLL_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h
-12409;0x3079;WRITE_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h
+12409;0x3079;WRITE_SYSCALL_ERROR_PDEC;HIGH;No description;linux/ipcore/PdecHandler.h
+12410;0x307a;PDEC_RESET_FAILED;HIGH;Failed to pull PDEC reset to low;linux/ipcore/PdecHandler.h
+12411;0x307b;OPEN_IRQ_FILE_FAILED;HIGH;Failed to open the IRQ uio file;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
@@ -246,12 +250,14 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13904;0x3650;WRITE_CONFIGFILE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
 13905;0x3651;READ_CONFIGFILE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
 14000;0x36b0;ALLOC_FAILURE;MEDIUM;No description;bsp_q7s/core/CoreController.h
-14001;0x36b1;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+14001;0x36b1;REBOOT_SW;LOW; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 14002;0x36b2;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
 14003;0x36b3;REBOOT_HW;MEDIUM;No description;bsp_q7s/core/CoreController.h
 14004;0x36b4;NO_SD_CARD_ACTIVE;HIGH;No SD card was active. Core controller will attempt to re-initialize a SD card.;bsp_q7s/core/CoreController.h
 14005;0x36b5;VERSION_INFO;INFO;P1: Byte 0: Major, Byte 1: Minor, Byte 2: Patch, Byte 3: Has Git Hash P2: First four letters of Git SHA is the last byte of P1 is set.;bsp_q7s/core/CoreController.h
 14006;0x36b6;CURRENT_IMAGE_INFO;INFO;P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+14007;0x36b7;REBOOT_COUNTER;INFO;Total reboot counter, which is the sum of the boot count of all individual images.;bsp_q7s/core/CoreController.h
+14008;0x36b8;INDIVIDUAL_BOOT_COUNTS;INFO;Get the boot count of the individual images. P1: First 16 bits boot count of image 0 0, last 16 bits boot count of image 0 1. P2: First 16 bits boot count of image 1 0, last 16 bits boot count of image 1 1.;bsp_q7s/core/CoreController.h
 14100;0x3714;NO_VALID_SENSOR_TEMPERATURE;MEDIUM;No description;mission/controller/ThermalController.h
 14101;0x3715;NO_HEALTHY_HEATER_AVAILABLE;MEDIUM;No description;mission/controller/ThermalController.h
 14102;0x3716;SYRLINKS_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
@@ -259,3 +265,6 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14104;0x3718;OBC_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
 14105;0x3719;HPA_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
 14106;0x371a;PLPCDU_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
+14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/objects/ComSubsystem.h
+14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/objects/ComSubsystem.h
+14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/tmtc/PersistentTmStore.h

eive_tmtc/config/object_ids.py

@@ -71,14 +71,14 @@ PLOC_MPSOC_ID = bytes([0x44, 0x33, 0x00, 0x15])
 PL_PCDU_ID = bytes([0x44, 0x30, 0x00, 0x00])
 
 # Other
-HEATER_0_OBC_BRD = bytes([0x60, 0x00, 0x00, 0x00])
-HEATER_1_PLOC_PROC_BRD = bytes([0x60, 0x00, 0x00, 0x01])
+HEATER_0_PLOC_PROC_BRD = bytes([0x60, 0x00, 0x00, 0x00])
+HEATER_1_PCDU_BRD = bytes([0x60, 0x00, 0x00, 0x01])
 HEATER_2_ACS_BRD = bytes([0x60, 0x00, 0x00, 0x02])
-HEATER_3_PCDU_BRD = bytes([0x60, 0x00, 0x00, 0x03])
+HEATER_3_OBC_BRD = bytes([0x60, 0x00, 0x00, 0x03])
 HEATER_4_CAMERA = bytes([0x60, 0x00, 0x00, 0x04])
 HEATER_5_STR = bytes([0x60, 0x00, 0x00, 0x05])
 HEATER_6_DRO = bytes([0x60, 0x00, 0x00, 0x06])
-HEATER_7_HPA = bytes([0x60, 0x00, 0x00, 0x07])
+HEATER_7_SYRLINKS = bytes([0x60, 0x00, 0x00, 0x07])
 
 # RTDs
 RTD_0_PLOC_HSPD = bytes([0x44, 0x42, 0x00, 0x16])
@@ -132,10 +132,21 @@ PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
 TCS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x03])
 COM_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x04])
 
+# Legacy names, kept for backwards compatibility
 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])
+SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
+IMTQ_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x08])
+
+ACS_BOARD_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x01])
+SUS_BOARD_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x02])
+TCS_BOARD_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x03])
 RW_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x04])
+CAM_SWITCHER = bytes([0x73, 0x00, 0x00, 0x06])
+SYRLINKS_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x07])
+# To be removed soon..
+MGT_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x08])
+STR_ASSEMBLY = bytes([0x73, 0x00, 0x00, 0x09])
 
 # Controllers
 TCS_CONTROLLER = bytes([0x43, 0x40, 0x00, 0x01])

eive_tmtc/config/objects.csv

@@ -77,11 +77,13 @@
 0x49010005;GPIO_IF
 0x49010006;SCEX_UART_READER
 0x49020004;SPI_MAIN_COM_IF
-0x49020005;RW_POLLING_TASK
-0x49020006;SPI_RTD_COM_IF
 0x49030003;UART_COM_IF
 0x49040002;I2C_COM_IF
 0x49050001;CSP_COM_IF
+0x49060004;ACS_BOARD_POLLING_TASK
+0x49060005;RW_POLLING_TASK
+0x49060006;SPI_RTD_COM_IF
+0x49060007;SUS_POLLING_TASK
 0x50000100;CCSDS_PACKET_DISTRIBUTOR
 0x50000200;PUS_PACKET_DISTRIBUTOR
 0x50000300;TCP_TMTC_SERVER
@@ -102,6 +104,7 @@
 0x53000008;PUS_SERVICE_8_FUNCTION_MGMT
 0x53000009;PUS_SERVICE_9_TIME_MGMT
 0x53000011;PUS_SERVICE_11_TC_SCHEDULER
+0x53000015;PUS_SERVICE_15_TM_STORAGE
 0x53000017;PUS_SERVICE_17_TEST
 0x53000020;PUS_SERVICE_20_PARAMETERS
 0x53000200;PUS_SERVICE_200_MODE_MGMT
@@ -136,8 +139,11 @@
 0x73000001;ACS_BOARD_ASS
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS
-0x73000004;RW_ASS
+0x73000004;RW_ASSY
 0x73000006;CAM_SWITCHER
+0x73000007;SYRLINKS_ASSY
+0x73000008;IMTQ_ASSY
+0x73000009;STR_ASSY
 0x73000100;TM_FUNNEL
 0x73000101;PUS_TM_FUNNEL
 0x73000102;CFDP_TM_FUNNEL
@@ -148,6 +154,11 @@
 0x73010002;PL_SUBSYSTEM
 0x73010003;TCS_SUBSYSTEM
 0x73010004;COM_SUBSYSTEM
+0x73020001;MISC_TM_STORE
+0x73020002;OK_TM_STORE
+0x73020003;NOT_OK_TM_STORE
+0x73020004;HK_TM_STORE
+0x73030000;CFDP_TM_STORE
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0x90000003;THERMAL_TEMP_INSERTER
 0xFFFFFFFF;NO_OBJECT

eive_tmtc/config/returnvalues.csv

@@ -1,8 +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
-0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
-0x6300;NVMB_Busy;No description;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.h
+0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.h
 0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
@@ -21,8 +20,8 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x52b5;RWHA_NoReply;Reaction wheel only responds with empty frames.;181;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h
 0x52b6;RWHA_NoStartMarker;Expected a start marker as first byte;182;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h
 0x52b7;RWHA_SpiReadTimeout;Timeout when reading reply;183;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h
-0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/devices/SusHandler.h
-0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/devices/SusHandler.h
+0x58a0;SUSS_ErrorUnlockMutex;No description;160;SUS_HANDLER;mission/devices/LegacySusHandler.h
+0x58a1;SUSS_ErrorLockMutex;No description;161;SUS_HANDLER;mission/devices/LegacySusHandler.h
 0x66a0;SADPL_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;SA_DEPL_HANDLER;mission/devices/RwHandler.h
 0x66a1;SADPL_InvalidRampTime;Action Message with invalid ramp time was received.;161;SA_DEPL_HANDLER;mission/devices/RwHandler.h
 0x66a2;SADPL_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;SA_DEPL_HANDLER;mission/devices/RwHandler.h
@@ -50,16 +49,17 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4fa4;HEATER_MainSwitchSetTimeout;No description;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x4fa5;HEATER_CommandAlreadyWaiting;No description;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
-0x6a01;ACSSAF_SafectrlMekfInputInvalid;No description;1;ACS_SAFE;mission/controller/acs/control/SafeCtrl.h
-0x6b01;ACSPTG_PtgctrlMekfInputInvalid;No description;1;ACS_PTG;mission/controller/acs/control/PtgCtrl.h
-0x6c01;ACSDTB_DetumbleNoSensordata;No description;1;ACS_DETUMBLE;mission/controller/acs/control/Detumble.h
-0x6902;ACSKAL_KalmanUninitialized;No description;2;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6903;ACSKAL_KalmanNoGyrData;No description;3;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6904;ACSKAL_KalmanNoModelVectors;No description;4;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6905;ACSKAL_KalmanNoSusMgmStrData;No description;5;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6906;ACSKAL_KalmanCovarianceInversionFailed;No description;6;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6907;ACSKAL_KalmanInitialized;No description;7;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6908;ACSKAL_KalmanRunning;No description;8;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6b01;ACSSAF_SafectrlMekfInputInvalid;No description;1;ACS_SAFE;mission/controller/acs/control/SafeCtrl.h
+0x6c01;ACSPTG_PtgctrlMekfInputInvalid;No description;1;ACS_PTG;mission/controller/acs/control/PtgCtrl.h
+0x6d01;ACSDTB_DetumbleNoSensordata;No description;1;ACS_DETUMBLE;mission/controller/acs/control/Detumble.h
+0x6a02;ACSMEKF_MekfUninitialized;No description;2;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a03;ACSMEKF_MekfNoGyrData;No description;3;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a04;ACSMEKF_MekfNoModelVectors;No description;4;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a05;ACSMEKF_MekfNoSusMgmStrData;No description;5;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a06;ACSMEKF_MekfCovarianceInversionFailed;No description;6;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a07;ACSMEKF_MekfInitialized;No description;7;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a08;ACSMEKF_MekfRunning;No description;8;ACS_MEKF;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6900;ACSCTRL_FileDeletionFailed;No description;0;ACS_CTRL;mission/controller/AcsController.h
 0x4500;HSPI_OpeningFileFailed;No description;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4501;HSPI_FullDuplexTransferFailed;No description;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4502;HSPI_HalfDuplexTransferFailed;No description;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
@@ -474,19 +474,20 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x1d03;ATC_IllegalApplicationData;No description;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
 0x1d04;ATC_SendTmFailed;No description;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
 0x1d05;ATC_Timeout;No description;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x7000;SCBU_KeyNotFound;No description;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
+0x7100;SCBU_KeyNotFound;No description;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
+0x6f00;LPH_SdNotReady;No description;0;LOCAL_PARAM_HANDLER;bsp_q7s/memory/LocalParameterHandler.h
 0x64a0;FSHLP_SdNotMounted;SD card specified with path string not mounted;160;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
 0x64a1;FSHLP_FileNotExists;Specified file does not exist on filesystem;161;FILE_SYSTEM_HELPER;bsp_q7s/fs/FilesystemHelper.h
-0x6f00;SDMA_OpOngoing;No description;0;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f01;SDMA_AlreadyOn;No description;1;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f02;SDMA_AlreadyMounted;No description;2;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f03;SDMA_AlreadyOff;No description;3;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f0a;SDMA_StatusFileNexists;No description;10;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f0b;SDMA_StatusFileFormatInvalid;No description;11;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f0c;SDMA_MountError;No description;12;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f0d;SDMA_UnmountError;No description;13;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f0e;SDMA_SystemCallError;No description;14;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6f0f;SDMA_PopenCallError;No description;15;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e00;SDMA_OpOngoing;No description;0;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e01;SDMA_AlreadyOn;No description;1;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e02;SDMA_AlreadyMounted;No description;2;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e03;SDMA_AlreadyOff;No description;3;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e0a;SDMA_StatusFileNexists;No description;10;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e0b;SDMA_StatusFileFormatInvalid;No description;11;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e0c;SDMA_MountError;No description;12;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e0d;SDMA_UnmountError;No description;13;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e0e;SDMA_SystemCallError;No description;14;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6e0f;SDMA_PopenCallError;No description;15;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
 0x65a0;PLMPHLP_FileClosedAccidentally;File accidentally close;160;PLOC_MPSOC_HELPER;linux/devices/ploc/PlocMPSoCHelper.h
 0x5ea0;PLMEMDUMP_MramAddressTooHigh;The capacity of the MRAM amounts to 512 kB. Thus the maximum address must not be higher than 0x7d000.;160;PLOC_MEMORY_DUMPER;linux/devices/ploc/PlocMemoryDumper.h
 0x5ea1;PLMEMDUMP_MramInvalidAddressCombination;The specified end address is lower than the start address;161;PLOC_MEMORY_DUMPER;linux/devices/ploc/PlocMemoryDumper.h

eive_tmtc/pus_tc/cmd_definitions.py

@@ -21,76 +21,3 @@ def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
     )
     call_all_definitions_providers(def_wrapper)
     return def_wrapper
-
-
-@tmtc_definitions_provider
-def add_pdec_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add("0", "PDEC Handler: Print CLCW")
-    oce.add("1", "PDEC Handler: Print PDEC monitor")
-    defs.add_service(CustomServiceList.PDEC_HANDLER.value, "PDEC Handler", oce)
-
-
-@tmtc_definitions_provider
-def add_str_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add("0", "Star Tracker: Mode On, Submode Bootloader")
-    oce.add("1", "Star Tracker: Mode On, Submode Firmware")
-    oce.add("2", "Star Tracker: Mode Normal")
-    oce.add("3", "Star Tracker: Mode Off")
-    oce.add("4", "Star Tracker: Mode Raw")
-    oce.add("5", "Star Tracker: Ping")
-    oce.add("6", "Star Tracker: Switch to bootloader program")
-    oce.add("7", "Star Tracker: Request temperature")
-    oce.add("8", "Star Tracker: Request version")
-    oce.add("9", "Star Tracker: Request interface")
-    oce.add("10", "Star Tracker: Request power")
-    oce.add("11", "Star Tracker: Set subscription parameters")
-    oce.add("12", "Star Tracker: Boot image (requires bootloader mode)")
-    oce.add("13", "Star Tracker: Request time")
-    oce.add("14", "Star Tracker: Request solution")
-    oce.add("15", "Star Tracker: Upload image")
-    oce.add("16", "Star Tracker: Download image")
-    oce.add("17", "Star Tracker: Set limit parameters")
-    oce.add("17", "Star Tracker: Set limit parameters")
-    oce.add("18", "Star Tracker: Set tracking parameters")
-    oce.add("19", "Star Tracker: Set mounting parameters")
-    oce.add("20", "Star Tracker: Set camera parameters")
-    oce.add("22", "Star Tracker: Set centroiding parameters")
-    oce.add("23", "Star Tracker: Set LISA parameters")
-    oce.add("24", "Star Tracker: Set matching parameters")
-    oce.add("25", "Star Tracker: Set validation parameters")
-    oce.add("26", "Star Tracker: Set algo parameters")
-    oce.add("27", "Star Tracker: Take image")
-    oce.add("28", "Star Tracker: Stop str helper")
-    oce.add("30", "Star Tracker: Set name of download image")
-    oce.add("31", "Star Tracker: Request histogram")
-    oce.add("32", "Star Tracker: Request contrast")
-    oce.add("33", "Star Tracker: Set json filename")
-    oce.add("35", "Star Tracker: Flash read")
-    oce.add("36", "Star Tracker: Set flash read filename")
-    oce.add("37", "Star Tracker: Get checksum")
-    oce.add("49", "Star Tracker: Request camera parameter")
-    oce.add("50", "Star Tracker: Request limits")
-    oce.add("51", "Star Tracker: Set image processor parameters")
-    oce.add("52", "Star Tracker: (EGSE only) Load camera ground config")
-    oce.add("53", "Star Tracker: (EGSE only) Load camera flight config")
-    oce.add("54", "Star Tracker: Request log level parameters")
-    oce.add("55", "Star Tracker: Request mounting parameters")
-    oce.add("56", "Star Tracker: Request image processor parameters")
-    oce.add("57", "Star Tracker: Request centroiding parameters")
-    oce.add("58", "Star Tracker: Request lisa parameters")
-    oce.add("59", "Star Tracker: Request matching parameters")
-    oce.add("60", "Star Tracker: Request tracking parameters")
-    oce.add("61", "Star Tracker: Request validation parameters")
-    oce.add("62", "Star Tracker: Request algo parameters")
-    oce.add("63", "Star Tracker: Request subscription parameters")
-    oce.add("64", "Star Tracker: Request log subscription parameters")
-    oce.add("65", "Star Tracker: Request debug camera parameters")
-    oce.add("66", "Star Tracker: Set log level parameters")
-    oce.add("67", "Star Tracker: Set log subscription parameters")
-    oce.add("68", "Star Tracker: Set debug camera parameters")
-    oce.add("69", "Star Tracker: Firmware update")
-    oce.add("70", "Star Tracker: Disable timestamp generation")
-    oce.add("71", "Star Tracker: Enable timestamp generation")
-    defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)

eive_tmtc/pus_tc/procedure_packer.py

@@ -4,6 +4,7 @@ import logging
 from typing import cast
 
 from eive_tmtc.tmtc.acs.gyros import handle_gyr_cmd
+from eive_tmtc.tmtc.acs.mgms import handle_mgm_cmd
 from eive_tmtc.tmtc.power.power import pack_power_commands
 from eive_tmtc.tmtc.tcs.rtd import pack_rtd_commands
 from eive_tmtc.tmtc.payload.scex import pack_scex_cmds
@@ -32,6 +33,7 @@ from eive_tmtc.tmtc.com.ccsds_handler import pack_ccsds_handler_test
 from eive_tmtc.tmtc.core import pack_core_commands
 from eive_tmtc.tmtc.acs.star_tracker import pack_star_tracker_commands
 from eive_tmtc.tmtc.com.syrlinks_handler import pack_syrlinks_command
+from eive_tmtc.tmtc.com.pdec_handler import pack_pdec_handler_test
 from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
 from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import (
@@ -134,6 +136,8 @@ def handle_default_procedure(
         return pack_single_rw_test_into(
             object_id=RW4_ID, rw_idx=4, q=queue_helper, op_code=op_code
         )
+    if service == CustomServiceList.MGMS.value:
+        return handle_mgm_cmd(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.RAD_SENSOR.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(RAD_SENSOR_ID))
         return pack_rad_sensor_test_into(
@@ -170,7 +174,7 @@ def handle_default_procedure(
             object_id=object_id, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.PDEC_HANDLER.value:
-        return pack_ccsds_handler_test(
+        return pack_pdec_handler_test(
             object_id=PDEC_HANDLER_ID, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.SYRLINKS.value:

eive_tmtc/pus_tm/hk_handling.py

@@ -166,6 +166,8 @@ def handle_regular_hk_print(
         return handle_thermal_controller_hk_data(
             object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
         )
+    elif objb == obj_ids.STAR_TRACKER_ID:
+        return handle_str_hk_data(set_id=set_id, hk_data=hk_data, printer=printer)
     elif objb == obj_ids.PLOC_SUPV_ID:
         return handle_supv_hk_data(set_id=set_id, hk_data=hk_data, printer=printer)
     elif objb == obj_ids.ACS_CONTROLLER:

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -14,6 +14,7 @@ from tmtccmd.config.tmtc import (
     OpCodeEntry,
 )
 from tmtccmd.tc import service_provider
+from tmtccmd.tc.queue import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_command
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_3_fsfw_hk import (
@@ -23,8 +24,23 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     disable_periodic_hk_command,
     create_request_one_diag_command,
 )
+from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
+from tmtccmd.tc.pus_20_fsfw_param import create_load_param_cmd
+
+from tmtccmd.pus.s20_fsfw_param_defs import (
+    create_scalar_u8_parameter,
+    create_scalar_u16_parameter,
+    create_scalar_i32_parameter,
+    create_scalar_float_parameter,
+    create_scalar_double_parameter,
+    create_vector_float_parameter,
+    create_vector_double_parameter,
+    create_matrix_float_parameter,
+    create_matrix_double_parameter,
+)
+
 
 class SetId(enum.IntEnum):
     MGM_RAW_SET = 0
@@ -50,11 +66,25 @@ class Submode(enum.IntEnum):
     PTG_INERTIAL = 16
 
 
+class ActionId(enum.IntEnum):
+    SOLAR_ARRAY_DEPLOYMENT_SUCCESSFUL = 0
+    RESET_MEKF = 1
+
+
 class OpCodes:
     OFF = ["off"]
     SAFE = ["normal_safe"]
     DTBL = ["normal_detumble"]
     IDLE = ["normal_idle"]
+    NADIR = ["normal_nadir"]
+    TARGET = ["normal_target"]
+    GS = ["normal_gs"]
+    INERTIAL = ["normal_inertial"]
+    SAFE_PTG = ["confirm_deployment"]
+    RESET_MEKF = ["reset_mekf"]
+    SET_PARAMETER_SCALAR = ["set_scalar_param"]
+    SET_PARAMETER_VECTOR = ["set_vector_param"]
+    SET_PARAMETER_MATRIX = ["set_matrix_param"]
     REQUEST_RAW_MGM_HK = ["0", "mgm_raw_hk"]
     ENABLE_RAW_MGM_HK = ["1", "mgm_raw_enable_hk"]
     DISABLE_RAW_MGM_HK = ["2", "mgm_raw_disable_hk"]
@@ -89,9 +119,18 @@ class OpCodes:
 
 class Info:
     OFF = "Switch ACS CTRL off"
-    SAFE = "Switch ACS CTRL normal safe"
-    DTBL = "Switch ACS CTRL normal detumble"
-    IDLE = "Switch ACS CTRL normal idle"
+    SAFE = "Switch ACS CTRL normal - safe"
+    DTBL = "Switch ACS CTRL normal - detumble"
+    IDLE = "Switch ACS CTRL normal - idle"
+    NADIR = "Switch ACS CTRL normal - pointing nadir"
+    TARGET = "Switch ACS CTRL normal - pointing target"
+    GS = "Switch ACS CTRL normal - pointing target groundstation"
+    INERTIAL = "Switch ACS CTRL normal - pointing inertial"
+    SAFE_PTG = "Confirm deployment of both solar arrays"
+    RESET_MEKF = "Reset the MEKF"
+    SET_PARAMETER_SCALAR = "Set Scalar Parameter"
+    SET_PARAMETER_VECTOR = "Set Vector Parameter"
+    SET_PARAMETER_MATRIX = "Set Matrix Parameter"
     REQUEST_RAW_MGM_HK = "Request Raw MGM HK once"
     ENABLE_RAW_MGM_HK = "Enable Raw MGM HK data generation"
     DISABLE_RAW_MGM_HK = "Disable Raw MGM HK data generation"
@@ -143,6 +182,15 @@ def acs_cmd_defs(defs: TmtcDefinitionWrapper):
     oce.add(keys=OpCodes.SAFE, info=Info.SAFE)
     oce.add(keys=OpCodes.DTBL, info=Info.DTBL)
     oce.add(keys=OpCodes.IDLE, info=Info.IDLE)
+    oce.add(keys=OpCodes.NADIR, info=Info.NADIR)
+    oce.add(keys=OpCodes.TARGET, info=Info.TARGET)
+    oce.add(keys=OpCodes.GS, info=Info.GS)
+    oce.add(keys=OpCodes.INERTIAL, info=Info.INERTIAL)
+    oce.add(keys=OpCodes.SAFE_PTG, info=Info.SAFE_PTG)
+    oce.add(keys=OpCodes.RESET_MEKF, info=Info.RESET_MEKF)
+    oce.add(keys=OpCodes.SET_PARAMETER_SCALAR, info=Info.SET_PARAMETER_SCALAR)
+    oce.add(keys=OpCodes.SET_PARAMETER_VECTOR, info=Info.SET_PARAMETER_VECTOR)
+    oce.add(keys=OpCodes.SET_PARAMETER_MATRIX, info=Info.SET_PARAMETER_MATRIX)
     oce.add(keys=OpCodes.REQUEST_RAW_MGM_HK, info=Info.REQUEST_RAW_MGM_HK)
     oce.add(keys=OpCodes.ENABLE_RAW_MGM_HK, info=Info.ENABLE_RAW_MGM_HK)
     oce.add(keys=OpCodes.DISABLE_RAW_MGM_HK, info=Info.DISABLE_RAW_MGM_HK)
@@ -194,6 +242,41 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
     elif op_code in OpCodes.IDLE:
         q.add_log_cmd(f"{Info.IDLE}")
         q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.IDLE))
+    elif op_code in OpCodes.NADIR:
+        q.add_log_cmd(f"{Info.NADIR}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.PTG_NADIR))
+    elif op_code in OpCodes.TARGET:
+        q.add_log_cmd(f"{Info.TARGET}")
+        q.add_pus_tc(pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.PTG_TARGET))
+    elif op_code in OpCodes.GS:
+        q.add_log_cmd(f"{Info.GS}")
+        q.add_pus_tc(
+            pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.PTG_TARGET_GS)
+        )
+    elif op_code in OpCodes.INERTIAL:
+        q.add_log_cmd(f"{Info.INERTIAL}")
+        q.add_pus_tc(
+            pack_mode_command(ACS_CONTROLLER, Mode.NORMAL, Submode.PTG_INERTIAL)
+        )
+    elif op_code in OpCodes.SAFE_PTG:
+        q.add_log_cmd(f"{Info.SAFE_PTG}")
+        q.add_pus_tc(
+            create_action_cmd(
+                ACS_CONTROLLER, ActionId.SOLAR_ARRAY_DEPLOYMENT_SUCCESSFUL
+            )
+        )
+    elif op_code in OpCodes.RESET_MEKF:
+        q.add_log_cmd(f"{Info.RESET_MEKF}")
+        q.add_pus_tc(create_action_cmd(ACS_CONTROLLER, ActionId.RESET_MEKF))
+    elif op_code in OpCodes.SET_PARAMETER_SCALAR:
+        q.add_log_cmd(f"{Info.SET_PARAMETER_SCALAR}")
+        set_acs_ctrl_param_scalar(q)
+    elif op_code in OpCodes.SET_PARAMETER_VECTOR:
+        q.add_log_cmd(f"{Info.SET_PARAMETER_VECTOR}")
+        set_acs_ctrl_param_vector(q)
+    elif op_code in OpCodes.SET_PARAMETER_MATRIX:
+        q.add_log_cmd(f"{Info.SET_PARAMETER_MATRIX}")
+        set_acs_ctrl_param_matrix(q)
     elif op_code in OpCodes.REQUEST_RAW_MGM_HK:
         q.add_log_cmd(Info.REQUEST_RAW_MGM_HK)
         q.add_pus_tc(
@@ -273,7 +356,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
     elif op_code in OpCodes.REQUEST_RAW_GYR_HK:
         q.add_log_cmd(Info.REQUEST_RAW_GYR_HK)
         q.add_pus_tc(
-            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET))
+            create_request_one_diag_command(make_sid(ACS_CONTROLLER, SetId.GYR_RAW_SET))
         )
     elif op_code in OpCodes.ENABLE_RAW_GYR_HK:
         q.add_log_cmd(Info.ENABLE_RAW_GYR_HK)
@@ -299,7 +382,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
     elif op_code in OpCodes.ENABLE_PROC_GYR_HK:
         q.add_log_cmd(Info.ENABLE_PROC_GYR_HK)
         cmd_tuple = enable_periodic_hk_command_with_interval(
-            False, make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET), 2.0
+            True, make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET), 2.0
         )
         q.add_pus_tc(cmd_tuple[0])
         q.add_pus_tc(cmd_tuple[1])
@@ -307,7 +390,7 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
         q.add_log_cmd(Info.DISABLE_PROC_GYR_HK)
         q.add_pus_tc(
             disable_periodic_hk_command(
-                False, make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET)
+                True, make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET)
             )
         )
     elif op_code in OpCodes.REQUEST_PROC_GPS_HK:
@@ -331,7 +414,9 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
         )
     elif op_code in OpCodes.REQUEST_MEKF_HK:
         q.add_log_cmd(Info.REQUEST_MEKF_HK)
-        q.add_pus_tc(generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.MEKF_DATA)))
+        q.add_pus_tc(
+            create_request_one_diag_command(make_sid(ACS_CONTROLLER, SetId.MEKF_DATA))
+        )
     elif op_code in OpCodes.ENABLE_MEKF_HK:
         q.add_log_cmd(Info.ENABLE_MEKF_HK)
         cmd_tuple = enable_periodic_hk_command_with_interval(
@@ -386,6 +471,189 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
         logging.getLogger(__name__).info(f"Unknown op code {op_code}")
 
 
+def set_acs_ctrl_param_scalar(q: DefaultPusQueueHelper):
+    pt = int(
+        input(
+            'Specify parameter type to set {0: "uint8", 1: "uint16", 2: "int32", 3: "float", '
+            '4: "double"}: '
+        )
+    )
+    sid = int(input("Specify parameter struct ID to set: "))
+    pid = int(input("Specify parameter ID to set: "))
+    match pt:
+        case 0:
+            param = int(input("Specify parameter value to set: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_u8_parameter(
+                        object_id=ACS_CONTROLLER,
+                        domain_id=sid,
+                        unique_id=pid,
+                        parameter=param,
+                    ).pack()
+                )
+            )
+        case 1:
+            param = int(input("Specify parameter value to set: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_u16_parameter(
+                        object_id=ACS_CONTROLLER,
+                        domain_id=sid,
+                        unique_id=pid,
+                        parameter=param,
+                    ).pack()
+                )
+            )
+        case 2:
+            param = int(input("Specify parameter value to set: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_i32_parameter(
+                        object_id=ACS_CONTROLLER,
+                        domain_id=sid,
+                        unique_id=pid,
+                        parameter=param,
+                    ).pack()
+                )
+            )
+        case 3:
+            param = float(input("Specify parameter value to set: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_float_parameter(
+                        object_id=ACS_CONTROLLER,
+                        domain_id=sid,
+                        unique_id=pid,
+                        parameter=param,
+                    ).pack()
+                )
+            )
+        case 4:
+            param = float(input("Specify parameter value to set: "))
+            q.add_pus_tc(
+                create_load_param_cmd(
+                    create_scalar_double_parameter(
+                        object_id=ACS_CONTROLLER,
+                        domain_id=sid,
+                        unique_id=pid,
+                        parameter=param,
+                    ).pack()
+                )
+            )
+
+
+def set_acs_ctrl_param_vector(q: DefaultPusQueueHelper):
+    pt = int(input('Specify parameter type to set {0: "float", 1: "double"}: '))
+    sid = int(input("Specify parameter struct ID to set: "))
+    pid = int(input("Specify parameter ID to set: "))
+    match pt:
+        case 0:
+            elms = int(input("Specify number of elements in vector to set: "))
+            param = []
+            for _ in range(elms):
+                param.append(
+                    float(input("Specify parameter vector entry value to set: "))
+                )
+            print(param)
+            if input("Confirm selected parameter values (Y/N): ") == "Y":
+                q.add_pus_tc(
+                    create_load_param_cmd(
+                        create_vector_float_parameter(
+                            object_id=ACS_CONTROLLER,
+                            domain_id=sid,
+                            unique_id=pid,
+                            parameters=param,
+                        ).pack()
+                    )
+                )
+            else:
+                q.add_log_cmd("Aborted by user input")
+                return
+        case 1:
+            elms = int(input("Specify number of elements in vector to set: "))
+            param = []
+            for _ in range(elms):
+                param.append(
+                    float(input("Specify parameter vector entry value to set: "))
+                )
+            print(param)
+            if input("Confirm selected parameter values (Y/N): ") == "Y":
+                q.add_pus_tc(
+                    create_load_param_cmd(
+                        create_vector_double_parameter(
+                            object_id=ACS_CONTROLLER,
+                            domain_id=sid,
+                            unique_id=pid,
+                            parameters=param,
+                        ).pack()
+                    )
+                )
+            else:
+                q.add_log_cmd("Aborted by user input")
+                return
+
+
+def set_acs_ctrl_param_matrix(q: DefaultPusQueueHelper):
+    pt = int(input('Specify parameter type to set {0: "float", 1: "double"}: '))
+    sid = int(input("Specify parameter struct ID to set: "))
+    pid = int(input("Specify parameter ID to set: "))
+    match pt:
+        case 0:
+            rows = int(input("Specify number of rows in matrix to set: "))
+            cols = int(input("Specify number of columns in matrix to set: "))
+            row = []
+            param = []
+            for _ in range(rows):
+                for _ in range(cols):
+                    row.append(
+                        float(input("Specify parameter vector entry value to set: "))
+                    )
+                param.append(row)
+            print(param)
+            if input("Confirm selected parameter values (Y/N): ") == "Y":
+                q.add_pus_tc(
+                    create_load_param_cmd(
+                        create_matrix_float_parameter(
+                            object_id=ACS_CONTROLLER,
+                            domain_id=sid,
+                            unique_id=pid,
+                            parameters=param,
+                        ).pack()
+                    )
+                )
+            else:
+                q.add_log_cmd("Aborted by user input")
+                return
+        case 1:
+            rows = int(input("Specify number of rows in matrix to set: "))
+            cols = int(input("Specify number of columns in matrix to set: "))
+            row = []
+            param = []
+            for _ in range(rows):
+                for _ in range(cols):
+                    row.append(
+                        float(input("Specify parameter vector entry value to set: "))
+                    )
+                param.append(row)
+                row = []
+            print(param)
+            if input("Confirm selected parameter values (Y/N): ") == "Y":
+                q.add_pus_tc(
+                    create_load_param_cmd(
+                        create_matrix_double_parameter(
+                            object_id=ACS_CONTROLLER,
+                            domain_id=sid,
+                            unique_id=pid,
+                            parameters=param,
+                        ).pack()
+                    )
+                )
+            else:
+                q.add_log_cmd("Aborted by user input")
+                return
+
+
 def handle_acs_ctrl_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
     pw = PrintWrapper(printer)
     match set_id:
@@ -684,14 +952,25 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
 
 
 def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
+    mekf_status = {
+        0: "UNINITIALIZED",
+        1: "NO_GYR_DATA",
+        2: "NO_MODEL_VECTORS",
+        3: "NO_SUS_MGM_STR_DATA",
+        4: "COVARIANCE_INVERSION_FAILED",
+        10: "INITIALIZED",
+        11: "RUNNING",
+    }
     pw.dlog("Received MEKF Set")
     fmt_quat = "!dddd"
     fmt_str_4 = "[{:8.3f}, {:8.3f}, {:8.3f}, {:8.3f}]"
     fmt_str_3 = "[{:8.3f}, {:8.3f}, {:8.3f}]"
     fmt_vec = "!ddd"
+    fmt_sts = "!B"
     inc_len_quat = struct.calcsize(fmt_quat)
     inc_len_vec = struct.calcsize(fmt_vec)
-    if len(hk_data) < inc_len_quat + inc_len_vec:
+    inc_len_sts = struct.calcsize(fmt_sts)
+    if len(hk_data) < inc_len_quat + inc_len_vec + inc_len_sts:
         pw.dlog("Received HK set too small")
         return
     current_idx = 0
@@ -699,18 +978,23 @@ def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
     current_idx += inc_len_quat
     rate = struct.unpack(fmt_vec, hk_data[current_idx : current_idx + inc_len_vec])
     current_idx += inc_len_vec
+    status = struct.unpack(fmt_sts, hk_data[current_idx : current_idx + inc_len_sts])[0]
+    current_idx += inc_len_sts
+    pw.dlog(f"{'MEKF Status'.ljust(25)}: {mekf_status[status]}")
     pw.dlog(f"{'MEKF Quaternion'.ljust(25)}: {fmt_str_4.format(*quat)}")
     pw.dlog(f"{'MEKF Rotational Rate'.ljust(25)}: {fmt_str_3.format(*rate)}")
-    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=2)
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)
 
 
 def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
     pw.dlog("Received CTRL Values Set")
     fmt_quat = "!dddd"
     fmt_scalar = "!d"
+    fmt_vec = "!ddd"
     inc_len_quat = struct.calcsize(fmt_quat)
     inc_len_scalar = struct.calcsize(fmt_scalar)
-    if len(hk_data) < 2 * inc_len_quat + inc_len_scalar:
+    inc_len_vec = struct.calcsize(fmt_vec)
+    if len(hk_data) < 2 * inc_len_quat + inc_len_scalar + inc_len_vec:
         pw.dlog("Received HK set too small")
         return
     current_idx = 0
@@ -735,10 +1019,18 @@ def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
         )
     ]
     current_idx += inc_len_scalar
+    tgt_rot = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
+        )
+    ]
+    current_idx += inc_len_vec
     pw.dlog(f"Control Values Target Quaternion: {tgt_quat}")
     pw.dlog(f"Control Values Error Quaternion: {err_quat}")
     pw.dlog(f"Control Values Error Angle: {err_ang} [rad]")
-    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)
+    pw.dlog(f"Control Values Target Rotational Rate: {tgt_rot} [rad/s]")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=4)
 
 
 def handle_act_cmd_data(pw: PrintWrapper, hk_data: bytes):

eive_tmtc/tmtc/acs/gyros.py

@@ -2,9 +2,13 @@ import enum
 import logging
 import struct
 
+from spacepackets.ecss import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_201_fsfw_health import pack_set_health_cmd_data, FsfwHealth
+from tmtccmd.pus.s201_fsfw_health import Subservice
 
 import eive_tmtc.config.object_ids as obj_ids
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_hk_command, make_sid
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
@@ -25,8 +29,11 @@ from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
 class OpCode:
+    NML = "normal"
+    OFF = "off"
     CORE_HK = "core_hk"
     CFG_HK = "cfg_hk"
+    SET_FAULTY = "set_faulty"
 
 
 class AdisGyroSetId(enum.IntEnum):
@@ -66,7 +73,13 @@ def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):
         core_hk_id = AdisGyroSetId.CORE_HK
     else:
         core_hk_id = L3gGyroSetId.CORE_HK
-    if op_code == OpCode.CORE_HK:
+    if op_code == OpCode.NML:
+        q.add_log_cmd(f"Gyro {gyr_info[0]} NORMAL mode")
+        q.add_pus_tc(create_mode_command(gyr_obj_id, Mode.NORMAL, 0))
+    if op_code == OpCode.OFF:
+        q.add_log_cmd(f"Gyro {gyr_info[0]} OFF mode")
+        q.add_pus_tc(create_mode_command(gyr_obj_id, Mode.OFF, 0))
+    elif op_code == OpCode.CORE_HK:
         q.add_log_cmd(f"Gyro  {gyr_info[0]} Core HK")
         q.add_pus_tc(create_request_one_hk_command(make_sid(gyr_obj_id, core_hk_id)))
     elif op_code == OpCode.CFG_HK:
@@ -76,6 +89,17 @@ def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):
         q.add_pus_tc(
             create_request_one_hk_command(make_sid(gyr_obj_id, AdisGyroSetId.CFG_HK))
         )
+    elif op_code == OpCode.SET_FAULTY:
+        q.add_log_cmd(f"Gyro {gyr_info[0]} set faulty")
+        q.add_pus_tc(
+            PusTelecommand(
+                service=201,
+                subservice=Subservice.TC_SET_HEALTH,
+                app_data=pack_set_health_cmd_data(
+                    object_id=gyr_obj_id, health=FsfwHealth.FAULTY
+                ),
+            )
+        )
     else:
         logging.getLogger(__name__).warning(
             f"invalid op code {op_code} for gyro command"
@@ -166,4 +190,7 @@ def add_gyr_cmd_defs(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(keys=OpCode.CORE_HK, info="Request Core HK")
     oce.add(keys=OpCode.CFG_HK, info="Request CFG HK")
+    oce.add(keys=OpCode.NML, info="Normal Mode")
+    oce.add(keys=OpCode.OFF, info="Off Mode")
+    oce.add(keys=OpCode.SET_FAULTY, info="Set Faulty")
     defs.add_service(CustomServiceList.GYRO, info="Gyro", op_code_entry=oce)

eive_tmtc/tmtc/acs/imtq.py

@@ -5,6 +5,7 @@
 @author J. Meier
 @date   25.03.2021
 """
+import enum
 import logging
 import struct
 from typing import List
@@ -22,6 +23,10 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
     generate_one_diag_command,
     generate_one_hk_command,
+    create_request_one_diag_command,
+    create_enable_periodic_hk_command,
+    create_disable_periodic_hk_command,
+    create_enable_periodic_hk_command_with_interval,
 )
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
@@ -36,8 +41,18 @@ class OpCode:
     NORMAL = "normal"
     OFF = "off"
     SET_DIPOLE = "set_dipole"
-    REQUEST_ENG_HK = "hk_os_eng_hk"
-    REQUEST_MGM_RAW = "hk_os_mgm_raw"
+    REQUEST_ENG_HK_NO_TORQUE = "hk_os_eng_hk_no_torque"
+    REQUEST_ENG_HK_WITH_TORQUE = "hk_os_eng_hk_with_torque"
+    REQUEST_MGM_RAW_NO_TORQUE = "hk_os_mgm_raw_no_torque"
+    ENABLE_MGM_RAW_NO_TORQUE = "enb_mgm_raw_no_torque"
+    DISABLE_MGM_RAW_NO_TORQUE = "dis_mgm_raw_no_torque"
+    REQUEST_MGM_RAW_WITH_TORQUE = "hk_os_mgm_raw_with_torque"
+    ENABLE_MGM_RAW_WITH_TORQUE = "enb_mgm_raw_with_torque"
+    DISABLE_MGM_RAW_WITH_TORQUE = "dis_mgm_raw_with_torque"
+    ENABLE_ENG_HK_NO_TORQUE = "enb_eng_hk_no_torque"
+    DISABLE_ENG_HK_NO_TORQUE = "dis_eng_hk_no_torque"
+    ENABLE_ENG_HK_WITH_TORQUE = "enb_eng_hk_with_torque"
+    DISABLE_ENG_HK_WITH_TORQUE = "dis_eng_hk_with_torque"
     POS_X_SELF_TEST = "self_test_pos_x"
     NEG_X_SELF_TEST = "self_test_neg_x"
     POS_Y_SELF_TEST = "self_test_pos_y"
@@ -46,7 +61,7 @@ class OpCode:
     NEG_Z_SELF_TEST = "self_test_neg_z"
 
 
-class ImtqSetId:
+class ImtqSetId(enum.IntEnum):
     ENG_HK_NO_TORQUE = 1
     RAW_MTM_NO_TORQUE = 2
     ENG_HK_SET_WITH_TORQUE = 3
@@ -83,8 +98,25 @@ def add_imtq_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCode.OFF, "Mode Off")
     oce.add(OpCode.ON, "Mode On")
     oce.add(OpCode.NORMAL, "Mode Normal")
-    oce.add(OpCode.REQUEST_ENG_HK, "Request Engineering HK One Shot")
-    oce.add(OpCode.REQUEST_MGM_RAW, "Request MGM Raw HK One Shot")
+    oce.add(OpCode.REQUEST_ENG_HK_NO_TORQUE, "Request Engineering HK One Shot")
+    oce.add(
+        OpCode.REQUEST_ENG_HK_WITH_TORQUE,
+        "Request Engineering HK One Shot during Torque",
+    )
+    oce.add(OpCode.ENABLE_ENG_HK_NO_TORQUE, "Enable ENG HK not torque")
+    oce.add(OpCode.ENABLE_ENG_HK_WITH_TORQUE, "Enable ENG HK with torque")
+    oce.add(OpCode.DISABLE_ENG_HK_NO_TORQUE, "Disable ENG HK not torque")
+    oce.add(OpCode.DISABLE_ENG_HK_WITH_TORQUE, "Disable ENG HK with torque")
+    oce.add(
+        OpCode.REQUEST_MGM_RAW_NO_TORQUE, "Request MGM Raw Without Torque HK One Shot"
+    )
+    oce.add(OpCode.ENABLE_MGM_RAW_NO_TORQUE, "Enable MGM Raw Without Torque HK")
+    oce.add(OpCode.DISABLE_MGM_RAW_NO_TORQUE, "Disable MGM Raw Without Torque HK")
+    oce.add(
+        OpCode.REQUEST_MGM_RAW_WITH_TORQUE, "Request MGM Raw With Torque HK One Shot"
+    )
+    oce.add(OpCode.ENABLE_MGM_RAW_WITH_TORQUE, "Enable MGM Raw With Torque HK")
+    oce.add(OpCode.DISABLE_MGM_RAW_WITH_TORQUE, "Disable MGM Raw With Torque HK")
     oce.add(OpCode.POS_X_SELF_TEST, "IMTQ perform pos X self test")
     oce.add(OpCode.NEG_X_SELF_TEST, "IMTQ perform neg X self test")
     oce.add(OpCode.POS_Y_SELF_TEST, "IMTQ perform pos Y self test")
@@ -207,13 +239,57 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod
             )
         )
 
-    if op_code == "10":
+    if op_code == "10":  # doesnt seem to work anymore
         q.add_log_cmd("IMTQ: Get commanded dipole")
         command = object_id.as_bytes + ImtqActionId.get_commanded_dipole
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
 
-    if op_code == OpCode.REQUEST_ENG_HK:
-        q.add_log_cmd("IMTQ: Get engineering hk set")
+    if op_code == OpCode.ENABLE_ENG_HK_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Enable ENG HK")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_NO_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.DISABLE_ENG_HK_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Disable ENG HK (No Torque)")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command(
+                True, make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_NO_TORQUE)
+            )
+        )
+    if op_code == OpCode.REQUEST_ENG_HK_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Get engineering hk set with torque")
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                sid=make_sid(
+                    object_id=object_id.as_bytes,
+                    set_id=ImtqSetId.ENG_HK_SET_WITH_TORQUE,
+                )
+            )
+        )
+    if op_code == OpCode.ENABLE_ENG_HK_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Enable ENG HK with torque")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_SET_WITH_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.DISABLE_ENG_HK_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Disable ENG HK with Torque")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command(
+                True, make_sid(object_id.as_bytes, ImtqSetId.ENG_HK_SET_WITH_TORQUE)
+            )
+        )
+    if op_code == OpCode.REQUEST_ENG_HK_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Get engineering hk set (no torque)")
         q.add_pus_tc(
             generate_one_diag_command(
                 sid=make_sid(
@@ -225,21 +301,65 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod
     if op_code == "12":
         q.add_log_cmd("IMTQ: Get calibrated MTM hk set")
         q.add_pus_tc(
-            generate_one_diag_command(
+            create_request_one_diag_command(
                 sid=make_sid(object_id=object_id.as_bytes, set_id=ImtqSetId.CAL_MTM_SET)
             )
         )
 
-    if op_code == OpCode.REQUEST_MGM_RAW:
+    if op_code == OpCode.REQUEST_MGM_RAW_NO_TORQUE:
         q.add_log_cmd("IMTQ: Get raw MTM hk set")
         q.add_pus_tc(
-            generate_one_diag_command(
+            create_request_one_diag_command(
                 sid=make_sid(
                     object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_NO_TORQUE
                 )
             )
         )
 
+    if op_code == OpCode.DISABLE_MGM_RAW_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Disable MGM RAW HK (No Torque)")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command(
+                True, make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_NO_TORQUE)
+            )
+        )
+    if op_code == OpCode.ENABLE_MGM_RAW_NO_TORQUE:
+        q.add_log_cmd("IMTQ: Enable MGM RAW HK (No Torque)")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_NO_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.REQUEST_MGM_RAW_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Get raw MTM hk set")
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                sid=make_sid(
+                    object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_WITH_TORQUE
+                )
+            )
+        )
+    if op_code == OpCode.ENABLE_MGM_RAW_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Enable MGM RAW HK (No Torque)")
+        interval = float(input("Please enter collection interval in seconds: "))
+        cmds = create_enable_periodic_hk_command_with_interval(
+            diag=True,
+            sid=make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_WITH_TORQUE),
+            interval_seconds=interval,
+        )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code == OpCode.DISABLE_MGM_RAW_WITH_TORQUE:
+        q.add_log_cmd("IMTQ: Disable MGM RAW HK (No Torque)")
+        q.add_pus_tc(
+            create_disable_periodic_hk_command(
+                True, make_sid(object_id.as_bytes, ImtqSetId.RAW_MTM_WITH_TORQUE)
+            )
+        )
+
 
 def pack_dipole_command(
     object_id: bytes, x_dipole: int, y_dipole: int, z_dipole: int, duration: int
@@ -310,19 +430,17 @@ def handle_imtq_hk(printer: FsfwTmTcPrinter, hk_data: bytes, set_id: int):
     if (set_id >= ImtqSetId.POSITIVE_X_TEST) and (set_id <= ImtqSetId.NEGATIVE_Z_TEST):
         return handle_self_test_data(printer, hk_data)
     elif set_id == ImtqSetId.ENG_HK_NO_TORQUE:
-        _LOGGER.info("Found engineering HK without torque")
-        return handle_eng_set(printer, hk_data)
+        return handle_eng_set(printer, hk_data, False)
     elif set_id == ImtqSetId.ENG_HK_SET_WITH_TORQUE:
-        _LOGGER.info("Found engineering HK during torque")
-        return handle_eng_set(printer, hk_data)
+        return handle_eng_set(printer, hk_data, True)
     elif set_id == ImtqSetId.CAL_MTM_SET:
         return handle_calibrated_mtm_measurement(printer, hk_data)
     elif set_id == ImtqSetId.RAW_MTM_NO_TORQUE:
-        _LOGGER.info("Found raw MTM measurement without torque")
-        return handle_raw_mtm_measurement(printer, hk_data)
+        return handle_raw_mtm_measurement(printer, hk_data, False)
     elif set_id == ImtqSetId.RAW_MTM_WITH_TORQUE:
-        _LOGGER.info("Found raw MTM measurement during torque")
-        return handle_raw_mtm_measurement(printer, hk_data)
+        return handle_raw_mtm_measurement(printer, hk_data, True)
+    elif set_id == ImtqSetId.DIPOLES:
+        return handle_dipole_set(printer, hk_data)
     elif set_id == ImtqSetId.STATUS_SET:
         return handle_status_set(printer, hk_data)
     else:
@@ -339,6 +457,21 @@ def unpack_status_set(hk_data: bytes) -> List:
     return [status_mode, status_error, status_conf, status_uptime]
 
 
+def handle_dipole_set(printer: FsfwTmTcPrinter, hk_data: bytes):
+    pw = PrintWrapper(printer)
+    pw.dlog("Received iMTQ dipole set")
+    fmt_str = "!hhhH"
+    fmt_len = struct.calcsize(fmt_str)
+    (dipole_x, dipole_y, dipole_z, current_torque_duration) = struct.unpack(
+        fmt_str, hk_data
+    )
+    pw.dlog(f"Dipole X: {dipole_x}")
+    pw.dlog(f"Dipole Y: {dipole_y}")
+    pw.dlog(f"Dipole Z: {dipole_z}")
+    pw.dlog(f"Current torque duration: {current_torque_duration}")
+    pw.printer.print_validity_buffer(hk_data[fmt_len:], 2)
+
+
 def unpack_eng_hk(hk_data: bytes) -> List:
     digital_voltage = struct.unpack("!H", hk_data[0:2])[0]
     analog_voltage = struct.unpack("!H", hk_data[2:4])[0]
@@ -367,8 +500,9 @@ def unpack_eng_hk(hk_data: bytes) -> List:
     return content_list
 
 
-def handle_eng_set(printer: FsfwTmTcPrinter, hk_data: bytes):
+def handle_eng_set(printer: FsfwTmTcPrinter, hk_data: bytes, torque_on: bool):
     pw = PrintWrapper(printer)
+    pw.dlog(f"Found engineering HK. Torque Status: {torque_on}")
     content_list = unpack_eng_hk(hk_data)
     validity_buffer = hk_data[32:]
 
@@ -409,8 +543,11 @@ def handle_calibrated_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
     printer.print_validity_buffer(validity_buffer=validity_buffer, num_vars=num_of_vars)
 
 
-def handle_raw_mtm_measurement(printer: FsfwTmTcPrinter, hk_data: bytes):
+def handle_raw_mtm_measurement(
+    printer: FsfwTmTcPrinter, hk_data: bytes, torque_status: bool
+):
     pw = PrintWrapper(printer)
+    pw.dlog(f"Found raw MTM measurement. Torque Status: {torque_status}")
     header_list = [
         "Raw MTM X [nT]",
         "Raw MTM Y [nT]",

eive_tmtc/tmtc/acs/mgms.py

@@ -1,13 +1,30 @@
 import enum
 import struct
 
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.config import OpCodeEntry
+
 import eive_tmtc.config.object_ids as obj_ids
+from eive_tmtc.config.object_ids import (
+    MGM_0_LIS3_HANDLER_ID,
+    MGM_1_RM3100_HANDLER_ID,
+    MGM_2_LIS3_HANDLER_ID,
+    MGM_3_RM3100_HANDLER_ID,
+)
 
 from eive_tmtc.pus_tm.defs import PrintWrapper
+from tmtccmd.config.tmtc import tmtc_definitions_provider, TmtcDefinitionWrapper
+from tmtccmd.tc import DefaultPusQueueHelper
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 
+class OpCode:
+    NORMAL = "normal"
+    OFF = "off"
+
+
 class MgmLis3SetId(enum.IntEnum):
     CORE_HK = 0
 
@@ -16,6 +33,36 @@ class MgmRm3100SetId(enum.IntEnum):
     CORE_HK = 0
 
 
+class MgmSel(enum.IntEnum):
+    MGM_0_LIS3 = 0
+    MGM_1_RM3100 = 1
+    MGM_2_LIS3 = 2
+    MGM_3_RM3100 = 3
+
+
+MGM_SEL_DICT = {
+    MgmSel.MGM_0_LIS3: ("MGM_0_LIS3", MGM_0_LIS3_HANDLER_ID),
+    MgmSel.MGM_1_RM3100: ("MGM_1_RM3100", MGM_1_RM3100_HANDLER_ID),
+    MgmSel.MGM_2_LIS3: ("MGM_2_LIS3", MGM_2_LIS3_HANDLER_ID),
+    MgmSel.MGM_3_RM3100: ("MGM_3_RM3100", MGM_3_RM3100_HANDLER_ID),
+}
+
+
+def handle_mgm_cmd(q: DefaultPusQueueHelper, op_code: str):
+    print("Please select the MGM Device")
+    for (k, v) in MGM_SEL_DICT.items():
+        print(f"{k}: {v[0]}")
+    sel_idx = int(input("Select MGM device by index: "))
+    mgm_info = MGM_SEL_DICT[MgmSel(sel_idx)]
+    mgm_obj_id = mgm_info[1]
+    if op_code == OpCode.NORMAL:
+        q.add_log_cmd(f"Gyro {mgm_info[0]} NORMAL mode")
+        q.add_pus_tc(create_mode_command(mgm_obj_id, Mode.NORMAL, 0))
+    if op_code == OpCode.OFF:
+        q.add_log_cmd(f"Gyro {mgm_info[0]} OFF mode")
+        q.add_pus_tc(create_mode_command(mgm_obj_id, Mode.OFF, 0))
+
+
 def handle_mgm_hk_data(
     object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
@@ -61,3 +108,11 @@ def handle_mgm_rm3100_hk_data(
         pw.dlog(
             f"Field strengths in micro Tesla X {field_x} | Y {field_y} | Z {field_z}"
         )
+
+
+@tmtc_definitions_provider
+def add_mgm_cmd_defs(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(keys=OpCode.NORMAL, info="Normal Mode")
+    oce.add(keys=OpCode.OFF, info="Off Mode")
+    defs.add_service(CustomServiceList.MGMS, info="MGMs", op_code_entry=oce)

eive_tmtc/tmtc/acs/star_tracker.py

@@ -5,17 +5,22 @@
 @author J. Meier
 @date   14.08.2021
 """
+import datetime
 import enum
 import logging
 import struct
 
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.pus_tm.defs import PrintWrapper
 from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
 from eive_tmtc.utility.input_helper import InputHelper
-
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -87,7 +92,11 @@ class StarTrackerActionId(enum.IntEnum):
 
 
 class OpCodes:
-    NORMAL = ["2", "nml"]
+    ON_BOOTLOADER = "on_bootloader"
+    ON_FIRMWARE = "on_firmware"
+    NORMAL = "nml"
+    OFF = "off"
+    PING = "ping"
 
 
 class SetId(enum.IntEnum):
@@ -172,19 +181,19 @@ def pack_star_tracker_commands(
         f"Generate command for star tracker with object id: {object_id.as_hex_string}"
     )
     obyt = object_id.as_bytes
-    if op_code == "0":
+    if op_code == OpCodes.ON_BOOTLOADER:
         q.add_log_cmd("Star tracker: Mode On, Submode Bootloader")
         data = pack_mode_data(obyt, Mode.ON, Submode.BOOTLOADER)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "1":
+    if op_code == OpCodes.ON_FIRMWARE:
         q.add_log_cmd("Star tracker: Mode On, Submode Firmware")
         data = pack_mode_data(obyt, Mode.ON, Submode.FIRMWARE)
         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("Star tracker: Mode Normal")
         data = pack_mode_data(obyt, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "3":
+    if op_code == OpCodes.OFF:
         q.add_log_cmd("Star tracker: Mode Off")
         data = pack_mode_data(obyt, Mode.OFF, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
@@ -192,7 +201,7 @@ def pack_star_tracker_commands(
         q.add_log_cmd("Star tracker: Mode Raw")
         data = pack_mode_data(obyt, Mode.RAW, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
-    if op_code == "5":
+    if op_code == OpCodes.PING:
         q.add_log_cmd("Star tracker: Ping")
         data = obyt + struct.pack("!I", StarTrackerActionId.PING)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -668,3 +677,142 @@ def get_upload_image() -> str:
     key = input_helper.get_key()
     image = upload_image_dict[key][1]
     return image
+
+
+def handle_str_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
+    pw = PrintWrapper(printer)
+    pw.dlog(f"Received STR HK set with set ID {set_id}")
+    if set_id == SetId.SOLUTION:
+        handle_solution_set(hk_data, pw)
+    else:
+        _LOGGER.warning(f"HK parsing for Star Tracker set ID {set_id} unimplemented")
+
+
+def handle_solution_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received solution set")
+    ticks_time_fmt = "!IQ"
+    current_idx = 0
+    fmt_len = struct.calcsize(ticks_time_fmt)
+    (ticks, unix_time) = struct.unpack(
+        ticks_time_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    unix_as_dt = datetime.datetime.fromtimestamp(unix_time, tz=datetime.timezone.utc)
+    pw.dlog(f"Ticks: {ticks} | UNIX time: {unix_time}")
+    pw.dlog(f"UNIX as datetime: {unix_as_dt}")
+    current_idx += fmt_len
+    calib_quaternions_fmt = "!ffff"
+    fmt_len = struct.calcsize(calib_quaternions_fmt)
+    (calib_q_w, calib_q_x, calib_q_y, calib_q_z) = struct.unpack(
+        calib_quaternions_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    pw.dlog("Calibrated Quaternions")
+    pw.dlog(f"Quaternion w: {calib_q_w}")
+    pw.dlog(f"Quaternion x: {calib_q_x}")
+    pw.dlog(f"Quaternion y: {calib_q_y}")
+    pw.dlog(f"Quaternion z: {calib_q_z}")
+    current_idx += fmt_len
+    track_fmt = "!fffff"
+    fmt_len = struct.calcsize(track_fmt)
+    (track_confidence, track_q_w, track_q_x, track_q_y, track_q_z) = struct.unpack(
+        track_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    pw.dlog(f"Track Confidence: {track_confidence}")
+    pw.dlog(f"Track QW: {track_q_w}")
+    pw.dlog(f"Track QX: {track_q_x}")
+    pw.dlog(f"Track QY: {track_q_y}")
+    pw.dlog(f"Track QZ: {track_q_z}")
+    current_idx += fmt_len
+    track_removed = hk_data[current_idx]
+    pw.dlog(f"Number of stars removed from tracking solution: {track_removed}")
+    current_idx += 1
+    stars_centroided = hk_data[current_idx]
+    pw.dlog(f"Centroided stars: {stars_centroided}")
+    current_idx += 1
+    stars_matched_database = hk_data[current_idx]
+    pw.dlog(f"Stars matched: {stars_matched_database}")
+    current_idx += 1
+    # Result of LISA: Lost in space algorithm
+    lisa_fmt = "!fffffB"
+    fmt_len = struct.calcsize(track_fmt)
+    (lisa_q_w, lisa_q_x, lisa_q_y, lisa_q_z) = struct.unpack(
+        lisa_fmt, hk_data[current_idx : current_idx + fmt_len]
+    )
+    pw.dlog(f"LISA QW: {lisa_q_w}")
+    pw.dlog(f"LISA QX: {lisa_q_x}")
+    pw.dlog(f"LISA QY: {lisa_q_y}")
+    pw.dlog(f"LISA QZ: {lisa_q_z}")
+    current_idx += fmt_len
+    is_trusworthy = hk_data[current_idx]
+    pw.dlog(f"Trustworthy solution: {is_trusworthy}")
+    current_idx += 1
+    stable_count = struct.unpack("!I", hk_data[current_idx : current_idx + 4])
+    pw.dlog(f"Stable count: {stable_count}")
+    current_idx += 4
+    solution_strategy = hk_data[current_idx]
+    pw.dlog(f"Solution strategy: {solution_strategy}")
+    pw.printer.print_validity_buffer(hk_data[current_idx:], 23)
+
+
+@tmtc_definitions_provider
+def add_str_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCodes.ON_BOOTLOADER, "Star Tracker: Mode On, Submode Bootloader")
+    oce.add(OpCodes.ON_FIRMWARE, "Star Tracker: Mode On, Submode Firmware")
+    oce.add(OpCodes.NORMAL, "Star Tracker: Mode Normal")
+    oce.add(OpCodes.OFF, "Star Tracker: Mode Off")
+    oce.add("4", "Star Tracker: Mode Raw")
+    oce.add(OpCodes.PING, "Star Tracker: Ping")
+    oce.add("6", "Star Tracker: Switch to bootloader program")
+    oce.add("7", "Star Tracker: Request temperature")
+    oce.add("8", "Star Tracker: Request version")
+    oce.add("9", "Star Tracker: Request interface")
+    oce.add("10", "Star Tracker: Request power")
+    oce.add("11", "Star Tracker: Set subscription parameters")
+    oce.add("12", "Star Tracker: Boot image (requires bootloader mode)")
+    oce.add("13", "Star Tracker: Request time")
+    oce.add("14", "Star Tracker: Request solution")
+    oce.add("15", "Star Tracker: Upload image")
+    oce.add("16", "Star Tracker: Download image")
+    oce.add("17", "Star Tracker: Set limit parameters")
+    oce.add("17", "Star Tracker: Set limit parameters")
+    oce.add("18", "Star Tracker: Set tracking parameters")
+    oce.add("19", "Star Tracker: Set mounting parameters")
+    oce.add("20", "Star Tracker: Set camera parameters")
+    oce.add("22", "Star Tracker: Set centroiding parameters")
+    oce.add("23", "Star Tracker: Set LISA parameters")
+    oce.add("24", "Star Tracker: Set matching parameters")
+    oce.add("25", "Star Tracker: Set validation parameters")
+    oce.add("26", "Star Tracker: Set algo parameters")
+    oce.add("27", "Star Tracker: Take image")
+    oce.add("28", "Star Tracker: Stop str helper")
+    oce.add("30", "Star Tracker: Set name of download image")
+    oce.add("31", "Star Tracker: Request histogram")
+    oce.add("32", "Star Tracker: Request contrast")
+    oce.add("33", "Star Tracker: Set json filename")
+    oce.add("35", "Star Tracker: Flash read")
+    oce.add("36", "Star Tracker: Set flash read filename")
+    oce.add("37", "Star Tracker: Get checksum")
+    oce.add("49", "Star Tracker: Request camera parameter")
+    oce.add("50", "Star Tracker: Request limits")
+    oce.add("51", "Star Tracker: Set image processor parameters")
+    oce.add("52", "Star Tracker: (EGSE only) Load camera ground config")
+    oce.add("53", "Star Tracker: (EGSE only) Load camera flight config")
+    oce.add("54", "Star Tracker: Request log level parameters")
+    oce.add("55", "Star Tracker: Request mounting parameters")
+    oce.add("56", "Star Tracker: Request image processor parameters")
+    oce.add("57", "Star Tracker: Request centroiding parameters")
+    oce.add("58", "Star Tracker: Request lisa parameters")
+    oce.add("59", "Star Tracker: Request matching parameters")
+    oce.add("60", "Star Tracker: Request tracking parameters")
+    oce.add("61", "Star Tracker: Request validation parameters")
+    oce.add("62", "Star Tracker: Request algo parameters")
+    oce.add("63", "Star Tracker: Request subscription parameters")
+    oce.add("64", "Star Tracker: Request log subscription parameters")
+    oce.add("65", "Star Tracker: Request debug camera parameters")
+    oce.add("66", "Star Tracker: Set log level parameters")
+    oce.add("67", "Star Tracker: Set log subscription parameters")
+    oce.add("68", "Star Tracker: Set debug camera parameters")
+    oce.add("69", "Star Tracker: Firmware update")
+    oce.add("70", "Star Tracker: Disable timestamp generation")
+    oce.add("71", "Star Tracker: Enable timestamp generation")
+    defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)

eive_tmtc/tmtc/com/pdec_handler.py

@@ -8,6 +8,18 @@
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
 
+from tmtccmd.tc.pus_20_fsfw_param import create_load_param_cmd
+
+from tmtccmd.pus.s20_fsfw_param_defs import create_scalar_u8_parameter
+
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+
+from eive_tmtc.config.definitions import CustomServiceList
+
 
 class CommandId:
     # prints the clcw to the console. Useful for debugging
@@ -16,15 +28,73 @@ class CommandId:
     PRINT_PDEC_MON = bytearray([0x0, 0x0, 0x0, 0x1])
 
 
+class ParameterId:
+    POSITIVE_WINDOW = 0
+    NEGATIVE_WINDOW = 1
+
+
+class OpCode:
+    PRINT_CLCW = "print_clcw"
+    PRINT_MON_REG = "print_mon_reg"
+    POSITIVE_WINDOW = "positive_window"
+    NEGATIVE_WINDOW = "negative_window"
+
+
+class Info:
+    PRINT_CLCW = "Will cause the OBSW to print the current CLCW to the debug console"
+    PRINT_MON_REG = (
+        "Will cause the OBSW to print the PDEC monitor register to the console"
+    )
+    POSITIVE_WINDOW = "Change positive window parameter for AD frames"
+    NEGATIVE_WINDOW = "Change negative window parameter for AD frames"
+
+
 def pack_pdec_handler_test(
     object_id: bytearray, q: DefaultPusQueueHelper, op_code: str
 ):
     q.add_log_cmd(f"Testing PDEC handler with object id: {object_id.hex()}")
-    if op_code == "0":
-        q.add_log_cmd("PDEC Handler: Print CLCW")
+    prefix = "PDEC Handler "
+    if op_code == OpCode.PRINT_CLCW:
+        q.add_log_cmd(f"{prefix}: {Info.PRINT_CLCW}")
         command = object_id + CommandId.PRINT_CLCW
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if op_code == "1":
-        q.add_log_cmd("PDEC Handler: Print PDEC monitor register")
+    if op_code == OpCode.PRINT_MON_REG:
+        q.add_log_cmd(f"{prefix}: {Info.PRINT_MON_REG}")
         command = object_id + CommandId.PRINT_PDEC_MON
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
+    if op_code == OpCode.POSITIVE_WINDOW:
+        q.add_log_cmd(f"{prefix}: {Info.POSITIVE_WINDOW}")
+        pw = int(input("Specify positive window to set: "))
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_u8_parameter(
+                    object_id,
+                    0,
+                    ParameterId.POSITIVE_WINDOW,
+                    pw,
+                ).pack()
+            )
+        )
+    if op_code == OpCode.NEGATIVE_WINDOW:
+        q.add_log_cmd(f"{prefix}: {Info.NEGATIVE_WINDOW}")
+        nw = int(input("Specify negative window to set: "))
+        q.add_pus_tc(
+            create_load_param_cmd(
+                create_scalar_u8_parameter(
+                    object_id,
+                    0,
+                    ParameterId.NEGATIVE_WINDOW,
+                    nw,
+                ).pack()
+            )
+        )
+
+
+@tmtc_definitions_provider
+def add_pdec_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.PRINT_CLCW, Info.PRINT_CLCW)
+    oce.add(OpCode.PRINT_MON_REG, Info.PRINT_MON_REG)
+    oce.add(OpCode.POSITIVE_WINDOW, Info.POSITIVE_WINDOW)
+    oce.add(OpCode.NEGATIVE_WINDOW, Info.NEGATIVE_WINDOW)
+    defs.add_service(CustomServiceList.PDEC_HANDLER.value, "PDEC Handler", oce)

eive_tmtc/tmtc/health.py

@@ -1,4 +1,7 @@
+import struct
+
 from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.tmtc.obj_prompt import prompt_object
 from spacepackets.ecss import PusTelecommand
 from tmtccmd.config.tmtc import (
     tmtc_definitions_provider,
@@ -6,33 +9,58 @@ from tmtccmd.config.tmtc import (
     OpCodeEntry,
 )
 from tmtccmd.tc import service_provider
-from tmtccmd.pus.s201_fsfw_health import Subservice
+from tmtccmd.pus.s201_fsfw_health import Subservice, FsfwHealth
 from tmtccmd.tc.decorator import ServiceProviderParams
 
 
 class OpCode:
+    SET_HEALTH = "set_health"
     ANNOUNCE_HEALTH_ALL = "read_health_all"
     ANNOUNCE_HEALTH = "read_health"
 
 
 class Info:
+    SET_HEALTH = "Set health of specific object"
     ANNOUNCE_HEALTH_ALL = "Read all health states"
     ANNOUNCE_HEALTH = "Read health state of one object"
 
 
+def prompt_health() -> FsfwHealth:
+    for item in FsfwHealth:
+        print(f"{item}: {item.name}")
+    health_idx = int(input("Please enter health by index: "))
+    return FsfwHealth(health_idx)
+
+
 @service_provider(CustomServiceList.HEALTH)
 def pack_test_command(p: ServiceProviderParams):
     o = p.op_code
     q = p.queue_helper
-    if o == OpCode.ANNOUNCE_HEALTH:
-        raise NotImplementedError()
+    if o == OpCode.SET_HEALTH:
+        app_data = bytearray(prompt_object())
+        health = prompt_health()
+        app_data.append(health)
+        q.add_log_cmd(Info.SET_HEALTH)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=201, subservice=Subservice.TC_SET_HEALTH, app_data=app_data
+            )
+        )
+    elif o == OpCode.ANNOUNCE_HEALTH:
+        app_data = bytearray(prompt_object())
+        q.add_log_cmd(Info.ANNOUNCE_HEALTH)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=201, subservice=Subservice.TC_ANNOUNCE_HEALTH, app_data=app_data
+            )
+        )
     elif o == OpCode.ANNOUNCE_HEALTH_ALL:
         q.add_log_cmd(Info.ANNOUNCE_HEALTH_ALL)
         q.add_pus_tc(
             PusTelecommand(service=201, subservice=Subservice.TC_ANNOUNCE_HEALTH_ALL)
         )
-        return
-    raise ValueError(f"unknown op code {o} for service {CustomServiceList.HEALTH}")
+    else:
+        raise ValueError(f"unknown op code {o} for service {CustomServiceList.HEALTH}")
 
 
 @tmtc_definitions_provider
@@ -40,4 +68,5 @@ def add_health_cmd_defs(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(OpCode.ANNOUNCE_HEALTH_ALL, Info.ANNOUNCE_HEALTH_ALL)
     oce.add(OpCode.ANNOUNCE_HEALTH, Info.ANNOUNCE_HEALTH)
+    oce.add(OpCode.SET_HEALTH, Info.SET_HEALTH)
     defs.add_service(CustomServiceList.HEALTH, info="Health Service", op_code_entry=oce)

eive_tmtc/tmtc/obj_prompt.py

@@ -0,0 +1,43 @@
+from eive_tmtc.config.object_ids import (
+    ACS_SUBSYSTEM_ID,
+    ACS_CONTROLLER,
+    IMTQ_HANDLER_ID,
+    GYRO_0_ADIS_HANDLER_ID,
+    GYRO_1_L3G_HANDLER_ID,
+    ACS_BOARD_ASS_ID,
+    RW_ASSEMBLY,
+    SUS_BOARD_ASS_ID,
+)
+
+SUBSYSTEM_DICT = {
+    0: "acs",
+    1: "tcs",
+    2: "com",
+}
+
+ACS_OBJ_DICT = {
+    0: ("Subsystem", ACS_SUBSYSTEM_ID),
+    1: ("SUS Assembly", SUS_BOARD_ASS_ID),
+    2: ("ACS Board Assembly", ACS_BOARD_ASS_ID),
+    3: ("RW Assembly", RW_ASSEMBLY),
+    4: ("iMTQ MGT", IMTQ_HANDLER_ID),
+    5: ("GYR 0 ADIS", GYRO_0_ADIS_HANDLER_ID),
+    6: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID),
+}
+
+
+def prompt_object() -> bytes:
+    for k, v in SUBSYSTEM_DICT.items():
+        print(f"{k}: {v}")
+    subsystem_key = int(input("Please specify target subsystem by key: "))
+    subsystem = SUBSYSTEM_DICT[subsystem_key]
+    if subsystem is None:
+        raise ValueError("invalid key")
+    if subsystem == "acs":
+        for k, v in ACS_OBJ_DICT.items():
+            print(f"{k}: {v[0]}")
+        obj_key = int(input("Please specify target object by key: "))
+        acs_obj = ACS_OBJ_DICT[obj_key]
+        if acs_obj is None:
+            raise ValueError("invalid key")
+        return acs_obj[1]

eive_tmtc/tmtc/power/power.py

@@ -45,7 +45,7 @@ class SetId(enum.IntEnum):
     SWITCHER_SET = 0
 
 
-class PcduSetIds:
+class PcduSetIds(enum.IntEnum):
     SWITCHER_SET = 0
 
 

eive_tmtc/tmtc/tcs/heater.py

@@ -21,26 +21,26 @@ from spacepackets.ecss.tc import PusTelecommand
 
 
 class Heater(enum.IntEnum):
-    HEATER_0_OBC_BRD = 0
-    HEATER_1_PLOC_PROC_BRD = 1
+    HEATER_0_PLOC_PROC_BRD = 0
+    HEATER_1_PCDU_BRD = 1
     HEATER_2_ACS_BRD = 2
-    HEATER_3_PCDU_PDU = 3
+    HEATER_3_OBC_BRD = 3
     HEATER_4_CAMERA = 4
     HEATER_5_STR = 5
     HEATER_6_DRO = 6
-    HEATER_7_HPA = 7
+    HEATER_7_SYRLINKS = 7
     NUMBER_OF_SWITCHES = 8
 
 
 HEATER_LOCATION = [
-    "OBC Board",
     "PLOC Processing Board",
-    "ACS Board",
     "PCDU PDU",
+    "ACS Board",
+    "OBC Board",
     "Camera",
     "Startracker",
     "DRO",
-    "HPA",
+    "Syrlinks",
 ]
 
 
@@ -135,25 +135,25 @@ def pack_heater_cmds(object_id: bytearray, op_code: str, q: DefaultPusQueueHelpe
 
 def heater_idx_to_obj(heater: int) -> ObjectIdU32:
     from eive_tmtc.config.object_ids import (
-        HEATER_0_OBC_BRD,
-        HEATER_1_PLOC_PROC_BRD,
+        HEATER_0_PLOC_PROC_BRD,
+        HEATER_1_PCDU_BRD,
         HEATER_2_ACS_BRD,
-        HEATER_3_PCDU_BRD,
+        HEATER_3_OBC_BRD,
         HEATER_4_CAMERA,
         HEATER_5_STR,
         HEATER_6_DRO,
-        HEATER_7_HPA,
+        HEATER_7_SYRLINKS,
     )
 
     obj_id_array = [
-        HEATER_0_OBC_BRD,
-        HEATER_1_PLOC_PROC_BRD,
+        HEATER_0_PLOC_PROC_BRD,
+        HEATER_1_PCDU_BRD,
         HEATER_2_ACS_BRD,
-        HEATER_3_PCDU_BRD,
+        HEATER_3_OBC_BRD,
         HEATER_4_CAMERA,
         HEATER_5_STR,
         HEATER_6_DRO,
-        HEATER_7_HPA,
+        HEATER_7_SYRLINKS,
     ]
     obj_dict = get_object_ids()
     obj_id_obj = obj_dict.get(obj_id_array[heater])

eive_tmtc/tmtc/tcs/tmp1075.py

@@ -40,7 +40,7 @@ class Tmp1075ActionId(enum.IntEnum):
 
 
 class SetId:
-    TMEPERATURE = 1
+    TEMPERATURE = 1
 
 
 def pack_tmp1075_test_into(
@@ -64,7 +64,7 @@ def pack_tmp1075_test_into(
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
     if op_code == OpCode.HK:
         q.add_log_cmd("TMP1075: Request One-Shot HK")
-        q.add_pus_tc(create_request_one_hk_command(make_sid(obyt, SetId.TMEPERATURE)))
+        q.add_pus_tc(create_request_one_hk_command(make_sid(obyt, SetId.TEMPERATURE)))
     return q
 
 

eive_tmtc/tmtc/tm_store.py

@@ -45,15 +45,12 @@ def pack_tm_store_commands(p: ServiceProviderParams):
     if o == OpCode.DELETE_UP_TO:
         obj_id, store_string = store_select_prompt()
         app_data = bytearray(obj_id.as_bytes)
-        delete_up_to_time = time_prompt()
+        delete_up_to_time = time_prompt("Determining deletion end time")
         end_stamp = int(math.floor(delete_up_to_time.timestamp()))
         app_data.extend(struct.pack("!I", end_stamp))
         q.add_log_cmd(Info.DELETE_UP_TO)
         q.add_log_cmd(f"Selected Store: {obj_id}")
-        q.add_log_cmd(
-            f"Deletion up to time "
-            f"{datetime.datetime.fromtimestamp(end_stamp, tz=datetime.timezone.utc)}"
-        )
+        q.add_log_cmd(f"Deletion up to time {delete_up_to_time}")
         q.add_pus_tc(
             PusTelecommand(
                 service=15, subservice=Subservice.DELETE_UP_TO, app_data=app_data
@@ -61,7 +58,26 @@ def pack_tm_store_commands(p: ServiceProviderParams):
         )
     elif o == OpCode.RETRIEVAL_BY_TIME_RANGE:
         q.add_log_cmd(Info.RETRIEVAL_BY_TIME_RANGE)
-        pass
+        obj_id, store_string = store_select_prompt()
+        app_data = bytearray(obj_id.as_bytes)
+        start_of_dump_time = time_prompt("Determining retrieval start time")
+        start_stamp = int(math.floor(start_of_dump_time.timestamp()))
+        end_of_dump_time = time_prompt("Determining retrieval end time")
+        end_stamp = int(math.floor(end_of_dump_time.timestamp()))
+        app_data.extend(struct.pack("!I", start_stamp))
+        app_data.extend(struct.pack("!I", end_stamp))
+        q.add_log_cmd(Info.RETRIEVAL_BY_TIME_RANGE)
+        q.add_log_cmd(f"Selected Store: {obj_id}")
+        q.add_log_cmd(
+            f"Retrieval from time {start_of_dump_time} up to time {end_of_dump_time}"
+        )
+        q.add_pus_tc(
+            PusTelecommand(
+                service=15,
+                subservice=Subservice.RETRIEVAL_BY_TIME_RANGE,
+                app_data=app_data,
+            )
+        )
 
 
 @tmtc_definitions_provider
@@ -100,8 +116,8 @@ TIME_INPUT_DICT = {
 }
 
 
-def time_prompt() -> datetime.datetime:
-    print("Available time input types: ")
+def time_prompt(info_str: str) -> datetime.datetime:
+    print(f"{info_str}. Available time input types: ")
     for k, v in TIME_INPUT_DICT.items():
         print(f"  {k}: {v}")
     while True:
@@ -146,7 +162,6 @@ def time_prompt_offset_from_now() -> datetime.datetime:
 def store_select_prompt() -> (ObjectIdU32, str):
     obj_id_dict = get_object_ids()
     print("Available TM stores:")
-    idx_to_obj_id = dict()
     for k, v in STORE_DICT.items():
         print(f"  {k}: {v[1]}")
     while True:

tmtcc.py

@@ -371,7 +371,7 @@ def setup_cfdp_handler() -> CfdpInCcsdsWrapper:
     remote_cfg = RemoteEntityCfg(
         closure_requested=False,
         entity_id=CFDP_REMOTE_ENTITY_ID,
-        max_file_segment_len=1024,
+        max_file_segment_len=990,
         check_limit=None,
         crc_on_transmission=False,
         crc_type=ChecksumType.CRC_32,