eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 2 Projects Releases 97 Wiki Activity

some TM packet names changed

Browse Source
This commit is contained in:
Robin Müller 2022-03-02 10:09:57 +01:00
parent 9fff4a90bc
commit 06a3636866
No known key found for this signature in database
GPG Key ID: 71B58F8A3CDFA9AC
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pus_tm/factory_hook.py
View File

@ -3,17 +3,16 @@
@details Template configuration file. Copy this folder to the TMTC commander root and adapt @details Template configuration file. Copy this folder to the TMTC commander root and adapt
it to your needs. it to your needs.
""" """
from tmtccmd.tm.service_8_functional_cmd import Service8TM from tmtccmd.tm.service_8_fsfw_functional_cmd import Service8FsfwTm
from spacepackets.ecss.tm import PusTelemetry from spacepackets.ecss.tm import PusTelemetry
from tmtccmd.utility.logger import get_console_logger from tmtccmd.utility.logger import get_console_logger
from tmtccmd.pus.service_1_verification import Service1TMExtended from tmtccmd.pus.service_1_verification import Service1TMExtended
from tmtccmd.pus.service_17_test import Service17TMExtended from tmtccmd.pus.service_17_test import Service17TMExtended
from tmtccmd.tm.service_3_housekeeping import Service3TM from tmtccmd.tm.service_3_fsfw_housekeeping import Service3FsfwTm
from tmtccmd.tm.service_200_mode import Service200TM from tmtccmd.tm.service_20_fsfw_parameters import Service20FsfwTm
from tmtccmd.tm.service_20_parameters import Service20TM from tmtccmd.tm.service_5_event import Service5Tm
from tmtccmd.tm.service_5_event import Service5TM from tmtccmd.tm.service_200_mode import Service200Tm
from tmtccmd.tm.service_200_mode import Service200TM
from tmtccmd.utility.tmtc_printer import TmTcPrinter, PrintFormats from tmtccmd.utility.tmtc_printer import TmTcPrinter, PrintFormats
from config.definitions import PUS_APID from config.definitions import PUS_APID
@ -38,19 +37,19 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
if service_type == 1: if service_type == 1:
tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm_packet) tm_packet = Service1TMExtended.unpack(raw_telemetry=raw_tm_packet)
if service_type == 3: if service_type == 3:
tm_packet = Service3TM.unpack( tm_packet = Service3FsfwTm.unpack(
raw_telemetry=raw_tm_packet, custom_hk_handling=False raw_telemetry=raw_tm_packet, custom_hk_handling=False
) )
if service_type == 5: if service_type == 5:
tm_packet = Service5TM.unpack(raw_telemetry=raw_tm_packet) tm_packet = Service5Tm.unpack(raw_telemetry=raw_tm_packet)
if service_type == 8: if service_type == 8:
tm_packet = Service8TM.unpack(raw_telemetry=raw_tm_packet) tm_packet = Service8FsfwTm.unpack(raw_telemetry=raw_tm_packet)
if service_type == 17: if service_type == 17:
tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet) tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet)
if service_type == 20: if service_type == 20:
tm_packet = Service20TM.unpack(raw_telemetry=raw_tm_packet) tm_packet = Service20FsfwTm.unpack(raw_telemetry=raw_tm_packet)
if service_type == 200: if service_type == 200:
tm_packet = Service200TM.unpack(raw_telemetry=raw_tm_packet) tm_packet = Service200Tm.unpack(raw_telemetry=raw_tm_packet)
if tm_packet is None: if tm_packet is None:
LOGGER.info( LOGGER.info(
f"The service {service_type} is not implemented in Telemetry Factory" f"The service {service_type} is not implemented in Telemetry Factory"

2
pus_tm/hk_handling.py
View File

@ -4,7 +4,7 @@ import os
import datetime import datetime
from tmtccmd.config.definitions import HkReplyUnpacked from tmtccmd.config.definitions import HkReplyUnpacked
from tmtccmd.tm.service_3_housekeeping import Service3Base from tmtccmd.tm.service_3_fsfw_housekeeping import Service3Base
from tmtccmd.utility.logger import get_console_logger from tmtccmd.utility.logger import get_console_logger
from pus_tc.bpx_batt import BpxSetIds from pus_tc.bpx_batt import BpxSetIds
from pus_tc.syrlinks_hk_handler import SetIds from pus_tc.syrlinks_hk_handler import SetIds

2
tmtccmd

@ -1 +1 @@
Subproject commit efa1e6636e3577579564ce496b66136a009bfa94 Subproject commit 027225b83a86123d23e16966fe0d3881e7ee8d64