eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

mueller/master #37

Closed
muellerr wants to merge 126 commits from mueller/master into eive/develop
pull from: mueller/master
merge into: eive:eive/develop
Conversation 0 Commits 126 Files Changed 42 +7 -3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5954002ae0 - Show all commits

10
tcdistribution/CFDPDistributor.cpp
View File

@ -13,10 +13,14 @@ CFDPDistributor::CFDPDistributor(uint16_t setApid, object_id_t setObjectId,
CFDPDistributor::~CFDPDistributor() {}
CFDPDistributor::TcMqMapIter CFDPDistributor::selectDestination() {
#if FSFW_CPP_OSTREAM_ENABLED == 1 && CFDP_DISTRIBUTOR_DEBUGGING == 1
store_address_t storeId = this->currentMessage.getStorageId());
sif:: debug << "CFDPDistributor::handlePacket received: " << storeId.poolIndex << ", " <<
#if CFDP_DISTRIBUTOR_DEBUGGING == 1
store_address_t storeId = this->currentMessage.getStorageId();
#if FSFW_CPP_OSTREAM_ENABLED == 1
sif::debug << "CFDPDistributor::handlePacket received: " << storeId.poolIndex << ", " <<
storeId.packetIndex << std::endl;
#else
sif::printDebug("CFDPDistributor::handlePacket received: %d, %d\n", storeId.poolIndex, storeId.packetIndex);
#endif
#endif
TcMqMapIter queueMapIt = this->queueMap.end();
if(this->currentPacket == nullptr) {