From 7fd2fbc4816515456cb40cb37c0a6d91e19b6a45 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 11 Mar 2023 15:09:31 +0100 Subject: [PATCH 1/2] prep v1.37.0 --- CHANGELOG.md | 4 ++++ CMakeLists.txt | 2 +- tmtc | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbe2bc50..ad8e5e37 100644 --- 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.0 + ## Added - `SensorProcessing` now includes an FDIR for GPS altitude. If the measured GPS altitude is out diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cd09271..cb5b5b28 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 36) +set(OBSW_VERSION_MINOR 37) set(OBSW_VERSION_REVISION 0) # set(CMAKE_VERBOSE TRUE) diff --git a/tmtc b/tmtc index f4e90914..65ada579 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit f4e9091484cd76db03aee00d39579ef13a92f3d3 +Subproject commit 65ada579d3b3e4ef37538941e41275f1da8ee76b -- 2.43.0 From eb861c9f01660898ee53b3f2423dc81302fd94af Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Sat, 11 Mar 2023 15:24:43 +0100 Subject: [PATCH 2/2] bump eive-tmtc to v2.18.1 --- CHANGELOG.md | 2 +- mission/tmtc/PersistentLogTmStoreTask.cpp | 3 ++- tmtc | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad8e5e37..69d8cf6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ will consitute of a breaking change warranting a new major release: # [v1.37.0] 2023-03-11 -eive-tmtc: v2.18.0 +eive-tmtc: v2.18.1 ## Added diff --git a/mission/tmtc/PersistentLogTmStoreTask.cpp b/mission/tmtc/PersistentLogTmStoreTask.cpp index aac51c55..dc17ec58 100644 --- 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) {} diff --git a/tmtc b/tmtc index 65ada579..a40c881b 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 65ada579d3b3e4ef37538941e41275f1da8ee76b +Subproject commit a40c881b9fc292fe598204280db38720a784b71f -- 2.43.0