Merge pull request 'relative timeshift' (#286) from relative-timeshift into main

Reviewed-on: #286
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -10,6 +10,33 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+## Added
+
+- Added version set for STR.
+- Command for relative timeshift.
+
+## Fixed
+
+- EPS power commands working again.
+
+# [v6.1.1] 2024-03-06
+
+## Added
+
+- Added Core Ctrl cmd to update leap seconds.
+
+# [v6.1.0] 2024-02-29
+
+## Added
+
+- Added commands to unlock and use STR secondary firmware slot.
+- STR BlobStats TM handling
+- New ACS CTRL commands.
+
+## Fixed
+
+- RW commanding
+
 # [v6.0.0] 2024-02-08
 
 ## Changed

eive_tmtc/config/custom_mode_op.py

@@ -3,6 +3,7 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
+
 import enum
 
 from tmtccmd import CcsdsTmtcBackend

eive_tmtc/config/events.csv

@@ -75,9 +75,10 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 7902;0x1ede;BIT_LOCK;INFO;A Bit Lock signal. Was detected. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7903;0x1edf;BIT_LOCK_LOST;INFO;A previously found Bit Lock signal was lost. P1: raw BLO state, P2: 0;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
 7905;0x1ee1;FRAME_PROCESSING_FAILED;LOW;The CCSDS Board could not interpret a TC;fsfw/src/fsfw/datalinklayer/DataLinkLayer.h
-8900;0x22c4;CLOCK_SET;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8900;0x22c4;CLOCK_SET;INFO;Clock has been set. P1: old timeval seconds. P2: new timeval seconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h
-8901;0x22c5;CLOCK_DUMP;INFO;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8901;0x22c5;CLOCK_DUMP_LEGACY;INFO;Clock dump event. P1: timeval seconds P2: timeval milliseconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h
-8902;0x22c6;CLOCK_SET_FAILURE;LOW;No description;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8902;0x22c6;CLOCK_SET_FAILURE;LOW;Clock could not be set. P1: Returncode.;fsfw/src/fsfw/pus/Service9TimeManagement.h
+8903;0x22c7;CLOCK_DUMP;INFO;Clock dump event. P1: timeval seconds P2: timeval microseconds.;fsfw/src/fsfw/pus/Service9TimeManagement.h
 9100;0x238c;TC_DELETION_FAILED;MEDIUM;Deletion of a TC from the map failed. P1: First 32 bit of request ID, P2. Last 32 bit of Request ID;fsfw/src/fsfw/pus/Service11TelecommandScheduling.h
 9700;0x25e4;TEST;INFO;No description;fsfw/src/fsfw/pus/Service17Test.h
 10600;0x2968;CHANGE_OF_SETUP_PARAMETER;LOW;No description;fsfw/src/fsfw_hal/devicehandlers/MgmLIS3MDLHandler.h
@@ -98,6 +99,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 11208;0x2bc8;TLE_TOO_OLD;INFO;The TLE for the SGP4 Propagator has become too old.;mission/acs/defs.h
 11209;0x2bc9;TLE_FILE_READ_FAILED;LOW;The TLE could not be read from the filesystem.;mission/acs/defs.h
 11210;0x2bca;PTG_RATE_VIOLATION;MEDIUM;The limits for the rotation in pointing mode were violated.;mission/acs/defs.h
+11211;0x2bcb;DETUMBLE_TRANSITION_FAILED;HIGH;The detumble transition has failed. //! P1: Last detumble state before failure.;mission/acs/defs.h
 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/power/defs.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/power/defs.h
 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h

eive_tmtc/config/object_ids.py

@@ -3,6 +3,7 @@
 @details    Template configuration file. Copy this folder to the TMTC commander root and adapt
             it to your needs.
 """
+
 import logging
 import os.path
 from typing import Dict

eive_tmtc/pus_tc/cmd_demux.py

@@ -1,5 +1,6 @@
 """Hook function which packs telecommands based on service and operation code string
 """
+
 import logging
 from typing import List, cast
 
@@ -70,6 +71,7 @@ from eive_tmtc.tmtc.tcs.subsystem import pack_tcs_sys_commands
 from eive_tmtc.tmtc.tcs.tmp1075 import pack_tmp1075_test_into
 from eive_tmtc.tmtc.test import build_test_commands
 from eive_tmtc.tmtc.time import pack_time_management_cmd
+from eive_tmtc.tmtc.tm_store import pack_tm_store_commands
 from eive_tmtc.tmtc.wdt import pack_wdt_commands
 from eive_tmtc.utility.input_helper import InputHelper
 
@@ -115,9 +117,9 @@ def handle_pus_procedure(
 
 def handle_eps_procedure(queue_helper: DefaultPusQueueHelper, cmd_path_list: List[str]):
     obj_id_man = get_object_ids()
-    if len(cmd_path_list) == 1:
+    assert len(cmd_path_list) >= 1
-        return pack_power_commands(queue_helper, cmd_path_list[0])
+    if cmd_path_list[0] == "power":
-    assert len(cmd_path_list) >= 2
+        return pack_power_commands(queue_helper, cmd_path_list[1])
     if cmd_path_list[0] == "pwr_ctrl":
         return pack_power_ctrl_command(queue_helper, cmd_path_list[1])
     if cmd_path_list[0] == "p60_dock":
@@ -197,29 +199,29 @@ def handle_acs_procedure(queue_helper: DefaultPusQueueHelper, cmd_path_list: Lis
         )
 
     if cmd_path_list[0] == "rws":
-        assert len(cmd_path_list) >= 3
+        assert len(cmd_path_list) >= 2
         if cmd_path_list[1] == "rw_assy":
-            assert len(cmd_path_list) >= 4
+            assert len(cmd_path_list) >= 3
             return pack_rw_ass_cmds(
                 q=queue_helper, object_id=RW_ASSEMBLY, cmd_str=cmd_path_list[2]
             )
         if cmd_path_list[1] == "rw_1":
-            assert len(cmd_path_list) >= 4
+            assert len(cmd_path_list) >= 3
             return create_single_rw_cmd(
                 object_id=RW1_ID, rw_idx=1, q=queue_helper, cmd_str=cmd_path_list[2]
             )
         if cmd_path_list[1] == "rw_2":
-            assert len(cmd_path_list) >= 4
+            assert len(cmd_path_list) >= 3
             return create_single_rw_cmd(
                 object_id=RW2_ID, rw_idx=2, q=queue_helper, cmd_str=cmd_path_list[2]
             )
         if cmd_path_list[1] == "rw_3":
-            assert len(cmd_path_list) >= 4
+            assert len(cmd_path_list) >= 3
             return create_single_rw_cmd(
                 object_id=RW3_ID, rw_idx=3, q=queue_helper, cmd_str=cmd_path_list[2]
             )
         if cmd_path_list[1] == "rw_4":
-            assert len(cmd_path_list) >= 4
+            assert len(cmd_path_list) >= 3
             return create_single_rw_cmd(
                 object_id=RW4_ID, rw_idx=4, q=queue_helper, cmd_str=cmd_path_list[2]
             )
@@ -281,6 +283,8 @@ def handle_obdh_procedure(
         return pack_wdt_commands(queue_helper, cmd_path_list[1])
     if cmd_path_list[0] == "time":
         return pack_time_management_cmd(queue_helper, cmd_path_list[1])
+    if cmd_path_list[0] == "tm_store":
+        return pack_tm_store_commands(queue_helper, cmd_path_list[1])
 
 
 def handle_com_procedure(queue_helper: DefaultPusQueueHelper, cmd_path_list: List[str]):

eive_tmtc/pus_tm/event_handler.py

@@ -122,12 +122,18 @@ def handle_event_packet(  # noqa C901: Complexity okay here
         new_time_dt = datetime.datetime.fromtimestamp(new_time, datetime.timezone.utc)
         pw.dlog(f"Old time (UTC): {old_time_dt}")
         pw.dlog(f"New time (UTC): {new_time_dt}")
-    if info.name == "CLOCK_DUMP":
+    if info.name == "CLOCK_DUMP_LEGACY":
         specific_handler = True
         # param 1 is timeval seconds, param 2 is timeval subsecond milliseconds
         time = event_def.param1 + event_def.param2 / 1000.0
         time_dt = datetime.datetime.fromtimestamp(time, datetime.timezone.utc)
         pw.dlog(f"Current time: {time_dt}")
+    if info.name == "CLOCK_DUMP":
+        specific_handler = True
+        # param 1 is timeval seconds, param 2 is timeval subsecond microseconds
+        time = event_def.param1 + event_def.param2 / 1000000.0
+        time_dt = datetime.datetime.fromtimestamp(time, datetime.timezone.utc)
+        pw.dlog(f"Current time: {time_dt}")
     if info.name == "ACTIVE_SD_INFO":
         sd_0_state = (event_def.param2 >> 16) & 0xFFFF
         sd_1_state = event_def.param2 & 0xFFFF

eive_tmtc/pus_tm/hk_handler.py

@@ -1,4 +1,5 @@
 """HK Handling for EIVE OBSW"""
+
 import dataclasses
 import logging
 import base64  # noqa
@@ -53,7 +54,7 @@ FORWARD_SENSOR_TEMPS = False
 
 @dataclasses.dataclass
 class HkFilter:
-    object_ids: List[ObjectIdU32]
+    object_ids: List[bytes]
     set_ids: List[int]
 
 
@@ -72,8 +73,7 @@ def handle_hk_packet(
         named_obj_id = tm_packet.object_id
     if tm_packet.subservice == 25 or tm_packet.subservice == 26:
         hk_data = tm_packet.tm_data[8:]
-
+        if named_obj_id.as_bytes in hk_filter.object_ids:
-        if named_obj_id in hk_filter.object_ids:
             # print(f"PUS TM Base64: {base64.b64encode(raw_tm)}")
             handle_regular_hk_print(
                 printer=printer,

eive_tmtc/pus_tm/pus_handler.py

@@ -1,5 +1,6 @@
 """Core EIVE TM handler module
 """
+
 import logging
 import sqlite3
 import uuid

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -7,12 +7,7 @@ import struct
 from socket import AF_INET
 from typing import Tuple
 
-from tmtccmd.config.tmtc import (
+from tmtccmd.config.tmtc import CmdTreeNode
-    CmdTreeNode,
-    OpCodeEntry,
-    TmtcDefinitionWrapper,
-    tmtc_definitions_provider,
-)
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.pus.s8_fsfw_action import create_action_cmd
 from tmtccmd.pus.s20_fsfw_param import create_load_param_cmd
@@ -37,7 +32,6 @@ from tmtccmd.pus.tc.s3_fsfw_hk import (
 )
 from tmtccmd.tmtc.queue import DefaultPusQueueHelper
 
-from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import ACS_CONTROLLER
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.tmtc.acs.defs import AcsMode, SafeSubmode
@@ -72,6 +66,7 @@ class ActionId(enum.IntEnum):
     RESTORE_MEKF_NONFINITE_RECOVERY = 2
     UPDATE_TLE = 3
     READ_TLE = 4
+    UPDATE_MEKF_STANDARD_DEVIATIONS = 5
 
 
 CTRL_STRAT_DICT = {
@@ -126,6 +121,7 @@ class OpCodes:
     RESTORE_MEKF_NONFINITE_RECOVERY = "restore_mekf_nonfinite_recovery"
     UPDATE_TLE = "update_tle"
     READ_TLE = "read_tle"
+    UPDATE_MEKF_STANDARD_DEVIATIONS = "update_mekf_standard_deviations"
     SET_PARAMETER_SCALAR = "set_scalar_param"
     SET_PARAMETER_VECTOR = "set_vector_param"
     SET_PARAMETER_MATRIX = "set_matrix_param"
@@ -148,6 +144,10 @@ class Info:
     RESTORE_MEKF_NONFINITE_RECOVERY = "Restore MEKF non-finite recovery"
     UPDATE_TLE = "Update TLE"
     READ_TLE = "Read the currently stored TLE"
+    UPDATE_MEKF_STANDARD_DEVIATIONS = (
+        "Update the Standard Deviations within the MEKF to the current ACS Parameter "
+        "Values"
+    )
     SET_PARAMETER_SCALAR = "Set Scalar Parameter"
     SET_PARAMETER_VECTOR = "Set Vector Parameter"
     SET_PARAMETER_MATRIX = "Set Matrix Parameter"
@@ -183,36 +183,6 @@ def create_acs_ctrl_node() -> CmdTreeNode:
     return acs_ctrl
 
 
-@tmtc_definitions_provider
-def acs_cmd_defs(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(keys=OpCodes.OFF, info=Info.OFF)
-    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.RESTORE_MEKF_NONFINITE_RECOVERY,
-        info=Info.RESTORE_MEKF_NONFINITE_RECOVERY,
-    )
-    oce.add(keys=OpCodes.UPDATE_TLE, info=Info.UPDATE_TLE)
-    oce.add(keys=OpCodes.READ_TLE, info=Info.READ_TLE)
-    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.ONE_SHOOT_HK, info=Info.ONE_SHOOT_HK)
-    oce.add(keys=OpCodes.ENABLE_HK, info=Info.ENABLE_HK)
-    oce.add(keys=OpCodes.DISABLE_HK, info=Info.DISABLE_HK)
-    defs.add_service(
-        name=CustomServiceList.ACS_CTRL.value, info="ACS Controller", op_code_entry=oce
-    )
-
-
 def pack_acs_ctrl_command(q: DefaultPusQueueHelper, cmd_str: str):  # noqa C901
     if cmd_str in OpCodes.OFF:
         q.add_log_cmd(f"{Info.OFF}")
@@ -273,18 +243,14 @@ def pack_acs_ctrl_command(q: DefaultPusQueueHelper, cmd_str: str):  # noqa C901
                 print("The line does not have the required length of 69 characters")
         tle = line1.encode() + line2.encode()
         q.add_pus_tc(create_action_cmd(ACS_CONTROLLER, ActionId.UPDATE_TLE, tle))
-    elif cmd_str in OpCodes.SET_PARAMETER_SCALAR:
-        q.add_log_cmd(f"{Info.SET_PARAMETER_SCALAR}")
-        set_acs_ctrl_param_scalar(q)
-    elif cmd_str in OpCodes.SET_PARAMETER_VECTOR:
-        q.add_log_cmd(f"{Info.SET_PARAMETER_VECTOR}")
-        set_acs_ctrl_param_vector(q)
-    elif cmd_str in OpCodes.SET_PARAMETER_MATRIX:
-        q.add_log_cmd(f"{Info.SET_PARAMETER_MATRIX}")
-        set_acs_ctrl_param_matrix(q)
     elif cmd_str == OpCodes.READ_TLE:
         q.add_log_cmd(f"{Info.READ_TLE}")
         q.add_pus_tc(create_action_cmd(ACS_CONTROLLER, ActionId.READ_TLE))
+    elif cmd_str == OpCodes.UPDATE_MEKF_STANDARD_DEVIATIONS:
+        q.add_log_cmd(f"{Info.UPDATE_MEKF_STANDARD_DEVIATIONS}")
+        q.add_pus_tc(
+            create_action_cmd(ACS_CONTROLLER, ActionId.UPDATE_MEKF_STANDARD_DEVIATIONS)
+        )
     elif cmd_str == OpCodes.SET_PARAMETER_SCALAR:
         q.add_log_cmd(f"{Info.SET_PARAMETER_SCALAR}")
         set_acs_ctrl_param_scalar(q)

eive_tmtc/tmtc/acs/reaction_wheels.py

@@ -6,12 +6,11 @@
 """
 import enum
 import struct
-from typing import List
+from typing import List, Tuple
 
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID
-from tmtccmd.config import CmdTreeNode, TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config import CmdTreeNode
-from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tmtc import DefaultPusQueueHelper
 from tmtccmd.pus.tc.s3_fsfw_hk import (
     generate_one_hk_command,
@@ -23,7 +22,6 @@ from tmtccmd.pus.tc.s3_fsfw_hk import (
 from tmtccmd.pus.s8_fsfw_action import create_action_cmd
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode, Subservice
-from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 
@@ -126,59 +124,14 @@ def create_reaction_wheel_assembly_node() -> CmdTreeNode:
     node = CmdTreeNode(
         "rw_assy", "Reaction Wheels Assembly", hide_children_which_are_leaves=True
     )
-    node.add_child(CmdTreeNode(InfoAss.ON, OpCodesAss.ON))
+    node.add_child(CmdTreeNode(OpCodesAss.ON, InfoAss.ON))
-    node.add_child(CmdTreeNode(InfoAss.NML, OpCodesAss.NML))
+    node.add_child(CmdTreeNode(OpCodesAss.NML, InfoAss.NML))
-    node.add_child(CmdTreeNode(InfoAss.OFF, OpCodesAss.OFF))
+    node.add_child(CmdTreeNode(OpCodesAss.OFF, InfoAss.OFF))
-    node.add_child(CmdTreeNode(InfoAss.ALL_SPEED_UP, OpCodesAss.ALL_SPEED_UP))
+    node.add_child(CmdTreeNode(OpCodesAss.ALL_SPEED_UP, InfoAss.ALL_SPEED_UP))
-    node.add_child(CmdTreeNode(InfoAss.ALL_SPEED_OFF, OpCodesAss.ALL_SPEED_OFF))
+    node.add_child(CmdTreeNode(OpCodesAss.ALL_SPEED_OFF, InfoAss.ALL_SPEED_OFF))
     return node
 
 
-@tmtc_definitions_provider
-def add_rw_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(info=InfoDev.SPEED, keys=OpCodesDev.SPEED)
-    oce.add(info=InfoDev.ON, keys=OpCodesDev.ON)
-    oce.add(info=InfoDev.OFF, keys=OpCodesDev.OFF)
-    oce.add(info=InfoDev.NML, keys=OpCodesDev.NML)
-    oce.add(info=InfoDev.REQ_TM, keys=OpCodesDev.REQ_TM)
-    oce.add(info=InfoDev.GET_STATUS, keys=OpCodesDev.GET_STATUS)
-    oce.add(info=InfoDev.GET_TM, keys=OpCodesDev.GET_TM)
-    oce.add(info=InfoDev.ENABLE_STATUS_HK, keys=OpCodesDev.ENABLE_STATUS_HK)
-    oce.add(info=InfoDev.DISABLE_STATUS_HK, keys=OpCodesDev.DISABLE_STATUS_HK)
-    defs.add_service(
-        name=CustomServiceList.REACTION_WHEEL_1.value,
-        info="Reaction Wheel 1",
-        op_code_entry=oce,
-    )
-    defs.add_service(
-        name=CustomServiceList.REACTION_WHEEL_2.value,
-        info="Reaction Wheel 2",
-        op_code_entry=oce,
-    )
-    defs.add_service(
-        name=CustomServiceList.REACTION_WHEEL_3.value,
-        info="Reaction Wheel 3",
-        op_code_entry=oce,
-    )
-    defs.add_service(
-        name=CustomServiceList.REACTION_WHEEL_4.value,
-        info="Reaction Wheel 4",
-        op_code_entry=oce,
-    )
-    oce = OpCodeEntry()
-    oce.add(info=InfoAss.ON, keys=OpCodesAss.ON)
-    oce.add(info=InfoAss.NML, keys=OpCodesAss.NML)
-    oce.add(info=InfoAss.OFF, keys=OpCodesAss.OFF)
-    oce.add(info=InfoAss.ALL_SPEED_UP, keys=OpCodesAss.ALL_SPEED_UP)
-    oce.add(info=InfoAss.ALL_SPEED_OFF, keys=OpCodesAss.ALL_SPEED_OFF)
-    defs.add_service(
-        name=CustomServiceList.RW_ASSEMBLY.value,
-        info="Reaction Wheel Assembly",
-        op_code_entry=oce,
-    )
-
-
 def create_single_rw_cmd(  # noqa C901: Complexity is okay here.
     object_id: bytes, rw_idx: int, q: DefaultPusQueueHelper, cmd_str: str
 ):
@@ -272,7 +225,7 @@ def pack_rw_ass_cmds(q: DefaultPusQueueHelper, object_id: bytes, cmd_str: str):
         )
 
 
-def prompt_speed_ramp_time() -> (int, int):
+def prompt_speed_ramp_time() -> Tuple[int, int]:
     speed = int(
         input("Specify speed [0.1 RPM, 0 or range [-65000, -1000] and [1000, 65000]: ")
     )

eive_tmtc/tmtc/acs/star_tracker.py

@@ -9,13 +9,12 @@ import datetime
 import enum
 import logging
 import struct
+from typing import List, Tuple
 
-from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.utility.input_helper import InputHelper
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.config import CmdTreeNode, TmtcDefinitionWrapper, OpCodeEntry
+from tmtccmd.config import CmdTreeNode
-from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.pus.tc.s3_fsfw_hk import (
     create_request_one_diag_command,
     create_request_one_hk_command,
@@ -23,6 +22,7 @@ from tmtccmd.pus.tc.s3_fsfw_hk import (
     disable_periodic_hk_command,
     make_sid,
 )
+from tmtccmd.pus.s20_fsfw_param import create_load_param_cmd, create_scalar_u8_parameter
 from tmtccmd.pus.s8_fsfw_action import create_action_cmd
 from tmtccmd.tmtc import DefaultPusQueueHelper
 from tmtccmd.pus.s200_fsfw_mode import pack_mode_data, Mode
@@ -33,6 +33,16 @@ from eive_tmtc.config.object_ids import STR_ASSEMBLY, STAR_TRACKER_ID
 _LOGGER = logging.getLogger(__name__)
 
 
+class FirmwareTarget(enum.IntEnum):
+    MAIN = 1
+    BACKUP = 10
+
+
+class ParamId(enum.IntEnum):
+    FIRMWARE_TARGET = 1
+    FIRMWARE_TARGET_PERSISTENT = 2
+
+
 class StarTrackerActionId(enum.IntEnum):
     PING = 0
     BOOT = 1
@@ -95,7 +105,10 @@ class StarTrackerActionId(enum.IntEnum):
     LOGLEVEL = 81
     LOG_SUBSCRIPTION = 82
     DEBUG_CAMERA = 83
+    # Legacy variable.
     FIRMWARE_UPDATE = 84
+    FIRMWARE_UPDATE_MAIN = 84
+    FIRMWARE_UPDATE_BACKUP = 101
     SET_TIME_FROM_SYS_TIME = 87
     ADD_SECONDARY_TM_TO_NORMAL_MODE = 95
     RESET_SECONDARY_TM_SET = 96
@@ -119,12 +132,23 @@ class OpCode:
     UPLOAD_IMAGE = "upload_image"
     DOWNLOAD_IMAGE = "download_image"
     SET_IMG_PROCESSOR_MODE = "set_img_proc_mode"
-    FW_UPDATE = "fw_update"
+    FW_UPDATE_MAIN = "fw_update_main"
     SET_TIME_FROM_SYS_TIME = "set_time"
     RELOAD_JSON_CFG_FILE = "reload_json_cfg"
+    FW_UPDATE_BACKUP = "fw_update_backup"
+    SELECT_TARGET_FIRMWARE_MAIN = "fw_main"
+    SELECT_TARGET_FIRMWARE_BACKUP = "fw_backup"
+    SELECT_TARGET_FIRMWARE_MAIN_PERSISTENT = "fw_main_persistent"
+    SELECT_TARGET_FIRMWARE_BACKUP_PERSISTENT = "fw_backup_persistent"
+    REQUEST_VERSION = "request_version"
 
 
 class Info:
+    ON_BOOTLOADER = "Switch to Mode On, Submode Bootloder"
+    ON_FIRMWARE = "Switch to Mode On, Submode Firmware"
+    NORMAL = "Switch to Mode Normal"
+    OFF = "Switch to Mode Off"
+    PING = "Send Ping"
     ONE_SHOOT_HK = "One shoot HK Set"
     ENABLE_HK = "Enable Periodic HK"
     DISABLE_HK = "Disable Periodic HK"
@@ -135,9 +159,17 @@ class Info:
     DOWNLOAD_IMAGE = "Download Optical Image"
     TAKE_IMAGE = "Take Image"
     SET_IMG_PROCESSOR_MODE = "Set Image Processor Mode"
-    FW_UPDATE = "Firmware Update"
+    FW_UPDATE_MAIN = "Update Main Firmware Slot"
+    FW_UPDATE_BACKUP = "Update Backup Firmware Slot"
     SET_TIME_FROM_SYS_TIME = "Set time from system time"
     RELOAD_JSON_CFG_FILE = "Reload JSON configuration file. Reboot still required."
+    SELECT_TARGET_FIRMWARE_MAIN = "Select main firmware slot"
+    SELECT_TARGET_FIRMWARE_BACKUP = "Select backup firmware slot"
+    SELECT_TARGET_FIRMWARE_MAIN_PERSISTENT = "Select main firmware slot persistently"
+    SELECT_TARGET_FIRMWARE_BACKUP_PERSISTENT = (
+        "Select backup firmware slot persistently"
+    )
+    REQUEST_VERSION = "Request the active Firmware Version"
 
 
 class SetId(enum.IntEnum):
@@ -159,6 +191,7 @@ class SetId(enum.IntEnum):
     BLOBS = 92
     CENTROID = 93
     CENTROIDS = 94
+    BLOB_STATS = 102
 
 
 class DataSetRequest(enum.IntEnum):
@@ -290,10 +323,6 @@ def pack_star_tracker_commands(  # noqa C901
         q.add_log_cmd("Star tracker: Temperature request")
         data = obyt + struct.pack("!I", StarTrackerActionId.REQ_TEMPERATURE)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if cmd_str == "8":
-        q.add_log_cmd("Star tracker: Request version")
-        data = obyt + struct.pack("!I", StarTrackerActionId.REQ_VERSION)
-        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if cmd_str == "9":
         q.add_log_cmd("Star tracker: Request interface")
         data = obyt + struct.pack("!I", StarTrackerActionId.REQ_INTERFACE)
@@ -642,12 +671,21 @@ def pack_star_tracker_commands(  # noqa C901
             + bytearray(json_file, "utf-8")
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if cmd_str == OpCode.FW_UPDATE:
+    if cmd_str == OpCode.FW_UPDATE_MAIN:
-        q.add_log_cmd(Info.FW_UPDATE)
+        q.add_log_cmd(Info.FW_UPDATE_MAIN)
         firmware = get_firmware()
         data = (
             obyt
-            + struct.pack("!I", StarTrackerActionId.FIRMWARE_UPDATE)
+            + struct.pack("!I", StarTrackerActionId.FIRMWARE_UPDATE_MAIN)
+            + firmware.encode()
+        )
+        q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
+    if cmd_str == OpCode.FW_UPDATE_BACKUP:
+        q.add_log_cmd(Info.FW_UPDATE_BACKUP)
+        firmware = get_firmware()
+        data = (
+            obyt
+            + struct.pack("!I", StarTrackerActionId.FIRMWARE_UPDATE_BACKUP)
             + firmware.encode()
         )
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -683,6 +721,42 @@ def pack_star_tracker_commands(  # noqa C901
         q.add_pus_tc(
             create_action_cmd(STAR_TRACKER_ID, StarTrackerActionId.RELOAD_JSON_CFG_FILE)
         )
+    if cmd_str == OpCode.SELECT_TARGET_FIRMWARE_MAIN:
+        q.add_log_cmd(Info.SELECT_TARGET_FIRMWARE_MAIN)
+        q.add_pus_tc(create_update_firmware_target_cmd(False, FirmwareTarget.MAIN))
+    if cmd_str == OpCode.SELECT_TARGET_FIRMWARE_BACKUP:
+        q.add_log_cmd(Info.SELECT_TARGET_FIRMWARE_BACKUP)
+        q.add_pus_tc(create_update_firmware_target_cmd(False, FirmwareTarget.BACKUP))
+    if cmd_str == OpCode.SELECT_TARGET_FIRMWARE_MAIN_PERSISTENT:
+        q.add_log_cmd(Info.SELECT_TARGET_FIRMWARE_BACKUP)
+        q.add_pus_tc(create_update_firmware_target_cmd(True, FirmwareTarget.MAIN))
+    if cmd_str == OpCode.SELECT_TARGET_FIRMWARE_BACKUP_PERSISTENT:
+        q.add_log_cmd(Info.SELECT_TARGET_FIRMWARE_BACKUP)
+        q.add_pus_tc(create_update_firmware_target_cmd(True, FirmwareTarget.BACKUP))
+    if cmd_str == OpCode.REQUEST_VERSION:
+        q.add_log_cmd(Info.REQUEST_VERSION)
+        q.add_pus_tc(
+            create_action_cmd(
+                object_id=STAR_TRACKER_ID, action_id=StarTrackerActionId.REQ_VERSION
+            )
+        )
+
+
+def create_update_firmware_target_cmd(
+    persistent: bool, fw_target: FirmwareTarget
+) -> PusTelecommand:
+    if persistent:
+        param_id = ParamId.FIRMWARE_TARGET_PERSISTENT
+    else:
+        param_id = ParamId.FIRMWARE_TARGET
+    return create_load_param_cmd(
+        create_scalar_u8_parameter(
+            STAR_TRACKER_ID,
+            0,
+            param_id,
+            fw_target,
+        )
+    )
 
 
 def request_dataset(q: DefaultPusQueueHelper, req_type: DataSetRequest):
@@ -814,6 +888,10 @@ def handle_str_hk_data(set_id: int, hk_data: bytes, pw: PrintWrapper):
         handle_centroids_set(hk_data, pw)
     elif set_id == SetId.CONTRAST:
         handle_contrast_set(hk_data, pw)
+    elif set_id == SetId.BLOB_STATS:
+        handle_blob_stats_set(hk_data, pw)
+    elif set_id == SetId.VERSION:
+        handle_version_set(hk_data, pw)
     else:
         _LOGGER.warning(f"HK parsing for Star Tracker set ID {set_id} unimplemented")
 
@@ -836,6 +914,25 @@ def unpack_time_hk(hk_data: bytes, current_idx: int, pw: PrintWrapper) -> int:
     return current_idx
 
 
+def handle_version_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Version Set")
+    if len(hk_data) != 16:
+        _LOGGER.warning(
+            f"Version dataset HK with length {len(hk_data)} of unexpected size"
+        )
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+    program = struct.unpack("!B", hk_data[current_idx : current_idx + 1])[0]
+    pw.dlog(f"Program: {program}")
+    current_idx += 1
+    major = struct.unpack("!B", hk_data[current_idx : current_idx + 1])[0]
+    pw.dlog(f"Major: {major}")
+    current_idx += 1
+    minor = struct.unpack("!B", hk_data[current_idx : current_idx + 1])[0]
+    pw.dlog(f"Minor: {minor}")
+    current_idx += 1
+    pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=5))
+
+
 def handle_temperature_set(hk_data: bytes, pw: PrintWrapper):
     pw.dlog("Received temperature set")
     if len(hk_data) < 24:
@@ -1116,6 +1213,35 @@ def handle_contrast_set(hk_data: bytes, pw: PrintWrapper):
     handle_histo_or_contrast_set("Contrast", hk_data, pw)
 
 
+def handle_blob_stats_set(hk_data: bytes, pw: PrintWrapper):
+    pw.dlog("Received Blob Stats Set")
+    if len(hk_data) < 65:
+        raise ValueError(
+            f"Matched BlobStats set with length {len(hk_data)} too short. Expected 65 bytes."
+        )
+    current_idx = unpack_time_hk(hk_data, 0, pw)
+
+    def fill_list(current_idx: int) -> Tuple[List[int], int]:
+        list_to_fill = []
+        for _ in range(16):
+            list_to_fill.append(hk_data[current_idx])
+            current_idx += 1
+        return list_to_fill, current_idx
+
+    noise_list, current_idx = fill_list(current_idx)
+    threshold_list, current_idx = fill_list(current_idx)
+    lvalid_list, current_idx = fill_list(current_idx)
+    oflow_list, current_idx = fill_list(current_idx)
+    pw.dlog("Index | Noise | Threshold | LValid | Oflow")
+    for i in range(16):
+        pw.dlog(
+            "{:<3} {:<3} {:<3} {:<3} {:<3}".format(
+                i, noise_list[i], threshold_list[i], lvalid_list[i], oflow_list[i]
+            )
+        )
+    pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[current_idx:], num_vars=6))
+
+
 def handle_star_tracker_action_replies(
     action_id: int, pw: PrintWrapper, custom_data: bytes
 ):
@@ -1156,63 +1282,15 @@ def handle_read_secondary_tm_set(pw: PrintWrapper, custom_data: bytes):
 
 
 def create_str_node() -> CmdTreeNode:
+    # Zip the two classes together into a dictionary
+    op_code_strs = [
+        getattr(OpCode, key) for key in dir(OpCode) if not key.startswith("__")
+    ]
+    info_strs = [getattr(Info, key) for key in dir(OpCode) if not key.startswith("__")]
+    combined_dict = dict(zip(op_code_strs, info_strs))
     node = CmdTreeNode(
         "str", "Star Tracker Device", hide_children_which_are_leaves=True
     )
-    node.add_child(CmdTreeNode(OpCode.ON_BOOTLOADER, "Mode On, Submode Bootloader"))
+    for op_code, info in combined_dict.items():
-    node.add_child(CmdTreeNode(OpCode.ON_FIRMWARE, "Mode On, Submode Firmware"))
+        node.add_child(CmdTreeNode(op_code, info))
-    node.add_child(CmdTreeNode(OpCode.NORMAL, "Mode Normal"))
-    node.add_child(CmdTreeNode(OpCode.OFF, "Mode Off"))
-    node.add_child(CmdTreeNode(OpCode.PING, "Star Tracker: Ping"))
-    node.add_child(CmdTreeNode(OpCode.TAKE_IMAGE, "Take Image"))
-    node.add_child(CmdTreeNode(OpCode.UPLOAD_IMAGE, Info.UPLOAD_IMAGE))
-    node.add_child(CmdTreeNode(OpCode.DOWNLOAD_IMAGE, Info.DOWNLOAD_IMAGE))
-    node.add_child(CmdTreeNode(OpCode.ONE_SHOOT_HK, Info.ONE_SHOOT_HK))
-    node.add_child(CmdTreeNode(OpCode.ENABLE_HK, Info.ENABLE_HK))
-    node.add_child(CmdTreeNode(OpCode.DISABLE_HK, Info.DISABLE_HK))
-    node.add_child(
-        CmdTreeNode(OpCode.SET_IMG_PROCESSOR_MODE, Info.SET_IMG_PROCESSOR_MODE)
-    )
-    node.add_child(
-        CmdTreeNode(
-            OpCode.ADD_SECONDARY_TM_TO_NORMAL_MODE,
-            Info.ADD_SECONDARY_TM_TO_NORMAL_MODE,
-        )
-    )
-    node.add_child(
-        CmdTreeNode(OpCode.READ_SECONDARY_TM_SET, Info.READ_SECONDARY_TM_SET)
-    )
-    node.add_child(
-        CmdTreeNode(OpCode.RESET_SECONDARY_TM_SET, Info.RESET_SECONDARY_TM_SET)
-    )
-    node.add_child(CmdTreeNode(OpCode.FW_UPDATE, Info.FW_UPDATE))
-    node.add_child(
-        CmdTreeNode(OpCode.SET_TIME_FROM_SYS_TIME, Info.SET_TIME_FROM_SYS_TIME)
-    )
     return node
-
-
-@tmtc_definitions_provider
-def add_str_cmds(defs: TmtcDefinitionWrapper):
-    oce = OpCodeEntry()
-    oce.add(OpCode.ON_BOOTLOADER, "Mode On, Submode Bootloader")
-    oce.add(OpCode.ON_FIRMWARE, "Mode On, Submode Firmware")
-    oce.add(OpCode.NORMAL, "Mode Normal")
-    oce.add(OpCode.OFF, "Mode Off")
-    oce.add(OpCode.PING, "Star Tracker: Ping")
-    oce.add(OpCode.TAKE_IMAGE, "Take Image")
-    oce.add(OpCode.UPLOAD_IMAGE, Info.UPLOAD_IMAGE)
-    oce.add(OpCode.DOWNLOAD_IMAGE, Info.DOWNLOAD_IMAGE)
-    oce.add(OpCode.ONE_SHOOT_HK, Info.ONE_SHOOT_HK)
-    oce.add(OpCode.ENABLE_HK, Info.ENABLE_HK)
-    oce.add(OpCode.DISABLE_HK, Info.DISABLE_HK)
-    oce.add(OpCode.SET_IMG_PROCESSOR_MODE, Info.SET_IMG_PROCESSOR_MODE)
-    oce.add(
-        OpCode.ADD_SECONDARY_TM_TO_NORMAL_MODE, Info.ADD_SECONDARY_TM_TO_NORMAL_MODE
-    )
-    oce.add(OpCode.READ_SECONDARY_TM_SET, Info.READ_SECONDARY_TM_SET)
-    oce.add(OpCode.RESET_SECONDARY_TM_SET, Info.RESET_SECONDARY_TM_SET)
-    oce.add(OpCode.FW_UPDATE, Info.FW_UPDATE)
-    oce.add(OpCode.SET_TIME_FROM_SYS_TIME, Info.SET_TIME_FROM_SYS_TIME)
-    oce.add(OpCode.RELOAD_JSON_CFG_FILE, Info.RELOAD_JSON_CFG_FILE)
-    defs.add_service(CustomServiceList.STAR_TRACKER.value, "Star Tracker", oce)

eive_tmtc/tmtc/core.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from typing import Tuple
 
 from spacepackets.ecss import PusTelecommand
-from tmtccmd.config import CmdTreeNode, TmtcDefinitionWrapper
+from tmtccmd.config import CmdTreeNode
 
 from tmtccmd.tmtc import DefaultPusQueueHelper
 from tmtccmd.pus.s8_fsfw_action import create_action_cmd
@@ -15,14 +15,12 @@ from tmtccmd.pus.s20_fsfw_param import (
     create_scalar_u8_parameter,
     create_load_param_cmd,
 )
-from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
 from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.pus.s11_tc_sched import (
     create_enable_tc_sched_cmd,
     create_disable_tc_sched_cmd,
 )
 
-from eive_tmtc.config.definitions import CustomServiceList
 from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
 from eive_tmtc.pus_tm.defs import PrintWrapper
 
@@ -71,6 +69,7 @@ class ActionId(enum.IntEnum):
     RM_HELPER = 54
     MKDIR_HELPER = 55
     ENABLE_SCHEDULER = 56
+    UPDATE_LEAP_SECONRS = 60
 
 
 class ParamId(enum.IntEnum):
@@ -122,6 +121,7 @@ class OpCode:
     AUTO_SWITCH_DISABLE = "auto_switch_disable"
     ENABLE_SCHEDULER = "enable_scheduler"
     DISABLE_SCHEDULER = "disable_scheduler"
+    UPDATE_LEAP_SECONDS = "leap_seconds_update"
 
 
 class Info:
@@ -165,6 +165,7 @@ class Info:
     AUTO_SWITCH_DISABLE = "Disable Auto-Switch Feature"
     ENABLE_SCHEDULER = "Enable scheduler"
     DISABLE_SCHEDULER = "Disable scheduler"
+    UPDATE_LEAP_SECONDS = "Updates the Leap Seconds"
 
 
 class Chip(enum.IntEnum):
@@ -197,90 +198,6 @@ def create_core_node() -> CmdTreeNode:
     return node
 
 
-@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.ANNOUNCE_BOOT_COUNTS, info=Info.ANNOUNCE_BOOT_COUNTS)
-    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)
-    oce.add(keys=OpCode.XSC_REBOOT_SELF, info="Reboot Self")
-    oce.add(keys=OpCode.XSC_REBOOT_0_0, info="Reboot 0 0")
-    oce.add(keys=OpCode.XSC_REBOOT_0_1, info="Reboot 0 1")
-    oce.add(keys=OpCode.XSC_REBOOT_1_0, info="Reboot 1 0")
-    oce.add(keys=OpCode.XSC_REBOOT_1_1, info="Reboot 1 1")
-    oce.add(keys=OpCode.SET_PREF_SD, info=Info.SET_PREF_SD)
-    oce.add(
-        keys=OpCode.READ_REBOOT_MECHANISM_INFO, info=Info.READ_REBOOT_MECHANISM_INFO
-    )
-    oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
-    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
-    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
-    oce.add(keys=OpCode.AUTO_SWITCH_ENABLE, info=Info.AUTO_SWITCH_ENABLE)
-    oce.add(keys=OpCode.AUTO_SWITCH_DISABLE, info=Info.AUTO_SWITCH_DISABLE)
-    oce.add(keys=OpCode.SYSTEMCTL_CMD_EXECUTOR, info=Info.SYSTEMCTL_CMD_EXECUTOR)
-    oce.add(
-        keys=OpCode.EXECUTE_SHELL_CMD_BLOCKING, info=Info.EXECUTE_SHELL_CMD_BLOCKING
-    )
-    oce.add(
-        keys=OpCode.EXECUTE_SHELL_CMD_NON_BLOCKING,
-        info=Info.EXECUTE_SHELL_CMD_NON_BLOCKING,
-    )
-    oce.add(
-        keys=OpCode.GET_HK,
-        info="Request housekeeping set",
-    )
-    oce.add(
-        keys=OpCode.ENABLE_REBOOT_FILE_HANDLING,
-        info="Enable reboot file handling",
-    )
-    oce.add(
-        keys=OpCode.DISABLE_REBOOT_FILE_HANDLING,
-        info="Disable reboot file handling",
-    )
-    oce.add(
-        keys=OpCode.RESET_ALL_REBOOT_COUNTERS,
-        info="Reset all reboot counters",
-    )
-    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_00,
-        info="Reset reboot counter 0 0",
-    )
-    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_01,
-        info="Reset reboot counter 0 1",
-    )
-    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_10,
-        info="Reset reboot counter 1 0",
-    )
-    oce.add(
-        keys=OpCode.RWD_RESET_REBOOT_COUNTER_11,
-        info="Reset reboot counter 1 1",
-    )
-    oce.add(
-        keys=OpCode.RWD_SET_MAX_REBOOT_CNT,
-        info="Reset max reboot count for reboot watchdog",
-    )
-    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_0, info=Info.OBSW_UPDATE_FROM_SD_0)
-    oce.add(keys=OpCode.OBSW_UPDATE_FROM_SD_1, info=Info.OBSW_UPDATE_FROM_SD_1)
-    oce.add(keys=OpCode.OBSW_UPDATE_FROM_TMP, info=Info.OBSW_UPDATE_FROM_TMP)
-    oce.add(keys=OpCode.SWITCH_TO_SD_0, info=Info.SWITCH_TO_SD_0)
-    oce.add(keys=OpCode.SWITCH_TO_SD_1, info=Info.SWITCH_TO_SD_1)
-    oce.add(keys=OpCode.SWITCH_TO_BOTH_SD_CARDS, info=Info.SWITCH_TO_BOTH_SD_CARDS)
-    oce.add(keys=OpCode.LIST_DIR_INTO_FILE, info=Info.LIST_DIR_INTO_FILE)
-    oce.add(keys=OpCode.LIST_DIR_DUMP_DIRECTLY, info=Info.LIST_DIR_DUMP_DIRECTLY)
-    oce.add(keys=OpCode.MV_HELPER, info=Info.MV_HELPER)
-    oce.add(keys=OpCode.CP_HELPER, info=Info.CP_HELPER)
-    oce.add(keys=OpCode.RM_HELPER, info=Info.RM_HELPER)
-    oce.add(keys=OpCode.MKDIR_HELPER, info=Info.MKDIR_HELPER)
-    oce.add(keys=OpCode.ENABLE_SCHEDULER, info=Info.ENABLE_SCHEDULER)
-    oce.add(keys=OpCode.DISABLE_SCHEDULER, info=Info.DISABLE_SCHEDULER)
-    defs.add_service(CustomServiceList.CORE.value, "Core Controller", oce)
-
-
 def pack_core_commands(  # noqa C901
     q: DefaultPusQueueHelper, cmd_str: str
 ):  # noqa: C901 , complexity okay here
