From 1483dc4d93898826b1cee645148f88995bbdc7a5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 29 Nov 2022 16:53:29 +0100 Subject: [PATCH] that was annoying --- .gitignore | 18 +++++- eive-tmtc/utility/__init__.py | 0 {eive-tmtc/config => eive_tmtc}/__init__.py | 0 eive_tmtc/config/__init__.py | 6 ++ .../config/custom_mode_op.py | 0 .../config/definitions.py | 0 {eive-tmtc => eive_tmtc}/config/events.csv | 0 .../config/globals_config.py | 0 {eive-tmtc => eive_tmtc}/config/hook.py | 10 +-- {eive-tmtc => eive_tmtc}/config/object_ids.py | 0 {eive-tmtc => eive_tmtc}/config/objects.csv | 0 .../config/returnvalues.csv | 0 {eive-tmtc => eive_tmtc}/config/retvals.py | 0 {eive-tmtc => eive_tmtc/gomspace}/__init__.py | 0 .../gomspace/gomspace_common.py | 0 .../gomspace/gomspace_pdu_definitions.py | 2 +- .../gomspace => eive_tmtc/pus_tc}/__init__.py | 0 .../pus_tc/cmd_definitions.py | 8 +-- .../pus_tc/devs/__init__.py | 0 .../pus_tc/devs/bpx_batt.py | 7 +-- .../pus_tc/devs/ccsds_handler.py | 0 {eive-tmtc => eive_tmtc}/pus_tc/devs/gps.py | 2 +- {eive-tmtc => eive_tmtc}/pus_tc/devs/gyros.py | 0 .../pus_tc/devs/heater.py | 6 +- {eive-tmtc => eive_tmtc}/pus_tc/devs/mgms.py | 0 .../pus_tc/devs/pdec_handler.py | 0 .../pus_tc/devs/plpcdu.py | 4 +- .../pus_tc/devs/rad_sensor.py | 4 +- {eive-tmtc => eive_tmtc}/pus_tc/devs/rtd.py | 8 +-- {eive-tmtc => eive_tmtc}/pus_tc/devs/scex.py | 4 +- .../pus_tc/devs/star_tracker.py | 2 +- .../pus_tc/devs/str_img_helper.py | 0 {eive-tmtc => eive_tmtc}/pus_tc/devs/sus.py | 0 .../pus_tc/devs/syrlinks_hk_handler.py | 2 +- .../pus_tc/devs/tmp1075.py | 2 +- .../pus_tc/procedure_packer.py | 61 ++++++++++--------- .../pus_tc/prompt_parameters.py | 0 .../pus_tc/service_200_mode.py | 2 +- .../pus_tc/system/__init__.py | 0 .../pus_tc/system/controllers.py | 9 ++- .../pus_tc/system/core.py | 4 +- .../pus_tc/system/proc.py | 53 ++++++++-------- {eive-tmtc => eive_tmtc}/pus_tc/system/tcs.py | 6 +- .../pus_tc/system/time.py | 2 +- .../pus_tc => eive_tmtc/pus_tm}/__init__.py | 0 .../pus_tm/action_reply_handler.py | 14 ++--- {eive-tmtc => eive_tmtc}/pus_tm/defs.py | 0 .../pus_tm/devs}/__init__.py | 0 .../pus_tm/devs/bpx_bat.py | 4 +- {eive-tmtc => eive_tmtc}/pus_tm/devs/gps.py | 2 +- {eive-tmtc => eive_tmtc}/pus_tm/devs/gyros.py | 6 +- {eive-tmtc => eive_tmtc}/pus_tm/devs/mgms.py | 6 +- .../pus_tm/devs/plpcdu.py | 4 +- .../pus_tm/devs/rad_sensor.py | 4 +- {eive-tmtc => eive_tmtc}/pus_tm/devs/sus.py | 4 +- .../pus_tm/devs/syrlinks.py | 4 +- .../pus_tm/event_handler.py | 8 +-- .../pus_tm/factory_hook.py | 4 +- .../pus_tm/hk_handling.py | 38 ++++++------ .../pus_tm/system}/__init__.py | 0 .../pus_tm/system/core.py | 4 +- {eive-tmtc => eive_tmtc}/pus_tm/system/tcs.py | 2 +- .../pus_tm/tcp_server_objects.py | 0 .../pus_tm/tm_tcp_server.py | 0 .../pus_tm/verification_handler.py | 2 +- {eive-tmtc => eive_tmtc}/tmtc/__init__.py | 0 .../system => eive_tmtc/tmtc/acs}/__init__.py | 0 .../tmtc/acs/acs_board.py | 6 +- {eive-tmtc => eive_tmtc}/tmtc/acs/acs_ctrl.py | 6 +- .../tmtc/acs/acs_subsystem.py | 6 +- {eive-tmtc => eive_tmtc}/tmtc/acs/imtq.py | 4 +- .../tmtc/acs/reaction_wheels.py | 6 +- .../tmtc/acs/sus_board.py | 8 +-- {eive-tmtc => eive_tmtc}/tmtc/common.py | 0 .../tmtc/payload}/__init__.py | 0 .../tmtc/payload/pl_subsystem.py | 6 +- .../tmtc/payload/ploc_memory_dumper.py | 2 +- .../tmtc/payload/ploc_mpsoc.py | 9 ++- .../tmtc/payload/ploc_supervisor.py | 8 +-- .../tmtc/power}/__init__.py | 0 {eive-tmtc => eive_tmtc}/tmtc/power/acu.py | 10 +-- .../tmtc/power/common_power.py | 4 +- .../tmtc/power/p60dock.py | 6 +- {eive-tmtc => eive_tmtc}/tmtc/power/pdu1.py | 10 +-- {eive-tmtc => eive_tmtc}/tmtc/power/pdu2.py | 8 +-- {eive-tmtc => eive_tmtc}/tmtc/power/power.py | 14 ++--- {eive-tmtc => eive_tmtc}/tmtc/power/tm.py | 14 +++-- .../tmtc/solar_array_deployment.py | 0 {eive-tmtc => eive_tmtc}/tmtc/test.py | 0 .../power => eive_tmtc/utility}/__init__.py | 0 .../utility/args_parser.py | 0 .../utility/input_helper.py | 0 setup.cfg | 4 +- tmtcc.py | 10 +-- 94 files changed, 251 insertions(+), 218 deletions(-) delete mode 100644 eive-tmtc/utility/__init__.py rename {eive-tmtc/config => eive_tmtc}/__init__.py (100%) create mode 100644 eive_tmtc/config/__init__.py rename {eive-tmtc => eive_tmtc}/config/custom_mode_op.py (100%) rename {eive-tmtc => eive_tmtc}/config/definitions.py (100%) rename {eive-tmtc => eive_tmtc}/config/events.csv (100%) rename {eive-tmtc => eive_tmtc}/config/globals_config.py (100%) rename {eive-tmtc => eive_tmtc}/config/hook.py (79%) rename {eive-tmtc => eive_tmtc}/config/object_ids.py (100%) rename {eive-tmtc => eive_tmtc}/config/objects.csv (100%) rename {eive-tmtc => eive_tmtc}/config/returnvalues.csv (100%) rename {eive-tmtc => eive_tmtc}/config/retvals.py (100%) rename {eive-tmtc => eive_tmtc/gomspace}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/gomspace/gomspace_common.py (100%) rename {eive-tmtc => eive_tmtc}/gomspace/gomspace_pdu_definitions.py (97%) rename {eive-tmtc/gomspace => eive_tmtc/pus_tc}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/cmd_definitions.py (96%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/bpx_batt.py (89%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/ccsds_handler.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/gps.py (95%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/gyros.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/heater.py (97%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/mgms.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/pdec_handler.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/plpcdu.py (99%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/rad_sensor.py (96%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/rtd.py (93%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/scex.py (98%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/star_tracker.py (99%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/str_img_helper.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/sus.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/syrlinks_hk_handler.py (99%) rename {eive-tmtc => eive_tmtc}/pus_tc/devs/tmp1075.py (97%) rename {eive-tmtc => eive_tmtc}/pus_tc/procedure_packer.py (80%) rename {eive-tmtc => eive_tmtc}/pus_tc/prompt_parameters.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/service_200_mode.py (96%) rename {eive-tmtc => eive_tmtc}/pus_tc/system/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tc/system/controllers.py (91%) rename {eive-tmtc => eive_tmtc}/pus_tc/system/core.py (98%) rename {eive-tmtc => eive_tmtc}/pus_tc/system/proc.py (93%) rename {eive-tmtc => eive_tmtc}/pus_tc/system/tcs.py (91%) rename {eive-tmtc => eive_tmtc}/pus_tc/system/time.py (94%) rename {eive-tmtc/pus_tc => eive_tmtc/pus_tm}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tm/action_reply_handler.py (92%) rename {eive-tmtc => eive_tmtc}/pus_tm/defs.py (100%) rename {eive-tmtc/pus_tm => eive_tmtc/pus_tm/devs}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/bpx_bat.py (95%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/gps.py (95%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/gyros.py (94%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/mgms.py (91%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/plpcdu.py (93%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/rad_sensor.py (90%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/sus.py (91%) rename {eive-tmtc => eive_tmtc}/pus_tm/devs/syrlinks.py (95%) rename {eive-tmtc => eive_tmtc}/pus_tm/event_handler.py (94%) rename {eive-tmtc => eive_tmtc}/pus_tm/factory_hook.py (95%) rename {eive-tmtc => eive_tmtc}/pus_tm/hk_handling.py (85%) rename {eive-tmtc/pus_tm/devs => eive_tmtc/pus_tm/system}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tm/system/core.py (87%) rename {eive-tmtc => eive_tmtc}/pus_tm/system/tcs.py (98%) rename {eive-tmtc => eive_tmtc}/pus_tm/tcp_server_objects.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tm/tm_tcp_server.py (100%) rename {eive-tmtc => eive_tmtc}/pus_tm/verification_handler.py (97%) rename {eive-tmtc => eive_tmtc}/tmtc/__init__.py (100%) rename {eive-tmtc/pus_tm/system => eive_tmtc/tmtc/acs}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/tmtc/acs/acs_board.py (95%) rename {eive-tmtc => eive_tmtc}/tmtc/acs/acs_ctrl.py (97%) rename {eive-tmtc => eive_tmtc}/tmtc/acs/acs_subsystem.py (92%) rename {eive-tmtc => eive_tmtc}/tmtc/acs/imtq.py (99%) rename {eive-tmtc => eive_tmtc}/tmtc/acs/reaction_wheels.py (98%) rename {eive-tmtc => eive_tmtc}/tmtc/acs/sus_board.py (90%) rename {eive-tmtc => eive_tmtc}/tmtc/common.py (100%) rename {eive-tmtc/tmtc/acs => eive_tmtc/tmtc/payload}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/tmtc/payload/pl_subsystem.py (91%) rename {eive-tmtc => eive_tmtc}/tmtc/payload/ploc_memory_dumper.py (96%) rename {eive-tmtc => eive_tmtc}/tmtc/payload/ploc_mpsoc.py (97%) rename {eive-tmtc => eive_tmtc}/tmtc/payload/ploc_supervisor.py (99%) rename {eive-tmtc/tmtc/payload => eive_tmtc/tmtc/power}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/tmtc/power/acu.py (96%) rename {eive-tmtc => eive_tmtc}/tmtc/power/common_power.py (98%) rename {eive-tmtc => eive_tmtc}/tmtc/power/p60dock.py (98%) rename {eive-tmtc => eive_tmtc}/tmtc/power/pdu1.py (96%) rename {eive-tmtc => eive_tmtc}/tmtc/power/pdu2.py (98%) rename {eive-tmtc => eive_tmtc}/tmtc/power/power.py (90%) rename {eive-tmtc => eive_tmtc}/tmtc/power/tm.py (98%) rename {eive-tmtc => eive_tmtc}/tmtc/solar_array_deployment.py (100%) rename {eive-tmtc => eive_tmtc}/tmtc/test.py (100%) rename {eive-tmtc/tmtc/power => eive_tmtc/utility}/__init__.py (100%) rename {eive-tmtc => eive_tmtc}/utility/args_parser.py (100%) rename {eive-tmtc => eive_tmtc}/utility/input_helper.py (100%) diff --git a/.gitignore b/.gitignore index 20b76c2..630695e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,20 @@ log /tmtc_conf.json /seqcnt*.txt -*.egg-info/ +# Distribution / packaging +/.Python +/build/ +/develop-eggs/ +/downloads/ +/eggs/ +/.eggs/ +/parts/ +/sdist/ +/var/ +/wheels/ +/pip-wheel-metadata/ +/share/python-wheels/ +/*.egg-info/ +/.installed.cfg +/*.egg +/MANIFEST diff --git a/eive-tmtc/utility/__init__.py b/eive-tmtc/utility/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/eive-tmtc/config/__init__.py b/eive_tmtc/__init__.py similarity index 100% rename from eive-tmtc/config/__init__.py rename to eive_tmtc/__init__.py diff --git a/eive_tmtc/config/__init__.py b/eive_tmtc/config/__init__.py new file mode 100644 index 0000000..f802189 --- /dev/null +++ b/eive_tmtc/config/__init__.py @@ -0,0 +1,6 @@ +SW_NAME = "eive" +VERSION_MAJOR = 1 +VERSION_MINOR = 13 +VERSION_SUBMINOR = 0 + +__version__ = "1.13.0" diff --git a/eive-tmtc/config/custom_mode_op.py b/eive_tmtc/config/custom_mode_op.py similarity index 100% rename from eive-tmtc/config/custom_mode_op.py rename to eive_tmtc/config/custom_mode_op.py diff --git a/eive-tmtc/config/definitions.py b/eive_tmtc/config/definitions.py similarity index 100% rename from eive-tmtc/config/definitions.py rename to eive_tmtc/config/definitions.py diff --git a/eive-tmtc/config/events.csv b/eive_tmtc/config/events.csv similarity index 100% rename from eive-tmtc/config/events.csv rename to eive_tmtc/config/events.csv diff --git a/eive-tmtc/config/globals_config.py b/eive_tmtc/config/globals_config.py similarity index 100% rename from eive-tmtc/config/globals_config.py rename to eive_tmtc/config/globals_config.py diff --git a/eive-tmtc/config/hook.py b/eive_tmtc/config/hook.py similarity index 79% rename from eive-tmtc/config/hook.py rename to eive_tmtc/config/hook.py index 1e73b2a..bee9a59 100644 --- a/eive-tmtc/config/hook.py +++ b/eive_tmtc/config/hook.py @@ -1,12 +1,12 @@ from typing import Optional -from config.definitions import SPACE_PACKET_IDS +from eive_tmtc.config.definitions import SPACE_PACKET_IDS from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend from tmtccmd.com_if import ComInterface from tmtccmd.config import TmtcDefinitionWrapper -from config.retvals import get_retval_dict -from pus_tc.cmd_definitions import get_eive_service_op_code_dict +from eive_tmtc.config.retvals import get_retval_dict +from eive_tmtc.pus_tc.cmd_definitions import get_eive_service_op_code_dict from tmtccmd.util import ObjectIdDictT, RetvalDictT @@ -31,12 +31,12 @@ class EiveHookObject(TmTcCfgHookBase): return create_com_interface_default(cfg) def perform_mode_operation(self, tmtc_backend: CcsdsTmtcBackend, mode: int): - from config.custom_mode_op import custom_mode_operation + from eive_tmtc.config.custom_mode_op import custom_mode_operation custom_mode_operation(tmtc_backend, mode) def get_object_ids(self) -> ObjectIdDictT: - from config.object_ids import get_object_ids + from eive_tmtc.config.object_ids import get_object_ids return get_object_ids() diff --git a/eive-tmtc/config/object_ids.py b/eive_tmtc/config/object_ids.py similarity index 100% rename from eive-tmtc/config/object_ids.py rename to eive_tmtc/config/object_ids.py diff --git a/eive-tmtc/config/objects.csv b/eive_tmtc/config/objects.csv similarity index 100% rename from eive-tmtc/config/objects.csv rename to eive_tmtc/config/objects.csv diff --git a/eive-tmtc/config/returnvalues.csv b/eive_tmtc/config/returnvalues.csv similarity index 100% rename from eive-tmtc/config/returnvalues.csv rename to eive_tmtc/config/returnvalues.csv diff --git a/eive-tmtc/config/retvals.py b/eive_tmtc/config/retvals.py similarity index 100% rename from eive-tmtc/config/retvals.py rename to eive_tmtc/config/retvals.py diff --git a/eive-tmtc/__init__.py b/eive_tmtc/gomspace/__init__.py similarity index 100% rename from eive-tmtc/__init__.py rename to eive_tmtc/gomspace/__init__.py diff --git a/eive-tmtc/gomspace/gomspace_common.py b/eive_tmtc/gomspace/gomspace_common.py similarity index 100% rename from eive-tmtc/gomspace/gomspace_common.py rename to eive_tmtc/gomspace/gomspace_common.py diff --git a/eive-tmtc/gomspace/gomspace_pdu_definitions.py b/eive_tmtc/gomspace/gomspace_pdu_definitions.py similarity index 97% rename from eive-tmtc/gomspace/gomspace_pdu_definitions.py rename to eive_tmtc/gomspace/gomspace_pdu_definitions.py index 344eb94..20edc2e 100644 --- a/eive-tmtc/gomspace/gomspace_pdu_definitions.py +++ b/eive_tmtc/gomspace/gomspace_pdu_definitions.py @@ -1,4 +1,4 @@ -from gomspace.gomspace_common import TableEntry +from eive_tmtc.gomspace.gomspace_common import TableEntry class PduConfigTable: diff --git a/eive-tmtc/gomspace/__init__.py b/eive_tmtc/pus_tc/__init__.py similarity index 100% rename from eive-tmtc/gomspace/__init__.py rename to eive_tmtc/pus_tc/__init__.py diff --git a/eive-tmtc/pus_tc/cmd_definitions.py b/eive_tmtc/pus_tc/cmd_definitions.py similarity index 96% rename from eive-tmtc/pus_tc/cmd_definitions.py rename to eive_tmtc/pus_tc/cmd_definitions.py index 6344929..534a748 100644 --- a/eive-tmtc/pus_tc/cmd_definitions.py +++ b/eive_tmtc/pus_tc/cmd_definitions.py @@ -1,6 +1,6 @@ -from pus_tc.devs.bpx_batt import BpxOpCodes +from eive_tmtc.pus_tc.devs.bpx_batt import BpxOpCodes -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry, CoreServiceList from tmtccmd.config.tmtc import ( tmtc_definitions_provider, @@ -140,7 +140,7 @@ def add_bpx_cmd_definitions(defs: TmtcDefinitionWrapper): @tmtc_definitions_provider def add_time_cmds(defs: TmtcDefinitionWrapper): - from pus_tc.system.time import OpCodes, Info + from eive_tmtc.pus_tc.system.time import OpCodes, Info oce = OpCodeEntry() oce.add( @@ -156,7 +156,7 @@ def add_time_cmds(defs: TmtcDefinitionWrapper): @tmtc_definitions_provider def add_system_cmds(defs: TmtcDefinitionWrapper): - import pus_tc.system.controllers as controllers + import eive_tmtc.pus_tc.system.controllers as controllers oce = OpCodeEntry() oce.add( diff --git a/eive-tmtc/pus_tc/devs/__init__.py b/eive_tmtc/pus_tc/devs/__init__.py similarity index 100% rename from eive-tmtc/pus_tc/devs/__init__.py rename to eive_tmtc/pus_tc/devs/__init__.py diff --git a/eive-tmtc/pus_tc/devs/bpx_batt.py b/eive_tmtc/pus_tc/devs/bpx_batt.py similarity index 89% rename from eive-tmtc/pus_tc/devs/bpx_batt.py rename to eive_tmtc/pus_tc/devs/bpx_batt.py index 108b02a..613a14a 100644 --- a/eive-tmtc/pus_tc/devs/bpx_batt.py +++ b/eive_tmtc/pus_tc/devs/bpx_batt.py @@ -1,7 +1,6 @@ -from config.definitions import CustomServiceList -from config.object_ids import BPX_HANDLER_ID -from tmtccmd import DefaultProcedureInfo, TcHandlerBase -from tmtccmd.tc import DefaultPusQueueHelper, service_provider +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import BPX_HANDLER_ID +from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid diff --git a/eive-tmtc/pus_tc/devs/ccsds_handler.py b/eive_tmtc/pus_tc/devs/ccsds_handler.py similarity index 100% rename from eive-tmtc/pus_tc/devs/ccsds_handler.py rename to eive_tmtc/pus_tc/devs/ccsds_handler.py diff --git a/eive-tmtc/pus_tc/devs/gps.py b/eive_tmtc/pus_tc/devs/gps.py similarity index 95% rename from eive-tmtc/pus_tc/devs/gps.py rename to eive_tmtc/pus_tc/devs/gps.py index 000d759..87f373f 100644 --- a/eive-tmtc/pus_tc/devs/gps.py +++ b/eive_tmtc/pus_tc/devs/gps.py @@ -1,6 +1,6 @@ import enum -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper diff --git a/eive-tmtc/pus_tc/devs/gyros.py b/eive_tmtc/pus_tc/devs/gyros.py similarity index 100% rename from eive-tmtc/pus_tc/devs/gyros.py rename to eive_tmtc/pus_tc/devs/gyros.py diff --git a/eive-tmtc/pus_tc/devs/heater.py b/eive_tmtc/pus_tc/devs/heater.py similarity index 97% rename from eive-tmtc/pus_tc/devs/heater.py rename to eive_tmtc/pus_tc/devs/heater.py index b7e9cde..ae7dd37 100644 --- a/eive-tmtc/pus_tc/devs/heater.py +++ b/eive_tmtc/pus_tc/devs/heater.py @@ -5,8 +5,8 @@ """ import enum -from config.definitions import CustomServiceList -from config.object_ids import get_object_ids +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import get_object_ids from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper @@ -122,7 +122,7 @@ def pack_heater_cmds(object_id: bytearray, op_code: str, q: DefaultPusQueueHelpe def heater_idx_to_obj(heater: int) -> ObjectIdU32: - from config.object_ids import ( + from eive_tmtc.config.object_ids import ( HEATER_0_OBC_BRD, HEATER_1_PLOC_PROC_BRD, HEATER_2_ACS_BRD, diff --git a/eive-tmtc/pus_tc/devs/mgms.py b/eive_tmtc/pus_tc/devs/mgms.py similarity index 100% rename from eive-tmtc/pus_tc/devs/mgms.py rename to eive_tmtc/pus_tc/devs/mgms.py diff --git a/eive-tmtc/pus_tc/devs/pdec_handler.py b/eive_tmtc/pus_tc/devs/pdec_handler.py similarity index 100% rename from eive-tmtc/pus_tc/devs/pdec_handler.py rename to eive_tmtc/pus_tc/devs/pdec_handler.py diff --git a/eive-tmtc/pus_tc/devs/plpcdu.py b/eive_tmtc/pus_tc/devs/plpcdu.py similarity index 99% rename from eive-tmtc/pus_tc/devs/plpcdu.py rename to eive_tmtc/pus_tc/devs/plpcdu.py index 6ceafed..b2c8008 100644 --- a/eive-tmtc/pus_tc/devs/plpcdu.py +++ b/eive_tmtc/pus_tc/devs/plpcdu.py @@ -3,7 +3,7 @@ import struct import time from typing import Optional -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config import TmtcDefinitionWrapper from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider @@ -26,7 +26,7 @@ from tmtccmd.tc.pus_20_params import ( ) from tmtccmd.logging import get_console_logger from spacepackets.ecss.tc import PusTelecommand -from config.object_ids import PL_PCDU_ID +from eive_tmtc.config.object_ids import PL_PCDU_ID LOGGER = get_console_logger() diff --git a/eive-tmtc/pus_tc/devs/rad_sensor.py b/eive_tmtc/pus_tc/devs/rad_sensor.py similarity index 96% rename from eive-tmtc/pus_tc/devs/rad_sensor.py rename to eive_tmtc/pus_tc/devs/rad_sensor.py index 949f9a8..9383901 100644 --- a/eive-tmtc/pus_tc/devs/rad_sensor.py +++ b/eive_tmtc/pus_tc/devs/rad_sensor.py @@ -7,10 +7,10 @@ """ import struct -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from spacepackets.ecss.tc import PusTelecommand -from pus_tc.service_200_mode import pack_mode_data, Modes +from eive_tmtc.pus_tc.service_200_mode import pack_mode_data, Modes from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper diff --git a/eive-tmtc/pus_tc/devs/rtd.py b/eive_tmtc/pus_tc/devs/rtd.py similarity index 93% rename from eive-tmtc/pus_tc/devs/rtd.py rename to eive_tmtc/pus_tc/devs/rtd.py index 692e781..9f2173e 100644 --- a/eive-tmtc/pus_tc/devs/rtd.py +++ b/eive_tmtc/pus_tc/devs/rtd.py @@ -1,7 +1,7 @@ from typing import Optional -from config.definitions import CustomServiceList -from pus_tc.devs.pdec_handler import CommandIds +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.pus_tc.devs.pdec_handler import CommandIds from spacepackets.ecss import PusTelecommand from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider @@ -9,8 +9,8 @@ from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.util import ObjectIdU32 from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices -import config.object_ids as oids -from config.object_ids import get_object_ids +import eive_tmtc.config.object_ids as oids +from eive_tmtc.config.object_ids import get_object_ids RTD_IDS = [ oids.RTD_0_PLOC_HSPD, diff --git a/eive-tmtc/pus_tc/devs/scex.py b/eive_tmtc/pus_tc/devs/scex.py similarity index 98% rename from eive-tmtc/pus_tc/devs/scex.py rename to eive_tmtc/pus_tc/devs/scex.py index 8ef0092..2612c5e 100644 --- a/eive-tmtc/pus_tc/devs/scex.py +++ b/eive_tmtc/pus_tc/devs/scex.py @@ -3,14 +3,14 @@ import json from spacepackets.ecss import PusTelecommand -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc.pus_200_fsfw_modes import Modes, pack_mode_data, Subservices from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper -from config.object_ids import SCEX_HANDLER_ID +from eive_tmtc.config.object_ids import SCEX_HANDLER_ID USE_SCEX_CONF_FILE = True diff --git a/eive-tmtc/pus_tc/devs/star_tracker.py b/eive_tmtc/pus_tc/devs/star_tracker.py similarity index 99% rename from eive-tmtc/pus_tc/devs/star_tracker.py rename to eive_tmtc/pus_tc/devs/star_tracker.py index 3012c34..b7519ff 100644 --- a/eive-tmtc/pus_tc/devs/star_tracker.py +++ b/eive_tmtc/pus_tc/devs/star_tracker.py @@ -13,7 +13,7 @@ from tmtccmd.logging import get_console_logger from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.util import ObjectIdU32 -from utility.input_helper import InputHelper +from eive_tmtc.utility.input_helper import InputHelper LOGGER = get_console_logger() diff --git a/eive-tmtc/pus_tc/devs/str_img_helper.py b/eive_tmtc/pus_tc/devs/str_img_helper.py similarity index 100% rename from eive-tmtc/pus_tc/devs/str_img_helper.py rename to eive_tmtc/pus_tc/devs/str_img_helper.py diff --git a/eive-tmtc/pus_tc/devs/sus.py b/eive_tmtc/pus_tc/devs/sus.py similarity index 100% rename from eive-tmtc/pus_tc/devs/sus.py rename to eive_tmtc/pus_tc/devs/sus.py diff --git a/eive-tmtc/pus_tc/devs/syrlinks_hk_handler.py b/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py similarity index 99% rename from eive-tmtc/pus_tc/devs/syrlinks_hk_handler.py rename to eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py index fece659..5ffdfeb 100644 --- a/eive-tmtc/pus_tc/devs/syrlinks_hk_handler.py +++ b/eive_tmtc/pus_tc/devs/syrlinks_hk_handler.py @@ -5,7 +5,7 @@ @author J. Meier @date 13.12.2020 """ -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config.tmtc import ( tmtc_definitions_provider, TmtcDefinitionWrapper, diff --git a/eive-tmtc/pus_tc/devs/tmp1075.py b/eive_tmtc/pus_tc/devs/tmp1075.py similarity index 97% rename from eive-tmtc/pus_tc/devs/tmp1075.py rename to eive_tmtc/pus_tc/devs/tmp1075.py index f24c7ab..5d5d419 100644 --- a/eive-tmtc/pus_tc/devs/tmp1075.py +++ b/eive_tmtc/pus_tc/devs/tmp1075.py @@ -6,7 +6,7 @@ @date 06.01.2021 """ from spacepackets.ecss.tc import PusTelecommand -from pus_tc.service_200_mode import pack_mode_data +from eive_tmtc.pus_tc.service_200_mode import pack_mode_data from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.tc.pus_200_fsfw_modes import Modes from tmtccmd.util import ObjectIdU32 diff --git a/eive-tmtc/pus_tc/procedure_packer.py b/eive_tmtc/pus_tc/procedure_packer.py similarity index 80% rename from eive-tmtc/pus_tc/procedure_packer.py rename to eive_tmtc/pus_tc/procedure_packer.py index ed94926..bbceaa9 100644 --- a/eive-tmtc/pus_tc/procedure_packer.py +++ b/eive_tmtc/pus_tc/procedure_packer.py @@ -2,10 +2,10 @@ """ from typing import cast -from tmtc.power.power import pack_power_commands -from pus_tc.devs.rtd import pack_rtd_commands -from pus_tc.devs.scex import pack_scex_cmds -from pus_tc.system.controllers import ( +from eive_tmtc.tmtc.power.power import pack_power_commands +from eive_tmtc.pus_tc.devs.rtd import pack_rtd_commands +from eive_tmtc.pus_tc.devs.scex import pack_scex_cmds +from eive_tmtc.pus_tc.system.controllers import ( pack_cmd_ctrl_to_prompted_mode, get_object_from_op_code, ) @@ -22,30 +22,33 @@ from tmtccmd.tc.pus_5_event import ( ) from tmtccmd.pus.pus_17_test import pack_service_17_ping_command -from pus_tc.service_200_mode import pack_service_200_test_into -from tmtc.power.p60dock import pack_p60dock_cmds -from tmtc.power.pdu2 import pack_pdu2_commands -from tmtc.power.pdu1 import pack_pdu1_commands -from tmtc.power.acu import pack_acu_commands -from tmtc.acs.imtq import pack_imtq_test_into -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.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.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 -from pus_tc.system.proc import pack_proc_commands -from config.definitions import CustomServiceList -from config.object_ids import ( +from eive_tmtc.pus_tc.service_200_mode import pack_service_200_test_into +from eive_tmtc.tmtc.power.p60dock import pack_p60dock_cmds +from eive_tmtc.tmtc.power.pdu2 import pack_pdu2_commands +from eive_tmtc.tmtc.power.pdu1 import pack_pdu1_commands +from eive_tmtc.tmtc.power.acu import pack_acu_commands +from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into +from eive_tmtc.pus_tc.devs.tmp1075 import pack_tmp1075_test_into +from eive_tmtc.pus_tc.devs.heater import pack_heater_cmds +from eive_tmtc.tmtc.acs.reaction_wheels import ( + pack_single_rw_test_into, + pack_rw_ass_cmds, +) +from eive_tmtc.pus_tc.devs.rad_sensor import pack_rad_sensor_test_into +from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd +from eive_tmtc.pus_tc.devs.ccsds_handler import pack_ccsds_handler_test +from eive_tmtc.pus_tc.system.core import pack_core_commands +from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands +from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command +from eive_tmtc.pus_tc.devs.gps import pack_gps_command +from eive_tmtc.tmtc.acs.acs_board import pack_acs_command +from eive_tmtc.tmtc.acs.sus_board import pack_sus_cmds +from eive_tmtc.pus_tc.devs.plpcdu import pack_pl_pcdu_commands +from eive_tmtc.pus_tc.devs.str_img_helper import pack_str_img_helper_command +from eive_tmtc.pus_tc.system.tcs import pack_tcs_sys_commands +from eive_tmtc.pus_tc.system.proc import pack_proc_commands +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import ( P60_DOCK_HANDLER, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, @@ -68,7 +71,7 @@ from config.object_ids import ( RW_ASSEMBLY, get_object_ids, ) -import config.object_ids as oids +import eive_tmtc.config.object_ids as oids from tmtccmd.util import ObjectIdU32 LOGGER = get_console_logger() diff --git a/eive-tmtc/pus_tc/prompt_parameters.py b/eive_tmtc/pus_tc/prompt_parameters.py similarity index 100% rename from eive-tmtc/pus_tc/prompt_parameters.py rename to eive_tmtc/pus_tc/prompt_parameters.py diff --git a/eive-tmtc/pus_tc/service_200_mode.py b/eive_tmtc/pus_tc/service_200_mode.py similarity index 96% rename from eive-tmtc/pus_tc/service_200_mode.py rename to eive_tmtc/pus_tc/service_200_mode.py index 42809d9..3158af0 100644 --- a/eive-tmtc/pus_tc/service_200_mode.py +++ b/eive_tmtc/pus_tc/service_200_mode.py @@ -8,7 +8,7 @@ from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes -from config.object_ids import TEST_DEVICE_ID +from eive_tmtc.config.object_ids import TEST_DEVICE_ID TEST_DEVICE_OBJ_ID = TEST_DEVICE_ID diff --git a/eive-tmtc/pus_tc/system/__init__.py b/eive_tmtc/pus_tc/system/__init__.py similarity index 100% rename from eive-tmtc/pus_tc/system/__init__.py rename to eive_tmtc/pus_tc/system/__init__.py diff --git a/eive-tmtc/pus_tc/system/controllers.py b/eive_tmtc/pus_tc/system/controllers.py similarity index 91% rename from eive-tmtc/pus_tc/system/controllers.py rename to eive_tmtc/pus_tc/system/controllers.py index 33252d2..50f2dd9 100644 --- a/eive-tmtc/pus_tc/system/controllers.py +++ b/eive_tmtc/pus_tc/system/controllers.py @@ -4,10 +4,13 @@ from tmtccmd.tc import DefaultPusQueueHelper from tmtccmd.tc.pus_200_fsfw_modes import Modes from tmtccmd.util import ObjectIdU32, ObjectIdBase -from tmtc.common import pack_mode_cmd_with_info -import config.object_ids as obj_ids +from eive_tmtc.tmtc.common import pack_mode_cmd_with_info +import eive_tmtc.config.object_ids as obj_ids -from pus_tc.prompt_parameters import prompt_parameters_cli, prompt_parameters_gui +from eive_tmtc.pus_tc.prompt_parameters import ( + prompt_parameters_cli, + prompt_parameters_gui, +) class OpCodes: diff --git a/eive-tmtc/pus_tc/system/core.py b/eive_tmtc/pus_tc/system/core.py similarity index 98% rename from eive-tmtc/pus_tc/system/core.py rename to eive_tmtc/pus_tc/system/core.py index e1b685d..41ec84f 100644 --- a/eive-tmtc/pus_tc/system/core.py +++ b/eive_tmtc/pus_tc/system/core.py @@ -1,6 +1,6 @@ import enum -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from spacepackets.ecss import PusTelecommand from tmtccmd.config import TmtcDefinitionWrapper @@ -9,7 +9,7 @@ from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.logging import get_console_logger from tmtccmd.tc.pus_3_fsfw_hk import make_sid, generate_one_hk_command from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider -from config.object_ids import CORE_CONTROLLER_ID +from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID LOGGER = get_console_logger() diff --git a/eive-tmtc/pus_tc/system/proc.py b/eive_tmtc/pus_tc/system/proc.py similarity index 93% rename from eive-tmtc/pus_tc/system/proc.py rename to eive_tmtc/pus_tc/system/proc.py index 0455f7a..924f47c 100644 --- a/eive-tmtc/pus_tc/system/proc.py +++ b/eive_tmtc/pus_tc/system/proc.py @@ -3,9 +3,9 @@ from __future__ import annotations import time from datetime import timedelta -from config.definitions import CustomServiceList -from config.object_ids import get_object_ids -from pus_tc.system.tcs import pack_tcs_sys_commands +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import get_object_ids +from eive_tmtc.pus_tc.system.tcs import pack_tcs_sys_commands from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider @@ -17,28 +17,31 @@ from tmtccmd.tc.pus_11_tc_sched import ( ) from tmtccmd.tc.pus_3_fsfw_hk import * -import config.object_ids as oids -from pus_tc.system.tcs import OpCodes as TcsOpCodes -from pus_tc.devs.bpx_batt import BpxSetIds -from pus_tc.system.core import SetIds as CoreSetIds -from tmtc.power.common_power import SetIds as GsSetIds -from pus_tc.devs.rad_sensor import SetIds as RadSetIds -from pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2 -from pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3 -from pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2 -from pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3 -from pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds -from pus_tc.devs.gps import SetIds as GpsSetIds -from tmtc.acs.imtq import ImtqSetIds -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.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 +import eive_tmtc.config.object_ids as oids +from eive_tmtc.pus_tc.system.tcs import OpCodes as TcsOpCodes +from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds +from eive_tmtc.pus_tc.system.core import SetIds as CoreSetIds +from eive_tmtc.tmtc.power.common_power import SetIds as GsSetIds +from eive_tmtc.pus_tc.devs.rad_sensor import SetIds as RadSetIds +from eive_tmtc.pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2 +from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3 +from eive_tmtc.pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2 +from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3 +from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds +from eive_tmtc.pus_tc.devs.gps import SetIds as GpsSetIds +from eive_tmtc.tmtc.acs.imtq import ImtqSetIds +from eive_tmtc.pus_tc.devs.sus import SetIds +from eive_tmtc.pus_tc.devs.star_tracker import SetIds as StrSetIds +from eive_tmtc.tmtc.acs.reaction_wheels import RwSetIds, rw_speed_up_cmd_consec +from eive_tmtc.pus_tc.system.controllers import ( + pack_cmd_ctrl_to_off, + pack_cmd_ctrl_to_nml, +) +from eive_tmtc.tmtc.acs.acs_board import pack_acs_command +from eive_tmtc.tmtc.acs.sus_board import pack_sus_cmds +from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command +from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands +from eive_tmtc.tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command class OpCodes: diff --git a/eive-tmtc/pus_tc/system/tcs.py b/eive_tmtc/pus_tc/system/tcs.py similarity index 91% rename from eive-tmtc/pus_tc/system/tcs.py rename to eive_tmtc/pus_tc/system/tcs.py index 05220be..54896b8 100644 --- a/eive-tmtc/pus_tc/system/tcs.py +++ b/eive_tmtc/pus_tc/system/tcs.py @@ -1,6 +1,6 @@ import enum -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper @@ -10,8 +10,8 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( generate_one_hk_command, ) -from tmtc.common import pack_mode_cmd_with_info -from config.object_ids import TCS_BOARD_ASS_ID, TCS_CONTROLLER +from eive_tmtc.tmtc.common import pack_mode_cmd_with_info +from eive_tmtc.config.object_ids import TCS_BOARD_ASS_ID, TCS_CONTROLLER class OpCodes: diff --git a/eive-tmtc/pus_tc/system/time.py b/eive_tmtc/pus_tc/system/time.py similarity index 94% rename from eive-tmtc/pus_tc/system/time.py rename to eive_tmtc/pus_tc/system/time.py index d1ba341..2853754 100644 --- a/eive-tmtc/pus_tc/system/time.py +++ b/eive_tmtc/pus_tc/system/time.py @@ -1,6 +1,6 @@ from datetime import datetime -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from spacepackets.ecss import PusTelecommand from tmtccmd import DefaultProcedureInfo, TcHandlerBase diff --git a/eive-tmtc/pus_tc/__init__.py b/eive_tmtc/pus_tm/__init__.py similarity index 100% rename from eive-tmtc/pus_tc/__init__.py rename to eive_tmtc/pus_tm/__init__.py diff --git a/eive-tmtc/pus_tm/action_reply_handler.py b/eive_tmtc/pus_tm/action_reply_handler.py similarity index 92% rename from eive-tmtc/pus_tm/action_reply_handler.py rename to eive_tmtc/pus_tm/action_reply_handler.py index 00b25e3..919878d 100644 --- a/eive-tmtc/pus_tm/action_reply_handler.py +++ b/eive_tmtc/pus_tm/action_reply_handler.py @@ -1,11 +1,11 @@ import struct -from config.object_ids import * -from tmtc.acs.imtq import ImtqActionIds -from pus_tm.defs import PrintWrapper -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 eive_tmtc.config.object_ids import * +from eive_tmtc.tmtc.acs.imtq import ImtqActionIds +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.tmtc.payload.ploc_mpsoc import PlocReplyIds +from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionIds +from eive_tmtc.pus_tc.devs.star_tracker import StarTrackerActionIds +from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply from tmtccmd.logging import get_console_logger from tmtccmd.tm import Service8FsfwTm from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/defs.py b/eive_tmtc/pus_tm/defs.py similarity index 100% rename from eive-tmtc/pus_tm/defs.py rename to eive_tmtc/pus_tm/defs.py diff --git a/eive-tmtc/pus_tm/__init__.py b/eive_tmtc/pus_tm/devs/__init__.py similarity index 100% rename from eive-tmtc/pus_tm/__init__.py rename to eive_tmtc/pus_tm/devs/__init__.py diff --git a/eive-tmtc/pus_tm/devs/bpx_bat.py b/eive_tmtc/pus_tm/devs/bpx_bat.py similarity index 95% rename from eive-tmtc/pus_tm/devs/bpx_bat.py rename to eive_tmtc/pus_tm/devs/bpx_bat.py index abbe93e..89351ce 100644 --- a/eive-tmtc/pus_tm/devs/bpx_bat.py +++ b/eive_tmtc/pus_tm/devs/bpx_bat.py @@ -1,7 +1,7 @@ import struct -from pus_tc.devs.bpx_batt import BpxSetIds -from pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tc.devs.bpx_batt import BpxSetIds +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/devs/gps.py b/eive_tmtc/pus_tm/devs/gps.py similarity index 95% rename from eive-tmtc/pus_tm/devs/gps.py rename to eive_tmtc/pus_tm/devs/gps.py index 0f421cb..34d98e1 100644 --- a/eive-tmtc/pus_tm/devs/gps.py +++ b/eive_tmtc/pus_tm/devs/gps.py @@ -1,6 +1,6 @@ import struct -from pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/devs/gyros.py b/eive_tmtc/pus_tm/devs/gyros.py similarity index 94% rename from eive-tmtc/pus_tm/devs/gyros.py rename to eive_tmtc/pus_tm/devs/gyros.py index bebfcda..1926a4f 100644 --- a/eive-tmtc/pus_tm/devs/gyros.py +++ b/eive_tmtc/pus_tm/devs/gyros.py @@ -1,11 +1,11 @@ import struct -from pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -from pus_tc.devs.gyros import L3gGyroSetIds, AdisGyroSetIds -import config.object_ids as obj_ids +from eive_tmtc.pus_tc.devs.gyros import L3gGyroSetIds, AdisGyroSetIds +import eive_tmtc.config.object_ids as obj_ids def handle_gyros_hk_data( diff --git a/eive-tmtc/pus_tm/devs/mgms.py b/eive_tmtc/pus_tm/devs/mgms.py similarity index 91% rename from eive-tmtc/pus_tm/devs/mgms.py rename to eive_tmtc/pus_tm/devs/mgms.py index b4cc122..ce0c1bc 100644 --- a/eive-tmtc/pus_tm/devs/mgms.py +++ b/eive_tmtc/pus_tm/devs/mgms.py @@ -1,10 +1,10 @@ import struct -from pus_tm.defs import PrintWrapper -from pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -import config.object_ids as obj_ids +import eive_tmtc.config.object_ids as obj_ids def handle_mgm_hk_data( diff --git a/eive-tmtc/pus_tm/devs/plpcdu.py b/eive_tmtc/pus_tm/devs/plpcdu.py similarity index 93% rename from eive-tmtc/pus_tm/devs/plpcdu.py rename to eive_tmtc/pus_tm/devs/plpcdu.py index f9ed50a..bcfd0f1 100644 --- a/eive-tmtc/pus_tm/devs/plpcdu.py +++ b/eive_tmtc/pus_tm/devs/plpcdu.py @@ -1,8 +1,8 @@ import struct -from pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -from pus_tc.devs.plpcdu import SetIds +from eive_tmtc.pus_tc.devs.plpcdu import SetIds ADC_CHANNELS_NAMED = [ diff --git a/eive-tmtc/pus_tm/devs/rad_sensor.py b/eive_tmtc/pus_tm/devs/rad_sensor.py similarity index 90% rename from eive-tmtc/pus_tm/devs/rad_sensor.py rename to eive_tmtc/pus_tm/devs/rad_sensor.py index a2673ff..4123f70 100644 --- a/eive-tmtc/pus_tm/devs/rad_sensor.py +++ b/eive_tmtc/pus_tm/devs/rad_sensor.py @@ -1,8 +1,8 @@ import struct -from pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -from pus_tc.devs.rad_sensor import SetIds +from eive_tmtc.pus_tc.devs.rad_sensor import SetIds def handle_rad_sensor_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): diff --git a/eive-tmtc/pus_tm/devs/sus.py b/eive_tmtc/pus_tm/devs/sus.py similarity index 91% rename from eive-tmtc/pus_tm/devs/sus.py rename to eive_tmtc/pus_tm/devs/sus.py index f733954..6cd60e6 100644 --- a/eive-tmtc/pus_tm/devs/sus.py +++ b/eive_tmtc/pus_tm/devs/sus.py @@ -1,7 +1,7 @@ import struct -from pus_tm.defs import PrintWrapper -from pus_tc.devs.sus import SetIds +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tc.devs.sus import SetIds from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/devs/syrlinks.py b/eive_tmtc/pus_tm/devs/syrlinks.py similarity index 95% rename from eive-tmtc/pus_tm/devs/syrlinks.py rename to eive_tmtc/pus_tm/devs/syrlinks.py index f0c9b58..efa5535 100644 --- a/eive-tmtc/pus_tm/devs/syrlinks.py +++ b/eive_tmtc/pus_tm/devs/syrlinks.py @@ -1,7 +1,7 @@ import struct -from pus_tm.defs import PrintWrapper -from pus_tc.devs.syrlinks_hk_handler import SetIds +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tc.devs.syrlinks_hk_handler import SetIds from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py similarity index 94% rename from eive-tmtc/pus_tm/event_handler.py rename to eive_tmtc/pus_tm/event_handler.py index 4111792..cdcd42d 100644 --- a/eive-tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -1,10 +1,10 @@ import logging import os.path 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.acs_subsystem import AcsModes +from eive_tmtc.config.object_ids import get_object_ids +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tm.verification_handler import generic_retval_printout +from eive_tmtc.tmtc.acs.acs_subsystem import AcsModes from tmtccmd.tc.pus_200_fsfw_modes import Modes from tmtccmd.tm import Service5Tm diff --git a/eive-tmtc/pus_tm/factory_hook.py b/eive_tmtc/pus_tm/factory_hook.py similarity index 95% rename from eive-tmtc/pus_tm/factory_hook.py rename to eive_tmtc/pus_tm/factory_hook.py index 8bf842d..36b9428 100644 --- a/eive-tmtc/pus_tm/factory_hook.py +++ b/eive_tmtc/pus_tm/factory_hook.py @@ -1,7 +1,6 @@ """Core EIVE TM handler module """ -from config.object_ids import get_object_ids -from config.retvals import get_retval_dict +from eive_tmtc.config.object_ids import get_object_ids from spacepackets.ecss import PusTelemetry from spacepackets.ecss.pus_17_test import Service17Tm from spacepackets.util import PrintFormats @@ -9,7 +8,6 @@ from tmtccmd import get_console_logger from tmtccmd.logging.pus import RawTmtcTimedLogWrapper from tmtccmd.pus import VerificationWrapper from tmtccmd.tm import Service20FsfwTm, Service200FsfwTm -from tmtccmd.tm.pus_17_test import Service17TmExtended from tmtccmd.tm.pus_200_fsfw_modes import Subservices as ModeSubservices from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from .defs import PrintWrapper diff --git a/eive-tmtc/pus_tm/hk_handling.py b/eive_tmtc/pus_tm/hk_handling.py similarity index 85% rename from eive-tmtc/pus_tm/hk_handling.py rename to eive_tmtc/pus_tm/hk_handling.py index 72fa4e5..3aacd32 100644 --- a/eive-tmtc/pus_tm/hk_handling.py +++ b/eive_tmtc/pus_tm/hk_handling.py @@ -1,12 +1,12 @@ """HK Handling for EIVE OBSW""" # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES -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.payload.ploc_supervisor import handle_supv_hk_data -from tmtc.acs.reaction_wheels import handle_rw_hk_data +from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_mgm_data +from eive_tmtc.pus_tm.devs.plpcdu import handle_plpcdu_hk +from eive_tmtc.pus_tm.devs.rad_sensor import handle_rad_sensor_data +from eive_tmtc.pus_tm.devs.sus import handle_sus_hk +from eive_tmtc.pus_tm.system.tcs import handle_thermal_controller_hk_data +from eive_tmtc.tmtc.payload.ploc_supervisor import handle_supv_hk_data +from eive_tmtc.tmtc.acs.reaction_wheels import handle_rw_hk_data from tmtccmd.tm.pus_3_fsfw_hk import ( Service3Base, HkContentType, @@ -15,22 +15,26 @@ from tmtccmd.tm.pus_3_fsfw_hk import ( from tmtccmd.util.obj_id import ObjectIdU32, ObjectIdDictT from tmtccmd.logging import get_console_logger -from pus_tm.devs.bpx_bat import handle_bpx_hk_data -from pus_tm.devs.gps import handle_gps_data -from pus_tm.devs.gyros import handle_gyros_hk_data -from tmtc.power.tm import handle_pdu_data, handle_p60_hk_data, handle_acu_hk_data -from pus_tm.devs.syrlinks import handle_syrlinks_hk_data -from tmtc.acs.imtq import ( +from eive_tmtc.pus_tm.devs.bpx_bat import handle_bpx_hk_data +from eive_tmtc.pus_tm.devs.gps import handle_gps_data +from eive_tmtc.pus_tm.devs.gyros import handle_gyros_hk_data +from eive_tmtc.tmtc.power.tm import ( + handle_pdu_data, + handle_p60_hk_data, + handle_acu_hk_data, +) +from eive_tmtc.pus_tm.devs.syrlinks import handle_syrlinks_hk_data +from eive_tmtc.tmtc.acs.imtq import ( ImtqSetIds, handle_self_test_data, handle_eng_set, handle_calibrated_mtm_measurement, handle_raw_mtm_measurement, ) -from pus_tm.defs import FsfwTmTcPrinter -from pus_tm.system.core import handle_core_hk_data -from pus_tm.devs.mgms import handle_mgm_hk_data -import config.object_ids as obj_ids +from eive_tmtc.pus_tm.defs import FsfwTmTcPrinter +from eive_tmtc.pus_tm.system.core import handle_core_hk_data +from eive_tmtc.pus_tm.devs.mgms import handle_mgm_hk_data +import eive_tmtc.config.object_ids as obj_ids LOGGER = get_console_logger() diff --git a/eive-tmtc/pus_tm/devs/__init__.py b/eive_tmtc/pus_tm/system/__init__.py similarity index 100% rename from eive-tmtc/pus_tm/devs/__init__.py rename to eive_tmtc/pus_tm/system/__init__.py diff --git a/eive-tmtc/pus_tm/system/core.py b/eive_tmtc/pus_tm/system/core.py similarity index 87% rename from eive-tmtc/pus_tm/system/core.py rename to eive_tmtc/pus_tm/system/core.py index f4e65a3..c664af7 100644 --- a/eive-tmtc/pus_tm/system/core.py +++ b/eive_tmtc/pus_tm/system/core.py @@ -1,7 +1,7 @@ import struct -from pus_tm.defs import PrintWrapper -from pus_tc.system.core import SetIds +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tc.system.core import SetIds from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/system/tcs.py b/eive_tmtc/pus_tm/system/tcs.py similarity index 98% rename from eive-tmtc/pus_tm/system/tcs.py rename to eive_tmtc/pus_tm/system/tcs.py index 9621ef6..b95d2d6 100644 --- a/eive-tmtc/pus_tm/system/tcs.py +++ b/eive_tmtc/pus_tm/system/tcs.py @@ -2,7 +2,7 @@ import enum import pprint import struct -from pus_tm.defs import PrintWrapper +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/pus_tm/tcp_server_objects.py b/eive_tmtc/pus_tm/tcp_server_objects.py similarity index 100% rename from eive-tmtc/pus_tm/tcp_server_objects.py rename to eive_tmtc/pus_tm/tcp_server_objects.py diff --git a/eive-tmtc/pus_tm/tm_tcp_server.py b/eive_tmtc/pus_tm/tm_tcp_server.py similarity index 100% rename from eive-tmtc/pus_tm/tm_tcp_server.py rename to eive_tmtc/pus_tm/tm_tcp_server.py diff --git a/eive-tmtc/pus_tm/verification_handler.py b/eive_tmtc/pus_tm/verification_handler.py similarity index 97% rename from eive-tmtc/pus_tm/verification_handler.py rename to eive_tmtc/pus_tm/verification_handler.py index c9671e9..2cd5b24 100644 --- a/eive-tmtc/pus_tm/verification_handler.py +++ b/eive_tmtc/pus_tm/verification_handler.py @@ -4,7 +4,7 @@ from spacepackets.ecss.pus_1_verification import UnpackParams, Service1Tm from tmtccmd.logging import get_console_logger from tmtccmd.pus import VerificationWrapper from tmtccmd.tm.pus_1_verification import Service1FsfwWrapper -from config.retvals import get_retval_dict +from eive_tmtc.config.retvals import get_retval_dict LOGGER = get_console_logger() diff --git a/eive-tmtc/tmtc/__init__.py b/eive_tmtc/tmtc/__init__.py similarity index 100% rename from eive-tmtc/tmtc/__init__.py rename to eive_tmtc/tmtc/__init__.py diff --git a/eive-tmtc/pus_tm/system/__init__.py b/eive_tmtc/tmtc/acs/__init__.py similarity index 100% rename from eive-tmtc/pus_tm/system/__init__.py rename to eive_tmtc/tmtc/acs/__init__.py diff --git a/eive-tmtc/tmtc/acs/acs_board.py b/eive_tmtc/tmtc/acs/acs_board.py similarity index 95% rename from eive-tmtc/tmtc/acs/acs_board.py rename to eive_tmtc/tmtc/acs/acs_board.py index 053fe1b..b109294 100644 --- a/eive-tmtc/tmtc/acs/acs_board.py +++ b/eive_tmtc/tmtc/acs/acs_board.py @@ -1,6 +1,6 @@ import enum -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config.tmtc import ( tmtc_definitions_provider, TmtcDefinitionWrapper, @@ -9,9 +9,9 @@ from tmtccmd.config.tmtc import ( 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 +from eive_tmtc.config.object_ids import ACS_BOARD_ASS_ID -from tmtc.common import pack_mode_cmd_with_info +from eive_tmtc.tmtc.common import pack_mode_cmd_with_info class AcsOpCodes: diff --git a/eive-tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py similarity index 97% rename from eive-tmtc/tmtc/acs/acs_ctrl.py rename to eive_tmtc/tmtc/acs/acs_ctrl.py index bf8b7fd..cc87b9f 100644 --- a/eive-tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -4,9 +4,9 @@ import struct from socket import AF_INET from typing import Tuple -from config.definitions import CustomServiceList -from config.object_ids import ACS_CONTROLLER -from pus_tm.defs import PrintWrapper +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import ACS_CONTROLLER +from eive_tmtc.pus_tm.defs import PrintWrapper from tmtccmd import get_console_logger from tmtccmd.config.tmtc import ( tmtc_definitions_provider, diff --git a/eive-tmtc/tmtc/acs/acs_subsystem.py b/eive_tmtc/tmtc/acs/acs_subsystem.py similarity index 92% rename from eive-tmtc/tmtc/acs/acs_subsystem.py rename to eive_tmtc/tmtc/acs/acs_subsystem.py index e127e37..0637562 100644 --- a/eive-tmtc/tmtc/acs/acs_subsystem.py +++ b/eive_tmtc/tmtc/acs/acs_subsystem.py @@ -2,9 +2,9 @@ import enum from typing import Tuple, Dict from spacepackets.ecss import PusTelecommand -from tmtc.common import pack_mode_cmd_with_info -from config.object_ids import ACS_SUBSYSTEM_ID -from config.definitions import CustomServiceList +from eive_tmtc.tmtc.common import pack_mode_cmd_with_info +from eive_tmtc.config.object_ids import ACS_SUBSYSTEM_ID +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.config.tmtc import ( tmtc_definitions_provider, TmtcDefinitionWrapper, diff --git a/eive-tmtc/tmtc/acs/imtq.py b/eive_tmtc/tmtc/acs/imtq.py similarity index 99% rename from eive-tmtc/tmtc/acs/imtq.py rename to eive_tmtc/tmtc/acs/imtq.py index e3da477..b8fe904 100644 --- a/eive-tmtc/tmtc/acs/imtq.py +++ b/eive_tmtc/tmtc/acs/imtq.py @@ -7,8 +7,8 @@ """ import struct -from config.definitions import CustomServiceList -from pus_tm.defs import PrintWrapper +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.pus_tm.defs import PrintWrapper from spacepackets.ecss.tc import PusTelecommand from tmtccmd.config.tmtc import ( tmtc_definitions_provider, diff --git a/eive-tmtc/tmtc/acs/reaction_wheels.py b/eive_tmtc/tmtc/acs/reaction_wheels.py similarity index 98% rename from eive-tmtc/tmtc/acs/reaction_wheels.py rename to eive_tmtc/tmtc/acs/reaction_wheels.py index 74987d1..6895e57 100644 --- a/eive-tmtc/tmtc/acs/reaction_wheels.py +++ b/eive_tmtc/tmtc/acs/reaction_wheels.py @@ -7,8 +7,8 @@ import struct from typing import List -from pus_tm.defs import PrintWrapper -from config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.config.object_ids import RW1_ID, RW2_ID, RW3_ID, RW4_ID from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper @@ -21,7 +21,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( ) from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from tmtccmd.util import ObjectIdU32 from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter diff --git a/eive-tmtc/tmtc/acs/sus_board.py b/eive_tmtc/tmtc/acs/sus_board.py similarity index 90% rename from eive-tmtc/tmtc/acs/sus_board.py rename to eive_tmtc/tmtc/acs/sus_board.py index 4b6b65f..dac1209 100644 --- a/eive-tmtc/tmtc/acs/sus_board.py +++ b/eive_tmtc/tmtc/acs/sus_board.py @@ -1,7 +1,7 @@ -from config.definitions import CustomServiceList -from config.object_ids import SUS_BOARD_ASS_ID -from tmtc.acs.acs_board import DualSideSubmodes -from tmtc.common import pack_mode_cmd_with_info +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import SUS_BOARD_ASS_ID +from eive_tmtc.tmtc.acs.acs_board import DualSideSubmodes +from eive_tmtc.tmtc.common import pack_mode_cmd_with_info from tmtccmd.config.tmtc import ( tmtc_definitions_provider, TmtcDefinitionWrapper, diff --git a/eive-tmtc/tmtc/common.py b/eive_tmtc/tmtc/common.py similarity index 100% rename from eive-tmtc/tmtc/common.py rename to eive_tmtc/tmtc/common.py diff --git a/eive-tmtc/tmtc/acs/__init__.py b/eive_tmtc/tmtc/payload/__init__.py similarity index 100% rename from eive-tmtc/tmtc/acs/__init__.py rename to eive_tmtc/tmtc/payload/__init__.py diff --git a/eive-tmtc/tmtc/payload/pl_subsystem.py b/eive_tmtc/tmtc/payload/pl_subsystem.py similarity index 91% rename from eive-tmtc/tmtc/payload/pl_subsystem.py rename to eive_tmtc/tmtc/payload/pl_subsystem.py index 85950d8..2e1b18e 100644 --- a/eive-tmtc/tmtc/payload/pl_subsystem.py +++ b/eive_tmtc/tmtc/payload/pl_subsystem.py @@ -1,10 +1,10 @@ import enum from typing import Dict, Tuple -from config.definitions import CustomServiceList -from config.object_ids import PL_SUBSYSTEM_ID +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import PL_SUBSYSTEM_ID from spacepackets.ecss import PusTelecommand -from tmtc.common import pack_mode_cmd_with_info +from eive_tmtc.tmtc.common import pack_mode_cmd_with_info from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import service_provider diff --git a/eive-tmtc/tmtc/payload/ploc_memory_dumper.py b/eive_tmtc/tmtc/payload/ploc_memory_dumper.py similarity index 96% rename from eive-tmtc/tmtc/payload/ploc_memory_dumper.py rename to eive_tmtc/tmtc/payload/ploc_memory_dumper.py index d99dafc..4c93f08 100644 --- a/eive-tmtc/tmtc/payload/ploc_memory_dumper.py +++ b/eive_tmtc/tmtc/payload/ploc_memory_dumper.py @@ -8,7 +8,7 @@ """ import struct -from config.definitions import CustomServiceList +from eive_tmtc.config.definitions import CustomServiceList from spacepackets.ecss.tc import PusTelecommand from tmtccmd.config import TmtcDefinitionWrapper from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry diff --git a/eive-tmtc/tmtc/payload/ploc_mpsoc.py b/eive_tmtc/tmtc/payload/ploc_mpsoc.py similarity index 97% rename from eive-tmtc/tmtc/payload/ploc_mpsoc.py rename to eive_tmtc/tmtc/payload/ploc_mpsoc.py index 3eb4322..5dffe0c 100644 --- a/eive-tmtc/tmtc/payload/ploc_mpsoc.py +++ b/eive_tmtc/tmtc/payload/ploc_mpsoc.py @@ -9,8 +9,8 @@ import struct import enum -from config.definitions import CustomServiceList -from config.object_ids import get_object_ids, PLOC_MPSOC_ID +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import get_object_ids, PLOC_MPSOC_ID from tmtccmd.config.tmtc import ( tmtc_definitions_provider, OpCodeEntry, @@ -18,10 +18,9 @@ from tmtccmd.config.tmtc import ( ) from tmtccmd.logging import get_console_logger from spacepackets.ecss.tc import PusTelecommand -from tmtccmd.tc import DefaultPusQueueHelper, service_provider +from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams -from tmtccmd.util import ObjectIdU32 -from utility.input_helper import InputHelper +from eive_tmtc.utility.input_helper import InputHelper from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes LOGGER = get_console_logger() diff --git a/eive-tmtc/tmtc/payload/ploc_supervisor.py b/eive_tmtc/tmtc/payload/ploc_supervisor.py similarity index 99% rename from eive-tmtc/tmtc/payload/ploc_supervisor.py rename to eive_tmtc/tmtc/payload/ploc_supervisor.py index 7eb5e09..6c45477 100644 --- a/eive-tmtc/tmtc/payload/ploc_supervisor.py +++ b/eive_tmtc/tmtc/payload/ploc_supervisor.py @@ -9,9 +9,9 @@ import enum import struct -from config.object_ids import PLOC_SUPV_ID, get_object_ids -from config.definitions import CustomServiceList -from pus_tm.defs import PrintWrapper +from eive_tmtc.config.object_ids import PLOC_SUPV_ID, get_object_ids +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.pus_tm.defs import PrintWrapper from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid from tmtccmd.config import TmtcDefinitionWrapper @@ -22,7 +22,7 @@ from tmtccmd.tc.decorator import ServiceProviderParams from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes from tmtccmd.tc.pus_8_funccmd import make_fsfw_action_cmd from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -from utility.input_helper import InputHelper +from eive_tmtc.utility.input_helper import InputHelper LOGGER = get_console_logger() diff --git a/eive-tmtc/tmtc/payload/__init__.py b/eive_tmtc/tmtc/power/__init__.py similarity index 100% rename from eive-tmtc/tmtc/payload/__init__.py rename to eive_tmtc/tmtc/power/__init__.py diff --git a/eive-tmtc/tmtc/power/acu.py b/eive_tmtc/tmtc/power/acu.py similarity index 96% rename from eive-tmtc/tmtc/power/acu.py rename to eive_tmtc/tmtc/power/acu.py index ddcba2c..aee4ea0 100644 --- a/eive-tmtc/tmtc/power/acu.py +++ b/eive_tmtc/tmtc/power/acu.py @@ -5,9 +5,9 @@ """ import struct -from config.definitions import CustomServiceList -from pus_tm.defs import PrintWrapper -from tmtc.power.common_power import ( +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.tmtc.power.common_power import ( pack_common_gomspace_cmds, add_gomspace_cmd_defs, req_hk_cmds, @@ -20,8 +20,8 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper -import gomspace.gomspace_common as gs -from config.object_ids import ACU_HANDLER_ID +import eive_tmtc.gomspace.gomspace_common as gs +from eive_tmtc.config.object_ids import ACU_HANDLER_ID from tmtccmd.util import ObjectIdU32 diff --git a/eive-tmtc/tmtc/power/common_power.py b/eive_tmtc/tmtc/power/common_power.py similarity index 98% rename from eive-tmtc/tmtc/power/common_power.py rename to eive_tmtc/tmtc/power/common_power.py index 61eba98..021a86c 100644 --- a/eive-tmtc/tmtc/power/common_power.py +++ b/eive_tmtc/tmtc/power/common_power.py @@ -1,7 +1,7 @@ import struct from typing import List -from gomspace.gomspace_common import ( +from eive_tmtc.gomspace.gomspace_common import ( pack_set_u8_param_command, Channel, GomspaceDeviceActionIds, @@ -11,7 +11,7 @@ from gomspace.gomspace_common import ( pack_gnd_wdt_reset_command, ParamTypes, ) -from gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST +from eive_tmtc.gomspace.gomspace_pdu_definitions import OUT_ENABLE_LIST from spacepackets.ecss import PusTelecommand from tmtccmd.config import OpCodeEntry from tmtccmd.tc import DefaultPusQueueHelper diff --git a/eive-tmtc/tmtc/power/p60dock.py b/eive_tmtc/tmtc/power/p60dock.py similarity index 98% rename from eive-tmtc/tmtc/power/p60dock.py rename to eive_tmtc/tmtc/power/p60dock.py index e9fed56..d94386a 100644 --- a/eive-tmtc/tmtc/power/p60dock.py +++ b/eive_tmtc/tmtc/power/p60dock.py @@ -5,14 +5,14 @@ @author J. Meier @date 13.12.2020 """ -from tmtc.power.common_power import ( +from eive_tmtc.tmtc.power.common_power import ( pack_common_gomspace_cmds, req_hk_cmds, pack_common_power_cmds, SetIds, ) from tmtccmd.tc import DefaultPusQueueHelper -from gomspace.gomspace_common import ( +from eive_tmtc.gomspace.gomspace_common import ( TableEntry, Channel, TableIds, @@ -23,7 +23,7 @@ from gomspace.gomspace_common import ( pack_set_u8_param_command, pack_set_u16_param_command, ) -from config.object_ids import P60_DOCK_HANDLER +from eive_tmtc.config.object_ids import P60_DOCK_HANDLER from tmtccmd.util import ObjectIdU32 diff --git a/eive-tmtc/tmtc/power/pdu1.py b/eive_tmtc/tmtc/power/pdu1.py similarity index 96% rename from eive-tmtc/tmtc/power/pdu1.py rename to eive_tmtc/tmtc/power/pdu1.py index 2ee949c..90cd142 100644 --- a/eive-tmtc/tmtc/power/pdu1.py +++ b/eive_tmtc/tmtc/power/pdu1.py @@ -3,9 +3,9 @@ @author J. Meier @date 17.12.2020 """ -from config.definitions import CustomServiceList -from config.object_ids import PDU_1_HANDLER_ID -from tmtc.power.common_power import ( +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import PDU_1_HANDLER_ID +from eive_tmtc.tmtc.power.common_power import ( pack_common_gomspace_cmds, req_hk_cmds, PowerOpCodes, @@ -20,8 +20,8 @@ from tmtc.power.common_power import ( SetIds, ) -from gomspace.gomspace_common import * -from gomspace.gomspace_pdu_definitions import * +from eive_tmtc.gomspace.gomspace_common import * +from eive_tmtc.gomspace.gomspace_pdu_definitions import * from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper from tmtccmd.config.tmtc import tmtc_definitions_provider diff --git a/eive-tmtc/tmtc/power/pdu2.py b/eive_tmtc/tmtc/power/pdu2.py similarity index 98% rename from eive-tmtc/tmtc/power/pdu2.py rename to eive_tmtc/tmtc/power/pdu2.py index 6ae17f5..6642ca4 100644 --- a/eive-tmtc/tmtc/power/pdu2.py +++ b/eive_tmtc/tmtc/power/pdu2.py @@ -6,8 +6,8 @@ @author J. Meier @date 17.12.2020 """ -from config.object_ids import PDU_2_HANDLER_ID -from tmtc.power.common_power import ( +from eive_tmtc.config.object_ids import PDU_2_HANDLER_ID +from eive_tmtc.tmtc.power.common_power import ( pack_common_gomspace_cmds, req_hk_cmds, PowerOpCodes, @@ -18,8 +18,8 @@ from tmtc.power.common_power import ( SetIds, add_common_power_defs, ) -from gomspace.gomspace_common import * -from gomspace.gomspace_pdu_definitions import * +from eive_tmtc.gomspace.gomspace_common import * +from eive_tmtc.gomspace.gomspace_pdu_definitions import * from tmtccmd.config import OpCodeEntry, TmtcDefinitionWrapper from tmtccmd.config.tmtc import tmtc_definitions_provider diff --git a/eive-tmtc/tmtc/power/power.py b/eive_tmtc/tmtc/power/power.py similarity index 90% rename from eive-tmtc/tmtc/power/power.py rename to eive_tmtc/tmtc/power/power.py index 50d4d96..fdd637e 100644 --- a/eive-tmtc/tmtc/power/power.py +++ b/eive_tmtc/tmtc/power/power.py @@ -1,24 +1,24 @@ -from tmtc.power.common_power import ( +from eive_tmtc.tmtc.power.common_power import ( PowerOpCodes, PowerInfo, add_gomspace_cmd_defs, pack_reset_gnd_wdt_cmd, ) -from config.definitions import CustomServiceList -from config.object_ids import ( +from eive_tmtc.config.definitions import CustomServiceList +from eive_tmtc.config.object_ids import ( P60_DOCK_HANDLER, ACU_HANDLER_ID, PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, get_object_ids, ) -from tmtc.power.pdu1 import ( +from eive_tmtc.tmtc.power.pdu1 import ( pdu1_req_hk_cmds, pdu1_switch_cmds, add_pdu1_common_defs, add_pdu1_cmds, ) -from tmtc.power.pdu2 import ( +from eive_tmtc.tmtc.power.pdu2 import ( pdu2_req_hk_cmds, add_pdu2_common_defs, pdu2_cmds, @@ -27,8 +27,8 @@ from tmtc.power.pdu2 import ( from tmtccmd import get_console_logger from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry -from tmtc.power.p60dock import P60OpCodes, P60Info, p60_dock_req_hk_cmds -from tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds +from eive_tmtc.tmtc.power.p60dock import P60OpCodes, P60Info, p60_dock_req_hk_cmds +from eive_tmtc.tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds from tmtccmd.config.tmtc import tmtc_definitions_provider from tmtccmd.tc import DefaultPusQueueHelper diff --git a/eive-tmtc/tmtc/power/tm.py b/eive_tmtc/tmtc/power/tm.py similarity index 98% rename from eive-tmtc/tmtc/power/tm.py rename to eive_tmtc/tmtc/power/tm.py index d3079ce..f1cf1dc 100644 --- a/eive-tmtc/tmtc/power/tm.py +++ b/eive_tmtc/tmtc/power/tm.py @@ -1,13 +1,17 @@ import struct from typing import List, Tuple -from tmtc.power.acu import acu_config_table_handler -from tmtc.power.common_power import SetIds, unpack_array_in_data, OBC_ENDIANNESS +from eive_tmtc.tmtc.power.acu import acu_config_table_handler +from eive_tmtc.tmtc.power.common_power import ( + SetIds, + unpack_array_in_data, + OBC_ENDIANNESS, +) from tmtccmd.util import ObjectIdBase from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter -from pus_tm.defs import PrintWrapper -from gomspace.gomspace_common import GomspaceDeviceActionIds -from config.object_ids import ( +from eive_tmtc.pus_tm.defs import PrintWrapper +from eive_tmtc.gomspace.gomspace_common import GomspaceDeviceActionIds +from eive_tmtc.config.object_ids import ( PDU_1_HANDLER_ID, PDU_2_HANDLER_ID, P60_DOCK_HANDLER, diff --git a/eive-tmtc/tmtc/solar_array_deployment.py b/eive_tmtc/tmtc/solar_array_deployment.py similarity index 100% rename from eive-tmtc/tmtc/solar_array_deployment.py rename to eive_tmtc/tmtc/solar_array_deployment.py diff --git a/eive-tmtc/tmtc/test.py b/eive_tmtc/tmtc/test.py similarity index 100% rename from eive-tmtc/tmtc/test.py rename to eive_tmtc/tmtc/test.py diff --git a/eive-tmtc/tmtc/power/__init__.py b/eive_tmtc/utility/__init__.py similarity index 100% rename from eive-tmtc/tmtc/power/__init__.py rename to eive_tmtc/utility/__init__.py diff --git a/eive-tmtc/utility/args_parser.py b/eive_tmtc/utility/args_parser.py similarity index 100% rename from eive-tmtc/utility/args_parser.py rename to eive_tmtc/utility/args_parser.py diff --git a/eive-tmtc/utility/input_helper.py b/eive_tmtc/utility/input_helper.py similarity index 100% rename from eive-tmtc/utility/input_helper.py rename to eive_tmtc/utility/input_helper.py diff --git a/setup.cfg b/setup.cfg index bc576ad..ba07f66 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = eive-tmtc description = TMTC Commander EIVE -version = attr: config.__version__ +version = attr: eive_tmtc.__version__ long_description = file: README.md long_description_content_type = text/markdown license = Apache-2.0 @@ -28,8 +28,6 @@ classifiers = [options] install_requires = tmtccmd >= 3.0.0rc2 -package_dir = - = . packages = find: python_requires = >=3.8 diff --git a/tmtcc.py b/tmtcc.py index 8b5d4af..240a454 100755 --- a/tmtcc.py +++ b/tmtcc.py @@ -84,16 +84,16 @@ from tmtccmd.config.args import ( PreArgsParsingWrapper, ProcedureParamsWrapper, ) -from config import __version__ -from config.definitions import ( +from eive_tmtc import __version__ +from eive_tmtc.config.definitions import ( PUS_APID, CFDP_APID, CFDP_LOCAL_ENTITY_ID, CFDP_REMOTE_ENTITY_ID, ) -from config.hook import EiveHookObject -from pus_tm.factory_hook import pus_factory_hook -from pus_tc.procedure_packer import handle_default_procedure +from eive_tmtc.config.hook import EiveHookObject +from eive_tmtc.pus_tm.factory_hook import pus_factory_hook +from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure LOGGER = get_console_logger()