CHANGELOG.md

@@ -49,6 +49,8 @@ will consitute of a breaking change warranting a new major release:
 - Transmitter state is not taken into account anymore for writing into the PTME. The PTME should
   be perfectly capable of generating a valid CADU, even when the transmitter is not ON for any
   reason.
+- OFF mode is ignores in TM store for determining whether a store will be written. The modes will
+  only be used to cancel a transfer.
 
 ## Added
 
@@ -80,6 +82,7 @@ will consitute of a breaking change warranting a new major release:
 - 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.
+- Some smaller logic fixes in the TM store base class
 
 # [v2.0.5] 2023-05-11
 

mission/com/TmStoreTaskBase.cpp

@@ -131,25 +131,22 @@ ReturnValue_t TmStoreTaskBase::performDump(PersistentTmStoreWithTmQueue& store,
   dumpContext.ptmeBusyCounter = 0;
   tmSinkBusyCd.resetTimer();
   ReturnValue_t result = store.getNextDumpPacket(tmReader, fileHasSwapped);
-  if (result != returnvalue::OK) {
+  if (fileHasSwapped and result == PersistentTmStore::DUMP_DONE) {
-    sif::error << "PersistentTmStore: Getting next dump packet failed" << std::endl;
-  } 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;
+  } else if (result != returnvalue::OK) {
+    sif::error << "PersistentTmStore: Getting next dump packet failed" << std::endl;
+    return result;
   }
   dumpedLen = tmReader.getFullPacketLen();
-  // Only write to VC if mode is on, but always confirm the dump.
+  result = channel.write(tmReader.getFullData(), dumpedLen);
-  // If the mode is OFF, it is assumed the PTME is not usable and is not allowed to be written
+  if (result == DirectTmSinkIF::IS_BUSY) {
-  // (e.g. to confirm a reset or the transmitter is off anyway).
+    sif::warning << "PersistentTmStore: Unexpected VC channel busy" << std::endl;
-  if (mode == MODE_ON) {
+  } else if (result != returnvalue::OK) {
-    result = channel.write(tmReader.getFullData(), dumpedLen);
+    sif::warning << "PersistentTmStore: Unexpected VC channel write failure" << std::endl;
-    if (result == DirectTmSinkIF::IS_BUSY) {
-      sif::warning << "PersistentTmStore: Unexpected VC channel busy" << std::endl;
-    } else if (result != returnvalue::OK) {
-      sif::warning << "PersistentTmStore: Unexpected VC channel write failure" << std::endl;
-    }
   }
+
   result = store.confirmDump(tmReader, fileHasSwapped);
   if ((result == PersistentTmStore::DUMP_DONE or result == returnvalue::OK)) {
     dumpPerformed = true;

mission/com/VirtualChannel.cpp

@@ -18,9 +18,7 @@ uint8_t VirtualChannel::getVcid() const { return vcId; }
 
 const char* VirtualChannel::getName() const { return vcName.c_str(); }
 
-bool VirtualChannel::isBusy() const {
+bool VirtualChannel::isBusy() const { return ptme.isBusy(vcId); }
-  return ptme.isBusy(vcId);
-}
 
 void VirtualChannel::cancelTransfer() { ptme.cancelTransfer(vcId); }
 

mission/tmtc/PersistentTmStore.cpp

@@ -256,6 +256,7 @@ ReturnValue_t PersistentTmStore::getNextDumpPacket(PusTmReader& reader, bool& fi
   if (state == State::IDLE or dumpParams.pendingPacketDump) {
     return returnvalue::FAILED;
   }
+  fileHasSwapped = false;
   reader.setReadOnlyData(fileBuf.data() + dumpParams.currentSize,
                          fileBuf.size() - dumpParams.currentSize);
   // CRC check to fully ensure this is a valid TM
@@ -270,7 +271,6 @@ ReturnValue_t PersistentTmStore::getNextDumpPacket(PusTmReader& reader, bool& fi
     fileHasSwapped = true;
     return loadNextDumpFile();
   }
-  fileHasSwapped = false;
   dumpParams.pendingPacketDump = true;
   return returnvalue::OK;
 }