tmtccmd refactoring

tmtccli.py

@@ -26,16 +26,11 @@ limitations under the License.
 
 @author     R. Mueller
 """
-import logging
 import sys
 import traceback
 
 try:
-    from tmtccmd.runner import (
-        initialize_tmtc_commander,
-        run_tmtc_commander,
-        add_ccsds_handler,
-    )
+    import tmtccmd.runner as tmtccmd
     from tmtccmd.ccsds.handler import CcsdsTmHandler, ApidHandler
     from tmtccmd.logging import init_console_logger
 except ImportError as error:
@@ -59,20 +54,28 @@ except ImportError as error:
 from config.hook_implementations import EiveHookObject
 from config.version import __version__
 from config.definitions import PUS_APID
+from pus_tc.tc_packer_hook import pre_tc_send_cb
 from pus_tm.factory_hook import ccsds_tm_handler
 
 
 def main():
-    hook_obj = EiveHookObject()
     print(f"-- eive tmtc version {__version__} --")
     print(f"-- spacepackets version {spacepackets.__version__} --")
-    initialize_tmtc_commander(hook_object=hook_obj)
+    hook_obj = EiveHookObject()
+    tmtccmd.init_tmtccmd(hook_object=hook_obj)
     ccsds_handler = CcsdsTmHandler()
     init_console_logger()
     pus_handler = ApidHandler(cb=ccsds_tm_handler, queue_len=50, user_args=None)
     ccsds_handler.add_tm_handler(apid=PUS_APID, handler=pus_handler)
-    add_ccsds_handler(ccsds_handler)
-    run_tmtc_commander(False)
+    tmtccmd.add_ccsds_handler(ccsds_handler)
+    tmtccmd.setup_tmtccmd(use_gui=False, reduced_printout=False)
+    tmtc_backend = tmtccmd.get_default_tmtc_backend(
+        hook_obj=hook_obj,
+        json_cfg_path=hook_obj.get_json_config_file_path(),
+        tm_handler=ccsds_handler
+    )
+    tmtc_backend.set_pre_send_cb(callable=pre_tc_send_cb, user_args=None)
+    tmtccmd.run_tmtccmd(False, tmtc_backend=tmtc_backend, run_setup=False)
 
 
 if __name__ == "__main__":