prep v2.12.1

Reviewed-on: #131
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -8,7 +8,45 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 The [milestone](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestones)
 list yields a list of all related PRs for each release.
 
-# [v2.9.0] 2023-01-01
+# [unreleased]
+
+# [v2.12.1] 2023-02-08
+
+## Added
+
+- Added version announce and current image announce commands.
+- Added persistent TM store object IDs
+- GPS enable and disable HK commands
+- All mode commands for the COM subsystem.
+
+# [v2.12.0] 2023-02-06
+
+## Changed
+
+- Updated the subsystem IDs to avoid value clashes with regular device handler mode IDs.
+
+# [v2.11.0] 2023-02-06
+
+## Fixed
+
+- TMP1075 comands: Implement proper prompt for device select.
+- TMP1075 commands: Add OFF, ON, NORMAL, and HK command
+
+# [v2.10.0] 2023-02-03
+
+tmtccmd v4.0.0rc0
+
+## Changed
+
+- Updated ACS SS commands for OBSW ACS SS update.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/130
+
+## Fixed
+
+- Fixed parsing of processed GPS data
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/129
+
+# [v2.9.0] 2023-02-01
 
 ## Fixed
 
@@ -21,7 +59,7 @@ list yields a list of all related PRs for each release.
 - Add time dump command.
 - Time event handling.
 
-# [v2.8.0] 2023-01-01
+# [v2.8.0] 2023-02-01
 
 - Move all device modules inside `pus_tc` and `pus_tm` to `tmtc` module and respective
   subsystem submodules.

eive_tmtc/__init__.py

@@ -3,10 +3,10 @@ from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
-VERSION_MINOR = 9
-VERSION_REVISION = 0
+VERSION_MINOR = 12
+VERSION_REVISION = 1
 
-__version__ = "2.9.0"
+__version__ = "2.12.1"
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

eive_tmtc/config/definitions.py

@@ -38,8 +38,6 @@ class CustomServiceList(str, enum.Enum):
     ACS = "acs"
     COM_SS = "com"
     BPX_BATTERY = "bpx"
-    TMP1075_1 = "tmp1075_1"
-    TMP1075_2 = "tmp1075_2"
     HEATER = "heater"
     IMTQ = "imtq"
     PLOC_SUPV = "ploc_supv"
@@ -53,7 +51,7 @@ class CustomServiceList(str, enum.Enum):
     REACTION_WHEEL_4 = "rw_4"
     RW_ASSEMBLY = "rw_ass"
     RAD_SENSOR = "rad_sensor"
-    GPS_CTRL = "gnss-ctrl"
+    GPS_CTRL = "gps"
     PLOC_MEMORY_DUMPER = "ploc_memory_dumper"
     CORE = "core"
     STAR_TRACKER = "star_tracker"
@@ -71,6 +69,8 @@ class CustomServiceList(str, enum.Enum):
     TIME = "time"
     PROCEDURE = "proc"
     RTD = "rtd"
+    TMP1075 = "tcs_tmp"
     TVTTESTPROCEDURE = "tvtestproc"
     CONTROLLERS = "controllers"
     SCEX = "scex"
+    TM_STORE = "tm_store"

eive_tmtc/config/events.csv

@@ -84,7 +84,8 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 10800;0x2a30;STORE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
 10801;0x2a31;MSG_QUEUE_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
 10802;0x2a32;SERIALIZATION_ERROR;LOW;;fsfw/src/fsfw/cfdp/handler/defs.h
-11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;;mission/controller/AcsController.h
+11200;0x2bc0;SAFE_RATE_VIOLATION;MEDIUM;;mission/acsDefs.h
+11201;0x2bc1;SAFE_RATE_RECOVERY;MEDIUM;;mission/acsDefs.h
 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/devices/devicedefinitions/powerDefinitions.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;;mission/devices/devicedefinitions/powerDefinitions.h
@@ -197,6 +198,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/objects/SusAssembly.h
 13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/objects/TcsBoardAssembly.h
 13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
+13101;0x332d;CANT_GET_FIX;LOW;Could not get fix in maximum allowed time. P1: Maximum allowed time to get a fix after the GPS was switched on.;mission/devices/devicedefinitions/GPSDefinitions.h
 13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
 13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
 13202;0x3392;BATT_MODE_CHANGED;MEDIUM;Battery mode has changed. P1: Old mode. P2: New mode;mission/devices/P60DockHandler.h
@@ -243,3 +245,5 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 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;;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

eive_tmtc/config/object_ids.py

