Merge pull request 'Another annoying TM store bug' (#645) from tm-store-task-base-bugfix into v2.1.0-dev
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #645
This commit is contained in:
commit
4dacca6df1
@ -76,6 +76,8 @@ will consitute of a breaking change warranting a new major release:
|
||||
- Fixed the MPSoC flash write command.
|
||||
- Added missing ACS parameter.
|
||||
- HK TM store: The HK store dump success event was triggered for cancelled HK dumps.
|
||||
- When a PUS parsing error occured while parsing a TM store file, the dump completion procedure
|
||||
was always executed.
|
||||
|
||||
# [v2.0.5] 2023-05-11
|
||||
|
||||
|
@ -133,7 +133,7 @@ ReturnValue_t TmStoreTaskBase::performDump(PersistentTmStoreWithTmQueue& store,
|
||||
ReturnValue_t result = store.getNextDumpPacket(tmReader, fileHasSwapped);
|
||||
if (result != returnvalue::OK) {
|
||||
sif::error << "PersistentTmStore: Getting next dump packet failed" << std::endl;
|
||||
} else if (fileHasSwapped or result == PersistentTmStore::DUMP_DONE) {
|
||||
} else if (fileHasSwapped and result == PersistentTmStore::DUMP_DONE) {
|
||||
// This can happen if a file is corrupted and the next file swap completes the dump.
|
||||
dumpDoneHandler();
|
||||
return returnvalue::OK;
|
||||
|
Loading…
Reference in New Issue
Block a user