Update to v1.6.1 #5

Merged
muellerr merged 32 commits from develop into master 2021-06-21 17:41:58 +02:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit aaba7d5857 - Show all commits

View File

@ -32,7 +32,7 @@ from config.hook_implementations import EiveHookObject
from config.definitions import PUS_APID from config.definitions import PUS_APID
from pus_tm.factory_hook import ccsds_tm_handler from pus_tm.factory_hook import ccsds_tm_handler
try: try:
from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander from tmtccmd.runner import initialize_tmtc_commander, run_tmtc_commander, add_ccsds_handler
from tmtccmd.ccsds.handler import CcsdsTmHandler from tmtccmd.ccsds.handler import CcsdsTmHandler
except ImportError as error: except ImportError as error:
run_tmtc_commander = None run_tmtc_commander = None
@ -48,6 +48,7 @@ def main():
initialize_tmtc_commander(hook_object=hook_obj) initialize_tmtc_commander(hook_object=hook_obj)
ccsds_handler = CcsdsTmHandler() ccsds_handler = CcsdsTmHandler()
ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50) ccsds_handler.add_tm_handler(apid=PUS_APID, pus_tm_handler=ccsds_tm_handler, max_queue_len=50)
add_ccsds_handler(ccsds_handler)
run_tmtc_commander(False) run_tmtc_commander(False)

@ -1 +1 @@
Subproject commit ec23093bff4c70ab0044f1bb049c64a2376ec927 Subproject commit b4358a15fd945a9e0103a707b2a2dc56c458b24a