diff --git a/plugins/samplemimo/xtrxmimo/readme.md b/plugins/samplemimo/xtrxmimo/readme.md index e82a6eec4..9041318c8 100644 --- a/plugins/samplemimo/xtrxmimo/readme.md +++ b/plugins/samplemimo/xtrxmimo/readme.md @@ -2,8 +2,6 @@

Introduction

-This is a v5 only plugin. - This MIMO plugin sends and receives its samples to/from a [XTRX device](https://xtrx.io). It handles both input (Rx) and output (Tx) streams synchronously. There is no option to synchronize Rx with Tx streams. ⚠ There are USB errors when first starting with XTRX after plugging it in. The only way to work around this is to restart SDRangel application. diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp index 1842463e1..01c95bf8a 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp +++ b/plugins/samplemimo/xtrxmimo/xtrxmimoplugin.cpp @@ -31,7 +31,7 @@ const PluginDescriptor XTRXMIMOPlugin::m_pluginDescriptor = { QString("XTRX"), QString("XTRX MIMO"), - QString("5.13.0"), + QString("6.0.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index d5cbbad06..ad7004ade 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -53,6 +53,7 @@ webapi/doc/swagger/include/LocalOutput.yaml webapi/doc/swagger/include/LocalSink.yaml webapi/doc/swagger/include/LocalSource.yaml + webapi/doc/swagger/include/MetisMISO.yaml webapi/doc/swagger/include/NFMDemod.yaml webapi/doc/swagger/include/NFMMod.yaml webapi/doc/swagger/include/PacketMod.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index d4b9a8c7e..39d102b41 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3648,6 +3648,9 @@ margin-bottom: 20px; "localOutputSettings" : { "$ref" : "#/definitions/LocalOutputSettings" }, + "metisMISOSettings" : { + "$ref" : "#/definitions/MetisMISOSettings" + }, "perseusSettings" : { "$ref" : "#/definitions/PerseusSettings" }, @@ -6084,6 +6087,166 @@ margin-bottom: 20px; } }, "description" : "Logging parameters setting" +}; + defs.MetisMISOSettings = { + "properties" : { + "nbReceivers" : { + "type" : "integer", + "description" : "Number of activated receivers" + }, + "txEnable" : { + "type" : "integer", + "description" : "Enable Tx * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device\n" + }, + "rx1CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 1" + }, + "rx2CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 2" + }, + "rx3CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 3" + }, + "rx4CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 4" + }, + "rx5CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 5" + }, + "rx6CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 6" + }, + "rx7CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 7" + }, + "rx8CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 8" + }, + "txCenterFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "rxTransverterMode" : { + "type" : "integer", + "description" : "Rx transverter activated * 0 - disabled * 1 - enabled\n" + }, + "rxTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "txTransverterMode" : { + "type" : "integer", + "description" : "Tx transverter activated * 0 - disabled * 1 - enabled\n" + }, + "txTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "iqOrder" : { + "type" : "integer", + "description" : "I/Q samples order * 0 - I then Q (direct) * 1 - Q then I (reversed)\n" + }, + "rx1SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 1" + }, + "rx2SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 2" + }, + "rx3SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 3" + }, + "rx4SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 4" + }, + "rx5SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 5" + }, + "rx6SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 6" + }, + "rx7SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 7" + }, + "rx8SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 8" + }, + "sampleRateIndex" : { + "type" : "integer" + }, + "log2Decim" : { + "type" : "integer" + }, + "LOppmTenths" : { + "type" : "integer", + "description" : "LO correction in tenths of ppm" + }, + "preamp" : { + "type" : "integer", + "description" : "Preamplifer * 0 - disabled * 1 - enabled\n" + }, + "random" : { + "type" : "integer", + "description" : "LT2208 Random * 0 - disabled * 1 - enabled\n" + }, + "dither" : { + "type" : "integer", + "description" : "LT2208 Dither * 0 - disabled * 1 - enabled\n" + }, + "duplex" : { + "type" : "integer", + "description" : "Duplex * 0 - disabled * 1 - enabled\n" + }, + "dcBlock" : { + "type" : "integer", + "description" : "DC block in software * 0 - disabled * 1 - enabled\n" + }, + "iqCorrection" : { + "type" : "integer", + "description" : "DC block in software * 0 - disabled * 1 - enabled\n" + }, + "txDrive" : { + "type" : "integer", + "description" : "Tx drive level (0 to 15)" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API * 0 - disabled * 1 - enabled\n" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + } + }, + "description" : "MetisMISOSettings" }; defs.NFMDemodReport = { "properties" : { @@ -41673,7 +41836,7 @@ except ApiException as e:
- Generated 2020-11-11T03:29:01.094+01:00 + Generated 2020-11-11T09:19:54.971+01:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml index 33c973810..4a75ffc72 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml @@ -52,6 +52,8 @@ DeviceSettings: $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputSettings" localOutputSettings: $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputSettings" + metisMISOSettings: + $ref: "/doc/swagger/include/MetisMISO.yaml#/MetisMISOSettings" perseusSettings: $ref: "/doc/swagger/include/Perseus.yaml#/PerseusSettings" plutoSdrInputSettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml b/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml new file mode 100644 index 000000000..14e88b31b --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml @@ -0,0 +1,153 @@ +MetisMISOSettings: + description: MetisMISOSettings + properties: + nbReceivers: + type: integer + description: Number of activated receivers + txEnable: + type: integer + description: > + Enable Tx + * 0 - disabled sends null payload to Metis device + * 1 - enabled sends Tx payload to Metis device + rx1CenterFrequency: + description: center fequencies of receiver 1 + type: integer + format: int64 + rx2CenterFrequency: + description: center fequencies of receiver 2 + type: integer + format: int64 + rx3CenterFrequency: + description: center fequencies of receiver 3 + type: integer + format: int64 + rx4CenterFrequency: + description: center fequencies of receiver 4 + type: integer + format: int64 + rx5CenterFrequency: + description: center fequencies of receiver 5 + type: integer + format: int64 + rx6CenterFrequency: + description: center fequencies of receiver 6 + type: integer + format: int64 + rx7CenterFrequency: + description: center fequencies of receiver 7 + type: integer + format: int64 + rx8CenterFrequency: + description: center fequencies of receiver 8 + type: integer + format: int64 + txCenterFrequency: + type: integer + format: int64 + rxTransverterMode: + type: integer + description: > + Rx transverter activated + * 0 - disabled + * 1 - enabled + rxTransverterDeltaFrequency: + type: integer + format: int64 + txTransverterMode: + type: integer + description: > + Tx transverter activated + * 0 - disabled + * 1 - enabled + txTransverterDeltaFrequency: + type: integer + format: int64 + iqOrder: + type: integer + description: > + I/Q samples order + * 0 - I then Q (direct) + * 1 - Q then I (reversed) + rx1SubsamplingIndex: + description: subsampling band indexes of receiver 1 + type: integer + rx2SubsamplingIndex: + description: subsampling band indexes of receiver 2 + type: integer + rx3SubsamplingIndex: + description: subsampling band indexes of receiver 3 + type: integer + rx4SubsamplingIndex: + description: subsampling band indexes of receiver 4 + type: integer + rx5SubsamplingIndex: + description: subsampling band indexes of receiver 5 + type: integer + rx6SubsamplingIndex: + description: subsampling band indexes of receiver 6 + type: integer + rx7SubsamplingIndex: + description: subsampling band indexes of receiver 7 + type: integer + rx8SubsamplingIndex: + description: subsampling band indexes of receiver 8 + type: integer + sampleRateIndex: + type: integer + log2Decim: + type: integer + LOppmTenths: + type: integer + description: LO correction in tenths of ppm + preamp: + type: integer + description: > + Preamplifer + * 0 - disabled + * 1 - enabled + random: + type: integer + description: > + LT2208 Random + * 0 - disabled + * 1 - enabled + dither: + type: integer + description: > + LT2208 Dither + * 0 - disabled + * 1 - enabled + duplex: + type: integer + description: > + Duplex + * 0 - disabled + * 1 - enabled + dcBlock: + type: integer + description: > + DC block in software + * 0 - disabled + * 1 - enabled + iqCorrection: + type: integer + description: > + DC block in software + * 0 - disabled + * 1 - enabled + txDrive: + type: integer + description: Tx drive level (0 to 15) + useReverseAPI: + type: integer + description: > + Synchronize with reverse API + * 0 - disabled + * 1 - enabled + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/sdrbase/webapi/webapirequestmapper.cpp b/sdrbase/webapi/webapirequestmapper.cpp index c20b2cacc..54c51d8af 100644 --- a/sdrbase/webapi/webapirequestmapper.cpp +++ b/sdrbase/webapi/webapirequestmapper.cpp @@ -3898,6 +3898,15 @@ bool WebAPIRequestMapper::getDeviceSettings( deviceSettings->setLimeSdrMimoSettings(new SWGSDRangel::SWGLimeSdrMIMOSettings()); deviceSettings->getLimeSdrMimoSettings()->fromJsonObject(settingsJsonObject); } + else if (deviceSettingsKey == "metisMISOSettings") + { + if (deviceSettingsKeys.contains("streams") && settingsJsonObject["streams"].isArray()) { + appendSettingsArrayKeys(settingsJsonObject, "streams", deviceSettingsKeys); + } + + deviceSettings->setMetisMisoSettings(new SWGSDRangel::SWGMetisMISOSettings()); + deviceSettings->getMetisMisoSettings()->fromJsonObject(settingsJsonObject); + } else if (deviceSettingsKey == "perseusSettings") { deviceSettings->setPerseusSettings(new SWGSDRangel::SWGPerseusSettings()); diff --git a/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml b/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml index af8e4fc98..74cec9986 100644 --- a/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml +++ b/swagger/sdrangel/api/swagger/include/DeviceSettings.yaml @@ -52,6 +52,8 @@ DeviceSettings: $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputSettings" localOutputSettings: $ref: "http://swgserver:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputSettings" + metisMISOSettings: + $ref: "http://swgserver:8081/api/swagger/include/MetisMISO.yaml#/MetisMISOSettings" perseusSettings: $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusSettings" plutoSdrInputSettings: diff --git a/swagger/sdrangel/api/swagger/include/MetisMISO.yaml b/swagger/sdrangel/api/swagger/include/MetisMISO.yaml new file mode 100644 index 000000000..14e88b31b --- /dev/null +++ b/swagger/sdrangel/api/swagger/include/MetisMISO.yaml @@ -0,0 +1,153 @@ +MetisMISOSettings: + description: MetisMISOSettings + properties: + nbReceivers: + type: integer + description: Number of activated receivers + txEnable: + type: integer + description: > + Enable Tx + * 0 - disabled sends null payload to Metis device + * 1 - enabled sends Tx payload to Metis device + rx1CenterFrequency: + description: center fequencies of receiver 1 + type: integer + format: int64 + rx2CenterFrequency: + description: center fequencies of receiver 2 + type: integer + format: int64 + rx3CenterFrequency: + description: center fequencies of receiver 3 + type: integer + format: int64 + rx4CenterFrequency: + description: center fequencies of receiver 4 + type: integer + format: int64 + rx5CenterFrequency: + description: center fequencies of receiver 5 + type: integer + format: int64 + rx6CenterFrequency: + description: center fequencies of receiver 6 + type: integer + format: int64 + rx7CenterFrequency: + description: center fequencies of receiver 7 + type: integer + format: int64 + rx8CenterFrequency: + description: center fequencies of receiver 8 + type: integer + format: int64 + txCenterFrequency: + type: integer + format: int64 + rxTransverterMode: + type: integer + description: > + Rx transverter activated + * 0 - disabled + * 1 - enabled + rxTransverterDeltaFrequency: + type: integer + format: int64 + txTransverterMode: + type: integer + description: > + Tx transverter activated + * 0 - disabled + * 1 - enabled + txTransverterDeltaFrequency: + type: integer + format: int64 + iqOrder: + type: integer + description: > + I/Q samples order + * 0 - I then Q (direct) + * 1 - Q then I (reversed) + rx1SubsamplingIndex: + description: subsampling band indexes of receiver 1 + type: integer + rx2SubsamplingIndex: + description: subsampling band indexes of receiver 2 + type: integer + rx3SubsamplingIndex: + description: subsampling band indexes of receiver 3 + type: integer + rx4SubsamplingIndex: + description: subsampling band indexes of receiver 4 + type: integer + rx5SubsamplingIndex: + description: subsampling band indexes of receiver 5 + type: integer + rx6SubsamplingIndex: + description: subsampling band indexes of receiver 6 + type: integer + rx7SubsamplingIndex: + description: subsampling band indexes of receiver 7 + type: integer + rx8SubsamplingIndex: + description: subsampling band indexes of receiver 8 + type: integer + sampleRateIndex: + type: integer + log2Decim: + type: integer + LOppmTenths: + type: integer + description: LO correction in tenths of ppm + preamp: + type: integer + description: > + Preamplifer + * 0 - disabled + * 1 - enabled + random: + type: integer + description: > + LT2208 Random + * 0 - disabled + * 1 - enabled + dither: + type: integer + description: > + LT2208 Dither + * 0 - disabled + * 1 - enabled + duplex: + type: integer + description: > + Duplex + * 0 - disabled + * 1 - enabled + dcBlock: + type: integer + description: > + DC block in software + * 0 - disabled + * 1 - enabled + iqCorrection: + type: integer + description: > + DC block in software + * 0 - disabled + * 1 - enabled + txDrive: + type: integer + description: Tx drive level (0 to 15) + useReverseAPI: + type: integer + description: > + Synchronize with reverse API + * 0 - disabled + * 1 - enabled + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index d4b9a8c7e..39d102b41 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3648,6 +3648,9 @@ margin-bottom: 20px; "localOutputSettings" : { "$ref" : "#/definitions/LocalOutputSettings" }, + "metisMISOSettings" : { + "$ref" : "#/definitions/MetisMISOSettings" + }, "perseusSettings" : { "$ref" : "#/definitions/PerseusSettings" }, @@ -6084,6 +6087,166 @@ margin-bottom: 20px; } }, "description" : "Logging parameters setting" +}; + defs.MetisMISOSettings = { + "properties" : { + "nbReceivers" : { + "type" : "integer", + "description" : "Number of activated receivers" + }, + "txEnable" : { + "type" : "integer", + "description" : "Enable Tx * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device\n" + }, + "rx1CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 1" + }, + "rx2CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 2" + }, + "rx3CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 3" + }, + "rx4CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 4" + }, + "rx5CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 5" + }, + "rx6CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 6" + }, + "rx7CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 7" + }, + "rx8CenterFrequency" : { + "type" : "integer", + "format" : "int64", + "description" : "center fequencies of receiver 8" + }, + "txCenterFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "rxTransverterMode" : { + "type" : "integer", + "description" : "Rx transverter activated * 0 - disabled * 1 - enabled\n" + }, + "rxTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "txTransverterMode" : { + "type" : "integer", + "description" : "Tx transverter activated * 0 - disabled * 1 - enabled\n" + }, + "txTransverterDeltaFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "iqOrder" : { + "type" : "integer", + "description" : "I/Q samples order * 0 - I then Q (direct) * 1 - Q then I (reversed)\n" + }, + "rx1SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 1" + }, + "rx2SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 2" + }, + "rx3SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 3" + }, + "rx4SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 4" + }, + "rx5SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 5" + }, + "rx6SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 6" + }, + "rx7SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 7" + }, + "rx8SubsamplingIndex" : { + "type" : "integer", + "description" : "subsampling band indexes of receiver 8" + }, + "sampleRateIndex" : { + "type" : "integer" + }, + "log2Decim" : { + "type" : "integer" + }, + "LOppmTenths" : { + "type" : "integer", + "description" : "LO correction in tenths of ppm" + }, + "preamp" : { + "type" : "integer", + "description" : "Preamplifer * 0 - disabled * 1 - enabled\n" + }, + "random" : { + "type" : "integer", + "description" : "LT2208 Random * 0 - disabled * 1 - enabled\n" + }, + "dither" : { + "type" : "integer", + "description" : "LT2208 Dither * 0 - disabled * 1 - enabled\n" + }, + "duplex" : { + "type" : "integer", + "description" : "Duplex * 0 - disabled * 1 - enabled\n" + }, + "dcBlock" : { + "type" : "integer", + "description" : "DC block in software * 0 - disabled * 1 - enabled\n" + }, + "iqCorrection" : { + "type" : "integer", + "description" : "DC block in software * 0 - disabled * 1 - enabled\n" + }, + "txDrive" : { + "type" : "integer", + "description" : "Tx drive level (0 to 15)" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API * 0 - disabled * 1 - enabled\n" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + } + }, + "description" : "MetisMISOSettings" }; defs.NFMDemodReport = { "properties" : { @@ -41673,7 +41836,7 @@ except ApiException as e:
- Generated 2020-11-11T03:29:01.094+01:00 + Generated 2020-11-11T09:19:54.971+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp index f9b3c601b..3c88c91a4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.cpp @@ -72,6 +72,8 @@ SWGDeviceSettings::SWGDeviceSettings() { m_local_input_settings_isSet = false; local_output_settings = nullptr; m_local_output_settings_isSet = false; + metis_miso_settings = nullptr; + m_metis_miso_settings_isSet = false; perseus_settings = nullptr; m_perseus_settings_isSet = false; pluto_sdr_input_settings = nullptr; @@ -160,6 +162,8 @@ SWGDeviceSettings::init() { m_local_input_settings_isSet = false; local_output_settings = new SWGLocalOutputSettings(); m_local_output_settings_isSet = false; + metis_miso_settings = new SWGMetisMISOSettings(); + m_metis_miso_settings_isSet = false; perseus_settings = new SWGPerseusSettings(); m_perseus_settings_isSet = false; pluto_sdr_input_settings = new SWGPlutoSdrInputSettings(); @@ -262,6 +266,9 @@ SWGDeviceSettings::cleanup() { if(local_output_settings != nullptr) { delete local_output_settings; } + if(metis_miso_settings != nullptr) { + delete metis_miso_settings; + } if(perseus_settings != nullptr) { delete perseus_settings; } @@ -373,6 +380,8 @@ SWGDeviceSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&local_output_settings, pJson["localOutputSettings"], "SWGLocalOutputSettings", "SWGLocalOutputSettings"); + ::SWGSDRangel::setValue(&metis_miso_settings, pJson["metisMISOSettings"], "SWGMetisMISOSettings", "SWGMetisMISOSettings"); + ::SWGSDRangel::setValue(&perseus_settings, pJson["perseusSettings"], "SWGPerseusSettings", "SWGPerseusSettings"); ::SWGSDRangel::setValue(&pluto_sdr_input_settings, pJson["plutoSdrInputSettings"], "SWGPlutoSdrInputSettings", "SWGPlutoSdrInputSettings"); @@ -491,6 +500,9 @@ SWGDeviceSettings::asJsonObject() { if((local_output_settings != nullptr) && (local_output_settings->isSet())){ toJsonValue(QString("localOutputSettings"), local_output_settings, obj, QString("SWGLocalOutputSettings")); } + if((metis_miso_settings != nullptr) && (metis_miso_settings->isSet())){ + toJsonValue(QString("metisMISOSettings"), metis_miso_settings, obj, QString("SWGMetisMISOSettings")); + } if((perseus_settings != nullptr) && (perseus_settings->isSet())){ toJsonValue(QString("perseusSettings"), perseus_settings, obj, QString("SWGPerseusSettings")); } @@ -769,6 +781,16 @@ SWGDeviceSettings::setLocalOutputSettings(SWGLocalOutputSettings* local_output_s this->m_local_output_settings_isSet = true; } +SWGMetisMISOSettings* +SWGDeviceSettings::getMetisMisoSettings() { + return metis_miso_settings; +} +void +SWGDeviceSettings::setMetisMisoSettings(SWGMetisMISOSettings* metis_miso_settings) { + this->metis_miso_settings = metis_miso_settings; + this->m_metis_miso_settings_isSet = true; +} + SWGPerseusSettings* SWGDeviceSettings::getPerseusSettings() { return perseus_settings; @@ -1020,6 +1042,9 @@ SWGDeviceSettings::isSet(){ if(local_output_settings && local_output_settings->isSet()){ isObjectUpdated = true; break; } + if(metis_miso_settings && metis_miso_settings->isSet()){ + isObjectUpdated = true; break; + } if(perseus_settings && perseus_settings->isSet()){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h index 122702bf1..a223ac6c1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGDeviceSettings.h @@ -41,6 +41,7 @@ #include "SWGLimeSdrOutputSettings.h" #include "SWGLocalInputSettings.h" #include "SWGLocalOutputSettings.h" +#include "SWGMetisMISOSettings.h" #include "SWGPerseusSettings.h" #include "SWGPlutoSdrInputSettings.h" #include "SWGPlutoSdrOutputSettings.h" @@ -145,6 +146,9 @@ public: SWGLocalOutputSettings* getLocalOutputSettings(); void setLocalOutputSettings(SWGLocalOutputSettings* local_output_settings); + SWGMetisMISOSettings* getMetisMisoSettings(); + void setMetisMisoSettings(SWGMetisMISOSettings* metis_miso_settings); + SWGPerseusSettings* getPerseusSettings(); void setPerseusSettings(SWGPerseusSettings* perseus_settings); @@ -269,6 +273,9 @@ private: SWGLocalOutputSettings* local_output_settings; bool m_local_output_settings_isSet; + SWGMetisMISOSettings* metis_miso_settings; + bool m_metis_miso_settings_isSet; + SWGPerseusSettings* perseus_settings; bool m_perseus_settings_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGMetisMISOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGMetisMISOSettings.cpp new file mode 100644 index 000000000..863bde302 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGMetisMISOSettings.cpp @@ -0,0 +1,961 @@ +/** + * 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, USRP 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.15.0 + * 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 "SWGMetisMISOSettings.h" + +#include "SWGHelpers.h" + +#include +#include +#include +#include + +namespace SWGSDRangel { + +SWGMetisMISOSettings::SWGMetisMISOSettings(QString* json) { + init(); + this->fromJson(*json); +} + +SWGMetisMISOSettings::SWGMetisMISOSettings() { + nb_receivers = 0; + m_nb_receivers_isSet = false; + tx_enable = 0; + m_tx_enable_isSet = false; + rx1_center_frequency = 0L; + m_rx1_center_frequency_isSet = false; + rx2_center_frequency = 0L; + m_rx2_center_frequency_isSet = false; + rx3_center_frequency = 0L; + m_rx3_center_frequency_isSet = false; + rx4_center_frequency = 0L; + m_rx4_center_frequency_isSet = false; + rx5_center_frequency = 0L; + m_rx5_center_frequency_isSet = false; + rx6_center_frequency = 0L; + m_rx6_center_frequency_isSet = false; + rx7_center_frequency = 0L; + m_rx7_center_frequency_isSet = false; + rx8_center_frequency = 0L; + m_rx8_center_frequency_isSet = false; + tx_center_frequency = 0L; + m_tx_center_frequency_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_transverter_mode = 0; + m_tx_transverter_mode_isSet = false; + tx_transverter_delta_frequency = 0L; + m_tx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; + rx1_subsampling_index = 0; + m_rx1_subsampling_index_isSet = false; + rx2_subsampling_index = 0; + m_rx2_subsampling_index_isSet = false; + rx3_subsampling_index = 0; + m_rx3_subsampling_index_isSet = false; + rx4_subsampling_index = 0; + m_rx4_subsampling_index_isSet = false; + rx5_subsampling_index = 0; + m_rx5_subsampling_index_isSet = false; + rx6_subsampling_index = 0; + m_rx6_subsampling_index_isSet = false; + rx7_subsampling_index = 0; + m_rx7_subsampling_index_isSet = false; + rx8_subsampling_index = 0; + m_rx8_subsampling_index_isSet = false; + sample_rate_index = 0; + m_sample_rate_index_isSet = false; + log2_decim = 0; + m_log2_decim_isSet = false; + l_oppm_tenths = 0; + m_l_oppm_tenths_isSet = false; + preamp = 0; + m_preamp_isSet = false; + random = 0; + m_random_isSet = false; + dither = 0; + m_dither_isSet = false; + duplex = 0; + m_duplex_isSet = false; + dc_block = 0; + m_dc_block_isSet = false; + iq_correction = 0; + m_iq_correction_isSet = false; + tx_drive = 0; + m_tx_drive_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; +} + +SWGMetisMISOSettings::~SWGMetisMISOSettings() { + this->cleanup(); +} + +void +SWGMetisMISOSettings::init() { + nb_receivers = 0; + m_nb_receivers_isSet = false; + tx_enable = 0; + m_tx_enable_isSet = false; + rx1_center_frequency = 0L; + m_rx1_center_frequency_isSet = false; + rx2_center_frequency = 0L; + m_rx2_center_frequency_isSet = false; + rx3_center_frequency = 0L; + m_rx3_center_frequency_isSet = false; + rx4_center_frequency = 0L; + m_rx4_center_frequency_isSet = false; + rx5_center_frequency = 0L; + m_rx5_center_frequency_isSet = false; + rx6_center_frequency = 0L; + m_rx6_center_frequency_isSet = false; + rx7_center_frequency = 0L; + m_rx7_center_frequency_isSet = false; + rx8_center_frequency = 0L; + m_rx8_center_frequency_isSet = false; + tx_center_frequency = 0L; + m_tx_center_frequency_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_transverter_mode = 0; + m_tx_transverter_mode_isSet = false; + tx_transverter_delta_frequency = 0L; + m_tx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; + rx1_subsampling_index = 0; + m_rx1_subsampling_index_isSet = false; + rx2_subsampling_index = 0; + m_rx2_subsampling_index_isSet = false; + rx3_subsampling_index = 0; + m_rx3_subsampling_index_isSet = false; + rx4_subsampling_index = 0; + m_rx4_subsampling_index_isSet = false; + rx5_subsampling_index = 0; + m_rx5_subsampling_index_isSet = false; + rx6_subsampling_index = 0; + m_rx6_subsampling_index_isSet = false; + rx7_subsampling_index = 0; + m_rx7_subsampling_index_isSet = false; + rx8_subsampling_index = 0; + m_rx8_subsampling_index_isSet = false; + sample_rate_index = 0; + m_sample_rate_index_isSet = false; + log2_decim = 0; + m_log2_decim_isSet = false; + l_oppm_tenths = 0; + m_l_oppm_tenths_isSet = false; + preamp = 0; + m_preamp_isSet = false; + random = 0; + m_random_isSet = false; + dither = 0; + m_dither_isSet = false; + duplex = 0; + m_duplex_isSet = false; + dc_block = 0; + m_dc_block_isSet = false; + iq_correction = 0; + m_iq_correction_isSet = false; + tx_drive = 0; + m_tx_drive_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 +SWGMetisMISOSettings::cleanup() { + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + if(reverse_api_address != nullptr) { + delete reverse_api_address; + } + + +} + +SWGMetisMISOSettings* +SWGMetisMISOSettings::fromJson(QString &json) { + QByteArray array (json.toStdString().c_str()); + QJsonDocument doc = QJsonDocument::fromJson(array); + QJsonObject jsonObject = doc.object(); + this->fromJsonObject(jsonObject); + return this; +} + +void +SWGMetisMISOSettings::fromJsonObject(QJsonObject &pJson) { + ::SWGSDRangel::setValue(&nb_receivers, pJson["nbReceivers"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_enable, pJson["txEnable"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx1_center_frequency, pJson["rx1CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx2_center_frequency, pJson["rx2CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx3_center_frequency, pJson["rx3CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx4_center_frequency, pJson["rx4CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx5_center_frequency, pJson["rx5CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx6_center_frequency, pJson["rx6CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx7_center_frequency, pJson["rx7CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx8_center_frequency, pJson["rx8CenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&tx_center_frequency, pJson["txCenterFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&rx_transverter_mode, pJson["rxTransverterMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx_transverter_delta_frequency, pJson["rxTransverterDeltaFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&tx_transverter_mode, pJson["txTransverterMode"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_transverter_delta_frequency, pJson["txTransverterDeltaFrequency"], "qint64", ""); + + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx1_subsampling_index, pJson["rx1SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx2_subsampling_index, pJson["rx2SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx3_subsampling_index, pJson["rx3SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx4_subsampling_index, pJson["rx4SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx5_subsampling_index, pJson["rx5SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx6_subsampling_index, pJson["rx6SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx7_subsampling_index, pJson["rx7SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&rx8_subsampling_index, pJson["rx8SubsamplingIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&sample_rate_index, pJson["sampleRateIndex"], "qint32", ""); + + ::SWGSDRangel::setValue(&log2_decim, pJson["log2Decim"], "qint32", ""); + + ::SWGSDRangel::setValue(&l_oppm_tenths, pJson["LOppmTenths"], "qint32", ""); + + ::SWGSDRangel::setValue(&preamp, pJson["preamp"], "qint32", ""); + + ::SWGSDRangel::setValue(&random, pJson["random"], "qint32", ""); + + ::SWGSDRangel::setValue(&dither, pJson["dither"], "qint32", ""); + + ::SWGSDRangel::setValue(&duplex, pJson["duplex"], "qint32", ""); + + ::SWGSDRangel::setValue(&dc_block, pJson["dcBlock"], "qint32", ""); + + ::SWGSDRangel::setValue(&iq_correction, pJson["iqCorrection"], "qint32", ""); + + ::SWGSDRangel::setValue(&tx_drive, pJson["txDrive"], "qint32", ""); + + ::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 +SWGMetisMISOSettings::asJson () +{ + QJsonObject* obj = this->asJsonObject(); + + QJsonDocument doc(*obj); + QByteArray bytes = doc.toJson(); + delete obj; + return QString(bytes); +} + +QJsonObject* +SWGMetisMISOSettings::asJsonObject() { + QJsonObject* obj = new QJsonObject(); + if(m_nb_receivers_isSet){ + obj->insert("nbReceivers", QJsonValue(nb_receivers)); + } + if(m_tx_enable_isSet){ + obj->insert("txEnable", QJsonValue(tx_enable)); + } + if(m_rx1_center_frequency_isSet){ + obj->insert("rx1CenterFrequency", QJsonValue(rx1_center_frequency)); + } + if(m_rx2_center_frequency_isSet){ + obj->insert("rx2CenterFrequency", QJsonValue(rx2_center_frequency)); + } + if(m_rx3_center_frequency_isSet){ + obj->insert("rx3CenterFrequency", QJsonValue(rx3_center_frequency)); + } + if(m_rx4_center_frequency_isSet){ + obj->insert("rx4CenterFrequency", QJsonValue(rx4_center_frequency)); + } + if(m_rx5_center_frequency_isSet){ + obj->insert("rx5CenterFrequency", QJsonValue(rx5_center_frequency)); + } + if(m_rx6_center_frequency_isSet){ + obj->insert("rx6CenterFrequency", QJsonValue(rx6_center_frequency)); + } + if(m_rx7_center_frequency_isSet){ + obj->insert("rx7CenterFrequency", QJsonValue(rx7_center_frequency)); + } + if(m_rx8_center_frequency_isSet){ + obj->insert("rx8CenterFrequency", QJsonValue(rx8_center_frequency)); + } + if(m_tx_center_frequency_isSet){ + obj->insert("txCenterFrequency", QJsonValue(tx_center_frequency)); + } + 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_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(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } + if(m_rx1_subsampling_index_isSet){ + obj->insert("rx1SubsamplingIndex", QJsonValue(rx1_subsampling_index)); + } + if(m_rx2_subsampling_index_isSet){ + obj->insert("rx2SubsamplingIndex", QJsonValue(rx2_subsampling_index)); + } + if(m_rx3_subsampling_index_isSet){ + obj->insert("rx3SubsamplingIndex", QJsonValue(rx3_subsampling_index)); + } + if(m_rx4_subsampling_index_isSet){ + obj->insert("rx4SubsamplingIndex", QJsonValue(rx4_subsampling_index)); + } + if(m_rx5_subsampling_index_isSet){ + obj->insert("rx5SubsamplingIndex", QJsonValue(rx5_subsampling_index)); + } + if(m_rx6_subsampling_index_isSet){ + obj->insert("rx6SubsamplingIndex", QJsonValue(rx6_subsampling_index)); + } + if(m_rx7_subsampling_index_isSet){ + obj->insert("rx7SubsamplingIndex", QJsonValue(rx7_subsampling_index)); + } + if(m_rx8_subsampling_index_isSet){ + obj->insert("rx8SubsamplingIndex", QJsonValue(rx8_subsampling_index)); + } + if(m_sample_rate_index_isSet){ + obj->insert("sampleRateIndex", QJsonValue(sample_rate_index)); + } + if(m_log2_decim_isSet){ + obj->insert("log2Decim", QJsonValue(log2_decim)); + } + if(m_l_oppm_tenths_isSet){ + obj->insert("LOppmTenths", QJsonValue(l_oppm_tenths)); + } + if(m_preamp_isSet){ + obj->insert("preamp", QJsonValue(preamp)); + } + if(m_random_isSet){ + obj->insert("random", QJsonValue(random)); + } + if(m_dither_isSet){ + obj->insert("dither", QJsonValue(dither)); + } + if(m_duplex_isSet){ + obj->insert("duplex", QJsonValue(duplex)); + } + if(m_dc_block_isSet){ + obj->insert("dcBlock", QJsonValue(dc_block)); + } + if(m_iq_correction_isSet){ + obj->insert("iqCorrection", QJsonValue(iq_correction)); + } + if(m_tx_drive_isSet){ + obj->insert("txDrive", QJsonValue(tx_drive)); + } + 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 +SWGMetisMISOSettings::getNbReceivers() { + return nb_receivers; +} +void +SWGMetisMISOSettings::setNbReceivers(qint32 nb_receivers) { + this->nb_receivers = nb_receivers; + this->m_nb_receivers_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getTxEnable() { + return tx_enable; +} +void +SWGMetisMISOSettings::setTxEnable(qint32 tx_enable) { + this->tx_enable = tx_enable; + this->m_tx_enable_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx1CenterFrequency() { + return rx1_center_frequency; +} +void +SWGMetisMISOSettings::setRx1CenterFrequency(qint64 rx1_center_frequency) { + this->rx1_center_frequency = rx1_center_frequency; + this->m_rx1_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx2CenterFrequency() { + return rx2_center_frequency; +} +void +SWGMetisMISOSettings::setRx2CenterFrequency(qint64 rx2_center_frequency) { + this->rx2_center_frequency = rx2_center_frequency; + this->m_rx2_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx3CenterFrequency() { + return rx3_center_frequency; +} +void +SWGMetisMISOSettings::setRx3CenterFrequency(qint64 rx3_center_frequency) { + this->rx3_center_frequency = rx3_center_frequency; + this->m_rx3_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx4CenterFrequency() { + return rx4_center_frequency; +} +void +SWGMetisMISOSettings::setRx4CenterFrequency(qint64 rx4_center_frequency) { + this->rx4_center_frequency = rx4_center_frequency; + this->m_rx4_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx5CenterFrequency() { + return rx5_center_frequency; +} +void +SWGMetisMISOSettings::setRx5CenterFrequency(qint64 rx5_center_frequency) { + this->rx5_center_frequency = rx5_center_frequency; + this->m_rx5_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx6CenterFrequency() { + return rx6_center_frequency; +} +void +SWGMetisMISOSettings::setRx6CenterFrequency(qint64 rx6_center_frequency) { + this->rx6_center_frequency = rx6_center_frequency; + this->m_rx6_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx7CenterFrequency() { + return rx7_center_frequency; +} +void +SWGMetisMISOSettings::setRx7CenterFrequency(qint64 rx7_center_frequency) { + this->rx7_center_frequency = rx7_center_frequency; + this->m_rx7_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRx8CenterFrequency() { + return rx8_center_frequency; +} +void +SWGMetisMISOSettings::setRx8CenterFrequency(qint64 rx8_center_frequency) { + this->rx8_center_frequency = rx8_center_frequency; + this->m_rx8_center_frequency_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getTxCenterFrequency() { + return tx_center_frequency; +} +void +SWGMetisMISOSettings::setTxCenterFrequency(qint64 tx_center_frequency) { + this->tx_center_frequency = tx_center_frequency; + this->m_tx_center_frequency_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRxTransverterMode() { + return rx_transverter_mode; +} +void +SWGMetisMISOSettings::setRxTransverterMode(qint32 rx_transverter_mode) { + this->rx_transverter_mode = rx_transverter_mode; + this->m_rx_transverter_mode_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getRxTransverterDeltaFrequency() { + return rx_transverter_delta_frequency; +} +void +SWGMetisMISOSettings::setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency) { + this->rx_transverter_delta_frequency = rx_transverter_delta_frequency; + this->m_rx_transverter_delta_frequency_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getTxTransverterMode() { + return tx_transverter_mode; +} +void +SWGMetisMISOSettings::setTxTransverterMode(qint32 tx_transverter_mode) { + this->tx_transverter_mode = tx_transverter_mode; + this->m_tx_transverter_mode_isSet = true; +} + +qint64 +SWGMetisMISOSettings::getTxTransverterDeltaFrequency() { + return tx_transverter_delta_frequency; +} +void +SWGMetisMISOSettings::setTxTransverterDeltaFrequency(qint64 tx_transverter_delta_frequency) { + this->tx_transverter_delta_frequency = tx_transverter_delta_frequency; + this->m_tx_transverter_delta_frequency_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getIqOrder() { + return iq_order; +} +void +SWGMetisMISOSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx1SubsamplingIndex() { + return rx1_subsampling_index; +} +void +SWGMetisMISOSettings::setRx1SubsamplingIndex(qint32 rx1_subsampling_index) { + this->rx1_subsampling_index = rx1_subsampling_index; + this->m_rx1_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx2SubsamplingIndex() { + return rx2_subsampling_index; +} +void +SWGMetisMISOSettings::setRx2SubsamplingIndex(qint32 rx2_subsampling_index) { + this->rx2_subsampling_index = rx2_subsampling_index; + this->m_rx2_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx3SubsamplingIndex() { + return rx3_subsampling_index; +} +void +SWGMetisMISOSettings::setRx3SubsamplingIndex(qint32 rx3_subsampling_index) { + this->rx3_subsampling_index = rx3_subsampling_index; + this->m_rx3_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx4SubsamplingIndex() { + return rx4_subsampling_index; +} +void +SWGMetisMISOSettings::setRx4SubsamplingIndex(qint32 rx4_subsampling_index) { + this->rx4_subsampling_index = rx4_subsampling_index; + this->m_rx4_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx5SubsamplingIndex() { + return rx5_subsampling_index; +} +void +SWGMetisMISOSettings::setRx5SubsamplingIndex(qint32 rx5_subsampling_index) { + this->rx5_subsampling_index = rx5_subsampling_index; + this->m_rx5_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx6SubsamplingIndex() { + return rx6_subsampling_index; +} +void +SWGMetisMISOSettings::setRx6SubsamplingIndex(qint32 rx6_subsampling_index) { + this->rx6_subsampling_index = rx6_subsampling_index; + this->m_rx6_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx7SubsamplingIndex() { + return rx7_subsampling_index; +} +void +SWGMetisMISOSettings::setRx7SubsamplingIndex(qint32 rx7_subsampling_index) { + this->rx7_subsampling_index = rx7_subsampling_index; + this->m_rx7_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRx8SubsamplingIndex() { + return rx8_subsampling_index; +} +void +SWGMetisMISOSettings::setRx8SubsamplingIndex(qint32 rx8_subsampling_index) { + this->rx8_subsampling_index = rx8_subsampling_index; + this->m_rx8_subsampling_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getSampleRateIndex() { + return sample_rate_index; +} +void +SWGMetisMISOSettings::setSampleRateIndex(qint32 sample_rate_index) { + this->sample_rate_index = sample_rate_index; + this->m_sample_rate_index_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getLog2Decim() { + return log2_decim; +} +void +SWGMetisMISOSettings::setLog2Decim(qint32 log2_decim) { + this->log2_decim = log2_decim; + this->m_log2_decim_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getLOppmTenths() { + return l_oppm_tenths; +} +void +SWGMetisMISOSettings::setLOppmTenths(qint32 l_oppm_tenths) { + this->l_oppm_tenths = l_oppm_tenths; + this->m_l_oppm_tenths_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getPreamp() { + return preamp; +} +void +SWGMetisMISOSettings::setPreamp(qint32 preamp) { + this->preamp = preamp; + this->m_preamp_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getRandom() { + return random; +} +void +SWGMetisMISOSettings::setRandom(qint32 random) { + this->random = random; + this->m_random_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getDither() { + return dither; +} +void +SWGMetisMISOSettings::setDither(qint32 dither) { + this->dither = dither; + this->m_dither_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getDuplex() { + return duplex; +} +void +SWGMetisMISOSettings::setDuplex(qint32 duplex) { + this->duplex = duplex; + this->m_duplex_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getDcBlock() { + return dc_block; +} +void +SWGMetisMISOSettings::setDcBlock(qint32 dc_block) { + this->dc_block = dc_block; + this->m_dc_block_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getIqCorrection() { + return iq_correction; +} +void +SWGMetisMISOSettings::setIqCorrection(qint32 iq_correction) { + this->iq_correction = iq_correction; + this->m_iq_correction_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getTxDrive() { + return tx_drive; +} +void +SWGMetisMISOSettings::setTxDrive(qint32 tx_drive) { + this->tx_drive = tx_drive; + this->m_tx_drive_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getUseReverseApi() { + return use_reverse_api; +} +void +SWGMetisMISOSettings::setUseReverseApi(qint32 use_reverse_api) { + this->use_reverse_api = use_reverse_api; + this->m_use_reverse_api_isSet = true; +} + +QString* +SWGMetisMISOSettings::getReverseApiAddress() { + return reverse_api_address; +} +void +SWGMetisMISOSettings::setReverseApiAddress(QString* reverse_api_address) { + this->reverse_api_address = reverse_api_address; + this->m_reverse_api_address_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getReverseApiPort() { + return reverse_api_port; +} +void +SWGMetisMISOSettings::setReverseApiPort(qint32 reverse_api_port) { + this->reverse_api_port = reverse_api_port; + this->m_reverse_api_port_isSet = true; +} + +qint32 +SWGMetisMISOSettings::getReverseApiDeviceIndex() { + return reverse_api_device_index; +} +void +SWGMetisMISOSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) { + this->reverse_api_device_index = reverse_api_device_index; + this->m_reverse_api_device_index_isSet = true; +} + + +bool +SWGMetisMISOSettings::isSet(){ + bool isObjectUpdated = false; + do{ + if(m_nb_receivers_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_enable_isSet){ + isObjectUpdated = true; break; + } + if(m_rx1_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx2_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx3_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx4_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx5_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx6_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx7_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_rx8_center_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_center_frequency_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_transverter_mode_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_transverter_delta_frequency_isSet){ + isObjectUpdated = true; break; + } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } + if(m_rx1_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx2_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx3_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx4_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx5_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx6_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx7_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_rx8_subsampling_index_isSet){ + isObjectUpdated = true; break; + } + if(m_sample_rate_index_isSet){ + isObjectUpdated = true; break; + } + if(m_log2_decim_isSet){ + isObjectUpdated = true; break; + } + if(m_l_oppm_tenths_isSet){ + isObjectUpdated = true; break; + } + if(m_preamp_isSet){ + isObjectUpdated = true; break; + } + if(m_random_isSet){ + isObjectUpdated = true; break; + } + if(m_dither_isSet){ + isObjectUpdated = true; break; + } + if(m_duplex_isSet){ + isObjectUpdated = true; break; + } + if(m_dc_block_isSet){ + isObjectUpdated = true; break; + } + if(m_iq_correction_isSet){ + isObjectUpdated = true; break; + } + if(m_tx_drive_isSet){ + 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/SWGMetisMISOSettings.h b/swagger/sdrangel/code/qt5/client/SWGMetisMISOSettings.h new file mode 100644 index 000000000..fca55d389 --- /dev/null +++ b/swagger/sdrangel/code/qt5/client/SWGMetisMISOSettings.h @@ -0,0 +1,281 @@ +/** + * 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, USRP 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.15.0 + * 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. + */ + +/* + * SWGMetisMISOSettings.h + * + * MetisMISOSettings + */ + +#ifndef SWGMetisMISOSettings_H_ +#define SWGMetisMISOSettings_H_ + +#include + + +#include + +#include "SWGObject.h" +#include "export.h" + +namespace SWGSDRangel { + +class SWG_API SWGMetisMISOSettings: public SWGObject { +public: + SWGMetisMISOSettings(); + SWGMetisMISOSettings(QString* json); + virtual ~SWGMetisMISOSettings(); + void init(); + void cleanup(); + + virtual QString asJson () override; + virtual QJsonObject* asJsonObject() override; + virtual void fromJsonObject(QJsonObject &json) override; + virtual SWGMetisMISOSettings* fromJson(QString &jsonString) override; + + qint32 getNbReceivers(); + void setNbReceivers(qint32 nb_receivers); + + qint32 getTxEnable(); + void setTxEnable(qint32 tx_enable); + + qint64 getRx1CenterFrequency(); + void setRx1CenterFrequency(qint64 rx1_center_frequency); + + qint64 getRx2CenterFrequency(); + void setRx2CenterFrequency(qint64 rx2_center_frequency); + + qint64 getRx3CenterFrequency(); + void setRx3CenterFrequency(qint64 rx3_center_frequency); + + qint64 getRx4CenterFrequency(); + void setRx4CenterFrequency(qint64 rx4_center_frequency); + + qint64 getRx5CenterFrequency(); + void setRx5CenterFrequency(qint64 rx5_center_frequency); + + qint64 getRx6CenterFrequency(); + void setRx6CenterFrequency(qint64 rx6_center_frequency); + + qint64 getRx7CenterFrequency(); + void setRx7CenterFrequency(qint64 rx7_center_frequency); + + qint64 getRx8CenterFrequency(); + void setRx8CenterFrequency(qint64 rx8_center_frequency); + + qint64 getTxCenterFrequency(); + void setTxCenterFrequency(qint64 tx_center_frequency); + + qint32 getRxTransverterMode(); + void setRxTransverterMode(qint32 rx_transverter_mode); + + qint64 getRxTransverterDeltaFrequency(); + void setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency); + + qint32 getTxTransverterMode(); + void setTxTransverterMode(qint32 tx_transverter_mode); + + qint64 getTxTransverterDeltaFrequency(); + void setTxTransverterDeltaFrequency(qint64 tx_transverter_delta_frequency); + + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + + qint32 getRx1SubsamplingIndex(); + void setRx1SubsamplingIndex(qint32 rx1_subsampling_index); + + qint32 getRx2SubsamplingIndex(); + void setRx2SubsamplingIndex(qint32 rx2_subsampling_index); + + qint32 getRx3SubsamplingIndex(); + void setRx3SubsamplingIndex(qint32 rx3_subsampling_index); + + qint32 getRx4SubsamplingIndex(); + void setRx4SubsamplingIndex(qint32 rx4_subsampling_index); + + qint32 getRx5SubsamplingIndex(); + void setRx5SubsamplingIndex(qint32 rx5_subsampling_index); + + qint32 getRx6SubsamplingIndex(); + void setRx6SubsamplingIndex(qint32 rx6_subsampling_index); + + qint32 getRx7SubsamplingIndex(); + void setRx7SubsamplingIndex(qint32 rx7_subsampling_index); + + qint32 getRx8SubsamplingIndex(); + void setRx8SubsamplingIndex(qint32 rx8_subsampling_index); + + qint32 getSampleRateIndex(); + void setSampleRateIndex(qint32 sample_rate_index); + + qint32 getLog2Decim(); + void setLog2Decim(qint32 log2_decim); + + qint32 getLOppmTenths(); + void setLOppmTenths(qint32 l_oppm_tenths); + + qint32 getPreamp(); + void setPreamp(qint32 preamp); + + qint32 getRandom(); + void setRandom(qint32 random); + + qint32 getDither(); + void setDither(qint32 dither); + + qint32 getDuplex(); + void setDuplex(qint32 duplex); + + qint32 getDcBlock(); + void setDcBlock(qint32 dc_block); + + qint32 getIqCorrection(); + void setIqCorrection(qint32 iq_correction); + + qint32 getTxDrive(); + void setTxDrive(qint32 tx_drive); + + 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 nb_receivers; + bool m_nb_receivers_isSet; + + qint32 tx_enable; + bool m_tx_enable_isSet; + + qint64 rx1_center_frequency; + bool m_rx1_center_frequency_isSet; + + qint64 rx2_center_frequency; + bool m_rx2_center_frequency_isSet; + + qint64 rx3_center_frequency; + bool m_rx3_center_frequency_isSet; + + qint64 rx4_center_frequency; + bool m_rx4_center_frequency_isSet; + + qint64 rx5_center_frequency; + bool m_rx5_center_frequency_isSet; + + qint64 rx6_center_frequency; + bool m_rx6_center_frequency_isSet; + + qint64 rx7_center_frequency; + bool m_rx7_center_frequency_isSet; + + qint64 rx8_center_frequency; + bool m_rx8_center_frequency_isSet; + + qint64 tx_center_frequency; + bool m_tx_center_frequency_isSet; + + qint32 rx_transverter_mode; + bool m_rx_transverter_mode_isSet; + + qint64 rx_transverter_delta_frequency; + bool m_rx_transverter_delta_frequency_isSet; + + qint32 tx_transverter_mode; + bool m_tx_transverter_mode_isSet; + + qint64 tx_transverter_delta_frequency; + bool m_tx_transverter_delta_frequency_isSet; + + qint32 iq_order; + bool m_iq_order_isSet; + + qint32 rx1_subsampling_index; + bool m_rx1_subsampling_index_isSet; + + qint32 rx2_subsampling_index; + bool m_rx2_subsampling_index_isSet; + + qint32 rx3_subsampling_index; + bool m_rx3_subsampling_index_isSet; + + qint32 rx4_subsampling_index; + bool m_rx4_subsampling_index_isSet; + + qint32 rx5_subsampling_index; + bool m_rx5_subsampling_index_isSet; + + qint32 rx6_subsampling_index; + bool m_rx6_subsampling_index_isSet; + + qint32 rx7_subsampling_index; + bool m_rx7_subsampling_index_isSet; + + qint32 rx8_subsampling_index; + bool m_rx8_subsampling_index_isSet; + + qint32 sample_rate_index; + bool m_sample_rate_index_isSet; + + qint32 log2_decim; + bool m_log2_decim_isSet; + + qint32 l_oppm_tenths; + bool m_l_oppm_tenths_isSet; + + qint32 preamp; + bool m_preamp_isSet; + + qint32 random; + bool m_random_isSet; + + qint32 dither; + bool m_dither_isSet; + + qint32 duplex; + bool m_duplex_isSet; + + qint32 dc_block; + bool m_dc_block_isSet; + + qint32 iq_correction; + bool m_iq_correction_isSet; + + qint32 tx_drive; + bool m_tx_drive_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 /* SWGMetisMISOSettings_H_ */ diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index 177ff60bd..551315318 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -142,6 +142,7 @@ #include "SWGLocalSourceSettings.h" #include "SWGLocationInformation.h" #include "SWGLoggingInfo.h" +#include "SWGMetisMISOSettings.h" #include "SWGNFMDemodReport.h" #include "SWGNFMDemodSettings.h" #include "SWGNFMModReport.h" @@ -615,6 +616,9 @@ namespace SWGSDRangel { if(QString("SWGLoggingInfo").compare(type) == 0) { return new SWGLoggingInfo(); } + if(QString("SWGMetisMISOSettings").compare(type) == 0) { + return new SWGMetisMISOSettings(); + } if(QString("SWGNFMDemodReport").compare(type) == 0) { return new SWGNFMDemodReport(); }