From 66c8f09febe2e7dfed79f9afd71b8b1ba73d1f27 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 3 Nov 2022 22:04:21 +0100 Subject: [PATCH] some cleaning up --- pus_tc/procedure_packer.py | 6 +++--- pus_tc/system/proc.py | 4 ++-- pus_tm/action_reply_handler.py | 4 ++-- pus_tm/event_handler.py | 2 +- pus_tm/hk_handling.py | 4 ++-- tmtc/__init__.py | 1 - tmtc/{ => acs}/acs_board.py | 2 +- tmtc/{ => acs}/acs_ctrl.py | 0 tmtc/{ => acs}/acs_subsystem.py | 2 +- tmtc/{ => acs}/sus_board.py | 2 +- tmtc/payload/__init__.py | 0 tmtc/payload/pl_subsystem.py | 0 tmtc/{ => payload}/ploc_memory_dumper.py | 0 tmtc/{ => payload}/ploc_mpsoc.py | 0 tmtc/{ => payload}/ploc_supervisor.py | 0 15 files changed, 13 insertions(+), 14 deletions(-) rename tmtc/{ => acs}/acs_board.py (98%) rename tmtc/{ => acs}/acs_ctrl.py (100%) rename tmtc/{ => acs}/acs_subsystem.py (98%) rename tmtc/{ => acs}/sus_board.py (98%) create mode 100644 tmtc/payload/__init__.py create mode 100644 tmtc/payload/pl_subsystem.py rename tmtc/{ => payload}/ploc_memory_dumper.py (100%) rename tmtc/{ => payload}/ploc_mpsoc.py (100%) rename tmtc/{ => payload}/ploc_supervisor.py (100%) diff --git a/pus_tc/procedure_packer.py b/pus_tc/procedure_packer.py index e248e6b..ed94926 100644 --- a/pus_tc/procedure_packer.py +++ b/pus_tc/procedure_packer.py @@ -32,14 +32,14 @@ from pus_tc.devs.tmp1075 import pack_tmp1075_test_into from pus_tc.devs.heater import pack_heater_cmds from tmtc.acs.reaction_wheels import pack_single_rw_test_into, pack_rw_ass_cmds from pus_tc.devs.rad_sensor import pack_rad_sensor_test_into -from tmtc.ploc_memory_dumper import pack_ploc_memory_dumper_cmd +from tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd from pus_tc.devs.ccsds_handler import pack_ccsds_handler_test from pus_tc.system.core import pack_core_commands 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 tmtc.acs_board import pack_acs_command -from tmtc.sus_board import pack_sus_cmds +from tmtc.acs.acs_board import pack_acs_command +from tmtc.acs.sus_board import pack_sus_cmds from pus_tc.devs.plpcdu import pack_pl_pcdu_commands from pus_tc.devs.str_img_helper import pack_str_img_helper_command from pus_tc.system.tcs import pack_tcs_sys_commands diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py index 65db9da..0455f7a 100644 --- a/pus_tc/system/proc.py +++ b/pus_tc/system/proc.py @@ -34,8 +34,8 @@ from pus_tc.devs.sus import SetIds from pus_tc.devs.star_tracker import SetIds as StrSetIds from tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec from pus_tc.system.controllers import pack_cmd_ctrl_to_off, pack_cmd_ctrl_to_nml -from tmtc.acs_board import pack_acs_command -from tmtc.sus_board import pack_sus_cmds +from tmtc.acs.acs_board import pack_acs_command +from tmtc.acs.sus_board import pack_sus_cmds from tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command from pus_tc.devs.star_tracker import pack_star_tracker_commands from tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py index cb07dc4..00b25e3 100644 --- a/pus_tm/action_reply_handler.py +++ b/pus_tm/action_reply_handler.py @@ -2,8 +2,8 @@ import struct from config.object_ids import * from tmtc.acs.imtq import ImtqActionIds from pus_tm.defs import PrintWrapper -from tmtc.ploc_mpsoc import PlocReplyIds -from tmtc.ploc_supervisor import SupvActionIds +from tmtc.payload.ploc_mpsoc import PlocReplyIds +from tmtc.payload.ploc_supervisor import SupvActionIds from pus_tc.devs.star_tracker import StarTrackerActionIds from tmtc.power.tm import handle_get_param_data_reply from tmtccmd.logging import get_console_logger diff --git a/pus_tm/event_handler.py b/pus_tm/event_handler.py index 1cd06bb..4111792 100644 --- a/pus_tm/event_handler.py +++ b/pus_tm/event_handler.py @@ -4,7 +4,7 @@ from datetime import datetime from config.object_ids import get_object_ids from pus_tm.defs import PrintWrapper from pus_tm.verification_handler import generic_retval_printout -from tmtc.acs_subsystem import AcsModes +from tmtc.acs.acs_subsystem import AcsModes from tmtccmd.tc.pus_200_fsfw_modes import Modes from tmtccmd.tm import Service5Tm diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py index f046b09..72fa4e5 100644 --- a/pus_tm/hk_handling.py +++ b/pus_tm/hk_handling.py @@ -1,11 +1,11 @@ """HK Handling for EIVE OBSW""" # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES -from tmtc.acs_ctrl import handle_acs_ctrl_mgm_data +from tmtc.acs.acs_ctrl import handle_acs_ctrl_mgm_data from pus_tm.devs.plpcdu import handle_plpcdu_hk from pus_tm.devs.rad_sensor import handle_rad_sensor_data from pus_tm.devs.sus import handle_sus_hk from pus_tm.system.tcs import handle_thermal_controller_hk_data -from tmtc.ploc_supervisor import handle_supv_hk_data +from tmtc.payload.ploc_supervisor import handle_supv_hk_data from tmtc.acs.reaction_wheels import handle_rw_hk_data from tmtccmd.tm.pus_3_fsfw_hk import ( Service3Base, diff --git a/tmtc/__init__.py b/tmtc/__init__.py index 841f57c..e32ce78 100644 --- a/tmtc/__init__.py +++ b/tmtc/__init__.py @@ -1,2 +1 @@ -from .acs_subsystem import add_acs_subsystem_cmds from .test import add_test_defs diff --git a/tmtc/acs_board.py b/tmtc/acs/acs_board.py similarity index 98% rename from tmtc/acs_board.py rename to tmtc/acs/acs_board.py index a07b152..053fe1b 100644 --- a/tmtc/acs_board.py +++ b/tmtc/acs/acs_board.py @@ -6,7 +6,7 @@ from tmtccmd.config.tmtc import ( TmtcDefinitionWrapper, OpCodeEntry, ) -from tmtccmd.tc import DefaultPusQueueHelper, service_provider +from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.pus_200_fsfw_modes import Modes from config.object_ids import ACS_BOARD_ASS_ID diff --git a/tmtc/acs_ctrl.py b/tmtc/acs/acs_ctrl.py similarity index 100% rename from tmtc/acs_ctrl.py rename to tmtc/acs/acs_ctrl.py diff --git a/tmtc/acs_subsystem.py b/tmtc/acs/acs_subsystem.py similarity index 98% rename from tmtc/acs_subsystem.py rename to tmtc/acs/acs_subsystem.py index 26477ec..e127e37 100644 --- a/tmtc/acs_subsystem.py +++ b/tmtc/acs/acs_subsystem.py @@ -2,7 +2,7 @@ import enum from typing import Tuple, Dict from spacepackets.ecss import PusTelecommand -from .common import pack_mode_cmd_with_info +from tmtc.common import pack_mode_cmd_with_info from config.object_ids import ACS_SUBSYSTEM_ID from config.definitions import CustomServiceList from tmtccmd.config.tmtc import ( diff --git a/tmtc/sus_board.py b/tmtc/acs/sus_board.py similarity index 98% rename from tmtc/sus_board.py rename to tmtc/acs/sus_board.py index 6fb0687..4b6b65f 100644 --- a/tmtc/sus_board.py +++ b/tmtc/acs/sus_board.py @@ -1,6 +1,6 @@ from config.definitions import CustomServiceList from config.object_ids import SUS_BOARD_ASS_ID -from tmtc.acs_board import DualSideSubmodes +from tmtc.acs.acs_board import DualSideSubmodes from tmtc.common import pack_mode_cmd_with_info from tmtccmd.config.tmtc import ( tmtc_definitions_provider, diff --git a/tmtc/payload/__init__.py b/tmtc/payload/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tmtc/payload/pl_subsystem.py b/tmtc/payload/pl_subsystem.py new file mode 100644 index 0000000..e69de29 diff --git a/tmtc/ploc_memory_dumper.py b/tmtc/payload/ploc_memory_dumper.py similarity index 100% rename from tmtc/ploc_memory_dumper.py rename to tmtc/payload/ploc_memory_dumper.py diff --git a/tmtc/ploc_mpsoc.py b/tmtc/payload/ploc_mpsoc.py similarity index 100% rename from tmtc/ploc_mpsoc.py rename to tmtc/payload/ploc_mpsoc.py diff --git a/tmtc/ploc_supervisor.py b/tmtc/payload/ploc_supervisor.py similarity index 100% rename from tmtc/ploc_supervisor.py rename to tmtc/payload/ploc_supervisor.py