diff --git a/.idea/runConfigurations/example.xml b/.idea/runConfigurations/example.xml new file mode 100644 index 0000000..4598e03 --- /dev/null +++ b/.idea/runConfigurations/example.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/example_common b/example_common index 43060b3..c483202 160000 --- a/example_common +++ b/example_common @@ -1 +1 @@ -Subproject commit 43060b3be7114813947d82e6eca55d069181988d +Subproject commit c483202852e3c0300164511de26b4e653cfba997 diff --git a/fsfw b/fsfw index 064b195..740644f 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit 064b195c752f2f6e7c0cb4660bb294cf8a8e6db1 +Subproject commit 740644f2c8398227734fd4a4110b3d8ae09f3351 diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc index 1f3e04b..4a90841 160000 --- a/tmtc/common_tmtc +++ b/tmtc/common_tmtc @@ -1 +1 @@ -Subproject commit 1f3e04bde45b73c2cfeb79316147de8b897b0878 +Subproject commit 4a908412822796b133254f95853f3604d7024a3f diff --git a/tmtc/config/hook.py b/tmtc/config/hook.py index 6676e3f..ee3705d 100644 --- a/tmtc/config/hook.py +++ b/tmtc/config/hook.py @@ -12,10 +12,11 @@ class FsfwHookBase(CommonFsfwHookBase): return common_fsfw_service_op_code_dict() def assign_communication_interface(self, com_if_key: str) -> Optional[ComInterface]: - from tmtccmd.config.com_if import create_communication_interface_default - - return create_communication_interface_default( + from tmtccmd.config.com_if import create_com_interface_default, \ + create_com_interface_cfg_default + cfg = create_com_interface_cfg_default( com_if_key=com_if_key, json_cfg_path=self.json_cfg_path, - space_packet_ids=TM_SP_IDS, + space_packet_ids=TM_SP_IDS ) + return create_com_interface_default(cfg) diff --git a/tmtc/deps/spacepackets b/tmtc/deps/spacepackets index 5317f4c..8d417d7 160000 --- a/tmtc/deps/spacepackets +++ b/tmtc/deps/spacepackets @@ -1 +1 @@ -Subproject commit 5317f4c384321b5b5d8832f51c530fa91d3b2ae5 +Subproject commit 8d417d7d8887982fcd9c7dc53c69d13a25e6bda0 diff --git a/tmtc/deps/tmtccmd b/tmtc/deps/tmtccmd index 4d34585..7729536 160000 --- a/tmtc/deps/tmtccmd +++ b/tmtc/deps/tmtccmd @@ -1 +1 @@ -Subproject commit 4d34585d45ede975f14e16c730390b6bd8343e8f +Subproject commit 77295364b3af77ebab576c703035387546aca736 diff --git a/tmtc/tmtcc.py b/tmtc/tmtcc.py index afafa06..c61a06a 100755 --- a/tmtc/tmtcc.py +++ b/tmtc/tmtcc.py @@ -16,8 +16,7 @@ from tmtccmd.logging.pus import ( TimedLogWhen, ) from tmtccmd.pus import VerificationWrapper -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter - +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter LOGGER = get_console_logger()