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

some cleaning up and some bugfixes
All checks were successful
EIVE/-/pipeline/pr-main This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2024-01-25 13:27:10 +01:00
parent f3eecfa8ac
commit 813f92f3d4
Signed by: muellerr
GPG Key ID: A649FB78196E3849
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eive_tmtc/pus_tm/hk_handler.py
View File

@ -75,9 +75,9 @@ def handle_hk_packet(
if named_obj_id in hk_filter.object_ids: if named_obj_id in hk_filter.object_ids:
handle_regular_hk_print( handle_regular_hk_print(
printer=printer, printer=printer,
packet_uuid=packet_uuid,
object_id=named_obj_id, object_id=named_obj_id,
hk_packet=tm_packet, hk_packet=tm_packet,
tm_packet=tm_packet.pus_tm,
hk_data=hk_data, hk_data=hk_data,
db=db_con, db=db_con,
) )

19
tmtcc.py
View File

@ -7,19 +7,20 @@ from pathlib import Path
from typing import Tuple from typing import Tuple
import tmtccmd import tmtccmd
from spacepackets.cfdp import (
ChecksumType,
TransmissionMode,
)
from spacepackets.ecss import PusVerificator
from spacepackets.version import get_version as get_sp_version
from tmtccmd import BackendBase
from cfdppy.handler import RemoteEntityCfgTable from cfdppy.handler import RemoteEntityCfgTable
from cfdppy.mib import ( from cfdppy.mib import (
IndicationCfg, IndicationCfg,
LocalEntityCfg, LocalEntityCfg,
RemoteEntityCfg, RemoteEntityCfg,
) )
from spacepackets.cfdp import (
ChecksumType,
TransmissionMode,
)
from spacepackets.ecss import PusVerificator
from spacepackets.seqcount import FileSeqCountProvider, PusFileSeqCountProvider
from spacepackets.version import get_version as get_sp_version
from tmtccmd import BackendBase
from tmtccmd.config import ( from tmtccmd.config import (
SetupWrapper, SetupWrapper,
default_json_path, default_json_path,
@ -41,10 +42,8 @@ from tmtccmd.logging.pus import (
) )
from tmtccmd.pus import VerificationWrapper from tmtccmd.pus import VerificationWrapper
from tmtccmd.tmtc import CcsdsTmHandler from tmtccmd.tmtc import CcsdsTmHandler
from spacepackets.seqcount import FileSeqCountProvider, PusFileSeqCountProvider
from eive_tmtc import APP_LOGGER from eive_tmtc import APP_LOGGER
from eive_tmtc.pus_tm.pus_handler import PusHandler, UnknownApidHandler
from eive_tmtc.cfdp.fault_handler import EiveCfdpFaultHandler from eive_tmtc.cfdp.fault_handler import EiveCfdpFaultHandler
from eive_tmtc.cfdp.handler import CfdpInCcsdsHandler from eive_tmtc.cfdp.handler import CfdpInCcsdsHandler
from eive_tmtc.cfdp.tm import CfdpInCcsdsWrapper from eive_tmtc.cfdp.tm import CfdpInCcsdsWrapper
@ -57,6 +56,7 @@ from eive_tmtc.config.definitions import (
) )
from eive_tmtc.config.hook import EiveHookObject from eive_tmtc.config.hook import EiveHookObject
from eive_tmtc.pus_tc.tc_handler import TcHandler from eive_tmtc.pus_tc.tc_handler import TcHandler
from eive_tmtc.pus_tm.pus_handler import PusHandler, UnknownApidHandler
_LOGGER = APP_LOGGER _LOGGER = APP_LOGGER
_LOG_LEVEL = logging.INFO _LOG_LEVEL = logging.INFO
@ -172,6 +172,7 @@ def setup_tmtc_handlers(
ccsds_handler.add_apid_handler(pus_handler) ccsds_handler.add_apid_handler(pus_handler)
ccsds_handler.add_apid_handler(cfdp_in_ccsds_wrapper) ccsds_handler.add_apid_handler(cfdp_in_ccsds_wrapper)
seq_count_provider = PusFileSeqCountProvider() seq_count_provider = PusFileSeqCountProvider()
assert printer.file_logger is not None
tc_handler = TcHandler( tc_handler = TcHandler(
seq_count_provider=seq_count_provider, seq_count_provider=seq_count_provider,
pus_verificator=verificator, pus_verificator=verificator,