From ea5f384f727e00c26cdb7f47203f6a2dedf0d388 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 4 Mar 2022 10:44:55 +0100 Subject: [PATCH] includes were not updated.. --- config/hook_implementations.py | 6 ++---- pus_tc/cmd_definitions.py | 35 +++++++++++++++++----------------- pus_tc/devs/plpcdu.py | 28 +++++++++++++-------------- pus_tc/tc_packer_hook.py | 32 +++++++++++++++---------------- pus_tm/event_handler.py | 2 +- pus_tm/hk_handling.py | 4 ++-- pus_tm/service_8_hook.py | 8 ++++---- 7 files changed, 56 insertions(+), 59 deletions(-) diff --git a/config/hook_implementations.py b/config/hook_implementations.py index cae5deb..ebd3645 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -103,11 +103,9 @@ class EiveHookObject(TmTcHookBase): object_id: bytes, event_id: int, param_1: int, param_2: int ) -> str: from pus_tm.event_handler import handle_event_packet + return handle_event_packet( - object_id=object_id, - event_id=event_id, - param_1=param_1, - param_2=param_2 + object_id=object_id, event_id=event_id, param_1=param_1, param_2=param_2 ) diff --git a/pus_tc/cmd_definitions.py b/pus_tc/cmd_definitions.py index 1e9849f..9a5e881 100644 --- a/pus_tc/cmd_definitions.py +++ b/pus_tc/cmd_definitions.py @@ -92,28 +92,25 @@ def add_core_controller_definitions(cmd_dict: ServiceOpCodeDictT): def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): - from pus_tc.plpcdu import OpCodes + from pus_tc.devs.plpcdu import OpCodes + op_code_dict = dict() add_op_code_entry( - op_code_dict=op_code_dict, - keys=OpCodes.SWITCH_ON, - info="Switch PL PCDU on" + op_code_dict=op_code_dict, keys=OpCodes.SWITCH_ON, info="Switch PL PCDU on" ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.SWITCH_ADC_NORMAL, - info="Switch PL PCDU ADC normal, submode ADC ON" + info="Switch PL PCDU ADC normal, submode ADC ON", ) add_op_code_entry( - op_code_dict=op_code_dict, - keys=OpCodes.SWITCH_OFF, - info="Switch PL PCDU off" + op_code_dict=op_code_dict, keys=OpCodes.SWITCH_OFF, info="Switch PL PCDU off" ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.SWITCH_ALL_NORMAL, info="Switch all PL PCDU modules normal, submode ALL ON", - options=generate_op_code_options(enter_listener_mode=True) + options=generate_op_code_options(enter_listener_mode=True), ) add_op_code_entry( op_code_dict=op_code_dict, @@ -123,32 +120,32 @@ def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_SSR_TO_DRO_FAILURE, - info="Inject failure SSR to DRO transition" + info="Inject failure SSR to DRO transition", ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_DRO_TO_X8_FAILURE, - info="Inject failure in DRO to X8 transition" + info="Inject failure in DRO to X8 transition", ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_X8_TO_TX_FAILURE, - info="Inject failure in X8 to TX transition" + info="Inject failure in X8 to TX transition", ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_TX_TO_MPA_FAILURE, - info="Inject failure in TX to MPA transition" + info="Inject failure in TX to MPA transition", ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_MPA_TO_HPA_FAILURE, - info="Inject failure in MPA to HPA transition" + info="Inject failure in MPA to HPA transition", ) add_op_code_entry( op_code_dict=op_code_dict, keys=OpCodes.INJECT_ALL_ON_FAILURE, - info="Inject failure in all on mode" + info="Inject failure in all on mode", ) add_service_op_code_entry( srv_op_code_dict=cmd_dict, @@ -159,9 +156,9 @@ def add_pl_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): def add_pcdu_cmds(cmd_dict: ServiceOpCodeDictT): - from pus_tc.p60dock import P60OpCodes, GomspaceOpCodes + from pus_tc.devs.p60dock import P60OpCodes, GomspaceOpCodes from pus_tc.devs.pdu1 import Pdu1OpCodes - from pus_tc.pdu2 import Pdu2OpCodes + from pus_tc.devs.pdu2 import Pdu2OpCodes op_code_dict = dict() add_op_code_entry(op_code_dict=op_code_dict, keys="0", info="P60 Tests") @@ -511,4 +508,6 @@ def add_ploc_cmds(cmd_dict: ServiceOpCodeDictT): service_ploc_updater_tuple = ("Ploc Updater", op_code_dict_srv_ploc_updater) cmd_dict[CustomServiceList.PLOC_SUPV.value] = service_ploc_supv_tuple cmd_dict[CustomServiceList.PLOC_UPDATER.value] = service_ploc_updater_tuple - cmd_dict[CustomServiceList.PLOC_MEMORY_DUMPER.value] = service_ploc_memory_dumper_tuple + cmd_dict[ + CustomServiceList.PLOC_MEMORY_DUMPER.value + ] = service_ploc_memory_dumper_tuple diff --git a/pus_tc/devs/plpcdu.py b/pus_tc/devs/plpcdu.py index ef642b2..b11be7d 100644 --- a/pus_tc/devs/plpcdu.py +++ b/pus_tc/devs/plpcdu.py @@ -7,7 +7,7 @@ from tmtccmd.tc.service_200_mode import pack_mode_data, Modes, Subservices from tmtccmd.tc.service_20_parameter import ( pack_scalar_double_param_app_data, pack_fsfw_load_param_cmd, - pack_boolean_parameter_app_data + pack_boolean_parameter_app_data, ) from tmtccmd.utility.logger import get_console_logger from spacepackets.ecss.tc import PusTelecommand @@ -80,24 +80,22 @@ class ParamIds(enum.IntEnum): def pack_pl_pcdu_commands(tc_queue: TcQueueT, op_code: str): if op_code in OpCodes.SWITCH_ON: tc_queue.appendleft((QueueCommands.PRINT, "Switching PL PCDU on")) - mode_data = pack_mode_data( - object_id=PL_PCDU_ID, mode=Modes.ON, submode=0 - ) + mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=Modes.ON, submode=0) mode_cmd = PusTelecommand( service=200, subservice=Subservices.SWITCH_MODE, app_data=mode_data ) tc_queue.appendleft(mode_cmd.pack_command_tuple()) if op_code in OpCodes.SWITCH_OFF: tc_queue.appendleft((QueueCommands.PRINT, "Switching PL PCDU off")) - mode_data = pack_mode_data( - object_id=PL_PCDU_ID, mode=Modes.OFF, submode=0 - ) + mode_data = pack_mode_data(object_id=PL_PCDU_ID, mode=Modes.OFF, submode=0) mode_cmd = PusTelecommand( service=200, subservice=Subservices.SWITCH_MODE, app_data=mode_data ) tc_queue.appendleft(mode_cmd.pack_command_tuple()) if op_code in OpCodes.SWITCH_ADC_NORMAL: - tc_queue.appendleft((QueueCommands.PRINT, "Switching PL PCDU ADC module normal, submode ADC ON")) + tc_queue.appendleft( + (QueueCommands.PRINT, "Switching PL PCDU ADC module normal, submode ADC ON") + ) mode_data = pack_mode_data( object_id=PL_PCDU_ID, mode=Modes.NORMAL, submode=Submodes.ADC_ON ) @@ -106,7 +104,12 @@ def pack_pl_pcdu_commands(tc_queue: TcQueueT, op_code: str): ) tc_queue.appendleft(mode_cmd.pack_command_tuple()) if op_code in OpCodes.SWITCH_ALL_NORMAL: - tc_queue.appendleft((QueueCommands.PRINT, "Switching all PL PCDU modules normal, submode ALL ON")) + tc_queue.appendleft( + ( + QueueCommands.PRINT, + "Switching all PL PCDU modules normal, submode ALL ON", + ) + ) mode_data = pack_mode_data( object_id=PL_PCDU_ID, mode=Modes.NORMAL, submode=Submodes.ALL_ON ) @@ -142,7 +145,7 @@ def pack_pl_pcdu_commands(tc_queue: TcQueueT, op_code: str): pack_failure_injection_cmd( tc_queue=tc_queue, param_id=ParamIds.INJECT_ALL_ON_FAILURE, - print_str="All On" + print_str="All On", ) @@ -182,10 +185,7 @@ def pack_wait_time_cmd(tc_queue: TcQueueT, param_id: int, print_str: str): def pack_failure_injection_cmd(tc_queue: TcQueueT, param_id: int, print_str: str): tc_queue.appendleft((QueueCommands.PRINT, f"Inserting {print_str} error")) param_data = pack_boolean_parameter_app_data( - object_id=PL_PCDU_ID, - domain_id=0, - unique_id=param_id, - parameter=True + object_id=PL_PCDU_ID, domain_id=0, unique_id=param_id, parameter=True ) cmd = pack_fsfw_load_param_cmd(ssc=0, app_data=param_data) tc_queue.appendleft(cmd.pack_command_tuple()) diff --git a/pus_tc/tc_packer_hook.py b/pus_tc/tc_packer_hook.py index 66c0239..8211214 100644 --- a/pus_tc/tc_packer_hook.py +++ b/pus_tc/tc_packer_hook.py @@ -11,28 +11,28 @@ from tmtccmd.tc.service_5_event import pack_generic_service5_test_into from tmtccmd.pus.service_17_test import pack_service_17_ping_command from pus_tc.service_200_mode import pack_service200_test_into -from pus_tc.p60dock import pack_p60dock_test_into -from pus_tc.pdu2 import pack_pdu2_commands +from pus_tc.devs.p60dock import pack_p60dock_test_into +from pus_tc.devs.pdu2 import pack_pdu2_commands from pus_tc.devs.pdu1 import pack_pdu1_commands from pus_tc.devs.bpx_batt import pack_bpx_commands -from pus_tc.acu import pack_acu_test_into -from pus_tc.imtq import pack_imtq_test_into -from pus_tc.tmp1075 import pack_tmp1075_test_into -from pus_tc.ploc_mpsoc import pack_ploc_mpsoc_test_into -from pus_tc.ploc_supervisor import pack_ploc_supv_test_into -from pus_tc.heater import pack_heater_test_into -from pus_tc.reaction_wheels import pack_single_rw_test_into -from pus_tc.rad_sensor import pack_rad_sensor_test_into -from pus_tc.ploc_upater import pack_ploc_updater_test_into -from pus_tc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd +from pus_tc.devs.acu import pack_acu_test_into +from pus_tc.devs.imtq import pack_imtq_test_into +from pus_tc.devs.tmp1075 import pack_tmp1075_test_into +from pus_tc.devs.ploc_mpsoc import pack_ploc_mpsoc_test_into +from pus_tc.devs.ploc_supervisor import pack_ploc_supv_test_into +from pus_tc.devs.heater import pack_heater_test_into +from pus_tc.devs.reaction_wheels import pack_single_rw_test_into +from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into +from pus_tc.devs.ploc_upater import pack_ploc_updater_test_into +from pus_tc.devs.ploc_memory_dumper import pack_ploc_memory_dumper_cmd from pus_tc.devs.ccsds_handler import pack_ccsds_handler_test from pus_tc.core import pack_core_commands -from pus_tc.star_tracker import pack_star_tracker_commands -from pus_tc.syrlinks_hk_handler import pack_syrlinks_command +from pus_tc.devs.star_tracker import pack_star_tracker_commands +from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command from pus_tc.devs.gps import pack_gps_command from pus_tc.acs import pack_acs_command -from pus_tc.plpcdu import pack_pl_pcdu_commands -from pus_tc.str_img_helper import pack_str_img_helper_command +from pus_tc.devs.plpcdu import pack_pl_pcdu_commands +from pus_tc.devs.str_img_helper import pack_str_img_helper_command from config.definitions import CustomServiceList from config.object_ids import ( P60_DOCK_HANDLER, diff --git a/pus_tm/event_handler.py b/pus_tm/event_handler.py index 1989f93..bb1e4ef 100644 --- a/pus_tm/event_handler.py +++ b/pus_tm/event_handler.py @@ -2,6 +2,6 @@ import config.object_ids as obj_ids def handle_event_packet( - object_id: bytes, event_id: int, param_1: int, param_2: int + object_id: bytes, event_id: int, param_1: int, param_2: int ) -> str: return "" diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py index cc2ce3d..69d8a24 100644 --- a/pus_tm/hk_handling.py +++ b/pus_tm/hk_handling.py @@ -7,8 +7,8 @@ from tmtccmd.config.definitions import HkReplyUnpacked from tmtccmd.tm.service_3_fsfw_housekeeping import Service3Base from tmtccmd.utility.logger import get_console_logger from pus_tc.devs.bpx_batt import BpxSetIds -from pus_tc.syrlinks_hk_handler import SetIds -from pus_tc.imtq import ImtqSetIds +from pus_tc.devs.syrlinks_hk_handler import SetIds +from pus_tc.devs.imtq import ImtqSetIds from config.object_ids import ( SYRLINKS_HANDLER_ID, IMTQ_HANDLER_ID, diff --git a/pus_tm/service_8_hook.py b/pus_tm/service_8_hook.py index 735e64f..f5ddde0 100644 --- a/pus_tm/service_8_hook.py +++ b/pus_tm/service_8_hook.py @@ -1,9 +1,9 @@ import struct from config.object_ids import * -from pus_tc.imtq import ImtqActionIds -from pus_tc.ploc_mpsoc import PlocReplyIds -from pus_tc.ploc_supervisor import SupvActionIds -from pus_tc.star_tracker import StarTrackerActionIds +from pus_tc.devs.imtq import ImtqActionIds +from pus_tc.devs.ploc_mpsoc import PlocReplyIds +from pus_tc.devs.ploc_supervisor import SupvActionIds +from pus_tc.devs.star_tracker import StarTrackerActionIds from tmtccmd.utility.logger import get_console_logger from tmtccmd.config.definitions import DataReplyUnpacked