fixes for updated FSFW

tcdistribution/CFDPDistributor.cpp

@@ -1,6 +1,8 @@
+
 #include "CCSDSDistributorIF.h"
 #include "CFDPDistributor.h"
 
+#include "../objectmanager/ObjectManager.h"
 #include "../serviceinterface/ServiceInterface.h"
 
 #define CFDP_DISTRIBUTOR_DEBUGGING     0
@@ -19,7 +21,8 @@ CFDPDistributor::TcMqMapIter CFDPDistributor::selectDestination() {
     sif::debug << "CFDPDistributor::handlePacket received: " << storeId.poolIndex << ", " <<
             storeId.packetIndex << std::endl;
 #else
-    sif::printDebug("CFDPDistributor::handlePacket received: %d, %d\n", storeId.poolIndex, storeId.packetIndex);
+    sif::printDebug("CFDPDistributor::handlePacket received: %d, %d\n", storeId.poolIndex,
+            storeId.packetIndex);
 #endif
 #endif
     TcMqMapIter queueMapIt = this->queueMap.end();
@@ -120,14 +123,14 @@ uint16_t CFDPDistributor::getIdentifier() {
 }
 
 ReturnValue_t CFDPDistributor::initialize() {
-    currentPacket = new TcPacketStored();
+    currentPacket = new TcPacketStoredPus();
     if(currentPacket == nullptr) {
         // Should not happen, memory allocation failed!
         return ObjectManagerIF::CHILD_INIT_FAILED;
     }
 
-    CCSDSDistributorIF* ccsdsDistributor =
-            objectManager->get<CCSDSDistributorIF>(packetSource);
+    CCSDSDistributorIF* ccsdsDistributor = ObjectManager::instance()->get<CCSDSDistributorIF>(
+            packetSource);
     if (ccsdsDistributor == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
         sif::error << "CFDPDistributor::initialize: Packet source invalid" << std::endl;