@@ -5,9 +5,10 @@
 """
 import logging
 import os.path
+from typing import Dict
 
 from eive_tmtc import EIVE_TMTC_ROOT
-from tmtccmd.util.obj_id import ObjectIdDictT
+from tmtccmd.util.obj_id import ObjectIdDictT, ObjectIdU32
 from tmtccmd.fsfw import parse_fsfw_objects_csv
 
 
@@ -30,8 +31,10 @@ SCEX_HANDLER_ID = bytes([0x44, 0x33, 0x00, 0x32])
 # Thermal Object IDs
 THERMAL_CONTROLLER_ID = bytes([0x43, 0x40, 0x00, 0x01])
 HEATER_CONTROLLER_ID = bytes([0x44, 0x41, 0x00, 0xA4])
-TMP_1075_1_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x04])
-TMP_1075_2_HANDLER_ID = bytes([0x44, 0x42, 0x00, 0x05])
+TMP1075_HANDLER_TCS_BRD_0_ID = bytes([0x44, 0x42, 0x00, 0x04])
+TMP1075_HANDLER_TCS_BRD_1_ID = bytes([0x44, 0x42, 0x00, 0x05])
+TMP1075_HANDLER_PLPCDU_0_ID = bytes([0x44, 0x42, 0x00, 0x06])
+TMP1075_HANDLER_IF_BRD_ID = bytes([0x44, 0x42, 0x00, 0x08])
 
 # Communication Object IDs
 SYRLINKS_HANDLER_ID = bytes([0x44, 0x53, 0x00, 0xA3])
@@ -138,8 +141,16 @@ TCS_CONTROLLER = bytes([0x43, 0x40, 0x00, 0x01])
 ACS_CONTROLLER = bytes([0x43, 0x00, 0x00, 0x02])
 CORE_CONTROLLER_ID = bytes([0x43, 0x00, 0x00, 0x03])
 
+MISC_TM_STORE = bytes([0x73, 0x02, 0x00, 0x01])
+OK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x02])
+NOT_OK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x03])
+HK_TM_STORE = bytes([0x73, 0x02, 0x00, 0x04])
+CFDP_TM_STORE = bytes([0x73, 0x03, 0x00, 0x00])
 
-def get_object_ids() -> ObjectIdDictT:
+ObjectIdDict = Dict[bytes, ObjectIdU32]
+
+
+def get_object_ids() -> ObjectIdDict:
     global __OBJECT_ID_DICT
     if not os.path.exists(DEFAULT_OBJECTS_CSV_PATH):
         logging.getLogger(__name__).warning(

eive_tmtc/config/returnvalues.csv

@@ -51,9 +51,12 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x4fa4;HEATER_MainSwitchSetTimeout;;164;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x4fa5;HEATER_CommandAlreadyWaiting;;165;HEATER_HANDLER;mission/devices/HeaterHandler.h
 0x60a0;CCSDS_CommandNotImplemented;Received action message with unknown action id;160;CCSDS_HANDLER;mission/tmtc/CcsdsIpCoreHandler.h
-0x6001;CCSDS_KalmanNoGyrMeas;;1;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6002;CCSDS_KalmanNoModel;;2;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
-0x6003;CCSDS_KalmanInversionFailed;;3;CCSDS_HANDLER;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6a01;ACSSAF_SafectrlMekfInputInvalid;;1;ACS_SAFE;mission/controller/acs/control/SafeCtrl.h
+0x6b01;ACSPTG_PtgctrlMekfInputInvalid;;1;ACS_PTG;mission/controller/acs/control/PtgCtrl.h
+0x6c01;ACSDTB_DetumbleNoSensordata;;1;ACS_DETUMBLE;mission/controller/acs/control/Detumble.h
+0x6901;ACSKAL_KalmanNoGyrMeas;;1;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6902;ACSKAL_KalmanNoModel;;2;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
+0x6903;ACSKAL_KalmanInversionFailed;;3;ACS_KALMAN;mission/controller/acs/MultiplicativeKalmanFilter.h
 0x4500;HSPI_OpeningFileFailed;;0;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4501;HSPI_FullDuplexTransferFailed;;1;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
 0x4502;HSPI_HalfDuplexTransferFailed;;2;HAL_SPI;fsfw/src/fsfw_hal/linux/spi/SpiComIF.h
@@ -468,16 +471,16 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x1d03;ATC_IllegalApplicationData;;3;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
 0x1d04;ATC_SendTmFailed;;4;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
 0x1d05;ATC_Timeout;;5;ACCEPTS_TELECOMMANDS_IF;fsfw/src/fsfw/tmtcservices/AcceptsTelecommandsIF.h
-0x6b00;SCBU_KeyNotFound;;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
+0x7000;SCBU_KeyNotFound;;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.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
-0x6a00;SDMA_OpOngoing;;0;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a01;SDMA_AlreadyOn;;1;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a02;SDMA_AlreadyMounted;;2;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a03;SDMA_AlreadyOff;;3;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a0a;SDMA_StatusFileNexists;;10;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a0b;SDMA_StatusFileFormatInvalid;;11;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a0c;SDMA_MountError;;12;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a0d;SDMA_UnmountError;;13;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a0e;SDMA_SystemCallError;;14;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
-0x6a0f;SDMA_PopenCallError;;15;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f00;SDMA_OpOngoing;;0;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f01;SDMA_AlreadyOn;;1;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f02;SDMA_AlreadyMounted;;2;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f03;SDMA_AlreadyOff;;3;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f0a;SDMA_StatusFileNexists;;10;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f0b;SDMA_StatusFileFormatInvalid;;11;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f0c;SDMA_MountError;;12;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f0d;SDMA_UnmountError;;13;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f0e;SDMA_SystemCallError;;14;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h
+0x6f0f;SDMA_PopenCallError;;15;SD_CARD_MANAGER;bsp_q7s/fs/SdCardManager.h

eive_tmtc/pus_tc/cmd_definitions.py

@@ -23,14 +23,6 @@ def get_eive_service_op_code_dict() -> TmtcDefinitionWrapper:
     return def_wrapper
 
 
-@tmtc_definitions_provider
-def add_tmp_sens_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add("0", "TMP1075 Tests")
-    defs.add_service(CustomServiceList.TMP1075_1.value, "TMP1075 1", oce)
-    defs.add_service(CustomServiceList.TMP1075_2.value, "TMP1075 2", oce)
-
-
 @tmtc_definitions_provider
 def add_pdec_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()

eive_tmtc/pus_tc/procedure_packer.py

@@ -45,8 +45,10 @@ from eive_tmtc.config.object_ids import (
     PDU_1_HANDLER_ID,
     PDU_2_HANDLER_ID,
     ACU_HANDLER_ID,
-    TMP_1075_1_HANDLER_ID,
-    TMP_1075_2_HANDLER_ID,
+    TMP1075_HANDLER_TCS_BRD_0_ID,
+    TMP1075_HANDLER_TCS_BRD_1_ID,
+    TMP1075_HANDLER_PLPCDU_0_ID,
+    TMP1075_HANDLER_IF_BRD_ID,
     HEATER_CONTROLLER_ID,
     IMTQ_HANDLER_ID,
     RW1_ID,
@@ -74,6 +76,8 @@ from eive_tmtc.pus_tc.system.proc import pack_proc_commands
 import eive_tmtc.config.object_ids as oids
 from tmtccmd.util import ObjectIdU32
 
+from eive_tmtc.utility.input_helper import InputHelper
+
 
 def handle_default_procedure(
     tc_base: TcHandlerBase,
@@ -103,13 +107,16 @@ def handle_default_procedure(
         return pack_acu_commands(object_id=object_id, q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.TMP1075_1.value:
-        object_id = cast(ObjectIdU32, obj_id_man.get(TMP_1075_1_HANDLER_ID))
-        return pack_tmp1075_test_into(
-            object_id=object_id, q=queue_helper, op_code=op_code
-        )
-    if service == CustomServiceList.TMP1075_2.value:
-        object_id = cast(ObjectIdU32, obj_id_man.get(TMP_1075_2_HANDLER_ID))
+    if service == CustomServiceList.TMP1075.value:
+        menu_dict = {
+            "0": ("TMP1075 TCS Board 0", TMP1075_HANDLER_TCS_BRD_0_ID),
+            "1": ("TMP1075 TCS Board 1", TMP1075_HANDLER_TCS_BRD_1_ID),
+            "2": ("TMP1075 PL PCDU 0", TMP1075_HANDLER_PLPCDU_0_ID),
+            "4": ("TMP1075 IF Board", TMP1075_HANDLER_IF_BRD_ID),
+        }
+        input_helper = InputHelper(menu_dict)
+        tmp_select = input_helper.get_key()
+        object_id = obj_id_man.get(menu_dict[tmp_select][1])
         return pack_tmp1075_test_into(
             object_id=object_id, q=queue_helper, op_code=op_code
         )

eive_tmtc/pus_tm/event_handler.py

@@ -1,5 +1,7 @@
 import logging
 import datetime
+import struct
+import sys
 
 from eive_tmtc.config.events import get_event_dict
 from eive_tmtc.config.object_ids import get_object_ids
@@ -19,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     pw = PrintWrapper(printer)
-    tm = Service5Tm.unpack(raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty())
+    tm = Service5Tm.unpack(data=raw_tm, time_reader=CdsShortTimestamp.empty())
     event_dict = get_event_dict()
     event_def = tm.event_definition
     info = event_dict.get(event_def.event_id)
@@ -35,10 +37,10 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     else:
         obj_name = obj_id_obj.name
     generic_event_string = f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x}) at {tm.time_provider.as_date_time()}"
+    _LOGGER.info(generic_event_string)
     pw.printer.file_logger.info(
         f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
     )
-    pw.ilog(_LOGGER, generic_event_string)
     specific_handler = True
     if info.name == "MODE_TRANSITION_FAILED":
         reason = generic_retval_printout(event_def.param1)
@@ -56,16 +58,13 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     if info.name == "MODE_INFO":
         mode_name = "Unknown"
         if obj_name == "ACS_SUBSYSTEM":
-            if event_def.param1 == Mode.OFF:
-                mode_name = "Off"
-            elif event_def.param1 == AcsMode.IDLE:
-                mode_name = "Idle"
-            elif event_def.param1 == AcsMode.DETUMBLE:
-                mode_name = "Detumble"
-            elif event_def.param1 == AcsMode.SAFE:
-                mode_name = "Safe"
-            elif event_def.param1 == AcsMode.TARGET_PT:
-                mode_name = "Target Pointing"
+            acs_mode = AcsMode(event_def.param1)
+            pw.dlog(f"ACS Mode: {acs_mode!r}")
+        elif obj_name == "ACS_CONTROLLER_ID":
+            mode_name = Mode(event_def.param1)
+            submode = AcsMode(event_def.param2)
+            pw.dlog(f"Mode: {mode_name!r}")
+            pw.dlog(f"ACS Mode: {submode!r}")
         else:
             if event_def.param1 == Mode.OFF:
                 mode_name = "Off"
@@ -75,8 +74,21 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
                 mode_name = "Normal"
             elif event_def.param1 == Mode.RAW:
                 mode_name = "Raw"
-        pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}")
-        pw.dlog(f"Submode: {event_def.param2}")
+            pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}")
+            pw.dlog(f"Submode: {event_def.param2}")
+    elif info.name == "VERSION_INFO":
+        ver_major = (event_def.param1 >> 24) & 0xFF
+        ver_minor = (event_def.param1 >> 16) & 0xFF
+        ver_rev = (event_def.param1 >> 8) & 0xFF
+        has_git_sha = bool(event_def.param1 & 0xFF)
+        git_sha = ""
+        if has_git_sha:
+            p2_as_bytes = event_def.param2.to_bytes(4, sys.byteorder)
+            git_sha = p2_as_bytes.decode("ascii")
+        version_string = f"v{ver_major}.{ver_minor}.{ver_rev}"
+        pw.dlog(f"Version {version_string}")
+        if has_git_sha:
+            pw.dlog(f"Git SHA first four letters: {git_sha}")
     elif info.name == "CLOCK_SET":
         old_time = event_def.param1
         new_time = event_def.param2

eive_tmtc/pus_tm/factory_hook.py

@@ -53,7 +53,7 @@ def pus_factory_hook(
         handle_action_reply(raw_tm=packet, printer=printer, obj_id_dict=obj_id_dict)
     elif service == 17:
         tm_packet = Service17Tm.unpack(
-            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
+            data=packet, time_reader=CdsShortTimestamp.empty()
         )
         if tm_packet.subservice == 2:
             verif_wrapper.dlog("Received Ping Reply TM[17,2]")

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -21,6 +21,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
     enable_periodic_hk_command_with_interval,
     disable_periodic_hk_command,
+    create_request_one_diag_command,
 )
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
@@ -286,7 +287,9 @@ def pack_acs_ctrl_command(p: ServiceProviderParams):
     elif op_code in OpCodes.REQUEST_PROC_GYR_HK:
         q.add_log_cmd(Info.REQUEST_PROC_GYR_HK)
         q.add_pus_tc(
-            generate_one_hk_command(make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET))
+            create_request_one_diag_command(
+                make_sid(ACS_CONTROLLER, SetId.GYR_PROC_SET)
+            )
         )
     elif op_code in OpCodes.ENABLE_PROC_GYR_HK:
         q.add_log_cmd(Info.ENABLE_PROC_GYR_HK)
@@ -511,8 +514,6 @@ def handle_raw_mgm_data(pw: PrintWrapper, hk_data: bytes):
     for entry in zip(print_str_list, formatted_list):
         pw.dlog(f"{entry[0].ljust(28)}: {entry[1]}")
     current_idx += 1
-    if PERFORM_MGM_CALIBRATION:
-        perform_mgm_calibration(pw, mgm_0_lis3_floats_ut)
     assert current_idx == 61
     pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=6)
 
@@ -525,13 +526,28 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
         pw.dlog("Recieved HK set too small")
         return
     current_idx = 0
-    for i in range(5):
-        fmt_str = "!fff"
-        inc_len = struct.calcsize(fmt_str)
-        mgm_vec = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
-        mgm_vec = [f"{val:8.3f}" for val in mgm_vec]
-        pw.dlog(f"MGM {i}: {mgm_vec}")
-        current_idx += inc_len
+    fmt_str = "!fff"
+    inc_len = struct.calcsize(fmt_str)
+    mgm_0 = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    mgm_0_str = [f"{val:8.3f}" for val in mgm_0]
+    pw.dlog(f"MGM 0 Vec: {mgm_0_str}")
+    current_idx += inc_len
+    mgm_1 = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    mgm_1_str = [f"{val:8.3f}" for val in mgm_1]
+    pw.dlog(f"MGM 1 Vec: {mgm_1_str}")
+    current_idx += inc_len
+    mgm_2 = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    mgm_2_str = [f"{val:8.3f}" for val in mgm_2]
+    pw.dlog(f"MGM 2 Vec: {mgm_2_str}")
+    current_idx += inc_len
+    mgm_3 = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    mgm_3_str = [f"{val:8.3f}" for val in mgm_3]
+    pw.dlog(f"MGM 3 Vec: {mgm_3_str}")
+    current_idx += inc_len
+    mgm_4 = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
+    mgm_4_str = [f"{val:8.3f}" for val in mgm_4]
+    pw.dlog(f"MGM 4 Vec: {mgm_4_str}")
+    current_idx += inc_len
     fmt_str = "!ddd"
     inc_len = struct.calcsize(fmt_str)
     mgm_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
@@ -550,6 +566,8 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
     mag_igrf_model = [f"{val:8.3f}" for val in mag_igrf_model]
     pw.dlog(f"MAG IGRF Model: {mag_igrf_model}")
     current_idx += inc_len
+    if PERFORM_MGM_CALIBRATION:
+        perform_mgm_calibration(pw, mgm_3)
     pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=8)
 
 
@@ -619,7 +637,7 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
     fmt_vec = "!ddd"
     inc_len_scalar = struct.calcsize(fmt_scalar)
     inc_len_vec = struct.calcsize(fmt_vec)
-    if len(hk_data) < 2 * inc_len_scalar + inc_len_vec:
+    if len(hk_data) < 2 * inc_len_scalar + 2 * inc_len_vec:
         pw.dlog("Received HK set too small")
         return
     current_idx = 0
@@ -637,14 +655,22 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
         )
     ]
     current_idx += inc_len_scalar
+    pos = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
+        )
+    ]
     velo = [
         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"GPS Latitude: {lat} [rad]")
     pw.dlog(f"GPS Longitude: {long} [rad]")
+    pw.dlog(f"GPS Position: {pos} [m]")
     pw.dlog(f"GPS Velocity: {velo} [m/s]")
     pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=3)
 
@@ -672,6 +698,7 @@ def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
             fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
         )
     ]
+    current_idx += inc_len_vec
     pw.dlog(f"MEKF Quaternion: {quat}")
     pw.dlog(f"MEKF Rotational Rate: {rate}")
     pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=2)
@@ -707,6 +734,7 @@ def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
             fmt_scalar, hk_data[current_idx : current_idx + inc_len_scalar]
         )
     ]
+    current_idx += inc_len_scalar
     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]")
@@ -745,6 +773,7 @@ def handle_act_cmd_data(pw: PrintWrapper, hk_data: bytes):
             fmt_vec3_int16, hk_data[current_idx : current_idx + inc_len_vec3_int16]
         )
     ]
+    current_idx += inc_len_vec3_int16
     pw.dlog(f"Actuator Commands RW Target Torque: {rw_tgt_torque}")
     pw.dlog(f"Actuator Commands RW Target Speed: {rw_tgt_speed}")
     pw.dlog(f"Actuator Commands MTQ Target Dipole: {mtq_tgt_dipole}")

eive_tmtc/tmtc/acs/gps.py

@@ -1,3 +1,4 @@
+import datetime
 import logging
 import struct
 
@@ -6,19 +7,28 @@ from eive_tmtc.pus_tm.defs import PrintWrapper
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command
+from tmtccmd.tc.pus_3_fsfw_hk import (
+    make_sid,
+    create_request_one_hk_command,
+    create_enable_periodic_hk_command_with_interval,
+    create_disable_periodic_hk_command,
+)
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 
 _LOGGER = logging.getLogger(__name__)
 
 
 class OpCode:
-    REQ_OS_HK = ["0", "hk-os"]
-    RESET_GNSS = ["5", "reset"]
+    REQ_OS_HK = ["hk"]
+    ENABLE_HK = ["enable_hk"]
+    DISABLE_HK = ["disable_hk"]
+    RESET_GNSS = ["reset"]
 
 
 class Info:
     REQ_OS_HK = "Request One-Shot HK"
+    ENABLE_HK = "Enable HK"
+    DISABLE_HK = "Disable HK"
     RESET_GNSS = "Reset GNSS using reset pin"
 
 
@@ -31,6 +41,8 @@ def add_gps_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
     oce.add(keys=OpCode.RESET_GNSS, info=Info.RESET_GNSS)
     oce.add(keys=OpCode.REQ_OS_HK, info=Info.REQ_OS_HK)
+    oce.add(keys=OpCode.ENABLE_HK, info=Info.ENABLE_HK)
+    oce.add(keys=OpCode.DISABLE_HK, info=Info.DISABLE_HK)
     defs.add_service(
         name=CustomServiceList.GPS_CTRL.value,
         info="GPS/GNSS Controller",
@@ -39,14 +51,26 @@ def add_gps_cmds(defs: TmtcDefinitionWrapper):
 
 
 def pack_gps_command(object_id: bytes, q: DefaultPusQueueHelper, op_code: str):
+    sid = make_sid(object_id=object_id, set_id=SetId.HK)
     if op_code in OpCode.RESET_GNSS:
         # TODO: This needs to be re-implemented
         _LOGGER.warning("Reset pin handling needs to be re-implemented")
-    if op_code in OpCode.REQ_OS_HK:
-        q.add_log_cmd(f"GMSS: {Info.REQ_OS_HK}")
-        q.add_pus_tc(
-            generate_one_hk_command(sid=make_sid(object_id=object_id, set_id=SetId.HK))
+    if op_code in OpCode.ENABLE_HK:
+        interval = float(input("Please specify interval in floating point seconds: "))
+        if interval <= 0:
+            raise ValueError("invalid interval")
+        q.add_log_cmd(f"GPS: {Info.ENABLE_HK}")
+        cmds = create_enable_periodic_hk_command_with_interval(
+            diag=False, sid=sid, interval_seconds=interval
         )
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_HK:
+        q.add_log_cmd(f"gps: {Info.DISABLE_HK}")
+        q.add_pus_tc(create_disable_periodic_hk_command(diag=False, sid=sid))
+    if op_code in OpCode.REQ_OS_HK:
+        q.add_log_cmd(f"GPS: {Info.REQ_OS_HK}")
+        q.add_pus_tc(create_request_one_hk_command(sid=sid))
 
 
 def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes):
@@ -72,7 +96,12 @@ def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes):
         unix_seconds,
     ) = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])
     current_idx += inc_len
-    date_string = f"{day}.{month}.{year} {hours}:{minutes}:{seconds}"
+    if year == 0:
+        date_string = "No date string, year is 0"
+    else:
+        date_string = datetime.datetime(
+            year=year, month=month, day=day, hour=hours, minute=minutes, second=seconds
+        )
     pw.dlog(f"Lat: {lat} deg")
     pw.dlog(f"Long: {long} deg")
     pw.dlog(f"Altitude: {alt} m | Speed: {speed} m/s")

eive_tmtc/tmtc/acs/subsystem.py

@@ -20,16 +20,22 @@ class OpCode(str, enum.Enum):
     SAFE = "safe"
     DETUMBLE = "detumble"
     IDLE = "idle"
-    TARGET_PT = "target"
+    PTG_TARGET = "ptg_target"
+    PTG_TARGET_NADIR = "ptg_nadir"
+    PTG_TARGET_GS = "ptg_target_gs"
+    PTG_TARGET_INERTIAL = "ptg_inertial"
     REPORT_ALL_MODES = "all_modes"
 
 
 class AcsMode(enum.IntEnum):
     OFF = 0
-    SAFE = 1 << 24
-    DETUMBLE = 2 << 24
-    IDLE = 3 << 24
-    TARGET_PT = 4 << 24
+    SAFE = 10
+    DETUMBLE = 11
+    IDLE = 12
+    PTG_TARGET_NADIR = 13
+    PTG_TARGET = 14
+    PTG_TARGET_GS = 15
+    PTG_TARGET_INERTIAL = 16
 
 
 class Info(str, enum.Enum):
@@ -37,15 +43,22 @@ class Info(str, enum.Enum):
     SAFE = "Safe Mode Command"
     DETUMBLE = "Detumble Mode Command"
     IDLE = "Idle Mode Command"
-    TARGET_PT = "Target Pointing Mode Command"
+    PTG_TARGET_NADIR = "Target Pointing Nadir"
+    PTG_TARGET = "Target Pointing"
+    PTG_TARGET_GS = "Target Pointing Ground Station"
+    PTG_TARGET_INERTIAL = "Target Pointing Inertial"
     REPORT_ALL_MODES = "Report All Modes Recursively"
 
 
 HANDLER_LIST: Dict[str, Tuple[int, str]] = {
     OpCode.OFF: (AcsMode.OFF, Info.OFF),
-    OpCode.IDLE: (AcsMode.IDLE, Info.IDLE),
     OpCode.SAFE: (AcsMode.SAFE, Info.SAFE),
     OpCode.DETUMBLE: (AcsMode.DETUMBLE, Info.DETUMBLE),
+    OpCode.IDLE: (AcsMode.IDLE, Info.IDLE),
+    OpCode.PTG_TARGET: (AcsMode.PTG_TARGET, Info.PTG_TARGET),
+    OpCode.PTG_TARGET_GS: (AcsMode.PTG_TARGET_GS, Info.PTG_TARGET_GS),
+    OpCode.PTG_TARGET_NADIR: (AcsMode.PTG_TARGET_NADIR, Info.PTG_TARGET_NADIR),
+    OpCode.PTG_TARGET_INERTIAL: (AcsMode.PTG_TARGET_INERTIAL, Info.PTG_TARGET_INERTIAL),
 }
 
 
@@ -78,8 +91,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
 @tmtc_definitions_provider
 def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(OpCode.OFF, Info.OFF)
-    oce.add(OpCode.SAFE, Info.SAFE)
-    oce.add(OpCode.IDLE, Info.IDLE)
+    for op_code, (_, info) in HANDLER_LIST.items():
+        oce.add(op_code, info)
     oce.add(OpCode.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
     defs.add_service(CustomServiceList.ACS_SS, "ACS Subsystem", oce)

eive_tmtc/tmtc/com/subsystem.py

@@ -10,7 +10,12 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command
+from tmtccmd.tc.pus_200_fsfw_mode import (
+    create_mode_command,
+    create_read_mode_command,
+    create_announce_mode_command,
+    create_announce_mode_recursive_command,
+)
 from tmtccmd.tc.pus_20_fsfw_param import (
     create_load_param_cmd,
     pack_scalar_u8_parameter_app_data,
@@ -22,11 +27,11 @@ class ParameterId(enum.IntEnum):
 
 
 class Submode(enum.IntEnum):
-    RX_ONLY = 0
-    RX_AND_TX_DEF_DATARATE = 1
-    RX_AND_TX_LOW_DATARATE = 2
-    RX_AND_TX_HIGH_DATARATE = 3
-    RX_AND_TX_CARRIER_WAVE = 4
+    RX_ONLY = 10
+    RX_AND_TX_DEF_DATARATE = 11
+    RX_AND_TX_LOW_DATARATE = 12
+    RX_AND_TX_HIGH_DATARATE = 13
+    RX_AND_TX_CARRIER_WAVE = 14
 
 
 class OpCode:
@@ -37,6 +42,9 @@ 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"
+    READ_MODE = "read_mode"
+    ANNOUNCE_MODE = "announce_mode"
+    ANNOUNCE_MODE_RECURSIVE = "announce_mode_recursive"
 
 
 class Info:
@@ -47,6 +55,9 @@ 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)"
+    READ_MODE = "Read Mode"
+    ANNOUNCE_MODE = "Announce Mode"
+    ANNOUNCE_MODE_RECURSIVE = "Announce mode recursively"
 
 
 @service_provider(CustomServiceList.COM_SS)
@@ -101,6 +112,15 @@ 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.READ_MODE:
+        q.add_log_cmd(Info.READ_MODE)
+        q.add_pus_tc(create_read_mode_command(COM_SUBSYSTEM_ID))
+    elif o == OpCode.ANNOUNCE_MODE:
+        q.add_log_cmd(Info.ANNOUNCE_MODE)
+        q.add_pus_tc(create_announce_mode_command(COM_SUBSYSTEM_ID))
+    elif o == OpCode.ANNOUNCE_MODE_RECURSIVE:
+        q.add_log_cmd(Info.ANNOUNCE_MODE_RECURSIVE)
+        q.add_pus_tc(create_announce_mode_recursive_command(COM_SUBSYSTEM_ID))
 
 
 @tmtc_definitions_provider
@@ -112,4 +132,7 @@ 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.READ_MODE, Info.READ_MODE)
+    oce.add(OpCode.ANNOUNCE_MODE, Info.ANNOUNCE_MODE)
+    oce.add(OpCode.ANNOUNCE_MODE_RECURSIVE, Info.ANNOUNCE_MODE_RECURSIVE)
     defs.add_service(CustomServiceList.COM_SS, "COM Subsystem", oce)

eive_tmtc/tmtc/core.py

@@ -20,6 +20,8 @@ _LOGGER = logging.getLogger(__name__)
 
 class ActionId(enum.IntEnum):
     LIST_DIR_INTO_FILE = 0
+    ANNOUNCE_VERSION = 1
+    ANNOUNCE_CURRENT_IMAGE = 2
     SWITCH_REBOOT_FILE_HANDLING = 5
     RESET_REBOOT_COUNTER = 6
     SWITCH_IMG_LOCK = 7
@@ -39,6 +41,8 @@ class SetId(enum.IntEnum):
 
 
 class OpCode:
+    ANNOUNCE_VERSION = "announce_version"
+    ANNOUNCE_CURRENT_IMAGE = "announce_current_image"
     REBOOT_XSC = ["0", "reboot_xsc"]
     XSC_REBOOT_SELF = ["1", "reboot_self"]
     XSC_REBOOT_0_0 = ["2", "reboot_00"]
@@ -64,6 +68,8 @@ class OpCode:
 
 
 class Info:
+    ANNOUNCE_VERSION = "Announce version"
+    ANNOUNCE_CURRENT_IMAGE = "Announce current image"
     REBOOT_XSC = "XSC reboot with prompt"
     REBOOT_FULL = "Full regular reboot"
     OBSW_UPDATE_FROM_SD_0 = "Update OBSW from SD Card 0"
@@ -89,6 +95,8 @@ class Copy(enum.IntEnum):
 @tmtc_definitions_provider
 def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
+    oce.add(keys=OpCode.ANNOUNCE_VERSION, info=Info.ANNOUNCE_VERSION)
+    oce.add(keys=OpCode.ANNOUNCE_CURRENT_IMAGE, info=Info.ANNOUNCE_CURRENT_IMAGE)
     oce.add(keys=OpCode.REBOOT_XSC, info=Info.REBOOT_XSC)
     oce.add(keys=OpCode.REBOOT_XSC, info=Info.REBOOT_XSC)
     oce.add(keys=OpCode.REBOOT_FULL, info=Info.REBOOT_FULL)
@@ -142,6 +150,14 @@ def add_core_controller_definitions(defs: TmtcDefinitionWrapper):
 
 
 def pack_core_commands(q: DefaultPusQueueHelper, op_code: str):
+    if op_code == OpCode.ANNOUNCE_VERSION:
+        q.add_log_cmd(f"{Info.ANNOUNCE_VERSION}")
+        q.add_pus_tc(create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_VERSION))
+    if op_code == OpCode.ANNOUNCE_CURRENT_IMAGE:
+        q.add_log_cmd(f"{Info.ANNOUNCE_CURRENT_IMAGE}")
+        q.add_pus_tc(
+            create_action_cmd(CORE_CONTROLLER_ID, ActionId.ANNOUNCE_CURRENT_IMAGE)
+        )
     if op_code in OpCode.REBOOT_XSC:
         reboot_self, chip_select, copy_select = determine_reboot_params()
         add_xsc_reboot_cmd(

eive_tmtc/tmtc/payload/subsystem.py

@@ -12,22 +12,27 @@ from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice
 
 
+class ModeId:
+    OFF = 0
+    SUPV_ONLY = 10
+    MPSOC_STREAM = 11
+    CAM_STREAM = 12
+    EARTH_OBSV = 13
+    SCEX = 14
+
+
 class OpCode(str, enum.Enum):
     OFF = "off"
     REPORT_ALL_MODES = "report_modes"
 
 
-class PayloadMode(enum.IntEnum):
-    OFF = 0
-
-
 class Info(str, enum.Enum):
     OFF = "Off Command"
     REPORT_ALL_MODES = "Report all modes"
 
 
 HANDLER_LIST: Dict[str, Tuple[int, str]] = {
-    OpCode.OFF: (PayloadMode.OFF, Info.OFF),
+    OpCode.OFF: (ModeId.OFF, Info.OFF),
 }
 
 

eive_tmtc/tmtc/tcs/tmp1075.py

@@ -7,27 +7,31 @@
 """
 import enum
 
