1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-20 14:48:35 -04:00

SDRDaemon: replaced specific channel data settings by generic channel data settings

This commit is contained in:
f4exb
2018-08-23 16:06:47 +02:00
parent 7e22fe20f9
commit 0ace2e9499
19 changed files with 921 additions and 652 deletions
+7 -7
View File
@@ -23,7 +23,7 @@
#include "SWGDeviceSettings.h"
#include "SWGDeviceState.h"
#include "SWGDeviceReport.h"
#include "SWGSDRDaemonDataSettings.h"
#include "SWGChannelSettings.h"
#include "SWGErrorResponse.h"
#include "dsp/dsptypes.h"
@@ -39,7 +39,7 @@
QString WebAPIAdapterDaemon::daemonInstanceSummaryURL = "/sdrdaemon";
QString WebAPIAdapterDaemon::daemonInstanceLoggingURL = "/sdrdaemon/logging";
QString WebAPIAdapterDaemon::daemonDataSettingsURL = "/sdrdaemon/data/settings";
QString WebAPIAdapterDaemon::daemonChannelSettingsURL = "/sdrdaemon/channel/settings";
QString WebAPIAdapterDaemon::daemonDeviceSettingsURL = "/sdrdaemon/device/settings";
QString WebAPIAdapterDaemon::daemonDeviceReportURL = "/sdrdaemon/device/report";
QString WebAPIAdapterDaemon::daemonRunURL = "/sdrdaemon/run";
@@ -176,8 +176,8 @@ int WebAPIAdapterDaemon::daemonInstanceLoggingPut(
return 200;
}
int WebAPIAdapterDaemon::daemonDataSettingsGet(
SWGSDRangel::SWGSDRDaemonDataSettings& response __attribute__((unused)),
int WebAPIAdapterDaemon::daemonChannelSettingsGet(
SWGSDRangel::SWGChannelSettings& response __attribute__((unused)),
SWGSDRangel::SWGErrorResponse& error)
{
error.init();
@@ -185,10 +185,10 @@ int WebAPIAdapterDaemon::daemonDataSettingsGet(
return 501;
}
int WebAPIAdapterDaemon::daemonDataSettingsPutPatch(
int WebAPIAdapterDaemon::daemonChannelSettingsPutPatch(
bool force __attribute__((unused)),
const QStringList& dataSettingsKeys __attribute__((unused)),
SWGSDRangel::SWGSDRDaemonDataSettings& response __attribute__((unused)),
const QStringList& channelSettingsKeys __attribute__((unused)),
SWGSDRangel::SWGChannelSettings& response __attribute__((unused)),
SWGSDRangel::SWGErrorResponse& error)
{
error.init();