From 325a6ff70b1f8e22f6cdb887d3377456746f1221 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 30 Nov 2023 15:20:50 +0100 Subject: [PATCH 1/2] prep v7.4.0 --- CHANGELOG.md | 2 ++ CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df2d01dc..8ca3755a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v7.4.0] 2023-11-30 + ## Changed - Rewrote the PLOC Supervisor Handler, which is now based on a new device handler base class. diff --git a/CMakeLists.txt b/CMakeLists.txt index a6b5f6e6..b3d0b344 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 7) -set(OBSW_VERSION_MINOR 3) +set(OBSW_VERSION_MINOR 4) set(OBSW_VERSION_REVISION 0) # set(CMAKE_VERBOSE TRUE) From fa727b1e44d1c1292abef9a737c6fe671a2da889 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 30 Nov 2023 15:47:12 +0100 Subject: [PATCH 2/2] bump tmtc to v5.11.0 --- CHANGELOG.md | 2 ++ tmtc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca3755a..7e14f0fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ will consitute of a breaking change warranting a new major release: # [v7.4.0] 2023-11-30 +- `eive-tmtc` v5.11.0 + ## Changed - Rewrote the PLOC Supervisor Handler, which is now based on a new device handler base class. diff --git a/tmtc b/tmtc index 098843a7..74e55b16 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 098843a74f93a7ec94500bc0fc9faa1abb165508 +Subproject commit 74e55b16dcca73023254493d911be3debc36adb2