From f9f8f9481fe78aec60a4ad121a72d2011d18363f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 30 Aug 2023 11:04:05 +0200 Subject: [PATCH] hmm --- .run/CFDP Downlink Test.run.xml | 24 ++++++++++++++++++++++++ eive_tmtc/pus_tc/tc_handler.py | 4 ++-- pyproject.toml | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .run/CFDP Downlink Test.run.xml diff --git a/.run/CFDP Downlink Test.run.xml b/.run/CFDP Downlink Test.run.xml new file mode 100644 index 0000000..42f0a50 --- /dev/null +++ b/.run/CFDP Downlink Test.run.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/eive_tmtc/pus_tc/tc_handler.py b/eive_tmtc/pus_tc/tc_handler.py index 35df314..10fca86 100644 --- a/eive_tmtc/pus_tc/tc_handler.py +++ b/eive_tmtc/pus_tc/tc_handler.py @@ -10,6 +10,7 @@ from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure from tmtccmd import TcHandlerBase, ProcedureWrapper from tmtccmd.cfdp.defs import CfdpRequestType from tmtccmd.cfdp.handler import CfdpInCcsdsHandler +from tmtccmd.config import cfdp_put_req_params_to_procedure from tmtccmd.logging import get_current_time_string from tmtccmd.logging.pus import RawTmtcTimedLogWrapper from tmtccmd.tc import ( @@ -20,8 +21,7 @@ from tmtccmd.tc import ( SendCbParams, TcQueueEntryType, ) -from tmtccmd.config import ( - cfdp_put_req_params_to_procedure, +from tmtccmd.config.cfdp import ( cfdp_req_to_put_req_proxy_get_req, ) from spacepackets.ecss import PusVerificator diff --git a/pyproject.toml b/pyproject.toml index 3e613db..6fcf95e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ classifiers = [ dependencies = [ # "tmtccmd ~= 5.0", "python-dateutil ~= 2.8", - "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@cfdp-proxy-op-support" + "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main" ] [project.urls]