From e06bb91f081f9f9d9033da635041cc274ab5a980 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 19 Mar 2021 17:42:36 +0100 Subject: [PATCH] minor corrections --- config/hook_implementations.py | 2 +- requirements.txt | 5 +---- tmtc_client_cli.py | 7 +++++-- tmtc_client_gui.py | 7 +++++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config/hook_implementations.py b/config/hook_implementations.py index b7d58e1..d8d8311 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -13,7 +13,7 @@ from tmtccmd.core.hook_base import TmTcHookBase from tmtccmd.utility.tmtc_printer import TmTcPrinter -class SourceHookBase(TmTcHookBase): +class EiveHookObject(TmTcHookBase): def get_version(self) -> str: from config.version import SW_NAME, VERSION_MAJOR, VERSION_MINOR, VERSION_SUBMINOR diff --git a/requirements.txt b/requirements.txt index 5999422..64b5f85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1 @@ -crcmod>=1.7 -PyQt5>=5.15.1 -PyQt5-stubs>=5.14.2.2 -pyserial>=3.4 +tmtccmd>=1.0.0 diff --git a/tmtc_client_cli.py b/tmtc_client_cli.py index 1e3bd1e..89b529d 100644 --- a/tmtc_client_cli.py +++ b/tmtc_client_cli.py @@ -26,11 +26,14 @@ limitations under the License. @author R. Mueller """ -from tmtccmd.tmtcc_runner import run_tmtc_client +from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander +from config.hook_implementations import EiveHookObject def main(): - run_tmtc_client(False) + hook_obj = EiveHookObject() + initialize_tmtc_commander(hook_object=hook_obj) + run_tmtc_commander(False) if __name__ == "__main__": diff --git a/tmtc_client_gui.py b/tmtc_client_gui.py index 6be58d4..dd05245 100644 --- a/tmtc_client_gui.py +++ b/tmtc_client_gui.py @@ -26,11 +26,14 @@ limitations under the License. @author R. Mueller """ -from tmtccmd.tmtcc_runner import run_tmtc_client +from config.hook_implementations import EiveHookObject +from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander def main(): - run_tmtc_client(True) + hook_obj = EiveHookObject() + initialize_tmtc_commander(hook_object=hook_obj) + run_tmtc_commander(True) if __name__ == "__main__":