update dependencies
This commit is contained in:
18
tmtcc.py
18
tmtcc.py
@ -45,6 +45,7 @@ from tmtccmd.tc import (
|
||||
FeedWrapper,
|
||||
TcProcedureType,
|
||||
TcQueueEntryType,
|
||||
DefaultPusQueueHelper,
|
||||
)
|
||||
from tmtccmd.config import default_json_path, SetupWrapper
|
||||
from tmtccmd.config.args import (
|
||||
@ -88,7 +89,7 @@ class TcHandler(TcHandlerBase):
|
||||
pus_verificator: PusVerificator,
|
||||
file_logger: logging.Logger,
|
||||
raw_logger: RawTmtcTimedLogWrapper,
|
||||
gui: bool
|
||||
gui: bool,
|
||||
):
|
||||
super().__init__()
|
||||
self.seq_count_provider = seq_count_provider
|
||||
@ -96,10 +97,19 @@ class TcHandler(TcHandlerBase):
|
||||
self.file_logger = file_logger
|
||||
self.raw_logger = raw_logger
|
||||
self.gui = gui
|
||||
self.queue_helper = DefaultPusQueueHelper(
|
||||
queue_wrapper=None,
|
||||
pus_apid=PUS_APID,
|
||||
seq_cnt_provider=seq_count_provider,
|
||||
pus_verificator=pus_verificator,
|
||||
)
|
||||
|
||||
def feed_cb(self, info: ProcedureHelper, wrapper: FeedWrapper):
|
||||
self.queue_helper.queue_wrapper = wrapper.queue_wrapper
|
||||
if info.proc_type == TcProcedureType.DEFAULT:
|
||||
handle_default_procedure(info.to_def_procedure(), wrapper, self.gui)
|
||||
handle_default_procedure(
|
||||
info.to_def_procedure(), self.queue_helper, self.gui
|
||||
)
|
||||
|
||||
def send_cb(self, send_params: SendCbParams):
|
||||
entry_helper = send_params.entry
|
||||
@ -151,7 +161,7 @@ def setup_tmtc(
|
||||
verificator: PusVerificator,
|
||||
printer: FsfwTmTcPrinter,
|
||||
raw_logger: RawTmtcTimedLogWrapper,
|
||||
gui: bool
|
||||
gui: bool,
|
||||
) -> (CcsdsTmHandler, TcHandler):
|
||||
verification_wrapper = VerificationWrapper(verificator, LOGGER, printer.file_logger)
|
||||
pus_handler = PusHandler(verification_wrapper, printer, raw_logger)
|
||||
@ -163,7 +173,7 @@ def setup_tmtc(
|
||||
pus_verificator=verificator,
|
||||
file_logger=printer.file_logger,
|
||||
raw_logger=raw_logger,
|
||||
gui=gui
|
||||
gui=gui,
|
||||
)
|
||||
return ccsds_handler, tc_handler
|
||||
|
||||
|
Reference in New Issue
Block a user