+from eive_tmtc.config.definitions import CustomServiceList
 from spacepackets.ecss.tc import PusTelecommand
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data
-from tmtccmd.pus.s8_fsfw_funccmd import make_action_id
+from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_hk_command, make_sid
 from tmtccmd.util import ObjectIdU32
 
 
-class Tmp1075TestProcedure:
-    """
-    @brief  Use this class to define the tests to perform for the Tmp1075.
-    @details    Setting all to True will run all tests.
-                Setting all to False will only run the tests set to True.
-    """
+class OpCode:
+    OFF = "off"
+    ON = "on"
+    NML = "nml"
+    HK = "hk"
 
-    all = False
-    start_adc_conversion = False
-    get_temp = False
-    set_mode_normal = (
-        True  # Setting mode to normal starts continuous temperature reading
-    )
-    set_mode_on = False  # If mode is MODE_ON, temperature will only be read on command
+
+class Info:
+    OFF = "Off"
+    ON = "On"
+    NML = "Normal"
+    HK = "HK"
 
 
 class Tmp1075ActionId(enum.IntEnum):
@@ -35,30 +39,40 @@ class Tmp1075ActionId(enum.IntEnum):
     START_ADC_CONV = 2
 
 
+class SetId:
+    TMEPERATURE = 1
+
+
 def pack_tmp1075_test_into(
     object_id: ObjectIdU32, op_code: str, q: DefaultPusQueueHelper
 ):
     q.add_log_cmd(
-        f"Testing Tmp1075 Temperature Sensor Handler with object id: {object_id.as_hex_string}"
+        f"Testing Tmp1075 Temperature Sensor Handler with object id: {object_id}"
     )
     obyt = object_id.as_bytes
