eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

Merge pull request 'PDEC Corrupted Config Event Parameters' (#785) from meier/pdec-event-params into main
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source 
Reviewed-on: #785
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
This commit is contained in:
Marius Eggert 2023-08-21 09:20:30 +02:00
commit b97afc9f1c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -16,6 +16,11 @@ will consitute of a breaking change warranting a new major release:
# [unreleased] # [unreleased]
## Fixed
- `PDEC_CONFIG_CORRUPTED` event now actually contains the readback instead of the expected
config
# [v6.4.0] 2023-08-16 # [v6.4.0] 2023-08-16
- `eive-tmtc`: v5.4.3 - `eive-tmtc`: v5.4.3

7
linux/ipcore/PdecHandler.cpp
View File

@ -595,9 +595,10 @@ void PdecHandler::checkConfig() {
sif::warning << "PdecHandler::checkConfig: Failed to create second word" << std::endl; sif::warning << "PdecHandler::checkConfig: Failed to create second word" << std::endl;
return; return;
} }
if (firstWord != pdecConfig.readbackFirstWord() or uint32_t readbackFirstWord = pdecConfig.readbackFirstWord();
secondWord != pdecConfig.readbackSecondWord()) { uint32_t readbackSecondWord = pdecConfig.readbackSecondWord();
triggerEvent(PDEC_CONFIG_CORRUPTED, firstWord, secondWord); if (firstWord != readbackFirstWord or secondWord != readbackSecondWord) {
triggerEvent(PDEC_CONFIG_CORRUPTED, readbackFirstWord, readbackSecondWord);
} }
} }