From 87d539d46eba64569e550f5873e176f31fce1542 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 8 Jul 2022 16:25:46 +0200 Subject: [PATCH] replaced includes --- config/hook.py | 3 +-- config/object_ids.py | 2 +- deps/spacepackets | 2 +- deps/tmtccmd | 2 +- gomspace/gomspace_common.py | 2 +- pus_tc/devs/acu.py | 2 +- pus_tc/devs/ccsds_handler.py | 2 +- pus_tc/devs/heater.py | 2 +- pus_tc/devs/imtq.py | 2 +- pus_tc/devs/ploc_memory_dumper.py | 2 +- pus_tc/devs/ploc_mpsoc.py | 2 +- pus_tc/devs/ploc_supervisor.py | 2 +- pus_tc/devs/rad_sensor.py | 2 +- pus_tc/devs/rtd.py | 2 +- pus_tc/devs/star_tracker.py | 2 +- pus_tc/devs/str_img_helper.py | 2 +- pus_tc/devs/syrlinks_hk_handler.py | 2 +- pus_tc/devs/tmp1075.py | 2 +- pus_tc/procedure_packer.py | 2 +- pus_tc/system/controllers.py | 2 +- pus_tm/action_reply_handler.py | 2 +- pus_tm/defs.py | 2 +- pus_tm/devs/bpx_bat.py | 2 +- pus_tm/devs/gps.py | 2 +- pus_tm/devs/gyros.py | 4 ++-- pus_tm/devs/imtq_mgt.py | 2 +- pus_tm/devs/mgms.py | 4 ++-- pus_tm/devs/pcdu.py | 2 +- pus_tm/devs/plpcdu.py | 2 +- pus_tm/devs/rad_sensor.py | 2 +- pus_tm/devs/reaction_wheels.py | 2 +- pus_tm/devs/sus.py | 4 ++-- pus_tm/devs/syrlinks.py | 2 +- pus_tm/event_handler.py | 2 +- pus_tm/factory_hook.py | 2 +- pus_tm/hk_handling.py | 2 +- pus_tm/system/core.py | 2 +- pus_tm/system/tcs.py | 4 ++-- pus_tm/tm_tcp_server.py | 2 +- tmtcc.py | 19 +++++++++++++------ 40 files changed, 56 insertions(+), 50 deletions(-) diff --git a/config/hook.py b/config/hook.py index af55692..fbca91f 100644 --- a/config/hook.py +++ b/config/hook.py @@ -4,11 +4,10 @@ from config.definitions import SPACE_PACKET_IDS from tmtccmd import TmTcCfgHookBase, CcsdsTmtcBackend from tmtccmd.com_if import ComInterface from tmtccmd.config import TmTcDefWrapper -from tmtccmd.utility.retval import RetvalDictT -from tmtccmd.utility.obj_id import ObjectIdDictT from config.retvals import get_retval_dict from pus_tc.cmd_definitions import get_eive_service_op_code_dict +from tmtccmd.util import ObjectIdDictT, RetvalDictT class EiveHookObject(TmTcCfgHookBase): diff --git a/config/object_ids.py b/config/object_ids.py index 9f1f3d2..98da0c9 100644 --- a/config/object_ids.py +++ b/config/object_ids.py @@ -4,7 +4,7 @@ it to your needs. """ import os.path -from tmtccmd.utility.obj_id import ObjectIdDictT +from tmtccmd.util.obj_id import ObjectIdDictT from tmtccmd.fsfw import parse_fsfw_objects_csv from tmtccmd.logging import get_console_logger diff --git a/deps/spacepackets b/deps/spacepackets index 5317f4c..3618d98 160000 --- a/deps/spacepackets +++ b/deps/spacepackets @@ -1 +1 @@ -Subproject commit 5317f4c384321b5b5d8832f51c530fa91d3b2ae5 +Subproject commit 3618d98a43fe9e4b76948f221e6f2142dfc8d225 diff --git a/deps/tmtccmd b/deps/tmtccmd index 02b30ad..b0dde5e 160000 --- a/deps/tmtccmd +++ b/deps/tmtccmd @@ -1 +1 @@ -Subproject commit 02b30ad935cc35a4f2de6844fea84fd29e680eec +Subproject commit b0dde5e6907a56055a5a88039bfa718744c455bc diff --git a/gomspace/gomspace_common.py b/gomspace/gomspace_common.py index aa859ff..2c90c47 100644 --- a/gomspace/gomspace_common.py +++ b/gomspace/gomspace_common.py @@ -12,7 +12,7 @@ from typing import Union from spacepackets.ecss import PusTelecommand from tmtccmd.tc.pus_8_funccmd import generate_action_command -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class GomspaceDeviceActionIds(enum.IntEnum): diff --git a/pus_tc/devs/acu.py b/pus_tc/devs/acu.py index dae5d7f..b21947e 100644 --- a/pus_tc/devs/acu.py +++ b/pus_tc/devs/acu.py @@ -20,7 +20,7 @@ from gomspace.gomspace_common import Info as GsInfo from config.object_ids import ACU_HANDLER_ID from pus_tc.devs.p60dock import P60DockConfigTable from tmtccmd.tc.pus_8_funccmd import generate_action_command -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class ACUConfigTable: diff --git a/pus_tc/devs/ccsds_handler.py b/pus_tc/devs/ccsds_handler.py index 5983bae..97e6771 100644 --- a/pus_tc/devs/ccsds_handler.py +++ b/pus_tc/devs/ccsds_handler.py @@ -9,7 +9,7 @@ import struct from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import QueueHelper -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class CommandIds: diff --git a/pus_tc/devs/heater.py b/pus_tc/devs/heater.py index e2317fb..a183d24 100644 --- a/pus_tc/devs/heater.py +++ b/pus_tc/devs/heater.py @@ -9,7 +9,7 @@ from config.definitions import CustomServiceList from config.object_ids import get_object_ids from tmtccmd.config import TmTcDefWrapper, OpCodeEntry from tmtccmd.tc import QueueHelper -from tmtccmd.utility.obj_id import ObjectIdU32 +from tmtccmd.util.obj_id import ObjectIdU32 from tmtccmd.tc.pus_201_fsfw_health import ( pack_set_health_cmd_data, FsfwHealth, diff --git a/pus_tc/devs/imtq.py b/pus_tc/devs/imtq.py index d8c0661..da38e2a 100644 --- a/pus_tc/devs/imtq.py +++ b/pus_tc/devs/imtq.py @@ -15,7 +15,7 @@ from tmtccmd.tc.pus_3_fsfw_hk import ( generate_one_hk_command, ) from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class ImtqSetIds: diff --git a/pus_tc/devs/ploc_memory_dumper.py b/pus_tc/devs/ploc_memory_dumper.py index 6b89119..45df816 100644 --- a/pus_tc/devs/ploc_memory_dumper.py +++ b/pus_tc/devs/ploc_memory_dumper.py @@ -10,7 +10,7 @@ import struct from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import QueueHelper -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class ActionIds: diff --git a/pus_tc/devs/ploc_mpsoc.py b/pus_tc/devs/ploc_mpsoc.py index 57e2175..b678b11 100644 --- a/pus_tc/devs/ploc_mpsoc.py +++ b/pus_tc/devs/ploc_mpsoc.py @@ -12,7 +12,7 @@ import enum from tmtccmd.logging import get_console_logger from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import QueueHelper -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 from utility.input_helper import InputHelper from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes diff --git a/pus_tc/devs/ploc_supervisor.py b/pus_tc/devs/ploc_supervisor.py index a608aea..0d33f6e 100644 --- a/pus_tc/devs/ploc_supervisor.py +++ b/pus_tc/devs/ploc_supervisor.py @@ -12,7 +12,7 @@ from spacepackets.ecss.tc import PusTelecommand from tmtccmd.logging import get_console_logger from tmtccmd.tc import QueueHelper from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 from utility.input_helper import InputHelper LOGGER = get_console_logger() diff --git a/pus_tc/devs/rad_sensor.py b/pus_tc/devs/rad_sensor.py index 898062a..ea56332 100644 --- a/pus_tc/devs/rad_sensor.py +++ b/pus_tc/devs/rad_sensor.py @@ -14,7 +14,7 @@ from pus_tc.service_200_mode import pack_mode_data, Modes from tmtccmd.config import TmTcDefWrapper, OpCodeEntry from tmtccmd.tc import QueueHelper from tmtccmd.tc.pus_3_fsfw_hk import generate_one_hk_command, make_sid -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class SetIds: diff --git a/pus_tc/devs/rtd.py b/pus_tc/devs/rtd.py index 27e5862..99a9d7a 100644 --- a/pus_tc/devs/rtd.py +++ b/pus_tc/devs/rtd.py @@ -6,7 +6,7 @@ from spacepackets.ecss import PusTelecommand from tmtccmd.config import TmTcDefWrapper, OpCodeEntry from tmtccmd.tc import QueueHelper -from tmtccmd.utility import ObjectIdU32 +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 diff --git a/pus_tc/devs/star_tracker.py b/pus_tc/devs/star_tracker.py index 382ac18..7c2ff11 100644 --- a/pus_tc/devs/star_tracker.py +++ b/pus_tc/devs/star_tracker.py @@ -12,7 +12,7 @@ from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes from tmtccmd.logging import get_console_logger from tmtccmd.tc import QueueHelper -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 from utility.input_helper import InputHelper diff --git a/pus_tc/devs/str_img_helper.py b/pus_tc/devs/str_img_helper.py index b53c42b..cfde090 100644 --- a/pus_tc/devs/str_img_helper.py +++ b/pus_tc/devs/str_img_helper.py @@ -12,7 +12,7 @@ import struct from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc import QueueHelper -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class Commands: diff --git a/pus_tc/devs/syrlinks_hk_handler.py b/pus_tc/devs/syrlinks_hk_handler.py index 287a620..b7210aa 100644 --- a/pus_tc/devs/syrlinks_hk_handler.py +++ b/pus_tc/devs/syrlinks_hk_handler.py @@ -11,7 +11,7 @@ from spacepackets.ecss.tc import PusTelecommand from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes import struct -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class SetIds: diff --git a/pus_tc/devs/tmp1075.py b/pus_tc/devs/tmp1075.py index 59d7208..849fd2b 100644 --- a/pus_tc/devs/tmp1075.py +++ b/pus_tc/devs/tmp1075.py @@ -9,7 +9,7 @@ from spacepackets.ecss.tc import PusTelecommand from pus_tc.service_200_mode import pack_mode_data from tmtccmd.tc import QueueHelper from tmtccmd.tc.pus_200_fsfw_modes import Modes -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 class Tmp1075TestProcedure: diff --git a/pus_tc/procedure_packer.py b/pus_tc/procedure_packer.py index 25f7af3..f168141 100644 --- a/pus_tc/procedure_packer.py +++ b/pus_tc/procedure_packer.py @@ -5,7 +5,6 @@ from typing import cast from pus_tc.devs.rtd import pack_rtd_commands from pus_tc.devs.scex import pack_scex_cmds from pus_tc.system.controllers import pack_cmd_ctrl_to_prompted_mode, get_object_from_op_code -from tmtccmd.utility import ObjectIdU32 from tmtccmd import DefaultProcedureInfo from tmtccmd.config import CoreServiceList from tmtccmd.logging import get_console_logger @@ -69,6 +68,7 @@ from config.object_ids import ( get_object_ids, ) import config.object_ids as oids +from tmtccmd.util import ObjectIdU32 LOGGER = get_console_logger() diff --git a/pus_tc/system/controllers.py b/pus_tc/system/controllers.py index 4078641..76c81bb 100644 --- a/pus_tc/system/controllers.py +++ b/pus_tc/system/controllers.py @@ -1,6 +1,6 @@ from tmtccmd.tc import QueueHelper from tmtccmd.tc.pus_200_fsfw_modes import Modes -from tmtccmd.utility import ObjectIdU32 +from tmtccmd.util import ObjectIdU32 from .common import command_mode import config.object_ids as obj_ids diff --git a/pus_tm/action_reply_handler.py b/pus_tm/action_reply_handler.py index b56cc3e..009efc2 100644 --- a/pus_tm/action_reply_handler.py +++ b/pus_tm/action_reply_handler.py @@ -7,7 +7,7 @@ from pus_tc.devs.star_tracker import StarTrackerActionIds from gomspace.gomspace_common import GomspaceDeviceActionIds from tmtccmd.logging import get_console_logger from tmtccmd.tm import Service8FsfwTm -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter LOGGER = get_console_logger() diff --git a/pus_tm/defs.py b/pus_tm/defs.py index 218e2d0..e5e6d14 100644 --- a/pus_tm/defs.py +++ b/pus_tm/defs.py @@ -1,4 +1,4 @@ -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter class PrintWrapper: diff --git a/pus_tm/devs/bpx_bat.py b/pus_tm/devs/bpx_bat.py index eb27286..abbe93e 100644 --- a/pus_tm/devs/bpx_bat.py +++ b/pus_tm/devs/bpx_bat.py @@ -2,7 +2,7 @@ import struct from pus_tc.devs.bpx_batt import BpxSetIds from pus_tm.defs import PrintWrapper -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter def handle_bpx_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): diff --git a/pus_tm/devs/gps.py b/pus_tm/devs/gps.py index 070a7d6..0f421cb 100644 --- a/pus_tm/devs/gps.py +++ b/pus_tm/devs/gps.py @@ -1,7 +1,7 @@ import struct from pus_tm.defs import PrintWrapper -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter def handle_gps_data(printer: FsfwTmTcPrinter, hk_data: bytes): diff --git a/pus_tm/devs/gyros.py b/pus_tm/devs/gyros.py index 48af1b1..bebfcda 100644 --- a/pus_tm/devs/gyros.py +++ b/pus_tm/devs/gyros.py @@ -1,8 +1,8 @@ import struct from pus_tm.defs import PrintWrapper -from tmtccmd.utility import ObjectIdU32 -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +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 diff --git a/pus_tm/devs/imtq_mgt.py b/pus_tm/devs/imtq_mgt.py index 6a3aae4..347e675 100644 --- a/pus_tm/devs/imtq_mgt.py +++ b/pus_tm/devs/imtq_mgt.py @@ -1,7 +1,7 @@ import struct from pus_tm.defs import PrintWrapper -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter def handle_eng_set(printer: FsfwTmTcPrinter, hk_data: bytes): diff --git a/pus_tm/devs/mgms.py b/pus_tm/devs/mgms.py index 2e0380e..b4cc122 100644 --- a/pus_tm/devs/mgms.py +++ b/pus_tm/devs/mgms.py @@ -2,8 +2,8 @@ import struct from pus_tm.defs import PrintWrapper from pus_tc.devs.mgms import MgmRm3100SetIds, MgmLis3SetIds -from tmtccmd.utility import ObjectIdU32 -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util import ObjectIdU32 +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter import config.object_ids as obj_ids diff --git a/pus_tm/devs/pcdu.py b/pus_tm/devs/pcdu.py index 068f4fd..dd5f8e4 100644 --- a/pus_tm/devs/pcdu.py +++ b/pus_tm/devs/pcdu.py @@ -1,7 +1,7 @@ import struct from typing import List, Tuple -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from pus_tm.defs import PrintWrapper from gomspace.gomspace_common import SetIds diff --git a/pus_tm/devs/plpcdu.py b/pus_tm/devs/plpcdu.py index 33eb3ca..f9ed50a 100644 --- a/pus_tm/devs/plpcdu.py +++ b/pus_tm/devs/plpcdu.py @@ -1,7 +1,7 @@ import struct from pus_tm.defs import PrintWrapper -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from pus_tc.devs.plpcdu import SetIds diff --git a/pus_tm/devs/rad_sensor.py b/pus_tm/devs/rad_sensor.py index de0e65d..a2673ff 100644 --- a/pus_tm/devs/rad_sensor.py +++ b/pus_tm/devs/rad_sensor.py @@ -1,7 +1,7 @@ import struct from pus_tm.defs import PrintWrapper -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from pus_tc.devs.rad_sensor import SetIds diff --git a/pus_tm/devs/reaction_wheels.py b/pus_tm/devs/reaction_wheels.py index 2597357..6e072f5 100644 --- a/pus_tm/devs/reaction_wheels.py +++ b/pus_tm/devs/reaction_wheels.py @@ -1,7 +1,7 @@ import struct from pus_tm.defs import PrintWrapper, FsfwTmTcPrinter -from tmtccmd.utility.obj_id import ObjectIdU32 +from tmtccmd.util.obj_id import ObjectIdU32 def handle_rw_hk_data( diff --git a/pus_tm/devs/sus.py b/pus_tm/devs/sus.py index c3a323a..f733954 100644 --- a/pus_tm/devs/sus.py +++ b/pus_tm/devs/sus.py @@ -2,8 +2,8 @@ import struct from pus_tm.defs import PrintWrapper from pus_tc.devs.sus import SetIds -from tmtccmd.utility import ObjectIdU32 -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util import ObjectIdU32 +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter def handle_sus_hk( diff --git a/pus_tm/devs/syrlinks.py b/pus_tm/devs/syrlinks.py index 3c82f7a..f0c9b58 100644 --- a/pus_tm/devs/syrlinks.py +++ b/pus_tm/devs/syrlinks.py @@ -2,7 +2,7 @@ import struct from pus_tm.defs import PrintWrapper from pus_tc.devs.syrlinks_hk_handler import SetIds -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter def handle_syrlinks_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): diff --git a/pus_tm/event_handler.py b/pus_tm/event_handler.py index 2af9e77..f460659 100644 --- a/pus_tm/event_handler.py +++ b/pus_tm/event_handler.py @@ -5,7 +5,7 @@ from config.object_ids import get_object_ids from tmtccmd.tm import Service5Tm from tmtccmd.logging import get_console_logger -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from tmtccmd.fsfw import parse_fsfw_events_csv, EventDictT, EventInfo diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py index e3b4f30..1ccdc7a 100644 --- a/pus_tm/factory_hook.py +++ b/pus_tm/factory_hook.py @@ -8,7 +8,7 @@ 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.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter from .event_handler import handle_event_packet from .verification_handler import handle_service_1_packet diff --git a/pus_tm/hk_handling.py b/pus_tm/hk_handling.py index 904475b..7b19a11 100644 --- a/pus_tm/hk_handling.py +++ b/pus_tm/hk_handling.py @@ -9,7 +9,7 @@ from tmtccmd.tm.pus_3_fsfw_hk import ( HkContentType, Service3FsfwTm, ) -from tmtccmd.utility.obj_id import ObjectIdU32, ObjectIdDictT +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 diff --git a/pus_tm/system/core.py b/pus_tm/system/core.py index 883d044..f4e65a3 100644 --- a/pus_tm/system/core.py +++ b/pus_tm/system/core.py @@ -2,7 +2,7 @@ import struct from pus_tm.defs import PrintWrapper from pus_tc.system.core import SetIds -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter def handle_core_hk_data(printer: FsfwTmTcPrinter, set_id: int, hk_data: bytes): diff --git a/pus_tm/system/tcs.py b/pus_tm/system/tcs.py index 50ccd2c..27d4583 100644 --- a/pus_tm/system/tcs.py +++ b/pus_tm/system/tcs.py @@ -3,8 +3,8 @@ import struct from pus_tm.defs import PrintWrapper from pus_tm.tcp_server_objects import * -from tmtccmd.utility import ObjectIdU32 -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter +from tmtccmd.util import ObjectIdU32 +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter class SetIds(enum.IntEnum): diff --git a/pus_tm/tm_tcp_server.py b/pus_tm/tm_tcp_server.py index 4d3f243..f2a7e02 100644 --- a/pus_tm/tm_tcp_server.py +++ b/pus_tm/tm_tcp_server.py @@ -4,7 +4,7 @@ import json import base64 from tmtccmd.logging import get_console_logger -from tmtccmd.utility.obj_id import ObjectIdU32 +from tmtccmd.util.obj_id import ObjectIdU32 from dle_encoder import DleEncoder LOGGER = get_console_logger() diff --git a/tmtcc.py b/tmtcc.py index cafd65d..7414ae3 100644 --- a/tmtcc.py +++ b/tmtcc.py @@ -4,6 +4,9 @@ import sys import time import traceback +from tmtccmd.util import FileSeqCountProvider, PusFileSeqCountProvider +from tmtccmd.util.tmtc_printer import FsfwTmTcPrinter + try: import spacepackets except ImportError as error: @@ -35,10 +38,8 @@ from tmtccmd.logging.pus import ( ) from tmtccmd.pus import VerificationWrapper from tmtccmd.tm import SpecificApidHandlerBase, GenericApidHandlerBase, CcsdsTmHandler -from tmtccmd.utility.tmtc_printer import FsfwTmTcPrinter from tmtccmd.core import BackendRequest from tmtccmd.logging import get_current_time_string -from tmtccmd.pus import FileSeqCountProvider from tmtccmd.tc import ( ProcedureHelper, FeedWrapper, @@ -88,23 +89,25 @@ class TcHandler(TcHandlerBase): pus_verificator: PusVerificator, file_logger: logging.Logger, raw_logger: RawTmtcTimedLogWrapper, + gui: bool ): super().__init__() self.seq_count_provider = seq_count_provider self.pus_verificator = pus_verificator self.file_logger = file_logger self.raw_logger = raw_logger + self.gui = gui def feed_cb(self, info: ProcedureHelper, wrapper: FeedWrapper): if info.proc_type == TcProcedureType.DEFAULT: - handle_default_procedure(info.to_def_procedure(), wrapper) + handle_default_procedure(info.to_def_procedure(), wrapper, self.gui) def send_cb(self, entry_helper: QueueEntryHelper, com_if: ComInterface): if entry_helper.is_tc: if entry_helper.entry_type == TcQueueEntryType.PUS_TC: pus_tc_wrapper = entry_helper.to_pus_tc_entry() pus_tc_wrapper.pus_tc.seq_count = ( - self.seq_count_provider.next_seq_count() + self.seq_count_provider.get_and_increment() ) pus_tc_wrapper.pus_tc.apid = PUS_APID # Add TC after Sequence Count stamping @@ -148,17 +151,19 @@ def setup_tmtc( verificator: PusVerificator, printer: FsfwTmTcPrinter, raw_logger: RawTmtcTimedLogWrapper, + gui: bool ) -> (CcsdsTmHandler, TcHandler): verification_wrapper = VerificationWrapper(verificator, LOGGER, printer.file_logger) pus_handler = PusHandler(verification_wrapper, printer, raw_logger) ccsds_handler = CcsdsTmHandler(generic_handler=UnknownApidHandler(None)) ccsds_handler.add_apid_handler(pus_handler) - seq_count_provider = FileSeqCountProvider() + seq_count_provider = PusFileSeqCountProvider() tc_handler = TcHandler( seq_count_provider=seq_count_provider, pus_verificator=verificator, file_logger=printer.file_logger, raw_logger=raw_logger, + gui=gui ) return ccsds_handler, tc_handler @@ -185,7 +190,9 @@ def main(): printer = FsfwTmTcPrinter(tmtc_logger.logger) raw_logger = RawTmtcTimedLogWrapper(when=TimedLogWhen.PER_HOUR, interval=2) pus_verificator = PusVerificator() - ccsds_handler, tc_handler = setup_tmtc(pus_verificator, printer, raw_logger) + ccsds_handler, tc_handler = setup_tmtc( + pus_verificator, printer, raw_logger, setup_wrapper.params.use_gui + ) tmtccmd.setup(setup_wrapper) tmtc_backend = setup_backend(