rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 22 Wiki Activity

update pyclient

Browse Source
This commit is contained in:
Robin Müller 2023-07-02 17:47:47 +02:00
parent ac4f8a9dd9
commit 4032839d50
Signed by: muellerr
GPG Key ID: A649FB78196E3849
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
satrs-example/pyclient/main.py
View File

@ -1,7 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
"""Example client for the sat-rs example application""" """Example client for the sat-rs example application"""
import logging import logging
import struct
import sys import sys
import time import time
from typing import Optional from typing import Optional
@ -43,13 +42,12 @@ from tmtccmd.tc import (
from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider
from tmtccmd.util.obj_id import ObjectIdDictT from tmtccmd.util.obj_id import ObjectIdDictT
from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
import pus_tc import pus_tc
import tc_definitions import tc_definitions
from common import EXAMPLE_PUS_APID, EventSeverity, EventU32 from common import EXAMPLE_PUS_APID, EventU32
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger()
class SatRsConfigHook(HookBase): class SatRsConfigHook(HookBase):
@ -85,12 +83,12 @@ class SatRsConfigHook(HookBase):
class PusHandler(SpecificApidHandlerBase): class PusHandler(SpecificApidHandlerBase):
def __init__( def __init__(
self, self,
file_logger: logging.Logger,
verif_wrapper: VerificationWrapper, verif_wrapper: VerificationWrapper,
printer: FsfwTmTcPrinter,
raw_logger: RawTmtcTimedLogWrapper, raw_logger: RawTmtcTimedLogWrapper,
): ):
super().__init__(EXAMPLE_PUS_APID, None) super().__init__(EXAMPLE_PUS_APID, None)
self.printer = printer self.file_logger = file_logger
self.raw_logger = raw_logger self.raw_logger = raw_logger
self.verif_wrapper = verif_wrapper self.verif_wrapper = verif_wrapper
@ -146,10 +144,10 @@ class PusHandler(SpecificApidHandlerBase):
) )
dedicated_handler = True dedicated_handler = True
if tm_packet.subservice == 2: if tm_packet.subservice == 2:
self.printer.file_logger.info("Received Ping Reply TM[17,2]") self.file_logger.info("Received Ping Reply TM[17,2]")
_LOGGER.info("Received Ping Reply TM[17,2]") _LOGGER.info("Received Ping Reply TM[17,2]")
else: else:
self.printer.file_logger.info( self.file_logger.info(
f"Received Test Packet with unknown subservice {tm_packet.subservice}" f"Received Test Packet with unknown subservice {tm_packet.subservice}"
) )
_LOGGER.info( _LOGGER.info(
@ -236,14 +234,12 @@ def main():
) )
# Create console logger helper and file loggers # Create console logger helper and file loggers
tmtc_logger = RegularTmtcLogWrapper() tmtc_logger = RegularTmtcLogWrapper()
printer = FsfwTmTcPrinter(tmtc_logger.logger) file_logger = tmtc_logger.logger
raw_logger = RawTmtcTimedLogWrapper(when=TimedLogWhen.PER_HOUR, interval=1) raw_logger = RawTmtcTimedLogWrapper(when=TimedLogWhen.PER_HOUR, interval=1)
verificator = PusVerificator() verificator = PusVerificator()
verification_wrapper = VerificationWrapper( verification_wrapper = VerificationWrapper(verificator, _LOGGER, file_logger)
verificator, _LOGGER, printer.file_logger
)
# Create primary TM handler and add it to the CCSDS Packet Handler # Create primary TM handler and add it to the CCSDS Packet Handler
tm_handler = PusHandler(verification_wrapper, printer, raw_logger) tm_handler = PusHandler(file_logger, verification_wrapper, raw_logger)
ccsds_handler = CcsdsTmHandler(generic_handler=None) ccsds_handler = CcsdsTmHandler(generic_handler=None)
ccsds_handler.add_apid_handler(tm_handler) ccsds_handler.add_apid_handler(tm_handler)

2
satrs-example/pyclient/requirements.txt
View File

@ -1,2 +1,2 @@
tmtccmd == 4.0.0rc0 tmtccmd == 5.0.0rc0
# -e git+https://github.com/robamu-org/tmtccmd@97e5e51101a08b21472b3ddecc2063359f7e307a#egg=tmtccmd # -e git+https://github.com/robamu-org/tmtccmd@97e5e51101a08b21472b3ddecc2063359f7e307a#egg=tmtccmd