From a82e6b2e64e271eecc23fdbe3c403c417bb65e39 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 16:01:53 +0200
Subject: [PATCH 1/7] update tmtccmd

---
 tmtccmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmtccmd b/tmtccmd
index fcf182c..74a86e5 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit fcf182c5e555b8abe05a5737142e82e8b1f805f6
+Subproject commit 74a86e54ecccab514ce19e7e722570b78dedd5d6

From acb48916cf5782b42e73ff95792cf440af179ae0 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 17:42:04 +0200
Subject: [PATCH 2/7] updated tmtccmd

---
 .../tmtcc_Listener_Mode_UDP.xml               |  2 +-
 .../tmtcc_Service_17_UDP.xml                  |  2 +-
 .../tmtcc_Service_200_UDP.xml                 |  2 +-
 .../runConfigurations/tmtcc_Service_2_UDP.xml |  2 +-
 .../runConfigurations/tmtcc_Service_3_UDP.xml |  2 +-
 .../runConfigurations/tmtcc_Service_8_UDP.xml |  2 +-
 .../tmtcc_Single_Command_UDP.xml              | 24 --------
 .../tmtcclient_ACU_Test_UDP.xml               |  2 +-
 .../tmtcclient_P60_Dock_Test_UDP.xml          |  2 +-
 .../tmtcclient_PDU1_Test_UDP.xml              |  2 +-
 .../tmtcclient_PDU2_Test_UDP.xml              |  2 +-
 config/custom_mode_op.py                      |  2 +-
 config/globals_config.py                      | 33 +++-------
 config/hook_implementations.py                | 41 +++++++------
 config/object_ids.py                          | 60 +++++++------------
 pus_tc/acu.py                                 |  8 +--
 pus_tc/heater.py                              |  2 +-
 pus_tc/p60dock.py                             |  2 +-
 pus_tc/pdu1.py                                |  2 +-
 pus_tc/pdu2.py                                |  2 +-
 pus_tc/service_200_mode.py                    |  2 +-
 pus_tc/tc_packer_hook.py                      | 30 +++++-----
 pus_tc/tmp1075.py                             |  2 +-
 pus_tm/factory_hook.py                        |  2 +-
 pus_tm/hk_handling.py                         |  2 +-
 pus_tm/service_8_hook.py                      |  6 +-
 tmtccmd                                       |  2 +-
 27 files changed, 95 insertions(+), 147 deletions(-)
 delete mode 100644 .idea/runConfigurations/tmtcc_Single_Command_UDP.xml

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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m 2 -c 2 --hk" />
+    <option name="PARAMETERS" value="-m listener --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s 17 -t 3" />
+    <option name="PARAMETERS" value="-s 17 -o 0 -t 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s 200 -t 4" />
+    <option name="PARAMETERS" value="-s 200 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s 2 -t 4" />
+    <option name="PARAMETERS" value="-s 2 -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s 3 -p --hk" />
+    <option name="PARAMETERS" value="-s 3 -p --hk" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s 8 -t 8" />
+    <option name="PARAMETERS" value="-s 8 -t 8" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tmtcc Single Command UDP" type="PythonConfigurationType" factoryName="Python" folderName="PUS">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_core/tmtcc_runner.py" />
-    <option name="PARAMETERS" value="-m listener -c udp" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="false" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ 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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s acu --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-s acu -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s p60dock --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-s p60dock -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s pdu1 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l" />
+    <option name="PARAMETERS" value="-s pdu1 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtc_client_cli.py" />
-    <option name="PARAMETERS" value="-m seqcmd -c udp -s pdu2 --boardIP 192.168.133.10 --clientIP 192.168.133.4 -l -t 4" />
+    <option name="PARAMETERS" value="-s pdu2 -l -t 4" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
     <option name="MODULE_MODE" value="false" />
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

From e8f48480f5ddc8683cd156295cc0a044cd0ea688 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 17:48:02 +0200
Subject: [PATCH 3/7] passing through op code

---
 pus_tc/tc_packer_hook.py | 20 ++++++++++++--------
 pus_tc/tmp1075.py        |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py
index acf5c7e..aaa84d2 100644
--- a/pus_tc/tc_packer_hook.py
+++ b/pus_tc/tc_packer_hook.py
@@ -30,32 +30,36 @@ LOGGER = get_logger()
 
 def pack_service_queue_user(service: Union[str, int], op_code: str, service_queue: TcQueueT):
     if service == CoreServiceList.SERVICE_5.value:
-        return pack_generic_service5_test_into(service_queue)
+        return pack_generic_service5_test_into(tc_queue=service_queue)
     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 = P60_DOCK_HANDLER
