update tmtccmd

This commit is contained in:
2023-01-31 12:56:13 +01:00
parent 63d7f577b1
commit 98af6a7907
26 changed files with 43 additions and 40 deletions

View File

@ -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
)