Merge pull request 'no dump cancel on TX OFF' (#647) from no-dump-cancel-on-tx-off 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: #647
This commit is contained in:
commit
a0b1ac3d06
@ -43,6 +43,9 @@ will consitute of a breaking change warranting a new major release:
|
||||
- Disable missed deadlines per default. Not useful in orbit, and triggers all the time on the EM
|
||||
build after a number of subsequent runs, without any apparent reason (deadlines are not actually
|
||||
missed, thread usage displayed is nominal)
|
||||
- TM store dumpes will not be cancelled anymore if the transmitter is off. The dump can be cancelled
|
||||
with an OFF command, and the PTME is perfectly capable of dumping without the transmitter being
|
||||
on.
|
||||
|
||||
## Added
|
||||
|
||||
|
@ -94,13 +94,6 @@ void TmStoreTaskBase::cancelDump(DumpContext& ctx, PersistentTmStore& store, boo
|
||||
ReturnValue_t TmStoreTaskBase::handleOneDump(PersistentTmStoreWithTmQueue& store,
|
||||
DumpContext& dumpContext, bool& dumpPerformed) {
|
||||
ReturnValue_t result = returnvalue::OK;
|
||||
// The PTME might have been reset an transmitter state change, so there is no point in continuing
|
||||
// the dump.
|
||||
// TODO: Will be solved in a cleaner way, this is kind of a hack.
|
||||
if (not channel.isTxOn()) {
|
||||
cancelDump(dumpContext, store, false);
|
||||
return returnvalue::FAILED;
|
||||
}
|
||||
// It is assumed that the PTME will only be locked for a short period (e.g. to change datarate).
|
||||
if (not channel.isBusy() and not ptmeLocked) {
|
||||
performDump(store, dumpContext, dumpPerformed);
|
||||
|
Loading…
Reference in New Issue
Block a user