From 3a72fad8219779783d8b740ea2d0ab53c27d10e6 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 20 May 2022 11:09:13 +0200
Subject: [PATCH] update tmtc

---
 fsfw                |  2 +-
 tmtc/common_tmtc    |  2 +-
 tmtc/config/hook.py | 11 +++++++++++
 tmtc/tmtccli.py     |  4 +++-
 tmtc/tmtccmd        |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 tmtc/config/hook.py

diff --git a/fsfw b/fsfw
index dac700b..8e2597f 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit dac700b80a98d9bfb5a9153c47589ce72c9381fc
+Subproject commit 8e2597f609f54d7b4fe58183a3ff955cc5930cc7
diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
index 756b300..7d197db 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 756b300c310a296c17d228036c66665f83f33343
+Subproject commit 7d197dbe4be46b63377936610ea0d01572c0a930
diff --git a/tmtc/config/hook.py b/tmtc/config/hook.py
new file mode 100644
index 0000000..46ee7ef
--- /dev/null
+++ b/tmtc/config/hook.py
@@ -0,0 +1,11 @@
+from common_tmtc.config.hook_implementation import CommonFsfwHookBase
+from tmtccmd.tc.definitions import TcQueueT
+
+
+class FsfwHookBase(CommonFsfwHookBase):
+    def pack_service_queue(self, service: int, op_code: str, service_queue: TcQueueT):
+        from common_tmtc.pus_tc.tc_packing import common_service_queue_user
+
+        common_service_queue_user(
+            service=service, op_code=op_code, tc_queue=service_queue
+        )
diff --git a/tmtc/tmtccli.py b/tmtc/tmtccli.py
index cb7f2e5..8bd32dc 100644
--- a/tmtc/tmtccli.py
+++ b/tmtc/tmtccli.py
@@ -7,10 +7,12 @@ from common_tmtc.tmtcc import (
     add_default_tmtccmd_args,
     parse_default_input_arguments,
 )
+from config.hook import FsfwHookBase
 
 
 def main():
-    hook_obj = tmtcc_pre_args()
+    tmtcc_pre_args()
+    hook_obj = FsfwHookBase(json_cfg_path="tmtc_conf.json")
     arg_parser = create_default_args_parser()
     add_default_tmtccmd_args(arg_parser)
     args = parse_default_input_arguments(arg_parser, hook_obj)
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 74cb9e7..aff56a0 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 74cb9e7f26c26f09028ae6fe0b61055ae26b8088
+Subproject commit aff56a02bd5dead2b6585ae50fa76297883a8130