From af618f5652714609ed640d5ed5fafc4056424d01 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Sun, 3 Jul 2022 19:29:53 +0200
Subject: [PATCH] start updating tmtccmd

---
 .../CMD_Assemly_to_Normal.xml                 |  2 +-
 .../.idea/runConfigurations/PUS_Mode_Test.xml |  2 +-
 tmtc/.idea/runConfigurations/PUS_Ping.xml     |  2 +-
 .../runConfigurations/PUS_Srv3_One_HK.xml     |  2 +-
 tmtc/.idea/runConfigurations/TMTC_CLI.xml     |  2 +-
 tmtc/common_tmtc                              |  2 +-
 tmtc/tmtcc.py                                 | 28 +++++++++++++++++++
 tmtc/tmtccli.py                               | 23 ---------------
 tmtc/tmtcgui.py                               | 12 --------
 9 files changed, 34 insertions(+), 41 deletions(-)
 create mode 100644 tmtc/tmtcc.py
 delete mode 100644 tmtc/tmtccli.py
 delete mode 100644 tmtc/tmtcgui.py

diff --git a/tmtc/.idea/runConfigurations/CMD_Assemly_to_Normal.xml b/tmtc/.idea/runConfigurations/CMD_Assemly_to_Normal.xml
index 8621e2d..002f7a1 100644
--- a/tmtc/.idea/runConfigurations/CMD_Assemly_to_Normal.xml
+++ b/tmtc/.idea/runConfigurations/CMD_Assemly_to_Normal.xml
@@ -12,7 +12,7 @@
     <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$/tmtccli.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
     <option name="PARAMETERS" value="-s 200 -o asm_to_normal -t 6 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/tmtc/.idea/runConfigurations/PUS_Mode_Test.xml b/tmtc/.idea/runConfigurations/PUS_Mode_Test.xml
index 979127f..96c62d8 100644
--- a/tmtc/.idea/runConfigurations/PUS_Mode_Test.xml
+++ b/tmtc/.idea/runConfigurations/PUS_Mode_Test.xml
@@ -12,7 +12,7 @@
     <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$/tmtccli.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
     <option name="PARAMETERS" value="-s 200 -o test -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/tmtc/.idea/runConfigurations/PUS_Ping.xml b/tmtc/.idea/runConfigurations/PUS_Ping.xml
index 2d88794..8cdd2f8 100644
--- a/tmtc/.idea/runConfigurations/PUS_Ping.xml
+++ b/tmtc/.idea/runConfigurations/PUS_Ping.xml
@@ -12,7 +12,7 @@
     <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$/tmtccli.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
     <option name="PARAMETERS" value="-s 17 -o 0 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/tmtc/.idea/runConfigurations/PUS_Srv3_One_HK.xml b/tmtc/.idea/runConfigurations/PUS_Srv3_One_HK.xml
index 57b1d30..340fa2d 100644
--- a/tmtc/.idea/runConfigurations/PUS_Srv3_One_HK.xml
+++ b/tmtc/.idea/runConfigurations/PUS_Srv3_One_HK.xml
@@ -12,7 +12,7 @@
     <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$/tmtccli.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
     <option name="PARAMETERS" value="-s 3 -o 1 -l" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
diff --git a/tmtc/.idea/runConfigurations/TMTC_CLI.xml b/tmtc/.idea/runConfigurations/TMTC_CLI.xml
index 5758fd7..d4ebcec 100644
--- a/tmtc/.idea/runConfigurations/TMTC_CLI.xml
+++ b/tmtc/.idea/runConfigurations/TMTC_CLI.xml
@@ -12,7 +12,7 @@
     <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$/tmtccli.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtcc.py" />
     <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="true" />
diff --git a/tmtc/common_tmtc b/tmtc/common_tmtc
index 3cca54f..4cc02d2 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 3cca54f66fe72f292787499e1e9bf2497a2cfdbf
+Subproject commit 4cc02d287d48569f4c8b6aed836098efb2b0ea41
diff --git a/tmtc/tmtcc.py b/tmtc/tmtcc.py
new file mode 100644
index 0000000..74dbe56
--- /dev/null
+++ b/tmtc/tmtcc.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+"""TMTC commander for FSFW Example"""
+import tmtccmd
+from common_tmtc.common import (
+    tmtcc_post_args,
+    tmtcc_pre_args
+)
+from config.hook import FsfwHookBase
+from examples.tmtcc import EXAMPLE_APID
+from tmtccmd.config import SetupParams, ArgParserWrapper, SetupWrapper
+
+
+def main():
+    tmtcc_pre_args()
+    hook_obj = FsfwHookBase(json_cfg_path="tmtc_conf.json")
+    params = SetupParams()
+    parser_wrapper = ArgParserWrapper(hook_obj)
+    parser_wrapper.parse()
+    tmtccmd.init_printout(parser_wrapper.use_gui)
+    parser_wrapper.set_params(params)
+    params.apid = EXAMPLE_APID
+    setup_wrapper = SetupWrapper(hook_obj, params)
+
+    tmtcc_post_args(hook_obj=hook_obj, use_gui=False, args=args)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tmtc/tmtccli.py b/tmtc/tmtccli.py
deleted file mode 100644
index 8bd32dc..0000000
--- a/tmtc/tmtccli.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-"""TMTC commander for FSFW Example"""
-from common_tmtc.tmtcc import (
-    tmtcc_post_args,
-    tmtcc_pre_args,
-    create_default_args_parser,
-    add_default_tmtccmd_args,
-    parse_default_input_arguments,
-)
-from config.hook import FsfwHookBase
-
-
-def main():
-    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)
-    tmtcc_post_args(hook_obj=hook_obj, use_gui=False, args=args)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tmtc/tmtcgui.py b/tmtc/tmtcgui.py
deleted file mode 100644
index cd4934b..0000000
--- a/tmtc/tmtcgui.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env python3
-"""TMTC commander for the FSFW Example"""
-from common_tmtc.tmtcc import tmtcc_post_args, tmtcc_pre_args
-
-
-def main():
-    hook_obj = tmtcc_pre_args()
-    tmtcc_post_args(hook_obj=hook_obj, use_gui=True, args=None)
-
-
-if __name__ == "__main__":
-    main()