add missing run config

.flake8

@@ -1,17 +0,0 @@
-[flake8]
-max-line-length = 100
-ignore = D203, W503
-per-file-ignores =
-	*/__init__.py: F401
-exclude =
-	.git,
-	__pycache__,
-	docs/conf.py,
-	old,
-	build,
-	dist,
-	venv
-max-complexity = 10
-extend-ignore =
-    # See https://github.com/PyCQA/pycodestyle/issues/373
-    E203,

.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,34 +10,11 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
-# [v2.15.0] 2023-02-23
-
-tmtccmd version v4.1.1
-
-## Changed
-
-- Moved to `pyproject.toml` package file
-
-## Fixed
-
-- Correction in `tmtccmd` dependency, added missing function
-
-# [v2.14.0] 2023-02-22
-
-## Changed
-
-- Generated CSV files for PDEC handler
-
-# [v2.13.0] 2023-02-21
-
 tmtccmd version 4.0.0
 
-Added `python-dateutil` dependency for time prompts.
-
 ## Added
 
 - Basic persistent TM store commanding
-- System and TCS system announce mode commands
 
 ## Changed
 

eive_tmtc/__init__.py

@@ -1,12 +1,12 @@
-__version__ = "2.15.0"
+__version__ = "2.12.7"
 
 import logging
 from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
-VERSION_MINOR = 15
-VERSION_REVISION = 0
+VERSION_MINOR = 12
+VERSION_REVISION = 7
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

eive_tmtc/config/definitions.py

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

eive_tmtc/config/events.csv

@@ -145,9 +145,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 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;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
+12407;0x3077;POLL_SYSCALL_ERROR_PDEC;MEDIUM;No description;linux/ipcore/PdecHandler.h
+12408;0x3078;WRITE_SYSCALL_ERROR_PDEC;MEDIUM;No description;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
@@ -250,10 +249,11 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 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
-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
-14103;0x3717;PLOC_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
-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
+14100;0x3714;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
+14200;0x3778;NO_VALID_SENSOR_TEMPERATURE;MEDIUM;No description;mission/controller/ThermalController.h
+14201;0x3779;NO_HEALTHY_HEATER_AVAILABLE;MEDIUM;No description;mission/controller/ThermalController.h
+14202;0x377a;SYRLINKS_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
+14203;0x377b;PLOC_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
+14204;0x377c;OBC_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
+14205;0x377d;HPA_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
+14206;0x377e;PLPCDU_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h

eive_tmtc/config/objects.csv

@@ -29,7 +29,6 @@
 0x44120350;RW4
 0x44130001;STAR_TRACKER
 0x44130045;GPS_CONTROLLER
-0x44140013;IMTQ_POLLING
 0x44140014;IMTQ_HANDLER
 0x442000A1;PCDU_HANDLER
 0x44250000;P60DOCK_HANDLER
@@ -148,6 +147,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

@@ -3,16 +3,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
-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
-0x5103;IMTQ_ParameterMissing;No description;3;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
-0x5104;IMTQ_ParameterInvalid;No description;4;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
-0x5105;IMTQ_CcUnavailable;No description;5;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
-0x5106;IMTQ_InternalProcessingError;No description;6;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
-0x5107;IMTQ_RejectedWithoutReason;No description;7;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
-0x5108;IMTQ_CmdErrUnknown;No description;8;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.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/devicedefinitions/imtqHelpers.h
 0x52b0;RWHA_SpiWriteFailure;No description;176;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h
 0x52b1;RWHA_SpiReadFailure;Used by the spi send function to tell a failing read call;177;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h
 0x52b2;RWHA_MissingStartSign;Can be used by the HDLC decoding mechanism to inform about a missing start sign 0x7E;178;RW_HANDLER;mission/devices/devicedefinitions/rwHelpers.h
