VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-14 15:33:34 -04:00
Code Issues Projects Releases Wiki Activity

Changed SDRDaemonChannelXxx to DaemonXxx

Browse Source
This commit is contained in:
f4exb
2018-09-04 20:35:54 +02:00
parent 7146225222
commit b2dc7a6cdc
28 changed files with 1308 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/daemonsrc/daemonsrc.cpp
+35 -35
View File
@@ -23,7 +23,7 @@
#include "SWGChannelSettings.h"
#include "SWGChannelReport.h"
#include "SWGSDRDaemonChannelSourceReport.h"
#include "SWGDaemonSourceReport.h"
#include "dsp/devicesamplesink.h"
#include "device/devicesinkapi.h"
@@ -219,7 +219,7 @@ void DaemonSrc::handleDataBlock(SDRDaemonDataBlock* dataBlock __attribute__((unu
{
if (dataBlock->m_rxControlBlock.m_blockCount < SDRDaemonNbOrginalBlocks)
{
qWarning("SDRDaemonChannelSource::handleDataBlock: incomplete data block: not processing");
qWarning("DaemonSrc::handleDataBlock: incomplete data block: not processing");
}
else
{
@@ -241,12 +241,12 @@ void DaemonSrc::handleDataBlock(SDRDaemonDataBlock* dataBlock __attribute__((unu
}
}
//qDebug("SDRDaemonChannelSource::handleDataBlock: frame: %u blocks: %d", dataBlock.m_rxControlBlock.m_frameIndex, blockCount);
//qDebug("DaemonSrc::handleDataBlock: frame: %u blocks: %d", dataBlock.m_rxControlBlock.m_frameIndex, blockCount);
// Need to use the CM256 recovery
if (m_cm256p &&(dataBlock->m_rxControlBlock.m_originalCount < SDRDaemonNbOrginalBlocks))
{
qDebug("SDRDaemonChannelSource::handleDataBlock: %d recovery blocks", dataBlock->m_rxControlBlock.m_recoveryCount);
qDebug("DaemonSrc::handleDataBlock: %d recovery blocks", dataBlock->m_rxControlBlock.m_recoveryCount);
CM256::cm256_encoder_params paramsCM256;
paramsCM256.BlockBytes = sizeof(SDRDaemonProtectedBlock); // never changes
paramsCM256.OriginalCount = SDRDaemonNbOrginalBlocks; // never changes
@@ -266,7 +266,7 @@ void DaemonSrc::handleDataBlock(SDRDaemonDataBlock* dataBlock __attribute__((unu
if (m_cm256.cm256_decode(paramsCM256, m_cm256DescriptorBlocks)) // CM256 decode
{
qWarning() << "SDRDaemonChannelSource::handleDataBlock: decode CM256 error:"
qWarning() << "DaemonSrc::handleDataBlock: decode CM256 error:"
<< " m_originalCount: " << dataBlock->m_rxControlBlock.m_originalCount
<< " m_recoveryCount: " << dataBlock->m_rxControlBlock.m_recoveryCount;
}
@@ -297,7 +297,7 @@ void DaemonSrc::handleDataBlock(SDRDaemonDataBlock* dataBlock __attribute__((unu
{
if (!(m_currentMeta == *metaData))
{
printMeta("SDRDaemonChannelSource::handleDataBlock", metaData);
printMeta("DaemonSrc::handleDataBlock", metaData);
if (m_currentMeta.m_centerFrequency != metaData->m_centerFrequency) {
m_deviceAPI->getSampleSink()->setCenterFrequency(metaData->m_centerFrequency*1000); // frequency is in kHz
@@ -314,7 +314,7 @@ void DaemonSrc::handleDataBlock(SDRDaemonDataBlock* dataBlock __attribute__((unu
}
else
{
qWarning() << "SDRDaemonChannelSource::handleDataBlock: recovered meta: invalid CRC32";
qWarning() << "DaemonSrc::handleDataBlock: recovered meta: invalid CRC32";
}
}
@@ -350,7 +350,7 @@ uint32_t DaemonSrc::calculateDataReadQueueSize(int sampleRate)
// scale for 20 blocks at 48 kS/s. Take next even number.
uint32_t maxSize = sampleRate / 2400;
maxSize = (maxSize % 2 == 0) ? maxSize : maxSize + 1;
qDebug("SDRDaemonChannelSource::calculateDataReadQueueSize: set max queue size to %u blocks", maxSize);
qDebug("DaemonSrc::calculateDataReadQueueSize: set max queue size to %u blocks", maxSize);
return maxSize;
}
@@ -358,8 +358,8 @@ int DaemonSrc::webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage __attribute__((unused)))
{
response.setSdrDaemonChannelSourceSettings(new SWGSDRangel::SWGSDRDaemonChannelSourceSettings());
response.getSdrDaemonChannelSourceSettings()->init();
response.setDaemonSourceSettings(new SWGSDRangel::SWGDaemonSourceSettings());
response.getDaemonSourceSettings()->init();
webapiFormatChannelSettings(response, m_settings);
return 200;
}
@@ -373,11 +373,11 @@ int DaemonSrc::webapiSettingsPutPatch(
DaemonSrcSettings settings = m_settings;
if (channelSettingsKeys.contains("dataAddress")) {
settings.m_dataAddress = *response.getSdrDaemonChannelSourceSettings()->getDataAddress();
settings.m_dataAddress = *response.getDaemonSourceSettings()->getDataAddress();
}
if (channelSettingsKeys.contains("dataPort"))
{
int dataPort = response.getSdrDaemonChannelSourceSettings()->getDataPort();
int dataPort = response.getDaemonSourceSettings()->getDataPort();
if ((dataPort < 1024) || (dataPort > 65535)) {
settings.m_dataPort = 9090;
@@ -386,10 +386,10 @@ int DaemonSrc::webapiSettingsPutPatch(
}
}
if (channelSettingsKeys.contains("rgbColor")) {
settings.m_rgbColor = response.getSdrDaemonChannelSourceSettings()->getRgbColor();
settings.m_rgbColor = response.getDaemonSourceSettings()->getRgbColor();
}
if (channelSettingsKeys.contains("title")) {
settings.m_title = *response.getSdrDaemonChannelSourceSettings()->getTitle();
settings.m_title = *response.getDaemonSourceSettings()->getTitle();
}
MsgConfigureDaemonSrc *msg = MsgConfigureDaemonSrc::create(settings, force);
@@ -411,27 +411,27 @@ int DaemonSrc::webapiReportGet(
SWGSDRangel::SWGChannelReport& response,
QString& errorMessage __attribute__((unused)))
{
response.setSdrDaemonChannelSourceReport(new SWGSDRangel::SWGSDRDaemonChannelSourceReport());
response.getSdrDaemonChannelSourceReport()->init();
response.setDaemonSourceReport(new SWGSDRangel::SWGDaemonSourceReport());
response.getDaemonSourceReport()->init();
webapiFormatChannelReport(response);
return 200;
}
void DaemonSrc::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const DaemonSrcSettings& settings)
{
if (response.getSdrDaemonChannelSourceSettings()->getDataAddress()) {
*response.getSdrDaemonChannelSourceSettings()->getDataAddress() = settings.m_dataAddress;
if (response.getDaemonSourceSettings()->getDataAddress()) {
*response.getDaemonSourceSettings()->getDataAddress() = settings.m_dataAddress;
} else {
response.getSdrDaemonChannelSourceSettings()->setDataAddress(new QString(settings.m_dataAddress));
response.getDaemonSourceSettings()->setDataAddress(new QString(settings.m_dataAddress));
}
response.getSdrDaemonChannelSourceSettings()->setDataPort(settings.m_dataPort);
response.getSdrDaemonChannelSourceSettings()->setRgbColor(settings.m_rgbColor);
response.getDaemonSourceSettings()->setDataPort(settings.m_dataPort);
response.getDaemonSourceSettings()->setRgbColor(settings.m_rgbColor);
if (response.getSdrDaemonChannelSourceSettings()->getTitle()) {
*response.getSdrDaemonChannelSourceSettings()->getTitle() = settings.m_title;
if (response.getDaemonSourceSettings()->getTitle()) {
*response.getDaemonSourceSettings()->getTitle() = settings.m_title;
} else {
response.getSdrDaemonChannelSourceSettings()->setTitle(new QString(settings.m_title));
response.getDaemonSourceSettings()->setTitle(new QString(settings.m_title));
}
}
@@ -440,16 +440,16 @@ void DaemonSrc::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& respons
struct timeval tv;
gettimeofday(&tv, 0);
response.getSdrDaemonChannelSourceReport()->setTvSec(tv.tv_sec);
response.getSdrDaemonChannelSourceReport()->setTvUSec(tv.tv_usec);
response.getSdrDaemonChannelSourceReport()->setQueueSize(m_dataReadQueue.size());
response.getSdrDaemonChannelSourceReport()->setQueueLength(m_dataReadQueue.length());
response.getSdrDaemonChannelSourceReport()->setSamplesCount(m_dataReadQueue.readSampleCount());
response.getSdrDaemonChannelSourceReport()->setCorrectableErrorsCount(m_nbCorrectableErrors);
response.getSdrDaemonChannelSourceReport()->setUncorrectableErrorsCount(m_nbUncorrectableErrors);
response.getSdrDaemonChannelSourceReport()->setNbOriginalBlocks(m_currentMeta.m_nbOriginalBlocks);
response.getSdrDaemonChannelSourceReport()->setNbFecBlocks(m_currentMeta.m_nbFECBlocks);
response.getSdrDaemonChannelSourceReport()->setCenterFreq(m_currentMeta.m_centerFrequency);
response.getSdrDaemonChannelSourceReport()->setSampleRate(m_currentMeta.m_sampleRate);
response.getDaemonSourceReport()->setTvSec(tv.tv_sec);
response.getDaemonSourceReport()->setTvUSec(tv.tv_usec);
response.getDaemonSourceReport()->setQueueSize(m_dataReadQueue.size());
response.getDaemonSourceReport()->setQueueLength(m_dataReadQueue.length());
response.getDaemonSourceReport()->setSamplesCount(m_dataReadQueue.readSampleCount());
response.getDaemonSourceReport()->setCorrectableErrorsCount(m_nbCorrectableErrors);
response.getDaemonSourceReport()->setUncorrectableErrorsCount(m_nbUncorrectableErrors);
response.getDaemonSourceReport()->setNbOriginalBlocks(m_currentMeta.m_nbOriginalBlocks);
response.getDaemonSourceReport()->setNbFecBlocks(m_currentMeta.m_nbFECBlocks);
response.getDaemonSourceReport()->setCenterFreq(m_currentMeta.m_centerFrequency);
response.getDaemonSourceReport()->setSampleRate(m_currentMeta.m_sampleRate);
}
plugins/channeltx/daemonsrc/daemonsrcthread.cpp
+3 -3
View File
@@ -41,7 +41,7 @@ DaemonSrcThread::DaemonSrcThread(SDRDaemonDataQueue *dataQueue, QObject* parent)
DaemonSrcThread::~DaemonSrcThread()
{
qDebug("DaemonSrcThread::~SDRDaemonChannelSourceThread");
qDebug("DaemonSrcThread::~DaemonSrcThread");
}
void DaemonSrcThread::startStop(bool start)
@@ -159,7 +159,7 @@ void DaemonSrcThread::readPendingDatagrams()
if (superBlock.m_header.m_frameIndex != frameIndex)
{
//qDebug("SDRDaemonChannelSourceThread::readPendingDatagrams: push frame %u", frameIndex);
//qDebug("DaemonSrcThread::readPendingDatagrams: push frame %u", frameIndex);
m_dataQueue->push(m_dataBlocks[dataBlockIndex]);
m_dataBlocks[dataBlockIndex] = new SDRDaemonDataBlock();
m_dataBlocks[dataBlockIndex]->m_rxControlBlock.m_frameIndex = superBlock.m_header.m_frameIndex;
@@ -182,7 +182,7 @@ void DaemonSrcThread::readPendingDatagrams()
}
else
{
qWarning("SDRDaemonChannelSourceThread::readPendingDatagrams: wrong super block size not processing");
qWarning("DaemonSrcThread::readPendingDatagrams: wrong super block size not processing");
}
}
}
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
+2 -2
View File
@@ -555,9 +555,9 @@ void SDRdaemonSinkGui::analyzeApiReply(const QJsonObject& jsonObject)
{
QString infoLine;
if (jsonObject.contains("SDRDaemonChannelSourceReport"))
if (jsonObject.contains("DaemonSourceReport"))
{
QJsonObject report = jsonObject["SDRDaemonChannelSourceReport"].toObject();
QJsonObject report = jsonObject["DaemonSourceReport"].toObject();
int queueSize = report["queueSize"].toInt();
queueSize = queueSize == 0 ? 10 : queueSize;
int queueLength = report["queueLength"].toInt();
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp
+2 -2
View File
@@ -508,9 +508,9 @@ void SDRdaemonSinkOutput::analyzeApiReply(const QJsonObject& jsonObject)
return;
}
if (jsonObject.contains("SDRDaemonChannelSourceReport"))
if (jsonObject.contains("DaemonSourceReport"))
{
QJsonObject report = jsonObject["SDRDaemonChannelSourceReport"].toObject();
QJsonObject report = jsonObject["DaemonSourceReport"].toObject();
int queueSize = report["queueSize"].toInt();
queueSize = queueSize == 0 ? 10 : queueSize;
int queueLength = report["queueLength"].toInt();