From 3b09e0e5d7f96c2718d7db7756c0c13cfe8e3718 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 6 Sep 2018 05:32:11 +0200 Subject: [PATCH] DaemonSink: Web API implementation --- plugins/channelrx/daemonsink/daemonsinkgui.cpp | 2 +- sdrbase/webapi/webapirequestmapper.cpp | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/plugins/channelrx/daemonsink/daemonsinkgui.cpp b/plugins/channelrx/daemonsink/daemonsinkgui.cpp index ff886c78c..9819b2efc 100644 --- a/plugins/channelrx/daemonsink/daemonsinkgui.cpp +++ b/plugins/channelrx/daemonsink/daemonsinkgui.cpp @@ -165,7 +165,7 @@ void DaemonSinkGUI::displaySettings() m_channelMarker.blockSignals(true); m_channelMarker.setCenterFrequency(0); m_channelMarker.setTitle(m_settings.m_title); - m_channelMarker.setBandwidth(5000); // TODO + m_channelMarker.setBandwidth(m_sampleRate); // TODO m_channelMarker.blockSignals(false); m_channelMarker.setColor(m_settings.m_rgbColor); // activate signal on the last setting only diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index 0c3c56fa5..d4ed9a3e2 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -2146,6 +2146,20 @@ bool WebAPIRequestMapper::validateChannelSettings( return false; } } + else if (*channelType == "DaemonSink") + { + if (channelSettings.getTx() == 0) + { + QJsonObject daemonChannelSinkSettingsJsonObject = jsonObject["DaemonSinkSettings"].toObject(); + channelSettingsKeys = daemonChannelSinkSettingsJsonObject.keys(); + channelSettings.setDaemonSinkSettings(new SWGSDRangel::SWGDaemonSinkSettings()); + channelSettings.getDaemonSinkSettings()->fromJsonObject(daemonChannelSinkSettingsJsonObject); + return true; + } + else { + return false; + } + } else if (*channelType == "DaemonSrc") { if (channelSettings.getTx() != 0)