-        return pack_p60dock_test_into(object_id, service_queue)
+        return pack_p60dock_test_into(object_id=object_id, tc_queue=service_queue)
     if service == CustomServiceList.PDU1.value:
         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)
+        return pack_pdu1_test_into(
+            pdu1_object_id=pdu1_object_id, p60dock_object_id=p60dock_object_id, tc_queue=service_queue
+        )
     if service == CustomServiceList.PDU2.value:
         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)
+        return pack_pdu2_test_into(
+            pdu2_object_id=pdu2_object_id, p60dock_object_id=p60dock_object_id, tc_queue=service_queue
+        )
     if service == CustomServiceList.ACU.value:
         object_id = ACU_HANDLER_ID
-        return pack_acu_test_into(object_id, service_queue)
+        return pack_acu_test_into(object_id=object_id, tc_queue=service_queue)
     if service == CustomServiceList.TMP1075_1.value:
         object_id = TMP_1075_1_HANDLER_ID
-        return pack_tmp1075_test_into(object_id, service_queue)
+        return pack_tmp1075_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.TMP1075_2.value:
         object_id = TMP_1075_2_HANDLER_ID
-        return pack_tmp1075_test_into(object_id, service_queue)
+        return pack_tmp1075_test_into(object_id=object_id, tc_queue=service_queue, op_code=op_code)
     if service == CustomServiceList.HEATER.value:
         object_id = HEATER_ID
-        return pack_heater_test_into(object_id, service_queue)
+        return pack_heater_test_into(object_id=object_id, tc_queue=service_queue)
     LOGGER.warning("Invalid Service !")
 
 
diff --git a/pus_tc/tmp1075.py b/pus_tc/tmp1075.py
index 21a75e0..311c39f 100644
--- a/pus_tc/tmp1075.py
+++ b/pus_tc/tmp1075.py
@@ -30,7 +30,7 @@ class Tmp1075ActionIds:
     start_adc_conversion = bytearray([0x0, 0x0, 0x0, 0x02])
 
 
