From 3b383b98df182be0c6321b5e468c7fb637264db5 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 3 Mar 2023 16:45:25 +0100
Subject: [PATCH] prep v1.34.0

---
 CHANGELOG.md   | 22 ++++++++++++++--------
 CMakeLists.txt |  2 +-
 fsfw           |  2 +-
 tmtc           |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 590a2cfd..90845628 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,12 @@ will consitute of a breaking change warranting a new major release:
 
 # [unreleased]
 
+# [v1.34.0] 2023-03-03
+
+This might include the fix for the race condition where CPU usage jumped to 200 %. The race
+condition was traced to the `Countdown` class, more specifically to the `getUptime` function where
+the `/proc/uptime` file is read.
+
 ## Changed
 
 - Moved polling of all SPI parts to the same PST.
@@ -37,7 +43,7 @@ will consitute of a breaking change warranting a new major release:
 
 - Added Syrlinks Assembly object to allow recovery handling and to fix faulty FDIR behaviour.
 
-# [v1.33.0]
+# [v1.33.0] 2023-03-01
 
 eive-tmtc: v2.16.2
 
@@ -51,7 +57,7 @@ eive-tmtc: v2.16.2
 - Linux GPS handler now checks the individual `*_SET` flags when analysing the `gpsd` struct.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/400
 
-# [v1.32.0]
+# [v1.32.0] 2023-02-24
 
 eive-tmtc: v2.16.1
 
@@ -92,7 +98,7 @@ eive-tmtc: v2.16.1
 - `RwDummy` now initializes with a non faulty state
 
 
-# [v1.31.1]
+# [v1.31.1] 2023-02-23
 
 ## Fixed
 
@@ -102,7 +108,7 @@ eive-tmtc: v2.16.1
   for actuator control which lead to a crash.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/403
 
-# [v1.31.0]
+# [v1.31.0] 2023-02-23
 
 eive-tmtc: v2.16.0
 
@@ -143,7 +149,7 @@ COM PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/364
 - `MekfData` now includes `mekfStatus`
 - `CtrlValData` now includes `tgtRotRate`
 
-# [v1.30.0]
+# [v1.30.0] 2023-02-22
 
 eive-tmtc: v2.14.0
 
@@ -160,7 +166,7 @@ Event IDs for PDEC handler have changed in a breaking manner.
   an event is triggered and the task is delayed for 400 ms.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/393
 
-# [v1.29.1]
+# [v1.29.1] 2023-02-21
 
 ## Fixed
 
@@ -172,7 +178,7 @@ Event IDs for PDEC handler have changed in a breaking manner.
   Issue: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/issues/388
 - Disable stopwatch in MAX31865 polling task
 
-# [v1.29.0]
+# [v1.29.0] 2023-02-21
 
 eive-tmtc: v2.13.0
 
@@ -193,7 +199,7 @@ eive-tmtc: v2.13.0
   will be part of the TCS tree.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/351
 
-# [v1.28.1]
+# [v1.28.1] 2023-02-21
 
 ## Fixed
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f477d205..588bf233 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 set(OBSW_VERSION_MAJOR 1)
-set(OBSW_VERSION_MINOR 33)
+set(OBSW_VERSION_MINOR 34)
 set(OBSW_VERSION_REVISION 0)
 
 # set(CMAKE_VERBOSE TRUE)
diff --git a/fsfw b/fsfw
index 6006c97e..33de1520 160000
--- a/fsfw
+++ b/fsfw
@@ -1 +1 @@
-Subproject commit 6006c97e48b7e6dc3b45a832bdd027a510b67f16
+Subproject commit 33de15205b4560c54a108e35609536374b026c22
diff --git a/tmtc b/tmtc
index 783d5a8e..a9e59ae4 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 783d5a8ed56a9683fc75d2aaffcabe82af34ffa9
+Subproject commit a9e59ae42b3f2f3a13a0bc96f56524f2d78e1eba