changelog update

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

@@ -1,24 +0,0 @@
-<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,11 +10,16 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [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.12.7"
+__version__ = "2.13.0"
 
 import logging
 from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
-VERSION_MINOR = 12
-VERSION_REVISION = 7
+VERSION_MINOR = 13
+VERSION_REVISION = 0
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

eive_tmtc/config/events.csv

@@ -249,11 +249,10 @@ 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;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
+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

eive_tmtc/config/objects.csv

@@ -29,6 +29,7 @@
 0x44120350;RW4
 0x44130001;STAR_TRACKER
 0x44130045;GPS_CONTROLLER
+0x44140013;IMTQ_POLLING
 0x44140014;IMTQ_HANDLER
 0x442000A1;PCDU_HANDLER
 0x44250000;P60DOCK_HANDLER
@@ -147,11 +148,6 @@
 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,6 +3,16 @@ 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
@@ -13,19 +23,12 @@ 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_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
+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
 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
@@ -566,6 +569,7 @@ 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/tmtc/system.py

@@ -7,18 +7,24 @@ 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
+from tmtccmd.tc.pus_200_fsfw_mode import (
+    create_mode_command,
+    Mode,
+    create_announce_mode_recursive_command,
+)
 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)
@@ -32,6 +38,9 @@ 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
@@ -39,6 +48,7 @@ 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,3 +5,4 @@ class CtrlSetId(enum.IntEnum):
     PRIMARY_SENSORS = 0
     DEVICE_SENSORS = 1
     SUS_TEMP_SENSORS = 2
+    HEATER_INFO = 4

eive_tmtc/tmtc/tcs/heater.py

@@ -32,6 +32,18 @@ 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,8 +9,12 @@ from tmtccmd.config.tmtc import (
     OpCodeEntry,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_mode import Mode
-from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
+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,
+)
 
 
 class OpCodeSys:
@@ -19,6 +23,8 @@ 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:
@@ -27,6 +33,8 @@ 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):
@@ -46,12 +54,22 @@ 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)
 
 
@@ -67,6 +85,8 @@ 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,10 +1,16 @@
+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(
@@ -22,7 +28,10 @@ def handle_thermal_controller_hk_data(
         pw.dlog("Received sensor temperature data")
 
         # get all the floats
-        tm_data = struct.unpack("!fffffffffffffffffffff", hk_data[: 21 * 4])
+        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)
         parsed_data = {
             "SENSOR_PLOC_HEATSPREADER": tm_data[0],
             "SENSOR_PLOC_MISSIONBOARD": tm_data[1],
@@ -46,9 +55,8 @@ def handle_thermal_controller_hk_data(
             "TMP1075 PL PCDU 1": tm_data[19],
             "TMP1075 IF BOARD": tm_data[20],
         }
-        printer.file_logger.info(str(parsed_data))
-        pp = pprint.PrettyPrinter(depth=4)
-        pp.pprint(parsed_data)
+        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.DEVICE_SENSORS:
         pw = PrintWrapper(printer)
         pw.dlog("Received device temperature data")
@@ -108,3 +116,13 @@ def handle_thermal_controller_hk_data(
         printer.file_logger.info(str(parsed_data))
         pp = pprint.PrettyPrinter(depth=4)
         pp.pprint(parsed_data)
+    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}")