VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemon: changed generic channel settings to sink channel settings

Browse Source
This commit is contained in:
f4exb
2018-08-23 17:38:25 +02:00
parent 0ace2e9499
commit 5bf657cd9a
14 changed files with 94 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapirequestmapper.cpp
+13 -7
View File
@@ -2146,13 +2146,19 @@ bool WebAPIRequestMapper::validateChannelSettings(
return false;
}
}
else if (*channelType == "SDRDaemonChannel")
else if (*channelType == "SDRDaemonChannelSink")
{
QJsonObject sdrDaemonChannelSettingsJsonObject = jsonObject["SDRDaemonChannelSettings"].toObject();
channelSettingsKeys = sdrDaemonChannelSettingsJsonObject.keys();
channelSettings.setSdrDaemonChannelSettings(new SWGSDRangel::SWGSDRDaemonChannelSettings());
channelSettings.getSdrDaemonChannelSettings()->fromJsonObject(sdrDaemonChannelSettingsJsonObject);
return true;
if (channelSettings.getTx() == 0)
{
QJsonObject sdrDaemonChannelSinkSettingsJsonObject = jsonObject["SDRDaemonChannelSinkSettings"].toObject();
channelSettingsKeys = sdrDaemonChannelSinkSettingsJsonObject.keys();
channelSettings.setSdrDaemonChannelSinkSettings(new SWGSDRangel::SWGSDRDaemonChannelSinkSettings());
channelSettings.getSdrDaemonChannelSinkSettings()->fromJsonObject(sdrDaemonChannelSinkSettingsJsonObject);
return true;
}
else {
return false;
}
}
else if (*channelType == "SSBDemod")
{
@@ -2392,7 +2398,7 @@ void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings&
channelSettings.setDsdDemodSettings(0);
channelSettings.setNfmDemodSettings(0);
channelSettings.setNfmModSettings(0);
channelSettings.setSdrDaemonChannelSettings(0);
channelSettings.setSdrDaemonChannelSinkSettings(0);
channelSettings.setSsbDemodSettings(0);
channelSettings.setSsbModSettings(0);
channelSettings.setUdpSinkSettings(0);