From 99ccd04b2ace82629bf292fad1a25df3fdbf1f00 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Mon, 12 Sep 2022 00:53:15 +0200
Subject: [PATCH] some adaptions

---
 common.py             | 18 ++++++++++--------
 pus_tc/pus_17_test.py |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/common.py b/common.py
index 4815dc3..90f5cee 100644
--- a/common.py
+++ b/common.py
@@ -71,7 +71,7 @@ from examples.tmtcc import (
 from tmtccmd import TcHandlerBase, get_console_logger, TmTcCfgHookBase, BackendBase
 from tmtccmd.pus import VerificationWrapper
 from tmtccmd.tc import (
-    ProcedureHelper,
+    ProcedureWrapper,
     FeedWrapper,
     TcProcedureType,
     TcQueueEntryType,
@@ -84,7 +84,7 @@ from tmtccmd.config import (
     CoreServiceList,
     SetupWrapper,
     SetupParams,
-    PreArgsParsingWrapper,
+    PreArgsParsingWrapper, params_to_procedure_conversion,
 )
 from common_tmtc.pus_tm.factory_hook import pus_factory_hook
 
@@ -323,14 +323,14 @@ class TcHandler(TcHandlerBase):
         )
         self.cfdp_in_ccsds_wrapper = cfdp_in_ccsds_wrapper
 
-    def feed_cb(self, info: ProcedureHelper, wrapper: FeedWrapper):
+    def feed_cb(self, info: ProcedureWrapper, wrapper: FeedWrapper):
         self.queue_helper.queue_wrapper = wrapper.queue_wrapper
         if info.proc_type == TcProcedureType.DEFAULT:
             self.handle_default_procedure(info)
         elif info.proc_type == TcProcedureType.CFDP:
             self.handle_cfdp_procedure(info)
 
-    def handle_default_procedure(self, info: ProcedureHelper):
+    def handle_default_procedure(self, info: ProcedureWrapper):
         def_proc = info.to_def_procedure()
         service = def_proc.service
         op_code = def_proc.op_code
@@ -352,7 +352,7 @@ class TcHandler(TcHandlerBase):
             return pack_service_200_commands_into(q=self.queue_helper, op_code=op_code)
         LOGGER.warning("Invalid Service !")
 
-    def handle_cfdp_procedure(self, info: ProcedureHelper):
+    def handle_cfdp_procedure(self, info: ProcedureWrapper):
         cfdp_procedure = info.to_cfdp_procedure()
         if cfdp_procedure.cfdp_request_type == CfdpRequestType.PUT:
             if not self.cfdp_in_ccsds_wrapper.handler.put_request_pending():
@@ -401,7 +401,7 @@ class TcHandler(TcHandlerBase):
         self.file_logger.info(f"{get_current_time_string(True)}: {tc_info_string}")
         params.com_if.send(raw_tc)
 
-    def queue_finished_cb(self, info: ProcedureHelper):
+    def queue_finished_cb(self, info: ProcedureWrapper):
         if info is not None and info.proc_type == TcQueueEntryType.PUS_TC:
             def_proc = info.to_def_procedure()
             LOGGER.info(
@@ -491,12 +491,14 @@ def setup_backend(
     tc_handler: TcHandler,
     ccsds_handler: CcsdsTmHandler,
 ) -> BackendBase:
-    # TODO: Convert procedure params to procedure
+    init_proc = params_to_procedure_conversion(
+        setup_wrapper.proc_param_wrapper
+    )
     tmtc_backend = tmtccmd.create_default_tmtc_backend(
         setup_wrapper=setup_wrapper,
         tm_handler=ccsds_handler,
         tc_handler=tc_handler,
-        init_procedure=None,
+        init_procedure=init_proc.base,
     )
     tmtccmd.start(tmtc_backend=tmtc_backend, hook_obj=setup_wrapper.hook_obj)
     return tmtc_backend
diff --git a/pus_tc/pus_17_test.py b/pus_tc/pus_17_test.py
index 8b803d8..85fb73b 100644
--- a/pus_tc/pus_17_test.py
+++ b/pus_tc/pus_17_test.py
@@ -6,7 +6,7 @@ from tmtccmd.tc.queue import DefaultPusQueueHelper
 
 
 def pack_service_17_commands(op_code: str, q: DefaultPusQueueHelper):
-    if op_code == "0":
+    if op_code in ["0", "ping"]:
         q.add_pus_tc(pack_service_17_ping_command())
     else:
         pack_generic_service17_test(q=q)