@@ -557,6 +474,16 @@ def pack_core_commands(  # noqa C901
     elif cmd_str == OpCode.DISABLE_SCHEDULER:
         q.add_log_cmd(Info.DISABLE_SCHEDULER)
         q.add_pus_tc(create_disable_tc_sched_cmd())
+    elif cmd_str == OpCode.UPDATE_LEAP_SECONDS:
+        q.add_log_cmd(Info.UPDATE_LEAP_SECONDS)
+        leap_seconds = int(input("Specify new Leap Seconds Value: ")).to_bytes(
+            length=2, signed=False, byteorder="big"
+        )
+        q.add_pus_tc(
+            create_action_cmd(
+                CORE_CONTROLLER_ID, ActionId.UPDATE_LEAP_SECONRS, leap_seconds
+            )
+        )
     else:
         _LOGGER.warning(
             f"Unknown operation code {cmd_str} for core controller commands"

eive_tmtc/tmtc/tcs/heater.py

@@ -59,7 +59,7 @@ CTN = CmdTreeNode
 
 
 def create_heater_node() -> CmdTreeNode:
-    node = CmdTreeNode("heater", "Heater Device", hide_children_which_are_leaves=True)
+    node = CmdTreeNode("heaters", "Heater Device", hide_children_which_are_leaves=True)
     node.add_child(CTN(OpCode.HEATER_CMD, Info.HEATER_CMD))
     node.add_child(CTN(OpCode.HEATER_HEALTHY_CMD, Info.HEATER_HEALTHY_CMD))
     node.add_child(CTN(OpCode.HEATER_EXT_CTRL, Info.HEATER_EXT_CTRL))

eive_tmtc/tmtc/time.py

@@ -1,6 +1,7 @@
 import enum
+import struct
 import logging
-from datetime import datetime
+import datetime
 
 from spacepackets.ecss import PusTelecommand, PusService
 
@@ -8,28 +9,34 @@ from tmtccmd.tmtc import DefaultPusQueueHelper
 from tmtccmd.config import CmdTreeNode
 
 
+_LOGGER = logging.getLogger(__name__)
+
+
 class Subservice(enum.IntEnum):
     SET_TIME = 128
     DUMP_TIME = 129
+    RELATIVE_TIMESHIFT = 130
 
 
 class CmdStr:
     SET_CURRENT_TIME = "set_curr_time"
+    RELATIVE_TIMESHIFT = "relative_timeshift"
     DUMP_TIME = "dump_time"
 
 
 class Info:
     SET_CURRENT_TIME = "Setting current time in ASCII format"
+    RELATIVE_TIMESHIFT = "Shift time with a relative offset"
     DUMP_TIME = "Dump system time as event"
 
 
 def pack_time_management_cmd(q: DefaultPusQueueHelper, cmd_str: str):
     if cmd_str == CmdStr.SET_CURRENT_TIME:
-        current_time = datetime.utcnow().isoformat() + "Z" + "\0"
+        current_time = (
-        current_time_ascii = current_time.encode("ascii")
+            datetime.datetime.now(datetime.timezone.utc).isoformat() + "Z" + "\0"
-        logging.getLogger(__name__).info(
-            f"Current time in ASCII format: {current_time_ascii}"
         )
+        current_time_ascii = current_time.encode("ascii")
+        _LOGGER.info(f"Current time in ASCII format: {current_time_ascii}")
         q.add_log_cmd(Info.SET_CURRENT_TIME)
         q.add_pus_tc(
             PusTelecommand(
@@ -38,6 +45,17 @@ def pack_time_management_cmd(q: DefaultPusQueueHelper, cmd_str: str):
                 app_data=current_time_ascii,
             )
         )
+    elif cmd_str == CmdStr.RELATIVE_TIMESHIFT:
+        nanos = int(input("Specify relative timeshift in nanoseconds: "))
+        nanos_packed = struct.pack("!q", nanos)
+        q.add_log_cmd(Info.RELATIVE_TIMESHIFT)
+        q.add_pus_tc(
+            PusTelecommand(
+                service=PusService.S9_TIME_MGMT,
+                subservice=Subservice.RELATIVE_TIMESHIFT,
+                app_data=nanos_packed,
+            )
+        )
     elif cmd_str == CmdStr.DUMP_TIME:
         q.add_log_cmd(Info.DUMP_TIME)
         q.add_pus_tc(
@@ -51,4 +69,5 @@ def create_time_node() -> CmdTreeNode:
     time_node = CmdTreeNode("time", "Time Management")
     time_node.add_child(CmdTreeNode(CmdStr.SET_CURRENT_TIME, "Set current time"))
     time_node.add_child(CmdTreeNode(CmdStr.DUMP_TIME, "Dumpy current time"))
+    time_node.add_child(CmdTreeNode(CmdStr.RELATIVE_TIMESHIFT, Info.RELATIVE_TIMESHIFT))
     return time_node

eive_tmtc/tmtc/tm_store.py

@@ -107,6 +107,7 @@ def pack_tm_store_commands(q: DefaultPusQueueHelper, cmd_path: str):
 def create_persistent_tm_store_node() -> CmdTreeNode:
     node = CmdTreeNode("tm_store", "Persistent TM Store")
     node.add_child(CmdTreeNode(OpCode.DELETE_UP_TO, Info.DELETE_UP_TO))
+    node.add_child(CmdTreeNode(OpCode.DELETE_BY_TIME_RANGE, Info.DELETE_BY_TIME_RANGE))
     node.add_child(
         CmdTreeNode(OpCode.RETRIEVAL_BY_TIME_RANGE, Info.RETRIEVAL_BY_TIME_RANGE)
     )

pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 name = "eive-tmtc"
 description = "TMTC Commander EIVE"
 readme = "README.md"
-version = "6.0.0"
+version = "6.1.1"
 requires-python = ">=3.10"
 license = {text = "Apache-2.0"}
 authors = [