From 26e656faf0da6bc47f40061fa3f16b8cbd62c9be Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 19 Aug 2022 14:48:10 +0200
Subject: [PATCH] add ploc supv hk handling

---
 .run/PLOC SUPV Normal.run.xml | 24 ++++++++++++++++++++++++
 .run/PLOC SUPV On.run.xml     | 24 ++++++++++++++++++++++++
 .run/PLOC SUPV.run.xml        | 24 ++++++++++++++++++++++++
 pus_tm/hk_handling.py         | 14 +++++++++++---
 tmtc/ploc_supervisor.py       |  5 +++++
 tmtcc.py                      |  8 ++++++--
 6 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 .run/PLOC SUPV Normal.run.xml
 create mode 100644 .run/PLOC SUPV On.run.xml
 create mode 100644 .run/PLOC SUPV.run.xml

diff --git a/.run/PLOC SUPV Normal.run.xml b/.run/PLOC SUPV Normal.run.xml
new file mode 100644
index 0000000..c6d87b6
--- /dev/null
+++ b/.run/PLOC SUPV Normal.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV Normal" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="tmtc -s ploc_supv -o nml" />
+    <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/.run/PLOC SUPV On.run.xml b/.run/PLOC SUPV On.run.xml
new file mode 100644
index 0000000..e5da12a
--- /dev/null
+++ b/.run/PLOC SUPV On.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV On" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="tmtc -s ploc_supv -o on" />
+    <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/.run/PLOC SUPV.run.xml b/.run/PLOC SUPV.run.xml
new file mode 100644
index 0000000..1de45d6
--- /dev/null
+++ b/.run/PLOC SUPV.run.xml	
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PLOC SUPV" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
+    <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$/tmtcc.py" />
+    <option name="PARAMETERS" value="tmtc -s ploc_supv -d 6" />
+    <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_tm/hk_handling.py b/pus_tm/hk_handling.py
index 8eabcb7..395f274 100644
--- a/pus_tm/hk_handling.py
+++ b/pus_tm/hk_handling.py
@@ -1,9 +1,11 @@
 """HK Handling for EIVE OBSW"""
+from pus_tm.tcp_server_objects import tcp_server_sensor_temperatures
 from tmtc.acs_ctrl import handle_acs_ctrl_mgm_data
 from pus_tm.devs.plpcdu import handle_plpcdu_hk
 from pus_tm.devs.rad_sensor import handle_rad_sensor_data
 from pus_tm.devs.sus import handle_sus_hk
 from pus_tm.system.tcs import handle_thermal_controller_hk_data
+from tmtc.ploc_supervisor import handle_supv_hk_data
 from tmtccmd.tm.pus_3_fsfw_hk import (
     Service3Base,
     HkContentType,
@@ -34,6 +36,9 @@ import config.object_ids as obj_ids
 LOGGER = get_console_logger()
 
 
+FORWARD_SENSOR_TEMPS = False
+
+
 def handle_hk_packet(
     raw_tm: bytes,
     obj_id_dict: ObjectIdDictT,
@@ -45,9 +50,10 @@ def handle_hk_packet(
         named_obj_id = tm_packet.object_id
     if tm_packet.subservice == 25 or tm_packet.subservice == 26:
         hk_data = tm_packet.tm_data[8:]
-        # tcp_server_sensor_temperatures.report_raw_hk_data(
-        #    object_id=named_obj_id, set_id=tm_packet.set_id, hk_data=hk_data
-        # )
+        if FORWARD_SENSOR_TEMPS:
+            tcp_server_sensor_temperatures.report_raw_hk_data(
+                object_id=named_obj_id, set_id=tm_packet.set_id, hk_data=hk_data
+            )
         printer.generic_hk_tm_print(
             content_type=HkContentType.HK,
             object_id=named_obj_id,
@@ -160,6 +166,8 @@ def handle_regular_hk_print(
         handle_thermal_controller_hk_data(
             object_id=object_id, printer=printer, set_id=set_id, hk_data=hk_data
         )
+    elif objb == obj_ids.PLOC_SUPV_ID:
+        handle_supv_hk_data(set_id=set_id, hk_data=hk_data, printer=printer)
     elif objb == obj_ids.ACS_CONTROLLER:
         handle_acs_ctrl_mgm_data(printer, hk_data)
     else:
diff --git a/tmtc/ploc_supervisor.py b/tmtc/ploc_supervisor.py
index 821130d..f6f9ab1 100644
--- a/tmtc/ploc_supervisor.py
+++ b/tmtc/ploc_supervisor.py
@@ -19,6 +19,7 @@ from tmtccmd.logging import get_console_logger
 from tmtccmd.tc import service_provider
 from tmtccmd.tc.decorator import ServiceProviderParams
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes
+from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter
 from utility.input_helper import InputHelper
 
 LOGGER = get_console_logger()
@@ -681,3 +682,7 @@ def get_event_buffer_path() -> str:
     else:
         file = event_buffer_path_dict[key][1]
     return file
+
+
+def handle_supv_hk_data(set_id: int, hk_data: bytes, printer: FsfwTmTcPrinter):
+    pass
diff --git a/tmtcc.py b/tmtcc.py
index 4144e1d..21cf14f 100755
--- a/tmtcc.py
+++ b/tmtcc.py
@@ -51,8 +51,12 @@ from tmtccmd.tc import (
 from tmtccmd.config import default_json_path, SetupWrapper
 from tmtccmd.config.args import (
     SetupParams,
-    ArgParserWrapper, create_default_args_parser, add_default_com_if_arguments,
-    add_default_mode_arguments, add_generic_arguments, add_ethernet_arguments,
+    ArgParserWrapper,
+    create_default_args_parser,
+    add_default_com_if_arguments,
+    add_default_mode_arguments,
+    add_generic_arguments,
+    add_ethernet_arguments,
 )
 from config import __version__
 from config.definitions import PUS_APID