From d968bb9125c15d293264caf216786dca6c990e92 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 1 Oct 2021 10:55:56 +0200 Subject: [PATCH] updated includes --- config/custom_hooks.py | 2 +- pus_tc/heater.py | 2 +- pus_tc/imtq.py | 2 +- pus_tc/pdu1.py | 2 +- pus_tc/ploc_memory_dumper.py | 2 +- pus_tc/ploc_mpsoc.py | 2 +- pus_tc/ploc_supervisor.py | 2 +- pus_tc/ploc_upater.py | 2 +- pus_tc/rad_sensor.py | 2 +- pus_tc/reaction_wheels.py | 2 +- pus_tc/service_200_mode.py | 2 +- pus_tc/star_tracker.py | 2 +- pus_tc/tmp1075.py | 2 +- pus_tm/factory_hook.py | 2 +- tmtccmd | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/custom_hooks.py b/config/custom_hooks.py index 35405b4..1e49474 100644 --- a/config/custom_hooks.py +++ b/config/custom_hooks.py @@ -3,7 +3,7 @@ @details Template configuration file. Copy this folder to the TMTC commander root and adapt it to your needs. """ -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand def command_preparation_hook() -> PusTelecommand: diff --git a/pus_tc/heater.py b/pus_tc/heater.py index 18adf80..795ebbb 100644 --- a/pus_tc/heater.py +++ b/pus_tc/heater.py @@ -7,7 +7,7 @@ """ from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class SwitchNumbers: diff --git a/pus_tc/imtq.py b/pus_tc/imtq.py index 943157c..f459f16 100644 --- a/pus_tc/imtq.py +++ b/pus_tc/imtq.py @@ -8,7 +8,7 @@ from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.service_3_housekeeping import make_sid, generate_one_hk_command diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py index e02bd58..0a713cc 100644 --- a/pus_tc/pdu1.py +++ b/pus_tc/pdu1.py @@ -7,7 +7,7 @@ import enum from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from gomspace.gomspace_common import * from pus_tc.p60dock import P60DockConfigTable from gomspace.gomspace_pdu_definitions import * diff --git a/pus_tc/ploc_memory_dumper.py b/pus_tc/ploc_memory_dumper.py index 60a4271..4618c44 100644 --- a/pus_tc/ploc_memory_dumper.py +++ b/pus_tc/ploc_memory_dumper.py @@ -11,7 +11,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class ActionIds: diff --git a/pus_tc/ploc_mpsoc.py b/pus_tc/ploc_mpsoc.py index d7a2977..8c45df1 100644 --- a/pus_tc/ploc_mpsoc.py +++ b/pus_tc/ploc_mpsoc.py @@ -11,7 +11,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class PlocTestProcedure: diff --git a/pus_tc/ploc_supervisor.py b/pus_tc/ploc_supervisor.py index 31f9627..9fff345 100644 --- a/pus_tc/ploc_supervisor.py +++ b/pus_tc/ploc_supervisor.py @@ -11,7 +11,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from tmtccmd.utility.logger import get_console_logger LOGGER = get_console_logger() diff --git a/pus_tc/ploc_upater.py b/pus_tc/ploc_upater.py index 6721013..31329d0 100644 --- a/pus_tc/ploc_upater.py +++ b/pus_tc/ploc_upater.py @@ -12,7 +12,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand latchup_id_dict = { diff --git a/pus_tc/rad_sensor.py b/pus_tc/rad_sensor.py index a462c13..9214484 100644 --- a/pus_tc/rad_sensor.py +++ b/pus_tc/rad_sensor.py @@ -9,7 +9,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data diff --git a/pus_tc/reaction_wheels.py b/pus_tc/reaction_wheels.py index 0c48491..c97760d 100644 --- a/pus_tc/reaction_wheels.py +++ b/pus_tc/reaction_wheels.py @@ -9,7 +9,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data diff --git a/pus_tc/service_200_mode.py b/pus_tc/service_200_mode.py index 4bc8cdb..08faad4 100644 --- a/pus_tc/service_200_mode.py +++ b/pus_tc/service_200_mode.py @@ -6,7 +6,7 @@ @date 02.05.2020 """ from tmtccmd.config.definitions import QueueCommands -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.packer import TcQueueT from tmtccmd.tc.service_200_mode import pack_mode_data from config.object_ids import TEST_DEVICE_ID diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py index 8edb2ed..e11fab1 100644 --- a/pus_tc/star_tracker.py +++ b/pus_tc/star_tracker.py @@ -10,7 +10,7 @@ import struct from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand class StarTrackerActionIds: diff --git a/pus_tc/tmp1075.py b/pus_tc/tmp1075.py index 48b2d65..6e8b65d 100644 --- a/pus_tc/tmp1075.py +++ b/pus_tc/tmp1075.py @@ -8,7 +8,7 @@ from tmtccmd.config.definitions import QueueCommands from tmtccmd.tc.packer import TcQueueT -from tmtccmd.ecss.tc import PusTelecommand +from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py index 0bdca81..3e80940 100644 --- a/pus_tm/factory_hook.py +++ b/pus_tm/factory_hook.py @@ -4,7 +4,7 @@ it to your needs. """ from tmtccmd.tm.service_8_functional_cmd import Service8TM -from tmtccmd.ecss.tm import PusTelemetry +from spacepackets.ecss.tm import PusTelemetry from tmtccmd.utility.logger import get_console_logger from tmtccmd.tm.service_1_verification import Service1TM diff --git a/tmtccmd b/tmtccmd index 6e6e5d5..be3c04d 160000 --- a/tmtccmd +++ b/tmtccmd @@ -1 +1 @@ -Subproject commit 6e6e5d56a0155f00508c8da506acc6891431ff2c +Subproject commit be3c04d04559d10923d9e3e3582d3eb767873913