@@ -23,12 +13,19 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 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
-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
-0x66a3;SADPL_ExecutionFailed;Command execution failed;163;SA_DEPL_HANDLER;mission/devices/RwHandler.h
-0x66a4;SADPL_CrcError;Reaction wheel reply has invalid crc;164;SA_DEPL_HANDLER;mission/devices/RwHandler.h
-0x66a5;SADPL_ValueNotRead;No description;165;SA_DEPL_HANDLER;mission/devices/RwHandler.h
+0x66a0;SADPL_CommandNotSupported;No description;160;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x66a1;SADPL_DeploymentAlreadyExecuting;No description;161;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x66a2;SADPL_MainSwitchTimeoutFailure;No description;162;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x66a3;SADPL_SwitchingDeplSa1Failed;No description;163;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x66a4;SADPL_SwitchingDeplSa2Failed;No description;164;SA_DEPL_HANDLER;mission/devices/SolarArrayDeploymentHandler.h
+0x51a0;IMTQ_InvalidSpeed;Action Message with invalid speed was received. Valid speeds must be in the range of [-65000, 1000] or [1000, 65000];160;IMTQ_HANDLER;mission/devices/RwHandler.h
+0x51a1;IMTQ_InvalidRampTime;Action Message with invalid ramp time was received.;161;IMTQ_HANDLER;mission/devices/RwHandler.h
+0x51a2;IMTQ_SetSpeedCommandInvalidLength;Received set speed command has invalid length. Should be 6.;162;IMTQ_HANDLER;mission/devices/RwHandler.h
+0x51a3;IMTQ_ExecutionFailed;Command execution failed;163;IMTQ_HANDLER;mission/devices/RwHandler.h
+0x51a4;IMTQ_CrcError;Reaction wheel reply has invalid crc;164;IMTQ_HANDLER;mission/devices/RwHandler.h
+0x51a5;IMTQ_ValueNotRead;No description;165;IMTQ_HANDLER;mission/devices/RwHandler.h
+0x51a6;IMTQ_CmdErrUnknown;No description;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;No description;160;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
 0x50a1;SYRLINKS_UartFraminOrParityErrorAck;No description;161;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
 0x50a2;SYRLINKS_BadCharacterAck;No description;162;SYRLINKS_HANDLER;mission/devices/SyrlinksHandler.h
@@ -569,7 +566,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x53b6;STRH_StartrackerAlreadyBooted;Star tracker is already in firmware mode;182;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
 0x53b7;STRH_StartrackerRunningFirmware;Star tracker is in firmware mode but must be in bootloader mode to execute this command;183;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
 0x53b8;STRH_StartrackerRunningBootloader;Star tracker is in bootloader mode but must be in firmware mode to execute this command;184;STR_HANDLER;linux/devices/startracker/StarTrackerHandler.h
-0x5300;STRH_NoReplyAvailable;No description;0;STR_HANDLER;linux/devices/ImtqPollingTask.h
 0x5302;STRH_InvalidCrc;No description;2;STR_HANDLER;linux/devices/ScexHelper.h
 0x5aa0;PTME_UnknownVcId;No description;160;PTME;linux/ipcore/Ptme.h
 0x5fa0;PDEC_AbandonedCltuRetval;No description;160;PDEC_HANDLER;linux/ipcore/PdecHandler.h

eive_tmtc/pus_tc/procedure_packer.py

@@ -3,7 +3,6 @@
 import logging
 from typing import cast
 
