Merge branch 'develop' into eggert/acs-dataset-stuff

mission/devices/GyroADIS1650XHandler.cpp

@@ -434,7 +434,7 @@ ReturnValue_t GyroADIS1650XHandler::spiSendCallback(SpiComIF *comIf, SpiCookie *
       // Prepare transfer
       int fileDescriptor = 0;
       std::string device = comIf->getSpiDev();
-      UnixFileGuard fileHelper(device, &fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
+      UnixFileGuard fileHelper(device, fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
       if (fileHelper.getOpenResult() != returnvalue::OK) {
         return SpiComIF::OPENING_FILE_FAILED;
       }

mission/devices/PayloadPcduHandler.cpp

@@ -722,7 +722,7 @@ ReturnValue_t PayloadPcduHandler::transferAsTwo(SpiComIF* comIf, SpiCookie* cook
   int retval = 0;
   // Prepare transfer
   int fileDescriptor = 0;
-  UnixFileGuard fileHelper(comIf->getSpiDev(), &fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
+  UnixFileGuard fileHelper(comIf->getSpiDev(), fileDescriptor, O_RDWR, "SpiComIF::sendMessage");
   if (fileHelper.getOpenResult() != returnvalue::OK) {
     return SpiComIF::OPENING_FILE_FAILED;
   }

mission/devices/RwHandler.cpp

@@ -168,7 +168,7 @@ ReturnValue_t RwHandler::interpretDeviceReply(DeviceCommandId_t id, const uint8_
     // data is one more flag byte to show whether the value was read at least once.
     auto packetLen = rws::idToPacketLen(currentId);
     // arrayprinter::print(packetPtr, packetLen);
-    uint16_t replyCrc;
+    uint16_t replyCrc = 0;
     size_t dummy = 0;
     SerializeAdapter::deSerialize(&replyCrc, packetPtr + packetLen - 2, &dummy,
                                   SerializeIF::Endianness::LITTLE);

mission/devices/SyrlinksHandler.cpp

@@ -279,7 +279,7 @@ ReturnValue_t SyrlinksHandler::scanForReply(const uint8_t* start, size_t remaini
       break;
     default:
       sif::warning << "SyrlinksHkHandler::scanForReply: Unknown reply identifier" << std::endl;
-      result = IGNORE_REPLY_DATA;
+      result = IGNORE_FULL_PACKET;
       break;
   }
 

mission/tmtc/CfdpTmFunnel.cpp

@@ -53,16 +53,18 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
 #endif
     return result;
   }
-  size_t serSize = 0;
-  result =
-      spacePacketHeader.serializeBe(&newPacketData, &serSize, spacePacketHeader.getFullPacketLen());
+  size_t packetLen = 0;
+  uint8_t* serPtr = newPacketData;
+  result = spacePacketHeader.serializeBe(&serPtr, &packetLen, spacePacketHeader.getFullPacketLen());
   if (result != returnvalue::OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::error << "CfdpTmFunnel::handlePacket: Error serializing packet" << std::endl;
 #endif
     return result;
   }
-  std::memcpy(newPacketData, cfdpPacket, cfdpPacketLen);
+  std::memcpy(serPtr, cfdpPacket, cfdpPacketLen);
+  packetLen += cfdpPacketLen;
+
   // Delete old packet
   tmStore.deleteData(msg.getStorageId());
   msg.setStorageId(newStoreId);
@@ -74,13 +76,15 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
         // Create copy of data to ensure each TM recipient has its own copy. That way, we don't need
         // to bother with send order and where the data is deleted.
         store_address_t storeId;
-        result = tmStore.addData(&storeId, newPacketData, serSize);
+        result = tmStore.addData(&storeId, newPacketData, packetLen);
         if (result == returnvalue::OK) {
           msg.setStorageId(storeId);
         } else {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-          sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy"
+          sif::error << "PusTmFunnel::handlePacket: Store too full to create data copy or store "
+                        "error"
                      << std::endl;
+          break;
 #endif
         }
       } else {