VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 14:04:46 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemon input: refactored plugin with nanomsg handling in core plugin

Browse Source
This commit is contained in:
f4exb
2017-12-26 02:18:30 +01:00
parent 9213b3c0b2
commit 6d70a644dd
8 changed files with 385 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp
+182 -52
View File
@@ -18,6 +18,14 @@
#include <errno.h>
#include <QDebug>
#ifdef _WIN32
#include <nn.h>
#include <pair.h>
#else
#include <nanomsg/nn.h>
#include <nanomsg/pair.h>
#endif
#include "SWGDeviceSettings.h"
#include "SWGDeviceState.h"
@@ -32,9 +40,6 @@
#include "sdrdaemonsourceudphandler.h"
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgConfigureSDRdaemonSource, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgConfigureSDRdaemonUDPLink, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgConfigureSDRdaemonAutoCorr, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgConfigureSDRdaemonWork, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgConfigureSDRdaemonStreamTiming, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgReportSDRdaemonAcquisition, Message)
MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgReportSDRdaemonSourceStreamData, Message)
@@ -44,19 +49,21 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonSourceInput::MsgStartStop, Message)
SDRdaemonSourceInput::SDRdaemonSourceInput(DeviceSourceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_address("127.0.0.1"),
m_port(9090),
m_settings(),
m_SDRdaemonUDPHandler(0),
m_deviceDescription(),
m_startingTimeStamp(0),
m_masterTimer(deviceAPI->getMasterTimer()),
m_autoFollowRate(false),
m_autoCorrBuffer(false)
{
m_sender = nn_socket(AF_SP, NN_PAIR);
assert(m_sender != -1);
int millis = 500;
int rc __attribute__((unused)) = nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
assert (rc == 0);
m_sampleFifo.setSize(96000 * 4);
//m_SDRdaemonUDPHandler = new SDRdaemonSourceUDPHandler(&m_sampleFifo, &m_inputMessageQueue, m_deviceAPI);
m_SDRdaemonUDPHandler = new SDRdaemonSourceUDPHandler(&m_sampleFifo, m_deviceAPI);
m_SDRdaemonUDPHandler->connectTimer(&m_masterTimer);
char recFileNameCStr[30];
sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());
@@ -79,23 +86,20 @@ void SDRdaemonSourceInput::destroy()
void SDRdaemonSourceInput::init()
{
DSPSignalNotification *notif = new DSPSignalNotification(m_settings.m_sampleRate/(1<<m_settings.m_log2Decim), m_settings.m_centerFrequency);
m_deviceAPI->getDeviceEngineInputMessageQueue()->push(notif);
applySettings(m_settings, true);
}
bool SDRdaemonSourceInput::start()
{
qDebug() << "SDRdaemonInput::start";
MsgConfigureSDRdaemonWork *command = MsgConfigureSDRdaemonWork::create(true);
getInputMessageQueue()->push(command);
qDebug() << "SDRdaemonSourceInput::start";
m_SDRdaemonUDPHandler->start();
return true;
}
void SDRdaemonSourceInput::stop()
{
qDebug() << "SDRdaemonInput::stop";
MsgConfigureSDRdaemonWork *command = MsgConfigureSDRdaemonWork::create(false);
getInputMessageQueue()->push(command);
qDebug() << "SDRdaemonSourceInput::stop";
m_SDRdaemonUDPHandler->stop();
}
void SDRdaemonSourceInput::setMessageQueueToGUI(MessageQueue *queue)
@@ -111,12 +115,20 @@ const QString& SDRdaemonSourceInput::getDeviceDescription() const
int SDRdaemonSourceInput::getSampleRate() const
{
return m_settings.m_sampleRate;
if (m_SDRdaemonUDPHandler->getSampleRate()) {
return m_SDRdaemonUDPHandler->getSampleRate();
} else {
return m_settings.m_sampleRate / (1<<m_settings.m_log2Decim);
}
}
quint64 SDRdaemonSourceInput::getCenterFrequency() const
{
return m_settings.m_centerFrequency;
if (m_SDRdaemonUDPHandler->getCenterFrequency()) {
return m_SDRdaemonUDPHandler->getCenterFrequency();
} else {
return m_settings.m_centerFrequency;
}
}
std::time_t SDRdaemonSourceInput::getStartingTimeStamp() const
@@ -124,14 +136,11 @@ std::time_t SDRdaemonSourceInput::getStartingTimeStamp() const
return m_startingTimeStamp;
}
void SDRdaemonSourceInput::getRemoteAddress(QString &s)
bool SDRdaemonSourceInput::isStreaming() const
{
if (m_SDRdaemonUDPHandler) {
m_SDRdaemonUDPHandler->getRemoteAddress(s);
}
return m_SDRdaemonUDPHandler->isStreaming();
}
bool SDRdaemonSourceInput::handleMessage(const Message& message)
{
if (DSPSignalNotification::match(message))
@@ -176,37 +185,10 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message)
else if (MsgConfigureSDRdaemonSource::match(message))
{
qDebug() << "SDRdaemonSourceInput::handleMessage:" << message.getIdentifier();
//SDRdaemonSourceInput& conf = (MsgConfigureSDRdaemonFEC&) message;
//applySettings(conf.getSettings(), conf.getForce());
MsgConfigureSDRdaemonSource& conf = (MsgConfigureSDRdaemonSource&) message;
applySettings(conf.getSettings(), conf.getForce());
return true;
}
else if (MsgConfigureSDRdaemonUDPLink::match(message))
{
MsgConfigureSDRdaemonUDPLink& conf = (MsgConfigureSDRdaemonUDPLink&) message;
m_SDRdaemonUDPHandler->configureUDPLink(conf.getAddress(), conf.getPort());
return true;
}
else if (MsgConfigureSDRdaemonAutoCorr::match(message))
{
MsgConfigureSDRdaemonAutoCorr& conf = (MsgConfigureSDRdaemonAutoCorr&) message;
bool dcBlock = conf.getDCBlock();
bool iqImbalance = conf.getIQImbalance();
m_deviceAPI->configureCorrections(dcBlock, iqImbalance);
return true;
}
else if (MsgConfigureSDRdaemonWork::match(message))
{
MsgConfigureSDRdaemonWork& conf = (MsgConfigureSDRdaemonWork&) message;
bool working = conf.isWorking();
if (working) {
m_SDRdaemonUDPHandler->start();
} else {
m_SDRdaemonUDPHandler->stop();
}
return true;
}
else if (MsgConfigureSDRdaemonStreamTiming::match(message))
{
return true;
@@ -237,6 +219,154 @@ bool SDRdaemonSourceInput::handleMessage(const Message& message)
}
}
void SDRdaemonSourceInput::applySettings(const SDRdaemonSourceSettings& settings, bool force)
{
QMutexLocker mutexLocker(&m_mutex);
bool changeTxDelay = false;
std::ostringstream os;
int nbArgs = 0;
QString remoteAddress;
m_SDRdaemonUDPHandler->getRemoteAddress(remoteAddress);
if ((m_settings.m_dcBlock != settings.m_dcBlock) || (m_settings.m_iqCorrection != settings.m_iqCorrection) || force)
{
m_deviceAPI->configureCorrections(settings.m_dcBlock, settings.m_iqCorrection);
qDebug("SDRdaemonSourceInput::applySettings: corrections: DC block: %s IQ imbalance: %s",
m_settings.m_dcBlock ? "true" : "false",
m_settings.m_iqCorrection ? "true" : "false");
}
if (force || (m_settings.m_address != settings.m_address) || (m_settings.m_dataPort != settings.m_dataPort))
{
m_SDRdaemonUDPHandler->configureUDPLink(settings.m_address, settings.m_dataPort);
m_SDRdaemonUDPHandler->getRemoteAddress(remoteAddress);
}
if (force || (remoteAddress != m_remoteAddress) || (m_settings.m_controlPort != settings.m_controlPort))
{
int rc = nn_shutdown(m_sender, 0);
if (rc < 0) {
qDebug() << "SDRdaemonSourceInput::applySettings: nn disconnection failed";
} else {
qDebug() << "SDRdaemonSourceInput::applySettings: nn disconnection successful";
}
std::ostringstream os;
os << "tcp://" << remoteAddress.toStdString() << ":" << m_settings.m_controlPort;
std::string addrstrng = os.str();
rc = nn_connect(m_sender, addrstrng.c_str());
if (rc < 0) {
qDebug() << "SDRdaemonSourceInput::applySettings: nn connexion to " << addrstrng.c_str() << " failed";
} else {
qDebug() << "SDRdaemonSourceInput::applySettings: nn connexion to " << addrstrng.c_str() << " successful";
}
}
if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency))
{
os << "freq=" << settings.m_centerFrequency;
nbArgs++;
}
if (force || (m_settings.m_sampleRate != settings.m_sampleRate) || (m_settings.m_log2Decim != settings.m_log2Decim))
{
if (nbArgs > 0) os << ",";
os << "srate=" << m_settings.m_sampleRate;
nbArgs++;
changeTxDelay = m_settings.m_sampleRate != settings.m_sampleRate;
}
if (force || (m_settings.m_log2Decim != settings.m_log2Decim))
{
if (nbArgs > 0) os << ",";
os << "decim=" << m_settings.m_log2Decim;
nbArgs++;
}
if ((m_settings.m_fcPos != settings.m_fcPos) || force)
{
if (nbArgs > 0) os << ",";
os << "fcpos=" << m_settings.m_fcPos;
nbArgs++;
}
if (force || (m_settings.m_nbFECBlocks != settings.m_nbFECBlocks))
{
if (nbArgs > 0) os << ",";
os << "fecblk=" << m_settings.m_nbFECBlocks;
nbArgs++;
changeTxDelay = true;
}
if (force || (m_settings.m_txDelay != settings.m_txDelay))
{
changeTxDelay = true;
}
if (changeTxDelay)
{
double delay = ((127*127*settings.m_txDelay) / settings.m_sampleRate)/(128 + settings.m_nbFECBlocks);
qDebug("SDRdaemonSourceInput::applySettings: Tx delay: %f us", delay*1e6);
if (delay != 0.0)
{
if (nbArgs > 0) os << ",";
os << "txdelay=" << (int) (delay*1e6);
nbArgs++;
}
}
if ((m_settings.m_specificParameters != settings.m_specificParameters) || force)
{
if (settings.m_specificParameters.size() > 0)
{
if (nbArgs > 0) os << ",";
os << settings.m_specificParameters.toStdString();
nbArgs++;
}
}
if (nbArgs > 0)
{
int config_size = os.str().size();
int rc = nn_send(m_sender, (void *) os.str().c_str(), config_size, 0);
if (rc != config_size)
{
qDebug() << "SDRdaemonSourceInput::applySettings: Cannot nn send to "
<< " remoteAddress: " << remoteAddress
<< " remotePort: " << settings.m_controlPort
<< " message: " << os.str().c_str();
}
else
{
qDebug() << "SDRdaemonSourceInput::applySettings: nn send to "
<< "remoteAddress:" << remoteAddress
<< "remotePort:" << settings.m_controlPort
<< "message:" << os.str().c_str();
}
}
mutexLocker.unlock();
m_settings = settings;
m_remoteAddress = remoteAddress;
qDebug() << "SDRdaemonSourceInput::applySettings: "
<< " m_address: " << m_settings.m_address
<< " m_remoteAddress: " << m_remoteAddress
<< " m_dataPort: " << m_settings.m_dataPort
<< " m_controlPort: " << m_settings.m_controlPort
<< " m_centerFrequency: " << m_settings.m_centerFrequency
<< " m_sampleRate: " << m_settings.m_sampleRate
<< " m_log2Decim: " << m_settings.m_log2Decim
<< " m_fcPos: " << m_settings.m_fcPos
<< " m_txDelay: " << m_settings.m_txDelay
<< " m_nbFECBlocks: " << m_settings.m_nbFECBlocks
<< " m_specificParameters: " << m_settings.m_specificParameters;
}
int SDRdaemonSourceInput::webapiRunGet(
SWGSDRangel::SWGDeviceState& response,
QString& errorMessage __attribute__((unused)))