v1.7.0 #8

Merged
meierj merged 40 commits from develop into master 2021-07-26 18:17:09 +02:00
6 changed files with 11 additions and 11 deletions
Showing only changes of commit 9d98eb6b60 - Show all commits

View File

@ -6,9 +6,9 @@
import enum import enum
from tmtccmd.core.backend import TmTcHandler from tmtccmd.core.backend import TmTcHandler
from tmtccmd.utility.logger import get_logger from tmtccmd.utility.logger import get_console_logger
LOGGER = get_logger() LOGGER = get_console_logger()
class CustomModeList(enum.IntEnum): class CustomModeList(enum.IntEnum):

View File

@ -14,9 +14,9 @@ from config.custom_mode_op import CustomModeList
from tmtccmd.config.definitions import CoreComInterfaces 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.utility.logger import get_logger from tmtccmd.utility.logger import get_console_logger
LOGGER = get_logger() LOGGER = get_console_logger()
class CustomGlobalIds(enum.Enum): class CustomGlobalIds(enum.Enum):

View File

@ -9,7 +9,7 @@ from collections import deque
from typing import Union from typing import Union
from tmtccmd.config.definitions import CoreServiceList from tmtccmd.config.definitions import CoreServiceList
from tmtccmd.utility.logger import get_logger from tmtccmd.utility.logger import get_console_logger
from tmtccmd.pus_tc.definitions import TcQueueT from tmtccmd.pus_tc.definitions import TcQueueT
from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into from tmtccmd.pus_tc.service_5_event import pack_generic_service5_test_into
from tmtccmd.pus_tc.service_17_test import pack_service17_ping_command from tmtccmd.pus_tc.service_17_test import pack_service17_ping_command
@ -27,7 +27,7 @@ from config.object_ids import P60_DOCK_HANDLER, PDU_1_HANDLER_ID, PDU_2_HANDLER_
TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID, IMTQ_HANDLER_ID, PLOC_ID TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID, IMTQ_HANDLER_ID, PLOC_ID
LOGGER = get_logger() LOGGER = get_console_logger()
def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT): def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):

View File

@ -5,7 +5,7 @@
""" """
from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
from tmtccmd.ecss.tm import PusTelemetry from tmtccmd.ecss.tm import PusTelemetry
from tmtccmd.utility.logger import get_logger from tmtccmd.utility.logger import get_console_logger
from tmtccmd.pus_tm.service_1_verification import Service1TM from tmtccmd.pus_tm.service_1_verification import Service1TM
from tmtccmd.pus_tm.service_3_housekeeping import Service3TM from tmtccmd.pus_tm.service_3_housekeeping import Service3TM
@ -15,7 +15,7 @@ from tmtccmd.utility.tmtc_printer import TmTcPrinter
from config.definitions import PUS_APID from config.definitions import PUS_APID
LOGGER = get_logger() LOGGER = get_console_logger()
def ccsds_tm_handler(apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter) -> None: def ccsds_tm_handler(apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter) -> None:

View File

@ -8,11 +8,11 @@ import struct
from typing import Tuple from typing import Tuple
from tmtccmd.pus_tm.service_3_housekeeping import Service3Base from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
from tmtccmd.utility.logger import get_logger from tmtccmd.utility.logger import get_console_logger
from pus_tc.syrlinks_hk_handler import SetIds from pus_tc.syrlinks_hk_handler import SetIds
from pus_tc.imtq import ImtqSetIds from pus_tc.imtq import ImtqSetIds
from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID from config.object_ids import SYRLINKS_HANDLER, IMTQ_HANDLER_ID
LOGGER = get_logger() LOGGER = get_console_logger()
def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray, def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray,

@ -1 +1 @@
Subproject commit e83928127df3451171d8d5c22d8c2ca1d571d629 Subproject commit 742e73dba0fbcad35768a268320c419854eab2ae