-def pack_tmp1075_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_tmp1075_test_into(object_id: bytearray, op_code:  str, tc_queue: TcQueueT) -> TcQueueT:
     tc_queue.appendleft(
         (QueueCommands.PRINT,
          "Testing Tmp1075 Temperature Sensor Handler with object id: 0x" + object_id.hex())

From eb9e93fbee473247b76f86923ec52da40d1a27da Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 17:59:24 +0200
Subject: [PATCH 4/7] updated GUI

---
 config/definitions.py          |  5 +++-
 config/hook_implementations.py | 47 ++++++++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/config/definitions.py b/config/definitions.py
index f48c235..a0b54b5 100644
--- a/config/definitions.py
+++ b/config/definitions.py
@@ -8,10 +8,13 @@ import enum
 
 
 class CustomServiceList(enum.Enum):
+    TEST_DEVICE = "test",
     P60DOCK = "p60dock"
     PDU1 = "pdu1"
     PDU2 = "pdu2"
     ACU = "acu"
     TMP1075_1 = "tmp1075_1"
     TMP1075_2 = "tmp1075_2"
-    HEATER = "heater"
+    HEATER = "heater",
+    PCDU = "pcdu",
+    SA_DEPLYOMENT = "sa_depl"
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 0df8e71..74f106c 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
+from tmtccmd.config.definitions import ServiceOpCodeDictT, CoreServiceList
 from tmtccmd.pus_tm.service_3_base import Service3Base
 from tmtccmd.ecss.tm import PusTelemetry
 from tmtccmd.pus_tc.definitions import TcQueueT
@@ -9,13 +9,56 @@ from tmtccmd.com_if.com_interface_base import CommunicationInterface
 from tmtccmd.core.backend import TmTcHandler
 from tmtccmd.config.hook import TmTcHookBase
 from tmtccmd.utility.tmtc_printer import TmTcPrinter
+from tmtccmd.config.globals import OpCodeDictKeys
+
+from config.definitions import CustomServiceList
 
 
 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()
+        service_op_code_dict = get_default_service_op_code_dict()
+        op_code_dict_srv_acu = {
+            "0": ("ACU Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_acu_tuple = ("ACU Devices", op_code_dict_srv_acu)
+
+        op_code_dict_srv_tmp1075 = {
+            "0": ("TMP1075 Tests", {OpCodeDictKeys.TIMEOUT: 2.2}),
+        }
+        service_tmp1075_1_tuple = ("TMP1075 1", op_code_dict_srv_tmp1075)
+        service_tmp1075_2_tuple = ("TMP1075 2", op_code_dict_srv_tmp1075)
+
+        op_code_dict_srv_p60 = {
+            "0": ("P60 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_p60_tuple = ("P60 Device", op_code_dict_srv_p60)
+
+        op_code_dict_srv_pdu1 = {
+            "0": ("PDU1 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_pdu1_tuple = ("PDU1 Device", op_code_dict_srv_pdu1)
+
+        op_code_dict_srv_pdu2 = {
+            "0": ("PDU2 Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_pdu2_tuple = ("PDU2 Device", op_code_dict_srv_pdu2)
+
+        op_code_dict_srv_heater = {
+            "0": ("Heater Tests", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        }
+        service_heater_tuple = ("Heater Device", op_code_dict_srv_heater)
+
+        service_op_code_dict[CustomServiceList.ACU.value] = service_acu_tuple
+        service_op_code_dict[CustomServiceList.TMP1075_1.value] = service_tmp1075_1_tuple
+        service_op_code_dict[CustomServiceList.TMP1075_2.value] = service_tmp1075_2_tuple
+        service_op_code_dict[CustomServiceList.P60DOCK.value] = service_p60_tuple
+        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu1_tuple
+        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu2_tuple
+        service_op_code_dict[CustomServiceList.PDU1.value] = service_pdu2_tuple
+        service_op_code_dict[CustomServiceList.HEATER.value] = service_heater_tuple
+        return service_op_code_dict
 
     def get_json_config_file_path(self) -> str:
         """

From 877b9bb5c10be7fc000d8ffdc13f9b285be3c0c9 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 18:01:55 +0200
Subject: [PATCH 5/7] 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
+    )

From 16ec4a1914cc2668dc314167c9b0537f989b295a Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 18:08:43 +0200
Subject: [PATCH 6/7] merge origin development

---
 config/object_ids.py                               |  1 +
 ...ray_deployment.py => solar_array_deployment.py} | 10 +++++-----
 ...rlinks_hk_handler.py => syrlinks_hk_handler.py} | 13 +++++--------
 ...pus_hk_handling_hook.py => hk_handling_hook.py} | 14 ++++++--------
 4 files changed, 17 insertions(+), 21 deletions(-)
 rename pus_tc/{tmtcc_tc_solar_array_deployment.py => solar_array_deployment.py} (69%)
 rename pus_tc/{tmtcc_tc_syrlinks_hk_handler.py => syrlinks_hk_handler.py} (68%)
 rename pus_tm/{tmtcc_pus_hk_handling_hook.py => hk_handling_hook.py} (88%)

diff --git a/config/object_ids.py b/config/object_ids.py
index 8548be7..1ae3693 100644
--- a/config/object_ids.py
+++ b/config/object_ids.py
@@ -16,6 +16,7 @@ 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])
+SYRLINKS_HANDLER = bytes([0x44, 0x00, 0x10, 0x02])
 
 
 def get_object_ids() -> Dict[bytes, list]:
diff --git a/pus_tc/tmtcc_tc_solar_array_deployment.py b/pus_tc/solar_array_deployment.py
similarity index 69%
rename from pus_tc/tmtcc_tc_solar_array_deployment.py
rename to pus_tc/solar_array_deployment.py
index 3ea5f44..6b63cae 100644
--- a/pus_tc/tmtcc_tc_solar_array_deployment.py
+++ b/pus_tc/solar_array_deployment.py
@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_solar_array_deployment.py
+@file   solar_array_deployment.py
 @brief  The test function in this file simply returns a command which triggers the solar array deployment.
 @author J. Meier
 @date   15.02.2021
 """
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
+from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.pus_tc.definitions import TcQueueT
+from tmtccmd.pus_tc.packer import PusTelecommand
 
 
 class ActionIds:
     DEPLOY_SOLAR_ARRAYS = bytearray([0x0, 0x0, 0x0, 0x5])
 
 
-def pack_solar_array_deployment_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_solar_array_deployment_test_into(object_id: bytearray, tc_queue: TcQueueT):
     tc_queue.appendleft((QueueCommands.PRINT, "Testing S/A Deployment"))
 
     command = object_id + ActionIds.DEPLOY_SOLAR_ARRAYS
diff --git a/pus_tc/tmtcc_tc_syrlinks_hk_handler.py b/pus_tc/syrlinks_hk_handler.py
similarity index 68%
rename from pus_tc/tmtcc_tc_syrlinks_hk_handler.py
rename to pus_tc/syrlinks_hk_handler.py
index 74f3caa..b3b8be7 100644
--- a/pus_tc/tmtcc_tc_syrlinks_hk_handler.py
+++ b/pus_tc/syrlinks_hk_handler.py
@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 """
-@file   tmtcc_tc_syrlinks_hk_handler.py
+@file   syrlinks_hk_handler.py
 @brief  Syrlinks Hk Handler tests
 @author J. Meier
 @date   13.12.2020
 """
 
-from tmtc_core.core.tmtc_core_definitions import QueueCommands
-from tmtc_core.pus_tc.tmtcc_pus_tc_packer import TcQueueT
-from tmtc_core.pus_tc.tmtcc_pus_tc_base import PusTelecommand
-from tmtc_core.pus_tc.tmtcc_tc_service_3_housekeeping import *
+from tmtccmd.config.definitions import QueueCommands
+from tmtccmd.pus_tc.definitions import TcQueueT
+from tmtccmd.pus_tc.service_3_housekeeping import make_sid, generate_one_hk_command
 
 
 class SetIds:
@@ -17,7 +16,7 @@ class SetIds:
     TX_REGISTERS_DATASET = 2
 
 
-def pack_syrlinks_hk_handler_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT:
+def pack_syrlinks_hk_handler_test_into(object_id: bytearray, tc_queue: TcQueueT):
     tc_queue.appendleft((QueueCommands.PRINT, "Syrlinks: Get RX Registers"))
     sid = make_sid(object_id, SetIds.RX_REGISTERS_DATASET)
     command = generate_one_hk_command(sid, 200)
@@ -27,5 +26,3 @@ def pack_syrlinks_hk_handler_test_into(object_id: bytearray, tc_queue: TcQueueT)
     sid = make_sid(object_id, SetIds.TX_REGISTERS_DATASET)
     command = generate_one_hk_command(sid, 201)
     tc_queue.appendleft(command.pack_command_tuple())
-
-    return tc_queue
diff --git a/pus_tm/tmtcc_pus_hk_handling_hook.py b/pus_tm/hk_handling_hook.py
similarity index 88%
rename from pus_tm/tmtcc_pus_hk_handling_hook.py
rename to pus_tm/hk_handling_hook.py
index 9a07777..32e6cba 100644
--- a/pus_tm/tmtcc_pus_hk_handling_hook.py
+++ b/pus_tm/hk_handling_hook.py
@@ -7,16 +7,14 @@
 import struct
 from typing import Tuple
 
-from config.tmtcc_object_ids import ObjectIds
-from tmtc_core.pus_tm.tmtcc_tm_service3_base import Service3Base
-from tmtc_core.utility.tmtcc_logger import get_logger
-from config.tmtcc_object_ids import ObjectIds
-from pus_tc.tmtcc_tc_syrlinks_hk_handler import SetIds
-
+from tmtccmd.pus_tm.service_3_housekeeping import Service3Base
+from tmtccmd.utility.logger import get_logger
+from pus_tc.syrlinks_hk_handler import SetIds
+from config.object_ids import SYRLINKS_HANDLER
 LOGGER = get_logger()
 
 
-def handle_user_hk_packet(object_id: ObjectIds, set_id: int, hk_data: bytearray,
+def handle_user_hk_packet(object_id: bytes, set_id: int, hk_data: bytearray,
                           service3_packet: Service3Base) -> Tuple[list, list, bytearray, int]:
     """
     This function is called when a Service 3 Housekeeping packet is received.
@@ -37,7 +35,7 @@ def handle_user_hk_packet(object_id: ObjectIds, set_id: int, hk_data: bytearray,
     the corresponding values. The bytearray is the validity buffer, which is usually appended
     at the end of the housekeeping packet. The last value is the number of parameters.
     """
-    if object_id == ObjectIds.SYRLINKS_HK_HANDLER:
+    if object_id == SYRLINKS_HANDLER:
         if set_id == SetIds.RX_REGISTERS_DATASET:
             return handle_syrlinks_rx_registers_dataset(hk_data)
         elif set_id == SetIds.TX_REGISTERS_DATASET:

From 74c9da8504b36b33110285f2797a06101b475eec Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 17 May 2021 18:14:52 +0200
Subject: [PATCH 7/7] bumped minor version

---
 config/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/version.py b/config/version.py
index 3882357..a6e02b7 100644
--- a/config/version.py
+++ b/config/version.py
@@ -1,4 +1,4 @@
 SW_NAME = "eive"
 VERSION_MAJOR = 1
-VERSION_MINOR = 4
+VERSION_MINOR = 5
 VERSION_SUBMINOR = 0