include replacement

eive_tmtc/pus_tc/cmd_demux.py

@@ -4,7 +4,7 @@
 import logging
 from typing import List, cast
 
-from tmtccmd import DefaultProcedureInfo
+from tmtccmd import TreeCommandingProcedure
 from tmtccmd.tmtc import DefaultPusQueueHelper
 from tmtccmd.util import ObjectIdU32
 
@@ -78,7 +78,7 @@ from eive_tmtc.utility.input_helper import InputHelper
 
 
 def handle_pus_procedure(
-    info: DefaultProcedureInfo,
+    info: TreeCommandingProcedure,
     queue_helper: DefaultPusQueueHelper,
 ):
     cmd_path = info.cmd_path

pyproject.toml

@@ -29,10 +29,10 @@ classifiers = [
     "Topic :: Scientific/Engineering"
 ]
 dependencies = [
-	"tmtccmd ~= 8.0.0rc1",
-  "cfdp-py~=0.1.0",
-	# "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main",
-	"python-dateutil ~= 2.8",
+  # "tmtccmd~=8.0.0rc2",
+  "cfdp-py~=0.1.1",
+  "tmtccmd @ git+https://github.com/robamu-org/tmtccmd@main",
+  "python-dateutil ~= 2.8",
 ]
 
 [project.urls]

tmtcc.py

@@ -97,8 +97,8 @@ def setup_params() -> Tuple[SetupWrapper, int]:
         hk_level = int(post_arg_parsing_wrapper.args_raw.hk)
     else:
         hk_level = 0
-    if params.app_params.print_tree:
-        perform_tree_printout(params.app_params, hook_obj.get_command_definitions())
+    if params.tc_params.print_tree:
+        perform_tree_printout(params.tc_params, hook_obj.get_command_definitions())
         sys.exit(0)
     params.apid = PUS_APID
     if params.com_if is None:
@@ -232,6 +232,7 @@ def main():  # noqa C901: Complexity okay here.
             state = tmtc_backend.periodic_op(None)
             tc_handler.cfdp_in_ccsds_handler.state_machine()
             if state.request == BackendRequest.TERMINATION_NO_ERROR:
+                tmtc_backend.close_com_if()
                 sys.exit(0)
             elif state.request == BackendRequest.DELAY_IDLE:
                 _LOGGER.info("TMTC Client in IDLE mode")
@@ -252,6 +253,7 @@ def main():  # noqa C901: Complexity okay here.
             elif state.request == BackendRequest.CALL_NEXT:
                 pass
     except KeyboardInterrupt:
+        tmtc_backend.close_com_if()
         sys.exit(0)