.idea/runConfigurations/Unittests_in_tmtccmd.xml

@@ -4,7 +4,7 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tmtccmd/src" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tmtccmd/src/tests" />
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />

config/custom_mode_op.py

@@ -6,7 +6,7 @@
 import enum
 
 from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()
 

config/globals_config.py

@@ -16,7 +16,7 @@ from tmtccmd.config.globals import (
     set_default_globals_pre_args_parsing,
     set_default_globals_post_args_parsing,
 )
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()
 

config/object_ids.py

@@ -6,7 +6,7 @@
 import os.path
 from tmtccmd.pus.obj_id import ObjectIdDictT
 from tmtccmd.utility.fsfw import parse_fsfw_objects_csv
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()
 DEFAULT_OBJECTS_CSV_PATH = "config/objects.csv"

config/retvals.py

@@ -1,6 +1,6 @@
 import os
 from tmtccmd.utility.fsfw import parse_fsfw_returnvalues_csv, RetvalDictT
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 DEFAULT_RETVAL_CSV_NAME = "config/returnvalues.csv"
 __RETVAL_DICT = None

pus_tc/devs/ploc_mpsoc.py

@@ -10,7 +10,7 @@ import struct
 import enum
 
 from tmtccmd.config.definitions import QueueCommands
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
 from utility.input_helper import InputHelper

pus_tc/devs/ploc_supervisor.py

@@ -11,7 +11,7 @@ import struct
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
 
 LOGGER = get_console_logger()

pus_tc/devs/plpcdu.py

@@ -9,7 +9,7 @@ from tmtccmd.tc.service_20_parameter import (
     pack_fsfw_load_param_cmd,
     pack_boolean_parameter_app_data,
 )
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from spacepackets.ecss.tc import PusTelecommand
 from config.object_ids import PL_PCDU_ID
 

pus_tc/devs/star_tracker.py

@@ -12,7 +12,7 @@ from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from utility.input_helper import InputHelper
 
 

pus_tc/system/core.py

@@ -3,7 +3,7 @@ import enum
 from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_8_functional_cmd import generate_action_command
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command
 from config.object_ids import CORE_CONTROLLER_ID
 

pus_tc/tc_packer_hook.py

@@ -5,7 +5,7 @@ from collections import deque
 from typing import Union
 
 from tmtccmd.config.definitions import CoreServiceList
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from tmtccmd.tc.definitions import TcQueueT
 from tmtccmd.tc.service_5_event import pack_generic_service5_test_into
 from tmtccmd.pus.service_17_test import pack_service_17_ping_command

pus_tm/event_handler.py

@@ -1,7 +1,7 @@
 import os.path
 
 from config.object_ids import get_object_ids
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from tmtccmd.utility.fsfw import parse_fsfw_events_csv, EventDictT, EventInfo
 
 LOGGER = get_console_logger()

pus_tm/factory_hook.py

@@ -5,7 +5,7 @@
 """
 from tmtccmd.tm.service_8_fsfw_functional_cmd import Service8FsfwTm
 from spacepackets.ecss.tm import PusTelemetry
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 from tmtccmd.pus.service_1_verification import Service1TMExtended
 from tmtccmd.pus.service_17_test import Service17TMExtended

pus_tm/hk_handling.py

@@ -5,7 +5,7 @@ import datetime
 
 from tmtccmd.config.definitions import HkReplyUnpacked
 from tmtccmd.tm.service_3_fsfw_housekeeping import Service3Base
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from pus_tc.devs.bpx_batt import BpxSetIds
 from pus_tc.devs.syrlinks_hk_handler import SetIds
 from pus_tc.devs.imtq import ImtqSetIds

pus_tm/service_8_hook.py

@@ -4,7 +4,7 @@ from pus_tc.devs.imtq import ImtqActionIds
 from pus_tc.devs.ploc_mpsoc import PlocReplyIds
 from pus_tc.devs.ploc_supervisor import SupvActionIds
 from pus_tc.devs.star_tracker import StarTrackerActionIds
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 from tmtccmd.config.definitions import DataReplyUnpacked
 
 LOGGER = get_console_logger()

spacepackets

@@ -1 +1 @@
-Subproject commit 19e8a588fa0723a5991f80bb2fd52dfc64f0ac64
+Subproject commit 9cebf416583b0ce5b07081be9d832674ed4c9c4f

tmtccli.py

@@ -36,7 +36,7 @@ try:
         add_ccsds_handler,
     )
     from tmtccmd.ccsds.handler import CcsdsTmHandler
-    from tmtccmd.utility.logger import TMTC_LOGGER_NAME
+    from tmtccmd.logging import TMTC_LOGGER_NAME
 except ImportError as error:
     run_tmtc_commander = None
     initialize_tmtc_commander = None

tmtccmd

@@ -1 +1 @@
-Subproject commit 3cda2df79d2b3eb29855a29ff33df8e4d6f18ae1
+Subproject commit 1054a73859657bc18c9a215d1dea385121275b8a

utility/input_helper.py

@@ -6,7 +6,7 @@
 @date   13.02.2021
 """
 
-from tmtccmd.utility.logger import get_console_logger
+from tmtccmd.logging import get_console_logger
 
 LOGGER = get_console_logger()