-from eive_tmtc.tmtc.acs.gyros import handle_gyr_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
@@ -178,8 +177,6 @@ def handle_default_procedure(
         return pack_syrlinks_command(
             object_id=object_id, q=queue_helper, op_code=op_code
         )
-    if service == CustomServiceList.GYRO.value:
-        return handle_gyr_cmd(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PROCEDURE.value:
         return pack_proc_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PL_PCDU.value:

eive_tmtc/tmtc/acs/__init__.py

@@ -1 +0,0 @@
-from .gyros import add_gyr_cmd_defs

eive_tmtc/tmtc/acs/gyros.py

@@ -1,34 +1,13 @@
 import enum
-import logging
 import struct
 
-from tmtccmd.tc import DefaultPusQueueHelper
-
 import eive_tmtc.config.object_ids as obj_ids
-from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_hk_command, make_sid
-from tmtccmd.config.tmtc import (
-    tmtc_definitions_provider,
-    OpCodeEntry,
-    TmtcDefinitionWrapper,
-)
-from eive_tmtc.config.object_ids import (
-    GYRO_0_ADIS_HANDLER_ID,
-    GYRO_1_L3G_HANDLER_ID,
-    GYRO_2_ADIS_HANDLER_ID,
-    GYRO_3_L3G_HANDLER_ID,
-)
-from eive_tmtc.config.definitions import CustomServiceList
-from eive_tmtc.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
 
 
-class OpCode:
-    CORE_HK = "core_hk"
-    CFG_HK = "cfg_hk"
-
-
 class AdisGyroSetId(enum.IntEnum):
     CORE_HK = 0
     CFG_HK = 1
@@ -38,50 +17,6 @@ class L3gGyroSetId(enum.IntEnum):
     CORE_HK = 0
 
 
-class GyrSel(enum.IntEnum):
-    GYR_0_ADIS = 0
-    GYR_1_L3G = 1
-    GYR_2_ADIS = 2
-    GYR_3_L3G = 3
-
-
-GYR_SEL_DICT = {
-    GyrSel.GYR_0_ADIS: ("GYRO_0_ADIS", GYRO_0_ADIS_HANDLER_ID),
-    GyrSel.GYR_1_L3G: ("GYRO_1_L3G", GYRO_1_L3G_HANDLER_ID),
-    GyrSel.GYR_2_ADIS: ("GYRO_2_ADIS", GYRO_2_ADIS_HANDLER_ID),
-    GyrSel.GYR_3_L3G: ("GYRO_3_L3G", GYRO_3_L3G_HANDLER_ID),
-}
-
-
-def handle_gyr_cmd(q: DefaultPusQueueHelper, op_code: str):
-    print("Please select the Gyro Device")
-    for (k, v) in GYR_SEL_DICT.items():
-        print(f"{k}: {v[0]}")
-    sel_idx = int(input("Select gyro device by index: "))
-    gyr_info = GYR_SEL_DICT[GyrSel(sel_idx)]
-    gyr_obj_id = gyr_info[1]
-    is_adis = False
-    if sel_idx == GyrSel.GYR_0_ADIS or sel_idx == GyrSel.GYR_2_ADIS:
-        is_adis = True
-        core_hk_id = AdisGyroSetId.CORE_HK
-    else:
-        core_hk_id = L3gGyroSetId.CORE_HK
-    if 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:
-        if not is_adis:
-            raise ValueError("No config HK for L3 device")
-        q.add_log_cmd(f"Gyro {gyr_info[0]} CFG HK")
-        q.add_pus_tc(
-            create_request_one_hk_command(make_sid(gyr_obj_id, AdisGyroSetId.CFG_HK))
-        )
-    else:
-        logging.getLogger(__name__).warning(
-            f"invalid op code {op_code} for gyro command"
-        )
-
-
 def handle_gyros_hk_data(
     object_id: ObjectIdU32, printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes
 ):
@@ -108,36 +43,24 @@ def handle_adis_gyro_hk(
         pw = PrintWrapper(printer)
         fmt_str = "!ddddddf"
         inc_len = struct.calcsize(fmt_str)
-        (
-            ang_veloc_x,
-            ang_veloc_y,
-            ang_veloc_z,
-            accel_x,
-            accel_y,
-            accel_z,
-            temp,
-        ) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
+        (angVelocX, angVelocY, angVelocZ, accelX, accelY, accelZ, temp) = struct.unpack(
+            fmt_str, hk_data[0 : 0 + inc_len]
+        )
         pw.dlog(f"Received ADIS1650X Gyro HK data from object {object_id}")
         pw.dlog(
-            f"Angular Velocities (degrees per second): X {ang_veloc_x} | "
-            f"Y {ang_veloc_y} | Z {ang_veloc_z}"
+            f"Angular Velocities (degrees per second): X {angVelocX} | "
+            f"Y {angVelocY} | Z {angVelocZ}"
         )
-        pw.dlog(f"Acceleration (m/s^2): X {accel_x} | Y {accel_y} | Z {accel_z}")
+        pw.dlog(f"Acceleration (m/s^2): X {accelX} | Y {accelY} | Z {accelZ}")
         pw.dlog(f"Temperature {temp} C")
     if set_id == AdisGyroSetId.CFG_HK:
         pw = PrintWrapper(printer)
-        fmt_str = "!HBHHH"
+        fmt_str = "!HBHH"
         inc_len = struct.calcsize(fmt_str)
-        print(len(hk_data))
-        (
-            diag_stat_reg,
-            filter_setting,
-            range_mdl,
-            msc_ctrl_reg,
-            dec_rate_reg,
-        ) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
+        (diag_stat_reg, filter_setting, msc_ctrl_reg, dec_rate_reg) = struct.unpack(
+            fmt_str, hk_data[0 : 0 + inc_len]
+        )
         pw.dlog(f"Diagnostic Status Register {diag_stat_reg:#018b}")
-        pw.dlog(f"Range MDL {range_mdl}")
         pw.dlog(f"Filter Settings {filter_setting:#010b}")
         pw.dlog(f"Miscellaneous Control Register {msc_ctrl_reg:#018b}")
         pw.dlog(f"Decimation Rate {dec_rate_reg:#06x}")
@@ -159,11 +82,3 @@ def handle_l3g_gyro_hk(
             f"Y {angVelocY} | Z {angVelocZ}"
         )
         pw.dlog(f"Temperature {temp} °C")
-
-
-@tmtc_definitions_provider
-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")
-    defs.add_service(CustomServiceList.GYRO, info="Gyro", op_code_entry=oce)

eive_tmtc/tmtc/acs/mgms.py

@@ -57,7 +57,7 @@ def handle_mgm_rm3100_hk_data(
         fmt_str = f"!fff"
         inc_len = struct.calcsize(fmt_str)
         (field_x, field_y, field_z) = struct.unpack(fmt_str, hk_data[0 : 0 + inc_len])
-        pw.dlog(f"Received MGM RM3100 from object {object_id}")
+        pw.dlog(f"Received MGM LIS3 from object {object_id}")
         pw.dlog(
             f"Field strengths in micro Tesla X {field_x} | Y {field_y} | Z {field_z}"
         )

eive_tmtc/tmtc/com/subsystem.py

@@ -21,12 +21,9 @@ from tmtccmd.tc.pus_20_fsfw_param import (
     pack_scalar_u8_parameter_app_data,
 )
 
-from tmtccmd.pus.s20_fsfw_param import create_scalar_u32_parameter
-
 
 class ParameterId(enum.IntEnum):
     DATARATE = 0
-    TRANSMITTER_TIMEOUT = 1
 
 
 class Submode(enum.IntEnum):
@@ -45,7 +42,6 @@ class OpCode:
     TX_AND_RX_CARRIER_WAVE = "rx_and_tx_carrier_wave"
     UPDATE_DEFAULT_DATARATE_LOW = "update_default_rate_low"
     UPDATE_DEFAULT_DATARATE_HIGH = "update_default_rate_high"
-    CHANGE_TRANSMITTER_TIMEOUT = "change_transmitter_timeout"
     READ_MODE = "read_mode"
     ANNOUNCE_MODE = "announce_mode"
     ANNOUNCE_MODE_RECURSIVE = "announce_mode_recursive"
@@ -59,7 +55,6 @@ class Info:
     TX_AND_RX_CARRIER_WAVE = "Syrlinks with TX carrier wave"
     UPDATE_DEFAULT_DATARATE_LOW = "Configure default low datarate (BPSK modulation)"
     UPDATE_DEFAULT_DATARATE_HIGH = "Configure default high datarate (0QPSK modulation)"
-    CHANGE_TRANSMITTER_TIMEOUT = "Changes the transmitter timeout"
     READ_MODE = "Read Mode"
     ANNOUNCE_MODE = "Announce Mode"
     ANNOUNCE_MODE_RECURSIVE = "Announce mode recursively"
@@ -117,19 +112,6 @@ def build_com_subsystem_cmd(p: ServiceProviderParams):
         q.add_pus_tc(
             create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_CARRIER_WAVE, 0)
         )
-    elif o == OpCode.CHANGE_TRANSMITTER_TIMEOUT:
-        timeout = int(input("Specify timeout to set [ms]: "))
-        q.add_log_cmd(Info.CHANGE_TRANSMITTER_TIMEOUT)
-        q.add_pus_tc(
-            create_load_param_cmd(
-                create_scalar_u32_parameter(
-                    COM_SUBSYSTEM_ID,
-                    0,
-                    ParameterId.TRANSMITTER_TIMEOUT,
-                    timeout,
-                ).pack()
-            )
-        )
     elif o == OpCode.READ_MODE:
         q.add_log_cmd(Info.READ_MODE)
         q.add_pus_tc(create_read_mode_command(COM_SUBSYSTEM_ID))
@@ -150,7 +132,6 @@ def add_com_subsystem_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCode.TX_AND_RX_DEF_RATE, Info.TX_AND_RX_DEF_DATARATE)
     oce.add(OpCode.UPDATE_DEFAULT_DATARATE_LOW, Info.UPDATE_DEFAULT_DATARATE_LOW)
     oce.add(OpCode.UPDATE_DEFAULT_DATARATE_HIGH, Info.UPDATE_DEFAULT_DATARATE_HIGH)
-    oce.add(OpCode.CHANGE_TRANSMITTER_TIMEOUT, Info.CHANGE_TRANSMITTER_TIMEOUT)
     oce.add(OpCode.READ_MODE, Info.READ_MODE)
     oce.add(OpCode.ANNOUNCE_MODE, Info.ANNOUNCE_MODE)
     oce.add(OpCode.ANNOUNCE_MODE_RECURSIVE, Info.ANNOUNCE_MODE_RECURSIVE)

eive_tmtc/tmtc/system.py

@@ -7,24 +7,18 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider
 from eive_tmtc.config.object_ids import EIVE_SYSTEM_ID
-from tmtccmd.tc.pus_200_fsfw_mode import (
-    create_mode_command,
-    Mode,
-    create_announce_mode_recursive_command,
-)
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.tc.decorator import ServiceProviderParams
 
 
 class OpCode:
     SAFE_MODE = "safe"
     IDLE_MODE = "idle"
-    ANNOUNCE_MODES = "announce_modes"
 
 
 class Info:
     SAFE_MODE = "Command System into Safe Mode"
     IDLE_MODE = "Command System into Idle Pointing Mode"
-    ANNOUNCE_MODES = "Announce mode recursively"
 
 
 @service_provider(CustomServiceList.SYSTEM.value)
@@ -38,9 +32,6 @@ def build_system_cmds(p: ServiceProviderParams):
     elif o == OpCode.IDLE_MODE:
         q.add_log_cmd(f"{prefix}: {Info.IDLE_MODE}")
         q.add_pus_tc(create_mode_command(EIVE_SYSTEM_ID, AcsMode.IDLE, 0))
-    elif o == OpCode.ANNOUNCE_MODES:
-        q.add_log_cmd(f"{prefix}: {Info.ANNOUNCE_MODES}")
-        q.add_pus_tc(create_announce_mode_recursive_command(EIVE_SYSTEM_ID))
 
 
 @tmtc_definitions_provider
@@ -48,7 +39,6 @@ def add_system_cmd_defs(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(keys=OpCode.SAFE_MODE, info=Info.SAFE_MODE)
     oce.add(keys=OpCode.IDLE_MODE, info=Info.IDLE_MODE)
-    oce.add(keys=OpCode.ANNOUNCE_MODES, info=Info.ANNOUNCE_MODES)
     defs.add_service(
         name=CustomServiceList.SYSTEM.value,
         info="EIVE system commands",

eive_tmtc/tmtc/tcs/defs.py

@@ -5,4 +5,3 @@ class CtrlSetId(enum.IntEnum):
     PRIMARY_SENSORS = 0
     DEVICE_SENSORS = 1
     SUS_TEMP_SENSORS = 2
-    HEATER_INFO = 4

eive_tmtc/tmtc/tcs/heater.py

@@ -32,18 +32,6 @@ class Heater(enum.IntEnum):
     NUMBER_OF_SWITCHES = 8
 
 
-HEATER_LOCATION = [
-    "OBC Board",
-    "PLOC Processing Board",
-    "ACS Board",
-    "PCDU PDU",
-    "Camera",
-    "Startracker",
-    "DRO",
-    "HPA",
-]
-
-
 class OpCode:
     HEATER_CMD = ["switch_cmd"]
     HEATER_EXT_CTRL = ["set_ext_ctrl"]

eive_tmtc/tmtc/tcs/subsystem.py

@@ -9,12 +9,8 @@ from tmtccmd.config.tmtc import (
     OpCodeEntry,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_announce_mode_recursive_command
-from tmtccmd.tc.pus_3_fsfw_hk import (
-    make_sid,
-    generate_one_hk_command,
-    create_request_one_diag_command,
-)
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
+from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
 
 
 class OpCodeSys:
@@ -23,8 +19,6 @@ class OpCodeSys:
     REQUEST_PRIMARY_TEMP_SET = ["temp"]
     REQUEST_DEVICE_TEMP_SET = ["temp_devs"]
     REQUEST_DEVICE_SUS_SET = ["temp_sus"]
-    REQUEST_HEATER_INFO = "heater_info"
-    ANNOUNCE_MODES = "announce_modes"
 
 
 class InfoSys:
@@ -33,8 +27,6 @@ class InfoSys:
     REQUEST_PRIMARY_TEMP_SET = "Request HK set of primary sensor temperatures"
     REQUEST_DEVICE_TEMP_SET = "Request HK set of device sensor temperatures"
     REQUEST_DEVICE_SUS_SET = "Request HK set of the SUS temperatures"
-    REQUEST_HEATER_INFO = "Request heater information"
-    ANNOUNCE_MODES = "Announce Modes recursively"
 
 
 def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
@@ -54,22 +46,12 @@ def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
                 make_sid(TCS_CONTROLLER, CtrlSetId.SUS_TEMP_SENSORS)
             )
         )
-    if op_code == OpCodeSys.REQUEST_HEATER_INFO:
-        q.add_log_cmd(InfoSys.REQUEST_HEATER_INFO)
-        q.add_pus_tc(
-            create_request_one_diag_command(
-                make_sid(TCS_CONTROLLER, CtrlSetId.HEATER_INFO)
-            )
-        )
     if op_code in OpCodeSys.OFF:
         q.add_log_cmd(InfoSys.OFF)
         pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.OFF, 0, q, InfoSys.OFF)
     if op_code in OpCodeSys.NML:
         q.add_log_cmd(InfoSys.NML)
         pack_mode_cmd_with_info(TCS_SUBSYSTEM_ID, Mode.NORMAL, 0, q, InfoSys.OFF)
-    if op_code == OpCodeSys.ANNOUNCE_MODES:
-        q.add_log_cmd(InfoSys.ANNOUNCE_MODES)
-        q.add_pus_tc(create_announce_mode_recursive_command(TCS_SUBSYSTEM_ID))
     pack_tcs_ass_cmds(q, op_code)
 
 
@@ -85,8 +67,6 @@ def add_tcs_subsystem_cmds(defs: TmtcDefinitionWrapper):
         keys=OpCodeSys.REQUEST_DEVICE_TEMP_SET, info=InfoSys.REQUEST_DEVICE_TEMP_SET
     )
     oce.add(keys=OpCodeSys.REQUEST_DEVICE_SUS_SET, info=InfoSys.REQUEST_DEVICE_SUS_SET)
-    oce.add(keys=OpCodeSys.REQUEST_HEATER_INFO, info=InfoSys.REQUEST_HEATER_INFO)
-    oce.add(keys=OpCodeSys.ANNOUNCE_MODES, info=InfoSys.ANNOUNCE_MODES)
     defs.add_service(
         name=CustomServiceList.TCS,
         info="TCS Board",

eive_tmtc/tmtc/tcs/tm.py

@@ -1,16 +1,10 @@
-import logging
 import pprint
 import struct
 
 from eive_tmtc.pus_tm.defs import PrintWrapper
-from tmtccmd.fsfw import validity_buffer_list
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from .defs import CtrlSetId
-from .heater import HEATER_LOCATION
-
-
-_LOGGER = logging.getLogger(__name__)
 
 
 def handle_thermal_controller_hk_data(
@@ -28,10 +22,7 @@ def handle_thermal_controller_hk_data(
         pw.dlog("Received sensor temperature data")
 
         # get all the floats
-        fmt_str = "!fffffffffffffffffffff"
-        fmt_len = struct.calcsize(fmt_str)
-        tm_data = struct.unpack(fmt_str, hk_data[:fmt_len])
-        valid_list = validity_buffer_list(hk_data[fmt_len:], 21)
+        tm_data = struct.unpack("!fffffffffffffffffffff", hk_data[: 21 * 4])
         parsed_data = {
             "SENSOR_PLOC_HEATSPREADER": tm_data[0],
             "SENSOR_PLOC_MISSIONBOARD": tm_data[1],
@@ -55,15 +46,14 @@ def handle_thermal_controller_hk_data(
             "TMP1075 PL PCDU 1": tm_data[19],
             "TMP1075 IF BOARD": tm_data[20],
         }
-        for idx, (k, v) in enumerate(parsed_data.items()):
-            print(f"{str(k).ljust(30)}: Valid: {valid_list[idx]}, Value: {v}")
+        printer.file_logger.info(str(parsed_data))
+        pp = pprint.PrettyPrinter(depth=4)
+        pp.pprint(parsed_data)
     elif set_id == CtrlSetId.DEVICE_SENSORS:
         pw = PrintWrapper(printer)
         pw.dlog("Received device temperature data")
         fmt_str = "!fhhhhiiiifffhffffffffffffff"
-        fmt_len = struct.calcsize(fmt_str)
         tm_data = struct.unpack(fmt_str, hk_data[:98])
-        valid_list = validity_buffer_list(hk_data[fmt_len:], 25)
         parsed_data = {
             "Q7S_TEMPERATURE": tm_data[0],
             "BATTERY_TEMPERATURE_1": tm_data[1],
@@ -78,7 +68,9 @@ def handle_thermal_controller_hk_data(
             "SYRLINKS_POWER_AMPLIFIER_TEMPERATURE": tm_data[10],
             "SYRLINKS_BASEBAND_BOARD_TEMPERATURE": tm_data[11],
             "MGT_TEMPERATURE": tm_data[12],
-            "ACU_TEMPERATURES": (tm_data[13], tm_data[14], tm_data[15]),
+            "ACU_TEMPERATURE_1": tm_data[13],
+            "ACU_TEMPERATURE_2": tm_data[14],
+            "ACU_TEMPERATURE_3": tm_data[15],
             "PDU1_TEMPERATURE": tm_data[16],
             "PDU2_TEMPERATURE": tm_data[17],
             "P60DOCK_TEMPERATURE_1": tm_data[18],
@@ -87,19 +79,18 @@ def handle_thermal_controller_hk_data(
             "GYRO_1_TEMPERATURE": tm_data[21],
             "GYRO_2_TEMPERATURE": tm_data[22],
             "GYRO_3_TEMPERATURE": tm_data[23],
-            "MGM_0_LIS3_TEMPERATURE": tm_data[24],
-            "MGM_2_LIS3_TEMPERATURE": tm_data[25],
+            "MGM_0_TEMPERATURE": tm_data[24],
+            "MGM_1_TEMPERATURE": tm_data[25],
             "ADC_PL_PCDU_TEMPERATURE": tm_data[26],
         }
-        for idx, (k, v) in enumerate(parsed_data.items()):
-            print(f"{str(k).ljust(30)}: Valid: {valid_list[idx]}, Value: {v}")
+        printer.file_logger.info(str(parsed_data))
+        pp = pprint.PrettyPrinter(depth=4)
+        pp.pprint(parsed_data)
     elif set_id == CtrlSetId.SUS_TEMP_SENSORS:
         pw = PrintWrapper(printer)
         pw.dlog("Received SUS temperature data")
-        fmt_str = "!ffffffffffff"
-        fmt_len = struct.calcsize(fmt_str)
-        tm_data = struct.unpack(fmt_str, hk_data[: 12 * 4])
-        valid_list = validity_buffer_list(hk_data[fmt_len:], 12)
+        fmt_str = "!ffffffffffffffffff"
+        tm_data = struct.unpack(fmt_str, hk_data[: 4 * 18])
         parsed_data = {
             "SUS_0": tm_data[0],
             "SUS_1": tm_data[1],
@@ -114,15 +105,6 @@ def handle_thermal_controller_hk_data(
             "SUS_10": tm_data[10],
             "SUS_11": tm_data[11],
         }
-        for idx, (k, v) in enumerate(parsed_data.items()):
-            print(f"{str(k).ljust(30)}: Valid: {valid_list[idx]}, Value: {v}")
-    elif set_id == CtrlSetId.HEATER_INFO:
-        print("Heater Switch States")
-        for i in range(8):
-            print(
-                f"{HEATER_LOCATION[i].ljust(25)}: {'On' if hk_data[i] == 1 else 'Off'}"
-            )
-        current_draw = struct.unpack("!H", hk_data[8:10])[0]
-        print(f"Heater Power Channel Current Draw: {current_draw} mA")
-    else:
-        _LOGGER.warning(f"Unimplemented set ID {set_id}")
+        printer.file_logger.info(str(parsed_data))
+        pp = pprint.PrettyPrinter(depth=4)
+        pp.pprint(parsed_data)

pyproject.toml

@@ -1,48 +0,0 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "eive-tmtc"
-description = "TMTC Commander EIVE"
-readme = "README.md"
-dynamic = ["version"]
-requires-python = ">=3.10"
-license = {text = "Apache-2.0"}
-authors = [
-    {name = "Robin Mueller", email = "muellerr@irs.uni-stuttgart.de"},
-    {name = "Jakob Meier", email = "meierj@irs.uni-stuttgart.de"},
-]
-keywords = ["eive", "space", "communication", "commanding"]
-classifiers = [
-    "Development Status :: 5 - Production/Stable",
-    "License :: OSI Approved :: Apache Software License",
-    "Natural Language :: English",
-    "Operating System :: POSIX",
-    "Operating System :: Microsoft :: Windows",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Topic :: Communications",
-    "Topic :: Software Development :: Libraries",
-    "Topic :: Software Development :: Libraries :: Python Modules",
-    "Topic :: Scientific/Engineering"
-]
-dependencies = [
-	"tmtccmd ~= 4.0",
-	"python-dateutil ~= 2.8",
-	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@<gitRev>#egg=tmtccmd
-]
-
-[project.urls]
-"Homepage" = "https://egit.irs.uni-stuttgart.de/eive/eive-tmtc"
-
-[tool.setuptools]
-include-package-data = true
-
-[tool.setuptools.dynamic]
-version = {attr = "eive_tmtc.__version__"}
-
-# Auto-Discovery is problematic for some reason, so use custom-discovery
-[tool.setuptools.packages]
-find = {}

setup.cfg

@@ -36,3 +36,19 @@ include_package_data = True
 
 [options.extras_require]
 mib =
+
+[flake8]
+max-line-length = 100
+ignore = D203, W503
+exclude =
+	.git,
+	__pycache__,
+	docs/conf.py,
+	old,
+	build,
+	dist,
+	venv
+max-complexity = 10
+extend-ignore =
+    # See https://github.com/PyCQA/pycodestyle/issues/373
+    E203,