From ec9a042f090ca84d13f8b6eb5a045fbba8f4cb32 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 10 Apr 2024 15:39:53 +0200 Subject: [PATCH] fixes for pyclient APID --- pytmtc/common.py | 7 ++----- pytmtc/main.py | 7 +++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pytmtc/common.py b/pytmtc/common.py index 6f56604..56b469f 100644 --- a/pytmtc/common.py +++ b/pytmtc/common.py @@ -5,11 +5,8 @@ import enum import struct -class Apid(enum.IntEnum): - SCHED = 1 - GENERIC_PUS = 2 - ACS = 3 - CFDP = 4 +EXPERIMENT_ID = 278 +EXPERIMENT_APID = 1024 + EXPERIMENT_ID class EventSeverity(enum.IntEnum): diff --git a/pytmtc/main.py b/pytmtc/main.py index a3e0caf..9fe494c 100755 --- a/pytmtc/main.py +++ b/pytmtc/main.py @@ -47,7 +47,7 @@ from tmtccmd.util.obj_id import ObjectIdDictT import pus_tc -from common import Apid, EventU32 +from common import EXPERIMENT_APID, EventU32 _LOGGER = logging.getLogger() @@ -64,8 +64,7 @@ class SatRsConfigHook(HookBase): assert self.cfg_path is not None packet_id_list = [] - for apid in Apid: - packet_id_list.append(PacketId(PacketType.TM, True, apid)) + packet_id_list.append(PacketId(PacketType.TM, True, EXPERIMENT_APID)) cfg = create_com_interface_cfg_default( com_if_key=com_if_key, json_cfg_path=self.cfg_path, @@ -181,7 +180,7 @@ class TcHandler(TcHandlerBase): tc_sched_timestamp_len=CdsShortTimestamp.TIMESTAMP_SIZE, seq_cnt_provider=seq_count_provider, pus_verificator=self.verif_wrapper.pus_verificator, - default_pus_apid=None, + default_pus_apid=EXPERIMENT_APID, ) def send_cb(self, send_params: SendCbParams):