From 57f2143d79945a6c2964659c59df8b98cc146b5e Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 17 Feb 2023 18:13:20 +0100 Subject: [PATCH] bump tmtccmd --- CHANGELOG.md | 2 ++ eive_tmtc/tmtc/__init__.py | 1 + eive_tmtc/tmtc/tm_store.py | 49 +++++++++++++++++++++++++++++++++++++- setup.cfg | 3 ++- 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 952e7ac..29987ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ list yields a list of all related PRs for each release. # [unreleased] +tmtccmd version 4.0.0 + # [v2.12.7] 2023-02-17 - Re-run generators diff --git a/eive_tmtc/tmtc/__init__.py b/eive_tmtc/tmtc/__init__.py index 8c57d8f..584b178 100644 --- a/eive_tmtc/tmtc/__init__.py +++ b/eive_tmtc/tmtc/__init__.py @@ -4,3 +4,4 @@ from .test import add_test_defs from .time import add_time_cmds from .health import add_health_cmd_defs from .system import add_system_cmd_defs +from .tm_store import add_persistent_tm_store_cmd_defs diff --git a/eive_tmtc/tmtc/tm_store.py b/eive_tmtc/tmtc/tm_store.py index 0f2b6c1..e8aa53e 100644 --- a/eive_tmtc/tmtc/tm_store.py +++ b/eive_tmtc/tmtc/tm_store.py @@ -1,8 +1,55 @@ +import struct + from eive_tmtc.config.definitions import CustomServiceList +from tmtccmd.config import TmtcDefinitionWrapper +from tmtccmd.config.tmtc import tmtc_definitions_provider, OpCodeEntry from tmtccmd.tc import service_provider from tmtccmd.tc.decorator import ServiceProviderParams +from dateutil.parser import parse + + +class OpCode: + DUMP = "dump" + DELETE = "delete" + + +class Info: + DUMP = "Dump Telemetry Packets" + DELETE = "Delete Telemetry Packets" @service_provider(CustomServiceList.TM_STORE) def pack_tm_store_commands(p: ServiceProviderParams): - pass + q = p.queue_helper + o = p.op_code + if o == OpCode.DELETE: + q.add_log_cmd(Info.DELETE) + delete_start_time = parse( + input( + "Please enter delete start time in UTC ISO format (YYYY-MM-DDThh:mm:ssZ" + ) + ) + delete_end_time = parse( + input( + "Please enter delete end time in UTC ISO format (YYYY-MM-DDThh:mm:ssZ" + ) + ) + start_stamp = delete_start_time.timestamp() + end_stamp = delete_end_time.timestamp() + app_data = bytearray(struct.pack("!I", start_stamp)) + app_data.extend(struct.pack("!I", end_stamp)) + + pass + elif o == OpCode.DUMP: + q.add_log_cmd(Info.DUMP) + pass + + +@tmtc_definitions_provider +def add_persistent_tm_store_cmd_defs(defs: TmtcDefinitionWrapper): + oce = OpCodeEntry() + oce.add(keys=OpCode.DELETE, info=Info.DELETE) + oce.add(keys=OpCode.DUMP, info=Info.DUMP) + defs.add_service( + CustomServiceList.TM_STORE, "Persistent TM Store", op_code_entry=oce + ) diff --git a/setup.cfg b/setup.cfg index 76d02d8..4f754fe 100644 --- a/setup.cfg +++ b/setup.cfg @@ -27,7 +27,8 @@ classifiers = [options] install_requires = - tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0rc2 + tmtccmd ~= 4.0 + python-dateutil ~= 2.8 # tmtccmd @ git+https://github.com/robamu-org/tmtccmd@#egg=tmtccmd packages = find: python_requires = >=3.10