diff --git a/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml b/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
index c1c76dd..1273551 100644
--- a/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Listener_Mode_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Service_17_UDP.xml b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
index 3301325..9bb6ff3 100644
--- a/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_17_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Service_200_UDP.xml b/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
index 1cce2c9..cec9e03 100644
--- a/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_200_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Service_2_UDP.xml b/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
index f45b13a..fec9dac 100644
--- a/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_2_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Service_3_UDP.xml b/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
index 7aacc07..232d098 100644
--- a/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_3_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Service_8_UDP.xml b/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
index ab11182..e80b75a 100644
--- a/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
+++ b/.idea/runConfigurations/tmtcc_Service_8_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml b/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
deleted file mode 100644
index e73b866..0000000
--- a/.idea/runConfigurations/tmtcc_Single_Command_UDP.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
index ce26d1c..3c13fbb 100644
--- a/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_ACU_Test_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
index 0755537..49c15a5 100644
--- a/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_P60_Dock_Test_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
index c268a80..3c6859b 100644
--- a/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU1_Test_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml b/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
index cb32038..c640826 100644
--- a/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
+++ b/.idea/runConfigurations/tmtcclient_PDU2_Test_UDP.xml
@@ -13,7 +13,7 @@
-
+
diff --git a/config/custom_mode_op.py b/config/custom_mode_op.py
index 7085520..a82797b 100644
--- a/config/custom_mode_op.py
+++ b/config/custom_mode_op.py
@@ -6,7 +6,7 @@
import enum
from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
LOGGER = get_logger()
diff --git a/config/globals_config.py b/config/globals_config.py
index 586aca7..fd17609 100644
--- a/config/globals_config.py
+++ b/config/globals_config.py
@@ -11,12 +11,11 @@ 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.core.definitions import CoreComInterfaces, CoreServiceList
-from tmtccmd.defaults.globals_setup import set_default_globals_pre_args_parsing, \
- set_default_globals_post_args_parsing, get_core_service_dict
+from tmtccmd.config.definitions import CoreComInterfaces, CoreServiceList, CoreGlobalIds
+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.core.definitions import CoreGlobalIds
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
LOGGER = get_logger()
@@ -27,29 +26,11 @@ class CustomGlobalIds(enum.Enum):
def set_globals_pre_args_parsing(gui: bool = False):
- set_default_globals_pre_args_parsing(gui=gui, apid=0x65, com_if_id=CoreComInterfaces.TCPIP_UDP)
-
- servicelist = get_core_service_dict()
- update_global(CoreGlobalIds.CURRENT_SERVICE, CoreServiceList.SERVICE_17)
- update_global(CoreGlobalIds.SERVICE_DICT, servicelist)
+ set_default_globals_pre_args_parsing(gui=gui, apid=0x65, com_if_id=CoreComInterfaces.TCPIP_UDP.value)
-def add_globals_post_args_parsing(args: argparse.Namespace):
+def add_globals_post_args_parsing(args: argparse.Namespace, json_cfg_path: str):
set_default_globals_post_args_parsing(
args=args, custom_services_list=[CustomServiceList],
- custom_modes_list=[CustomModeList],
- custom_com_ifs_lists=None
+ custom_modes_list=[CustomModeList], json_cfg_path=json_cfg_path
)
-
-
-def set_up_serial_cfg(com_if: CoreComInterfaces):
- from tmtccmd.defaults.com_setup import default_serial_cfg_setup
- default_serial_cfg_setup(com_if=com_if)
-
-
-def set_up_ethernet_cfg():
- from tmtccmd.defaults.com_setup import default_tcpip_udp_cfg_setup
- default_tcpip_udp_cfg_setup()
-
-
-
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 1005812..0df8e71 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -1,18 +1,29 @@
import argparse
from typing import Union, Dict, Tuple
+from tmtccmd.config.definitions import ServiceOpCodeDictT
from tmtccmd.pus_tm.service_3_base import Service3Base
from tmtccmd.ecss.tm import PusTelemetry
-from tmtccmd.ecss.tc import PusTelecommand
from tmtccmd.pus_tc.definitions import TcQueueT
from tmtccmd.com_if.com_interface_base import CommunicationInterface
from tmtccmd.core.backend import TmTcHandler
-from tmtccmd.core.hook_base import TmTcHookBase
+from tmtccmd.config.hook import TmTcHookBase
from tmtccmd.utility.tmtc_printer import TmTcPrinter
class EiveHookObject(TmTcHookBase):
+ def get_service_op_code_dictionary(self) -> ServiceOpCodeDictT:
+ from tmtccmd.config.globals import get_default_service_op_code_dict
+ return get_default_service_op_code_dict()
+
+ def get_json_config_file_path(self) -> str:
+ """
+ The user can specify a path and filename for the JSON configuration file by overriding this function.
+ :return:
+ """
+ return "config/tmtc_config.json"
+
def get_version(self) -> str:
from config.version import SW_NAME, VERSION_MAJOR, VERSION_MINOR, VERSION_SUBMINOR
return f"{SW_NAME} {VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_SUBMINOR}"
@@ -23,12 +34,14 @@ class EiveHookObject(TmTcHookBase):
def add_globals_post_args_parsing(self, args: argparse.Namespace):
from config.globals_config import add_globals_post_args_parsing
- add_globals_post_args_parsing(args)
+ add_globals_post_args_parsing(args=args, json_cfg_path=self.get_json_config_file_path())
- def assign_communication_interface(self, com_if: int, tmtc_printer: TmTcPrinter) -> \
+ def assign_communication_interface(self, com_if_key: str, tmtc_printer: TmTcPrinter) -> \
Union[CommunicationInterface, None]:
- from tmtccmd.defaults.com_setup import create_communication_interface_default
- return create_communication_interface_default(com_if=com_if, tmtc_printer=tmtc_printer)
+ from tmtccmd.config.com_if import create_communication_interface_default
+ return create_communication_interface_default(
+ com_if_key=com_if_key, tmtc_printer=tmtc_printer, json_cfg_path=self.get_json_config_file_path()
+ )
def perform_mode_operation(self, tmtc_backend: TmTcHandler, mode: int):
from config.custom_mode_op import custom_mode_operation
@@ -42,21 +55,13 @@ class EiveHookObject(TmTcHookBase):
from pus_tm.factory_hook import tm_user_factory_hook
return tm_user_factory_hook(raw_tm_packet=raw_tm_packet)
- def set_object_ids(self) -> Dict[int, bytearray]:
- from config.object_ids import set_object_ids
- return set_object_ids()
-
- def pack_total_service_queue(self) -> Union[None, TcQueueT]:
- from pus_tc.tc_packer_hook import create_total_tc_queue_user
- return create_total_tc_queue_user()
-
- def command_preparation_hook(self) -> Union[None, PusTelecommand]:
- from custom_hooks import command_preparation_hook
- return command_preparation_hook()
+ def get_object_ids(self) -> Dict[bytes, list]:
+ from config.object_ids import get_object_ids
+ return get_object_ids()
@staticmethod
def handle_service_8_telemetry(
- object_id: int, action_id: int, custom_data: bytearray
+ object_id: bytes, action_id: int, custom_data: bytearray
) -> Tuple[list, list]:
from pus_tm.service_8_hook import user_analyze_service_8_data
return user_analyze_service_8_data(
diff --git a/config/object_ids.py b/config/object_ids.py
index bffa66e..c1d6147 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -7,45 +7,31 @@
import enum
from typing import Dict
-PUS_SERVICE_17_ID = bytearray([0x53, 0x00, 0x00, 0x17])
-TEST_DEVICE_ID = bytearray([0x44, 0x00, 0xAF, 0xFE])
-P60_DOCK_HANDLER = bytearray([0x44, 0x00, 0x00, 0x1])
-PDU_1_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x2])
-PDU_2_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x3])
-ACU_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x4])
-TMP_1075_1_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x5])
-TMP_1075_2_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x6])
-HEATER_ID = bytearray([0x54, 0x00, 0x00, 0x1])
-PCDU_HANDLER_ID = bytearray([0x44, 0x00, 0x10, 0x00])
-SOLAR_ARRAY_DEPLOYMENT_ID = bytearray([0x44, 0x00, 0x10, 0x01])
+PUS_SERVICE_17_ID = bytes([0x53, 0x00, 0x00, 0x17])
+TEST_DEVICE_ID = bytes([0x44, 0x00, 0xAF, 0xFE])
+P60_DOCK_HANDLER = bytes([0x44, 0x00, 0x00, 0x1])
+PDU_1_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x2])
+PDU_2_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x3])
+ACU_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x4])
+TMP_1075_1_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x5])
+TMP_1075_2_HANDLER_ID = bytes([0x44, 0x00, 0x00, 0x6])
+HEATER_ID = bytes([0x54, 0x00, 0x00, 0x1])
+PCDU_HANDLER_ID = bytes([0x44, 0x00, 0x10, 0x00])
+SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x00, 0x10, 0x01])
-class ObjIdIds(enum.IntEnum):
- PUS_SERVICE_17_ID = 0
- TEST_DEVICE_ID = 1
- P60DOCK_HANDLER_ID = 2
- PDU1_HANDLER_ID = 3
- PDU2_HANDLER_ID = 4
- PCDU_HANDLER_ID = 5
- ACU_HANDLER_ID = 6
- TMP1075_1_HANDLER_ID = 7
- TMP1075_2_HANDLER_ID = 8
- HEATER_ID = 9
- SOLAR_ARRAY_DEPLOYMENT_ID = 10
-
-
-def set_object_ids() -> Dict[int, bytearray]:
+def get_object_ids() -> Dict[bytes, list]:
object_id_dict = ({
- ObjIdIds.PUS_SERVICE_17_ID: PUS_SERVICE_17_ID,
- ObjIdIds.TEST_DEVICE_ID: TEST_DEVICE_ID,
- ObjIdIds.P60DOCK_HANDLER_ID: P60_DOCK_HANDLER,
- ObjIdIds.PDU1_HANDLER_ID: PDU_1_HANDLER_ID,
- ObjIdIds.PDU2_HANDLER_ID: PDU_2_HANDLER_ID,
- ObjIdIds.ACU_HANDLER_ID: ACU_HANDLER_ID,
- ObjIdIds.TMP1075_1_HANDLER_ID: TMP_1075_1_HANDLER_ID,
- ObjIdIds.TMP1075_2_HANDLER_ID: TMP_1075_2_HANDLER_ID,
- ObjIdIds.HEATER_ID: HEATER_ID,
- ObjIdIds.PCDU_HANDLER_ID: PCDU_HANDLER_ID,
- ObjIdIds.SOLAR_ARRAY_DEPLOYMENT_ID: SOLAR_ARRAY_DEPLOYMENT_ID,
+ PUS_SERVICE_17_ID: "PUS Service 17",
+ TEST_DEVICE_ID: "Test Device",
+ P60_DOCK_HANDLER: "P60",
+ PDU_1_HANDLER_ID: "PCDU PDU1 Handler",
+ PDU_2_HANDLER_ID: "PCDU PDU2 Handler",
+ ACU_HANDLER_ID: "ACU Handler",
+ TMP_1075_1_HANDLER_ID: "TMP 1075 Handler 1",
+ TMP_1075_2_HANDLER_ID: "TMP 1075 Handler 2",
+ HEATER_ID: "Heater",
+ PCDU_HANDLER_ID: "PCDU",
+ SOLAR_ARRAY_DEPLOYMENT_ID: "Solar Array Deployment",
})
return object_id_dict
diff --git a/pus_tc/acu.py b/pus_tc/acu.py
index 8af2a0e..969e0fb 100644
--- a/pus_tc/acu.py
+++ b/pus_tc/acu.py
@@ -8,11 +8,11 @@
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.ecss.tc import PusTelecommand
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from gomspace.gomspace_common import *
from pus_tc.p60dock import P60DockConfigTable
-from config.object_ids import ObjIdIds
-from tmtccmd.core.object_id_manager import get_object_id
+
+from config.object_ids import P60_DOCK_HANDLER
class ACUTestProcedure:
@@ -57,7 +57,7 @@ def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
tc_queue.appendleft((QueueCommands.PRINT, "Testing ACU"))
tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling ACU connected to X1 slot (channel 0)"))
- p60dock_object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID)
+ p60dock_object_id = P60_DOCK_HANDLER
command = pack_set_param_command(p60dock_object_id, P60DockConfigTable.out_en_0.parameter_address,
P60DockConfigTable.out_en_0.parameter_size, Channel.on)
command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command)
diff --git a/pus_tc/heater.py b/pus_tc/heater.py
index 1fff68c..51a247f 100644
--- a/pus_tc/heater.py
+++ b/pus_tc/heater.py
@@ -5,7 +5,7 @@
@author J. Meier
@date 30.01.2021
"""
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.ecss.tc import PusTelecommand
diff --git a/pus_tc/p60dock.py b/pus_tc/p60dock.py
index 1fce2dd..e269047 100644
--- a/pus_tc/p60dock.py
+++ b/pus_tc/p60dock.py
@@ -5,7 +5,7 @@
@author J. Meier
@date 13.12.2020
"""
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.ecss.tc import PusTelecommand
from gomspace.gomspace_common import *
diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index e95b80e..27c0dd3 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -5,7 +5,7 @@
@author J. Meier
@date 17.12.2020
"""
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.ecss.tc import PusTelecommand
diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py
index 48ee1c1..c502940 100644
--- a/pus_tc/pdu2.py
+++ b/pus_tc/pdu2.py
@@ -5,7 +5,7 @@
@author J. Meier
@date 17.12.2020
"""
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.ecss.tc import PusTelecommand
from gomspace.gomspace_common import *
diff --git a/pus_tc/service_200_mode.py b/pus_tc/service_200_mode.py
index e4ec905..c49f5e0 100644
--- a/pus_tc/service_200_mode.py
+++ b/pus_tc/service_200_mode.py
@@ -5,7 +5,7 @@
@author R. Mueller
@date 02.05.2020
"""
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from tmtccmd.ecss.tc import PusTelecommand
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.pus_tc.service_200_mode import pack_mode_data
diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index ed88b19..acf5c7e 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -8,12 +8,11 @@ import os
from collections import deque
from typing import Union
-from tmtccmd.core.definitions import CoreServiceList
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.config.definitions import CoreServiceList
+from tmtccmd.utility.logger import get_logger
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_17_test import pack_service17_ping_command
-from tmtccmd.core.object_id_manager import get_object_id
from pus_tc.p60dock import pack_p60dock_test_into
from pus_tc.pdu2 import pack_pdu2_test_into
@@ -22,39 +21,40 @@ from pus_tc.acu import pack_acu_test_into
from pus_tc.tmp1075 import pack_tmp1075_test_into
from pus_tc.heater import pack_heater_test_into
from config.definitions import CustomServiceList
-from config.object_ids import ObjIdIds
+from config.object_ids import P60_DOCK_HANDLER, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, ACU_HANDLER_ID, \
+ TMP_1075_1_HANDLER_ID, TMP_1075_2_HANDLER_ID, HEATER_ID
LOGGER = get_logger()
def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):
- if service == CoreServiceList.SERVICE_5:
+ if service == CoreServiceList.SERVICE_5.value:
return pack_generic_service5_test_into(service_queue)
- if service == CoreServiceList.SERVICE_17:
+ if service == CoreServiceList.SERVICE_17.value:
return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple())
if service == CustomServiceList.P60DOCK.value:
- object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID)
+ object_id = P60_DOCK_HANDLER
return pack_p60dock_test_into(object_id, service_queue)
if service == CustomServiceList.PDU1.value:
- pdu1_object_id = get_object_id(ObjIdIds.PDU1_HANDLER_ID)
- p60dock_object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID)
+ pdu1_object_id = PDU_1_HANDLER_ID
+ p60dock_object_id = P60_DOCK_HANDLER
return pack_pdu1_test_into(pdu1_object_id, p60dock_object_id, service_queue)
if service == CustomServiceList.PDU2.value:
- pdu2_object_id = get_object_id(ObjIdIds.PDU2_HANDLER_ID)
- p60dock_object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID)
+ pdu2_object_id = PDU_2_HANDLER_ID
+ p60dock_object_id = P60_DOCK_HANDLER
return pack_pdu2_test_into(pdu2_object_id, p60dock_object_id, service_queue)
if service == CustomServiceList.ACU.value:
- object_id = get_object_id(ObjIdIds.ACU_HANDLER_ID)
+ object_id = ACU_HANDLER_ID
return pack_acu_test_into(object_id, service_queue)
if service == CustomServiceList.TMP1075_1.value:
- object_id = get_object_id(ObjIdIds.TMP1075_1_HANDLER_ID)
+ object_id = TMP_1075_1_HANDLER_ID
return pack_tmp1075_test_into(object_id, service_queue)
if service == CustomServiceList.TMP1075_2.value:
- object_id = get_object_id(ObjIdIds.TMP1075_2_HANDLER_ID)
+ object_id = TMP_1075_2_HANDLER_ID
return pack_tmp1075_test_into(object_id, service_queue)
if service == CustomServiceList.HEATER.value:
- object_id = get_object_id(ObjIdIds.HEATER)
+ object_id = HEATER_ID
return pack_heater_test_into(object_id, service_queue)
LOGGER.warning("Invalid Service !")
diff --git a/pus_tc/tmp1075.py b/pus_tc/tmp1075.py
index 7b667cb..21a75e0 100644
--- a/pus_tc/tmp1075.py
+++ b/pus_tc/tmp1075.py
@@ -5,7 +5,7 @@
@author J. Meier
@date 06.01.2021
"""
-from tmtccmd.core.definitions import QueueCommands
+from tmtccmd.config.definitions import QueueCommands
from tmtccmd.pus_tc.packer import TcQueueT
from tmtccmd.ecss.tc import PusTelecommand
diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 74e1631..b9dc0cf 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -5,7 +5,7 @@
"""
from tmtccmd.pus_tm.service_8_functional_cmd import Service8TM
from tmtccmd.ecss.tm import PusTelemetry
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
from tmtccmd.pus_tm.service_1_verification import Service1TM
from tmtccmd.pus_tm.service_5_event import Service5TM
diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py
index b23a3ee..b3d2595 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -7,7 +7,7 @@
from typing import Tuple
from tmtccmd.pus_tm.service_3_base import Service3Base
-from tmtccmd.utility.tmtcc_logger import get_logger
+from tmtccmd.utility.logger import get_logger
LOGGER = get_logger()
diff --git a/pus_tm/service_8_hook.py b/pus_tm/service_8_hook.py
index 12a8617..41d6eb9 100644
--- a/pus_tm/service_8_hook.py
+++ b/pus_tm/service_8_hook.py
@@ -1,9 +1,9 @@
from typing import Tuple
-from config.object_ids import ObjIdIds
+from config.object_ids import PDU_2_HANDLER_ID
def user_analyze_service_8_data(
- object_id: int, action_id: int, custom_data: bytearray) -> Tuple[list, list]:
+ object_id: bytes, action_id: int, custom_data: bytearray) -> Tuple[list, list]:
"""
This function is called by the TMTC core if a Service 8 data reply (subservice 130)
is received. The user can return a tuple of two lists, where the first list
@@ -15,7 +15,7 @@ def user_analyze_service_8_data(
@param custom_data:
@return:
"""
- if object_id == ObjIdIds.PDU2_HANDLER_ID.value:
+ if object_id == PDU_2_HANDLER_ID:
header_list = ['PDU2 Service 8 Reply']
data_string = str()
diff --git a/tmtccmd b/tmtccmd
index 74a86e5..8ca16e3 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 74a86e54ecccab514ce19e7e722570b78dedd5d6
+Subproject commit 8ca16e305d18eb8df2165680676992261af99c1b