Merge branch 'acs_updates' into acs_update_scheduling

2023-02-03 10:15:12 +01:00 · 2023-02-03 10:15:12 +01:00 · 02f7b1ae4a
commit 02f7b1ae4a
parent 1e0d9561a2 d9e142e1a8
4 changed files with 9 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -17,6 +17,10 @@ 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)
@ -31,6 +35,8 @@ change warranting a new major release:
 - Update and tweak ACS subsystem to represent the actual ACS design
 - Event handling in the ACS subsystem for events triggered by the ACS controller.
  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/365
+- 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

--- 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)

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f2461cd7e9df449e9ea4a842ca820d5002ef6494
+Subproject commit 3250bbf269b3326683222bb87ce7faecae63ad97
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c633893df43030bb26b8422604b569bf8419d454
+Subproject commit 28c367c6fb959b180fa5ead858e508178454891e