From e7b7e77d4df0b84ab1f29164f141ccf2fc1c7a4a Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 9 Jun 2017 14:18:11 +0200 Subject: [PATCH] SDRdaemonFEC: renamed all SDRdaemonFEC references in debug messages to SDRdaemonSource ones --- .../samplesource/sdrdaemonsource/readme.md | 2 +- .../sdrdaemonsource/sdrdaemonsourcebuffer.cpp | 26 +++++++++---------- .../sdrdaemonsource/sdrdaemonsourcegui.cpp | 12 ++++----- .../sdrdaemonsource/sdrdaemonsourceinput.cpp | 4 +-- .../sdrdaemonsourceudphandler.cpp | 14 +++++----- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/plugins/samplesource/sdrdaemonsource/readme.md b/plugins/samplesource/sdrdaemonsource/readme.md index 99da1f866..66b599e76 100644 --- a/plugins/samplesource/sdrdaemonsource/readme.md +++ b/plugins/samplesource/sdrdaemonsource/readme.md @@ -1,4 +1,4 @@ -

SDRdaemonFEC plugin

+

SDRdaemon source plugin

Introduction

diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp index e58061721..0ae16958f 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcebuffer.cpp @@ -59,7 +59,7 @@ SDRdaemonSourceBuffer::SDRdaemonSourceBuffer(uint32_t throttlems) : if (!m_cm256.isInitialized()) { m_cm256_OK = false; - qDebug() << "SDRdaemonFECBuffer::SDRdaemonFECBuffer: cannot initialize CM256 library"; + qDebug() << "SDRdaemonSourceBuffer::SDRdaemonSourceBuffer: cannot initialize CM256 library"; } else { m_cm256_OK = true; } @@ -182,7 +182,7 @@ void SDRdaemonSourceBuffer::checkSlotData(int slotIndex) if (!m_decoderSlots[slotIndex].m_decoded) { - qDebug() << "SDRdaemonFECBuffer::checkSlotData: incomplete frame:" + qDebug() << "SDRdaemonSourceBuffer::checkSlotData: incomplete frame:" << " m_blockCount: " << m_decoderSlots[slotIndex].m_blockCount << " m_recoveryCount: " << m_decoderSlots[slotIndex].m_recoveryCount; } @@ -258,13 +258,13 @@ void SDRdaemonSourceBuffer::writeData(char *array) if (m_cm256.cm256_decode(m_paramsCM256, m_decoderSlots[decoderIndex].m_cm256DescriptorBlocks)) // CM256 decode { - qDebug() << "SDRdaemonFECBuffer::writeData: decode CM256 error:" + qDebug() << "SDRdaemonSourceBuffer::writeData: decode CM256 error:" << " m_originalCount: " << m_decoderSlots[decoderIndex].m_originalCount << " m_recoveryCount: " << m_decoderSlots[decoderIndex].m_recoveryCount; } else { - qDebug() << "SDRdaemonFECBuffer::writeData: decode CM256 success:" + qDebug() << "SDRdaemonSourceBuffer::writeData: decode CM256 success:" << " m_originalCount: " << m_decoderSlots[decoderIndex].m_originalCount << " m_recoveryCount: " << m_decoderSlots[decoderIndex].m_recoveryCount; @@ -284,17 +284,17 @@ void SDRdaemonSourceBuffer::writeData(char *array) if (crc32.checksum() == metaData->m_crc32) { m_decoderSlots[decoderIndex].m_metaRetrieved = true; - printMeta("SDRdaemonFECBuffer::writeData: recovered meta", metaData); + printMeta("SDRdaemonSourceBuffer::writeData: recovered meta", metaData); } else { - qDebug() << "SDRdaemonFECBuffer::writeData: recovered meta: invalid CRC32"; + qDebug() << "SDRdaemonSourceBuffer::writeData: recovered meta: invalid CRC32"; } } storeOriginalBlock(decoderIndex, blockIndex, *recoveredBlock); - qDebug() << "SDRdaemonFECBuffer::writeData: recovered block #" << blockIndex; + qDebug() << "SDRdaemonSourceBuffer::writeData: recovered block #" << blockIndex; } // restore missing blocks } // CM256 decode } // revovery @@ -313,7 +313,7 @@ void SDRdaemonSourceBuffer::writeData(char *array) m_readNbBytes = (sampleRate * m_iqSampleSize) / 20; } - printMeta("SDRdaemonFECBuffer::writeData: new meta", metaData); // print for change other than timestamp + printMeta("SDRdaemonSourceBuffer::writeData: new meta", metaData); // print for change other than timestamp } m_currentMeta = *metaData; // renew current meta @@ -332,7 +332,7 @@ void SDRdaemonSourceBuffer::writeData0(char *array __attribute__((unused)), uint // int decoderIndex = frameIndex % nbDecoderSlots; // int blockIndex = superBlock->header.blockIndex; // -//// qDebug() << "SDRdaemonFECBuffer::writeData:" +//// qDebug() << "SDRdaemonSourceBuffer::writeData:" //// << " frameIndex: " << frameIndex //// << " decoderIndex: " << decoderIndex //// << " blockIndex: " << blockIndex; @@ -352,7 +352,7 @@ void SDRdaemonSourceBuffer::writeData0(char *array __attribute__((unused)), uint // { // if (-frameDelta < nbDecoderSlots) // new frame head not too new // { -// //qDebug() << "SDRdaemonFECBuffer::writeData: new frame head (1): " << frameIndex << ":" << frameDelta << ":" << decoderIndex; +// //qDebug() << "SDRdaemonSourceBuffer::writeData: new frame head (1): " << frameIndex << ":" << frameDelta << ":" << decoderIndex; // m_decoderIndexHead = decoderIndex; // new decoder slot head // m_frameHead = frameIndex; // checkSlotData(decoderIndex); @@ -361,7 +361,7 @@ void SDRdaemonSourceBuffer::writeData0(char *array __attribute__((unused)), uint // } // else if (-frameDelta <= 65536 - nbDecoderSlots) // loss of sync start over // { -// //qDebug() << "SDRdaemonFECBuffer::writeData: loss of sync start over (1)" << frameIndex << ":" << frameDelta << ":" << decoderIndex; +// //qDebug() << "SDRdaemonSourceBuffer::writeData: loss of sync start over (1)" << frameIndex << ":" << frameDelta << ":" << decoderIndex; // m_decoderIndexHead = decoderIndex; // new decoder slot head // m_frameHead = frameIndex; // initReadIndex(); // reset read index @@ -372,7 +372,7 @@ void SDRdaemonSourceBuffer::writeData0(char *array __attribute__((unused)), uint // { // if (frameDelta > 65536 - nbDecoderSlots) // new frame head not too new // { -// //qDebug() << "SDRdaemonFECBuffer::writeData: new frame head (2): " << frameIndex << ":" << frameDelta << ":" << decoderIndex; +// //qDebug() << "SDRdaemonSourceBuffer::writeData: new frame head (2): " << frameIndex << ":" << frameDelta << ":" << decoderIndex; // m_decoderIndexHead = decoderIndex; // new decoder slot head // m_frameHead = frameIndex; // checkSlotData(decoderIndex); @@ -381,7 +381,7 @@ void SDRdaemonSourceBuffer::writeData0(char *array __attribute__((unused)), uint // } // else if (frameDelta >= nbDecoderSlots) // loss of sync start over // { -// //qDebug() << "SDRdaemonFECBuffer::writeData: loss of sync start over (2)" << frameIndex << ":" << frameDelta << ":" << decoderIndex; +// //qDebug() << "SDRdaemonSourceBuffer::writeData: loss of sync start over (2)" << frameIndex << ":" << frameDelta << ":" << decoderIndex; // m_decoderIndexHead = decoderIndex; // new decoder slot head // m_frameHead = frameIndex; // initReadIndex(); // reset read index diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp index e3982dd8c..fd7ff5c98 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp @@ -349,9 +349,9 @@ void SDRdaemonSourceGui::sendControl(bool force) int rc = nn_shutdown(m_sender, 0); if (rc < 0) { - qDebug() << "SDRdaemonFECGui::sendControl: disconnection failed"; + qDebug() << "SDRdaemonSourceGui::sendControl: disconnection failed"; } else { - qDebug() << "SDRdaemonFECGui::sendControl: disconnection successful"; + qDebug() << "SDRdaemonSourceGui::sendControl: disconnection successful"; } std::ostringstream os; @@ -360,10 +360,10 @@ void SDRdaemonSourceGui::sendControl(bool force) rc = nn_connect(m_sender, addrstrng.c_str()); if (rc < 0) { - qDebug() << "SDRdaemonFECGui::sendConfiguration: connexion to " << addrstrng.c_str() << " failed"; + qDebug() << "SDRdaemonSourceGui::sendConfiguration: connexion to " << addrstrng.c_str() << " failed"; QMessageBox::information(this, tr("Message"), tr("Cannot connect to remote control port")); } else { - qDebug() << "SDRdaemonFECGui::sendConfiguration: connexion to " << addrstrng.c_str() << " successful"; + qDebug() << "SDRdaemonSourceGui::sendConfiguration: connexion to " << addrstrng.c_str() << " successful"; } } @@ -430,14 +430,14 @@ void SDRdaemonSourceGui::sendControl(bool force) if (rc != config_size) { //QMessageBox::information(this, tr("Message"), tr("Cannot send message to remote control port")); - qDebug() << "SDRdaemonFECGui::sendControl: Cannot send message to remote control port." + qDebug() << "SDRdaemonSourceGui::sendControl: Cannot send message to remote control port." << " remoteAddress: " << m_remoteAddress << " remotePort: " << m_settings.m_controlPort << " message: " << os.str().c_str(); } else { - qDebug() << "SDRdaemonFECGui::sendControl:" + qDebug() << "SDRdaemonSourceGui::sendControl:" << "remoteAddress:" << m_remoteAddress << "remotePort:" << m_settings.m_controlPort << "message:" << os.str().c_str(); diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp index ee8cf4551..09bd078ff 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp @@ -108,8 +108,8 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message) { if (MsgConfigureSDRdaemonSource::match(message)) { - qDebug() << "SDRdaemonFECInput::handleMessage:" << message.getIdentifier(); - //MsgConfigureSDRdaemonFEC& conf = (MsgConfigureSDRdaemonFEC&) message; + qDebug() << "SDRdaemonSourceInput::handleMessage:" << message.getIdentifier(); + //SDRdaemonSourceInput& conf = (MsgConfigureSDRdaemonFEC&) message; //applySettings(conf.getSettings(), conf.getForce()); return true; } diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp index 6d53e053a..b91b1144b 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceudphandler.cpp @@ -68,7 +68,7 @@ SDRdaemonSourceUDPHandler::~SDRdaemonSourceUDPHandler() void SDRdaemonSourceUDPHandler::start() { - qDebug("SDRdaemonFECUDPHandler::start"); + qDebug("SDRdaemonSourceUDPHandler::start"); if (!m_dataSocket) { @@ -81,12 +81,12 @@ void SDRdaemonSourceUDPHandler::start() if (m_dataSocket->bind(m_dataAddress, m_dataPort)) { - qDebug("SDRdaemonFECUDPHandler::start: bind data socket to %s:%d", m_dataAddress.toString().toStdString().c_str(), m_dataPort); + qDebug("SDRdaemonSourceUDPHandler::start: bind data socket to %s:%d", m_dataAddress.toString().toStdString().c_str(), m_dataPort); m_dataConnected = true; } else { - qWarning("SDRdaemonFECUDPHandler::start: cannot bind data port %d", m_dataPort); + qWarning("SDRdaemonSourceUDPHandler::start: cannot bind data port %d", m_dataPort); disconnect(m_dataSocket, SIGNAL(readyRead()), this, SLOT(dataReadyRead())); m_dataConnected = false; } @@ -100,7 +100,7 @@ void SDRdaemonSourceUDPHandler::start() void SDRdaemonSourceUDPHandler::stop() { - qDebug("SDRdaemonFECUDPHandler::stop"); + qDebug("SDRdaemonSourceUDPHandler::stop"); if (m_dataConnected) { @@ -117,12 +117,12 @@ void SDRdaemonSourceUDPHandler::stop() void SDRdaemonSourceUDPHandler::configureUDPLink(const QString& address, quint16 port) { - qDebug("SDRdaemonFECUDPHandler::configureUDPLink: %s:%d", address.toStdString().c_str(), port); + qDebug("SDRdaemonSourceUDPHandler::configureUDPLink: %s:%d", address.toStdString().c_str(), port); bool addressOK = m_dataAddress.setAddress(address); if (!addressOK) { - qWarning("SDRdaemonFECUDPHandler::configureUDPLink: invalid address %s. Set to localhost.", address.toStdString().c_str()); + qWarning("SDRdaemonSourceUDPHandler::configureUDPLink: invalid address %s. Set to localhost.", address.toStdString().c_str()); m_dataAddress = QHostAddress::LocalHost; } @@ -185,7 +185,7 @@ void SDRdaemonSourceUDPHandler::processData() void SDRdaemonSourceUDPHandler::connectTimer(const QTimer* timer) { - qDebug() << "SDRdaemonFECUDPHandler::connectTimer"; + qDebug() << "SDRdaemonSourceUDPHandler::connectTimer"; #ifdef USE_INTERNAL_TIMER #warning "Uses internal timer" m_timer = new QTimer();