From a868ddcb83807e355a82ff0b6786e49965082bf2 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 13 Oct 2021 12:09:21 +0200
Subject: [PATCH] tmtc updates

---
 .gitmodules                                   |  3 +++
 tmtc/.idea/runConfigurations/PUS_3_One_HK.xml | 24 +++++++++++++++++++
 tmtc/common_tmtc                              |  2 +-
 tmtc/spacepackets                             |  1 +
 tmtc/tmtc_client_cli.py                       |  3 +++
 tmtc/tmtccmd                                  |  2 +-
 6 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 tmtc/.idea/runConfigurations/PUS_3_One_HK.xml
 create mode 160000 tmtc/spacepackets

diff --git a/.gitmodules b/.gitmodules
index 0e30c7b..f7e38cb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "tmtc/common_tmtc"]
 	path = tmtc/common_tmtc
 	url = https://egit.irs.uni-stuttgart.de/fsfw/fsfw-example-tmtc-common.git
+[submodule "tmtc/spacepackets"]
+	path = tmtc/spacepackets
+	url = https://github.com/robamu-org/py-spacepackets.git
diff --git a/tmtc/.idea/runConfigurations/PUS_3_One_HK.xml b/tmtc/.idea/runConfigurations/PUS_3_One_HK.xml
new file mode 100644
index 0000000..86a42d4
--- /dev/null
+++ b/tmtc/.idea/runConfigurations/PUS_3_One_HK.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PUS 3 One HK" 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_client_cli.py" />
+    <option name="PARAMETERS" value="-s 3 -o 1 -l" />
+    <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/tmtc/common_tmtc b/tmtc/common_tmtc
index 22ea3ee..4b6ab8d 160000
--- a/tmtc/common_tmtc
+++ b/tmtc/common_tmtc
@@ -1 +1 @@
-Subproject commit 22ea3eea9278c3f73c0f804dc3618ea004fe224b
+Subproject commit 4b6ab8d00accc368e22956e3896976fcae37e177
diff --git a/tmtc/spacepackets b/tmtc/spacepackets
new file mode 160000
index 0000000..38d7474
--- /dev/null
+++ b/tmtc/spacepackets
@@ -0,0 +1 @@
+Subproject commit 38d74744a759a0a89d5edf5155b95728ca96b3d2
diff --git a/tmtc/tmtc_client_cli.py b/tmtc/tmtc_client_cli.py
index d22134a..557155d 100755
--- a/tmtc/tmtc_client_cli.py
+++ b/tmtc/tmtc_client_cli.py
@@ -28,12 +28,14 @@ limitations under the License.
 """
 import sys
 
+from spacepackets.log import set_custom_console_logger_name
 from common_tmtc.config.hook_implementation import FsfwHookBase
 from common_tmtc.config.definitions import PUS_APID
 from common_tmtc.pus_tm.factory_hook import ccsds_tm_handler
 try:
     from tmtccmd.runner import run_tmtc_commander, initialize_tmtc_commander, add_ccsds_handler
     from tmtccmd.ccsds.handler import CcsdsTmHandler
+    from tmtccmd.utility.logger import TMTC_LOGGER_NAME
 except ImportError as error:
     run_tmtc_commander = None
     initialize_tmtc_commander = None
@@ -49,6 +51,7 @@ def main():
     ccsds_handler = CcsdsTmHandler()
     ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50)
     add_ccsds_handler(ccsds_handler)
+    set_custom_console_logger_name(TMTC_LOGGER_NAME)
     run_tmtc_commander(use_gui=False, app_name="TMTC Commander FSFW")
 
 
diff --git a/tmtc/tmtccmd b/tmtc/tmtccmd
index 8f2289c..1f1c8c3 160000
--- a/tmtc/tmtccmd
+++ b/tmtc/tmtccmd
@@ -1 +1 @@
-Subproject commit 8f2289ceef004334401127e8a756cb2d49b1ad0c
+Subproject commit 1f1c8c34f66812b52d7af3db96b193abf74e0519