From c9ae13c16f09cc2fa410b7cf7ee683b0b77e6b7b Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 13 Jan 2023 11:07:08 +0100 Subject: [PATCH] some fixes for common tmtc code --- pus_tc/pus_17_test.py | 6 ++++-- pus_tc/service_3_housekeeping.py | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pus_tc/pus_17_test.py b/pus_tc/pus_17_test.py index 85fb73b..ccf2916 100644 --- a/pus_tc/pus_17_test.py +++ b/pus_tc/pus_17_test.py @@ -1,12 +1,14 @@ from tmtccmd.pus.pus_17_test import ( pack_service_17_ping_command, - pack_generic_service17_test, ) from tmtccmd.tc.queue import DefaultPusQueueHelper +from tmtccmd.logging import get_console_logger + +LOGGER = get_console_logger() def pack_service_17_commands(op_code: str, q: DefaultPusQueueHelper): if op_code in ["0", "ping"]: q.add_pus_tc(pack_service_17_ping_command()) else: - pack_generic_service17_test(q=q) + LOGGER.warning(f"Invalid op code {op_code}") diff --git a/pus_tc/service_3_housekeeping.py b/pus_tc/service_3_housekeeping.py index e17ea0d..bedc475 100644 --- a/pus_tc/service_3_housekeeping.py +++ b/pus_tc/service_3_housekeeping.py @@ -1,8 +1,7 @@ from datetime import timedelta from spacepackets.ecss.tc import PusTelecommand - -from deps.spacepackets.spacepackets.ecss import PusServices +from spacepackets.ecss import PusServices from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes from tmtccmd.tc.pus_20_params import (