bump tmtccmd again
All checks were successful
EIVE/-/pipeline/pr-v6.0.0-dev This commit looks good

This commit is contained in:
Robin Müller 2024-01-24 17:59:16 +01:00
parent d53e9d61b0
commit db70b33bd6
Signed by: muellerr
GPG Key ID: A649FB78196E3849
8 changed files with 44 additions and 35 deletions

View File

@ -1,20 +1,28 @@
import logging import logging
from spacepackets.cfdp import ConditionCode from spacepackets.cfdp import ConditionCode, TransactionId
from tmtccmd.cfdp.mib import DefaultFaultHandlerBase from cfdppy.mib import DefaultFaultHandlerBase
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
class EiveCfdpFaultHandler(DefaultFaultHandlerBase): class EiveCfdpFaultHandler(DefaultFaultHandlerBase):
def notice_of_suspension_cb(self, cond: ConditionCode): def notice_of_suspension_cb(
self, transaction_id: TransactionId, cond: ConditionCode, progress: int
):
_LOGGER.info(f"Received notice of suspension: {cond!r}") _LOGGER.info(f"Received notice of suspension: {cond!r}")
def notice_of_cancellation_cb(self, cond: ConditionCode): def notice_of_cancellation_cb(
self, transaction_id: TransactionId, cond: ConditionCode, progress: int
):
_LOGGER.info(f"Received notice of cancellation: {cond!r}") _LOGGER.info(f"Received notice of cancellation: {cond!r}")
def abandoned_cb(self, cond: ConditionCode): def abandoned_cb(
self, transaction_id: TransactionId, cond: ConditionCode, progress: int
):
_LOGGER.info(f"Abandoned transaction: {cond!r}") _LOGGER.info(f"Abandoned transaction: {cond!r}")
def ignore_cb(self, cond: ConditionCode): def ignore_cb(
self, transaction_id: TransactionId, cond: ConditionCode, progress: int
):
_LOGGER.info(f"Ignored transaction: {cond!r}") _LOGGER.info(f"Ignored transaction: {cond!r}")

View File

@ -5,22 +5,22 @@ import deprecation
from spacepackets import PacketType, SpacePacket, SpacePacketHeader from spacepackets import PacketType, SpacePacket, SpacePacketHeader
from spacepackets.cfdp import GenericPduPacket, PduFactory from spacepackets.cfdp import GenericPduPacket, PduFactory
from spacepackets.cfdp.pdu import PduHolder from spacepackets.cfdp.pdu import PduHolder
from tmtccmd.cfdp import ( from cfdppy import (
CfdpUserBase, CfdpUserBase,
LocalEntityCfg, LocalEntityCfg,
RemoteEntityCfgTable, RemoteEntityCfgTable,
) )
from tmtccmd.cfdp.defs import CfdpState from cfdppy.defs import CfdpState
from tmtccmd.cfdp.handler import ( from cfdppy.handler import (
DestHandler, DestHandler,
DestStateWrapper, DestStateWrapper,
SourceHandler, SourceHandler,
SourceStateWrapper, SourceStateWrapper,
) )
from tmtccmd.cfdp.handler.common import PacketDestination, get_packet_destination from cfdppy.handler.common import PacketDestination, get_packet_destination
from tmtccmd.cfdp.mib import CheckTimerProvider from cfdppy.mib import CheckTimerProvider
from tmtccmd.cfdp.request import PutRequest from cfdppy.request import PutRequest
from tmtccmd.util import ProvidesSeqCount from spacepackets.seqcount import ProvidesSeqCount
from tmtccmd.version import get_version from tmtccmd.version import get_version

View File

