From 877b9bb5c10be7fc000d8ffdc13f9b285be3c0c9 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Mon, 17 May 2021 18:01:55 +0200 Subject: [PATCH] smaller changes --- config/globals_config.py | 3 +-- config/hook_implementations.py | 2 +- config/object_ids.py | 2 -- tmtccmd | 2 +- utility/args_parser.py | 7 ++++--- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/config/globals_config.py b/config/globals_config.py index fd17609..c1199c6 100644 --- a/config/globals_config.py +++ b/config/globals_config.py @@ -11,10 +11,9 @@ import argparse # All globals can be added here and will be part of a globals dictionary. from config.definitions import CustomServiceList from config.custom_mode_op import CustomModeList -from tmtccmd.config.definitions import CoreComInterfaces, CoreServiceList, CoreGlobalIds +from tmtccmd.config.definitions import CoreComInterfaces from tmtccmd.config.globals import set_default_globals_pre_args_parsing, \ set_default_globals_post_args_parsing -from tmtccmd.core.globals_manager import update_global from tmtccmd.utility.logger import get_logger LOGGER = get_logger() diff --git a/config/hook_implementations.py b/config/hook_implementations.py index 74f106c..498f921 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -1,7 +1,7 @@ import argparse from typing import Union, Dict, Tuple -from tmtccmd.config.definitions import ServiceOpCodeDictT, CoreServiceList +from tmtccmd.config.definitions import ServiceOpCodeDictT from tmtccmd.pus_tm.service_3_base import Service3Base from tmtccmd.ecss.tm import PusTelemetry from tmtccmd.pus_tc.definitions import TcQueueT diff --git a/config/object_ids.py b/config/object_ids.py index c1d6147..8548be7 100644 --- a/config/object_ids.py +++ b/config/object_ids.py @@ -3,8 +3,6 @@ @details Template configuration file. Copy this folder to the TMTC commander root and adapt it to your needs. """ - -import enum from typing import Dict PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17]) diff --git a/tmtccmd b/tmtccmd index 8ca16e3..3f39a1f 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 8ca16e305d18eb8df2165680676992261af99c1b +Subproject commit 3f39a1ffa17e8c74cadc789b3f4714c4bbd5f75f diff --git a/utility/args_parser.py b/utility/args_parser.py index a7ad2b1..d4b11ad 100644 --- a/utility/args_parser.py +++ b/utility/args_parser.py @@ -5,6 +5,7 @@ def parse_input_arguments_user(print_known_args: bool = False, print_unknown_arg This function by default will build the default argument parser. A custom CLI parser can be built in this function if required. """ - from tmtccmd.defaults.args_parser import parse_default_input_arguments - parse_default_input_arguments(print_known_args=print_known_args, - print_unknown_args=print_unknown_args) + from tmtccmd.config.args import parse_default_input_arguments + parse_default_input_arguments( + print_known_args=print_known_args, print_unknown_args=print_unknown_args + )