diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index 6e1e75a6b..d6bf5b6a0 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -705,16 +705,16 @@ int AirspyInput::webapiSettingsPutPatch( settings.m_fileRecordName = *response.getAirspySettings()->getFileRecordName(); } if (deviceSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getAirspySettings()->getUseReverseApi() != 0; } if (deviceSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getAirspySettings()->getReverseApiAddress(); } if (deviceSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getAirspySettings()->getReverseApiPort(); } if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getAirspySettings()->getReverseApiDeviceIndex(); } MsgConfigureAirspy *msg = MsgConfigureAirspy::create(settings, force); @@ -765,16 +765,16 @@ void AirspyInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res response.getAirspySettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } - response.getTestSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + response.getAirspySettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); - if (response.getTestSourceSettings()->getReverseApiAddress()) { - *response.getTestSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + if (response.getAirspySettings()->getReverseApiAddress()) { + *response.getAirspySettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; } else { - response.getTestSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + response.getAirspySettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); } - response.getTestSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); - response.getTestSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); + response.getAirspySettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getAirspySettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void AirspyInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesource/airspyhf/airspyhfinput.cpp b/plugins/samplesource/airspyhf/airspyhfinput.cpp index 2250dc39e..c3ab0f2de 100644 --- a/plugins/samplesource/airspyhf/airspyhfinput.cpp +++ b/plugins/samplesource/airspyhf/airspyhfinput.cpp @@ -573,16 +573,16 @@ int AirspyHFInput::webapiSettingsPutPatch( settings.m_fileRecordName = *response.getAirspyHfSettings()->getFileRecordName(); } if (deviceSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getAirspyHfSettings()->getUseReverseApi() != 0; } if (deviceSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getAirspyHfSettings()->getReverseApiAddress(); } if (deviceSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getAirspyHfSettings()->getReverseApiPort(); } if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getAirspyHfSettings()->getReverseApiDeviceIndex(); } MsgConfigureAirspyHF *msg = MsgConfigureAirspyHF::create(settings, force); @@ -614,16 +614,16 @@ void AirspyHFInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r response.getAirspyHfSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } - response.getTestSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + response.getAirspyHfSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); - if (response.getTestSourceSettings()->getReverseApiAddress()) { - *response.getTestSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + if (response.getAirspyHfSettings()->getReverseApiAddress()) { + *response.getAirspyHfSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; } else { - response.getTestSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + response.getAirspyHfSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); } - response.getTestSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); - response.getTestSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); + response.getAirspyHfSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getAirspyHfSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void AirspyHFInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/plugins/samplesource/bladerf1input/bladerf1input.cpp b/plugins/samplesource/bladerf1input/bladerf1input.cpp index 304958827..eb056bdf2 100644 --- a/plugins/samplesource/bladerf1input/bladerf1input.cpp +++ b/plugins/samplesource/bladerf1input/bladerf1input.cpp @@ -642,16 +642,16 @@ void Bladerf1Input::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r response.getBladeRf1InputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } - response.getTestSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + response.getBladeRf1InputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); - if (response.getTestSourceSettings()->getReverseApiAddress()) { - *response.getTestSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + if (response.getBladeRf1InputSettings()->getReverseApiAddress()) { + *response.getBladeRf1InputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; } else { - response.getTestSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + response.getBladeRf1InputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); } - response.getTestSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); - response.getTestSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); + response.getBladeRf1InputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getBladeRf1InputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } int Bladerf1Input::webapiSettingsPutPatch( @@ -706,16 +706,16 @@ int Bladerf1Input::webapiSettingsPutPatch( settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName(); } if (deviceSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getBladeRf1InputSettings()->getUseReverseApi() != 0; } if (deviceSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getBladeRf1InputSettings()->getReverseApiAddress(); } if (deviceSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getBladeRf1InputSettings()->getReverseApiPort(); } if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getBladeRf1InputSettings()->getReverseApiDeviceIndex(); } MsgConfigureBladerf1 *msg = MsgConfigureBladerf1::create(settings, force); diff --git a/plugins/samplesource/bladerf2input/bladerf2input.cpp b/plugins/samplesource/bladerf2input/bladerf2input.cpp index 215d8812f..a7a4eade1 100644 --- a/plugins/samplesource/bladerf2input/bladerf2input.cpp +++ b/plugins/samplesource/bladerf2input/bladerf2input.cpp @@ -1092,19 +1092,19 @@ int BladeRF2Input::webapiSettingsPutPatch( settings.m_transverterMode = response.getBladeRf2InputSettings()->getTransverterMode() != 0; } if (deviceSettingsKeys.contains("fileRecordName")) { - settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName(); + settings.m_fileRecordName = *response.getBladeRf2InputSettings()->getFileRecordName(); } if (deviceSettingsKeys.contains("useReverseAPI")) { - settings.m_useReverseAPI = response.getTestSourceSettings()->getUseReverseApi() != 0; + settings.m_useReverseAPI = response.getBladeRf2InputSettings()->getUseReverseApi() != 0; } if (deviceSettingsKeys.contains("reverseAPIAddress")) { - settings.m_reverseAPIAddress = *response.getTestSourceSettings()->getReverseApiAddress(); + settings.m_reverseAPIAddress = *response.getBladeRf2InputSettings()->getReverseApiAddress(); } if (deviceSettingsKeys.contains("reverseAPIPort")) { - settings.m_reverseAPIPort = response.getTestSourceSettings()->getReverseApiPort(); + settings.m_reverseAPIPort = response.getBladeRf2InputSettings()->getReverseApiPort(); } if (deviceSettingsKeys.contains("reverseAPIDeviceIndex")) { - settings.m_reverseAPIDeviceIndex = response.getTestSourceSettings()->getReverseApiDeviceIndex(); + settings.m_reverseAPIDeviceIndex = response.getBladeRf2InputSettings()->getReverseApiDeviceIndex(); } MsgConfigureBladeRF2 *msg = MsgConfigureBladeRF2::create(settings, force); @@ -1151,16 +1151,16 @@ void BladeRF2Input::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& r response.getBladeRf2InputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } - response.getTestSourceSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); + response.getBladeRf2InputSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0); - if (response.getTestSourceSettings()->getReverseApiAddress()) { - *response.getTestSourceSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; + if (response.getBladeRf2InputSettings()->getReverseApiAddress()) { + *response.getBladeRf2InputSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress; } else { - response.getTestSourceSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); + response.getBladeRf2InputSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress)); } - response.getTestSourceSettings()->setReverseApiPort(settings.m_reverseAPIPort); - response.getTestSourceSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); + response.getBladeRf2InputSettings()->setReverseApiPort(settings.m_reverseAPIPort); + response.getBladeRf2InputSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex); } void BladeRF2Input::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index d19df8b9e..f6061f479 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1006,6 +1006,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" : "AirspyHF" @@ -1076,6 +1089,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" : "Airspy" @@ -1381,6 +1407,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" : "BladeRF1" @@ -1486,6 +1525,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" : "BladeRF2" @@ -5232,7 +5284,7 @@ margin-bottom: 20px;