From befa84a74b7a3d7b3363492bda0c3cf0d689a376 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 19 Apr 2023 18:09:57 +0200 Subject: [PATCH 1/3] the hottest fix --- mission/acs/GyrAdis1650XHandler.cpp | 1 + mission/acs/GyrL3gCustomHandler.cpp | 1 + mission/acs/MgmLis3CustomHandler.cpp | 1 + mission/acs/MgmRm3100CustomHandler.cpp | 1 + mission/acs/SusHandler.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/mission/acs/GyrAdis1650XHandler.cpp b/mission/acs/GyrAdis1650XHandler.cpp index b9e0b049..c61187ce 100644 --- a/mission/acs/GyrAdis1650XHandler.cpp +++ b/mission/acs/GyrAdis1650XHandler.cpp @@ -37,6 +37,7 @@ void GyrAdis1650XHandler::doStartUp() { void GyrAdis1650XHandler::doShutDown() { if (internalState != InternalState::SHUTDOWN) { commandExecuted = false; + PoolReadGuard pg(&primaryDataset); primaryDataset.setValidity(false, true); internalState = InternalState::SHUTDOWN; } diff --git a/mission/acs/GyrL3gCustomHandler.cpp b/mission/acs/GyrL3gCustomHandler.cpp index 934fba99..ebc6ba42 100644 --- a/mission/acs/GyrL3gCustomHandler.cpp +++ b/mission/acs/GyrL3gCustomHandler.cpp @@ -33,6 +33,7 @@ void GyrL3gCustomHandler::doStartUp() { void GyrL3gCustomHandler::doShutDown() { if (internalState != InternalState::SHUTDOWN) { internalState = InternalState::SHUTDOWN; + PoolReadGuard pg(&dataset); dataset.setValidity(false, true); commandExecuted = false; } diff --git a/mission/acs/MgmLis3CustomHandler.cpp b/mission/acs/MgmLis3CustomHandler.cpp index d1dd5eff..4b2e992d 100644 --- a/mission/acs/MgmLis3CustomHandler.cpp +++ b/mission/acs/MgmLis3CustomHandler.cpp @@ -29,6 +29,7 @@ void MgmLis3CustomHandler::doStartUp() { void MgmLis3CustomHandler::doShutDown() { if (internalState != InternalState::SHUTDOWN) { + PoolReadGuard pg(&dataset); dataset.setValidity(false, true); internalState = InternalState::SHUTDOWN; commandExecuted = false; diff --git a/mission/acs/MgmRm3100CustomHandler.cpp b/mission/acs/MgmRm3100CustomHandler.cpp index e57effda..24c94938 100644 --- a/mission/acs/MgmRm3100CustomHandler.cpp +++ b/mission/acs/MgmRm3100CustomHandler.cpp @@ -33,6 +33,7 @@ void MgmRm3100CustomHandler::doStartUp() { void MgmRm3100CustomHandler::doShutDown() { if (internalState != InternalState::SHUTDOWN) { commandExecuted = false; + PoolReadGuard pg(&primaryDataset); primaryDataset.setValidity(false, true); internalState = InternalState::SHUTDOWN; } diff --git a/mission/acs/SusHandler.cpp b/mission/acs/SusHandler.cpp index 0032a11d..c347020f 100644 --- a/mission/acs/SusHandler.cpp +++ b/mission/acs/SusHandler.cpp @@ -29,6 +29,7 @@ void SusHandler::doStartUp() { void SusHandler::doShutDown() { if (internalState != InternalState::SHUTDOWN) { + PoolReadGuard pg(&dataset); dataset.setValidity(false, true); internalState = InternalState::SHUTDOWN; commandExecuted = false; From f46a705900a67c981a4afefa267a2c7fd38896a1 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 19 Apr 2023 18:12:32 +0200 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 756b0709..2731eb8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,13 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +# [v2.0.4] 2023-04-19 + +## Fixed + +- The dual lane assembly device handlers did not properly set their datasets + to invalid on off transitions + # [v2.0.3] 2023-04-17 - eive-tmtc: v3.1.1 From 1756b5edcc4293892d2aef7a30d5b58c8c40db33 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 19 Apr 2023 18:14:28 +0200 Subject: [PATCH 3/3] patch revision --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f632d2d..358dd8ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 2) set(OBSW_VERSION_MINOR 0) -set(OBSW_VERSION_REVISION 3) +set(OBSW_VERSION_REVISION 4) # set(CMAKE_VERBOSE TRUE)