From 4d737bfc12f51c1b9c09f410db8d5243e0852f2b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 19 Mar 2021 18:03:41 +0100 Subject: [PATCH] some renaming --- config/object_ids.py | 45 +++++++++++++++++++------------------- pus_tc/acu.py | 4 ++-- pus_tc/service_200_mode.py | 4 ++-- pus_tc/tc_packer_hook.py | 20 ++++++++--------- pus_tm/service_8_hook.py | 4 ++-- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/config/object_ids.py b/config/object_ids.py index 3734b44..bffa66e 100644 --- a/config/object_ids.py +++ b/config/object_ids.py @@ -7,20 +7,20 @@ import enum from typing import Dict -PUS_SERVICE_17 = bytearray([0x53, 0x00, 0x00, 0x17]) -TEST_DEVICE = bytearray([0x44, 0x00, 0xAF, 0xFE]) +PUS_SERVICE_17_ID = bytearray([0x53, 0x00, 0x00, 0x17]) +TEST_DEVICE_ID = bytearray([0x44, 0x00, 0xAF, 0xFE]) P60_DOCK_HANDLER = bytearray([0x44, 0x00, 0x00, 0x1]) -PDU_1_HANDLER = bytearray([0x44, 0x00, 0x00, 0x2]) -PDU_2_HANDLER = bytearray([0x44, 0x00, 0x00, 0x3]) -ACU_HANDLER = bytearray([0x44, 0x00, 0x00, 0x4]) -TMP_1075_1_HANDLER = bytearray([0x44, 0x00, 0x00, 0x5]) -TMP_1075_2_HANDLER = bytearray([0x44, 0x00, 0x00, 0x6]) -HEATER = bytearray([0x54, 0x00, 0x00, 0x1]) -PCDU_HANDLER = bytearray([0x44, 0x00, 0x10, 0x00]) -SOLAR_ARRAY_DEPLOYMENT = bytearray([0x44, 0x00, 0x10, 0x01]) +PDU_1_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x2]) +PDU_2_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x3]) +ACU_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x4]) +TMP_1075_1_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x5]) +TMP_1075_2_HANDLER_ID = bytearray([0x44, 0x00, 0x00, 0x6]) +HEATER_ID = bytearray([0x54, 0x00, 0x00, 0x1]) +PCDU_HANDLER_ID = bytearray([0x44, 0x00, 0x10, 0x00]) +SOLAR_ARRAY_DEPLOYMENT_ID = bytearray([0x44, 0x00, 0x10, 0x01]) -class CustomObjectIds(enum.IntEnum): +class ObjIdIds(enum.IntEnum): PUS_SERVICE_17_ID = 0 TEST_DEVICE_ID = 1 P60DOCK_HANDLER_ID = 2 @@ -35,18 +35,17 @@ class CustomObjectIds(enum.IntEnum): def set_object_ids() -> Dict[int, bytearray]: - o_ids = CustomObjectIds object_id_dict = ({ - o_ids.PUS_SERVICE_17_ID: PUS_SERVICE_17, - o_ids.TEST_DEVICE_ID: TEST_DEVICE, - o_ids.P60DOCK_HANDLER_ID: P60_DOCK_HANDLER, - o_ids.PDU1_HANDLER_ID: PDU_1_HANDLER, - o_ids.PDU2_HANDLER_ID: PDU_2_HANDLER, - o_ids.ACU_HANDLER_ID: ACU_HANDLER, - o_ids.TMP1075_1_HANDLER_ID: TMP_1075_1_HANDLER, - o_ids.TMP1075_2_HANDLER_ID: TMP_1075_2_HANDLER, - o_ids.HEATER_ID: HEATER, - o_ids.PCDU_HANDLER_ID: PCDU_HANDLER, - o_ids.SOLAR_ARRAY_DEPLOYMENT_ID: SOLAR_ARRAY_DEPLOYMENT, + ObjIdIds.PUS_SERVICE_17_ID: PUS_SERVICE_17_ID, + ObjIdIds.TEST_DEVICE_ID: TEST_DEVICE_ID, + ObjIdIds.P60DOCK_HANDLER_ID: P60_DOCK_HANDLER, + ObjIdIds.PDU1_HANDLER_ID: PDU_1_HANDLER_ID, + ObjIdIds.PDU2_HANDLER_ID: PDU_2_HANDLER_ID, + ObjIdIds.ACU_HANDLER_ID: ACU_HANDLER_ID, + ObjIdIds.TMP1075_1_HANDLER_ID: TMP_1075_1_HANDLER_ID, + ObjIdIds.TMP1075_2_HANDLER_ID: TMP_1075_2_HANDLER_ID, + ObjIdIds.HEATER_ID: HEATER_ID, + ObjIdIds.PCDU_HANDLER_ID: PCDU_HANDLER_ID, + ObjIdIds.SOLAR_ARRAY_DEPLOYMENT_ID: SOLAR_ARRAY_DEPLOYMENT_ID, }) return object_id_dict diff --git a/pus_tc/acu.py b/pus_tc/acu.py index 41dd9c6..557cfe9 100644 --- a/pus_tc/acu.py +++ b/pus_tc/acu.py @@ -11,7 +11,7 @@ from tmtccmd.pus_tc.base import PusTelecommand from tmtccmd.core.definitions import QueueCommands from gomspace.gomspace_common import * from pus_tc.p60dock import P60DockConfigTable -from config.object_ids import CustomObjectIds +from config.object_ids import ObjIdIds from tmtccmd.core.object_id_manager import get_object_id @@ -57,7 +57,7 @@ def pack_acu_test_into(object_id: bytearray, tc_queue: TcQueueT) -> TcQueueT: tc_queue.appendleft((QueueCommands.PRINT, "Testing ACU")) tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling ACU connected to X1 slot (channel 0)")) - p60dock_object_id = get_object_id(CustomObjectIds.P60DOCK_HANDLER_ID) + p60dock_object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID) command = pack_set_param_command(p60dock_object_id, P60DockConfigTable.out_en_0.parameter_address, P60DockConfigTable.out_en_0.parameter_size, Channel.on) command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command) diff --git a/pus_tc/service_200_mode.py b/pus_tc/service_200_mode.py index 9c84504..95c8109 100644 --- a/pus_tc/service_200_mode.py +++ b/pus_tc/service_200_mode.py @@ -9,9 +9,9 @@ from tmtccmd.core.definitions import QueueCommands from tmtccmd.pus_tc.base import PusTelecommand from tmtccmd.pus_tc.packer import TcQueueT from tmtccmd.pus_tc.service_200_mode import pack_mode_data -from config.object_ids import TEST_DEVICE +from config.object_ids import TEST_DEVICE_ID -TEST_DEVICE_OBJ_ID = TEST_DEVICE +TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID def pack_service200_test_into(tc_queue: TcQueueT) -> TcQueueT: diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py index 26528f4..576ecf4 100644 --- a/pus_tc/tc_packer_hook.py +++ b/pus_tc/tc_packer_hook.py @@ -22,7 +22,7 @@ from pus_tc.acu import pack_acu_test_into from pus_tc.tmp1075 import pack_tmp1075_test_into from pus_tc.heater import pack_heater_test_into from config.definitions import CustomServiceList -from config.object_ids import CustomObjectIds +from config.object_ids import ObjIdIds LOGGER = get_logger() @@ -34,27 +34,27 @@ def pack_service_queue_user(service: Union[str, int], op_code: str, service_queu if service == CoreServiceList.SERVICE_17: return service_queue.appendleft(pack_service17_ping_command(ssc=1700).pack_command_tuple()) if service == CustomServiceList.P60DOCK.value: - object_id = get_object_id(CustomObjectIds.P60DOCK_HANDLER_ID) + object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID) return pack_p60dock_test_into(object_id, service_queue) if service == CustomServiceList.PDU1.value: - pdu1_object_id = get_object_id(CustomObjectIds.PDU1_HANDLER_ID) - p60dock_object_id = get_object_id(CustomObjectIds.P60DOCK_HANDLER_ID) + pdu1_object_id = get_object_id(ObjIdIds.PDU1_HANDLER_ID) + p60dock_object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID) return pack_pdu1_test_into(pdu1_object_id, p60dock_object_id, service_queue) if service == CustomServiceList.PDU2.value: - pdu2_object_id = get_object_id(CustomObjectIds.PDU2_HANDLER_ID) - p60dock_object_id = get_object_id(CustomObjectIds.P60DOCK_HANDLER_ID) + pdu2_object_id = get_object_id(ObjIdIds.PDU2_HANDLER_ID) + p60dock_object_id = get_object_id(ObjIdIds.P60DOCK_HANDLER_ID) return pack_pdu2_test_into(pdu2_object_id, p60dock_object_id, service_queue) if service == CustomServiceList.ACU.value: - object_id = get_object_id(CustomObjectIds.ACU_HANDLER_ID) + object_id = get_object_id(ObjIdIds.ACU_HANDLER_ID) return pack_acu_test_into(object_id, service_queue) if service == CustomServiceList.TMP1075_1.value: - object_id = get_object_id(CustomObjectIds.TMP1075_1_HANDLER_ID) + object_id = get_object_id(ObjIdIds.TMP1075_1_HANDLER_ID) return pack_tmp1075_test_into(object_id, service_queue) if service == CustomServiceList.TMP1075_2.value: - object_id = get_object_id(CustomObjectIds.TMP1075_2_HANDLER_ID) + object_id = get_object_id(ObjIdIds.TMP1075_2_HANDLER_ID) return pack_tmp1075_test_into(object_id, service_queue) if service == CustomServiceList.HEATER.value: - object_id = get_object_id(CustomObjectIds.HEATER) + object_id = get_object_id(ObjIdIds.HEATER) return pack_heater_test_into(object_id, service_queue) LOGGER.warning("Invalid Service !") diff --git a/pus_tm/service_8_hook.py b/pus_tm/service_8_hook.py index f529b5f..12a8617 100644 --- a/pus_tm/service_8_hook.py +++ b/pus_tm/service_8_hook.py @@ -1,5 +1,5 @@ from typing import Tuple -from config.object_ids import CustomObjectIds +from config.object_ids import ObjIdIds def user_analyze_service_8_data( @@ -15,7 +15,7 @@ def user_analyze_service_8_data( @param custom_data: @return: """ - if object_id == CustomObjectIds.PDU2_HANDLER_ID.value: + if object_id == ObjIdIds.PDU2_HANDLER_ID.value: header_list = ['PDU2 Service 8 Reply'] data_string = str()