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

continuing printout handling refactoring

Browse Source
This commit is contained in:
Robin Müller
2022-04-05 17:39:51 +02:00
parent 5896ecad07
commit 2c58a77338
3 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pus_tm/factory_hook.py
View File

@ -21,6 +21,7 @@ from tmtccmd.tm.service_200_fsfw_mode import Service200FsfwTm
from tmtccmd.utility.tmtc_printer import PrintFormats, FsfwTmTcPrinter
from config.definitions import PUS_APID
from config.object_ids import get_object_ids
from .event_handler import handle_event_packet
from .verification_handler import handle_service_1_packet
from .hk_handling import handle_hk_packet
@ -44,6 +45,7 @@ def pus_factory_hook(raw_tm_packet: bytes):
subservice_type = raw_tm_packet[8]
tm_packet = None
file_logger = FSFW_PRINTER.file_logger
obj_id_dict = get_object_ids()
try:
if service_type == 1:
handle_service_1_packet(printer=FSFW_PRINTER, raw_tm=raw_tm_packet)
@ -51,7 +53,15 @@ def pus_factory_hook(raw_tm_packet: bytes):
tm_packet = Service3FsfwTm.unpack(
raw_telemetry=raw_tm_packet, custom_hk_handling=False
)
handle_hk_packet(hk_packet=tm_packet, packet_if=tm_packet)
named_obj_id = obj_id_dict.get(tm_packet.object_id.as_bytes)
if named_obj_id is None:
named_obj_id = tm_packet.object_id
handle_hk_packet(
printer=FSFW_PRINTER,
object_id=named_obj_id,
hk_packet=tm_packet,
packet_if=tm_packet
)
elif service_type == 5:
tm_packet = Service5Tm.unpack(raw_telemetry=raw_tm_packet)
handle_event_packet(file_logger=file_logger, tm=tm_packet)