diff --git a/tm/obsw_pus_tm_base.py b/tm/obsw_pus_tm_base.py index 9a5e0e3c17cc6ee79d72eeee57e8b2d27294a1b9..37b50e60c26c03e96715e971d1a4000b5aae09be 100644 --- a/tm/obsw_pus_tm_base.py +++ b/tm/obsw_pus_tm_base.py @@ -55,7 +55,8 @@ class PusTelemetry: return self._data_field_header: Final = PusPacketDataFieldHeader(raw_telemetry[6:]) self._tm_data: Final = raw_telemetry[PusPacketDataFieldHeader.DATA_HEADER_SIZE + - PusTelemetry.PUS_HEADER_SIZE:len(raw_telemetry) - 2] + PusTelemetry.PUS_HEADER_SIZE + 1: + len(raw_telemetry) - 2] self._crc: Final = raw_telemetry[len(raw_telemetry) - 2] << 8 | \ raw_telemetry[len(raw_telemetry) - 1] self.print_info = "" @@ -377,7 +378,7 @@ class PusTelemetryTimestamp: # # ------------------------------------------------Packet Data Field------------------------------------------------- | # ---------------------------------Data Field Header ---------------------------|AppData|Spare| PacketErrCtr | -# CCSDS(1)|TC PUS Ver.(3)|Ack(4)|SrvType (8)|SrvSubtype(8)|Source ID(o)|Spare(o)| (var)|(var)| (16) | +# CCSDS(1)|TM PUS Ver.(3)|Ack(4)|SrvType (8)|SrvSubtype(8)| Time (o) |Spare(o)| (var)|(var)| (16) | # 0x11 (0x1F) | 0x11 | 0x01 | | | | | Calc. | Calc. | # 0 001 1111 |00010001 | 00000001 | | | | | | | # 0 1 1111 | 17 | 2 | | | | | | | diff --git a/tm/obsw_tm_service_1.py b/tm/obsw_tm_service_1.py index 30883014af7445a4c8677e1b12f9b751371e683a..b856d398df5126d9f921ccd48cfcdfbf85af5fdf 100644 --- a/tm/obsw_tm_service_1.py +++ b/tm/obsw_tm_service_1.py @@ -10,7 +10,9 @@ from typing import Dict from tm.obsw_pus_tm_base import PusTelemetry, TmDictionaryKeys from tm.obsw_pus_tm_creator import PusTelemetryCreator +from utility.obsw_logger import get_logger +LOGGER = get_logger() pusPacketInfoService1T = Dict[TmDictionaryKeys, any]