eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

bump tmtccmd

Browse Source
This commit is contained in:
Robin Müller 2023-01-30 14:31:38 +01:00
parent 63d7f577b1
commit ece20bf177
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eive_tmtc/config/definitions.py
View File

@ -17,8 +17,8 @@ CFDP_APID = 0x66
PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID) PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID)
CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID) CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID)
SPACE_PACKET_IDS = ( SPACE_PACKET_IDS = (
PUS_PACKET_ID.raw(), PUS_PACKET_ID,
CFDP_PACKET_ID.raw(), CFDP_PACKET_ID,
) )
CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1) CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1)

2
eive_tmtc/config/hook.py
View File

@ -18,7 +18,7 @@ class EiveHookObject(TmTcCfgHookBase):
return get_eive_service_op_code_dict() return get_eive_service_op_code_dict()
def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]: 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_default,
create_com_interface_cfg_default, create_com_interface_cfg_default,
) )

2
setup.cfg
View File

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

14
tmtcc.py
View File

@ -72,7 +72,7 @@ from tmtccmd.tc import (
FeedWrapper, FeedWrapper,
TcProcedureType, TcProcedureType,
TcQueueEntryType, TcQueueEntryType,
DefaultPusQueueHelper, DefaultPusQueueHelper, QueueWrapper,
) )
from tmtccmd.config import ( from tmtccmd.config import (
default_json_path, default_json_path,
@ -221,8 +221,9 @@ class TcHandler(TcHandlerBase):
self.pus_raw_logger = raw_pus_logger self.pus_raw_logger = raw_pus_logger
self.gui = gui self.gui = gui
self.queue_helper = DefaultPusQueueHelper( self.queue_helper = DefaultPusQueueHelper(
queue_wrapper=None, queue_wrapper=QueueWrapper.empty(),
pus_apid=PUS_APID, tc_sched_timestamp_len=4,
default_pus_apid=PUS_APID,
seq_cnt_provider=seq_count_provider, seq_cnt_provider=seq_count_provider,
pus_verificator=pus_verificator, pus_verificator=pus_verificator,
) )
@ -247,12 +248,7 @@ class TcHandler(TcHandlerBase):
if entry_helper.is_tc: if entry_helper.is_tc:
if entry_helper.entry_type == TcQueueEntryType.PUS_TC: if entry_helper.entry_type == TcQueueEntryType.PUS_TC:
pus_tc_wrapper = entry_helper.to_pus_tc_entry() pus_tc_wrapper = entry_helper.to_pus_tc_entry()
pus_tc_wrapper.pus_tc.seq_count = ( # pus_tc_wrapper.pus_tc.apid = PUS_APID
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)
raw_tc = pus_tc_wrapper.pus_tc.pack() raw_tc = pus_tc_wrapper.pus_tc.pack()
self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc) self.pus_raw_logger.log_tc(pus_tc_wrapper.pus_tc)
tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}" tc_info_string = f"Sent {pus_tc_wrapper.pus_tc}"