From bcb6a8b34e91dc9c8f0b3e1c68864e9eb1ff0cc4 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Mar 2024 10:59:09 +0100 Subject: [PATCH 1/3] changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38e6908..4e36e4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ list yields a list of all related PRs for each release. # [unreleased] +# [v6.1.1] 2024-03-06 + ## Added - Added Core Ctrl cmd to update leap seconds. -- 2.43.0 From c90dd921623f7ad29a3b6fa679a24eeea8bd0077 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Mar 2024 10:59:31 +0100 Subject: [PATCH 2/3] bump version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e4f2a5e..36e7208 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" name = "eive-tmtc" description = "TMTC Commander EIVE" readme = "README.md" -version = "6.1.0" +version = "6.1.1" requires-python = ">=3.10" license = {text = "Apache-2.0"} authors = [ -- 2.43.0 From 49a614db1080a3b0125b7d1e3ff8d5c0ab67e963 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 6 Mar 2024 11:02:10 +0100 Subject: [PATCH 3/3] cleanup --- eive_tmtc/tmtc/acs/acs_ctrl.py | 8 +------- eive_tmtc/tmtc/core.py | 4 +--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index 9f72faa..a2ab713 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -7,12 +7,7 @@ import struct from socket import AF_INET from typing import Tuple -from tmtccmd.config.tmtc import ( - CmdTreeNode, - OpCodeEntry, - TmtcDefinitionWrapper, - tmtc_definitions_provider, -) +from tmtccmd.config.tmtc import CmdTreeNode from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter from tmtccmd.pus.s8_fsfw_action import create_action_cmd from tmtccmd.pus.s20_fsfw_param import create_load_param_cmd @@ -37,7 +32,6 @@ from tmtccmd.pus.tc.s3_fsfw_hk import ( ) from tmtccmd.tmtc.queue import DefaultPusQueueHelper -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 eive_tmtc.tmtc.acs.defs import AcsMode, SafeSubmode diff --git a/eive_tmtc/tmtc/core.py b/eive_tmtc/tmtc/core.py index 369e30e..f80d6ab 100644 --- a/eive_tmtc/tmtc/core.py +++ b/eive_tmtc/tmtc/core.py @@ -6,7 +6,7 @@ from pathlib import Path from typing import Tuple from spacepackets.ecss import PusTelecommand -from tmtccmd.config import CmdTreeNode, TmtcDefinitionWrapper +from tmtccmd.config import CmdTreeNode from tmtccmd.tmtc import DefaultPusQueueHelper from tmtccmd.pus.s8_fsfw_action import create_action_cmd @@ -15,14 +15,12 @@ from tmtccmd.pus.s20_fsfw_param import ( create_scalar_u8_parameter, create_load_param_cmd, ) -from tmtccmd.config.tmtc import OpCodeEntry, tmtc_definitions_provider from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter from tmtccmd.pus.s11_tc_sched import ( create_enable_tc_sched_cmd, create_disable_tc_sched_cmd, ) -from eive_tmtc.config.definitions import CustomServiceList from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID from eive_tmtc.pus_tm.defs import PrintWrapper -- 2.43.0