Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc

Reviewed-on: #128

CHANGELOG.md

@@ -10,9 +10,27 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+# [v2.7.0] 2023-01-31
+
+- tmtccmd v4.0.0a3
+
+# [v2.6.0 and v2.6.1] 2023-01-28
+
+## Changed
+
+- Reworked and improved PUS 20 parameter reply handling
+
+## Added
+
+- COM subsystem commanding. Default datarate parameter commanding
+  was moved to the subsystem as well.
+
+# [v2.5.0] 2023-01-26
+
 ## Fixed
 
 - Bugfix for CCSDS handler commanding: Pass correct object ID
+- Processed MGM set TM handling fix
 
 ## Added
 

eive_tmtc/__init__.py

@@ -2,10 +2,10 @@ from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
-VERSION_MINOR = 4
-VERSION_REVISION = 1
+VERSION_MINOR = 7
+VERSION_REVISION = 0
 
-__version__ = "2.4.1"
+__version__ = "2.7.0"
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

eive_tmtc/config/definitions.py

@@ -17,8 +17,8 @@ CFDP_APID = 0x66
 PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID)
 CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID)
 SPACE_PACKET_IDS = (
-    PUS_PACKET_ID.raw(),
-    CFDP_PACKET_ID.raw(),
+    PUS_PACKET_ID,
+    CFDP_PACKET_ID,
 )
 
 CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)
@@ -35,6 +35,7 @@ class CustomServiceList(str, enum.Enum):
     POWER = "power"
     ACU = "acu"
     ACS = "acs"
+    COM_SS = "com"
     BPX_BATTERY = "bpx"
     TMP1075_1 = "tmp1075_1"
     TMP1075_2 = "tmp1075_2"

eive_tmtc/config/hook.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
 from eive_tmtc.config.definitions import SPACE_PACKET_IDS
-from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend
-from tmtccmd.com_if import ComInterface
+from tmtccmd import HookBase, CcsdsTmtcBackend
+from tmtccmd.com import ComInterface
 from tmtccmd.config import TmtcDefinitionWrapper
 
 from eive_tmtc.config.retvals import get_retval_dict
@@ -10,7 +10,7 @@ from eive_tmtc.pus_tc.cmd_definitions import get_eive_service_op_code_dict
 from tmtccmd.util import ObjectIdDictT, RetvalDictT
 
 
-class EiveHookObject(TmTcCfgHookBase):
+class EiveHookObject(HookBase):
     def __init__(self, json_cfg_path: str):
         super().__init__(json_cfg_path=json_cfg_path)
 
@@ -18,7 +18,7 @@ class EiveHookObject(TmTcCfgHookBase):
         return get_eive_service_op_code_dict()
 
     def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]:
-        from tmtccmd.config.com_if import (
+        from tmtccmd.config.com import (
             create_com_interface_default,
             create_com_interface_cfg_default,
         )

eive_tmtc/config/object_ids.py

@@ -127,6 +127,8 @@ SUS_11_R_LOC_XBYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x43])
 ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
 PL_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x02])
 TCS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x03])
+COM_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x04])
+
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
 SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
 TCS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x03])

eive_tmtc/config/objects.csv

@@ -72,7 +72,7 @@
 0x44420029;RTD_13_IC16_PLPCDU_HEATSPREADER
 0x44420030;RTD_14_IC17_TCS_BOARD
 0x44420031;RTD_15_IC18_IMTQ
-0x445300A3;SYRLINKS_HK_HANDLER
+0x445300A3;SYRLINKS_HANDLER
 0x49000000;ARDUINO_COM_IF
 0x49010005;GPIO_IF
 0x49010006;SCEX_UART_READER
@@ -147,5 +147,6 @@
 0x73010001;ACS_SUBSYSTEM
 0x73010002;PL_SUBSYSTEM
 0x73010003;TCS_SUBSYSTEM
+0x73010004;COM_SUBSYSTEM
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT

eive_tmtc/pus_tc/devs/bpx_batt.py

@@ -11,8 +11,8 @@ from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd
 from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
-from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
 
 
 class BpxSetId:

eive_tmtc/pus_tc/devs/plpcdu.py

