Merge pull request 'prep v1.37.0' (#458) from prep_v1.37.0 into develop

Reviewed-on: #458
2023-03-11 15:26:38 +01:00 · 2023-03-11 15:26:38 +01:00 · 569fdfef6e
commit 569fdfef6e
parent 58a5ede270 eb861c9f01
4 changed files with 8 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,6 +16,10 @@ will consitute of a breaking change warranting a new major release:

 # [unreleased]

+# [v1.37.0] 2023-03-11
+
+eive-tmtc: v2.18.1
+
 ## Added

 - `SensorProcessing` now includes an FDIR for GPS altitude. If the measured GPS altitude is out
--- 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 36)
+set(OBSW_VERSION_MINOR 37)
 set(OBSW_VERSION_REVISION 0)

 # set(CMAKE_VERBOSE TRUE)
--- a/mission/tmtc/PersistentLogTmStoreTask.cpp
+++ b/mission/tmtc/PersistentLogTmStoreTask.cpp
@ -6,7 +6,8 @@
 PersistentLogTmStoreTask::PersistentLogTmStoreTask(object_id_t objectId, StorageManagerIF& ipcStore,
                                                   LogStores stores, VirtualChannel& channel,
                                                   SdCardMountedIF& sdcMan)
-    : TmStoreTaskBase(objectId, ipcStore, channel, sdcMan), stores(stores),
+    : TmStoreTaskBase(objectId, ipcStore, channel, sdcMan),
+      stores(stores),
      okStoreContext(persTmStore::DUMP_OK_STORE_DONE),
      notOkStoreContext(persTmStore::DUMP_NOK_STORE_DONE),
      miscStoreContext(persTmStore::DUMP_MISC_STORE_DONE) {}
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f4e9091484cd76db03aee00d39579ef13a92f3d3
+Subproject commit a40c881b9fc292fe598204280db38720a784b71f