From 98af6a7907ac473e7a247e7ce385a0cdbbd7739f Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 31 Jan 2023 12:56:13 +0100 Subject: [PATCH] update tmtccmd --- eive_tmtc/config/definitions.py | 4 ++-- eive_tmtc/config/hook.py | 8 ++++---- eive_tmtc/pus_tc/devs/bpx_batt.py | 4 ++-- eive_tmtc/pus_tc/devs/plpcdu.py | 4 ++-- eive_tmtc/pus_tc/devs/rtd.py | 2 +- eive_tmtc/pus_tc/devs/scex.py | 2 +- eive_tmtc/pus_tc/devs/tmp1075.py | 2 +- eive_tmtc/pus_tc/service_200_mode.py | 2 +- eive_tmtc/pus_tc/system/controllers.py | 2 +- eive_tmtc/pus_tm/event_handler.py | 2 +- eive_tmtc/pus_tm/factory_hook.py | 6 +++--- eive_tmtc/tmtc/acs/acs_board.py | 2 +- eive_tmtc/tmtc/acs/acs_ctrl.py | 2 +- eive_tmtc/tmtc/acs/imtq.py | 2 +- eive_tmtc/tmtc/acs/reaction_wheels.py | 2 +- eive_tmtc/tmtc/acs/star_tracker.py | 2 +- eive_tmtc/tmtc/acs/subsystem.py | 2 +- eive_tmtc/tmtc/acs/sus_board.py | 2 +- eive_tmtc/tmtc/com/ccsds_handler.py | 2 +- eive_tmtc/tmtc/com/subsystem.py | 4 ++-- eive_tmtc/tmtc/com/syrlinks_handler.py | 2 +- eive_tmtc/tmtc/common.py | 2 +- eive_tmtc/tmtc/payload/ploc_mpsoc.py | 2 +- eive_tmtc/tmtc/payload/subsystem.py | 2 +- eive_tmtc/tmtc/tcs.py | 2 +- tmtcc.py | 15 +++++++++------ 26 files changed, 43 insertions(+), 40 deletions(-) diff --git a/eive_tmtc/config/definitions.py b/eive_tmtc/config/definitions.py index d5c3bc3..570b6fa 100644 --- a/eive_tmtc/config/definitions.py +++ b/eive_tmtc/config/definitions.py @@ -17,8 +17,8 @@ CFDP_APID = 0x66 PUS_PACKET_ID = PacketId(PacketType.TM, True, PUS_APID) CFDP_PACKET_ID = PacketId(PacketType.TM, False, CFDP_APID) SPACE_PACKET_IDS = ( - PUS_PACKET_ID.raw(), - CFDP_PACKET_ID.raw(), + PUS_PACKET_ID, + CFDP_PACKET_ID, ) CFDP_LOCAL_ENTITY_ID = UnsignedByteField(byte_len=2, val=1) diff --git a/eive_tmtc/config/hook.py b/eive_tmtc/config/hook.py index bee9a59..6019fb7 100644 --- a/eive_tmtc/config/hook.py +++ b/eive_tmtc/config/hook.py @@ -1,8 +1,8 @@ from typing import Optional from eive_tmtc.config.definitions import SPACE_PACKET_IDS -from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend -from tmtccmd.com_if import ComInterface +from tmtccmd import HookBase, CcsdsTmtcBackend +from tmtccmd.com import ComInterface from tmtccmd.config import TmtcDefinitionWrapper from eive_tmtc.config.retvals import get_retval_dict @@ -10,7 +10,7 @@ from eive_tmtc.pus_tc.cmd_definitions import get_eive_service_op_code_dict from tmtccmd.util import ObjectIdDictT, RetvalDictT -class EiveHookObject(TmTcCfgHookBase): +class EiveHookObject(HookBase): def __init__(self, json_cfg_path: str): super().__init__(json_cfg_path=json_cfg_path) @@ -18,7 +18,7 @@ class EiveHookObject(TmTcCfgHookBase): return get_eive_service_op_code_dict() def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]: - from tmtccmd.config.com_if import ( + from tmtccmd.config.com import ( create_com_interface_default, create_com_interface_cfg_default, ) diff --git a/eive_tmtc/pus_tc/devs/bpx_batt.py b/eive_tmtc/pus_tc/devs/bpx_batt.py index 4e7ba91..a7a5274 100644 --- a/eive_tmtc/pus_tc/devs/bpx_batt.py +++ b/eive_tmtc/pus_tc/devs/bpx_batt.py @@ -11,8 +11,8 @@ from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode -from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode +from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices class BpxSetId: diff --git a/eive_tmtc/pus_tc/devs/plpcdu.py b/eive_tmtc/pus_tc/devs/plpcdu.py index 0046078..842ec53 100644 --- a/eive_tmtc/pus_tc/devs/plpcdu.py +++ b/eive_tmtc/pus_tc/devs/plpcdu.py @@ -18,8 +18,8 @@ from tmtccmd.tc.pus_11_tc_sched import ( create_enable_tc_sched_cmd, create_time_tagged_cmd, ) -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice -from tmtccmd.tc.pus_20_fsfw_params import ( +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice +from tmtccmd.tc.pus_20_fsfw_param import ( pack_scalar_double_param_app_data, create_load_param_cmd, pack_boolean_parameter_app_data, diff --git a/eive_tmtc/pus_tc/devs/rtd.py b/eive_tmtc/pus_tc/devs/rtd.py index a97f277..a372a70 100644 --- a/eive_tmtc/pus_tc/devs/rtd.py +++ b/eive_tmtc/pus_tc/devs/rtd.py @@ -9,7 +9,7 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.util import ObjectIdU32 -from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice +from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice import eive_tmtc.config.object_ids as oids from eive_tmtc.config.object_ids import get_object_ids diff --git a/eive_tmtc/pus_tc/devs/scex.py b/eive_tmtc/pus_tc/devs/scex.py index 982382b..6b62b6a 100644 --- a/eive_tmtc/pus_tc/devs/scex.py +++ b/eive_tmtc/pus_tc/devs/scex.py @@ -5,7 +5,7 @@ from spacepackets.ecss import PusTelecommand from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config.tmtc import tmtc_definitions_provider -from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_data, Subservice +from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_data, Subservice from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.pus.s8_fsfw_funccmd import create_action_cmd diff --git a/eive_tmtc/pus_tc/devs/tmp1075.py b/eive_tmtc/pus_tc/devs/tmp1075.py index c2bd654..bc4ace6 100644 --- a/eive_tmtc/pus_tc/devs/tmp1075.py +++ b/eive_tmtc/pus_tc/devs/tmp1075.py @@ -10,7 +10,7 @@ import enum from spacepackets.ecss.tc import PusTelecommand from eive_tmtc.pus_tc.service_200_mode import pack_mode_data from tmtccmd.tc import DefaultPusQueueHelper -from tmtccmd.tc.pus_200_fsfw_modes import Mode +from tmtccmd.tc.pus_200_fsfw_mode import Mode from tmtccmd.pus.s8_fsfw_funccmd import make_action_id from tmtccmd.util import ObjectIdU32 diff --git a/eive_tmtc/pus_tc/service_200_mode.py b/eive_tmtc/pus_tc/service_200_mode.py index a13eb6b..07da250 100644 --- a/eive_tmtc/pus_tc/service_200_mode.py +++ b/eive_tmtc/pus_tc/service_200_mode.py @@ -7,7 +7,7 @@ """ from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import DefaultPusQueueHelper -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode from eive_tmtc.config.object_ids import TEST_DEVICE_ID TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID diff --git a/eive_tmtc/pus_tc/system/controllers.py b/eive_tmtc/pus_tc/system/controllers.py index cabccf9..5119ecf 100644 --- a/eive_tmtc/pus_tc/system/controllers.py +++ b/eive_tmtc/pus_tc/system/controllers.py @@ -1,7 +1,7 @@ from typing import Union from tmtccmd.tc import DefaultPusQueueHelper -from tmtccmd.tc.pus_200_fsfw_modes import Mode +from tmtccmd.tc.pus_200_fsfw_mode import Mode from tmtccmd.util import ObjectIdU32, ObjectIdBase from eive_tmtc.tmtc.common import pack_mode_cmd_with_info diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py index fada99d..60c4ed0 100644 --- a/eive_tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -5,7 +5,7 @@ from eive_tmtc.config.object_ids import get_object_ids from eive_tmtc.pus_tm.defs import PrintWrapper from eive_tmtc.pus_tm.verification_handler import generic_retval_printout from eive_tmtc.tmtc.acs.subsystem import AcsMode -from tmtccmd.tc.pus_200_fsfw_modes import Mode +from tmtccmd.tc.pus_200_fsfw_mode import Mode from tmtccmd.tm import Service5Tm from tmtccmd.logging import get_console_logger diff --git a/eive_tmtc/pus_tm/factory_hook.py b/eive_tmtc/pus_tm/factory_hook.py index 1866673..49191d2 100644 --- a/eive_tmtc/pus_tm/factory_hook.py +++ b/eive_tmtc/pus_tm/factory_hook.py @@ -9,9 +9,9 @@ from tmtccmd import get_console_logger from tmtccmd.logging.pus import RawTmtcTimedLogWrapper from tmtccmd.pus import VerificationWrapper from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm -from tmtccmd.tm.pus_20_fsfw_params import Service20ParamDumpWrapper -from tmtccmd.pus.s20_fsfw_params_defs import CustomSubservice as ParamSubservice -from tmtccmd.tm.pus_200_fsfw_modes import Subservice as ModeSubservice +from tmtccmd.tm.pus_20_fsfw_param import Service20ParamDumpWrapper +from tmtccmd.pus.s20_fsfw_param_defs import CustomSubservice as ParamSubservice +from tmtccmd.tm.pus_200_fsfw_mode import Subservice as ModeSubservice from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from .defs import PrintWrapper diff --git a/eive_tmtc/tmtc/acs/acs_board.py b/eive_tmtc/tmtc/acs/acs_board.py index 37fe840..0027ee4 100644 --- a/eive_tmtc/tmtc/acs/acs_board.py +++ b/eive_tmtc/tmtc/acs/acs_board.py @@ -8,7 +8,7 @@ from tmtccmd.config.tmtc import ( ) from tmtccmd.tc import service_provider, DefaultPusQueueHelper from tmtccmd.tc.decorator import ServiceProviderParams -from tmtccmd.tc.pus_200_fsfw_modes import Mode +from tmtccmd.tc.pus_200_fsfw_mode import Mode from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID from eive_tmtc.tmtc.common import pack_mode_cmd_with_info diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index 0978807..bda57bf 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -14,7 +14,7 @@ from tmtccmd.config.tmtc import ( OpCodeEntry, ) from tmtccmd.tc import service_provider -from tmtccmd.tc.pus_200_fsfw_modes import Mode, pack_mode_command +from tmtccmd.tc.pus_200_fsfw_mode import Mode, pack_mode_command from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.pus_3_fsfw_hk import ( generate_one_hk_command, diff --git a/eive_tmtc/tmtc/acs/imtq.py b/eive_tmtc/tmtc/acs/imtq.py index 6d22c40..1af3aea 100644 --- a/eive_tmtc/tmtc/acs/imtq.py +++ b/eive_tmtc/tmtc/acs/imtq.py @@ -22,7 +22,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( generate_one_diag_command, generate_one_hk_command, ) -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive_tmtc/tmtc/acs/reaction_wheels.py b/eive_tmtc/tmtc/acs/reaction_wheels.py index e0a832a..da8be5f 100644 --- a/eive_tmtc/tmtc/acs/reaction_wheels.py +++ b/eive_tmtc/tmtc/acs/reaction_wheels.py @@ -20,7 +20,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( disable_periodic_hk_command, ) from spacepackets.ecss.tc import PusTelecommand -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive_tmtc/tmtc/acs/star_tracker.py b/eive_tmtc/tmtc/acs/star_tracker.py index 37e6e74..772c3e2 100644 --- a/eive_tmtc/tmtc/acs/star_tracker.py +++ b/eive_tmtc/tmtc/acs/star_tracker.py @@ -9,7 +9,7 @@ import enum import struct from spacepackets.ecss.tc import PusTelecommand -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode from tmtccmd.logging import get_console_logger from tmtccmd.tc import DefaultPusQueueHelper diff --git a/eive_tmtc/tmtc/acs/subsystem.py b/eive_tmtc/tmtc/acs/subsystem.py index 7963a3a..538661e 100644 --- a/eive_tmtc/tmtc/acs/subsystem.py +++ b/eive_tmtc/tmtc/acs/subsystem.py @@ -10,7 +10,7 @@ from tmtccmd.config.tmtc import ( TmtcDefinitionWrapper, OpCodeEntry, ) -from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservices +from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservices from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams diff --git a/eive_tmtc/tmtc/acs/sus_board.py b/eive_tmtc/tmtc/acs/sus_board.py index 6520a5e..d3d406d 100644 --- a/eive_tmtc/tmtc/acs/sus_board.py +++ b/eive_tmtc/tmtc/acs/sus_board.py @@ -9,7 +9,7 @@ from tmtccmd.config.tmtc import ( ) from tmtccmd.tc import service_provider, DefaultPusQueueHelper from tmtccmd.tc.decorator import ServiceProviderParams -from tmtccmd.tc.pus_200_fsfw_modes import Mode +from tmtccmd.tc.pus_200_fsfw_mode import Mode class SusOpCode: diff --git a/eive_tmtc/tmtc/com/ccsds_handler.py b/eive_tmtc/tmtc/com/ccsds_handler.py index f9293dd..5bc1466 100644 --- a/eive_tmtc/tmtc/com/ccsds_handler.py +++ b/eive_tmtc/tmtc/com/ccsds_handler.py @@ -16,7 +16,7 @@ from tmtccmd.config.tmtc import ( TmtcDefinitionWrapper, ) from tmtccmd.tc import DefaultPusQueueHelper -from tmtccmd.tc.pus_200_fsfw_modes import create_mode_command, Mode +from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command, Mode from tmtccmd.util import ObjectIdU32 from eive_tmtc.config.object_ids import CCSDS_HANDLER_ID diff --git a/eive_tmtc/tmtc/com/subsystem.py b/eive_tmtc/tmtc/com/subsystem.py index c897470..f602532 100644 --- a/eive_tmtc/tmtc/com/subsystem.py +++ b/eive_tmtc/tmtc/com/subsystem.py @@ -10,8 +10,8 @@ from tmtccmd.config.tmtc import ( ) from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams -from tmtccmd.tc.pus_200_fsfw_modes import create_mode_command -from tmtccmd.tc.pus_20_fsfw_params import ( +from tmtccmd.tc.pus_200_fsfw_mode import create_mode_command +from tmtccmd.tc.pus_20_fsfw_param import ( create_load_param_cmd, pack_scalar_u8_parameter_app_data, ) diff --git a/eive_tmtc/tmtc/com/syrlinks_handler.py b/eive_tmtc/tmtc/com/syrlinks_handler.py index 3b8e800..1017b89 100644 --- a/eive_tmtc/tmtc/com/syrlinks_handler.py +++ b/eive_tmtc/tmtc/com/syrlinks_handler.py @@ -23,7 +23,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( create_disable_periodic_hk_command, ) from spacepackets.ecss.tc import PusTelecommand -from tmtccmd.tc.pus_200_fsfw_modes import Mode, create_mode_command +from tmtccmd.tc.pus_200_fsfw_mode import Mode, create_mode_command from eive_tmtc.config.object_ids import SYRLINKS_HANDLER_ID import struct diff --git a/eive_tmtc/tmtc/common.py b/eive_tmtc/tmtc/common.py index 5ae4b15..8425195 100644 --- a/eive_tmtc/tmtc/common.py +++ b/eive_tmtc/tmtc/common.py @@ -2,7 +2,7 @@ from typing import Union from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import DefaultPusQueueHelper -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode, Subservice +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode, Subservice from tmtccmd.util import ObjectIdU32 diff --git a/eive_tmtc/tmtc/payload/ploc_mpsoc.py b/eive_tmtc/tmtc/payload/ploc_mpsoc.py index 671de0e..b9a0ee1 100644 --- a/eive_tmtc/tmtc/payload/ploc_mpsoc.py +++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py @@ -21,7 +21,7 @@ from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams from eive_tmtc.utility.input_helper import InputHelper -from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Mode +from tmtccmd.tc.pus_200_fsfw_mode import pack_mode_data, Mode LOGGER = get_console_logger() diff --git a/eive_tmtc/tmtc/payload/subsystem.py b/eive_tmtc/tmtc/payload/subsystem.py index d309e29..3b71f0f 100644 --- a/eive_tmtc/tmtc/payload/subsystem.py +++ b/eive_tmtc/tmtc/payload/subsystem.py @@ -9,7 +9,7 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams -from tmtccmd.tc.pus_200_fsfw_modes import Subservice as ModeSubservice +from tmtccmd.tc.pus_200_fsfw_mode import Subservice as ModeSubservice class OpCode(str, enum.Enum): diff --git a/eive_tmtc/tmtc/tcs.py b/eive_tmtc/tmtc/tcs.py index 3641d2f..f5c589a 100644 --- a/eive_tmtc/tmtc/tcs.py +++ b/eive_tmtc/tmtc/tcs.py @@ -8,7 +8,7 @@ from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper -from tmtccmd.tc.pus_200_fsfw_modes import Mode +from tmtccmd.tc.pus_200_fsfw_mode import Mode from tmtccmd.tc.pus_3_fsfw_hk import ( make_sid, generate_one_hk_command, diff --git a/tmtcc.py b/tmtcc.py index 2323247..c5cb379 100755 --- a/tmtcc.py +++ b/tmtcc.py @@ -72,7 +72,7 @@ from tmtccmd.tc import ( FeedWrapper, TcProcedureType, TcQueueEntryType, - DefaultPusQueueHelper, + DefaultPusQueueHelper, QueueWrapper, ) from tmtccmd.config import ( default_json_path, @@ -221,10 +221,11 @@ class TcHandler(TcHandlerBase): self.pus_raw_logger = raw_pus_logger self.gui = gui self.queue_helper = DefaultPusQueueHelper( - queue_wrapper=None, - pus_apid=PUS_APID, + queue_wrapper=QueueWrapper.empty(), + default_pus_apid=PUS_APID, seq_cnt_provider=seq_count_provider, pus_verificator=pus_verificator, + tc_sched_timestamp_len=4 ) self.cfdp_in_ccsds_wrapper = cfdp_in_ccsds_wrapper @@ -338,15 +339,17 @@ def setup_params() -> SetupWrapper: parser_wrapper.create_default_parent_parser() parser_wrapper.create_default_parser() parser_wrapper.add_def_proc_and_cfdp_as_subparsers() - post_arg_parsing_wrapper = parser_wrapper.parse(hook_obj) + post_arg_parsing_wrapper = parser_wrapper.parse(setup_params=params, hook_obj=hook_obj) tmtccmd.init_printout(post_arg_parsing_wrapper.use_gui) use_prompts = not post_arg_parsing_wrapper.use_gui proc_param_wrapper = ProcedureParamsWrapper() if use_prompts: - post_arg_parsing_wrapper.set_params_with_prompts(params, proc_param_wrapper) + post_arg_parsing_wrapper.set_params_with_prompts(proc_param_wrapper) else: - post_arg_parsing_wrapper.set_params_without_prompts(params, proc_param_wrapper) + post_arg_parsing_wrapper.set_params_without_prompts(proc_param_wrapper) params.apid = PUS_APID + if params.com_if is None: + raise ValueError("could not determine a COM interface.") setup_wrapper = SetupWrapper( hook_obj=hook_obj, setup_params=params, proc_param_wrapper=proc_param_wrapper )