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

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/samplesource/bladerfinput/bladerfinput.cpp
+32 -32
View File
@@ -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<BladeRFInputSettings::fcPos_t>(response.getBladeRfInputSettings()->getFcPos());
settings.m_fcPos = static_cast<BladeRFInputSettings::fcPos_t>(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<bladerf_xb200_path>(response.getBladeRfInputSettings()->getXb200Path());
settings.m_xb200Path = static_cast<bladerf_xb200_path>(response.getBladeRf1InputSettings()->getXb200Path());
}
if (deviceSettingsKeys.contains("xb200Filter")) {
settings.m_xb200Filter = static_cast<bladerf_xb200_filter>(response.getBladeRfInputSettings()->getXb200Filter());
settings.m_xb200Filter = static_cast<bladerf_xb200_filter>(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);
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+3 -3
View File
@@ -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)
plugins/samplesource/bladerfinput/bladerfinputplugin.h
+2 -2
View File
@@ -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);