From 022551139c0d237369265ab234a4afc528ce9a7b Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 19 May 2022 19:24:57 +0200
Subject: [PATCH] some improvements

---
 .run/tmtcloop.run.xml     | 24 ++++++++++++++++++++++++
 pus_tc/cmd_definitions.py |  2 +-
 pus_tm/system/core.py     |  2 +-
 tmtccmd                   |  2 +-
 tmtcloop.py               |  9 ++++-----
 5 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 .run/tmtcloop.run.xml

diff --git a/.run/tmtcloop.run.xml b/.run/tmtcloop.run.xml
new file mode 100644
index 0000000..ee5f5f7
--- /dev/null
+++ b/.run/tmtcloop.run.xml
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="tmtcloop" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+    <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$/tmtcloop.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <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/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py
index f554b2a..4d5920a 100644
--- a/pus_tc/cmd_definitions.py
+++ b/pus_tc/cmd_definitions.py
@@ -968,7 +968,7 @@ def add_proc_cmds(cmd_dict: ServiceOpCodeDictT):
         op_code_dict=op_code_dict, keys=OpCodes.PCDU_FT, info=KAI.PCDU_FT[1]
     )
     add_op_code_entry(
-        op_code_dict=op_code_dict, keys=OpCodes.CORE_FT, info=KAI.CORE_FT[1]
+        op_code_dict=op_code_dict, keys=OpCodes.CORE_FT, info=KAI.CORE_FT[1], options={}
     )
     add_service_op_code_entry(
         srv_op_code_dict=cmd_dict,
diff --git a/pus_tm/system/core.py b/pus_tm/system/core.py
index 1c2ae5d..883d044 100644
--- a/pus_tm/system/core.py
+++ b/pus_tm/system/core.py
@@ -18,4 +18,4 @@ def handle_core_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes):
             f"PL Voltage [mV] {pl_voltage}"
         )
         pw.dlog(printout)
-        printer.print_validity_buffer(validity_buffer=hk_data[inc_len:], num_vars=4)
+        printer.print_validity_buffer(validity_buffer=hk_data[inc_len:], num_vars=3)
diff --git a/tmtccmd b/tmtccmd
index cf0afec..163ed8c 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit cf0afec762de4077f89b8da1f43b98e993fca6d0
+Subproject commit 163ed8c5d5295a511bfee72f4a62864aa67e59be
diff --git a/tmtcloop.py b/tmtcloop.py
index 52d1848..0a7fdc8 100755
--- a/tmtcloop.py
+++ b/tmtcloop.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 """EIVE TMTC Commander"""
-from distutils.log import debug
 import sys
 import traceback
 
@@ -63,11 +62,11 @@ def main():
 
     tmtc_backend.set_mode(CoreModeList.CONTINUOUS_MODE)
 
-    get_console_logger().info("Disabling console logger for continuous operation")
-    get_console_logger().setLevel("ERROR")
+    # get_console_logger().info("Disabling console logger for continuous operation")
+    # get_console_logger().setLevel("ERROR")
 
     tmtccmd.init_and_start_daemons(tmtc_backend=tmtc_backend)
-    tmtccmd.performOperation(tmtc_backend=tmtc_backend)
+    tmtc_backend.perform_operation()
 
     # remove cmdline args so that we can reuse code
     sys.argv = sys.argv[:1]
@@ -81,7 +80,7 @@ def main():
         tmtc_backend.set_opcode(args.op_code)
         tmtc_backend.set_mode(CoreModeList.CONTINUOUS_MODE)
 
-        tmtccmd.performOperation(tmtc_backend=tmtc_backend)
+        tmtc_backend.perform_operation()
 
 
 if __name__ == "__main__":