From 7226f02d4b69962c7147e575fec7d50fa6521a91 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 2 Feb 2023 18:22:07 +0100
Subject: [PATCH 1/3] bump tmtc and fsfw

---
 fsfw | 2 +-
 tmtc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fsfw b/fsfw
index 01cc619e..f2461cd7 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 01cc619e67b84cef514b045377771ff1e11caf80
+Subproject commit f2461cd7e9df449e9ea4a842ca820d5002ef6494
diff --git a/tmtc b/tmtc
index c633893d..b4e42280 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit c633893df43030bb26b8422604b569bf8419d454
+Subproject commit b4e4228040e5b77169fdd92c5577d6f58d318275

From 5a54d4e1ed2a6e8ed221301c3f7eb78bec16c25c Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 2 Feb 2023 18:22:28 +0100
Subject: [PATCH 2/3] afmt

---
 mission/core/GenericFactory.cpp     | 3 ++-
 mission/tmtc/CcsdsIpCoreHandler.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp
index 9c08726c..a5acd734 100644
--- a/mission/core/GenericFactory.cpp
+++ b/mission/core/GenericFactory.cpp
@@ -162,7 +162,8 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
                                    pus::PUS_SERVICE_20);
   new CService200ModeCommanding(objects::PUS_SERVICE_200_MODE_MGMT, config::EIVE_PUS_APID,
                                 pus::PUS_SERVICE_200, 8);
-  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable, 20);
+  HealthServiceCfg healthCfg(objects::PUS_SERVICE_201_HEALTH, config::EIVE_PUS_APID, *healthTable,
+                             20);
   new CServiceHealthCommanding(healthCfg);
 
 #if OBSW_ADD_CFDP_COMPONENTS == 1
diff --git a/mission/tmtc/CcsdsIpCoreHandler.cpp b/mission/tmtc/CcsdsIpCoreHandler.cpp
index 85d1143b..02089da8 100644
--- a/mission/tmtc/CcsdsIpCoreHandler.cpp
+++ b/mission/tmtc/CcsdsIpCoreHandler.cpp
@@ -361,7 +361,7 @@ void CcsdsIpCoreHandler::checkTxTimer() {
   }
   if (transmitterCountdown.hasTimedOut()) {
     disableTransmit();
-    //TODO: set mode to off (move timer to subsystem)
+    // TODO: set mode to off (move timer to subsystem)
   }
 }
 

From e6bafd51dc1de3cb3221bef52e2e415b42869e06 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Thu, 2 Feb 2023 18:37:56 +0100
Subject: [PATCH 3/3] 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