eive/eive-tmtc
eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity

CFDP file downlink #233

Merged
muellerr merged 35 commits from cfdp-file-downlink into main 2023-09-14 11:44:23 +02:00
Conversation 1 Commits 35 Files Changed 12 +20 -6
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 14b558b7f7 - Show all commits

22
eive_tmtc/pus_tc/tc_handler.py
View File

@ -1,7 +1,11 @@
import logging import logging
from typing import cast from typing import cast
from eive_tmtc.config.definitions import CFDP_REMOTE_ENTITY_ID, PUS_APID from eive_tmtc.config.definitions import (
CFDP_REMOTE_ENTITY_ID,
PUS_APID,
CFDP_LOCAL_ENTITY_ID,
)
from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure
from tmtcc import CfdpInCcsdsWrapper from tmtcc import CfdpInCcsdsWrapper
from tmtccmd import TcHandlerBase, ProcedureWrapper from tmtccmd import TcHandlerBase, ProcedureWrapper
@ -16,6 +20,10 @@ from tmtccmd.tc import (
SendCbParams, SendCbParams,
TcQueueEntryType, TcQueueEntryType,
) )
from tmtccmd.config import (
cfdp_put_req_params_to_procedure,
cfdp_req_to_put_req_proxy_get_req,
)
from spacepackets.ecss import PusVerificator from spacepackets.ecss import PusVerificator
from tmtccmd.util import FileSeqCountProvider from tmtccmd.util import FileSeqCountProvider
from spacepackets.cfdp import PduHolder, DirectiveType from spacepackets.cfdp import PduHolder, DirectiveType
@ -36,7 +44,6 @@ class TcHandler(TcHandlerBase):
): ):
super().__init__() super().__init__()
self.cfdp_handler_started = False self.cfdp_handler_started = False
self.cfdp_dest_id = CFDP_REMOTE_ENTITY_ID
self.seq_count_provider = seq_count_provider self.seq_count_provider = seq_count_provider
self.pus_verificator = pus_verificator self.pus_verificator = pus_verificator
self.high_level_file_logger = high_level_file_logger self.high_level_file_logger = high_level_file_logger
@ -104,8 +111,15 @@ class TcHandler(TcHandlerBase):
not self.cfdp_in_ccsds_wrapper.handler.put_request_pending() not self.cfdp_in_ccsds_wrapper.handler.put_request_pending()
and not self.cfdp_handler_started and not self.cfdp_handler_started
): ):
put_req = cfdp_procedure.request_wrapper.to_put_request() put_req_cfg_wrapper = cfdp_procedure.request_wrapper.to_put_request()
put_req.cfg.destination_id = self.cfdp_dest_id if put_req_cfg_wrapper.cfg.proxy_op:
put_req = cfdp_req_to_put_req_proxy_get_req(
put_req_cfg_wrapper.cfg,
CFDP_REMOTE_ENTITY_ID,
CFDP_LOCAL_ENTITY_ID,
)
else:
put_req = cfdp_put_req_params_to_procedure(put_req_cfg_wrapper.cfg)
_LOGGER.info( _LOGGER.info(
f"CFDP: Starting file put request with parameters:\n{put_req}" f"CFDP: Starting file put request with parameters:\n{put_req}"
) )

4
pyproject.toml
View File

@ -29,9 +29,9 @@ classifiers = [
"Topic :: Scientific/Engineering" "Topic :: Scientific/Engineering"
] ]
dependencies = [ dependencies = [
"tmtccmd ~= 5.0", # "tmtccmd ~= 5.0",
"python-dateutil ~= 2.8", "python-dateutil ~= 2.8",
# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@1b110d321ef85#egg=tmtccmd" "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@#egg=cfdp-proxy-op-support"
] ]
[project.urls] [project.urls]