From 2482a79db7dea38f6f348aad6ccb32d4ae119d76 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 14 Jul 2022 15:45:57 +0200 Subject: [PATCH] new send_cb argument --- deps/tmtccmd | 2 +- tmtcc.py | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/deps/tmtccmd b/deps/tmtccmd index 7ba0dd3..5627f6c 160000 --- a/deps/tmtccmd +++ b/deps/tmtccmd @@ -1 +1 @@ -Subproject commit 7ba0dd3bc5a328a7445c40cf801f587624b46652 +Subproject commit 5627f6c99f7a277d514f7b48e540f575c08031b6 diff --git a/tmtcc.py b/tmtcc.py index 0a7727d..975ef3f 100755 --- a/tmtcc.py +++ b/tmtcc.py @@ -4,6 +4,8 @@ import sys import time import traceback +from tmtccmd.tc.handler import SendCbParams + try: import spacepackets except ImportError as error: @@ -26,7 +28,6 @@ except ImportError as error: from spacepackets.ecss import PusVerificator from tmtccmd import get_console_logger, TcHandlerBase, BackendBase -from tmtccmd.com_if import ComInterface from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter @@ -43,7 +44,6 @@ from tmtccmd.tc import ( ProcedureHelper, FeedWrapper, TcProcedureType, - QueueEntryHelper, TcQueueEntryType, ) from tmtccmd.config import default_json_path, SetupWrapper @@ -101,7 +101,8 @@ class TcHandler(TcHandlerBase): if info.proc_type == TcProcedureType.DEFAULT: handle_default_procedure(info.to_def_procedure(), wrapper, self.gui) - def send_cb(self, entry_helper: QueueEntryHelper, com_if: ComInterface): + def send_cb(self, send_params: SendCbParams): + entry_helper = send_params.entry if entry_helper.is_tc: if entry_helper.entry_type == TcQueueEntryType.PUS_TC: pus_tc_wrapper = entry_helper.to_pus_tc_entry() @@ -118,7 +119,7 @@ class TcHandler(TcHandlerBase): self.file_logger.info( f"{get_current_time_string(True)}: {tc_info_string}" ) - com_if.send(raw_tc) + send_params.com_if.send(raw_tc) elif entry_helper.entry_type == TcQueueEntryType.LOG: log_entry = entry_helper.to_log_entry() LOGGER.info(log_entry.log_str)