small fix for mpsoc command dispatch

.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>

.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>

.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>

.run/PLOC_MPSoC.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="PLOC MPSoC" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
+  <configuration default="false" name="PLOC MPSoC" type="PythonConfigurationType" factoryName="Python" folderName="PLOC">
     <module name="tmtc" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />

.run/Ping Command.run.xml

@@ -13,7 +13,7 @@
     <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="-s test -o ping -d 3" />
+    <option name="PARAMETERS" value="tmtc -s test -o ping -d 3" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

pus_tc/procedure_packer.py

@@ -128,11 +128,6 @@ def handle_default_procedure(
     if service == CustomServiceList.IMTQ.value:
         object_id = cast(ObjectIdU32, obj_id_man.get(IMTQ_HANDLER_ID))
         return pack_imtq_test_into(object_id=object_id, q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.PLOC_MPSOC.value:
-        object_id = cast(ObjectIdU32, obj_id_man.get(PLOC_MPSOC_ID))
-        return pack_ploc_mpsoc_commands(
-            object_id=object_id, q=queue_helper, op_code=op_code
-        )
     if service == CustomServiceList.REACTION_WHEEL_1.value:
         return pack_single_rw_test_into(
             object_id=RW1_ID, rw_idx=1, q=queue_helper, op_code=op_code

pus_tm/factory_hook.py

@@ -2,6 +2,7 @@
 """
 from config.object_ids import get_object_ids
 from spacepackets.ecss import PusTelemetry
+from spacepackets.ecss.pus_17_test import Service17Tm
 from spacepackets.util import PrintFormats
 from tmtccmd import get_console_logger
 from tmtccmd.logging.pus import RawTmtcTimedLogWrapper
@@ -46,8 +47,10 @@ def pus_factory_hook(
     elif service == 8:
         handle_action_reply(raw_tm=packet, printer=printer, obj_id_dict=obj_id_dict)
     elif service == 17:
-        tm_packet = Service17TmExtended.unpack(raw_telemetry=packet)
-        dedicated_handler = False
+        tm_packet = Service17Tm.unpack(raw_telemetry=packet)
+        if tm_packet.subservice == 2:
+            verif_wrapper.dlog("Received Ping Reply TM[17,2]")
+        dedicated_handler = True
     elif service == 20:
         tm_packet = Service20FsfwTm.unpack(raw_telemetry=packet)
         dedicated_handler = False

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:

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

tmtcc.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import argparse
 import logging
 import sys
 import time
@@ -51,6 +52,11 @@ 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,
 )
 from config import __version__
 from config.definitions import PUS_APID
@@ -152,6 +158,9 @@ def setup_params() -> SetupWrapper:
     hook_obj = EiveHookObject(default_json_path())
     params = SetupParams()
     parser_wrapper = ArgParserWrapper(hook_obj)
+    parser_wrapper.create_default_parent_parser()
+    parser_wrapper.create_default_parser()
+    parser_wrapper.add_def_proc_and_cfdp_as_subparsers()
     parser_wrapper.parse()
     tmtccmd.init_printout(parser_wrapper.use_gui)
     parser_wrapper.set_params(params)