Update to v1.5.0 #4

Merged
muellerr merged 9 commits from develop into master 2021-05-17 18:16:41 +02:00
5 changed files with 7 additions and 9 deletions
Showing only changes of commit 877b9bb5c1 - Show all commits

View File

@ -11,10 +11,9 @@ import argparse
# All globals can be added here and will be part of a globals dictionary. # All globals can be added here and will be part of a globals dictionary.
from config.definitions import CustomServiceList from config.definitions import CustomServiceList
from config.custom_mode_op import CustomModeList 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, \ from tmtccmd.config.globals import set_default_globals_pre_args_parsing, \
set_default_globals_post_args_parsing set_default_globals_post_args_parsing
from tmtccmd.core.globals_manager import update_global
from tmtccmd.utility.logger import get_logger from tmtccmd.utility.logger import get_logger
LOGGER = get_logger() LOGGER = get_logger()

View File

@ -1,7 +1,7 @@
import argparse import argparse
from typing import Union, Dict, Tuple 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.pus_tm.service_3_base import Service3Base
from tmtccmd.ecss.tm import PusTelemetry from tmtccmd.ecss.tm import PusTelemetry
from tmtccmd.pus_tc.definitions import TcQueueT from tmtccmd.pus_tc.definitions import TcQueueT

View File

@ -3,8 +3,6 @@
@details Template configuration file. Copy this folder to the TMTC commander root and adapt @details Template configuration file. Copy this folder to the TMTC commander root and adapt
it to your needs. it to your needs.
""" """
import enum
from typing import Dict from typing import Dict
PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17]) PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])

@ -1 +1 @@
Subproject commit 8ca16e305d18eb8df2165680676992261af99c1b Subproject commit 3f39a1ffa17e8c74cadc789b3f4714c4bbd5f75f

View File

@ -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 This function by default will build the default argument parser. A custom CLI parser can be
built in this function if required. built in this function if required.
""" """
from tmtccmd.defaults.args_parser import parse_default_input_arguments from tmtccmd.config.args import parse_default_input_arguments
parse_default_input_arguments(print_known_args=print_known_args, parse_default_input_arguments(
print_unknown_args=print_unknown_args) print_known_args=print_known_args, print_unknown_args=print_unknown_args
)