Merge branch 'mueller/tm_funnel_improvements' into dhb2normal

CHANGELOG.md

@@ -10,6 +10,9 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+- Extended TM funnels to allow multiple TM recipients.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/312
+
 # [v1.15.0] 27.10.2022
 
 - Consistent device file naming

bsp_hosted/ObjectFactory.cpp

@@ -4,7 +4,7 @@
 #include <fsfw/tmtcservices/PusServiceBase.h>
 #include <mission/controller/ThermalController.h>
 #include <mission/core/GenericFactory.h>
-#include <mission/tmtc/TmFunnel.h>
+#include <mission/tmtc/TmFunnelHandler.h>
 #include <objects/systemObjectList.h>
 #include <tmtc/pusIds.h>
 
@@ -59,7 +59,9 @@ void Factory::setStaticFrameworkObjectIds() {
 
 void ObjectFactory::produce(void* args) {
   Factory::setStaticFrameworkObjectIds();
-  ObjectFactory::produceGenericObjects();
+  PusTmFunnel* pusFunnel;
+  CfdpTmFunnel* cfdpFunnel;
+  ObjectFactory::produceGenericObjects(nullptr, &pusFunnel, &cfdpFunnel);
 
   dummy::DummyCfg cfg;
   dummy::createDummies(cfg);

bsp_q7s/core/ObjectFactory.cpp

@@ -91,11 +91,9 @@
 #include "mission/devices/devicedefinitions/RwDefinitions.h"
 #include "mission/devices/devicedefinitions/SyrlinksDefinitions.h"
 #include "mission/devices/devicedefinitions/payloadPcduDefinitions.h"
-
 #include "mission/system/objects/AcsBoardAssembly.h"
 #include "mission/tmtc/CcsdsIpCoreHandler.h"
 #include "mission/tmtc/TmFunnelHandler.h"
-
 #include "mission/tmtc/VirtualChannel.h"
 
 ResetArgs RESET_ARGS_GNSS;

linux/ObjectFactory.cpp

@@ -18,16 +18,15 @@
 #include <mission/devices/SusHandler.h>
 #include <mission/system/fdir/RtdFdir.h>
 #include <mission/system/fdir/SusFdir.h>
-#include <mission/system/objects/SusAssembly.h>
-#include <mission/system/objects/TcsBoardAssembly.h>
-#include "mission/system/tree/acsModeTree.h"
 
 #include "OBSWConfig.h"
 #include "devConf.h"
 #include "devices/addresses.h"
 #include "devices/gpioIds.h"
 #include "eive/definitions.h"
-
+#include "mission/system/objects/SusAssembly.h"
+#include "mission/system/objects/TcsBoardAssembly.h"
+#include "mission/system/tree/acsModeTree.h"
 
 void ObjectFactory::createSunSensorComponents(GpioIF* gpioComIF, SpiComIF* spiComIF,
                                               PowerSwitchIF* pwrSwitcher, std::string spiDev) {

mission/tmtc/CfdpTmFunnel.cpp

@@ -69,14 +69,16 @@ ReturnValue_t CfdpTmFunnel::handlePacket(TmTcMessage& msg) {
   store_address_t origStoreId = newStoreId;
   for (unsigned int idx = 0; idx < destinations.size(); idx++) {
     const auto& destVcidPair = destinations[idx];
-    if (idx <= destinations.size() - 1) {
-      // 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);
-      msg.setStorageId(storeId);
-    } else {
-      msg.setStorageId(origStoreId);
+    if (destinations.size() > 1) {
+      if (idx <= destinations.size() - 1) {
+        // 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);
+        msg.setStorageId(storeId);
+      } else {
+        msg.setStorageId(origStoreId);
+      }
     }
     result = tmQueue->sendMessage(destVcidPair.first, &msg);
     if (result != returnvalue::OK) {

mission/tmtc/PusTmFunnel.cpp

@@ -50,14 +50,16 @@ ReturnValue_t PusTmFunnel::handlePacket(TmTcMessage &message) {
 
   for (unsigned int idx = 0; idx < destinations.size(); idx++) {
     const auto &destVcidPair = destinations[idx];
-    if (idx <= destinations.size() - 1) {
-      // 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, packetData, size);
-      message.setStorageId(storeId);
-    } else {
-      message.setStorageId(origStoreId);
+    if (destinations.size() > 1) {
+      if (idx <= destinations.size() - 1) {
+        // 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, packetData, size);
+        message.setStorageId(storeId);
+      } else {
+        message.setStorageId(origStoreId);
+      }
     }
     result = tmQueue->sendMessage(destVcidPair.first, &message);
     if (result != returnvalue::OK) {