From bf726e16b1e659b00a7bed992d51cfc9eff36544 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 19 Sep 2018 05:54:07 +0200 Subject: [PATCH] LibbladeRF2: migrate REST API from bladerf to bladerf1 --- .../bladerfoutput/bladerfoutput.cpp | 40 ++++----- .../bladerfoutput/bladerfoutputplugin.cpp | 6 +- .../bladerfoutput/bladerfoutputplugin.h | 4 +- .../bladerfinput/bladerfinput.cpp | 64 +++++++-------- .../bladerfinput/bladerfinputplugin.cpp | 6 +- .../bladerfinput/bladerfinputplugin.h | 4 +- sdrbase/resources/res.qrc | 2 +- sdrbase/resources/webapi/doc/html2/index.html | 16 ++-- .../include/{BladeRF.yaml => BladeRF1.yaml} | 4 +- .../resources/webapi/doc/swagger/swagger.yaml | 10 +-- sdrbase/webapi/webapirequestmapper.cpp | 16 ++-- .../include/{BladeRF.yaml => BladeRF1.yaml} | 4 +- swagger/sdrangel/api/swagger/swagger.yaml | 10 +-- swagger/sdrangel/code/html2/index.html | 16 ++-- .../code/qt5/client/SWGAMDemodReport.cpp | 2 +- .../code/qt5/client/SWGAMDemodReport.h | 2 +- .../code/qt5/client/SWGAMDemodSettings.cpp | 2 +- .../code/qt5/client/SWGAMDemodSettings.h | 2 +- .../code/qt5/client/SWGAMModReport.cpp | 2 +- .../sdrangel/code/qt5/client/SWGAMModReport.h | 2 +- .../code/qt5/client/SWGAMModSettings.cpp | 2 +- .../code/qt5/client/SWGAMModSettings.h | 2 +- .../code/qt5/client/SWGATVModReport.cpp | 2 +- .../code/qt5/client/SWGATVModReport.h | 2 +- .../code/qt5/client/SWGATVModSettings.cpp | 2 +- .../code/qt5/client/SWGATVModSettings.h | 2 +- .../code/qt5/client/SWGAirspyHFReport.cpp | 2 +- .../code/qt5/client/SWGAirspyHFReport.h | 2 +- .../code/qt5/client/SWGAirspyHFSettings.cpp | 2 +- .../code/qt5/client/SWGAirspyHFSettings.h | 2 +- .../code/qt5/client/SWGAirspyReport.cpp | 2 +- .../code/qt5/client/SWGAirspyReport.h | 2 +- .../code/qt5/client/SWGAirspySettings.cpp | 2 +- .../code/qt5/client/SWGAirspySettings.h | 2 +- .../code/qt5/client/SWGAudioDevices.cpp | 2 +- .../code/qt5/client/SWGAudioDevices.h | 2 +- .../code/qt5/client/SWGAudioInputDevice.cpp | 2 +- .../code/qt5/client/SWGAudioInputDevice.h | 2 +- .../code/qt5/client/SWGAudioOutputDevice.cpp | 2 +- .../code/qt5/client/SWGAudioOutputDevice.h | 2 +- .../code/qt5/client/SWGBFMDemodReport.cpp | 2 +- .../code/qt5/client/SWGBFMDemodReport.h | 2 +- .../code/qt5/client/SWGBFMDemodSettings.cpp | 2 +- .../code/qt5/client/SWGBFMDemodSettings.h | 2 +- .../sdrangel/code/qt5/client/SWGBandwidth.cpp | 2 +- .../sdrangel/code/qt5/client/SWGBandwidth.h | 2 +- ...tings.cpp => SWGBladeRF1InputSettings.cpp} | 82 +++++++++---------- ...tSettings.h => SWGBladeRF1InputSettings.h} | 20 ++--- ...ings.cpp => SWGBladeRF1OutputSettings.cpp} | 62 +++++++------- ...Settings.h => SWGBladeRF1OutputSettings.h} | 20 ++--- .../code/qt5/client/SWGCWKeyerSettings.cpp | 2 +- .../code/qt5/client/SWGCWKeyerSettings.h | 2 +- .../sdrangel/code/qt5/client/SWGChannel.cpp | 2 +- swagger/sdrangel/code/qt5/client/SWGChannel.h | 2 +- .../code/qt5/client/SWGChannelListItem.cpp | 2 +- .../code/qt5/client/SWGChannelListItem.h | 2 +- .../code/qt5/client/SWGChannelReport.cpp | 2 +- .../code/qt5/client/SWGChannelReport.h | 2 +- .../code/qt5/client/SWGChannelSettings.cpp | 2 +- .../code/qt5/client/SWGChannelSettings.h | 2 +- .../code/qt5/client/SWGChannelsDetail.cpp | 2 +- .../code/qt5/client/SWGChannelsDetail.h | 2 +- .../code/qt5/client/SWGDSDDemodReport.cpp | 2 +- .../code/qt5/client/SWGDSDDemodReport.h | 2 +- .../code/qt5/client/SWGDSDDemodSettings.cpp | 2 +- .../code/qt5/client/SWGDSDDemodSettings.h | 2 +- .../code/qt5/client/SWGDVSeralDevices.cpp | 2 +- .../code/qt5/client/SWGDVSeralDevices.h | 2 +- .../code/qt5/client/SWGDVSerialDevice.cpp | 2 +- .../code/qt5/client/SWGDVSerialDevice.h | 2 +- .../code/qt5/client/SWGDaemonSinkSettings.cpp | 2 +- .../code/qt5/client/SWGDaemonSinkSettings.h | 2 +- .../code/qt5/client/SWGDaemonSourceReport.cpp | 2 +- .../code/qt5/client/SWGDaemonSourceReport.h | 2 +- .../qt5/client/SWGDaemonSourceSettings.cpp | 2 +- .../code/qt5/client/SWGDaemonSourceSettings.h | 2 +- .../code/qt5/client/SWGDeviceListItem.cpp | 2 +- .../code/qt5/client/SWGDeviceListItem.h | 2 +- .../code/qt5/client/SWGDeviceReport.cpp | 2 +- .../code/qt5/client/SWGDeviceReport.h | 2 +- .../sdrangel/code/qt5/client/SWGDeviceSet.cpp | 2 +- .../sdrangel/code/qt5/client/SWGDeviceSet.h | 2 +- .../code/qt5/client/SWGDeviceSetApi.cpp | 2 +- .../code/qt5/client/SWGDeviceSetApi.h | 2 +- .../code/qt5/client/SWGDeviceSetList.cpp | 2 +- .../code/qt5/client/SWGDeviceSetList.h | 2 +- .../code/qt5/client/SWGDeviceSettings.cpp | 66 +++++++-------- .../code/qt5/client/SWGDeviceSettings.h | 22 ++--- .../code/qt5/client/SWGDeviceState.cpp | 2 +- .../sdrangel/code/qt5/client/SWGDeviceState.h | 2 +- .../code/qt5/client/SWGErrorResponse.cpp | 2 +- .../code/qt5/client/SWGErrorResponse.h | 2 +- .../code/qt5/client/SWGFCDProPlusSettings.cpp | 2 +- .../code/qt5/client/SWGFCDProPlusSettings.h | 2 +- .../code/qt5/client/SWGFCDProSettings.cpp | 2 +- .../code/qt5/client/SWGFCDProSettings.h | 2 +- .../code/qt5/client/SWGFileSourceReport.cpp | 2 +- .../code/qt5/client/SWGFileSourceReport.h | 2 +- .../code/qt5/client/SWGFileSourceSettings.cpp | 2 +- .../code/qt5/client/SWGFileSourceSettings.h | 2 +- .../sdrangel/code/qt5/client/SWGFrequency.cpp | 2 +- .../sdrangel/code/qt5/client/SWGFrequency.h | 2 +- .../code/qt5/client/SWGFrequencyBand.cpp | 2 +- .../code/qt5/client/SWGFrequencyBand.h | 2 +- swagger/sdrangel/code/qt5/client/SWGGain.cpp | 2 +- swagger/sdrangel/code/qt5/client/SWGGain.h | 2 +- .../qt5/client/SWGHackRFInputSettings.cpp | 2 +- .../code/qt5/client/SWGHackRFInputSettings.h | 2 +- .../qt5/client/SWGHackRFOutputSettings.cpp | 2 +- .../code/qt5/client/SWGHackRFOutputSettings.h | 2 +- .../sdrangel/code/qt5/client/SWGHelpers.cpp | 2 +- swagger/sdrangel/code/qt5/client/SWGHelpers.h | 2 +- .../code/qt5/client/SWGHttpRequest.cpp | 2 +- .../sdrangel/code/qt5/client/SWGHttpRequest.h | 2 +- .../code/qt5/client/SWGInstanceApi.cpp | 2 +- .../sdrangel/code/qt5/client/SWGInstanceApi.h | 2 +- .../client/SWGInstanceChannelsResponse.cpp | 2 +- .../qt5/client/SWGInstanceChannelsResponse.h | 2 +- .../qt5/client/SWGInstanceDevicesResponse.cpp | 2 +- .../qt5/client/SWGInstanceDevicesResponse.h | 2 +- .../qt5/client/SWGInstanceSummaryResponse.cpp | 2 +- .../qt5/client/SWGInstanceSummaryResponse.h | 2 +- .../code/qt5/client/SWGLimeSdrInputReport.cpp | 2 +- .../code/qt5/client/SWGLimeSdrInputReport.h | 2 +- .../qt5/client/SWGLimeSdrInputSettings.cpp | 2 +- .../code/qt5/client/SWGLimeSdrInputSettings.h | 2 +- .../qt5/client/SWGLimeSdrOutputReport.cpp | 2 +- .../code/qt5/client/SWGLimeSdrOutputReport.h | 2 +- .../qt5/client/SWGLimeSdrOutputSettings.cpp | 2 +- .../qt5/client/SWGLimeSdrOutputSettings.h | 2 +- .../qt5/client/SWGLocationInformation.cpp | 2 +- .../code/qt5/client/SWGLocationInformation.h | 2 +- .../code/qt5/client/SWGLoggingInfo.cpp | 2 +- .../sdrangel/code/qt5/client/SWGLoggingInfo.h | 2 +- .../code/qt5/client/SWGModelFactory.h | 14 ++-- .../code/qt5/client/SWGNFMDemodReport.cpp | 2 +- .../code/qt5/client/SWGNFMDemodReport.h | 2 +- .../code/qt5/client/SWGNFMDemodSettings.cpp | 2 +- .../code/qt5/client/SWGNFMDemodSettings.h | 2 +- .../code/qt5/client/SWGNFMModReport.cpp | 2 +- .../code/qt5/client/SWGNFMModReport.h | 2 +- .../code/qt5/client/SWGNFMModSettings.cpp | 2 +- .../code/qt5/client/SWGNFMModSettings.h | 2 +- swagger/sdrangel/code/qt5/client/SWGObject.h | 2 +- .../code/qt5/client/SWGPerseusReport.cpp | 2 +- .../code/qt5/client/SWGPerseusReport.h | 2 +- .../code/qt5/client/SWGPerseusSettings.cpp | 2 +- .../code/qt5/client/SWGPerseusSettings.h | 2 +- .../qt5/client/SWGPlutoSdrInputReport.cpp | 2 +- .../code/qt5/client/SWGPlutoSdrInputReport.h | 2 +- .../qt5/client/SWGPlutoSdrInputSettings.cpp | 2 +- .../qt5/client/SWGPlutoSdrInputSettings.h | 2 +- .../qt5/client/SWGPlutoSdrOutputReport.cpp | 2 +- .../code/qt5/client/SWGPlutoSdrOutputReport.h | 2 +- .../qt5/client/SWGPlutoSdrOutputSettings.cpp | 2 +- .../qt5/client/SWGPlutoSdrOutputSettings.h | 2 +- .../code/qt5/client/SWGPresetExport.cpp | 2 +- .../code/qt5/client/SWGPresetExport.h | 2 +- .../code/qt5/client/SWGPresetGroup.cpp | 2 +- .../sdrangel/code/qt5/client/SWGPresetGroup.h | 2 +- .../code/qt5/client/SWGPresetIdentifier.cpp | 2 +- .../code/qt5/client/SWGPresetIdentifier.h | 2 +- .../code/qt5/client/SWGPresetImport.cpp | 2 +- .../code/qt5/client/SWGPresetImport.h | 2 +- .../code/qt5/client/SWGPresetItem.cpp | 2 +- .../sdrangel/code/qt5/client/SWGPresetItem.h | 2 +- .../code/qt5/client/SWGPresetTransfer.cpp | 2 +- .../code/qt5/client/SWGPresetTransfer.h | 2 +- .../sdrangel/code/qt5/client/SWGPresets.cpp | 2 +- swagger/sdrangel/code/qt5/client/SWGPresets.h | 2 +- .../sdrangel/code/qt5/client/SWGRDSReport.cpp | 2 +- .../sdrangel/code/qt5/client/SWGRDSReport.h | 2 +- .../client/SWGRDSReport_altFrequencies.cpp | 2 +- .../qt5/client/SWGRDSReport_altFrequencies.h | 2 +- .../code/qt5/client/SWGRtlSdrReport.cpp | 2 +- .../code/qt5/client/SWGRtlSdrReport.h | 2 +- .../code/qt5/client/SWGRtlSdrSettings.cpp | 2 +- .../code/qt5/client/SWGRtlSdrSettings.h | 2 +- .../code/qt5/client/SWGSDRPlayReport.cpp | 2 +- .../code/qt5/client/SWGSDRPlayReport.h | 2 +- .../code/qt5/client/SWGSDRPlaySettings.cpp | 2 +- .../code/qt5/client/SWGSDRPlaySettings.h | 2 +- .../qt5/client/SWGSDRdaemonSinkReport.cpp | 2 +- .../code/qt5/client/SWGSDRdaemonSinkReport.h | 2 +- .../qt5/client/SWGSDRdaemonSinkSettings.cpp | 2 +- .../qt5/client/SWGSDRdaemonSinkSettings.h | 2 +- .../qt5/client/SWGSDRdaemonSourceReport.cpp | 2 +- .../qt5/client/SWGSDRdaemonSourceReport.h | 2 +- .../qt5/client/SWGSDRdaemonSourceSettings.cpp | 2 +- .../qt5/client/SWGSDRdaemonSourceSettings.h | 2 +- .../code/qt5/client/SWGSSBDemodReport.cpp | 2 +- .../code/qt5/client/SWGSSBDemodReport.h | 2 +- .../code/qt5/client/SWGSSBDemodSettings.cpp | 2 +- .../code/qt5/client/SWGSSBDemodSettings.h | 2 +- .../code/qt5/client/SWGSSBModReport.cpp | 2 +- .../code/qt5/client/SWGSSBModReport.h | 2 +- .../code/qt5/client/SWGSSBModSettings.cpp | 2 +- .../code/qt5/client/SWGSSBModSettings.h | 2 +- .../code/qt5/client/SWGSampleRate.cpp | 2 +- .../sdrangel/code/qt5/client/SWGSampleRate.h | 2 +- .../code/qt5/client/SWGSamplingDevice.cpp | 2 +- .../code/qt5/client/SWGSamplingDevice.h | 2 +- .../code/qt5/client/SWGSuccessResponse.cpp | 2 +- .../code/qt5/client/SWGSuccessResponse.h | 2 +- .../code/qt5/client/SWGTestSourceSettings.cpp | 2 +- .../code/qt5/client/SWGTestSourceSettings.h | 2 +- .../code/qt5/client/SWGUDPSinkReport.cpp | 2 +- .../code/qt5/client/SWGUDPSinkReport.h | 2 +- .../code/qt5/client/SWGUDPSinkSettings.cpp | 2 +- .../code/qt5/client/SWGUDPSinkSettings.h | 2 +- .../code/qt5/client/SWGUDPSourceReport.cpp | 2 +- .../code/qt5/client/SWGUDPSourceReport.h | 2 +- .../code/qt5/client/SWGUDPSourceSettings.cpp | 2 +- .../code/qt5/client/SWGUDPSourceSettings.h | 2 +- .../code/qt5/client/SWGWFMDemodReport.cpp | 2 +- .../code/qt5/client/SWGWFMDemodReport.h | 2 +- .../code/qt5/client/SWGWFMDemodSettings.cpp | 2 +- .../code/qt5/client/SWGWFMDemodSettings.h | 2 +- .../code/qt5/client/SWGWFMModReport.cpp | 2 +- .../code/qt5/client/SWGWFMModReport.h | 2 +- .../code/qt5/client/SWGWFMModSettings.cpp | 2 +- .../code/qt5/client/SWGWFMModSettings.h | 2 +- 222 files changed, 445 insertions(+), 445 deletions(-) rename sdrbase/resources/webapi/doc/swagger/include/{BladeRF.yaml => BladeRF1.yaml} (94%) rename swagger/sdrangel/api/swagger/include/{BladeRF.yaml => BladeRF1.yaml} (94%) rename swagger/sdrangel/code/qt5/client/{SWGBladeRFInputSettings.cpp => SWGBladeRF1InputSettings.cpp} (81%) rename swagger/sdrangel/code/qt5/client/{SWGBladeRFInputSettings.h => SWGBladeRF1InputSettings.h} (89%) rename swagger/sdrangel/code/qt5/client/{SWGBladeRFOutputSettings.cpp => SWGBladeRF1OutputSettings.cpp} (80%) rename swagger/sdrangel/code/qt5/client/{SWGBladeRFOutputSettings.h => SWGBladeRF1OutputSettings.h} (87%) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index de47352e2..3fc74365a 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -538,23 +538,23 @@ int BladerfOutput::webapiSettingsGet( SWGSDRangel::SWGDeviceSettings& response, QString& errorMessage __attribute__((unused))) { - response.setBladeRfOutputSettings(new SWGSDRangel::SWGBladeRFOutputSettings()); - response.getBladeRfOutputSettings()->init(); + response.setBladeRf1OutputSettings(new SWGSDRangel::SWGBladeRF1OutputSettings()); + response.getBladeRf1OutputSettings()->init(); webapiFormatDeviceSettings(response, m_settings); return 200; } void BladerfOutput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const BladeRFOutputSettings& settings) { - response.getBladeRfOutputSettings()->setCenterFrequency(settings.m_centerFrequency); - response.getBladeRfOutputSettings()->setDevSampleRate(settings.m_devSampleRate); - response.getBladeRfOutputSettings()->setVga1(settings.m_vga1); - response.getBladeRfOutputSettings()->setVga2(settings.m_vga2); - response.getBladeRfOutputSettings()->setBandwidth(settings.m_bandwidth); - response.getBladeRfOutputSettings()->setLog2Interp(settings.m_log2Interp); - response.getBladeRfOutputSettings()->setXb200(settings.m_xb200 ? 1 : 0); - response.getBladeRfOutputSettings()->setXb200Path((int) settings.m_xb200Path); - response.getBladeRfOutputSettings()->setXb200Filter((int) settings.m_xb200Filter); + response.getBladeRf1OutputSettings()->setCenterFrequency(settings.m_centerFrequency); + response.getBladeRf1OutputSettings()->setDevSampleRate(settings.m_devSampleRate); + response.getBladeRf1OutputSettings()->setVga1(settings.m_vga1); + response.getBladeRf1OutputSettings()->setVga2(settings.m_vga2); + response.getBladeRf1OutputSettings()->setBandwidth(settings.m_bandwidth); + response.getBladeRf1OutputSettings()->setLog2Interp(settings.m_log2Interp); + response.getBladeRf1OutputSettings()->setXb200(settings.m_xb200 ? 1 : 0); + response.getBladeRf1OutputSettings()->setXb200Path((int) settings.m_xb200Path); + response.getBladeRf1OutputSettings()->setXb200Filter((int) settings.m_xb200Filter); } int BladerfOutput::webapiSettingsPutPatch( @@ -566,31 +566,31 @@ int BladerfOutput::webapiSettingsPutPatch( BladeRFOutputSettings settings = m_settings; if (deviceSettingsKeys.contains("centerFrequency")) { - settings.m_centerFrequency = response.getBladeRfOutputSettings()->getCenterFrequency(); + settings.m_centerFrequency = response.getBladeRf1OutputSettings()->getCenterFrequency(); } if (deviceSettingsKeys.contains("devSampleRate")) { - settings.m_devSampleRate = response.getBladeRfOutputSettings()->getDevSampleRate(); + settings.m_devSampleRate = response.getBladeRf1OutputSettings()->getDevSampleRate(); } if (deviceSettingsKeys.contains("vga1")) { - settings.m_vga1 = response.getBladeRfOutputSettings()->getVga1(); + settings.m_vga1 = response.getBladeRf1OutputSettings()->getVga1(); } if (deviceSettingsKeys.contains("vga2")) { - settings.m_vga2 = response.getBladeRfOutputSettings()->getVga2(); + settings.m_vga2 = response.getBladeRf1OutputSettings()->getVga2(); } if (deviceSettingsKeys.contains("bandwidth")) { - settings.m_bandwidth = response.getBladeRfOutputSettings()->getBandwidth(); + settings.m_bandwidth = response.getBladeRf1OutputSettings()->getBandwidth(); } if (deviceSettingsKeys.contains("log2Interp")) { - settings.m_log2Interp = response.getBladeRfOutputSettings()->getLog2Interp(); + settings.m_log2Interp = response.getBladeRf1OutputSettings()->getLog2Interp(); } if (deviceSettingsKeys.contains("xb200")) { - settings.m_xb200 = response.getBladeRfOutputSettings()->getXb200() == 0 ? 0 : 1; + settings.m_xb200 = response.getBladeRf1OutputSettings()->getXb200() == 0 ? 0 : 1; } if (deviceSettingsKeys.contains("xb200Path")) { - settings.m_xb200Path = static_cast(response.getBladeRfOutputSettings()->getXb200Path()); + settings.m_xb200Path = static_cast(response.getBladeRf1OutputSettings()->getXb200Path()); } if (deviceSettingsKeys.contains("xb200Filter")) { - settings.m_xb200Filter = static_cast(response.getBladeRfOutputSettings()->getXb200Filter()); + settings.m_xb200Filter = static_cast(response.getBladeRf1OutputSettings()->getXb200Filter()); } MsgConfigureBladerf *msg = MsgConfigureBladerf::create(settings, force); diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp index 2dc8e7df4..82bd8574f 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp @@ -29,7 +29,7 @@ #endif const PluginDescriptor BladerfOutputPlugin::m_pluginDescriptor = { - QString("BladeRF Output"), + QString("BladeRF1 Output"), QString("4.2.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), @@ -37,8 +37,8 @@ const PluginDescriptor BladerfOutputPlugin::m_pluginDescriptor = { QString("https://github.com/f4exb/sdrangel") }; -const QString BladerfOutputPlugin::m_hardwareID = "BladeRF"; -const QString BladerfOutputPlugin::m_deviceTypeID = BLADERFOUTPUT_DEVICE_TYPE_ID; +const QString BladerfOutputPlugin::m_hardwareID = "BladeRF1"; +const QString BladerfOutputPlugin::m_deviceTypeID = BLADERF1OUTPUT_DEVICE_TYPE_ID; BladerfOutputPlugin::BladerfOutputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h index a2e057995..1ba913aac 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutputplugin.h @@ -22,12 +22,12 @@ class PluginAPI; -#define BLADERFOUTPUT_DEVICE_TYPE_ID "sdrangel.samplesource.bladerfoutput" +#define BLADERF1OUTPUT_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf1output" class BladerfOutputPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID BLADERFOUTPUT_DEVICE_TYPE_ID) + Q_PLUGIN_METADATA(IID BLADERF1OUTPUT_DEVICE_TYPE_ID) public: explicit BladerfOutputPlugin(QObject* parent = NULL); diff --git a/plugins/samplesource/bladerfinput/bladerfinput.cpp b/plugins/samplesource/bladerfinput/bladerfinput.cpp index 14ad45706..97308c2f5 100644 --- a/plugins/samplesource/bladerfinput/bladerfinput.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinput.cpp @@ -611,32 +611,32 @@ int BladerfInput::webapiSettingsGet( SWGSDRangel::SWGDeviceSettings& response, QString& errorMessage __attribute__((unused))) { - response.setBladeRfInputSettings(new SWGSDRangel::SWGBladeRFInputSettings()); - response.getBladeRfInputSettings()->init(); + response.setBladeRf1InputSettings(new SWGSDRangel::SWGBladeRF1InputSettings()); + response.getBladeRf1InputSettings()->init(); webapiFormatDeviceSettings(response, m_settings); return 200; } void BladerfInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const BladeRFInputSettings& settings) { - response.getBladeRfInputSettings()->setCenterFrequency(settings.m_centerFrequency); - response.getBladeRfInputSettings()->setDevSampleRate(settings.m_devSampleRate); - response.getBladeRfInputSettings()->setLnaGain(settings.m_lnaGain); - response.getBladeRfInputSettings()->setVga1(settings.m_vga1); - response.getBladeRfInputSettings()->setVga2(settings.m_vga2); - response.getBladeRfInputSettings()->setBandwidth(settings.m_bandwidth); - response.getBladeRfInputSettings()->setLog2Decim(settings.m_log2Decim); - response.getBladeRfInputSettings()->setFcPos((int) settings.m_fcPos); - response.getBladeRfInputSettings()->setXb200(settings.m_xb200 ? 1 : 0); - response.getBladeRfInputSettings()->setXb200Path((int) settings.m_xb200Path); - response.getBladeRfInputSettings()->setXb200Filter((int) settings.m_xb200Filter); - response.getBladeRfInputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0); - response.getBladeRfInputSettings()->setIqCorrection(settings.m_iqCorrection ? 1 : 0); + response.getBladeRf1InputSettings()->setCenterFrequency(settings.m_centerFrequency); + response.getBladeRf1InputSettings()->setDevSampleRate(settings.m_devSampleRate); + response.getBladeRf1InputSettings()->setLnaGain(settings.m_lnaGain); + response.getBladeRf1InputSettings()->setVga1(settings.m_vga1); + response.getBladeRf1InputSettings()->setVga2(settings.m_vga2); + response.getBladeRf1InputSettings()->setBandwidth(settings.m_bandwidth); + response.getBladeRf1InputSettings()->setLog2Decim(settings.m_log2Decim); + response.getBladeRf1InputSettings()->setFcPos((int) settings.m_fcPos); + response.getBladeRf1InputSettings()->setXb200(settings.m_xb200 ? 1 : 0); + response.getBladeRf1InputSettings()->setXb200Path((int) settings.m_xb200Path); + response.getBladeRf1InputSettings()->setXb200Filter((int) settings.m_xb200Filter); + response.getBladeRf1InputSettings()->setDcBlock(settings.m_dcBlock ? 1 : 0); + response.getBladeRf1InputSettings()->setIqCorrection(settings.m_iqCorrection ? 1 : 0); - if (response.getBladeRfInputSettings()->getFileRecordName()) { - *response.getBladeRfInputSettings()->getFileRecordName() = settings.m_fileRecordName; + if (response.getBladeRf1InputSettings()->getFileRecordName()) { + *response.getBladeRf1InputSettings()->getFileRecordName() = settings.m_fileRecordName; } else { - response.getBladeRfInputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); + response.getBladeRf1InputSettings()->setFileRecordName(new QString(settings.m_fileRecordName)); } } @@ -649,46 +649,46 @@ int BladerfInput::webapiSettingsPutPatch( BladeRFInputSettings settings = m_settings; if (deviceSettingsKeys.contains("centerFrequency")) { - settings.m_centerFrequency = response.getBladeRfInputSettings()->getCenterFrequency(); + settings.m_centerFrequency = response.getBladeRf1InputSettings()->getCenterFrequency(); } if (deviceSettingsKeys.contains("devSampleRate")) { - settings.m_devSampleRate = response.getBladeRfInputSettings()->getDevSampleRate(); + settings.m_devSampleRate = response.getBladeRf1InputSettings()->getDevSampleRate(); } if (deviceSettingsKeys.contains("lnaGain")) { - settings.m_lnaGain = response.getBladeRfInputSettings()->getLnaGain(); + settings.m_lnaGain = response.getBladeRf1InputSettings()->getLnaGain(); } if (deviceSettingsKeys.contains("vga1")) { - settings.m_vga1 = response.getBladeRfInputSettings()->getVga1(); + settings.m_vga1 = response.getBladeRf1InputSettings()->getVga1(); } if (deviceSettingsKeys.contains("vga2")) { - settings.m_vga2 = response.getBladeRfInputSettings()->getVga2(); + settings.m_vga2 = response.getBladeRf1InputSettings()->getVga2(); } if (deviceSettingsKeys.contains("bandwidth")) { - settings.m_bandwidth = response.getBladeRfInputSettings()->getBandwidth(); + settings.m_bandwidth = response.getBladeRf1InputSettings()->getBandwidth(); } if (deviceSettingsKeys.contains("log2Decim")) { - settings.m_log2Decim = response.getBladeRfInputSettings()->getLog2Decim(); + settings.m_log2Decim = response.getBladeRf1InputSettings()->getLog2Decim(); } if (deviceSettingsKeys.contains("fcPos")) { - settings.m_fcPos = static_cast(response.getBladeRfInputSettings()->getFcPos()); + settings.m_fcPos = static_cast(response.getBladeRf1InputSettings()->getFcPos()); } if (deviceSettingsKeys.contains("xb200")) { - settings.m_xb200 = response.getBladeRfInputSettings()->getXb200() == 0 ? 0 : 1; + settings.m_xb200 = response.getBladeRf1InputSettings()->getXb200() == 0 ? 0 : 1; } if (deviceSettingsKeys.contains("xb200Path")) { - settings.m_xb200Path = static_cast(response.getBladeRfInputSettings()->getXb200Path()); + settings.m_xb200Path = static_cast(response.getBladeRf1InputSettings()->getXb200Path()); } if (deviceSettingsKeys.contains("xb200Filter")) { - settings.m_xb200Filter = static_cast(response.getBladeRfInputSettings()->getXb200Filter()); + settings.m_xb200Filter = static_cast(response.getBladeRf1InputSettings()->getXb200Filter()); } if (deviceSettingsKeys.contains("dcBlock")) { - settings.m_dcBlock = response.getBladeRfInputSettings()->getDcBlock() != 0; + settings.m_dcBlock = response.getBladeRf1InputSettings()->getDcBlock() != 0; } if (deviceSettingsKeys.contains("iqCorrection")) { - settings.m_iqCorrection = response.getBladeRfInputSettings()->getIqCorrection() != 0; + settings.m_iqCorrection = response.getBladeRf1InputSettings()->getIqCorrection() != 0; } if (deviceSettingsKeys.contains("fileRecordName")) { - settings.m_fileRecordName = *response.getBladeRfInputSettings()->getFileRecordName(); + settings.m_fileRecordName = *response.getBladeRf1InputSettings()->getFileRecordName(); } MsgConfigureBladerf *msg = MsgConfigureBladerf::create(settings, force); diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp index b9a79a471..e6c979d74 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp @@ -29,7 +29,7 @@ #endif const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = { - QString("BladeRF Input"), + QString("BladeRF1 Input"), QString("4.2.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), @@ -37,8 +37,8 @@ const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = { QString("https://github.com/f4exb/sdrangel") }; -const QString BlderfInputPlugin::m_hardwareID = "BladeRF"; -const QString BlderfInputPlugin::m_deviceTypeID = BLADERF_DEVICE_TYPE_ID; +const QString BlderfInputPlugin::m_hardwareID = "BladeRF1"; +const QString BlderfInputPlugin::m_deviceTypeID = BLADERF1INPUT_DEVICE_TYPE_ID; BlderfInputPlugin::BlderfInputPlugin(QObject* parent) : QObject(parent) diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.h b/plugins/samplesource/bladerfinput/bladerfinputplugin.h index d9fcb6599..83ea9429a 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.h +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.h @@ -24,12 +24,12 @@ class PluginAPI; class DeviceSourceAPI; class DeviceUISet; -#define BLADERF_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf" +#define BLADERF1INPUT_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf1input" class BlderfInputPlugin : public QObject, public PluginInterface { Q_OBJECT Q_INTERFACES(PluginInterface) - Q_PLUGIN_METADATA(IID BLADERF_DEVICE_TYPE_ID) + Q_PLUGIN_METADATA(IID BLADERF1INPUT_DEVICE_TYPE_ID) public: explicit BlderfInputPlugin(QObject* parent = NULL); diff --git a/sdrbase/resources/res.qrc b/sdrbase/resources/res.qrc index 51145dc6a..9df5f8c67 100644 --- a/sdrbase/resources/res.qrc +++ b/sdrbase/resources/res.qrc @@ -8,7 +8,7 @@ webapi/doc/swagger/include/AMMod.yaml webapi/doc/swagger/include/ATVMod.yaml webapi/doc/swagger/include/BFMDemod.yaml - webapi/doc/swagger/include/BladeRF.yaml + webapi/doc/swagger/include/BladeRF1.yaml webapi/doc/swagger/include/CWKeyer.yaml webapi/doc/swagger/include/DSDDemod.yaml webapi/doc/swagger/include/FCDPro.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index c6de6f988..61e28cb46 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1221,7 +1221,7 @@ margin-bottom: 20px; }, "description" : "A bandwidth expressed in Hertz (Hz)" }; - defs.BladeRFInputSettings = { + defs.BladeRF1InputSettings = { "properties" : { "centerFrequency" : { "type" : "integer", @@ -1269,7 +1269,7 @@ margin-bottom: 20px; }, "description" : "BladeRF" }; - defs.BladeRFOutputSettings = { + defs.BladeRF1OutputSettings = { "properties" : { "centerFrequency" : { "type" : "integer", @@ -1929,11 +1929,11 @@ margin-bottom: 20px; "airspyHFSettings" : { "$ref" : "#/definitions/AirspyHFSettings" }, - "bladeRFInputSettings" : { - "$ref" : "#/definitions/BladeRFInputSettings" + "bladeRF1InputSettings" : { + "$ref" : "#/definitions/BladeRF1InputSettings" }, - "bladeRFOutputSettings" : { - "$ref" : "#/definitions/BladeRFOutputSettings" + "bladeRF1OutputSettings" : { + "$ref" : "#/definitions/BladeRF1OutputSettings" }, "fcdProSettings" : { "$ref" : "#/definitions/FCDProSettings" @@ -4198,7 +4198,7 @@ margin-bottom: 20px;