@ -3,12 +3,13 @@ import logging
from spacepackets.cfdp import ConditionCode from spacepackets.cfdp import ConditionCode
from spacepackets.util import UnsignedByteField from spacepackets.util import UnsignedByteField
from tmtccmd.cfdp import CfdpUserBase, TransactionId from cfdppy import CfdpUserBase, TransactionId
from tmtccmd.cfdp.mib import CheckTimerProvider, Countdown, EntityType from cfdppy.mib import CheckTimerProvider, Countdown, EntityType
from tmtccmd.cfdp.user import ( from cfdppy.user import (
TransactionFinishedParams, TransactionFinishedParams,
MetadataRecvParams, MetadataRecvParams,
FileSegmentRecvdParams, FileSegmentRecvdParams,
TransactionParams,
) )
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
@ -25,17 +26,22 @@ class EiveCheckTimerProvider(CheckTimerProvider):
class EiveCfdpUser(CfdpUserBase): class EiveCfdpUser(CfdpUserBase):
def transaction_indication(self, transaction_id: TransactionId): def transaction_indication(
_LOGGER.info(f"CFDP User: Start of File {transaction_id}") self,
transaction_indication_params: TransactionParams,
):
_LOGGER.info(
f"CFDP User: Start of File {transaction_indication_params.transaction_id}"
)
def eof_sent_indication(self, transaction_id: TransactionId): def eof_sent_indication(self, transaction_id: TransactionId):
_LOGGER.info(f"CFDP User: EOF sent for {transaction_id}") _LOGGER.info(f"CFDP User: EOF sent for {transaction_id}")
def transaction_finished_indication(self, params: TransactionFinishedParams): def transaction_finished_indication(self, params: TransactionFinishedParams):
_LOGGER.info(f"CFDP User: {params.transaction_id} finished") _LOGGER.info(f"CFDP User: {params.transaction_id} finished")
_LOGGER.info(f"Delivery Code: {params.delivery_code!r}") _LOGGER.info(f"Delivery Code: {params.finished_params.delivery_code!r}")
_LOGGER.info(f"Condition code: {params.condition_code!r}") _LOGGER.info(f"Condition code: {params.finished_params.condition_code!r}")
_LOGGER.info(f"File delivery status: {params.delivery_code!r}") _LOGGER.info(f"File delivery status: {params.finished_params.delivery_code!r}")
def metadata_recv_indication(self, params: MetadataRecvParams): def metadata_recv_indication(self, params: MetadataRecvParams):
pass pass

View File

