VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-05 07:24:44 -04:00
Code Issues Projects Releases Wiki Activity

LibbladeRF2: migrate REST API from bladerf to bladerf1

Browse Source
This commit is contained in:
f4exb
2018-09-19 05:54:07 +02:00
parent 8433f63a9b
commit bf726e16b1
222 changed files with 445 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesink/bladerfoutput/bladerfoutput.cpp
+20 -20
View File
@@ -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<bladerf_xb200_path>(response.getBladeRfOutputSettings()->getXb200Path());
settings.m_xb200Path = static_cast<bladerf_xb200_path>(response.getBladeRf1OutputSettings()->getXb200Path());
}
if (deviceSettingsKeys.contains("xb200Filter")) {
settings.m_xb200Filter = static_cast<bladerf_xb200_filter>(response.getBladeRfOutputSettings()->getXb200Filter());
settings.m_xb200Filter = static_cast<bladerf_xb200_filter>(response.getBladeRf1OutputSettings()->getXb200Filter());
}
MsgConfigureBladerf *msg = MsgConfigureBladerf::create(settings, force);
plugins/samplesink/bladerfoutput/bladerfoutputplugin.cpp
+3 -3
View File
@@ -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)
plugins/samplesink/bladerfoutput/bladerfoutputplugin.h
+2 -2
View File
@@ -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);