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

REST API: implement reverse API settings (3)

Browse Source
This commit is contained in:
f4exb
2019-01-11 14:45:00 +01:00
parent 3e096580b0
commit 0215839220
85 changed files with 2794 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/soapysdrinput/soapysdrinput.cpp
+24
View File
@@ -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)
plugins/samplesource/soapysdrinput/soapysdrinputplugin.cpp
+1 -1
View File
@@ -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,