From c251d2b3c8eeb632c4f2ce5f3dc88ff23129caf7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 9 Sep 2022 14:30:27 +0200 Subject: [PATCH] wrap up module moving --- tmtc/common_tmtc | 2 +- tmtc/deps/spacepackets | 2 +- tmtc/tmtcc.py | 32 ++------------------------------ 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc index b1b19f9..af8dccb 160000 --- a/tmtc/common_tmtc +++ b/tmtc/common_tmtc @@ -1 +1 @@ -Subproject commit b1b19f9cba8d51457b4343b4a244753376c8bec0 +Subproject commit af8dccb56b7a94681f75f822b5f6a8d9fad498ba diff --git a/tmtc/deps/spacepackets b/tmtc/deps/spacepackets index 6da0217..af5f0eb 160000 --- a/tmtc/deps/spacepackets +++ b/tmtc/deps/spacepackets @@ -1 +1 @@ -Subproject commit 6da02173f1ca0b58c704d25ed332808e693a87be +Subproject commit af5f0ebb5555a9fb936f735179d4e70280312ce5 diff --git a/tmtc/tmtcc.py b/tmtc/tmtcc.py index a0d02b0..2b47123 100755 --- a/tmtc/tmtcc.py +++ b/tmtc/tmtcc.py @@ -2,39 +2,12 @@ """TMTC commander for FSFW Example""" import sys import time -from pathlib import Path -from typing import Sequence, Optional - -from spacepackets import SpacePacket, SpacePacketHeader, PacketTypes -from spacepackets.cfdp import ConditionCode, TransmissionModes, PduType, DirectiveType -from spacepackets.cfdp.pdu import AbstractFileDirectiveBase, PduHolder, PduFactory -from spacepackets.cfdp.pdu.helper import GenericPduPacket from spacepackets.ecss import PusVerificator import tmtccmd -from common_tmtc.common import ( - setup_params, - setup_tmtc_handlers, - setup_backend, - EXAMPLE_APID, -) +from common_tmtc.common import setup_params, setup_tmtc_handlers, setup_backend from config.hook import FsfwHookBase -from spacepackets.util import UnsignedByteField from tmtccmd import get_console_logger -from tmtccmd.cfdp import ( - LocalEntityCfg, - CfdpUserBase, - TransactionId, - RemoteEntityCfg, - RemoteEntityCfgTable, - HostFilestore, -) -from tmtccmd.cfdp.request import PutRequestCfg, PutRequest -from tmtccmd.cfdp.user import ( - FileSegmentRecvdParams, - MetadataRecvParams, - TransactionFinishedParams, -) from tmtccmd.core import BackendRequest from tmtccmd.logging.pus import ( RegularTmtcLogWrapper, @@ -42,9 +15,8 @@ from tmtccmd.logging.pus import ( TimedLogWhen, ) from tmtccmd.pus import VerificationWrapper -from tmtccmd.util import ProvidesSeqCount from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -from tmtccmd.cfdp.handler import DestHandler, SourceHandler + LOGGER = get_console_logger()