From b7e5e2bbc5ebb4a6fddf77168f94fd8c2c131a7e Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 16 Sep 2019 01:17:46 +0200 Subject: [PATCH] BladeRF2 MIMO web API objects --- sdrbase/resources/webapi/doc/html2/index.html | 106 ++- .../webapi/doc/swagger/include/BladeRF2.yaml | 72 ++ .../doc/swagger/include/DeviceSettings.yaml | 2 + .../api/swagger/include/BladeRF2.yaml | 72 ++ .../api/swagger/include/DeviceSettings.yaml | 2 + swagger/sdrangel/code/html2/index.html | 106 ++- .../qt5/client/SWGBladeRF2MIMOSettings.cpp | 733 ++++++++++++++++++ .../code/qt5/client/SWGBladeRF2MIMOSettings.h | 221 ++++++ .../code/qt5/client/SWGDeviceSettings.cpp | 25 + .../code/qt5/client/SWGDeviceSettings.h | 7 + .../code/qt5/client/SWGModelFactory.h | 4 + 11 files changed, 1348 insertions(+), 2 deletions(-) create mode 100644 swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp create mode 100644 swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 467bae291..5ad54fe5d 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1747,6 +1747,107 @@ margin-bottom: 20px; } }, "description" : "BladeRF2" +}; + defs.BladeRF2MIMOSettings = { + "properties" : { + "devSampleRate" : { + "type" : "integer" + }, + "LOppmTenths" : { + "type" : "integer" + }, + "rxCenterFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "log2Decim" : { + "type" : "integer" + }, + "fcPos" : { + "type" : "integer", + "description" : "See BladeRF2MIMO::fcPos_t" + }, + "rxBandwidth" : { + "type" : "integer" + }, + "rx0GainMode" : { + "type" : "integer" + }, + "rx0GlobalGain" : { + "type" : "integer" + }, + "rx1GainMode" : { + "type" : "integer" + }, + "rx1GlobalGain" : { + "type" : "integer" + }, + "rxBiasTee" : { + "type" : "integer", + "description" : "boolean" + }, + "dcBlock" : { + "type" : "integer", + "description" : "boolean" + }, + "iqCorrection" : { + "type" : "integer", + "description" : "boolean" + }, + "rxTransverterMode" : { + "type" : "integer", + "description" : "boolean" + }, + "rxTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "txCenterFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "log2Interp" : { + "type" : "integer" + }, + "txBandwidth" : { + "type" : "integer" + }, + "tx0GlobalGain" : { + "type" : "integer" + }, + "tx1GlobalGain" : { + "type" : "integer" + }, + "txBiasTee" : { + "type" : "integer", + "description" : "boolean" + }, + "txTransverterMode" : { + "type" : "integer", + "description" : "boolean" + }, + "txTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "fileRecordName" : { + "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "boolean" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + } + }, + "description" : "BladeRF2" }; defs.BladeRF2OutputReport = { "properties" : { @@ -2688,6 +2789,9 @@ margin-bottom: 20px; "bladeRF2OutputSettings" : { "$ref" : "#/definitions/BladeRF2OutputSettings" }, + "bladeRF2MIMOSettings" : { + "$ref" : "#/definitions/BladeRF2MIMOSettings" + }, "fcdProSettings" : { "$ref" : "#/definitions/FCDProSettings" }, @@ -28228,7 +28332,7 @@ except ApiException as e:
- Generated 2019-08-28T08:25:28.542+02:00 + Generated 2019-09-15T23:01:58.850+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml index 52fed234d..77df11a72 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml @@ -101,3 +101,75 @@ BladeRF2OutputReport: $ref: "/doc/swagger/include/Structs.yaml#/Range" globalGainRange: $ref: "/doc/swagger/include/Structs.yaml#/Range" + +BladeRF2MIMOSettings: + description: BladeRF2 + properties: + devSampleRate: + type: integer + LOppmTenths: + type: integer + rxCenterFrequency: + type: integer + format: int64 + log2Decim: + type: integer + fcPos: + description: See BladeRF2MIMO::fcPos_t + type: integer + rxBandwidth: + type: integer + rx0GainMode: + type: integer + rx0GlobalGain: + type: integer + rx1GainMode: + type: integer + rx1GlobalGain: + type: integer + rxBiasTee: + description: boolean + type: integer + dcBlock: + description: boolean + type: integer + iqCorrection: + description: boolean + type: integer + rxTransverterMode: + description: boolean + type: integer + rxTransverterDeltaFrequency: + type: integer + format: int64 + txCenterFrequency: + type: integer + format: int64 + log2Interp: + type: integer + txBandwidth: + type: integer + tx0GlobalGain: + type: integer + tx1GlobalGain: + type: integer + txBiasTee: + description: boolean + type: integer + txTransverterMode: + description: boolean + type: integer + txTransverterDeltaFrequency: + type: integer + format: int64 + fileRecordName: + type: string + useReverseAPI: + description: boolean + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml index fc5c776b0..61bc48dab 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml @@ -26,6 +26,8 @@ DeviceSettings: $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" bladeRF2OutputSettings: $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" + bladeRF2MIMOSettings: + $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2MIMOSettings" fcdProSettings: $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProSettings" fcdProPlusSettings: diff --git a/swagger/sdrangel/api/swagger/include/BladeRF2.yaml b/swagger/sdrangel/api/swagger/include/BladeRF2.yaml index e6c692a05..d6bc003d7 100644 --- a/swagger/sdrangel/api/swagger/include/BladeRF2.yaml +++ b/swagger/sdrangel/api/swagger/include/BladeRF2.yaml @@ -101,3 +101,75 @@ BladeRF2OutputReport: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/Range" globalGainRange: $ref: "http://localhost:8081/api/swagger/include/Structs.yaml#/Range" + +BladeRF2MIMOSettings: + description: BladeRF2 + properties: + devSampleRate: + type: integer + LOppmTenths: + type: integer + rxCenterFrequency: + type: integer + format: int64 + log2Decim: + type: integer + fcPos: + description: See BladeRF2MIMO::fcPos_t + type: integer + rxBandwidth: + type: integer + rx0GainMode: + type: integer + rx0GlobalGain: + type: integer + rx1GainMode: + type: integer + rx1GlobalGain: + type: integer + rxBiasTee: + description: boolean + type: integer + dcBlock: + description: boolean + type: integer + iqCorrection: + description: boolean + type: integer + rxTransverterMode: + description: boolean + type: integer + rxTransverterDeltaFrequency: + type: integer + format: int64 + txCenterFrequency: + type: integer + format: int64 + log2Interp: + type: integer + txBandwidth: + type: integer + tx0GlobalGain: + type: integer + tx1GlobalGain: + type: integer + txBiasTee: + description: boolean + type: integer + txTransverterMode: + description: boolean + type: integer + txTransverterDeltaFrequency: + type: integer + format: int64 + fileRecordName: + type: string + useReverseAPI: + description: boolean + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml b/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml index 83056d97c..550400585 100644 --- a/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml +++ b/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml @@ -26,6 +26,8 @@ DeviceSettings: $ref: "http://localhost:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" bladeRF2OutputSettings: $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" + bladeRF2MIMOSettings: + $ref: "http://localhost:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2MIMOSettings" fcdProSettings: $ref: "http://localhost:8081/api/swagger/include/FCDPro.yaml#/FCDProSettings" fcdProPlusSettings: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 467bae291..5ad54fe5d 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1747,6 +1747,107 @@ margin-bottom: 20px; } }, "description" : "BladeRF2" +}; + defs.BladeRF2MIMOSettings = { + "properties" : { + "devSampleRate" : { + "type" : "integer" + }, + "LOppmTenths" : { + "type" : "integer" + }, + "rxCenterFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "log2Decim" : { + "type" : "integer" + }, + "fcPos" : { + "type" : "integer", + "description" : "See BladeRF2MIMO::fcPos_t" + }, + "rxBandwidth" : { + "type" : "integer" + }, + "rx0GainMode" : { + "type" : "integer" + }, + "rx0GlobalGain" : { + "type" : "integer" + }, + "rx1GainMode" : { + "type" : "integer" + }, + "rx1GlobalGain" : { + "type" : "integer" + }, + "rxBiasTee" : { + "type" : "integer", + "description" : "boolean" + }, + "dcBlock" : { + "type" : "integer", + "description" : "boolean" + }, + "iqCorrection" : { + "type" : "integer", + "description" : "boolean" + }, + "rxTransverterMode" : { + "type" : "integer", + "description" : "boolean" + }, + "rxTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "txCenterFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "log2Interp" : { + "type" : "integer" + }, + "txBandwidth" : { + "type" : "integer" + }, + "tx0GlobalGain" : { + "type" : "integer" + }, + "tx1GlobalGain" : { + "type" : "integer" + }, + "txBiasTee" : { + "type" : "integer", + "description" : "boolean" + }, + "txTransverterMode" : { + "type" : "integer", + "description" : "boolean" + }, + "txTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "fileRecordName" : { + "type" : "string" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "boolean" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + } + }, + "description" : "BladeRF2" }; defs.BladeRF2OutputReport = { "properties" : { @@ -2688,6 +2789,9 @@ margin-bottom: 20px; "bladeRF2OutputSettings" : { "$ref" : "#/definitions/BladeRF2OutputSettings" }, + "bladeRF2MIMOSettings" : { + "$ref" : "#/definitions/BladeRF2MIMOSettings" + }, "fcdProSettings" : { "$ref" : "#/definitions/FCDProSettings" }, @@ -28228,7 +28332,7 @@ except ApiException as e:
- Generated 2019-08-28T08:25:28.542+02:00 + Generated 2019-09-15T23:01:58.850+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp new file mode 100644 index 000000000..e03801b4b --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp @@ -0,0 +1,733 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 4.11.6 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + + +#include "SWGBladeRF2MIMOSettings.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGBladeRF2MIMOSettings::SWGBladeRF2MIMOSettings(QString* json) { + init(); + this->fromJson(*json); +} + +SWGBladeRF2MIMOSettings::SWGBladeRF2MIMOSettings() { + dev_sample_rate = 0; + m_dev_sample_rate_isSet = false; + l_oppm_tenths = 0; + m_l_oppm_tenths_isSet = false; + rx_center_frequency = 0L; + m_rx_center_frequency_isSet = false; + log2_decim = 0; + m_log2_decim_isSet = false; + fc_pos = 0; + m_fc_pos_isSet = false; + rx_bandwidth = 0; + m_rx_bandwidth_isSet = false; + rx0_gain_mode = 0; + m_rx0_gain_mode_isSet = false; + rx0_global_gain = 0; + m_rx0_global_gain_isSet = false; + rx1_gain_mode = 0; + m_rx1_gain_mode_isSet = false; + rx1_global_gain = 0; + m_rx1_global_gain_isSet = false; + rx_bias_tee = 0; + m_rx_bias_tee_isSet = false; + dc_block = 0; + m_dc_block_isSet = false; + iq_correction = 0; + m_iq_correction_isSet = false; + rx_transverter_mode = 0; + m_rx_transverter_mode_isSet = false; + rx_transverter_delta_frequency = 0L; + m_rx_transverter_delta_frequency_isSet = false; + tx_center_frequency = 0L; + m_tx_center_frequency_isSet = false; + log2_interp = 0; + m_log2_interp_isSet = false; + tx_bandwidth = 0; + m_tx_bandwidth_isSet = false; + tx0_global_gain = 0; + m_tx0_global_gain_isSet = false; + tx1_global_gain = 0; + m_tx1_global_gain_isSet = false; + tx_bias_tee = 0; + m_tx_bias_tee_isSet = false; + tx_transverter_mode = 0; + m_tx_transverter_mode_isSet = false; + tx_transverter_delta_frequency = 0L; + m_tx_transverter_delta_frequency_isSet = false; + file_record_name = nullptr; + m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = nullptr; + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; +} + +SWGBladeRF2MIMOSettings::~SWGBladeRF2MIMOSettings() { + this->cleanup(); +} + +void +SWGBladeRF2MIMOSettings::init() { + dev_sample_rate = 0; + m_dev_sample_rate_isSet = false; + l_oppm_tenths = 0; + m_l_oppm_tenths_isSet = false; + rx_center_frequency = 0L; + m_rx_center_frequency_isSet = false; + log2_decim = 0; + m_log2_decim_isSet = false; + fc_pos = 0; + m_fc_pos_isSet = false; + rx_bandwidth = 0; + m_rx_bandwidth_isSet = false; + rx0_gain_mode = 0; + m_rx0_gain_mode_isSet = false; + rx0_global_gain = 0; + m_rx0_global_gain_isSet = false; + rx1_gain_mode = 0; + m_rx1_gain_mode_isSet = false; + rx1_global_gain = 0; + m_rx1_global_gain_isSet = false; + rx_bias_tee = 0; + m_rx_bias_tee_isSet = false; + dc_block = 0; + m_dc_block_isSet = false; + iq_correction = 0; + m_iq_correction_isSet = false; + rx_transverter_mode = 0; + m_rx_transverter_mode_isSet = false; + rx_transverter_delta_frequency = 0L; + m_rx_transverter_delta_frequency_isSet = false; + tx_center_frequency = 0L; + m_tx_center_frequency_isSet = false; + log2_interp = 0; + m_log2_interp_isSet = false; + tx_bandwidth = 0; + m_tx_bandwidth_isSet = false; + tx0_global_gain = 0; + m_tx0_global_gain_isSet = false; + tx1_global_gain = 0; + m_tx1_global_gain_isSet = false; + tx_bias_tee = 0; + m_tx_bias_tee_isSet = false; + tx_transverter_mode = 0; + m_tx_transverter_mode_isSet = false; + tx_transverter_delta_frequency = 0L; + m_tx_transverter_delta_frequency_isSet = false; + file_record_name = new QString(""); + m_file_record_name_isSet = false; + use_reverse_api = 0; + m_use_reverse_api_isSet = false; + reverse_api_address = new QString(""); + m_reverse_api_address_isSet = false; + reverse_api_port = 0; + m_reverse_api_port_isSet = false; + reverse_api_device_index = 0; + m_reverse_api_device_index_isSet = false; +} + +void +SWGBladeRF2MIMOSettings::cleanup() { + + + + + + + + + + + + + + + + + + + + + + + + if(file_record_name != nullptr) { + delete file_record_name; + } + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + +} + +SWGBladeRF2MIMOSettings* +SWGBladeRF2MIMOSettings::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGBladeRF2MIMOSettings::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&dev_sample_rate, pJson["devSampleRate"], "qint32", ""); + + ::SWGSDRangel::setValue(&l_oppm_tenths, pJson["LOppmTenths"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx_center_frequency, pJson["rxCenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&log2_decim, pJson["log2Decim"], "qint32", ""); + + ::SWGSDRangel::setValue(&fc_pos, pJson["fcPos"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx_bandwidth, pJson["rxBandwidth"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx0_gain_mode, pJson["rx0GainMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx0_global_gain, pJson["rx0GlobalGain"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx1_gain_mode, pJson["rx1GainMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx1_global_gain, pJson["rx1GlobalGain"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx_bias_tee, pJson["rxBiasTee"], "qint32", ""); + + ::SWGSDRangel::setValue(&dc_block, pJson["dcBlock"], "qint32", ""); + + ::SWGSDRangel::setValue(&iq_correction, pJson["iqCorrection"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx_transverter_mode, pJson["rxTransverterMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx_transverter_delta_frequency, pJson["rxTransverterDeltaFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&tx_center_frequency, pJson["txCenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&log2_interp, pJson["log2Interp"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_bandwidth, pJson["txBandwidth"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx0_global_gain, pJson["tx0GlobalGain"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx1_global_gain, pJson["tx1GlobalGain"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_bias_tee, pJson["txBiasTee"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_transverter_mode, pJson["txTransverterMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_transverter_delta_frequency, pJson["txTransverterDeltaFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); + + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); + + ::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", ""); + + ::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", ""); + +} + +QString +SWGBladeRF2MIMOSettings::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGBladeRF2MIMOSettings::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_dev_sample_rate_isSet){ + obj->insert("devSampleRate", QJsonValue(dev_sample_rate)); + } + if(m_l_oppm_tenths_isSet){ + obj->insert("LOppmTenths", QJsonValue(l_oppm_tenths)); + } + if(m_rx_center_frequency_isSet){ + obj->insert("rxCenterFrequency", QJsonValue(rx_center_frequency)); + } + if(m_log2_decim_isSet){ + obj->insert("log2Decim", QJsonValue(log2_decim)); + } + if(m_fc_pos_isSet){ + obj->insert("fcPos", QJsonValue(fc_pos)); + } + if(m_rx_bandwidth_isSet){ + obj->insert("rxBandwidth", QJsonValue(rx_bandwidth)); + } + if(m_rx0_gain_mode_isSet){ + obj->insert("rx0GainMode", QJsonValue(rx0_gain_mode)); + } + if(m_rx0_global_gain_isSet){ + obj->insert("rx0GlobalGain", QJsonValue(rx0_global_gain)); + } + if(m_rx1_gain_mode_isSet){ + obj->insert("rx1GainMode", QJsonValue(rx1_gain_mode)); + } + if(m_rx1_global_gain_isSet){ + obj->insert("rx1GlobalGain", QJsonValue(rx1_global_gain)); + } + if(m_rx_bias_tee_isSet){ + obj->insert("rxBiasTee", QJsonValue(rx_bias_tee)); + } + if(m_dc_block_isSet){ + obj->insert("dcBlock", QJsonValue(dc_block)); + } + if(m_iq_correction_isSet){ + obj->insert("iqCorrection", QJsonValue(iq_correction)); + } + if(m_rx_transverter_mode_isSet){ + obj->insert("rxTransverterMode", QJsonValue(rx_transverter_mode)); + } + if(m_rx_transverter_delta_frequency_isSet){ + obj->insert("rxTransverterDeltaFrequency", QJsonValue(rx_transverter_delta_frequency)); + } + if(m_tx_center_frequency_isSet){ + obj->insert("txCenterFrequency", QJsonValue(tx_center_frequency)); + } + if(m_log2_interp_isSet){ + obj->insert("log2Interp", QJsonValue(log2_interp)); + } + if(m_tx_bandwidth_isSet){ + obj->insert("txBandwidth", QJsonValue(tx_bandwidth)); + } + if(m_tx0_global_gain_isSet){ + obj->insert("tx0GlobalGain", QJsonValue(tx0_global_gain)); + } + if(m_tx1_global_gain_isSet){ + obj->insert("tx1GlobalGain", QJsonValue(tx1_global_gain)); + } + if(m_tx_bias_tee_isSet){ + obj->insert("txBiasTee", QJsonValue(tx_bias_tee)); + } + if(m_tx_transverter_mode_isSet){ + obj->insert("txTransverterMode", QJsonValue(tx_transverter_mode)); + } + if(m_tx_transverter_delta_frequency_isSet){ + obj->insert("txTransverterDeltaFrequency", QJsonValue(tx_transverter_delta_frequency)); + } + if(file_record_name != nullptr && *file_record_name != QString("")){ + toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); + } + if(m_use_reverse_api_isSet){ + obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); + } + if(reverse_api_address != nullptr && *reverse_api_address != QString("")){ + toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString")); + } + if(m_reverse_api_port_isSet){ + obj->insert("reverseAPIPort", QJsonValue(reverse_api_port)); + } + if(m_reverse_api_device_index_isSet){ + obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index)); + } + + return obj; +} + +qint32 +SWGBladeRF2MIMOSettings::getDevSampleRate() { + return dev_sample_rate; +} +void +SWGBladeRF2MIMOSettings::setDevSampleRate(qint32 dev_sample_rate) { + this->dev_sample_rate = dev_sample_rate; + this->m_dev_sample_rate_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getLOppmTenths() { + return l_oppm_tenths; +} +void +SWGBladeRF2MIMOSettings::setLOppmTenths(qint32 l_oppm_tenths) { + this->l_oppm_tenths = l_oppm_tenths; + this->m_l_oppm_tenths_isSet = true; +} + +qint64 +SWGBladeRF2MIMOSettings::getRxCenterFrequency() { + return rx_center_frequency; +} +void +SWGBladeRF2MIMOSettings::setRxCenterFrequency(qint64 rx_center_frequency) { + this->rx_center_frequency = rx_center_frequency; + this->m_rx_center_frequency_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getLog2Decim() { + return log2_decim; +} +void +SWGBladeRF2MIMOSettings::setLog2Decim(qint32 log2_decim) { + this->log2_decim = log2_decim; + this->m_log2_decim_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getFcPos() { + return fc_pos; +} +void +SWGBladeRF2MIMOSettings::setFcPos(qint32 fc_pos) { + this->fc_pos = fc_pos; + this->m_fc_pos_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRxBandwidth() { + return rx_bandwidth; +} +void +SWGBladeRF2MIMOSettings::setRxBandwidth(qint32 rx_bandwidth) { + this->rx_bandwidth = rx_bandwidth; + this->m_rx_bandwidth_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRx0GainMode() { + return rx0_gain_mode; +} +void +SWGBladeRF2MIMOSettings::setRx0GainMode(qint32 rx0_gain_mode) { + this->rx0_gain_mode = rx0_gain_mode; + this->m_rx0_gain_mode_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRx0GlobalGain() { + return rx0_global_gain; +} +void +SWGBladeRF2MIMOSettings::setRx0GlobalGain(qint32 rx0_global_gain) { + this->rx0_global_gain = rx0_global_gain; + this->m_rx0_global_gain_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRx1GainMode() { + return rx1_gain_mode; +} +void +SWGBladeRF2MIMOSettings::setRx1GainMode(qint32 rx1_gain_mode) { + this->rx1_gain_mode = rx1_gain_mode; + this->m_rx1_gain_mode_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRx1GlobalGain() { + return rx1_global_gain; +} +void +SWGBladeRF2MIMOSettings::setRx1GlobalGain(qint32 rx1_global_gain) { + this->rx1_global_gain = rx1_global_gain; + this->m_rx1_global_gain_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRxBiasTee() { + return rx_bias_tee; +} +void +SWGBladeRF2MIMOSettings::setRxBiasTee(qint32 rx_bias_tee) { + this->rx_bias_tee = rx_bias_tee; + this->m_rx_bias_tee_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getDcBlock() { + return dc_block; +} +void +SWGBladeRF2MIMOSettings::setDcBlock(qint32 dc_block) { + this->dc_block = dc_block; + this->m_dc_block_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getIqCorrection() { + return iq_correction; +} +void +SWGBladeRF2MIMOSettings::setIqCorrection(qint32 iq_correction) { + this->iq_correction = iq_correction; + this->m_iq_correction_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getRxTransverterMode() { + return rx_transverter_mode; +} +void +SWGBladeRF2MIMOSettings::setRxTransverterMode(qint32 rx_transverter_mode) { + this->rx_transverter_mode = rx_transverter_mode; + this->m_rx_transverter_mode_isSet = true; +} + +qint64 +SWGBladeRF2MIMOSettings::getRxTransverterDeltaFrequency() { + return rx_transverter_delta_frequency; +} +void +SWGBladeRF2MIMOSettings::setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency) { + this->rx_transverter_delta_frequency = rx_transverter_delta_frequency; + this->m_rx_transverter_delta_frequency_isSet = true; +} + +qint64 +SWGBladeRF2MIMOSettings::getTxCenterFrequency() { + return tx_center_frequency; +} +void +SWGBladeRF2MIMOSettings::setTxCenterFrequency(qint64 tx_center_frequency) { + this->tx_center_frequency = tx_center_frequency; + this->m_tx_center_frequency_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getLog2Interp() { + return log2_interp; +} +void +SWGBladeRF2MIMOSettings::setLog2Interp(qint32 log2_interp) { + this->log2_interp = log2_interp; + this->m_log2_interp_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getTxBandwidth() { + return tx_bandwidth; +} +void +SWGBladeRF2MIMOSettings::setTxBandwidth(qint32 tx_bandwidth) { + this->tx_bandwidth = tx_bandwidth; + this->m_tx_bandwidth_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getTx0GlobalGain() { + return tx0_global_gain; +} +void +SWGBladeRF2MIMOSettings::setTx0GlobalGain(qint32 tx0_global_gain) { + this->tx0_global_gain = tx0_global_gain; + this->m_tx0_global_gain_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getTx1GlobalGain() { + return tx1_global_gain; +} +void +SWGBladeRF2MIMOSettings::setTx1GlobalGain(qint32 tx1_global_gain) { + this->tx1_global_gain = tx1_global_gain; + this->m_tx1_global_gain_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getTxBiasTee() { + return tx_bias_tee; +} +void +SWGBladeRF2MIMOSettings::setTxBiasTee(qint32 tx_bias_tee) { + this->tx_bias_tee = tx_bias_tee; + this->m_tx_bias_tee_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getTxTransverterMode() { + return tx_transverter_mode; +} +void +SWGBladeRF2MIMOSettings::setTxTransverterMode(qint32 tx_transverter_mode) { + this->tx_transverter_mode = tx_transverter_mode; + this->m_tx_transverter_mode_isSet = true; +} + +qint64 +SWGBladeRF2MIMOSettings::getTxTransverterDeltaFrequency() { + return tx_transverter_delta_frequency; +} +void +SWGBladeRF2MIMOSettings::setTxTransverterDeltaFrequency(qint64 tx_transverter_delta_frequency) { + this->tx_transverter_delta_frequency = tx_transverter_delta_frequency; + this->m_tx_transverter_delta_frequency_isSet = true; +} + +QString* +SWGBladeRF2MIMOSettings::getFileRecordName() { + return file_record_name; +} +void +SWGBladeRF2MIMOSettings::setFileRecordName(QString* file_record_name) { + this->file_record_name = file_record_name; + this->m_file_record_name_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGBladeRF2MIMOSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGBladeRF2MIMOSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGBladeRF2MIMOSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGBladeRF2MIMOSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGBladeRF2MIMOSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGBladeRF2MIMOSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + + +bool +SWGBladeRF2MIMOSettings::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_dev_sample_rate_isSet){ + isObjectUpdated = true; break; + } + if(m_l_oppm_tenths_isSet){ + isObjectUpdated = true; break; + } + if(m_rx_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_log2_decim_isSet){ + isObjectUpdated = true; break; + } + if(m_fc_pos_isSet){ + isObjectUpdated = true; break; + } + if(m_rx_bandwidth_isSet){ + isObjectUpdated = true; break; + } + if(m_rx0_gain_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_rx0_global_gain_isSet){ + isObjectUpdated = true; break; + } + if(m_rx1_gain_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_rx1_global_gain_isSet){ + isObjectUpdated = true; break; + } + if(m_rx_bias_tee_isSet){ + isObjectUpdated = true; break; + } + if(m_dc_block_isSet){ + isObjectUpdated = true; break; + } + if(m_iq_correction_isSet){ + isObjectUpdated = true; break; + } + if(m_rx_transverter_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_rx_transverter_delta_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_log2_interp_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_bandwidth_isSet){ + isObjectUpdated = true; break; + } + if(m_tx0_global_gain_isSet){ + isObjectUpdated = true; break; + } + if(m_tx1_global_gain_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_bias_tee_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_transverter_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_transverter_delta_frequency_isSet){ + isObjectUpdated = true; break; + } + if(file_record_name && *file_record_name != QString("")){ + isObjectUpdated = true; break; + } + if(m_use_reverse_api_isSet){ + isObjectUpdated = true; break; + } + if(reverse_api_address && *reverse_api_address != QString("")){ + isObjectUpdated = true; break; + } + if(m_reverse_api_port_isSet){ + isObjectUpdated = true; break; + } + if(m_reverse_api_device_index_isSet){ + isObjectUpdated = true; break; + } + }while(false); + return isObjectUpdated; +} +} + diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h new file mode 100644 index 000000000..64bf409b5 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h @@ -0,0 +1,221 @@ +/** + * SDRangel + * This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1 and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time --- + * + * OpenAPI spec version: 4.11.6 + * Contact: f4exb06@gmail.com + * + * NOTE: This class is auto generated by the swagger code generator program. + * https://github.com/swagger-api/swagger-codegen.git + * Do not edit the class manually. + */ + +/* + * SWGBladeRF2MIMOSettings.h + * + * BladeRF2 + */ + +#ifndef SWGBladeRF2MIMOSettings_H_ +#define SWGBladeRF2MIMOSettings_H_ + +#include + + +#include + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGBladeRF2MIMOSettings: public SWGObject { +public: + SWGBladeRF2MIMOSettings(); + SWGBladeRF2MIMOSettings(QString* json); + virtual ~SWGBladeRF2MIMOSettings(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGBladeRF2MIMOSettings* fromJson(QString &jsonString) override; + + qint32 getDevSampleRate(); + void setDevSampleRate(qint32 dev_sample_rate); + + qint32 getLOppmTenths(); + void setLOppmTenths(qint32 l_oppm_tenths); + + qint64 getRxCenterFrequency(); + void setRxCenterFrequency(qint64 rx_center_frequency); + + qint32 getLog2Decim(); + void setLog2Decim(qint32 log2_decim); + + qint32 getFcPos(); + void setFcPos(qint32 fc_pos); + + qint32 getRxBandwidth(); + void setRxBandwidth(qint32 rx_bandwidth); + + qint32 getRx0GainMode(); + void setRx0GainMode(qint32 rx0_gain_mode); + + qint32 getRx0GlobalGain(); + void setRx0GlobalGain(qint32 rx0_global_gain); + + qint32 getRx1GainMode(); + void setRx1GainMode(qint32 rx1_gain_mode); + + qint32 getRx1GlobalGain(); + void setRx1GlobalGain(qint32 rx1_global_gain); + + qint32 getRxBiasTee(); + void setRxBiasTee(qint32 rx_bias_tee); + + qint32 getDcBlock(); + void setDcBlock(qint32 dc_block); + + qint32 getIqCorrection(); + void setIqCorrection(qint32 iq_correction); + + qint32 getRxTransverterMode(); + void setRxTransverterMode(qint32 rx_transverter_mode); + + qint64 getRxTransverterDeltaFrequency(); + void setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency); + + qint64 getTxCenterFrequency(); + void setTxCenterFrequency(qint64 tx_center_frequency); + + qint32 getLog2Interp(); + void setLog2Interp(qint32 log2_interp); + + qint32 getTxBandwidth(); + void setTxBandwidth(qint32 tx_bandwidth); + + qint32 getTx0GlobalGain(); + void setTx0GlobalGain(qint32 tx0_global_gain); + + qint32 getTx1GlobalGain(); + void setTx1GlobalGain(qint32 tx1_global_gain); + + qint32 getTxBiasTee(); + void setTxBiasTee(qint32 tx_bias_tee); + + qint32 getTxTransverterMode(); + void setTxTransverterMode(qint32 tx_transverter_mode); + + qint64 getTxTransverterDeltaFrequency(); + void setTxTransverterDeltaFrequency(qint64 tx_transverter_delta_frequency); + + QString* getFileRecordName(); + void setFileRecordName(QString* file_record_name); + + qint32 getUseReverseApi(); + void setUseReverseApi(qint32 use_reverse_api); + + QString* getReverseApiAddress(); + void setReverseApiAddress(QString* reverse_api_address); + + qint32 getReverseApiPort(); + void setReverseApiPort(qint32 reverse_api_port); + + qint32 getReverseApiDeviceIndex(); + void setReverseApiDeviceIndex(qint32 reverse_api_device_index); + + + virtual bool isSet() override; + +private: + qint32 dev_sample_rate; + bool m_dev_sample_rate_isSet; + + qint32 l_oppm_tenths; + bool m_l_oppm_tenths_isSet; + + qint64 rx_center_frequency; + bool m_rx_center_frequency_isSet; + + qint32 log2_decim; + bool m_log2_decim_isSet; + + qint32 fc_pos; + bool m_fc_pos_isSet; + + qint32 rx_bandwidth; + bool m_rx_bandwidth_isSet; + + qint32 rx0_gain_mode; + bool m_rx0_gain_mode_isSet; + + qint32 rx0_global_gain; + bool m_rx0_global_gain_isSet; + + qint32 rx1_gain_mode; + bool m_rx1_gain_mode_isSet; + + qint32 rx1_global_gain; + bool m_rx1_global_gain_isSet; + + qint32 rx_bias_tee; + bool m_rx_bias_tee_isSet; + + qint32 dc_block; + bool m_dc_block_isSet; + + qint32 iq_correction; + bool m_iq_correction_isSet; + + qint32 rx_transverter_mode; + bool m_rx_transverter_mode_isSet; + + qint64 rx_transverter_delta_frequency; + bool m_rx_transverter_delta_frequency_isSet; + + qint64 tx_center_frequency; + bool m_tx_center_frequency_isSet; + + qint32 log2_interp; + bool m_log2_interp_isSet; + + qint32 tx_bandwidth; + bool m_tx_bandwidth_isSet; + + qint32 tx0_global_gain; + bool m_tx0_global_gain_isSet; + + qint32 tx1_global_gain; + bool m_tx1_global_gain_isSet; + + qint32 tx_bias_tee; + bool m_tx_bias_tee_isSet; + + qint32 tx_transverter_mode; + bool m_tx_transverter_mode_isSet; + + qint64 tx_transverter_delta_frequency; + bool m_tx_transverter_delta_frequency_isSet; + + QString* file_record_name; + bool m_file_record_name_isSet; + + qint32 use_reverse_api; + bool m_use_reverse_api_isSet; + + QString* reverse_api_address; + bool m_reverse_api_address_isSet; + + qint32 reverse_api_port; + bool m_reverse_api_port_isSet; + + qint32 reverse_api_device_index; + bool m_reverse_api_device_index_isSet; + +}; + +} + +#endif /* SWGBladeRF2MIMOSettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp index 49f7d7097..9596f43b8 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp @@ -46,6 +46,8 @@ SWGDeviceSettings::SWGDeviceSettings() { m_blade_rf1_output_settings_isSet = false; blade_rf2_output_settings = nullptr; m_blade_rf2_output_settings_isSet = false; + blade_rf2_mimo_settings = nullptr; + m_blade_rf2_mimo_settings_isSet = false; fcd_pro_settings = nullptr; m_fcd_pro_settings_isSet = false; fcd_pro_plus_settings = nullptr; @@ -118,6 +120,8 @@ SWGDeviceSettings::init() { m_blade_rf1_output_settings_isSet = false; blade_rf2_output_settings = new SWGBladeRF2OutputSettings(); m_blade_rf2_output_settings_isSet = false; + blade_rf2_mimo_settings = new SWGBladeRF2MIMOSettings(); + m_blade_rf2_mimo_settings_isSet = false; fcd_pro_settings = new SWGFCDProSettings(); m_fcd_pro_settings_isSet = false; fcd_pro_plus_settings = new SWGFCDProPlusSettings(); @@ -191,6 +195,9 @@ SWGDeviceSettings::cleanup() { if(blade_rf2_output_settings != nullptr) { delete blade_rf2_output_settings; } + if(blade_rf2_mimo_settings != nullptr) { + delete blade_rf2_mimo_settings; + } if(fcd_pro_settings != nullptr) { delete fcd_pro_settings; } @@ -291,6 +298,8 @@ SWGDeviceSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&blade_rf2_output_settings, pJson["bladeRF2OutputSettings"], "SWGBladeRF2OutputSettings", "SWGBladeRF2OutputSettings"); + ::SWGSDRangel::setValue(&blade_rf2_mimo_settings, pJson["bladeRF2MIMOSettings"], "SWGBladeRF2MIMOSettings", "SWGBladeRF2MIMOSettings"); + ::SWGSDRangel::setValue(&fcd_pro_settings, pJson["fcdProSettings"], "SWGFCDProSettings", "SWGFCDProSettings"); ::SWGSDRangel::setValue(&fcd_pro_plus_settings, pJson["fcdProPlusSettings"], "SWGFCDProPlusSettings", "SWGFCDProPlusSettings"); @@ -380,6 +389,9 @@ SWGDeviceSettings::asJsonObject() { if((blade_rf2_output_settings != nullptr) && (blade_rf2_output_settings->isSet())){ toJsonValue(QString("bladeRF2OutputSettings"), blade_rf2_output_settings, obj, QString("SWGBladeRF2OutputSettings")); } + if((blade_rf2_mimo_settings != nullptr) && (blade_rf2_mimo_settings->isSet())){ + toJsonValue(QString("bladeRF2MIMOSettings"), blade_rf2_mimo_settings, obj, QString("SWGBladeRF2MIMOSettings")); + } if((fcd_pro_settings != nullptr) && (fcd_pro_settings->isSet())){ toJsonValue(QString("fcdProSettings"), fcd_pro_settings, obj, QString("SWGFCDProSettings")); } @@ -543,6 +555,16 @@ SWGDeviceSettings::setBladeRf2OutputSettings(SWGBladeRF2OutputSettings* blade_rf this->m_blade_rf2_output_settings_isSet = true; } +SWGBladeRF2MIMOSettings* +SWGDeviceSettings::getBladeRf2MimoSettings() { + return blade_rf2_mimo_settings; +} +void +SWGDeviceSettings::setBladeRf2MimoSettings(SWGBladeRF2MIMOSettings* blade_rf2_mimo_settings) { + this->blade_rf2_mimo_settings = blade_rf2_mimo_settings; + this->m_blade_rf2_mimo_settings_isSet = true; +} + SWGFCDProSettings* SWGDeviceSettings::getFcdProSettings() { return fcd_pro_settings; @@ -805,6 +827,9 @@ SWGDeviceSettings::isSet(){ if(blade_rf2_output_settings && blade_rf2_output_settings->isSet()){ isObjectUpdated = true; break; } + if(blade_rf2_mimo_settings && blade_rf2_mimo_settings->isSet()){ + isObjectUpdated = true; break; + } if(fcd_pro_settings && fcd_pro_settings->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h index 414cb5013..b48b17ae5 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h @@ -27,6 +27,7 @@ #include "SWGBladeRF1InputSettings.h" #include "SWGBladeRF1OutputSettings.h" #include "SWGBladeRF2InputSettings.h" +#include "SWGBladeRF2MIMOSettings.h" #include "SWGBladeRF2OutputSettings.h" #include "SWGFCDProPlusSettings.h" #include "SWGFCDProSettings.h" @@ -98,6 +99,9 @@ public: SWGBladeRF2OutputSettings* getBladeRf2OutputSettings(); void setBladeRf2OutputSettings(SWGBladeRF2OutputSettings* blade_rf2_output_settings); + SWGBladeRF2MIMOSettings* getBladeRf2MimoSettings(); + void setBladeRf2MimoSettings(SWGBladeRF2MIMOSettings* blade_rf2_mimo_settings); + SWGFCDProSettings* getFcdProSettings(); void setFcdProSettings(SWGFCDProSettings* fcd_pro_settings); @@ -198,6 +202,9 @@ private: SWGBladeRF2OutputSettings* blade_rf2_output_settings; bool m_blade_rf2_output_settings_isSet; + SWGBladeRF2MIMOSettings* blade_rf2_mimo_settings; + bool m_blade_rf2_mimo_settings_isSet; + SWGFCDProSettings* fcd_pro_settings; bool m_fcd_pro_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index ad27ea70c..d8ba07199 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -39,6 +39,7 @@ #include "SWGBladeRF1OutputSettings.h" #include "SWGBladeRF2InputReport.h" #include "SWGBladeRF2InputSettings.h" +#include "SWGBladeRF2MIMOSettings.h" #include "SWGBladeRF2OutputReport.h" #include "SWGBladeRF2OutputSettings.h" #include "SWGCWKeyerSettings.h" @@ -245,6 +246,9 @@ namespace SWGSDRangel { if(QString("SWGBladeRF2InputSettings").compare(type) == 0) { return new SWGBladeRF2InputSettings(); } + if(QString("SWGBladeRF2MIMOSettings").compare(type) == 0) { + return new SWGBladeRF2MIMOSettings(); + } if(QString("SWGBladeRF2OutputReport").compare(type) == 0) { return new SWGBladeRF2OutputReport(); }