Merge remote-tracking branch 'origin/develop' into refactor_imtq_handling

.idea/cmake.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSharedSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" ENABLED="true" CONFIG_NAME="Debug" NO_GENERATOR="true" />
+      <configuration PROFILE_NAME="Debug Q7S" ENABLED="true" CONFIG_NAME="Debug" TOOLCHAIN_NAME="Q7S" GENERATION_OPTIONS="-DTGT_BSP=&quot;arm/q7s&quot;" NO_GENERATOR="true">
+        <ADDITIONAL_GENERATION_ENVIRONMENT>
+          <envs>
+            <env name="ZYNQ_7020_ROOTFS" value="/opt/xiphos/sdk/ark/sysroots/cortexa9hf-neon-xiphos-linux-gnueabi" />
+            <env name="CROSS_COMPILE" value="/opt/q7s-gcc/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf/bin/arm-linux-gnueabihf" />
+          </envs>
+        </ADDITIONAL_GENERATION_ENVIRONMENT>
+      </configuration>
+    </configurations>
+  </component>
+</project>

CHANGELOG.md

@@ -17,6 +17,10 @@ change warranting a new major release:
 
 # [unreleased]
 
+## Fixed
+
+- CFDP Funnel bugfix: CCSDS wrapping was buggy and works properly now.
+
 ## Changed
 
 - Add `-Wshadow=local` shadowing warnings and fixed all of them

bsp_hosted/fsfwconfig/FSFWConfig.h.in

@@ -50,6 +50,8 @@
 //! If set to 1 the binary needs "cap_sys_nice=eip" privileges to run
 #define FSFW_USE_REALTIME_FOR_LINUX 0
 
+#define FSFW_UDP_SEND_WIRETAPPING_ENABLED 0
+
 namespace fsfwconfig {
 
 //! Default timestamp size. The default timestamp will be an seven byte CDC short timestamp.

fsfw

@@ -1 +1 @@
-Subproject commit c8469ca6473f64676e007e2e2f1c733fe6252053
+Subproject commit c32798522283d89028b7c1ecd3bd33b8391e1a39

mission/tmtc/CfdpTmFunnel.cpp

@@ -53,17 +53,26 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
 #endif
     return result;
   }
+<<<<<<< HEAD
 
   size_t packetLen = 0;
   uint8_t* serPtr = newPacketData;
   result = spacePacketHeader.serializeBe(&serPtr, &packetLen, spacePacketHeader.getFullPacketLen());
+=======
+  size_t packetLen = 0;
+  uint8_t* serPtr = newPacketData;
+  result =
+      spacePacketHeader.serializeBe(&serPtr, &packetLen, spacePacketHeader.getFullPacketLen());
+>>>>>>> origin/develop
   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);
@@ -75,14 +84,13 @@ 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 or store "
-                        "error"
-                     << std::endl;
+                        "error" << std::endl;
 #endif
           break;
         }

tmtc

@@ -1 +1 @@
-Subproject commit a57511e7251ebe0f2adb8ba6af23a7b9783ca6a8
+Subproject commit 37fcdb9a60efc7f6306e18252c0ce98203cb1322