@ -9,7 +9,7 @@ from eive_tmtc.config.definitions import (
from eive_tmtc.pus_tc.cmd_demux import handle_pus_procedure from eive_tmtc.pus_tc.cmd_demux import handle_pus_procedure
from eive_tmtc.cfdp.handler import CfdpInCcsdsHandler from eive_tmtc.cfdp.handler import CfdpInCcsdsHandler
from tmtccmd import TcHandlerBase, ProcedureWrapper from tmtccmd import TcHandlerBase, ProcedureWrapper
from tmtccmd.cfdp.defs import CfdpRequestType from cfdppy.defs import CfdpRequestType
from tmtccmd.logging import get_current_time_string from tmtccmd.logging import get_current_time_string
from tmtccmd.logging.pus import RawTmtcTimedLogWrapper from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
from tmtccmd.tmtc import ( from tmtccmd.tmtc import (
@ -22,7 +22,7 @@ from tmtccmd.tmtc import (
) )
from tmtccmd.config.cfdp import generic_cfdp_params_to_put_request from tmtccmd.config.cfdp import generic_cfdp_params_to_put_request
from spacepackets.ecss import PusVerificator from spacepackets.ecss import PusVerificator
from tmtccmd.util import FileSeqCountProvider from spacepackets.seqcount import FileSeqCountProvider
from spacepackets.cfdp import PduHolder, DirectiveType from spacepackets.cfdp import PduHolder, DirectiveType

View File

@ -21,9 +21,9 @@ from eive_tmtc.tmtc.com.syrlinks_handler import handle_syrlinks_hk_data
from eive_tmtc.tmtc.tcs import handle_thermal_controller_hk_data from eive_tmtc.tmtc.tcs import handle_thermal_controller_hk_data
from eive_tmtc.tmtc.tcs.tmp1075 import handle_tmp_1075_hk_data from eive_tmtc.tmtc.tcs.tmp1075 import handle_tmp_1075_hk_data
from tmtccmd.pus.tm.s3_fsfw_hk import ( from tmtccmd.pus.tm.s3_fsfw_hk import (
HkContentType,
Service3FsfwTm, Service3FsfwTm,
) )
from tmtccmd.pus.tm.s3_hk_base import HkContentType
from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT
from eive_tmtc.tmtc.power.bpx_batt import handle_bpx_hk_data from eive_tmtc.tmtc.power.bpx_batt import handle_bpx_hk_data

View File

@ -17,17 +17,10 @@ from tmtccmd.pus.s20_fsfw_param import (
) )
from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider
from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
from tmtccmd.pus.s8_fsfw_action import create_action_cmd
from tmtccmd.pus.s11_tc_sched import ( from tmtccmd.pus.s11_tc_sched import (
create_enable_tc_sched_cmd, create_enable_tc_sched_cmd,
create_disable_tc_sched_cmd, create_disable_tc_sched_cmd,
) )
from tmtccmd.pus.s20_fsfw_param import (
create_load_param_cmd,
create_scalar_u8_parameter,
)
from tmtccmd.pus.tc.s3_fsfw_hk import generate_one_hk_command, make_sid
from tmtccmd.tmtc import DefaultPusQueueHelper
from eive_tmtc.config.definitions import CustomServiceList from eive_tmtc.config.definitions import CustomServiceList
from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
@ -165,6 +158,7 @@ class Info:
RWD_RESET_REBOOT_COUNTER_00 = "Reset reboot counter 0 0" RWD_RESET_REBOOT_COUNTER_00 = "Reset reboot counter 0 0"
RWD_RESET_REBOOT_COUNTER_01 = "Reset reboot counter 0 0" RWD_RESET_REBOOT_COUNTER_01 = "Reset reboot counter 0 0"
RWD_RESET_REBOOT_COUNTER_10 = "Reset reboot counter 1 0" RWD_RESET_REBOOT_COUNTER_10 = "Reset reboot counter 1 0"
GET_HK = "Get HK set"
RWD_RESET_REBOOT_COUNTER_11 = "Reset reboot counter 1 1" RWD_RESET_REBOOT_COUNTER_11 = "Reset reboot counter 1 1"
RWD_SET_MAX_REBOOT_CNT = "rwd_max_cnt" RWD_SET_MAX_REBOOT_CNT = "rwd_max_cnt"
AUTO_SWITCH_ENABLE = "Enable Auto-Switch Feature with a specific target image" AUTO_SWITCH_ENABLE = "Enable Auto-Switch Feature with a specific target image"

View File

@ -29,7 +29,8 @@ classifiers = [
"Topic :: Scientific/Engineering" "Topic :: Scientific/Engineering"
] ]
dependencies = [ dependencies = [
"tmtccmd ~= 8.0.0rc0", "tmtccmd ~= 8.0.0rc1",
"cfdp-py~=0.1.0",
# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main", # "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main",
"python-dateutil ~= 2.8", "python-dateutil ~= 2.8",
] ]

View File

@ -14,8 +14,8 @@ from spacepackets.cfdp import (
from spacepackets.ecss import PusVerificator from spacepackets.ecss import PusVerificator
from spacepackets.version import get_version as get_sp_version from spacepackets.version import get_version as get_sp_version
from tmtccmd import BackendBase from tmtccmd import BackendBase
from tmtccmd.cfdp.handler import RemoteEntityCfgTable from cfdppy.handler import RemoteEntityCfgTable
from tmtccmd.cfdp.mib import ( from cfdppy.mib import (
IndicationCfg, IndicationCfg,
LocalEntityCfg, LocalEntityCfg,
RemoteEntityCfg, RemoteEntityCfg,
@ -41,7 +41,7 @@ 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 tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider 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.pus_tm.pus_handler import PusHandler, UnknownApidHandler