tmtccmd refactoring

This commit is contained in:
2022-04-05 15:19:46 +02:00
parent e67eb6633e
commit 3c302bd4e8
5 changed files with 29 additions and 15 deletions

View File

@ -6,6 +6,7 @@
from tmtccmd.tm.service_8_fsfw_functional_cmd import Service8FsfwTm
from spacepackets.ecss.tm import PusTelemetry
from tmtccmd.logging import get_console_logger
from tmtccmd.logging.pus import log_pus_tm, log_unknown_packet, PacketTypes
from tmtccmd.pus.service_1_verification import Service1TMExtended
from tmtccmd.pus.service_17_test import Service17TMExtended
@ -32,6 +33,7 @@ def pus_factory_hook(raw_tm_packet: bytes, tmtc_printer: FsfwTmTcPrinter):
LOGGER.warning("Detected packet shorter than 8 bytes!")
return
service_type = raw_tm_packet[7]
subservice_type = raw_tm_packet[8]
tm_packet = None
try:
if service_type == 1:
@ -57,9 +59,11 @@ def pus_factory_hook(raw_tm_packet: bytes, tmtc_printer: FsfwTmTcPrinter):
tm_packet = PusTelemetry.unpack(raw_telemetry=raw_tm_packet)
tm_packet.print_source_data(PrintFormats.HEX)
LOGGER.info(f"Received packet with service {service_type}")
log_pus_tm(packet=raw_tm_packet, srv_subservice=(service_type, subservice_type))
# tmtc_printer.print_telemetry(
# packet_if=tm_packet, info_if=tm_packet, print_raw_tm=False
# )
except ValueError:
# TODO: Log faulty packet
LOGGER.warning("Invalid packet format detected")
log_unknown_packet(packet=raw_tm_packet, packet_type=PacketTypes.TM)