diff --git a/plugins/samplesink/sdrdaemonsink/CMakeLists.txt b/plugins/samplesink/sdrdaemonsink/CMakeLists.txt
index d9dfb00ab..28c8fc386 100644
--- a/plugins/samplesink/sdrdaemonsink/CMakeLists.txt
+++ b/plugins/samplesink/sdrdaemonsink/CMakeLists.txt
@@ -45,6 +45,7 @@ target_link_libraries(outputsdrdaemonsink
${QT_LIBRARIES}
sdrbase
${CM256CC_LIBRARIES}
+ ${LIBNANOMSG_LIBRARIES}
)
qt5_use_modules(outputsdrdaemonsink Core Widgets)
diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
index 55cafb98e..ce381e947 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
@@ -170,12 +170,12 @@ void SDRdaemonSinkGui::handleDSPMessages()
while ((message = m_deviceAPI->getDeviceOutputMessageQueue()->pop()) != 0)
{
- qDebug("FileSinkGui::handleDSPMessages: message: %s", message->getIdentifier());
+ qDebug("SDRdaemonSinkGui::handleDSPMessages: message: %s", message->getIdentifier());
if (DSPSignalNotification::match(*message))
{
DSPSignalNotification* notif = (DSPSignalNotification*) message;
- qDebug("FileSinkGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency());
+ qDebug("SDRdaemonSinkGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency());
m_sampleRate = notif->getSampleRate();
m_deviceCenterFrequency = notif->getCenterFrequency();
updateSampleRateAndFrequency();
@@ -296,13 +296,18 @@ void SDRdaemonSinkGui::sendControl(bool force)
if (rc != config_size)
{
- QMessageBox::information(this, tr("Message"), tr("Cannot send message to remote control port"));
+ //QMessageBox::information(this, tr("Message"), tr("Cannot send message to remote control port"));
+ qDebug() << "SDRdaemonSinkGui::sendControl: Cannot send message to remote control port."
+ << " remoteAddress: " << m_settings.m_address
+ << " remotePort: " << m_settings.m_controlPort
+ << " message: " << os.str().c_str();
}
else
{
qDebug() << "SDRdaemonSinkGui::sendControl:"
- << " remoteAddress: " << m_settings.m_address
- << " message: " << os.str().c_str();
+ << "remoteAddress:" << m_settings.m_address
+ << "remotePort:" << m_settings.m_controlPort
+ << "message:" << os.str().c_str();
}
}
@@ -323,7 +328,7 @@ void SDRdaemonSinkGui::sendSettings()
void SDRdaemonSinkGui::updateHardware()
{
- qDebug() << "FileSinkGui::updateHardware";
+ qDebug() << "SDRdaemonSinkGui::updateHardware";
SDRdaemonSinkOutput::MsgConfigureSDRdaemonSink* message = SDRdaemonSinkOutput::MsgConfigureSDRdaemonSink::create(m_settings);
m_deviceSampleSink->getInputMessageQueue()->push(message);
m_updateTimer.stop();
@@ -401,14 +406,14 @@ void SDRdaemonSinkGui::on_nbFECBlocks_valueChanged(int value)
sendSettings();
}
-void SDRdaemonSinkGui::on_address_textEdited(const QString& arg1)
+void SDRdaemonSinkGui::on_address_returnPressed()
{
m_settings.m_address = ui->address->text();
sendControl();
sendSettings();
}
-void SDRdaemonSinkGui::on_dataPort_textEdited(const QString& arg1)
+void SDRdaemonSinkGui::on_dataPort_returnPressed()
{
bool dataOk;
int udpDataPort = ui->dataPort->text().toInt(&dataOk);
@@ -425,10 +430,10 @@ void SDRdaemonSinkGui::on_dataPort_textEdited(const QString& arg1)
sendSettings();
}
-void SDRdaemonSinkGui::on_controlPort_textEdited(const QString& arg1)
+void SDRdaemonSinkGui::on_controlPort_returnPressed()
{
bool ctlOk;
- int udpCtlPort = ui->dataPort->text().toInt(&ctlOk);
+ int udpCtlPort = ui->controlPort->text().toInt(&ctlOk);
if((!ctlOk) || (udpCtlPort < 1024) || (udpCtlPort > 65535))
{
@@ -442,7 +447,7 @@ void SDRdaemonSinkGui::on_controlPort_textEdited(const QString& arg1)
sendControl();
}
-void SDRdaemonSinkGui::on_specificParms_textEdited(const QString& arg1)
+void SDRdaemonSinkGui::on_specificParms_returnPressed()
{
m_settings.m_specificParameters = ui->specificParms->text();
sendControl();
@@ -464,7 +469,7 @@ void SDRdaemonSinkGui::on_startStop_toggled(bool checked)
{
if (!m_deviceAPI->startGeneration())
{
- qDebug("FileSinkGui::on_startStop_toggled: device start failed");
+ qDebug("SDRdaemonSinkGui::on_startStop_toggled: device start failed");
}
DSPEngine::instance()->startAudioInput();
diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
index a5c9d1125..b60f38d1f 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.h
@@ -83,10 +83,10 @@ private slots:
void on_interp_currentIndexChanged(int index);
void on_txDelay_valueChanged(int value);
void on_nbFECBlocks_valueChanged(int value);
- void on_address_textEdited(const QString& arg1);
- void on_dataPort_textEdited(const QString& arg1);
- void on_controlPort_textEdited(const QString& arg1);
- void on_specificParms_textEdited(const QString& arg1);
+ void on_address_returnPressed();
+ void on_dataPort_returnPressed();
+ void on_controlPort_returnPressed();
+ void on_specificParms_returnPressed();
void on_applyButton_clicked(bool checked);
void on_sendButton_clicked(bool checked);
void on_startStop_toggled(bool checked);
diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
index 8452cb3f4..35b2705b0 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.ui
@@ -435,9 +435,12 @@
<property name="toolTip">
<string>Remote data connection IP address</string>
</property>
- <property name="text">
+ <property name="inputMask">
<string>000.000.000.000</string>
</property>
+ <property name="text">
+ <string>0...</string>
+ </property>
</widget>
</item>
<item>
@@ -452,8 +455,11 @@
<property name="toolTip">
<string>Remote data connection port</string>
</property>
+ <property name="inputMask">
+ <string>00000</string>
+ </property>
<property name="text">
- <string>0000</string>
+ <string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -472,9 +478,12 @@
<property name="toolTip">
<string>Remote control port</string>
</property>
- <property name="text">
+ <property name="inputMask">
<string>00000</string>
</property>
+ <property name="text">
+ <string>0</string>
+ </property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp
index 201cec404..f98f4708f 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp
@@ -109,7 +109,7 @@ bool SDRdaemonSinkOutput::handleMessage(const Message& message)
{
if (MsgConfigureSDRdaemonSink::match(message))
{
- qDebug() << "FileSinkOutput::handleMessage: MsgConfigureFileSink";
+ qDebug() << "SDRdaemonSinkOutput::handleMessage: MsgConfigureFileSink";
MsgConfigureSDRdaemonSink& conf = (MsgConfigureSDRdaemonSink&) message;
applySettings(conf.getSettings(), false);
return true;
@@ -219,7 +219,7 @@ void SDRdaemonSinkOutput::applySettings(const SDRdaemonSinkSettings& settings, b
mutexLocker.unlock();
- qDebug("FileSinkOutput::applySettings: %s m_centerFrequency: %llu m_sampleRate: %llu m_log2Interp: %d m_txDelay: %d m_nbFECBlocks: %d",
+ qDebug("SDRdaemonSinkOutput::applySettings: %s m_centerFrequency: %llu m_sampleRate: %llu m_log2Interp: %d m_txDelay: %d m_nbFECBlocks: %d",
forwardChange ? "forward change" : "",
m_settings.m_centerFrequency,
m_settings.m_sampleRate,
diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp
index d9ca43df1..b0c9ed25a 100644
--- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp
+++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp
@@ -31,7 +31,7 @@ void SDRdaemonSinkSettings::resetToDefaults()
m_nbFECBlocks = 0;
m_address = "127.0.0.1";
m_dataPort = 9090;
- m_controlPort = 9090;
+ m_controlPort = 9091;
m_specificParameters = "";
}