Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master

config/hook_implementations.py

@@ -13,7 +13,7 @@ from tmtccmd.pus.obj_id import ObjectIdDictT
 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.utility.tmtc_printer import FsfwTmTcPrinter
 from tmtccmd.config.globals import OpCodeDictKeys
 
 from config.definitions import CustomServiceList
@@ -50,13 +50,12 @@ class EiveHookObject(TmTcHookBase):
         )
 
     def assign_communication_interface(
-        self, com_if_key: str, tmtc_printer: TmTcPrinter
+        self, com_if_key: str
     ) -> Union[CommunicationInterface, None]:
         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(),
             space_packet_ids=(0x0865,),
         )
@@ -88,19 +87,6 @@ class EiveHookObject(TmTcHookBase):
             object_id=object_id, action_id=action_id, custom_data=custom_data
         )
 
-    @staticmethod
-    def handle_service_3_housekeeping(
-        object_id: bytes, set_id: int, hk_data: bytearray, service3_packet: Service3Base
-    ) -> HkReplyUnpacked:
-        from pus_tm.hk_handling import handle_user_hk_packet
-
-        return handle_user_hk_packet(
-            object_id=object_id,
-            set_id=set_id,
-            hk_data=hk_data,
-            service3_packet=service3_packet,
-        )
-
     @staticmethod
     def handle_service_5_event(
         object_id: bytes, event_id: int, param_1: int, param_2: int

config/object_ids.py

@@ -5,9 +5,10 @@
 """
 import os.path
 from tmtccmd.pus.obj_id import ObjectIdDictT
-from tmtccmd.utility.fsfw import parse_fsfw_objects_csv
+from tmtccmd.fsfw import parse_fsfw_objects_csv
 from tmtccmd.logging import get_console_logger
 
+
 LOGGER = get_console_logger()
 DEFAULT_OBJECTS_CSV_PATH = "config/objects.csv"
 __OBJECT_ID_DICT = None

config/retvals.py

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