From e6bafd51dc1de3cb3221bef52e2e415b42869e06 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 2 Feb 2023 18:37:56 +0100 Subject: [PATCH] prepare v1.23.1 --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- fsfw | 2 +- tmtc | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b15c4f12..52d52e98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,10 +17,16 @@ change warranting a new major release: # [unreleased] +# [v1.23.1] 2023-02-02 + +TMTC rev: 15adb9bf2ec68304a4f87b8dd418c1a8353283a3 + ## Fixed - Bugfix in FSFW where the sequence flags of the PUS packets were set to continuation segment (0b00) instead of unsegmented (0b11). +- Bugfix in FSFW where the MGM RM3100 value Z axis data was parse incorrectly. + PR: https://egit.irs.uni-stuttgart.de/eive/fsfw/pulls/123 # [v1.23.0] 2023-02-01 diff --git a/CMakeLists.txt b/CMakeLists.txt index 55f4afe4..e9c51a6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR_IF_GIT_FAILS 1) set(OBSW_VERSION_MINOR_IF_GIT_FAILS 23) -set(OBSW_VERSION_REVISION_IF_GIT_FAILS 0) +set(OBSW_VERSION_REVISION_IF_GIT_FAILS 1) # set(CMAKE_VERBOSE TRUE) diff --git a/fsfw b/fsfw index f2461cd7..3250bbf2 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit f2461cd7e9df449e9ea4a842ca820d5002ef6494 +Subproject commit 3250bbf269b3326683222bb87ce7faecae63ad97 diff --git a/tmtc b/tmtc index b4e42280..15adb9bf 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit b4e4228040e5b77169fdd92c5577d6f58d318275 +Subproject commit 15adb9bf2ec68304a4f87b8dd418c1a8353283a3