@@ -18,8 +18,8 @@ from tmtccmd.tc.pus_11_tc_sched import (
     create_enable_tc_sched_cmd,
     create_time_tagged_cmd,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
-from tmtccmd.tc.pus_20_fsfw_params import (
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
+from tmtccmd.tc.pus_20_fsfw_param import (
     pack_scalar_double_param_app_data,
     create_load_param_cmd,
     pack_boolean_parameter_app_data,

eive_tmtc/pus_tc/devs/rtd.py

@@ -9,7 +9,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider
 
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
-from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice
 import eive_tmtc.config.object_ids as oids
 from eive_tmtc.config.object_ids import get_object_ids
 

eive_tmtc/pus_tc/devs/scex.py

@@ -5,7 +5,7 @@ from spacepackets.ecss import PusTelecommand
 
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config.tmtc import tmtc_definitions_provider
-from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd

eive_tmtc/pus_tc/devs/tmp1075.py

@@ -10,7 +10,7 @@ import enum
 from spacepackets.ecss.tc import PusTelecommand
 from eive_tmtc.pus_tc.service_200_mode import pack_mode_data
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.pus.s8_fsfw_funccmd import make_action_id
 from tmtccmd.util import ObjectIdU32
 

eive_tmtc/pus_tc/service_200_mode.py

@@ -7,7 +7,7 @@
 """
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from eive_tmtc.config.object_ids import TEST_DEVICE_ID
 
 TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID

eive_tmtc/pus_tc/system/controllers.py

@@ -1,7 +1,7 @@
 from typing import Union
 
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info

eive_tmtc/pus_tm/event_handler.py

@@ -4,8 +4,8 @@ from eive_tmtc.config.events import get_event_dict
 from eive_tmtc.config.object_ids import get_object_ids
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.pus_tm.verification_handler import generic_retval_printout
-from eive_tmtc.tmtc.acs.acs_subsystem import AcsMode
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from eive_tmtc.tmtc.acs.subsystem import AcsMode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 
 from tmtccmd.tm import Service5Tm
 from tmtccmd.logging import get_console_logger
@@ -20,69 +20,67 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     pw = PrintWrapper(printer)
     tm = Service5Tm.unpack(raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty())
     event_dict = get_event_dict()
-    info = event_dict.get(tm.event_id)
+    event_def = tm.event_definition
+    info = event_dict.get(event_def.event_id)
     if info is None:
-        LOGGER.warning(f"Event ID {tm.event_id} has no information")
+        LOGGER.warning(f"Event ID {event_def.event_id} has no information")
         info = EventInfo()
         info.name = "Unknown event"
     obj_ids = get_object_ids()
-    obj_id_obj = obj_ids.get(tm.reporter_id.as_bytes)
+    obj_id_obj = obj_ids.get(event_def.reporter_id)
     if obj_id_obj is None:
-        LOGGER.warning(f"Object ID 0x{tm.reporter_id.as_hex_string} has no name")
-        obj_name = tm.reporter_id.as_hex_string
+        LOGGER.warning(f"Object ID 0x{event_def.reporter_id.hex(sep=',')} has no name")
+        obj_name = event_def.reporter_id.hex(sep=",")
     else:
         obj_name = obj_id_obj.name
-    generic_event_string = (
-        f"Object {obj_name} generated Event {tm.event_id} | {info.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()}"
     pw.printer.file_logger.info(
         f"{datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
     )
     LOGGER.info(generic_event_string)
     specific_handler = True
     if info.name == "MODE_TRANSITION_FAILED":
-        reason = generic_retval_printout(tm.param_1)
+        reason = generic_retval_printout(event_def.param1)
         for string in reason:
             pw.dlog(f"Reason from event parameter 1: {string}")
-            pw.dlog(f"Mode, sequence or table: {tm.param_2:#08x}")
+            pw.dlog(f"Mode, sequence or table: {event_def.param2:#08x}")
     if info.name == "SUPV_UPDATE_PROGRESS" or info.name == "WRITE_MEMORY_FAILED":
         additional_event_info = f"Additional info: {info.info}"
         context = (
-            f"Progress Percent: {tm.param_1 >> 24 & 0xff} | Sequence Count: {tm.param_1 & 0xffff} "
-            f"| Bytes Written: {tm.param_2}"
+            f"Progress Percent: {event_def.param1 >> 24 & 0xff} | Sequence Count: {event_def.param1 & 0xffff} "
+            f"| Bytes Written: {event_def.param2}"
         )
         pw.dlog(additional_event_info)
         pw.dlog(context)
     if info.name == "MODE_INFO":
         mode_name = "Unknown"
         if obj_name == "ACS_SUBSYSTEM":
-            if tm.param_1 == Mode.OFF:
+            if event_def.param1 == Mode.OFF:
                 mode_name = "Off"
-            elif tm.param_1 == AcsMode.IDLE:
+            elif event_def.param1 == AcsMode.IDLE:
                 mode_name = "Idle"
-            elif tm.param_1 == AcsMode.DETUMBLE:
+            elif event_def.param1 == AcsMode.DETUMBLE:
                 mode_name = "Detumble"
-            elif tm.param_1 == AcsMode.SAFE:
+            elif event_def.param1 == AcsMode.SAFE:
                 mode_name = "Safe"
-            elif tm.param_1 == AcsMode.TARGET_PT:
+            elif event_def.param1 == AcsMode.TARGET_PT:
                 mode_name = "Target Pointing"
         else:
-            if tm.param_1 == Mode.OFF:
+            if event_def.param1 == Mode.OFF:
                 mode_name = "Off"
-            elif tm.param_1 == Mode.ON:
+            elif event_def.param1 == Mode.ON:
                 mode_name = "On"
-            elif tm.param_1 == Mode.NORMAL:
+            elif event_def.param1 == Mode.NORMAL:
                 mode_name = "Normal"
-            elif tm.param_1 == Mode.RAW:
+            elif event_def.param1 == Mode.RAW:
                 mode_name = "Raw"
-        pw.dlog(f"Mode Number {tm.param_1}, Mode Name {mode_name}")
-        pw.dlog(f"Submode: {tm.param_2}")
+        pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}")
+        pw.dlog(f"Submode: {event_def.param2}")
     else:
         specific_handler = False
         if info.info != "":
-            additional_event_info = (
-                f"Additional info: {info.info} | P1: {tm.param_1} | P2: {tm.param_2}"
-            )
+            additional_event_info = f"Additional info: {info.info} | P1: {event_def.param1} | P2: {event_def.param2}"
             pw.dlog(additional_event_info)
     if not specific_handler:
-        printer.handle_long_tm_print(packet_if=tm, info_if=tm)
+        # printer.handle_long_tm_print(packet_if=tm.pus_tm, info_if=tm.pus_tm)
+        pass

eive_tmtc/pus_tm/factory_hook.py

@@ -9,7 +9,9 @@ from tmtccmd import get_console_logger
 from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm
-from tmtccmd.tm.pus_200_fsfw_modes import Subservice as ModeSubservices
+from tmtccmd.tm.pus_20_fsfw_param import Service20ParamDumpWrapper
+from tmtccmd.pus.s20_fsfw_param_defs import CustomSubservice as ParamSubservice
+from tmtccmd.tm.pus_200_fsfw_mode import Subservice as ModeSubservice
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from .defs import PrintWrapper
 
@@ -56,15 +58,42 @@ def pus_factory_hook(
             verif_wrapper.dlog("Received Ping Reply TM[17,2]")
         dedicated_handler = True
     elif service == 20:
-        tm_packet = Service20FsfwTm.unpack(
+        param_packet = Service20FsfwTm.unpack(
             raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
         )
-        dedicated_handler = False
+        if tm_packet.subservice == ParamSubservice.TM_DUMP_REPLY:
+            param_wrapper = Service20ParamDumpWrapper(param_tm=param_packet)
+            try:
+                param = param_wrapper.get_param()
+                obj = obj_id_dict.get(param_wrapper.param_tm.object_id)
+                pw.dlog(f"Received parameter dump TM from {obj}")
+                pw.dlog(f"Parameter: {param}")
+                if param.row == 1 and param.column == 1:
+                    try:
+                        scalar_param = param.parse_scalar_param()
+                        if isinstance(scalar_param, int):
+                            pw.dlog(f"Scalar integer parameter: {scalar_param}")
+                        elif isinstance(scalar_param, float):
+                            pw.dlog(f"Scalar floating point parameter: {scalar_param}")
+                    except ValueError as e:
+                        pw.dlog("received {e} trying to parse scalar parameter")
+                else:
+                    # TODO: Could improve display further by actually displaying a matrix as a
+                    #       matrix using row and column information
+                    pw.dlog(
+                        f"Received vector or matrix data: {param.param_data.hex(sep=',')}"
+                    )
+            except ValueError as e:
+                pw.dlog(f"received {e} when trying to parse parameters")
+            except NotImplementedError as e:
+                pw.dlog(f"received {e} when trying to parse parameters")
+        else:
+            pw.dlog(f"unknown subservice {tm_packet.subservice} for parameter service")
     elif service == 200:
         tm_packet = Service200FsfwTm.unpack(
             raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
         )
-        if tm_packet.subservice == ModeSubservices.TM_CANT_REACH_MODE:
+        if tm_packet.subservice == ModeSubservice.TM_CANT_REACH_MODE:
             obj_id = tm_packet.object_id
             obj_id_obj = obj_id_dict.get(obj_id)
             retval = tm_packet.return_value

eive_tmtc/tmtc/__init__.py

@@ -1,3 +1,3 @@
-from .payload.pl_subsystem import add_payload_subsystem_cmds
+from .payload.subsystem import add_payload_subsystem_cmds
 from .solar_array_deployment import add_sa_depl_cmds
 from .test import add_test_defs

eive_tmtc/tmtc/acs/acs_board.py

@@ -8,7 +8,7 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider, DefaultPusQueueHelper
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID
 
 from eive_tmtc.tmtc.common import pack_mode_cmd_with_info

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -14,7 +14,7 @@ from tmtccmd.config.tmtc import (
     OpCodeEntry,
 )
 from tmtccmd.tc import service_provider
-from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_command
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_command
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_hk_command,
@@ -534,6 +534,7 @@ def handle_mgm_data_processed(pw: PrintWrapper, hk_data: bytes):
         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 = "!ddd"
     inc_len = struct.calcsize(fmt_str)
     mgm_vec_tot = struct.unpack(fmt_str, hk_data[current_idx : current_idx + inc_len])

eive_tmtc/tmtc/acs/imtq.py

@@ -22,7 +22,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     generate_one_diag_command,
     generate_one_hk_command,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 

eive_tmtc/tmtc/acs/reaction_wheels.py

@@ -20,7 +20,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     disable_periodic_hk_command,
 )
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
 from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.util import ObjectIdU32
 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter

eive_tmtc/tmtc/acs/star_tracker.py

@@ -9,7 +9,7 @@ import enum
 import struct
 
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 from tmtccmd.logging import get_console_logger
 
 from tmtccmd.tc import DefaultPusQueueHelper

eive_tmtc/tmtc/acs/subsystem.py

@@ -10,7 +10,7 @@ from tmtccmd.config.tmtc import (
     TmtcDefinitionWrapper,
     OpCodeEntry,
 )
-from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 

eive_tmtc/tmtc/acs/sus_board.py

@@ -9,7 +9,7 @@ from tmtccmd.config.tmtc import (
 )
 from tmtccmd.tc import service_provider, DefaultPusQueueHelper
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 
 
 class SusOpCode:

eive_tmtc/tmtc/com/__init__.py

@@ -0,0 +1 @@
+from .subsystem import add_com_subsystem_cmds

eive_tmtc/tmtc/com/ccsds_handler.py

@@ -16,7 +16,7 @@ from tmtccmd.config.tmtc import (
     TmtcDefinitionWrapper,
 )
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import create_mode_command, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode
 from tmtccmd.util import ObjectIdU32
 from eive_tmtc.config.object_ids import CCSDS_HANDLER_ID
 

eive_tmtc/tmtc/com/subsystem.py

@@ -0,0 +1,115 @@
+import enum
+
+from eive_tmtc.config.definitions import CustomServiceList
+from eive_tmtc.config.object_ids import COM_SUBSYSTEM_ID
+from eive_tmtc.tmtc.com.syrlinks_handler import Datarate
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+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_20_fsfw_param import (
+    create_load_param_cmd,
+    pack_scalar_u8_parameter_app_data,
+)
+
+
+class ParameterId(enum.IntEnum):
+    DATARATE = 0
+
+
+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
+
+
+class OpCode:
+    RX_ONLY = "rx_only"
+    TX_AND_RX_DEF_RATE = "rx_and_tx_default_rate"
+    TX_AND_RX_LOW_RATE = "rx_and_tx_low_rate"
+    TX_AND_RX_HIGH_RATE = "rx_and_tx_high_rate"
+    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"
+
+
+class Info:
+    RX_ONLY = "Syrlinks RX Only"
+    TX_AND_RX_DEF_DATARATE = "Syrlinks with TX default datarate"
+    TX_AND_RX_LOW_DATARATE = "Syrlinks with TX low datarate (BPSK modulation)"
+    TX_AND_RX_HIGH_DATARATE = "Syrlinks with TX high datarate (0QPSK modulation)"
+    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)"
+
+
+@service_provider(CustomServiceList.COM_SS)
+def build_com_subsystem_cmd(p: ServiceProviderParams):
+    q = p.queue_helper
+    o = p.op_code
+    prefix = "COM Subsystem"
+    if o == OpCode.RX_ONLY:
+        q.add_log_cmd(Info.RX_ONLY)
+        q.add_pus_tc(create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_ONLY, 0))
+    elif o == OpCode.TX_AND_RX_DEF_RATE:
+        q.add_log_cmd(Info.TX_AND_RX_DEF_DATARATE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_DEF_DATARATE, 0)
+        )
+    elif o == OpCode.TX_AND_RX_LOW_RATE:
+        q.add_log_cmd(Info.TX_AND_RX_LOW_DATARATE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_LOW_DATARATE, 0)
+        )
+    elif o == OpCode.TX_AND_RX_HIGH_RATE:
+        q.add_log_cmd(Info.TX_AND_RX_HIGH_DATARATE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_HIGH_DATARATE, 0)
+        )
+    if o == OpCode.UPDATE_DEFAULT_DATARATE_LOW:
+        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_LOW}")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                pack_scalar_u8_parameter_app_data(
+                    COM_SUBSYSTEM_ID,
+                    0,
+                    ParameterId.DATARATE,
+                    Datarate.LOW_RATE_MODULATION_BPSK,
+                )
+            )
+        )
+    if o == OpCode.UPDATE_DEFAULT_DATARATE_HIGH:
+        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_HIGH}")
+        q.add_pus_tc(
+            create_load_param_cmd(
+                pack_scalar_u8_parameter_app_data(
+                    COM_SUBSYSTEM_ID,
+                    0,
+                    ParameterId.DATARATE,
+                    Datarate.HIGH_RATE_MODULATION_0QPSK,
+                )
+            )
+        )
+    elif o == OpCode.TX_AND_RX_CARRIER_WAVE:
+        q.add_log_cmd(Info.TX_AND_RX_CARRIER_WAVE)
+        q.add_pus_tc(
+            create_mode_command(COM_SUBSYSTEM_ID, Submode.RX_AND_TX_CARRIER_WAVE, 0)
+        )
+
+
+@tmtc_definitions_provider
+def add_com_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCode.RX_ONLY, Info.RX_ONLY)
+    oce.add(OpCode.TX_AND_RX_LOW_RATE, Info.TX_AND_RX_LOW_DATARATE)
+    oce.add(OpCode.TX_AND_RX_HIGH_RATE, Info.TX_AND_RX_HIGH_DATARATE)
+    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)
+    defs.add_service(CustomServiceList.COM_SS, "COM Subsystem", oce)

eive_tmtc/tmtc/com/syrlinks_handler.py

@@ -23,11 +23,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import (
     create_disable_periodic_hk_command,
 )
 from spacepackets.ecss.tc import PusTelecommand
-from tmtccmd.tc.pus_200_fsfw_modes import Mode, create_mode_command
-from tmtccmd.tc.pus_20_fsfw_params import (
-    pack_scalar_u8_parameter_app_data,
-    create_load_param_cmd,
-)
+from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_mode_command
 from eive_tmtc.config.object_ids import SYRLINKS_HANDLER_ID
 import struct
 
@@ -49,8 +45,6 @@ class OpCode:
     NORMAL_RX_AND_TX_DEF_DATARATE = "nml_default_datarate"
     NORMAL_RX_AND_TX_LOW_DATARATE = "nml_low_datarate"
     NORMAL_RX_AND_TX_HIGH_DATARATE = "nml_high_datarate"
-    UPDATE_DEFAULT_DATARATE_LOW_RATE = "param_low_datarate"
-    UPDATE_DEFAULT_DATARATE_HIGH_RATE = "param_high_datarate"
     HK_RX_REGS = "hk_rx_regs"
     ENABLE_HK_RX_REGS = "enable_hk_rx"
     DISABLE_HK_RX_REGS = "disable_hk_rx"
@@ -69,8 +63,6 @@ class Info:
     NORMAL_RX_AND_TX_DEF_DATARATE = "NORMAL RX and TX, TX with default datarate"
     NORMAL_RX_AND_TX_LOW_DATARATE = "NORMAL RX and TX, TX with low datarate"
     NORMAL_RX_AND_TX_HIGH_DATARATE = "NORMAL RX and TX, TX with high datarate"
-    UPDATE_DEFAULT_DATARATE_LOW_RATE = "Update default datarate to low rate (BPSK)"
-    UPDATE_DEFAULT_DATARATE_HIGH_RATE = "Update default datarate to high rate (0QPSK)"
     HK_RX_REGS = "Request RX register set"
     HK_TX_REGS = "Request TX register set"
     ENABLE_HK_RX_REGS = "Enable periodic RX register HK"
@@ -108,10 +100,6 @@ class Submode(enum.IntEnum):
     RX_AND_TX_CW = 4
 
 
-class ParameterId(enum.IntEnum):
-    DATARATE = 0
-
-
 class Datarate(enum.IntEnum):
     LOW_RATE_MODULATION_BPSK = 0
     HIGH_RATE_MODULATION_0QPSK = 1
@@ -127,12 +115,6 @@ def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCode.NORMAL_RX_AND_TX_DEF_DATARATE, Info.NORMAL_RX_AND_TX_DEF_DATARATE)
     oce.add(OpCode.NORMAL_RX_AND_TX_LOW_DATARATE, Info.NORMAL_RX_AND_TX_LOW_DATARATE)
     oce.add(OpCode.NORMAL_RX_AND_TX_HIGH_DATARATE, Info.NORMAL_RX_AND_TX_HIGH_DATARATE)
-    oce.add(
-        OpCode.UPDATE_DEFAULT_DATARATE_LOW_RATE, Info.UPDATE_DEFAULT_DATARATE_LOW_RATE
-    )
-    oce.add(
-        OpCode.UPDATE_DEFAULT_DATARATE_HIGH_RATE, Info.UPDATE_DEFAULT_DATARATE_HIGH_RATE
-    )
     oce.add(OpCode.HK_RX_REGS, Info.HK_RX_REGS)
     oce.add(OpCode.HK_TX_REGS, Info.HK_TX_REGS)
     oce.add(OpCode.TX_STATUS, Info.TX_STATUS)
@@ -188,24 +170,6 @@ def pack_syrlinks_command(
         normal_mode_cmd(
             q, Info.NORMAL_RX_AND_TX_HIGH_DATARATE, Submode.RX_AND_TX_HIGH_DATARATE
         )
-    if op_code == OpCode.UPDATE_DEFAULT_DATARATE_LOW_RATE:
-        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_LOW_RATE}")
-        q.add_pus_tc(
-            create_load_param_cmd(
-                pack_scalar_u8_parameter_app_data(
-                    obyt, 0, ParameterId.DATARATE, Datarate.LOW_RATE_MODULATION_BPSK
-                )
-            )
-        )
-    if op_code == OpCode.UPDATE_DEFAULT_DATARATE_HIGH_RATE:
-        q.add_log_cmd(f"{prefix}: {Info.UPDATE_DEFAULT_DATARATE_HIGH_RATE}")
-        q.add_pus_tc(
-            create_load_param_cmd(
-                pack_scalar_u8_parameter_app_data(
-                    obyt, 0, ParameterId.DATARATE, Datarate.HIGH_RATE_MODULATION_0QPSK
-                )
-            )
-        )
     if op_code in OpCode.NORMAL_RX_AND_TX_CW:
         normal_mode_cmd(q, Info.NORMAL_RX_AND_TX_CW, Submode.RX_AND_TX_CW)
     if op_code in OpCode.HK_RX_REGS:

eive_tmtc/tmtc/common.py

@@ -2,7 +2,7 @@ from typing import Union
 
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice
 from tmtccmd.util import ObjectIdU32
 
 

eive_tmtc/tmtc/payload/ploc_mpsoc.py

@@ -21,7 +21,7 @@ from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from eive_tmtc.utility.input_helper import InputHelper
-from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode
+from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode
 
 
 LOGGER = get_console_logger()

eive_tmtc/tmtc/payload/subsystem.py

@@ -9,7 +9,7 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
-from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservice
+from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice
 
 
 class OpCode(str, enum.Enum):

eive_tmtc/tmtc/tcs.py

@@ -8,7 +8,7 @@ from eive_tmtc.config.definitions import CustomServiceList
 from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Mode
+from tmtccmd.tc.pus_200_fsfw_mode import Mode
 from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
     generate_one_hk_command,

setup.cfg

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

tmtcc.py

@@ -73,6 +73,7 @@ from tmtccmd.tc import (
     TcProcedureType,
     TcQueueEntryType,
     DefaultPusQueueHelper,
+    QueueWrapper,
 )
 from tmtccmd.config import (
     default_json_path,
@@ -221,10 +222,11 @@ class TcHandler(TcHandlerBase):
         self.pus_raw_logger = raw_pus_logger
         self.gui = gui
         self.queue_helper = DefaultPusQueueHelper(
-            queue_wrapper=None,
-            pus_apid=PUS_APID,
+            queue_wrapper=QueueWrapper.empty(),
+            default_pus_apid=PUS_APID,
             seq_cnt_provider=seq_count_provider,
             pus_verificator=pus_verificator,
+            tc_sched_timestamp_len=4
         )
         self.cfdp_in_ccsds_wrapper = cfdp_in_ccsds_wrapper
 
@@ -247,12 +249,7 @@ class TcHandler(TcHandlerBase):
         if entry_helper.is_tc:
             if entry_helper.entry_type == TcQueueEntryType.PUS_TC:
                 pus_tc_wrapper = entry_helper.to_pus_tc_entry()
-                pus_tc_wrapper.pus_tc.seq_count = (
-                    self.seq_count_provider.get_and_increment()
-                )
-                pus_tc_wrapper.pus_tc.apid = PUS_APID
-                # Add TC after Sequence Count stamping
-                self.pus_verificator.add_tc(pus_tc_wrapper.pus_tc)
+                # pus_tc_wrapper.pus_tc.apid = PUS_APID
                 raw_tc = pus_tc_wrapper.pus_tc.pack()
                 self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc)
                 tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}"
@@ -338,15 +335,17 @@ def setup_params() -> SetupWrapper:
     parser_wrapper.create_default_parent_parser()
     parser_wrapper.create_default_parser()
     parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
-    post_arg_parsing_wrapper = parser_wrapper.parse(hook_obj)
+    post_arg_parsing_wrapper = parser_wrapper.parse(setup_params=params, hook_obj=hook_obj)
     tmtccmd.init_printout(post_arg_parsing_wrapper.use_gui)
     use_prompts = not post_arg_parsing_wrapper.use_gui
     proc_param_wrapper = ProcedureParamsWrapper()
     if use_prompts:
-        post_arg_parsing_wrapper.set_params_with_prompts(params, proc_param_wrapper)
+        post_arg_parsing_wrapper.set_params_with_prompts(proc_param_wrapper)
     else:
-        post_arg_parsing_wrapper.set_params_without_prompts(params, proc_param_wrapper)
+        post_arg_parsing_wrapper.set_params_without_prompts(proc_param_wrapper)
     params.apid = PUS_APID
+    if params.com_if is None:
+        raise ValueError("could not determine a COM interface.")
     setup_wrapper = SetupWrapper(
         hook_obj=hook_obj, setup_params=params, proc_param_wrapper=proc_param_wrapper
     )