Merge pull request 'adaptions to updated fsfw' (#150) from mueller/pass-mq-args into develop

Reviewed-on: #150
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>

bsp_q7s/core/ObjectFactory.cpp

@@ -987,13 +987,13 @@ void ObjectFactory::createCcsdsComponents(LinuxLibgpioIF* gpioComIF) {
       gpioComIF, gpioIds::RS485_EN_TX_CLOCK, gpioIds::RS485_EN_TX_DATA);
 
   VirtualChannel* vc = nullptr;
-  vc = new VirtualChannel(ccsds::VC0, common::VC0_QUEUE_SIZE);
+  vc = new VirtualChannel(ccsds::VC0, common::VC0_QUEUE_SIZE, objects::CCSDS_HANDLER);
   ccsdsHandler->addVirtualChannel(ccsds::VC0, vc);
-  vc = new VirtualChannel(ccsds::VC1, common::VC1_QUEUE_SIZE);
+  vc = new VirtualChannel(ccsds::VC1, common::VC1_QUEUE_SIZE, objects::CCSDS_HANDLER);
   ccsdsHandler->addVirtualChannel(ccsds::VC1, vc);
-  vc = new VirtualChannel(ccsds::VC2, common::VC2_QUEUE_SIZE);
+  vc = new VirtualChannel(ccsds::VC2, common::VC2_QUEUE_SIZE, objects::CCSDS_HANDLER);
   ccsdsHandler->addVirtualChannel(ccsds::VC2, vc);
-  vc = new VirtualChannel(ccsds::VC3, common::VC3_QUEUE_SIZE);
+  vc = new VirtualChannel(ccsds::VC3, common::VC3_QUEUE_SIZE, objects::CCSDS_HANDLER);
   ccsdsHandler->addVirtualChannel(ccsds::VC3, vc);
 
   GpioCookie* gpioCookiePdec = new GpioCookie;

bsp_q7s/devices/PlocMemoryDumper.cpp

@@ -10,7 +10,9 @@
 
 PlocMemoryDumper::PlocMemoryDumper(object_id_t objectId)
     : SystemObject(objectId), commandActionHelper(this), actionHelper(this, nullptr) {
-  commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
+  auto mqArgs = MqArgs(this->getObjectId());
+  commandQueue = QueueFactory::instance()->createMessageQueue(
+      QUEUE_SIZE, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 PlocMemoryDumper::~PlocMemoryDumper() {}

bsp_q7s/devices/PlocUpdater.cpp

@@ -8,7 +8,9 @@
 
 PlocUpdater::PlocUpdater(object_id_t objectId)
     : SystemObject(objectId), commandActionHelper(this), actionHelper(this, nullptr) {
-  commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
+  auto mqArgs = MqArgs(this->getObjectId());
+  commandQueue = QueueFactory::instance()->createMessageQueue(
+      QUEUE_SIZE, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 PlocUpdater::~PlocUpdater() {}

bsp_q7s/devices/startracker/StarTrackerHandler.cpp

@@ -44,7 +44,9 @@ StarTrackerHandler::StarTrackerHandler(object_id_t objectId, object_id_t comIF,
   if (strHelper == nullptr) {
     sif::error << "StarTrackerHandler: Invalid str image loader" << std::endl;
   }
-  eventQueue = QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 5);
+  auto mqArgs = MqArgs(this->getObjectId());
+  eventQueue = QueueFactory::instance()->createMessageQueue(
+      EventMessage::EVENT_MESSAGE_SIZE * 5, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 StarTrackerHandler::~StarTrackerHandler() {}

bsp_q7s/memory/FileSystemHandler.cpp

@@ -11,7 +11,9 @@
 
 FileSystemHandler::FileSystemHandler(object_id_t fileSystemHandler)
     : SystemObject(fileSystemHandler) {
-  mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE);
+  auto mqArgs = MqArgs(this->getObjectId());
+  mq = QueueFactory::instance()->createMessageQueue(FS_MAX_QUEUE_SIZE,
+                                                    MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 FileSystemHandler::~FileSystemHandler() { QueueFactory::instance()->deleteMessageQueue(mq); }

fsfw

@@ -1 +1 @@
-Subproject commit 32a9e0c7044665f0265c10108c8d62d45c047769
+Subproject commit 19f8e41c7f2523d3684ebddd393e3a7700861328

mission/devices/HeaterHandler.cpp

@@ -16,8 +16,9 @@ HeaterHandler::HeaterHandler(object_id_t setObjectId_, object_id_t gpioDriverId_
       mainLineSwitcherObjectId(mainLineSwitcherObjectId_),
       mainLineSwitch(mainLineSwitch_),
       actionHelper(this, nullptr) {
+  auto mqArgs = MqArgs(setObjectId_, static_cast<void*>(this));
   commandQueue = QueueFactory::instance()->createMessageQueue(
-      cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE);
+      cmdQueueSize, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 HeaterHandler::~HeaterHandler() {}

mission/tmtc/CCSDSHandler.cpp

@@ -23,7 +23,9 @@ CCSDSHandler::CCSDSHandler(object_id_t objectId, object_id_t ptmeId, object_id_t
       enTxClock(enTxClock),
       enTxData(enTxData) {
   commandQueue = QueueFactory::instance()->createMessageQueue(QUEUE_SIZE);
-  eventQueue = QueueFactory::instance()->createMessageQueue(EventMessage::EVENT_MESSAGE_SIZE * 2);
+  auto mqArgs = MqArgs(objectId, static_cast<void*>(this));
+  eventQueue =
+      QueueFactory::instance()->createMessageQueue(10, EventMessage::EVENT_MESSAGE_SIZE, &mqArgs);
 }
 
 CCSDSHandler::~CCSDSHandler() {}

mission/tmtc/CCSDSHandler.h

@@ -132,7 +132,7 @@ class CCSDSHandler : public SystemObject,
 
   ActionHelper actionHelper;
 
-  MessageQueueId_t tcDistributorQueueId;
+  MessageQueueId_t tcDistributorQueueId = MessageQueueIF::NO_QUEUE;
 
   PtmeConfig* ptmeConfig = nullptr;
 

mission/tmtc/VirtualChannel.cpp

@@ -7,9 +7,11 @@
 #include "fsfw/serviceinterface/ServiceInterfaceStream.h"
 #include "fsfw/tmtcservices/TmTcMessage.h"
 
-VirtualChannel::VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth) : vcId(vcId) {
+VirtualChannel::VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId)
-  tmQueue = QueueFactory::instance()->createMessageQueue(tmQueueDepth,
+    : vcId(vcId) {
-                                                         MessageQueueMessage::MAX_MESSAGE_SIZE);
+  auto mqArgs = MqArgs(ownerId, reinterpret_cast<void*>(vcId));
+  tmQueue = QueueFactory::instance()->createMessageQueue(
+      tmQueueDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 ReturnValue_t VirtualChannel::initialize() {

mission/tmtc/VirtualChannel.h

@@ -24,7 +24,7 @@ class VirtualChannel : public AcceptsTelemetryIF, public HasReturnvaluesIF {
    * @param vcId  The virtual channel id assigned to this object
    * @param tmQueueDepth  Queue depth of queue receiving telemetry from other objects
    */
-  VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth);
+  VirtualChannel(uint8_t vcId, uint32_t tmQueueDepth, object_id_t ownerId);
 
   ReturnValue_t initialize();
   MessageQueueId_t getReportReceptionQueue(uint8_t virtualChannel = 0) override;

mission/utility/TmFunnel.cpp

@@ -11,10 +11,11 @@ object_id_t TmFunnel::storageDestination = objects::NO_OBJECT;
 
 TmFunnel::TmFunnel(object_id_t objectId, uint32_t messageDepth)
     : SystemObject(objectId), messageDepth(messageDepth) {
-  tmQueue = QueueFactory::instance()->createMessageQueue(messageDepth,
+  auto mqArgs = MqArgs(objectId, static_cast<void*>(this));
-                                                         MessageQueueMessage::MAX_MESSAGE_SIZE);
+  tmQueue = QueueFactory::instance()->createMessageQueue(
+      messageDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
   storageQueue = QueueFactory::instance()->createMessageQueue(
-      messageDepth, MessageQueueMessage::MAX_MESSAGE_SIZE);
+      messageDepth, MessageQueueMessage::MAX_MESSAGE_SIZE, &mqArgs);
 }
 
 TmFunnel::~TmFunnel() {}