From 6febf6242a556dbe2b4b0500e9bfca3938b436b8 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 19 Aug 2023 06:33:31 +0200 Subject: [PATCH 1/3] pdec config corrupted event, readback config used as parameters --- linux/ipcore/PdecHandler.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index 189dfca8..35e7330f 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -590,15 +590,18 @@ void PdecHandler::checkConfig() { uint32_t secondWord = 0; result = pdecConfig.createSecondWord(&secondWord); if (result != returnvalue::OK) { - // This should normally never happen during runtime. So here is just - // output a warning - sif::warning << "PdecHandler::checkConfig: Failed to create second word" << std::endl; - return; - } - if (firstWord != pdecConfig.readbackFirstWord() or - secondWord != pdecConfig.readbackSecondWord()) { - triggerEvent(PDEC_CONFIG_CORRUPTED, firstWord, secondWord); + // This should normally never happen during runtime. So here is just + // output a warning + sif::warning << "PdecHandler::checkConfig: Failed to create second word" + << std::endl; + return; } + uint32_t readbackFirstWord = pdecConfig.readbackFirstWord(); + uint32_t readbackSecondWord = pdecConfig.readbackSecondWord(); + if (firstWord != readbackFirstWord or + secondWord != readbackSecondWord) { + triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord); + } } void PdecHandler::handleNewTc() { -- 2.43.0 From ddbf4a5ff00247450b096f62621865e695fdb6d3 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 19 Aug 2023 06:37:39 +0200 Subject: [PATCH 2/3] run auto formatter --- linux/ipcore/PdecHandler.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp index 35e7330f..c7266710 100644 --- a/linux/ipcore/PdecHandler.cpp +++ b/linux/ipcore/PdecHandler.cpp @@ -590,18 +590,16 @@ void PdecHandler::checkConfig() { uint32_t secondWord = 0; result = pdecConfig.createSecondWord(&secondWord); if (result != returnvalue::OK) { - // This should normally never happen during runtime. So here is just - // output a warning - sif::warning << "PdecHandler::checkConfig: Failed to create second word" - << std::endl; - return; + // This should normally never happen during runtime. So here is just + // output a warning + sif::warning << "PdecHandler::checkConfig: Failed to create second word" << std::endl; + return; } uint32_t readbackFirstWord = pdecConfig.readbackFirstWord(); uint32_t readbackSecondWord = pdecConfig.readbackSecondWord(); - if (firstWord != readbackFirstWord or - secondWord != readbackSecondWord) { - triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord); - } + if (firstWord != readbackFirstWord or secondWord != readbackSecondWord) { + triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord); + } } void PdecHandler::handleNewTc() { -- 2.43.0 From a1d360502fbd2d8286e5c5a6f172037dcc34fc84 Mon Sep 17 00:00:00 2001 From: meggert Date: Mon, 21 Aug 2023 09:14:16 +0200 Subject: [PATCH 3/3] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09c6db91..5220985e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release: # [unreleased] +## Fixed + +- `PDEC_CONFIG_CORRUPTED` event now actually contains the readback instead of the expected + config + # [v6.4.0] 2023-08-16 - `eive-tmtc`: v5.4.3 -- 2.43.0