From 02158392209edae0d022e44fefbbfcd7cac2aff7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 11 Jan 2019 14:45:00 +0100 Subject: [PATCH] REST API: implement reverse API settings (3) --- fcdlib/fcdtraits.cpp | 4 +- .../bladerf1output/bladerf1output.cpp | 23 ++ .../bladerf1output/bladerf1outputplugin.cpp | 2 +- .../bladerf2output/bladerf2output.cpp | 23 ++ .../bladerf2output/bladerf2outputplugin.cpp | 2 +- .../samplesink/hackrfoutput/hackrfoutput.cpp | 23 ++ .../hackrfoutput/hackrfoutputplugin.cpp | 2 +- .../plutosdroutput/plutosdroutput.cpp | 22 ++ .../plutosdroutput/plutosdroutputplugin.cpp | 2 +- .../sdrdaemonsink/sdrdaemonsinkoutput.cpp | 22 ++ .../sdrdaemonsink/sdrdaemonsinkplugin.cpp | 2 +- .../soapysdroutput/soapysdroutput.cpp | 24 +++ .../soapysdroutput/soapysdroutputplugin.cpp | 2 +- plugins/samplesource/fcdpro/fcdproinput.cpp | 23 ++ .../fcdproplus/fcdproplusinput.cpp | 23 ++ .../filesource/filesourceinput.cpp | 22 ++ .../filesource/filesourceplugin.cpp | 2 +- .../samplesource/hackrfinput/hackrfinput.cpp | 23 ++ .../hackrfinput/hackrfinputplugin.cpp | 2 +- plugins/samplesource/perseus/perseusinput.cpp | 23 ++ .../samplesource/perseus/perseusplugin.cpp | 2 +- .../plutosdrinput/plutosdrinput.cpp | 23 ++ .../plutosdrinput/plutosdrinputplugin.cpp | 2 +- .../sdrdaemonsource/sdrdaemonsourceinput.cpp | 23 ++ .../sdrdaemonsource/sdrdaemonsourceplugin.cpp | 2 +- plugins/samplesource/sdrplay/sdrplayinput.cpp | 25 ++- .../samplesource/sdrplay/sdrplayplugin.cpp | 2 +- .../soapysdrinput/soapysdrinput.cpp | 24 +++ .../soapysdrinput/soapysdrinputplugin.cpp | 2 +- sdrbase/resources/webapi/doc/html2/index.html | 197 +++++++++++++++++- .../webapi/doc/swagger/include/BladeRF1.yaml | 9 + .../webapi/doc/swagger/include/BladeRF2.yaml | 9 + .../webapi/doc/swagger/include/FCDPro.yaml | 9 + .../doc/swagger/include/FCDProPlus.yaml | 9 + .../doc/swagger/include/FileSource.yaml | 12 +- .../webapi/doc/swagger/include/HackRF.yaml | 24 ++- .../webapi/doc/swagger/include/Perseus.yaml | 16 +- .../webapi/doc/swagger/include/PlutoSdr.yaml | 44 ++-- .../doc/swagger/include/SDRDaemonSink.yaml | 10 +- .../doc/swagger/include/SDRDaemonSource.yaml | 10 +- .../webapi/doc/swagger/include/SDRPlay.yaml | 21 +- .../webapi/doc/swagger/include/SoapySDR.yaml | 85 +++++--- .../api/swagger/include/BladeRF1.yaml | 9 + .../api/swagger/include/BladeRF2.yaml | 9 + .../sdrangel/api/swagger/include/FCDPro.yaml | 9 + .../api/swagger/include/FCDProPlus.yaml | 9 + .../api/swagger/include/FileSource.yaml | 12 +- .../sdrangel/api/swagger/include/HackRF.yaml | 24 ++- .../sdrangel/api/swagger/include/Perseus.yaml | 16 +- .../api/swagger/include/PlutoSdr.yaml | 44 ++-- .../api/swagger/include/SDRDaemonSink.yaml | 10 +- .../api/swagger/include/SDRDaemonSource.yaml | 10 +- .../sdrangel/api/swagger/include/SDRPlay.yaml | 21 +- .../api/swagger/include/SoapySDR.yaml | 85 +++++--- swagger/sdrangel/code/html2/index.html | 197 +++++++++++++++++- .../qt5/client/SWGBladeRF1OutputSettings.cpp | 86 ++++++++ .../qt5/client/SWGBladeRF1OutputSettings.h | 25 +++ .../qt5/client/SWGBladeRF2OutputSettings.cpp | 86 ++++++++ .../qt5/client/SWGBladeRF2OutputSettings.h | 25 +++ .../code/qt5/client/SWGFCDProPlusSettings.cpp | 86 ++++++++ .../code/qt5/client/SWGFCDProPlusSettings.h | 24 +++ .../code/qt5/client/SWGFCDProSettings.cpp | 86 ++++++++ .../code/qt5/client/SWGFCDProSettings.h | 24 +++ .../code/qt5/client/SWGFileSourceSettings.cpp | 86 ++++++++ .../code/qt5/client/SWGFileSourceSettings.h | 24 +++ .../qt5/client/SWGHackRFInputSettings.cpp | 86 ++++++++ .../code/qt5/client/SWGHackRFInputSettings.h | 24 +++ .../qt5/client/SWGHackRFOutputSettings.cpp | 86 ++++++++ .../code/qt5/client/SWGHackRFOutputSettings.h | 25 +++ .../code/qt5/client/SWGPerseusSettings.cpp | 86 ++++++++ .../code/qt5/client/SWGPerseusSettings.h | 24 +++ .../qt5/client/SWGPlutoSdrInputSettings.cpp | 86 ++++++++ .../qt5/client/SWGPlutoSdrInputSettings.h | 24 +++ .../qt5/client/SWGPlutoSdrOutputSettings.cpp | 86 ++++++++ .../qt5/client/SWGPlutoSdrOutputSettings.h | 25 +++ .../code/qt5/client/SWGSDRPlaySettings.cpp | 86 ++++++++ .../code/qt5/client/SWGSDRPlaySettings.h | 24 +++ .../qt5/client/SWGSDRdaemonSinkSettings.cpp | 86 ++++++++ .../qt5/client/SWGSDRdaemonSinkSettings.h | 24 +++ .../qt5/client/SWGSDRdaemonSourceSettings.cpp | 86 ++++++++ .../qt5/client/SWGSDRdaemonSourceSettings.h | 24 +++ .../qt5/client/SWGSoapySDRInputSettings.cpp | 86 ++++++++ .../qt5/client/SWGSoapySDRInputSettings.h | 24 +++ .../qt5/client/SWGSoapySDROutputSettings.cpp | 86 ++++++++ .../qt5/client/SWGSoapySDROutputSettings.h | 24 +++ 85 files changed, 2794 insertions(+), 146 deletions(-) diff --git a/fcdlib/fcdtraits.cpp b/fcdlib/fcdtraits.cpp index 883137f12..dba874b23 100644 --- a/fcdlib/fcdtraits.cpp +++ b/fcdlib/fcdtraits.cpp @@ -34,8 +34,8 @@ const char *fcd_traits::displayedName = "FunCube Dongle Pro+"; const char *fcd_traits::pluginDisplayedName = "FunCube Pro Input"; const char *fcd_traits::pluginDisplayedName = "FunCube Pro+ Input"; -const char *fcd_traits::pluginVersion = "4.4.0"; -const char *fcd_traits::pluginVersion = "4.4.0"; +const char *fcd_traits::pluginVersion = "4.4.1"; +const char *fcd_traits::pluginVersion = "4.4.1"; const int64_t fcd_traits::loLowLimitFreq = 64000000L; const int64_t fcd_traits::loLowLimitFreq = 150000L; diff --git a/plugins/samplesink/bladerf1output/bladerf1output.cpp b/plugins/samplesink/bladerf1output/bladerf1output.cpp index 0c4eb5693..377237fbc 100644 --- a/plugins/samplesink/bladerf1output/bladerf1output.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1output.cpp @@ -566,6 +566,17 @@ void Bladerf1Output::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response.getBladeRf1OutputSettings()->setXb200(settings.m_xb200 ? 1 : 0); response.getBladeRf1OutputSettings()->setXb200Path((int) settings.m_xb200Path); response.getBladeRf1OutputSettings()->setXb200Filter((int) settings.m_xb200Filter); + + response.getBladeRf1OutputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getBladeRf1OutputSettings()->getReverseApiAddress()) { + *response.getBladeRf1OutputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getBladeRf1OutputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getBladeRf1OutputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getBladeRf1OutputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } int Bladerf1Output::webapiSettingsPutPatch( @@ -604,6 +615,18 @@ int Bladerf1Output::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("xb200Filter")) { settings.m_xb200Filter = static_cast(response.getBladeRf1OutputSettings()->getXb200Filter()); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getBladeRf1OutputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getBladeRf1OutputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getBladeRf1OutputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getBladeRf1OutputSettings()->getReverseApiDeviceIndex(); + } MsgConfigureBladerf1 *msg = MsgConfigureBladerf1::create(settings, force); m_inputMessageQueue.push(msg); diff --git a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp index b21619603..ac4868f2e 100644 --- a/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp +++ b/plugins/samplesink/bladerf1output/bladerf1outputplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor Bladerf1OutputPlugin::m_pluginDescriptor = { QString("BladeRF1 Output"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/bladerf2output/bladerf2output.cpp b/plugins/samplesink/bladerf2output/bladerf2output.cpp index abc8cdcb0..c437228eb 100644 --- a/plugins/samplesink/bladerf2output/bladerf2output.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2output.cpp @@ -993,6 +993,18 @@ int BladeRF2Output::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("transverterMode")) { settings.m_transverterMode = response.getBladeRf2OutputSettings()->getTransverterMode() != 0; } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getBladeRf2OutputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getBladeRf2OutputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getBladeRf2OutputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getBladeRf2OutputSettings()->getReverseApiDeviceIndex(); + } MsgConfigureBladeRF2 *msg = MsgConfigureBladeRF2::create(settings, force); m_inputMessageQueue.push(msg); @@ -1027,6 +1039,17 @@ void BladeRF2Output::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response.getBladeRf2OutputSettings()->setGlobalGain(settings.m_globalGain); response.getBladeRf2OutputSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency); response.getBladeRf2OutputSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0); + + response.getBladeRf2OutputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getBladeRf2OutputSettings()->getReverseApiAddress()) { + *response.getBladeRf2OutputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getBladeRf2OutputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getBladeRf2OutputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getBladeRf2OutputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void BladeRF2Output::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp index 8307b331f..3ec3cdf64 100644 --- a/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp +++ b/plugins/samplesink/bladerf2output/bladerf2outputplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor BladeRF2OutputPlugin::m_pluginDescriptor = { QString("BladeRF2 Output"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp index 238f57213..e25828b36 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutput.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutput.cpp @@ -543,6 +543,18 @@ int HackRFOutput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("lnaExt")) { settings.m_lnaExt = response.getHackRfOutputSettings()->getLnaExt() != 0; } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getHackRfOutputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getHackRfOutputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getHackRfOutputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getHackRfOutputSettings()->getReverseApiDeviceIndex(); + } MsgConfigureHackRF *msg = MsgConfigureHackRF::create(settings, force); m_inputMessageQueue.push(msg); @@ -567,6 +579,17 @@ void HackRFOutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& re response.getHackRfOutputSettings()->setDevSampleRate(settings.m_devSampleRate); response.getHackRfOutputSettings()->setBiasT(settings.m_biasT ? 1 : 0); response.getHackRfOutputSettings()->setLnaExt(settings.m_lnaExt ? 1 : 0); + + response.getHackRfOutputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getHackRfOutputSettings()->getReverseApiAddress()) { + *response.getHackRfOutputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getHackRfOutputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getHackRfOutputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getHackRfOutputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } int HackRFOutput::webapiRunGet( diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index 6314d7cb5..4ec36edc8 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor HackRFOutputPlugin::m_pluginDescriptor = { QString("HackRF Output"), - QString("3.14.5"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp index 44c66faf6..f1d2025ab 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutput.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutput.cpp @@ -701,6 +701,18 @@ int PlutoSDROutput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("transverterMode")) { settings.m_transverterMode = response.getPlutoSdrOutputSettings()->getTransverterMode() != 0; } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getPlutoSdrOutputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getPlutoSdrOutputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getPlutoSdrOutputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getPlutoSdrOutputSettings()->getReverseApiDeviceIndex(); + } MsgConfigurePlutoSDR *msg = MsgConfigurePlutoSDR::create(settings, force); m_inputMessageQueue.push(msg); @@ -741,6 +753,16 @@ void PlutoSDROutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response.getPlutoSdrOutputSettings()->setAntennaPath((int) settings.m_antennaPath); response.getPlutoSdrOutputSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency); response.getPlutoSdrOutputSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0); + response.getPlutoSdrOutputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getPlutoSdrOutputSettings()->getReverseApiAddress()) { + *response.getPlutoSdrOutputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getPlutoSdrOutputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getPlutoSdrOutputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getPlutoSdrOutputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void PlutoSDROutput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp index 182ffd063..8cbb89ef3 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputplugin.cpp @@ -30,7 +30,7 @@ class DeviceSourceAPI; const PluginDescriptor PlutoSDROutputPlugin::m_pluginDescriptor = { QString("PlutoSDR Output"), - QString("4.4.0"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp index 7ff09249d..eeb0600e3 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp @@ -411,6 +411,18 @@ int SDRdaemonSinkOutput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("channelIndex")) { settings.m_channelIndex = response.getSdrDaemonSinkSettings()->getChannelIndex(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getSdrDaemonSinkSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getSdrDaemonSinkSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getSdrDaemonSinkSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getSdrDaemonSinkSettings()->getReverseApiDeviceIndex(); + } MsgConfigureSDRdaemonSink *msg = MsgConfigureSDRdaemonSink::create(settings, force); m_inputMessageQueue.push(msg); @@ -448,6 +460,16 @@ void SDRdaemonSinkOutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSetti response.getSdrDaemonSinkSettings()->setDataPort(settings.m_dataPort); response.getSdrDaemonSinkSettings()->setDeviceIndex(settings.m_deviceIndex); response.getSdrDaemonSinkSettings()->setChannelIndex(settings.m_channelIndex); + response.getSdrDaemonSinkSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getSdrDaemonSinkSettings()->getReverseApiAddress()) { + *response.getSdrDaemonSinkSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getSdrDaemonSinkSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getSdrDaemonSinkSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getSdrDaemonSinkSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void SDRdaemonSinkOutput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp index 05e294324..a80c47ea8 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkplugin.cpp @@ -29,7 +29,7 @@ const PluginDescriptor SDRdaemonSinkPlugin::m_pluginDescriptor = { QString("SDRdaemon sink output"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp index 675d70176..a40dcc6cd 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutput.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutput.cpp @@ -1450,6 +1450,19 @@ int SoapySDROutput::webapiSettingsPutPatch( } } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getSoapySdrOutputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getSoapySdrOutputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getSoapySdrOutputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getSoapySdrOutputSettings()->getReverseApiDeviceIndex(); + } + MsgConfigureSoapySDROutput *msg = MsgConfigureSoapySDROutput::create(settings, force); m_inputMessageQueue.push(msg); @@ -1593,6 +1606,17 @@ void SoapySDROutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& const QVariant& v = settings.m_deviceArgSettings.value(itName); webapiFormatArgValue(v, response.getSoapySdrOutputSettings()->getDeviceArgSettings()->back()); } + + response.getSoapySdrOutputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getSoapySdrOutputSettings()->getReverseApiAddress()) { + *response.getSoapySdrOutputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getSoapySdrOutputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getSoapySdrOutputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getSoapySdrOutputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void SoapySDROutput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp index 3cdd98365..3b950343d 100644 --- a/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp +++ b/plugins/samplesink/soapysdroutput/soapysdroutputplugin.cpp @@ -31,7 +31,7 @@ const PluginDescriptor SoapySDROutputPlugin::m_pluginDescriptor = { QString("SoapySDR Output"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index e9f93ba56..d346ad674 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -946,6 +946,18 @@ int FCDProInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("fileRecordName")) { settings.m_fileRecordName = *response.getFcdProSettings()->getFileRecordName(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getFcdProSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getFcdProSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getFcdProSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getFcdProSettings()->getReverseApiDeviceIndex(); + } MsgConfigureFCDPro *msg = MsgConfigureFCDPro::create(settings, force); m_inputMessageQueue.push(msg); @@ -992,6 +1004,17 @@ void FCDProInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res } else { response.getFcdProSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getFcdProSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getFcdProSettings()->getReverseApiAddress()) { + *response.getFcdProSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getFcdProSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getFcdProSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getFcdProSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void FCDProInput::webapiReverseSendSettings(QList& deviceSettingsKeys, const FCDProSettings& settings, bool force) diff --git a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp index c2fde686e..16962ee9a 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusinput.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusinput.cpp @@ -646,6 +646,18 @@ int FCDProPlusInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("fileRecordName")) { settings.m_fileRecordName = *response.getFcdProPlusSettings()->getFileRecordName(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getFcdProPlusSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getFcdProPlusSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getFcdProPlusSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getFcdProPlusSettings()->getReverseApiDeviceIndex(); + } MsgConfigureFCDProPlus *msg = MsgConfigureFCDProPlus::create(settings, force); m_inputMessageQueue.push(msg); @@ -683,6 +695,17 @@ void FCDProPlusInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& } else { response.getFcdProPlusSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getFcdProPlusSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getFcdProPlusSettings()->getReverseApiAddress()) { + *response.getFcdProPlusSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getFcdProPlusSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getFcdProPlusSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getFcdProPlusSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void FCDProPlusInput::webapiReverseSendSettings(QList& deviceSettingsKeys, const FCDProPlusSettings& settings, bool force) diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index ab710c391..75d3a8d2b 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -467,6 +467,18 @@ int FileSourceInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("loop")) { settings.m_loop = response.getFileSourceSettings()->getLoop() != 0; } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getFileSourceSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getFileSourceSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getFileSourceSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getFileSourceSettings()->getReverseApiDeviceIndex(); + } MsgConfigureFileSource *msg = MsgConfigureFileSource::create(settings, force); m_inputMessageQueue.push(msg); @@ -526,6 +538,16 @@ void FileSourceInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response.getFileSourceSettings()->setAccelerationFactor(settings.m_accelerationFactor); response.getFileSourceSettings()->setLoop(settings.m_loop ? 1 : 0); + response.getFileSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getFileSourceSettings()->getReverseApiAddress()) { + *response.getFileSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getFileSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getFileSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getFileSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void FileSourceInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesource/filesource/filesourceplugin.cpp b/plugins/samplesource/filesource/filesourceplugin.cpp index 2f4de4d84..6c272e5b6 100644 --- a/plugins/samplesource/filesource/filesourceplugin.cpp +++ b/plugins/samplesource/filesource/filesourceplugin.cpp @@ -29,7 +29,7 @@ const PluginDescriptor FileSourcePlugin::m_pluginDescriptor = { QString("File source input"), - QString("4.2.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/hackrfinput/hackrfinput.cpp b/plugins/samplesource/hackrfinput/hackrfinput.cpp index 614e86dd3..3c3f9748a 100644 --- a/plugins/samplesource/hackrfinput/hackrfinput.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinput.cpp @@ -632,6 +632,18 @@ int HackRFInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("fileRecordName")) { settings.m_fileRecordName = *response.getHackRfInputSettings()->getFileRecordName(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getHackRfInputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getHackRfInputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getHackRfInputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getHackRfInputSettings()->getReverseApiDeviceIndex(); + } MsgConfigureHackRF *msg = MsgConfigureHackRF::create(settings, force); m_inputMessageQueue.push(msg); @@ -667,6 +679,17 @@ void HackRFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res } else { response.getHackRfInputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getHackRfInputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getHackRfInputSettings()->getReverseApiAddress()) { + *response.getHackRfInputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getHackRfInputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getHackRfInputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getHackRfInputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } int HackRFInput::webapiRunGet( diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index d7da12789..2d2edddb0 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -32,7 +32,7 @@ const PluginDescriptor HackRFInputPlugin::m_pluginDescriptor = { QString("HackRF Input"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/perseus/perseusinput.cpp b/plugins/samplesource/perseus/perseusinput.cpp index 33d48e51e..035914cb9 100644 --- a/plugins/samplesource/perseus/perseusinput.cpp +++ b/plugins/samplesource/perseus/perseusinput.cpp @@ -530,6 +530,18 @@ int PerseusInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("fileRecordName")) { settings.m_fileRecordName = *response.getPerseusSettings()->getFileRecordName(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getPerseusSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getPerseusSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getPerseusSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getPerseusSettings()->getReverseApiDeviceIndex(); + } MsgConfigurePerseus *msg = MsgConfigurePerseus::create(settings, force); m_inputMessageQueue.push(msg); @@ -573,6 +585,17 @@ void PerseusInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& re } else { response.getPerseusSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getPerseusSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getPerseusSettings()->getReverseApiAddress()) { + *response.getPerseusSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getPerseusSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getPerseusSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getPerseusSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void PerseusInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesource/perseus/perseusplugin.cpp b/plugins/samplesource/perseus/perseusplugin.cpp index 64a30ace5..cdb31137d 100644 --- a/plugins/samplesource/perseus/perseusplugin.cpp +++ b/plugins/samplesource/perseus/perseusplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor PerseusPlugin::m_pluginDescriptor = { QString("Perseus Input"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp index 9632444b4..48fe76894 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinput.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinput.cpp @@ -814,6 +814,18 @@ int PlutoSDRInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("fileRecordName")) { settings.m_fileRecordName = *response.getPlutoSdrInputSettings()->getFileRecordName(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getPlutoSdrInputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getPlutoSdrInputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getPlutoSdrInputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getPlutoSdrInputSettings()->getReverseApiDeviceIndex(); + } MsgConfigurePlutoSDR *msg = MsgConfigurePlutoSDR::create(settings, force); m_inputMessageQueue.push(msg); @@ -864,6 +876,17 @@ void PlutoSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r } else { response.getPlutoSdrInputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getPlutoSdrInputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getPlutoSdrInputSettings()->getReverseApiAddress()) { + *response.getPlutoSdrInputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getPlutoSdrInputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getPlutoSdrInputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getPlutoSdrInputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void PlutoSDRInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp index b5beaaff3..1478fb2b7 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputplugin.cpp @@ -30,7 +30,7 @@ class DeviceSourceAPI; const PluginDescriptor PlutoSDRInputPlugin::m_pluginDescriptor = { QString("PlutoSDR Input"), - QString("4.4.0"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp index f0afea029..3a2bc1e9f 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceinput.cpp @@ -353,6 +353,18 @@ int SDRdaemonSourceInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("fileRecordName")) { settings.m_fileRecordName = *response.getSdrDaemonSourceSettings()->getFileRecordName(); } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getSdrDaemonSourceSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getSdrDaemonSourceSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getSdrDaemonSourceSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getSdrDaemonSourceSettings()->getReverseApiDeviceIndex(); + } MsgConfigureSDRdaemonSource *msg = MsgConfigureSDRdaemonSource::create(settings, force); m_inputMessageQueue.push(msg); @@ -381,6 +393,17 @@ void SDRdaemonSourceInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSett } else { response.getSdrDaemonSourceSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getSdrDaemonSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getSdrDaemonSourceSettings()->getReverseApiAddress()) { + *response.getSdrDaemonSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getSdrDaemonSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getSdrDaemonSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getSdrDaemonSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } int SDRdaemonSourceInput::webapiReportGet( diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp index 4f62e99d1..749a22e2c 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourceplugin.cpp @@ -29,7 +29,7 @@ const PluginDescriptor SDRdaemonSourcePlugin::m_pluginDescriptor = { QString("SDRdaemon source input"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index 27e598deb..eeeb046b7 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -731,7 +731,19 @@ int SDRPlayInput::webapiSettingsPutPatch( settings.m_basebandGain = response.getSdrPlaySettings()->getBasebandGain(); } if (deviceSettingsKeys.contains("fileRecordName")) { - settings.m_fileRecordName = *response.getRtlSdrSettings()->getFileRecordName(); + settings.m_fileRecordName = *response.getSdrPlaySettings()->getFileRecordName(); + } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getSdrPlaySettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getSdrPlaySettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getSdrPlaySettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getSdrPlaySettings()->getReverseApiDeviceIndex(); } MsgConfigureSDRPlay *msg = MsgConfigureSDRPlay::create(settings, force); @@ -770,6 +782,17 @@ void SDRPlayInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& re } else { response.getSdrPlaySettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } + + response.getSdrPlaySettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getSdrPlaySettings()->getReverseApiAddress()) { + *response.getSdrPlaySettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getSdrPlaySettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getSdrPlaySettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getSdrPlaySettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } int SDRPlayInput::webapiReportGet( diff --git a/plugins/samplesource/sdrplay/sdrplayplugin.cpp b/plugins/samplesource/sdrplay/sdrplayplugin.cpp index 099ac4e52..d1a8e39e6 100644 --- a/plugins/samplesource/sdrplay/sdrplayplugin.cpp +++ b/plugins/samplesource/sdrplay/sdrplayplugin.cpp @@ -28,7 +28,7 @@ const PluginDescriptor SDRPlayPlugin::m_pluginDescriptor = { QString("SDRPlay RSP1 Input"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp index d00218924..9cc8294b7 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinput.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinput.cpp @@ -1525,6 +1525,19 @@ int SoapySDRInput::webapiSettingsPutPatch( } } + if (deviceSettingsKeys.contains("useReverseAPI")) { + settings.m_useReverseAPI = response.getSoapySdrInputSettings()->getUseReverseApi() != 0; + } + if (deviceSettingsKeys.contains("reverseAPIAddress")) { + settings.m_reverseAPIAddress = *response.getSoapySdrInputSettings()->getReverseApiAddress(); + } + if (deviceSettingsKeys.contains("reverseAPIPort")) { + settings.m_reverseAPIPort = response.getSoapySdrInputSettings()->getReverseApiPort(); + } + if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { + settings.m_reverseAPIDeviceIndex = response.getSoapySdrInputSettings()->getReverseApiDeviceIndex(); + } + MsgConfigureSoapySDRInput *msg = MsgConfigureSoapySDRInput::create(settings, force); m_inputMessageQueue.push(msg); @@ -1677,6 +1690,17 @@ void SoapySDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r const QVariant& v = settings.m_deviceArgSettings.value(itName); webapiFormatArgValue(v, response.getSoapySdrInputSettings()->getDeviceArgSettings()->back()); } + + response.getSoapySdrInputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + + if (response.getSoapySdrInputSettings()->getReverseApiAddress()) { + *response.getSoapySdrInputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + } else { + response.getSoapySdrInputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + } + + response.getSoapySdrInputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getSoapySdrInputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void SoapySDRInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp index d4f336117..c0e81086b 100644 --- a/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp +++ b/plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor SoapySDRInputPlugin::m_pluginDescriptor = { QString("SoapySDR Input"), - QString("4.3.2"), + QString("4.4.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index f6061f479..a41a9a47c 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1453,6 +1453,19 @@ margin-bottom: 20px; }, "xb200Filter" : { "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "BladeRF1" @@ -1589,6 +1602,19 @@ margin-bottom: 20px; "transverterDeltaFrequency" : { "type" : "integer", "format" : "int64" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "BladeRF2" @@ -2445,6 +2471,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "FCDProPlus" @@ -2527,6 +2566,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "FCDPro" @@ -2572,6 +2624,19 @@ margin-bottom: 20px; "loop" : { "type" : "integer", "description" : "1 if playing in a loop else 0" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "FileSource" @@ -2667,6 +2732,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "HackRF" @@ -2697,6 +2775,19 @@ margin-bottom: 20px; }, "lnaExt" : { "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "HackRF" @@ -3311,6 +3402,19 @@ margin-bottom: 20px; "attenuator" : { "type" : "integer", "description" : "Attenuator setting in Bels (0, 10, 20 30 dB)" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "Perseus" @@ -3397,6 +3501,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "PlutoSDR" @@ -3464,6 +3581,19 @@ margin-bottom: 20px; "transverterDeltaFrequency" : { "type" : "integer", "format" : "int64" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "PlutoSDR" @@ -3848,6 +3978,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SDRplay1" @@ -3900,6 +4043,19 @@ margin-bottom: 20px; }, "channelIndex" : { "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SDRdaemonSink" @@ -3954,6 +4110,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SDRdaemonSource" @@ -4329,6 +4498,19 @@ margin-bottom: 20px; "items" : { "$ref" : "#/definitions/ArgValue" } + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SoapySDR" @@ -4406,6 +4588,19 @@ margin-bottom: 20px; "items" : { "$ref" : "#/definitions/ArgValue" } + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SoapySDR" @@ -24152,7 +24347,7 @@ except ApiException as e:
- Generated 2019-01-10T23:01:08.580+01:00 + Generated 2019-01-11T14:37:54.502+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml b/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml index aa644b6ec..d6232ef87 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml @@ -62,3 +62,12 @@ BladeRF1OutputSettings: type: integer xb200Filter: type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml index 320af68e0..52fed234d 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml @@ -80,6 +80,15 @@ BladeRF2OutputSettings: transverterDeltaFrequency: type: integer format: int64 + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer BladeRF2OutputReport: description: BladeRF2 diff --git a/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml b/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml index 856b15d8a..9c0f12bdb 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml @@ -53,4 +53,13 @@ FCDProSettings: format: int64 fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml b/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml index fa4aa3600..aa6f55b97 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml @@ -39,3 +39,12 @@ FCDProPlusSettings: format: int64 fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml index f608a64da..872a69c03 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FileSource.yaml @@ -10,7 +10,16 @@ FileSourceSettings: loop: description: 1 if playing in a loop else 0 type: integer - + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + FileSourceReport: description: FileSource properties: @@ -31,4 +40,3 @@ FileSourceReport: durationTime: description: Duration time string representation type: string - \ No newline at end of file diff --git a/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml b/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml index a246ad7b5..fd8ce9084 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml @@ -1,6 +1,6 @@ HackRFInputSettings: description: HackRF - properties: + properties: centerFrequency: type: integer format: int64 @@ -12,7 +12,7 @@ HackRFInputSettings: type: integer vgaGain: type: integer - log2Decim: + log2Decim: type: integer fcPos: description: 0=Infra 1=Supra 2=Center @@ -31,6 +31,15 @@ HackRFInputSettings: type: integer fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer HackRFOutputSettings: description: HackRF @@ -44,7 +53,7 @@ HackRFOutputSettings: type: integer vgaGain: type: integer - log2Interp: + log2Interp: type: integer devSampleRate: type: integer @@ -52,3 +61,12 @@ HackRFOutputSettings: type: integer lnaExt: type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml b/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml index a8a8a3881..64ff7be79 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml @@ -23,11 +23,20 @@ PerseusSettings: type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 fileRecordName: type: string attenuator: - description: Attenuator setting in Bels (0, 10, 20 30 dB) + description: Attenuator setting in Bels (0, 10, 20 30 dB) + type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: type: integer PerseusReport: @@ -36,5 +45,4 @@ PerseusReport: sampleRates: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/SampleRate" - \ No newline at end of file + $ref: "/doc/swagger/include/Structs.yaml#/SampleRate" diff --git a/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml index 8f9ecc6eb..4e15e9ab4 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml @@ -1,6 +1,6 @@ PlutoSdrInputSettings: description: PlutoSDR - properties: + properties: centerFrequency: type: integer format: int64 @@ -11,7 +11,7 @@ PlutoSdrInputSettings: lpfFIREnable: description: Low pass FIR filter enable (1 if enabled else 0) type: integer - lpfFIRBW: + lpfFIRBW: description: digital lowpass FIR filter bandwidth (Hz) type: integer lpfFIRlog2Decim: @@ -30,7 +30,7 @@ PlutoSdrInputSettings: log2Decim: type: integer lpfBW: - description: Analog lowpass filter bandwidth (Hz) + description: Analog lowpass filter bandwidth (Hz) type: integer gain: description: Hardware gain @@ -43,13 +43,22 @@ PlutoSdrInputSettings: type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 fileRecordName: type: string - + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + PlutoSdrOutputSettings: description: PlutoSDR - properties: + properties: centerFrequency: type: integer format: int64 @@ -60,7 +69,7 @@ PlutoSdrOutputSettings: lpfFIREnable: description: Low pass FIR filter enable (1 if enabled else 0) type: integer - lpfFIRBW: + lpfFIRBW: description: digital lowpass FIR filter bandwidth (Hz) type: integer lpfFIRlog2Interp: @@ -72,7 +81,7 @@ PlutoSdrOutputSettings: log2Interp: type: integer lpfBW: - description: Analog lowpass filter bandwidth (Hz) + description: Analog lowpass filter bandwidth (Hz) type: integer att: description: Hardware attenuator gain in decibel fourths (negative) @@ -83,11 +92,20 @@ PlutoSdrOutputSettings: type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer PlutoSdrInputReport: description: PlutoSDR - properties: + properties: adcRate: type: integer rssi: @@ -96,15 +114,15 @@ PlutoSdrInputReport: type: integer temperature: type: number - format: float + format: float PlutoSdrOutputReport: description: PlutoSDR - properties: + properties: dacRate: type: integer rssi: type: string temperature: type: number - format: float \ No newline at end of file + format: float \ No newline at end of file diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml index c9ee31515..ef85adb0a 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSink.yaml @@ -26,6 +26,15 @@ SDRdaemonSinkSettings: channelIndex: device: remote SDRangel instance channel index type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SDRdaemonSinkReport: description: SDRdaemonSource @@ -37,4 +46,3 @@ SDRdaemonSinkReport: sampleCount: description: count of samples that have been sent type: integer - \ No newline at end of file diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSource.yaml index 31fe6980c..a5b6370e5 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSource.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRDaemonSource.yaml @@ -15,6 +15,15 @@ SDRdaemonSourceSettings: type: integer fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SDRdaemonSourceReport: description: SDRdaemonSource @@ -36,4 +45,3 @@ SDRdaemonSourceReport: maxNbRecovery: description: Maximum number of recovery blocks used per frame type: integer - \ No newline at end of file diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml index 7aac12513..cd741a81e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml @@ -8,17 +8,17 @@ SDRPlaySettings: type: integer LOppmTenths: type: integer - frequencyBandIndex: + frequencyBandIndex: type: integer - ifFrequencyIndex: + ifFrequencyIndex: type: integer - bandwidthIndex: + bandwidthIndex: type: integer - devSampleRateIndex: + devSampleRateIndex: type: integer - log2Decim: + log2Decim: type: integer - fcPos: + fcPos: type: integer dcBlock: type: integer @@ -35,6 +35,15 @@ SDRPlaySettings: type: integer fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SDRPlayReport: description: SDRplay1 diff --git a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml index 54aea556a..3483991fa 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml @@ -3,7 +3,7 @@ SoapySDRInputSettings: properties: centerFrequency: type: integer - format: int64 + format: int64 LOppmTenths: type: integer devSampleRate: @@ -13,17 +13,17 @@ SoapySDRInputSettings: fcPos: type: integer softDCCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer softIQCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer transverterMode: - description: boolean not zero for true + description: boolean not zero for true type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 fileRecordName: type: string antenna: @@ -33,21 +33,21 @@ SoapySDRInputSettings: tunableElements: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" globalGain: type: integer individualGains: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" autoGain: - description: boolean not zero for true + description: boolean not zero for true type: integer autoDCCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer autoIQCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer dcCorrection: $ref: "/doc/swagger/include/Structs.yaml#/Complex" @@ -56,18 +56,27 @@ SoapySDRInputSettings: streamArgSettings: type: array items: - $ref: "#/definitions/ArgValue" - deviceArgSettings: + $ref: "#/definitions/ArgValue" + deviceArgSettings: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SoapySDROutputSettings: description: SoapySDR properties: centerFrequency: type: integer - format: int64 + format: int64 LOppmTenths: type: integer devSampleRate: @@ -75,11 +84,11 @@ SoapySDROutputSettings: log2Interp: type: integer transverterMode: - description: boolean not zero for true + description: boolean not zero for true type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 antenna: type: string bandwidth: @@ -87,21 +96,21 @@ SoapySDROutputSettings: tunableElements: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" globalGain: type: integer individualGains: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" autoGain: - description: boolean not zero for true + description: boolean not zero for true type: integer autoDCCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer autoIQCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer dcCorrection: $ref: "/doc/swagger/include/Structs.yaml#/Complex" @@ -110,12 +119,21 @@ SoapySDROutputSettings: streamArgSettings: type: array items: - $ref: "#/definitions/ArgValue" - deviceArgSettings: + $ref: "#/definitions/ArgValue" + deviceArgSettings: type: array items: - $ref: "#/definitions/ArgValue" - + $ref: "#/definitions/ArgValue" + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + SoapySDRReport: description: SoapySDR properties: @@ -143,7 +161,7 @@ SoapySDRReport: type: array items: type: string - hasAGC: + hasAGC: description: boolean not zero for true type: integer gainRange: @@ -164,13 +182,13 @@ SoapySDRReport: type: array items: $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" - bandwidthsRanges: + bandwidthsRanges: type: array items: $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" definitions: - + SoapySDRGainSetting: description: A named gain setting specified by its range properties: @@ -178,7 +196,7 @@ definitions: type: string range: $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" - + SoapySDRFrequencySetting: description: A named frequency setting specified by a range list properties: @@ -188,7 +206,7 @@ definitions: type: array items: $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" - + ArgValue: descripion: Generic argument value properties: @@ -199,7 +217,7 @@ definitions: enum: [bool, int, float, string] valueString: type: string - + ArgInfo: descripion: Generic argument information properties: @@ -226,6 +244,5 @@ definitions: type: array items: type: string - - - \ No newline at end of file + + diff --git a/swagger/sdrangel/api/swagger/include/BladeRF1.yaml b/swagger/sdrangel/api/swagger/include/BladeRF1.yaml index aa644b6ec..d6232ef87 100644 --- a/swagger/sdrangel/api/swagger/include/BladeRF1.yaml +++ b/swagger/sdrangel/api/swagger/include/BladeRF1.yaml @@ -62,3 +62,12 @@ BladeRF1OutputSettings: type: integer xb200Filter: type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/swagger/sdrangel/api/swagger/include/BladeRF2.yaml b/swagger/sdrangel/api/swagger/include/BladeRF2.yaml index 1a0614985..e6c692a05 100644 --- a/swagger/sdrangel/api/swagger/include/BladeRF2.yaml +++ b/swagger/sdrangel/api/swagger/include/BladeRF2.yaml @@ -80,6 +80,15 @@ BladeRF2OutputSettings: transverterDeltaFrequency: type: integer format: int64 + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer BladeRF2OutputReport: description: BladeRF2 diff --git a/swagger/sdrangel/api/swagger/include/FCDPro.yaml b/swagger/sdrangel/api/swagger/include/FCDPro.yaml index 856b15d8a..9c0f12bdb 100644 --- a/swagger/sdrangel/api/swagger/include/FCDPro.yaml +++ b/swagger/sdrangel/api/swagger/include/FCDPro.yaml @@ -53,4 +53,13 @@ FCDProSettings: format: int64 fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/swagger/sdrangel/api/swagger/include/FCDProPlus.yaml b/swagger/sdrangel/api/swagger/include/FCDProPlus.yaml index fa4aa3600..aa6f55b97 100644 --- a/swagger/sdrangel/api/swagger/include/FCDProPlus.yaml +++ b/swagger/sdrangel/api/swagger/include/FCDProPlus.yaml @@ -39,3 +39,12 @@ FCDProPlusSettings: format: int64 fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/swagger/sdrangel/api/swagger/include/FileSource.yaml b/swagger/sdrangel/api/swagger/include/FileSource.yaml index f608a64da..872a69c03 100644 --- a/swagger/sdrangel/api/swagger/include/FileSource.yaml +++ b/swagger/sdrangel/api/swagger/include/FileSource.yaml @@ -10,7 +10,16 @@ FileSourceSettings: loop: description: 1 if playing in a loop else 0 type: integer - + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + FileSourceReport: description: FileSource properties: @@ -31,4 +40,3 @@ FileSourceReport: durationTime: description: Duration time string representation type: string - \ No newline at end of file diff --git a/swagger/sdrangel/api/swagger/include/HackRF.yaml b/swagger/sdrangel/api/swagger/include/HackRF.yaml index a246ad7b5..fd8ce9084 100644 --- a/swagger/sdrangel/api/swagger/include/HackRF.yaml +++ b/swagger/sdrangel/api/swagger/include/HackRF.yaml @@ -1,6 +1,6 @@ HackRFInputSettings: description: HackRF - properties: + properties: centerFrequency: type: integer format: int64 @@ -12,7 +12,7 @@ HackRFInputSettings: type: integer vgaGain: type: integer - log2Decim: + log2Decim: type: integer fcPos: description: 0=Infra 1=Supra 2=Center @@ -31,6 +31,15 @@ HackRFInputSettings: type: integer fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer HackRFOutputSettings: description: HackRF @@ -44,7 +53,7 @@ HackRFOutputSettings: type: integer vgaGain: type: integer - log2Interp: + log2Interp: type: integer devSampleRate: type: integer @@ -52,3 +61,12 @@ HackRFOutputSettings: type: integer lnaExt: type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/swagger/sdrangel/api/swagger/include/Perseus.yaml b/swagger/sdrangel/api/swagger/include/Perseus.yaml index 6ed9052b8..19e079a75 100644 --- a/swagger/sdrangel/api/swagger/include/Perseus.yaml +++ b/swagger/sdrangel/api/swagger/include/Perseus.yaml @@ -23,11 +23,20 @@ PerseusSettings: type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 fileRecordName: type: string attenuator: - description: Attenuator setting in Bels (0, 10, 20 30 dB) + description: Attenuator setting in Bels (0, 10, 20 30 dB) + type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: type: integer PerseusReport: @@ -36,5 +45,4 @@ PerseusReport: sampleRates: type: array items: - $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/SampleRate" - \ No newline at end of file + $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/SampleRate" diff --git a/swagger/sdrangel/api/swagger/include/PlutoSdr.yaml b/swagger/sdrangel/api/swagger/include/PlutoSdr.yaml index 8f9ecc6eb..4e15e9ab4 100644 --- a/swagger/sdrangel/api/swagger/include/PlutoSdr.yaml +++ b/swagger/sdrangel/api/swagger/include/PlutoSdr.yaml @@ -1,6 +1,6 @@ PlutoSdrInputSettings: description: PlutoSDR - properties: + properties: centerFrequency: type: integer format: int64 @@ -11,7 +11,7 @@ PlutoSdrInputSettings: lpfFIREnable: description: Low pass FIR filter enable (1 if enabled else 0) type: integer - lpfFIRBW: + lpfFIRBW: description: digital lowpass FIR filter bandwidth (Hz) type: integer lpfFIRlog2Decim: @@ -30,7 +30,7 @@ PlutoSdrInputSettings: log2Decim: type: integer lpfBW: - description: Analog lowpass filter bandwidth (Hz) + description: Analog lowpass filter bandwidth (Hz) type: integer gain: description: Hardware gain @@ -43,13 +43,22 @@ PlutoSdrInputSettings: type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 fileRecordName: type: string - + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + PlutoSdrOutputSettings: description: PlutoSDR - properties: + properties: centerFrequency: type: integer format: int64 @@ -60,7 +69,7 @@ PlutoSdrOutputSettings: lpfFIREnable: description: Low pass FIR filter enable (1 if enabled else 0) type: integer - lpfFIRBW: + lpfFIRBW: description: digital lowpass FIR filter bandwidth (Hz) type: integer lpfFIRlog2Interp: @@ -72,7 +81,7 @@ PlutoSdrOutputSettings: log2Interp: type: integer lpfBW: - description: Analog lowpass filter bandwidth (Hz) + description: Analog lowpass filter bandwidth (Hz) type: integer att: description: Hardware attenuator gain in decibel fourths (negative) @@ -83,11 +92,20 @@ PlutoSdrOutputSettings: type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer PlutoSdrInputReport: description: PlutoSDR - properties: + properties: adcRate: type: integer rssi: @@ -96,15 +114,15 @@ PlutoSdrInputReport: type: integer temperature: type: number - format: float + format: float PlutoSdrOutputReport: description: PlutoSDR - properties: + properties: dacRate: type: integer rssi: type: string temperature: type: number - format: float \ No newline at end of file + format: float \ No newline at end of file diff --git a/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml b/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml index c9ee31515..ef85adb0a 100644 --- a/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml +++ b/swagger/sdrangel/api/swagger/include/SDRDaemonSink.yaml @@ -26,6 +26,15 @@ SDRdaemonSinkSettings: channelIndex: device: remote SDRangel instance channel index type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SDRdaemonSinkReport: description: SDRdaemonSource @@ -37,4 +46,3 @@ SDRdaemonSinkReport: sampleCount: description: count of samples that have been sent type: integer - \ No newline at end of file diff --git a/swagger/sdrangel/api/swagger/include/SDRDaemonSource.yaml b/swagger/sdrangel/api/swagger/include/SDRDaemonSource.yaml index 31fe6980c..a5b6370e5 100644 --- a/swagger/sdrangel/api/swagger/include/SDRDaemonSource.yaml +++ b/swagger/sdrangel/api/swagger/include/SDRDaemonSource.yaml @@ -15,6 +15,15 @@ SDRdaemonSourceSettings: type: integer fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SDRdaemonSourceReport: description: SDRdaemonSource @@ -36,4 +45,3 @@ SDRdaemonSourceReport: maxNbRecovery: description: Maximum number of recovery blocks used per frame type: integer - \ No newline at end of file diff --git a/swagger/sdrangel/api/swagger/include/SDRPlay.yaml b/swagger/sdrangel/api/swagger/include/SDRPlay.yaml index e4ae5f13c..51e1e819c 100644 --- a/swagger/sdrangel/api/swagger/include/SDRPlay.yaml +++ b/swagger/sdrangel/api/swagger/include/SDRPlay.yaml @@ -8,17 +8,17 @@ SDRPlaySettings: type: integer LOppmTenths: type: integer - frequencyBandIndex: + frequencyBandIndex: type: integer - ifFrequencyIndex: + ifFrequencyIndex: type: integer - bandwidthIndex: + bandwidthIndex: type: integer - devSampleRateIndex: + devSampleRateIndex: type: integer - log2Decim: + log2Decim: type: integer - fcPos: + fcPos: type: integer dcBlock: type: integer @@ -35,6 +35,15 @@ SDRPlaySettings: type: integer fileRecordName: type: string + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SDRPlayReport: description: SDRplay1 diff --git a/swagger/sdrangel/api/swagger/include/SoapySDR.yaml b/swagger/sdrangel/api/swagger/include/SoapySDR.yaml index dd6bc0ba3..1222dffb9 100644 --- a/swagger/sdrangel/api/swagger/include/SoapySDR.yaml +++ b/swagger/sdrangel/api/swagger/include/SoapySDR.yaml @@ -3,7 +3,7 @@ SoapySDRInputSettings: properties: centerFrequency: type: integer - format: int64 + format: int64 LOppmTenths: type: integer devSampleRate: @@ -13,17 +13,17 @@ SoapySDRInputSettings: fcPos: type: integer softDCCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer softIQCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer transverterMode: - description: boolean not zero for true + description: boolean not zero for true type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 fileRecordName: type: string antenna: @@ -33,21 +33,21 @@ SoapySDRInputSettings: tunableElements: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" globalGain: type: integer individualGains: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" autoGain: - description: boolean not zero for true + description: boolean not zero for true type: integer autoDCCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer autoIQCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer dcCorrection: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/Complex" @@ -56,18 +56,27 @@ SoapySDRInputSettings: streamArgSettings: type: array items: - $ref: "#/definitions/ArgValue" - deviceArgSettings: + $ref: "#/definitions/ArgValue" + deviceArgSettings: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer SoapySDROutputSettings: description: SoapySDR properties: centerFrequency: type: integer - format: int64 + format: int64 LOppmTenths: type: integer devSampleRate: @@ -75,11 +84,11 @@ SoapySDROutputSettings: log2Interp: type: integer transverterMode: - description: boolean not zero for true + description: boolean not zero for true type: integer transverterDeltaFrequency: type: integer - format: int64 + format: int64 antenna: type: string bandwidth: @@ -87,21 +96,21 @@ SoapySDROutputSettings: tunableElements: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" globalGain: type: integer individualGains: type: array items: - $ref: "#/definitions/ArgValue" + $ref: "#/definitions/ArgValue" autoGain: - description: boolean not zero for true + description: boolean not zero for true type: integer autoDCCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer autoIQCorrection: - description: boolean not zero for true + description: boolean not zero for true type: integer dcCorrection: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/Complex" @@ -110,12 +119,21 @@ SoapySDROutputSettings: streamArgSettings: type: array items: - $ref: "#/definitions/ArgValue" - deviceArgSettings: + $ref: "#/definitions/ArgValue" + deviceArgSettings: type: array items: - $ref: "#/definitions/ArgValue" - + $ref: "#/definitions/ArgValue" + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + SoapySDRReport: description: SoapySDR properties: @@ -143,7 +161,7 @@ SoapySDRReport: type: array items: type: string - hasAGC: + hasAGC: description: boolean not zero for true type: integer gainRange: @@ -164,13 +182,13 @@ SoapySDRReport: type: array items: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/RangeFloat" - bandwidthsRanges: + bandwidthsRanges: type: array items: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/RangeFloat" definitions: - + SoapySDRGainSetting: description: A named gain setting specified by its range properties: @@ -178,7 +196,7 @@ definitions: type: string range: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/RangeFloat" - + SoapySDRFrequencySetting: description: A named frequency setting specified by a range list properties: @@ -188,7 +206,7 @@ definitions: type: array items: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/RangeFloat" - + ArgValue: descripion: Generic argument value properties: @@ -199,7 +217,7 @@ definitions: enum: [bool, int, float, string] valueString: type: string - + ArgInfo: descripion: Generic argument information properties: @@ -226,6 +244,5 @@ definitions: type: array items: type: string - - - \ No newline at end of file + + diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index f6061f479..a41a9a47c 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1453,6 +1453,19 @@ margin-bottom: 20px; }, "xb200Filter" : { "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "BladeRF1" @@ -1589,6 +1602,19 @@ margin-bottom: 20px; "transverterDeltaFrequency" : { "type" : "integer", "format" : "int64" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "BladeRF2" @@ -2445,6 +2471,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "FCDProPlus" @@ -2527,6 +2566,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "FCDPro" @@ -2572,6 +2624,19 @@ margin-bottom: 20px; "loop" : { "type" : "integer", "description" : "1 if playing in a loop else 0" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "FileSource" @@ -2667,6 +2732,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "HackRF" @@ -2697,6 +2775,19 @@ margin-bottom: 20px; }, "lnaExt" : { "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "HackRF" @@ -3311,6 +3402,19 @@ margin-bottom: 20px; "attenuator" : { "type" : "integer", "description" : "Attenuator setting in Bels (0, 10, 20 30 dB)" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "Perseus" @@ -3397,6 +3501,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "PlutoSDR" @@ -3464,6 +3581,19 @@ margin-bottom: 20px; "transverterDeltaFrequency" : { "type" : "integer", "format" : "int64" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "PlutoSDR" @@ -3848,6 +3978,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SDRplay1" @@ -3900,6 +4043,19 @@ margin-bottom: 20px; }, "channelIndex" : { "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SDRdaemonSink" @@ -3954,6 +4110,19 @@ margin-bottom: 20px; }, "fileRecordName" : { "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SDRdaemonSource" @@ -4329,6 +4498,19 @@ margin-bottom: 20px; "items" : { "$ref" : "#/definitions/ArgValue" } + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SoapySDR" @@ -4406,6 +4588,19 @@ margin-bottom: 20px; "items" : { "$ref" : "#/definitions/ArgValue" } + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" } }, "description" : "SoapySDR" @@ -24152,7 +24347,7 @@ except ApiException as e:
- Generated 2019-01-10T23:01:08.580+01:00 + Generated 2019-01-11T14:37:54.502+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp index 7c1405444..3c1f20f85 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.cpp @@ -46,6 +46,14 @@ SWGBladeRF1OutputSettings::SWGBladeRF1OutputSettings() { m_xb200_path_isSet = false; xb200_filter = 0; m_xb200_filter_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGBladeRF1OutputSettings::~SWGBladeRF1OutputSettings() { @@ -72,6 +80,14 @@ SWGBladeRF1OutputSettings::init() { m_xb200_path_isSet = false; xb200_filter = 0; m_xb200_filter_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -85,6 +101,12 @@ SWGBladeRF1OutputSettings::cleanup() { + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGBladeRF1OutputSettings* @@ -116,6 +138,14 @@ SWGBladeRF1OutputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&xb200_filter, pJson["xb200Filter"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -159,6 +189,18 @@ SWGBladeRF1OutputSettings::asJsonObject() { if(m_xb200_filter_isSet){ obj->insert("xb200Filter", QJsonValue(xb200_filter)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -253,6 +295,46 @@ SWGBladeRF1OutputSettings::setXb200Filter(qint32 xb200_filter) { this->m_xb200_filter_isSet = true; } +qint32 +SWGBladeRF1OutputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGBladeRF1OutputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGBladeRF1OutputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGBladeRF1OutputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGBladeRF1OutputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGBladeRF1OutputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGBladeRF1OutputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGBladeRF1OutputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGBladeRF1OutputSettings::isSet(){ @@ -267,6 +349,10 @@ SWGBladeRF1OutputSettings::isSet(){ if(m_xb200_isSet){ isObjectUpdated = true; break;} if(m_xb200_path_isSet){ isObjectUpdated = true; break;} if(m_xb200_filter_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.h index a644108e3..0aba7fad2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1OutputSettings.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -68,6 +69,18 @@ public: qint32 getXb200Filter(); void setXb200Filter(qint32 xb200_filter); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -99,6 +112,18 @@ private: qint32 xb200_filter; bool m_xb200_filter_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp index 41c17853e..04aba453e 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.cpp @@ -46,6 +46,14 @@ SWGBladeRF2OutputSettings::SWGBladeRF2OutputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGBladeRF2OutputSettings::~SWGBladeRF2OutputSettings() { @@ -72,6 +80,14 @@ SWGBladeRF2OutputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -85,6 +101,12 @@ SWGBladeRF2OutputSettings::cleanup() { + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGBladeRF2OutputSettings* @@ -116,6 +138,14 @@ SWGBladeRF2OutputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -159,6 +189,18 @@ SWGBladeRF2OutputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -253,6 +295,46 @@ SWGBladeRF2OutputSettings::setTransverterDeltaFrequency(qint64 transverter_delta this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGBladeRF2OutputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGBladeRF2OutputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGBladeRF2OutputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGBladeRF2OutputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGBladeRF2OutputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGBladeRF2OutputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGBladeRF2OutputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGBladeRF2OutputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGBladeRF2OutputSettings::isSet(){ @@ -267,6 +349,10 @@ SWGBladeRF2OutputSettings::isSet(){ if(m_log2_interp_isSet){ isObjectUpdated = true; break;} if(m_transverter_mode_isSet){ isObjectUpdated = true; break;} if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.h index bd74299d3..7dcfb1778 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2OutputSettings.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -68,6 +69,18 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -99,6 +112,18 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp index c9bc5fd9a..8d415899a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp @@ -60,6 +60,14 @@ SWGFCDProPlusSettings::SWGFCDProPlusSettings() { m_transverter_delta_frequency_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGFCDProPlusSettings::~SWGFCDProPlusSettings() { @@ -100,6 +108,14 @@ SWGFCDProPlusSettings::init() { m_transverter_delta_frequency_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -122,6 +138,12 @@ SWGFCDProPlusSettings::cleanup() { if(file_record_name != nullptr) { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGFCDProPlusSettings* @@ -167,6 +189,14 @@ SWGFCDProPlusSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -231,6 +261,18 @@ SWGFCDProPlusSettings::asJsonObject() { if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -395,6 +437,46 @@ SWGFCDProPlusSettings::setFileRecordName(QString* file_record_name) { this->m_file_record_name_isSet = true; } +qint32 +SWGFCDProPlusSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGFCDProPlusSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGFCDProPlusSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGFCDProPlusSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGFCDProPlusSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGFCDProPlusSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGFCDProPlusSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGFCDProPlusSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGFCDProPlusSettings::isSet(){ @@ -416,6 +498,10 @@ SWGFCDProPlusSettings::isSet(){ if(m_transverter_mode_isSet){ isObjectUpdated = true; break;} if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h index db2b4ac11..81b847517 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h @@ -90,6 +90,18 @@ public: QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -142,6 +154,18 @@ private: QString* file_record_name; bool m_file_record_name_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp index f3fca938c..ef4c0623c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp @@ -78,6 +78,14 @@ SWGFCDProSettings::SWGFCDProSettings() { m_transverter_delta_frequency_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGFCDProSettings::~SWGFCDProSettings() { @@ -136,6 +144,14 @@ SWGFCDProSettings::init() { m_transverter_delta_frequency_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -167,6 +183,12 @@ SWGFCDProSettings::cleanup() { if(file_record_name != nullptr) { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGFCDProSettings* @@ -230,6 +252,14 @@ SWGFCDProSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -321,6 +351,18 @@ SWGFCDProSettings::asJsonObject() { if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -575,6 +617,46 @@ SWGFCDProSettings::setFileRecordName(QString* file_record_name) { this->m_file_record_name_isSet = true; } +qint32 +SWGFCDProSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGFCDProSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGFCDProSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGFCDProSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGFCDProSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGFCDProSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGFCDProSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGFCDProSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGFCDProSettings::isSet(){ @@ -605,6 +687,10 @@ SWGFCDProSettings::isSet(){ if(m_transverter_mode_isSet){ isObjectUpdated = true; break;} if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h index 54ab028a4..d1a7391eb 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h @@ -117,6 +117,18 @@ public: QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -196,6 +208,18 @@ private: QString* file_record_name; bool m_file_record_name_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp index f65d7c1d8..bf19155a2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.cpp @@ -34,6 +34,14 @@ SWGFileSourceSettings::SWGFileSourceSettings() { m_acceleration_factor_isSet = false; loop = 0; m_loop_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGFileSourceSettings::~SWGFileSourceSettings() { @@ -48,6 +56,14 @@ SWGFileSourceSettings::init() { m_acceleration_factor_isSet = false; loop = 0; m_loop_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -57,6 +73,12 @@ SWGFileSourceSettings::cleanup() { } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGFileSourceSettings* @@ -76,6 +98,14 @@ SWGFileSourceSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&loop, pJson["loop"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -101,6 +131,18 @@ SWGFileSourceSettings::asJsonObject() { if(m_loop_isSet){ obj->insert("loop", QJsonValue(loop)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -135,6 +177,46 @@ SWGFileSourceSettings::setLoop(qint32 loop) { this->m_loop_isSet = true; } +qint32 +SWGFileSourceSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGFileSourceSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGFileSourceSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGFileSourceSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGFileSourceSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGFileSourceSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGFileSourceSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGFileSourceSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGFileSourceSettings::isSet(){ @@ -143,6 +225,10 @@ SWGFileSourceSettings::isSet(){ if(file_name != nullptr && *file_name != QString("")){ isObjectUpdated = true; break;} if(m_acceleration_factor_isSet){ isObjectUpdated = true; break;} if(m_loop_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h index 89c8e8e40..6a35b99f8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFileSourceSettings.h @@ -51,6 +51,18 @@ public: qint32 getLoop(); void setLoop(qint32 loop); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -64,6 +76,18 @@ private: qint32 loop; bool m_loop_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp index c5ce7030d..710d134b6 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp @@ -56,6 +56,14 @@ SWGHackRFInputSettings::SWGHackRFInputSettings() { m_link_tx_frequency_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGHackRFInputSettings::~SWGHackRFInputSettings() { @@ -92,6 +100,14 @@ SWGHackRFInputSettings::init() { m_link_tx_frequency_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -112,6 +128,12 @@ SWGHackRFInputSettings::cleanup() { if(file_record_name != nullptr) { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGHackRFInputSettings* @@ -153,6 +175,14 @@ SWGHackRFInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -211,6 +241,18 @@ SWGHackRFInputSettings::asJsonObject() { if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -355,6 +397,46 @@ SWGHackRFInputSettings::setFileRecordName(QString* file_record_name) { this->m_file_record_name_isSet = true; } +qint32 +SWGHackRFInputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGHackRFInputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGHackRFInputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGHackRFInputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGHackRFInputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGHackRFInputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGHackRFInputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGHackRFInputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGHackRFInputSettings::isSet(){ @@ -374,6 +456,10 @@ SWGHackRFInputSettings::isSet(){ if(m_iq_correction_isSet){ isObjectUpdated = true; break;} if(m_link_tx_frequency_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h index 1bb75d7f0..606d44997 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h @@ -84,6 +84,18 @@ public: QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -130,6 +142,18 @@ private: QString* file_record_name; bool m_file_record_name_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp index 9fd5f28c9..343046da2 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.cpp @@ -44,6 +44,14 @@ SWGHackRFOutputSettings::SWGHackRFOutputSettings() { m_bias_t_isSet = false; lna_ext = 0; m_lna_ext_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGHackRFOutputSettings::~SWGHackRFOutputSettings() { @@ -68,6 +76,14 @@ SWGHackRFOutputSettings::init() { m_bias_t_isSet = false; lna_ext = 0; m_lna_ext_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -80,6 +96,12 @@ SWGHackRFOutputSettings::cleanup() { + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGHackRFOutputSettings* @@ -109,6 +131,14 @@ SWGHackRFOutputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&lna_ext, pJson["lnaExt"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -149,6 +179,18 @@ SWGHackRFOutputSettings::asJsonObject() { if(m_lna_ext_isSet){ obj->insert("lnaExt", QJsonValue(lna_ext)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -233,6 +275,46 @@ SWGHackRFOutputSettings::setLnaExt(qint32 lna_ext) { this->m_lna_ext_isSet = true; } +qint32 +SWGHackRFOutputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGHackRFOutputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGHackRFOutputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGHackRFOutputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGHackRFOutputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGHackRFOutputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGHackRFOutputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGHackRFOutputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGHackRFOutputSettings::isSet(){ @@ -246,6 +328,10 @@ SWGHackRFOutputSettings::isSet(){ if(m_dev_sample_rate_isSet){ isObjectUpdated = true; break;} if(m_bias_t_isSet){ isObjectUpdated = true; break;} if(m_lna_ext_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.h b/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.h index 447ca4edc..29481ab1d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFOutputSettings.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -65,6 +66,18 @@ public: qint32 getLnaExt(); void setLnaExt(qint32 lna_ext); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -93,6 +106,18 @@ private: qint32 lna_ext; bool m_lna_ext_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp index 21a2d06e3..2663caaf4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp @@ -50,6 +50,14 @@ SWGPerseusSettings::SWGPerseusSettings() { m_file_record_name_isSet = false; attenuator = 0; m_attenuator_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGPerseusSettings::~SWGPerseusSettings() { @@ -80,6 +88,14 @@ SWGPerseusSettings::init() { m_file_record_name_isSet = false; attenuator = 0; m_attenuator_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -97,6 +113,12 @@ SWGPerseusSettings::cleanup() { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGPerseusSettings* @@ -132,6 +154,14 @@ SWGPerseusSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&attenuator, pJson["attenuator"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -181,6 +211,18 @@ SWGPerseusSettings::asJsonObject() { if(m_attenuator_isSet){ obj->insert("attenuator", QJsonValue(attenuator)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -295,6 +337,46 @@ SWGPerseusSettings::setAttenuator(qint32 attenuator) { this->m_attenuator_isSet = true; } +qint32 +SWGPerseusSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGPerseusSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGPerseusSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGPerseusSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGPerseusSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGPerseusSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGPerseusSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGPerseusSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGPerseusSettings::isSet(){ @@ -311,6 +393,10 @@ SWGPerseusSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} if(m_attenuator_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h index 7cf3158b7..665958d3e 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h @@ -75,6 +75,18 @@ public: qint32 getAttenuator(); void setAttenuator(qint32 attenuator); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -112,6 +124,18 @@ private: qint32 attenuator; bool m_attenuator_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp index 289704c94..025e87f4f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp @@ -64,6 +64,14 @@ SWGPlutoSdrInputSettings::SWGPlutoSdrInputSettings() { m_transverter_delta_frequency_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGPlutoSdrInputSettings::~SWGPlutoSdrInputSettings() { @@ -108,6 +116,14 @@ SWGPlutoSdrInputSettings::init() { m_transverter_delta_frequency_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -132,6 +148,12 @@ SWGPlutoSdrInputSettings::cleanup() { if(file_record_name != nullptr) { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGPlutoSdrInputSettings* @@ -181,6 +203,14 @@ SWGPlutoSdrInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -251,6 +281,18 @@ SWGPlutoSdrInputSettings::asJsonObject() { if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -435,6 +477,46 @@ SWGPlutoSdrInputSettings::setFileRecordName(QString* file_record_name) { this->m_file_record_name_isSet = true; } +qint32 +SWGPlutoSdrInputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGPlutoSdrInputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGPlutoSdrInputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGPlutoSdrInputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGPlutoSdrInputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGPlutoSdrInputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGPlutoSdrInputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGPlutoSdrInputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGPlutoSdrInputSettings::isSet(){ @@ -458,6 +540,10 @@ SWGPlutoSdrInputSettings::isSet(){ if(m_transverter_mode_isSet){ isObjectUpdated = true; break;} if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h index debdfe51b..8f99b3c30 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h @@ -96,6 +96,18 @@ public: QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -154,6 +166,18 @@ private: QString* file_record_name; bool m_file_record_name_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp index 633444c92..2e43a38ec 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.cpp @@ -54,6 +54,14 @@ SWGPlutoSdrOutputSettings::SWGPlutoSdrOutputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGPlutoSdrOutputSettings::~SWGPlutoSdrOutputSettings() { @@ -88,6 +96,14 @@ SWGPlutoSdrOutputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -105,6 +121,12 @@ SWGPlutoSdrOutputSettings::cleanup() { + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGPlutoSdrOutputSettings* @@ -144,6 +166,14 @@ SWGPlutoSdrOutputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -199,6 +229,18 @@ SWGPlutoSdrOutputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -333,6 +375,46 @@ SWGPlutoSdrOutputSettings::setTransverterDeltaFrequency(qint64 transverter_delta this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGPlutoSdrOutputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGPlutoSdrOutputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGPlutoSdrOutputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGPlutoSdrOutputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGPlutoSdrOutputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGPlutoSdrOutputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGPlutoSdrOutputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGPlutoSdrOutputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGPlutoSdrOutputSettings::isSet(){ @@ -351,6 +433,10 @@ SWGPlutoSdrOutputSettings::isSet(){ if(m_antenna_path_isSet){ isObjectUpdated = true; break;} if(m_transverter_mode_isSet){ isObjectUpdated = true; break;} if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.h b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.h index 53ba5931d..9f49238fc 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrOutputSettings.h @@ -22,6 +22,7 @@ #include +#include #include "SWGObject.h" #include "export.h" @@ -80,6 +81,18 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -123,6 +136,18 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp index 4e9e1d4c8..e4e6767bc 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp @@ -60,6 +60,14 @@ SWGSDRPlaySettings::SWGSDRPlaySettings() { m_baseband_gain_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGSDRPlaySettings::~SWGSDRPlaySettings() { @@ -100,6 +108,14 @@ SWGSDRPlaySettings::init() { m_baseband_gain_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -122,6 +138,12 @@ SWGSDRPlaySettings::cleanup() { if(file_record_name != nullptr) { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGSDRPlaySettings* @@ -167,6 +189,14 @@ SWGSDRPlaySettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -231,6 +261,18 @@ SWGSDRPlaySettings::asJsonObject() { if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -395,6 +437,46 @@ SWGSDRPlaySettings::setFileRecordName(QString* file_record_name) { this->m_file_record_name_isSet = true; } +qint32 +SWGSDRPlaySettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGSDRPlaySettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGSDRPlaySettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGSDRPlaySettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGSDRPlaySettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGSDRPlaySettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGSDRPlaySettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGSDRPlaySettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGSDRPlaySettings::isSet(){ @@ -416,6 +498,10 @@ SWGSDRPlaySettings::isSet(){ if(m_mixer_amp_on_isSet){ isObjectUpdated = true; break;} if(m_baseband_gain_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h index 2bb65c9b9..6581a63d6 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h @@ -90,6 +90,18 @@ public: QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -142,6 +154,18 @@ private: QString* file_record_name; bool m_file_record_name_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp index 7013af7fc..891b960d4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.cpp @@ -48,6 +48,14 @@ SWGSDRdaemonSinkSettings::SWGSDRdaemonSinkSettings() { m_device_index_isSet = false; channel_index = 0; m_channel_index_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGSDRdaemonSinkSettings::~SWGSDRdaemonSinkSettings() { @@ -76,6 +84,14 @@ SWGSDRdaemonSinkSettings::init() { m_device_index_isSet = false; channel_index = 0; m_channel_index_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -94,6 +110,12 @@ SWGSDRdaemonSinkSettings::cleanup() { + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGSDRdaemonSinkSettings* @@ -127,6 +149,14 @@ SWGSDRdaemonSinkSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&channel_index, pJson["channelIndex"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -173,6 +203,18 @@ SWGSDRdaemonSinkSettings::asJsonObject() { if(m_channel_index_isSet){ obj->insert("channelIndex", QJsonValue(channel_index)); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -277,6 +319,46 @@ SWGSDRdaemonSinkSettings::setChannelIndex(qint32 channel_index) { this->m_channel_index_isSet = true; } +qint32 +SWGSDRdaemonSinkSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGSDRdaemonSinkSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGSDRdaemonSinkSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGSDRdaemonSinkSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGSDRdaemonSinkSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGSDRdaemonSinkSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGSDRdaemonSinkSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGSDRdaemonSinkSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGSDRdaemonSinkSettings::isSet(){ @@ -292,6 +374,10 @@ SWGSDRdaemonSinkSettings::isSet(){ if(m_data_port_isSet){ isObjectUpdated = true; break;} if(m_device_index_isSet){ isObjectUpdated = true; break;} if(m_channel_index_isSet){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h index 6f48dce07..950719fc7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSinkSettings.h @@ -72,6 +72,18 @@ public: qint32 getChannelIndex(); void setChannelIndex(qint32 channel_index); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -106,6 +118,18 @@ private: qint32 channel_index; bool m_channel_index_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.cpp index 31b0670ad..d9268ab23 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.cpp @@ -42,6 +42,14 @@ SWGSDRdaemonSourceSettings::SWGSDRdaemonSourceSettings() { m_iq_correction_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGSDRdaemonSourceSettings::~SWGSDRdaemonSourceSettings() { @@ -64,6 +72,14 @@ SWGSDRdaemonSourceSettings::init() { m_iq_correction_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -81,6 +97,12 @@ SWGSDRdaemonSourceSettings::cleanup() { if(file_record_name != nullptr) { delete file_record_name; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGSDRdaemonSourceSettings* @@ -108,6 +130,14 @@ SWGSDRdaemonSourceSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -145,6 +175,18 @@ SWGSDRdaemonSourceSettings::asJsonObject() { if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -219,6 +261,46 @@ SWGSDRdaemonSourceSettings::setFileRecordName(QString* file_record_name) { this->m_file_record_name_isSet = true; } +qint32 +SWGSDRdaemonSourceSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGSDRdaemonSourceSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGSDRdaemonSourceSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGSDRdaemonSourceSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGSDRdaemonSourceSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGSDRdaemonSourceSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGSDRdaemonSourceSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGSDRdaemonSourceSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGSDRdaemonSourceSettings::isSet(){ @@ -231,6 +313,10 @@ SWGSDRdaemonSourceSettings::isSet(){ if(m_dc_block_isSet){ isObjectUpdated = true; break;} if(m_iq_correction_isSet){ isObjectUpdated = true; break;} if(file_record_name != nullptr && *file_record_name != QString("")){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.h index 927f376a1..a640cb884 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRdaemonSourceSettings.h @@ -63,6 +63,18 @@ public: QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -88,6 +100,18 @@ private: QString* file_record_name; bool m_file_record_name_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp index 8d50b3f8a..da73ba8ea 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp @@ -72,6 +72,14 @@ SWGSoapySDRInputSettings::SWGSoapySDRInputSettings() { m_stream_arg_settings_isSet = false; device_arg_settings = nullptr; m_device_arg_settings_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGSoapySDRInputSettings::~SWGSoapySDRInputSettings() { @@ -124,6 +132,14 @@ SWGSoapySDRInputSettings::init() { m_stream_arg_settings_isSet = false; device_arg_settings = new QList(); m_device_arg_settings_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -182,6 +198,12 @@ SWGSoapySDRInputSettings::cleanup() { } delete device_arg_settings; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGSoapySDRInputSettings* @@ -239,6 +261,14 @@ SWGSoapySDRInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&stream_arg_settings, pJson["streamArgSettings"], "QList", "SWGArgValue"); ::SWGSDRangel::setValue(&device_arg_settings, pJson["deviceArgSettings"], "QList", "SWGArgValue"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -321,6 +351,18 @@ SWGSoapySDRInputSettings::asJsonObject() { if(device_arg_settings->size() > 0){ toJsonArray((QList*)device_arg_settings, obj, "deviceArgSettings", "SWGArgValue"); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -545,6 +587,46 @@ SWGSoapySDRInputSettings::setDeviceArgSettings(QList* device_arg_s this->m_device_arg_settings_isSet = true; } +qint32 +SWGSoapySDRInputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGSoapySDRInputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGSoapySDRInputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGSoapySDRInputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGSoapySDRInputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGSoapySDRInputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGSoapySDRInputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGSoapySDRInputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGSoapySDRInputSettings::isSet(){ @@ -572,6 +654,10 @@ SWGSoapySDRInputSettings::isSet(){ if(iq_correction != nullptr && iq_correction->isSet()){ isObjectUpdated = true; break;} if(stream_arg_settings->size() > 0){ isObjectUpdated = true; break;} if(device_arg_settings->size() > 0){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h index b56af90ab..f139bc43d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h @@ -111,6 +111,18 @@ public: QList* getDeviceArgSettings(); void setDeviceArgSettings(QList* device_arg_settings); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -181,6 +193,18 @@ private: QList* device_arg_settings; bool m_device_arg_settings_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp index 572af3fdb..a4de0f769 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.cpp @@ -64,6 +64,14 @@ SWGSoapySDROutputSettings::SWGSoapySDROutputSettings() { m_stream_arg_settings_isSet = false; device_arg_settings = nullptr; m_device_arg_settings_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } SWGSoapySDROutputSettings::~SWGSoapySDROutputSettings() { @@ -108,6 +116,14 @@ SWGSoapySDROutputSettings::init() { m_stream_arg_settings_isSet = false; device_arg_settings = new QList(); m_device_arg_settings_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; } void @@ -160,6 +176,12 @@ SWGSoapySDROutputSettings::cleanup() { } delete device_arg_settings; } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + } SWGSoapySDROutputSettings* @@ -209,6 +231,14 @@ SWGSoapySDROutputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&stream_arg_settings, pJson["streamArgSettings"], "QList", "SWGArgValue"); ::SWGSDRangel::setValue(&device_arg_settings, pJson["deviceArgSettings"], "QList", "SWGArgValue"); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + } QString @@ -279,6 +309,18 @@ SWGSoapySDROutputSettings::asJsonObject() { if(device_arg_settings->size() > 0){ toJsonArray((QList*)device_arg_settings, obj, "deviceArgSettings", "SWGArgValue"); } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } return obj; } @@ -463,6 +505,46 @@ SWGSoapySDROutputSettings::setDeviceArgSettings(QList* device_arg_ this->m_device_arg_settings_isSet = true; } +qint32 +SWGSoapySDROutputSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGSoapySDROutputSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGSoapySDROutputSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGSoapySDROutputSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGSoapySDROutputSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGSoapySDROutputSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGSoapySDROutputSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGSoapySDROutputSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + bool SWGSoapySDROutputSettings::isSet(){ @@ -486,6 +568,10 @@ SWGSoapySDROutputSettings::isSet(){ if(iq_correction != nullptr && iq_correction->isSet()){ isObjectUpdated = true; break;} if(stream_arg_settings->size() > 0){ isObjectUpdated = true; break;} if(device_arg_settings->size() > 0){ isObjectUpdated = true; break;} + if(m_use_reverse_api_isSet){ isObjectUpdated = true; break;} + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ isObjectUpdated = true; break;} + if(m_reverse_api_port_isSet){ isObjectUpdated = true; break;} + if(m_reverse_api_device_index_isSet){ isObjectUpdated = true; break;} }while(false); return isObjectUpdated; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.h b/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.h index 923b0fe18..5347c5b64 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDROutputSettings.h @@ -99,6 +99,18 @@ public: QList* getDeviceArgSettings(); void setDeviceArgSettings(QList* device_arg_settings); + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + virtual bool isSet() override; @@ -157,6 +169,18 @@ private: QList* device_arg_settings; bool m_device_arg_settings_isSet; + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + }; }