From 4ef3c403035970f6378d4053eecaa4664fec22b2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 5 Jul 2022 02:18:30 +0200 Subject: [PATCH] pass ObjectIdU32 instead of bytes --- pus_tc/procedure_packer.py | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pus_tc/procedure_packer.py b/pus_tc/procedure_packer.py index 7e7d6e6..a4c6b8a 100644 --- a/pus_tc/procedure_packer.py +++ b/pus_tc/procedure_packer.py @@ -1,10 +1,6 @@ """Hook function which packs telecommands based on service and operation code string """ -import logging -from typing import Union - from pus_tc.devs.rtd import pack_rtd_commands -from spacepackets.ecss import PusTelecommand from tmtccmd import DefaultProcedureInfo from tmtccmd.config import CoreServiceList from tmtccmd.logging import get_console_logger @@ -13,7 +9,6 @@ from tmtccmd.tc.pus_5_event import ( pack_generic_service_5_test_into, ) from tmtccmd.pus.pus_17_test import pack_service_17_ping_command -from tmtccmd.logging import get_current_time_string from pus_tc.service_200_mode import pack_service200_test_into from pus_tc.devs.p60dock import pack_p60dock_cmds @@ -101,12 +96,12 @@ def handle_default_procedure(info: DefaultProcedureInfo, wrapper: FeedWrapper): if service == CustomServiceList.BPX_BATTERY.value: return pack_bpx_commands(q=queue_helper, op_code=op_code) if service == CustomServiceList.TMP1075_1.value: - object_id = TMP_1075_1_HANDLER_ID + object_id = obj_id_man.get(TMP_1075_1_HANDLER_ID) return pack_tmp1075_test_into( object_id=object_id, q=queue_helper, op_code=op_code ) if service == CustomServiceList.TMP1075_2.value: - object_id = TMP_1075_2_HANDLER_ID + object_id = obj_id_man.get(TMP_1075_2_HANDLER_ID) return pack_tmp1075_test_into( object_id=object_id, q=queue_helper, op_code=op_code ) @@ -114,10 +109,10 @@ def handle_default_procedure(info: DefaultProcedureInfo, wrapper: FeedWrapper): object_id = HEATER_ID return pack_heater_cmds(object_id=object_id, q=queue_helper, op_code=op_code) if service == CustomServiceList.IMTQ.value: - object_id = IMTQ_HANDLER_ID + object_id = 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 = PLOC_MPSOC_ID + object_id = obj_id_man.get(PLOC_MPSOC_ID) return pack_ploc_mpsoc_commands( object_id=object_id, q=queue_helper, op_code=op_code ) @@ -143,24 +138,24 @@ def handle_default_procedure(info: DefaultProcedureInfo, wrapper: FeedWrapper): object_id=object_id, q=queue_helper, op_code=op_code ) if service == CustomServiceList.PLOC_SUPV.value: - object_id = PLOC_SUPV_ID + object_id = obj_id_man.get(PLOC_SUPV_ID) return pack_ploc_supv_commands( object_id=object_id, q=queue_helper, op_code=op_code ) if service == CustomServiceList.STAR_TRACKER.value: - object_id = STAR_TRACKER_ID + object_id = obj_id_man.get(STAR_TRACKER_ID) return pack_star_tracker_commands( object_id=object_id, q=queue_helper, op_code=op_code ) if service == CustomServiceList.STR_IMG_HELPER.value: - object_id = STR_IMG_HELPER_ID + object_id = obj_id_man.get(STR_IMG_HELPER_ID) return pack_str_img_helper_command( object_id=object_id, q=queue_helper, op_code=op_code ) if service == CustomServiceList.CORE.value: return pack_core_commands(q=queue_helper, op_code=op_code) if service == CustomServiceList.PLOC_MEMORY_DUMPER.value: - object_id = PLOC_MEMORY_DUMPER_ID + object_id = obj_id_man.get(PLOC_MEMORY_DUMPER_ID) return pack_ploc_memory_dumper_cmd( object_id=object_id, q=queue_helper, op_code=op_code )