-    if Tmp1075TestProcedure.all or Tmp1075TestProcedure.start_adc_conversion:
-        q.add_log_cmd("TMP1075: Starting new temperature conversion")
-        command = obyt + make_action_id(Tmp1075ActionId.GET_TEMP)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-    if Tmp1075TestProcedure.all or Tmp1075TestProcedure.get_temp:
-        q.add_log_cmd("TMP1075: Read temperature")
-        command = obyt + make_action_id(Tmp1075ActionId.START_ADC_CONV)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command))
-
-    if Tmp1075TestProcedure.set_mode_normal:
+    if op_code == OpCode.OFF:
+        q.add_log_cmd("TMP1075: Set Normal Off")
+        mode_data = pack_mode_data(obyt, Mode.OFF, 0)
+        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
+    if op_code == OpCode.NML:
         q.add_log_cmd("TMP1075: Set Mode Normal")
         mode_data = pack_mode_data(obyt, Mode.NORMAL, 0)
         q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=mode_data))
-
-    if Tmp1075TestProcedure.set_mode_on:
+    if op_code == OpCode.ON:
         q.add_log_cmd("TMP1075: Set Mode On")
         mode_data = pack_mode_data(obyt, Mode.ON, 0)
         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)))
     return q
+
+
+@tmtc_definitions_provider
+def add_tmp_sens_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.OFF, Info.OFF)
+    oce.add(OpCode.ON, Info.ON)
+    oce.add(OpCode.NML, Info.NML)
+    oce.add(OpCode.HK, Info.HK)
+    defs.add_service(CustomServiceList.TMP1075.value, "TMP1075 Temperature Sensor", oce)

eive_tmtc/tmtc/tm_store.py

@@ -0,0 +1,8 @@
+from eive_tmtc.config.definitions import CustomServiceList
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+@service_provider(CustomServiceList.TM_STORE)
+def pack_tm_store_commands(p: ServiceProviderParams):
+    pass

eive_tmtc/utility/input_helper.py

@@ -6,13 +6,13 @@
 @date   13.02.2021
 """
 import logging
-
+from typing import Tuple, Dict
 
 _LOGGER = logging.getLogger(__name__)
 
 
 class InputHelper:
-    def __init__(self, menu: dict):
+    def __init__(self, menu: Dict[str, Tuple[str, ...]]):
         """
         @brief  Constructor
         @param menu The menu describing the input options

setup.cfg

@@ -27,8 +27,8 @@ classifiers =
 
 [options]
 install_requires =
-	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a3
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@d6938b2adf0c5cbf3fe8621292b805ed2a66071e#egg=tmtccmd
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0rc0
+	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@<gitRev>#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True