diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index e07ab0333..f01db7a77 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -14,14 +14,20 @@ webapi/doc/swagger/include/ChannelActions.yaml webapi/doc/swagger/include/ChannelAnalyzer.yaml webapi/doc/swagger/include/ChannelSettings.yaml + webapi/doc/swagger/include/ChannelReport.yaml webapi/doc/swagger/include/Command.yaml webapi/doc/swagger/include/CWKeyer.yaml webapi/doc/swagger/include/DATVDemod.yaml webapi/doc/swagger/include/DSDDemod.yaml webapi/doc/swagger/include/DeviceActions.yaml webapi/doc/swagger/include/DeviceSettings.yaml + webapi/doc/swagger/include/DeviceReports.yaml webapi/doc/swagger/include/FCDPro.yaml webapi/doc/swagger/include/FCDProPlus.yaml + webapi/doc/swagger/include/FeatureActions.yaml + webapi/doc/swagger/include/FeatureReport.yaml + webapi/doc/swagger/include/FeatureSettings.yaml + webapi/doc/swagger/include/FeatureSetPreset.yaml webapi/doc/swagger/include/FileSink.yaml webapi/doc/swagger/include/FileSource.yaml webapi/doc/swagger/include/FileInput.yaml @@ -50,7 +56,9 @@ webapi/doc/swagger/include/RemoteSource.yaml webapi/doc/swagger/include/RemoteInput.yaml webapi/doc/swagger/include/RemoteOutput.yaml + webapi/doc/swagger/include/RigCtlServer.yaml webapi/doc/swagger/include/SDRPlay.yaml + webapi/doc/swagger/include/SimplePTT.yaml webapi/doc/swagger/include/SoapySDR.yaml webapi/doc/swagger/include/SSBDemod.yaml webapi/doc/swagger/include/SSBMod.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index bff9aef41..35752624b 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1132,6 +1132,17 @@ margin-bottom: 20px; } }, "description" : "ATVMod" +}; + defs.AirspyHFReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + } + }, + "description" : "AirspyHF" }; defs.AirspyHFSettings = { "properties" : { @@ -1203,6 +1214,17 @@ margin-bottom: 20px; } }, "description" : "AirspyHF" +}; + defs.AirspyReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + } + }, + "description" : "Airspy" }; defs.AirspySettings = { "properties" : { @@ -1276,6 +1298,44 @@ margin-bottom: 20px; } }, "description" : "Airspy" +}; + defs.ArgInfo = { + "properties" : { + "key" : { + "type" : "string" + }, + "valueType" : { + "type" : "string", + "enum" : [ "bool", "int", "float", "string" ] + }, + "valueString" : { + "type" : "string" + }, + "name" : { + "type" : "string" + }, + "description" : { + "type" : "string" + }, + "units" : { + "type" : "string" + }, + "range" : { + "$ref" : "#/definitions/RangeFloat" + }, + "valueOptions" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "optionNames" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } }; defs.ArgValue = { "properties" : { @@ -1499,6 +1559,14 @@ margin-bottom: 20px; } }, "description" : "BFMDemod" +}; + defs.Bandwidth = { + "properties" : { + "bandwidth" : { + "type" : "integer" + } + }, + "description" : "A bandwidth expressed in Hertz (Hz)" }; defs.BladeRF1InputSettings = { "properties" : { @@ -1607,6 +1675,29 @@ margin-bottom: 20px; } }, "description" : "BladeRF1" +}; + defs.BladeRF2InputReport = { + "properties" : { + "frequencyRange" : { + "$ref" : "#/definitions/FrequencyRange" + }, + "sampleRateRange" : { + "$ref" : "#/definitions/Range" + }, + "bandwidthRange" : { + "$ref" : "#/definitions/Range" + }, + "globalGainRange" : { + "$ref" : "#/definitions/Range" + }, + "gainModes" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/NamedEnum" + } + } + }, + "description" : "BladeRF2" }; defs.BladeRF2InputSettings = { "properties" : { @@ -1779,6 +1870,23 @@ margin-bottom: 20px; } }, "description" : "BladeRF2" +}; + defs.BladeRF2OutputReport = { + "properties" : { + "frequencyRange" : { + "$ref" : "#/definitions/FrequencyRange" + }, + "sampleRateRange" : { + "$ref" : "#/definitions/Range" + }, + "bandwidthRange" : { + "$ref" : "#/definitions/Range" + }, + "globalGainRange" : { + "$ref" : "#/definitions/Range" + } + }, + "description" : "BladeRF2" }; defs.BladeRF2OutputSettings = { "properties" : { @@ -2622,6 +2730,84 @@ margin-bottom: 20px; } }, "description" : "Summarized information about attached hardware device" +}; + defs.DeviceReport = { + "required" : [ "deviceHwType", "direction" ], + "discriminator" : "deviceHwType", + "properties" : { + "deviceHwType" : { + "type" : "string", + "description" : "Device hardware type code" + }, + "direction" : { + "type" : "integer", + "description" : "0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)" + }, + "airspyReport" : { + "$ref" : "#/definitions/AirspyReport" + }, + "airspyHFReport" : { + "$ref" : "#/definitions/AirspyHFReport" + }, + "bladeRF2InputReport" : { + "$ref" : "#/definitions/BladeRF2InputReport" + }, + "bladeRF2OutputReport" : { + "$ref" : "#/definitions/BladeRF2OutputReport" + }, + "fileInputReport" : { + "$ref" : "#/definitions/FileInputReport" + }, + "limeSdrInputReport" : { + "$ref" : "#/definitions/LimeSdrInputReport" + }, + "kiwiSDRReport" : { + "$ref" : "#/definitions/KiwiSDRReport" + }, + "limeSdrOutputReport" : { + "$ref" : "#/definitions/LimeSdrOutputReport" + }, + "localInputReport" : { + "$ref" : "#/definitions/LocalInputReport" + }, + "localOutputReport" : { + "$ref" : "#/definitions/LocalOutputReport" + }, + "perseusReport" : { + "$ref" : "#/definitions/PerseusReport" + }, + "plutoSdrInputReport" : { + "$ref" : "#/definitions/PlutoSdrInputReport" + }, + "plutoSdrOutputReport" : { + "$ref" : "#/definitions/PlutoSdrOutputReport" + }, + "rtlSdrReport" : { + "$ref" : "#/definitions/RtlSdrReport" + }, + "remoteOutputReport" : { + "$ref" : "#/definitions/RemoteOutputReport" + }, + "remoteInputReport" : { + "$ref" : "#/definitions/RemoteInputReport" + }, + "sdrPlayReport" : { + "$ref" : "#/definitions/SDRPlayReport" + }, + "soapySDRInputReport" : { + "$ref" : "#/definitions/SoapySDRReport" + }, + "soapySDROutputReport" : { + "$ref" : "#/definitions/SoapySDRReport" + }, + "xtrxInputReport" : { + "$ref" : "#/definitions/XtrxInputReport" + }, + "xtrxOutputReport" : { + "$ref" : "#/definitions/XtrxOutputReport" + } + }, + "description" : "Base device report. Only the device report corresponding to the device specified in the deviceHwType is or should be present." }; defs.DeviceSet = { "required" : [ "channelcount", "samplingDevice" ], @@ -3101,6 +3287,34 @@ margin-bottom: 20px; } }, "description" : "Base feature settings. Only the feature settings corresponding to the feature specified in the featureType field is or should be present." +}; + defs.FileInputReport = { + "properties" : { + "fileName" : { + "type" : "string" + }, + "sampleRate" : { + "type" : "integer", + "description" : "Record sample rate in S/s" + }, + "sampleSize" : { + "type" : "integer", + "description" : "Record sample size in number of bits" + }, + "absoluteTime" : { + "type" : "string", + "description" : "Absolute record time string representation" + }, + "elapsedTime" : { + "type" : "string", + "description" : "Elapsed time since beginning string representation" + }, + "durationTime" : { + "type" : "string", + "description" : "Duration time string representation" + } + }, + "description" : "FileInput" }; defs.FileInputSettings = { "properties" : { @@ -3604,6 +3818,48 @@ margin-bottom: 20px; } }, "description" : "FreqTracker" +}; + defs.Frequency = { + "properties" : { + "frequency" : { + "type" : "integer" + } + }, + "description" : "A frequency expressed in Hertz (Hz)" +}; + defs.FrequencyBand = { + "properties" : { + "name" : { + "type" : "string" + }, + "lowerBound" : { + "type" : "integer" + }, + "higherBound" : { + "type" : "integer" + } + }, + "description" : "A band of frequencies given its boudaries in Hertz (Hz)" +}; + defs.FrequencyRange = { + "properties" : { + "min" : { + "type" : "integer", + "format" : "int64" + }, + "max" : { + "type" : "integer", + "format" : "int64" + }, + "step" : { + "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "An frequency range with 64 bit support for min and max" }; defs.GLScope = { "properties" : { @@ -3724,6 +3980,14 @@ margin-bottom: 20px; } }, "description" : "GLSpectrumGUI settings" +}; + defs.Gain = { + "properties" : { + "gainCB" : { + "type" : "integer" + } + }, + "description" : "A gain expressed in centi-Bels (tenths of dB)" }; defs.HackRFInputSettings = { "properties" : { @@ -3953,6 +4217,15 @@ margin-bottom: 20px; } }, "description" : "Summarized information about this SDRangel instance" +}; + defs.KiwiSDRReport = { + "properties" : { + "status" : { + "type" : "integer", + "description" : "0 for Idle, 1 for Connecting, 2 for Connected, 3 for Error, 4 for Disconnected" + } + }, + "description" : "KiwiSDR" }; defs.KiwiSDRSettings = { "properties" : { @@ -4100,6 +4373,55 @@ margin-bottom: 20px; } }, "description" : "LimeRFE" +}; + defs.LimeSdrInputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfullt retrieved else 0" + }, + "streamActive" : { + "type" : "integer", + "description" : "1 if active else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "underrunCount" : { + "type" : "integer" + }, + "overrunCount" : { + "type" : "integer" + }, + "droppedPacketsCount" : { + "type" : "integer" + }, + "linkRate" : { + "type" : "number", + "format" : "float" + }, + "hwTimestamp" : { + "type" : "integer", + "format" : "int64", + "description" : "Hardware timestamp" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpioDir" : { + "type" : "integer", + "format" : "int8" + }, + "gpioPins" : { + "type" : "integer", + "format" : "int8" + } + }, + "description" : "LimeSDR" }; defs.LimeSdrInputSettings = { "properties" : { @@ -4195,6 +4517,55 @@ margin-bottom: 20px; } }, "description" : "LimeSDR" +}; + defs.LimeSdrOutputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfullt retrieved else 0" + }, + "streamActive" : { + "type" : "integer", + "description" : "1 if active else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "underrunCount" : { + "type" : "integer" + }, + "overrunCount" : { + "type" : "integer" + }, + "droppedPacketsCount" : { + "type" : "integer" + }, + "linkRate" : { + "type" : "number", + "format" : "float" + }, + "hwTimestamp" : { + "type" : "integer", + "format" : "int64", + "description" : "Hardware timestamp" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpioDir" : { + "type" : "integer", + "format" : "int8" + }, + "gpioPins" : { + "type" : "integer", + "format" : "int8" + } + }, + "description" : "LimeSDR" }; defs.LimeSdrOutputSettings = { "properties" : { @@ -4268,6 +4639,18 @@ margin-bottom: 20px; } }, "description" : "LimeSDR" +}; + defs.LocalInputReport = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "sampleRate" : { + "type" : "integer" + } + }, + "description" : "LocalInput" }; defs.LocalInputSettings = { "properties" : { @@ -4292,6 +4675,18 @@ margin-bottom: 20px; } }, "description" : "LocalInput" +}; + defs.LocalOutputReport = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "sampleRate" : { + "type" : "integer" + } + }, + "description" : "LocalOutput" }; defs.LocalOutputSettings = { "properties" : { @@ -4634,6 +5029,17 @@ margin-bottom: 20px; } }, "description" : "NFMMod" +}; + defs.NamedEnum = { + "properties" : { + "name" : { + "type" : "string" + }, + "value" : { + "type" : "integer" + } + }, + "description" : "Enumeration with name for values" }; defs.PacketModActions = { "properties" : { @@ -4843,6 +5249,17 @@ margin-bottom: 20px; } }, "description" : "PacketMod" +}; + defs.PerseusReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + } + }, + "description" : "Perseus" }; defs.PerseusSettings = { "properties" : { @@ -4901,6 +5318,24 @@ margin-bottom: 20px; } }, "description" : "Perseus" +}; + defs.PlutoSdrInputReport = { + "properties" : { + "adcRate" : { + "type" : "integer" + }, + "rssi" : { + "type" : "string" + }, + "gainDB" : { + "type" : "integer" + }, + "temperature" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "PlutoSDR" }; defs.PlutoSdrInputSettings = { "properties" : { @@ -4992,6 +5427,21 @@ margin-bottom: 20px; } }, "description" : "PlutoSDR" +}; + defs.PlutoSdrOutputReport = { + "properties" : { + "dacRate" : { + "type" : "integer" + }, + "rssi" : { + "type" : "string" + }, + "temperature" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "PlutoSDR" }; defs.PlutoSdrOutputSettings = { "properties" : { @@ -5335,6 +5785,69 @@ margin-bottom: 20px; "format" : "float" } } +}; + defs.Range = { + "properties" : { + "min" : { + "type" : "integer" + }, + "max" : { + "type" : "integer" + }, + "step" : { + "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "An arbitrary range of integer values" +}; + defs.RangeFloat = { + "properties" : { + "min" : { + "type" : "number", + "format" : "float" + }, + "max" : { + "type" : "number", + "format" : "float" + }, + "step" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "An arbitrary range of floating point values" +}; + defs.RemoteInputReport = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "sampleRate" : { + "type" : "integer" + }, + "bufferRWBalance" : { + "type" : "integer", + "description" : "percentage off the mid buffer (positive read leads)" + }, + "remoteTimestamp" : { + "type" : "string", + "description" : "string representation of timestamp as sent by the remote instance" + }, + "minNbBlocks" : { + "type" : "integer", + "description" : "Minimum number of blocks retrieved per frame" + }, + "maxNbRecovery" : { + "type" : "integer", + "description" : "Maximum number of recovery blocks used per frame" + } + }, + "description" : "RemoteInput" }; defs.RemoteInputSettings = { "properties" : { @@ -5378,6 +5891,20 @@ margin-bottom: 20px; } }, "description" : "RemoteInput" +}; + defs.RemoteOutputReport = { + "properties" : { + "bufferRWBalance" : { + "type" : "number", + "format" : "float", + "description" : "ratio off the mid buffer (positive read leads)" + }, + "sampleCount" : { + "type" : "integer", + "description" : "count of samples that have been sent" + } + }, + "description" : "RemoteOutput" }; defs.RemoteOutputSettings = { "properties" : { @@ -5621,6 +6148,17 @@ margin-bottom: 20px; } }, "description" : "RigCtl server settings" +}; + defs.RtlSdrReport = { + "properties" : { + "gains" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Gain" + } + } + }, + "description" : "RTLSDR" }; defs.RtlSdrSettings = { "properties" : { @@ -5694,6 +6232,35 @@ margin-bottom: 20px; } }, "description" : "RTLSDR" +}; + defs.SDRPlayReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + }, + "bandwidths" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Bandwidth" + } + }, + "intermediateFrequencies" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Frequency" + } + }, + "frequencyBands" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/FrequencyBand" + } + } + }, + "description" : "SDRplay1" }; defs.SDRPlaySettings = { "properties" : { @@ -5972,6 +6539,14 @@ margin-bottom: 20px; } }, "description" : "SSBMod" +}; + defs.SampleRate = { + "properties" : { + "rate" : { + "type" : "integer" + } + }, + "description" : "A sample rate expressed in samples per second (S/s)" }; defs.SamplingDevice = { "required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial" ], @@ -6088,6 +6663,31 @@ margin-bottom: 20px; } }, "description" : "Simple PTT settings" +}; + defs.SoapySDRFrequencySetting = { + "properties" : { + "name" : { + "type" : "string" + }, + "ranges" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/RangeFloat" + } + } + }, + "description" : "A named frequency setting specified by a range list" +}; + defs.SoapySDRGainSetting = { + "properties" : { + "name" : { + "type" : "string" + }, + "range" : { + "$ref" : "#/definitions/RangeFloat" + } + }, + "description" : "A named gain setting specified by its range" }; defs.SoapySDRInputSettings = { "properties" : { @@ -6283,6 +6883,82 @@ margin-bottom: 20px; } }, "description" : "SoapySDR" +}; + defs.SoapySDRReport = { + "properties" : { + "deviceSettingsArgs" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ArgInfo" + } + }, + "streamSettingsArgs" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ArgInfo" + } + }, + "hasDCAutoCorrection" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "hasDCOffsetValue" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "hasIQBalanceValue" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "hasFrequencyCorrectionValue" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "antennas" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "hasAGC" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "gainRange" : { + "$ref" : "#/definitions/RangeFloat" + }, + "gainSettings" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SoapySDRGainSetting" + } + }, + "frequencySettings" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SoapySDRFrequencySetting" + } + }, + "frequencySettingsArgs" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ArgInfo" + } + }, + "ratesRanges" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/RangeFloat" + } + }, + "bandwidthsRanges" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/RangeFloat" + } + } + }, + "description" : "SoapySDR" }; defs.SuccessResponse = { "required" : [ "message" ], @@ -6928,6 +7604,29 @@ margin-bottom: 20px; } }, "description" : "WFMMod" +}; + defs.XtrxInputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfully retrieved else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpsLock" : { + "type" : "integer", + "description" : "1 if GPSDO is locked else 0" + } + }, + "description" : "XTRX" }; defs.XtrxInputSettings = { "properties" : { @@ -7019,6 +7718,29 @@ margin-bottom: 20px; } }, "description" : "XTRX" +}; + defs.XtrxOutputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfully retrieved else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpsLock" : { + "type" : "integer", + "description" : "1 if GPSDO is locked else 0" + } + }, + "description" : "XTRX" }; defs.XtrxOutputSettings = { "properties" : { @@ -38991,7 +39713,7 @@ except ApiException as e:
- Generated 2020-09-28T19:24:51.767+02:00 + Generated 2020-09-29T00:33:21.870+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml new file mode 100644 index 000000000..feb311dfc --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml @@ -0,0 +1,55 @@ +DeviceReport: + description: Base device report. Only the device report corresponding to the device specified in the deviceHwType is or should be present. + discriminator: deviceHwType + required: + - deviceHwType + - direction + properties: + deviceHwType: + description: Device hardware type code + type: string + direction: + description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) + type: integer + airspyReport: + $ref: "/doc/swagger/include/Airspy.yaml#/AirspyReport" + airspyHFReport: + $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFReport" + bladeRF2InputReport: + $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputReport" + bladeRF2OutputReport: + $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport" + fileInputReport: + $ref: "/doc/swagger/include/FileInput.yaml#/FileInputReport" + limeSdrInputReport: + $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputReport" + kiwiSDRReport: + $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRReport" + limeSdrOutputReport: + $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputReport" + localInputReport: + $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputReport" + localOutputReport: + $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputReport" + perseusReport: + $ref: "/doc/swagger/include/Perseus.yaml#/PerseusReport" + plutoSdrInputReport: + $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputReport" + plutoSdrOutputReport: + $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputReport" + rtlSdrReport: + $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrReport" + remoteOutputReport: + $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputReport" + remoteInputReport: + $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputReport" + sdrPlayReport: + $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlayReport" + soapySDRInputReport: + $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRReport" + soapySDROutputReport: + $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRReport" + xtrxInputReport: + $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputReport" + xtrxOutputReport: + $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputReport" diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 885cbc624..7f1d57d41 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -1353,7 +1353,7 @@ paths: "200": description: On success return device report schema: - $ref: "#/definitions/DeviceReport" + $ref: "/doc/swagger/include/DeviceReports.yaml#/DeviceReport" "400": description: Invalid device set schema: diff --git a/swagger/sdrangel/api/swagger/include/DeviceReports.yaml b/swagger/sdrangel/api/swagger/include/DeviceReports.yaml new file mode 100644 index 000000000..d6a7e39e6 --- /dev/null +++ b/swagger/sdrangel/api/swagger/include/DeviceReports.yaml @@ -0,0 +1,55 @@ +DeviceReport: + description: Base device report. Only the device report corresponding to the device specified in the deviceHwType is or should be present. + discriminator: deviceHwType + required: + - deviceHwType + - direction + properties: + deviceHwType: + description: Device hardware type code + type: string + direction: + description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) + type: integer + airspyReport: + $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspyReport" + airspyHFReport: + $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFReport" + bladeRF2InputReport: + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputReport" + bladeRF2OutputReport: + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport" + fileInputReport: + $ref: "http://swgserver:8081/api/swagger/include/FileInput.yaml#/FileInputReport" + limeSdrInputReport: + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputReport" + kiwiSDRReport: + $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRReport" + limeSdrOutputReport: + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputReport" + localInputReport: + $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputReport" + localOutputReport: + $ref: "http://swgserver:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputReport" + perseusReport: + $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusReport" + plutoSdrInputReport: + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputReport" + plutoSdrOutputReport: + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputReport" + rtlSdrReport: + $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrReport" + remoteOutputReport: + $ref: "http://swgserver:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputReport" + remoteInputReport: + $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputReport" + sdrPlayReport: + $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlayReport" + soapySDRInputReport: + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRReport" + soapySDROutputReport: + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRReport" + xtrxInputReport: + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputReport" + xtrxOutputReport: + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputReport" diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index aa4de8a39..a13661f22 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -1353,7 +1353,7 @@ paths: "200": description: On success return device report schema: - $ref: "#/definitions/DeviceReport" + $ref: "http://swgserver:8081/api/swagger/include/DeviceReports.yaml#/DeviceReport" "400": description: Invalid device set schema: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index bff9aef41..35752624b 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1132,6 +1132,17 @@ margin-bottom: 20px; } }, "description" : "ATVMod" +}; + defs.AirspyHFReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + } + }, + "description" : "AirspyHF" }; defs.AirspyHFSettings = { "properties" : { @@ -1203,6 +1214,17 @@ margin-bottom: 20px; } }, "description" : "AirspyHF" +}; + defs.AirspyReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + } + }, + "description" : "Airspy" }; defs.AirspySettings = { "properties" : { @@ -1276,6 +1298,44 @@ margin-bottom: 20px; } }, "description" : "Airspy" +}; + defs.ArgInfo = { + "properties" : { + "key" : { + "type" : "string" + }, + "valueType" : { + "type" : "string", + "enum" : [ "bool", "int", "float", "string" ] + }, + "valueString" : { + "type" : "string" + }, + "name" : { + "type" : "string" + }, + "description" : { + "type" : "string" + }, + "units" : { + "type" : "string" + }, + "range" : { + "$ref" : "#/definitions/RangeFloat" + }, + "valueOptions" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "optionNames" : { + "type" : "array", + "items" : { + "type" : "string" + } + } + } }; defs.ArgValue = { "properties" : { @@ -1499,6 +1559,14 @@ margin-bottom: 20px; } }, "description" : "BFMDemod" +}; + defs.Bandwidth = { + "properties" : { + "bandwidth" : { + "type" : "integer" + } + }, + "description" : "A bandwidth expressed in Hertz (Hz)" }; defs.BladeRF1InputSettings = { "properties" : { @@ -1607,6 +1675,29 @@ margin-bottom: 20px; } }, "description" : "BladeRF1" +}; + defs.BladeRF2InputReport = { + "properties" : { + "frequencyRange" : { + "$ref" : "#/definitions/FrequencyRange" + }, + "sampleRateRange" : { + "$ref" : "#/definitions/Range" + }, + "bandwidthRange" : { + "$ref" : "#/definitions/Range" + }, + "globalGainRange" : { + "$ref" : "#/definitions/Range" + }, + "gainModes" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/NamedEnum" + } + } + }, + "description" : "BladeRF2" }; defs.BladeRF2InputSettings = { "properties" : { @@ -1779,6 +1870,23 @@ margin-bottom: 20px; } }, "description" : "BladeRF2" +}; + defs.BladeRF2OutputReport = { + "properties" : { + "frequencyRange" : { + "$ref" : "#/definitions/FrequencyRange" + }, + "sampleRateRange" : { + "$ref" : "#/definitions/Range" + }, + "bandwidthRange" : { + "$ref" : "#/definitions/Range" + }, + "globalGainRange" : { + "$ref" : "#/definitions/Range" + } + }, + "description" : "BladeRF2" }; defs.BladeRF2OutputSettings = { "properties" : { @@ -2622,6 +2730,84 @@ margin-bottom: 20px; } }, "description" : "Summarized information about attached hardware device" +}; + defs.DeviceReport = { + "required" : [ "deviceHwType", "direction" ], + "discriminator" : "deviceHwType", + "properties" : { + "deviceHwType" : { + "type" : "string", + "description" : "Device hardware type code" + }, + "direction" : { + "type" : "integer", + "description" : "0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0)" + }, + "airspyReport" : { + "$ref" : "#/definitions/AirspyReport" + }, + "airspyHFReport" : { + "$ref" : "#/definitions/AirspyHFReport" + }, + "bladeRF2InputReport" : { + "$ref" : "#/definitions/BladeRF2InputReport" + }, + "bladeRF2OutputReport" : { + "$ref" : "#/definitions/BladeRF2OutputReport" + }, + "fileInputReport" : { + "$ref" : "#/definitions/FileInputReport" + }, + "limeSdrInputReport" : { + "$ref" : "#/definitions/LimeSdrInputReport" + }, + "kiwiSDRReport" : { + "$ref" : "#/definitions/KiwiSDRReport" + }, + "limeSdrOutputReport" : { + "$ref" : "#/definitions/LimeSdrOutputReport" + }, + "localInputReport" : { + "$ref" : "#/definitions/LocalInputReport" + }, + "localOutputReport" : { + "$ref" : "#/definitions/LocalOutputReport" + }, + "perseusReport" : { + "$ref" : "#/definitions/PerseusReport" + }, + "plutoSdrInputReport" : { + "$ref" : "#/definitions/PlutoSdrInputReport" + }, + "plutoSdrOutputReport" : { + "$ref" : "#/definitions/PlutoSdrOutputReport" + }, + "rtlSdrReport" : { + "$ref" : "#/definitions/RtlSdrReport" + }, + "remoteOutputReport" : { + "$ref" : "#/definitions/RemoteOutputReport" + }, + "remoteInputReport" : { + "$ref" : "#/definitions/RemoteInputReport" + }, + "sdrPlayReport" : { + "$ref" : "#/definitions/SDRPlayReport" + }, + "soapySDRInputReport" : { + "$ref" : "#/definitions/SoapySDRReport" + }, + "soapySDROutputReport" : { + "$ref" : "#/definitions/SoapySDRReport" + }, + "xtrxInputReport" : { + "$ref" : "#/definitions/XtrxInputReport" + }, + "xtrxOutputReport" : { + "$ref" : "#/definitions/XtrxOutputReport" + } + }, + "description" : "Base device report. Only the device report corresponding to the device specified in the deviceHwType is or should be present." }; defs.DeviceSet = { "required" : [ "channelcount", "samplingDevice" ], @@ -3101,6 +3287,34 @@ margin-bottom: 20px; } }, "description" : "Base feature settings. Only the feature settings corresponding to the feature specified in the featureType field is or should be present." +}; + defs.FileInputReport = { + "properties" : { + "fileName" : { + "type" : "string" + }, + "sampleRate" : { + "type" : "integer", + "description" : "Record sample rate in S/s" + }, + "sampleSize" : { + "type" : "integer", + "description" : "Record sample size in number of bits" + }, + "absoluteTime" : { + "type" : "string", + "description" : "Absolute record time string representation" + }, + "elapsedTime" : { + "type" : "string", + "description" : "Elapsed time since beginning string representation" + }, + "durationTime" : { + "type" : "string", + "description" : "Duration time string representation" + } + }, + "description" : "FileInput" }; defs.FileInputSettings = { "properties" : { @@ -3604,6 +3818,48 @@ margin-bottom: 20px; } }, "description" : "FreqTracker" +}; + defs.Frequency = { + "properties" : { + "frequency" : { + "type" : "integer" + } + }, + "description" : "A frequency expressed in Hertz (Hz)" +}; + defs.FrequencyBand = { + "properties" : { + "name" : { + "type" : "string" + }, + "lowerBound" : { + "type" : "integer" + }, + "higherBound" : { + "type" : "integer" + } + }, + "description" : "A band of frequencies given its boudaries in Hertz (Hz)" +}; + defs.FrequencyRange = { + "properties" : { + "min" : { + "type" : "integer", + "format" : "int64" + }, + "max" : { + "type" : "integer", + "format" : "int64" + }, + "step" : { + "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "An frequency range with 64 bit support for min and max" }; defs.GLScope = { "properties" : { @@ -3724,6 +3980,14 @@ margin-bottom: 20px; } }, "description" : "GLSpectrumGUI settings" +}; + defs.Gain = { + "properties" : { + "gainCB" : { + "type" : "integer" + } + }, + "description" : "A gain expressed in centi-Bels (tenths of dB)" }; defs.HackRFInputSettings = { "properties" : { @@ -3953,6 +4217,15 @@ margin-bottom: 20px; } }, "description" : "Summarized information about this SDRangel instance" +}; + defs.KiwiSDRReport = { + "properties" : { + "status" : { + "type" : "integer", + "description" : "0 for Idle, 1 for Connecting, 2 for Connected, 3 for Error, 4 for Disconnected" + } + }, + "description" : "KiwiSDR" }; defs.KiwiSDRSettings = { "properties" : { @@ -4100,6 +4373,55 @@ margin-bottom: 20px; } }, "description" : "LimeRFE" +}; + defs.LimeSdrInputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfullt retrieved else 0" + }, + "streamActive" : { + "type" : "integer", + "description" : "1 if active else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "underrunCount" : { + "type" : "integer" + }, + "overrunCount" : { + "type" : "integer" + }, + "droppedPacketsCount" : { + "type" : "integer" + }, + "linkRate" : { + "type" : "number", + "format" : "float" + }, + "hwTimestamp" : { + "type" : "integer", + "format" : "int64", + "description" : "Hardware timestamp" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpioDir" : { + "type" : "integer", + "format" : "int8" + }, + "gpioPins" : { + "type" : "integer", + "format" : "int8" + } + }, + "description" : "LimeSDR" }; defs.LimeSdrInputSettings = { "properties" : { @@ -4195,6 +4517,55 @@ margin-bottom: 20px; } }, "description" : "LimeSDR" +}; + defs.LimeSdrOutputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfullt retrieved else 0" + }, + "streamActive" : { + "type" : "integer", + "description" : "1 if active else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "underrunCount" : { + "type" : "integer" + }, + "overrunCount" : { + "type" : "integer" + }, + "droppedPacketsCount" : { + "type" : "integer" + }, + "linkRate" : { + "type" : "number", + "format" : "float" + }, + "hwTimestamp" : { + "type" : "integer", + "format" : "int64", + "description" : "Hardware timestamp" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpioDir" : { + "type" : "integer", + "format" : "int8" + }, + "gpioPins" : { + "type" : "integer", + "format" : "int8" + } + }, + "description" : "LimeSDR" }; defs.LimeSdrOutputSettings = { "properties" : { @@ -4268,6 +4639,18 @@ margin-bottom: 20px; } }, "description" : "LimeSDR" +}; + defs.LocalInputReport = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "sampleRate" : { + "type" : "integer" + } + }, + "description" : "LocalInput" }; defs.LocalInputSettings = { "properties" : { @@ -4292,6 +4675,18 @@ margin-bottom: 20px; } }, "description" : "LocalInput" +}; + defs.LocalOutputReport = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "sampleRate" : { + "type" : "integer" + } + }, + "description" : "LocalOutput" }; defs.LocalOutputSettings = { "properties" : { @@ -4634,6 +5029,17 @@ margin-bottom: 20px; } }, "description" : "NFMMod" +}; + defs.NamedEnum = { + "properties" : { + "name" : { + "type" : "string" + }, + "value" : { + "type" : "integer" + } + }, + "description" : "Enumeration with name for values" }; defs.PacketModActions = { "properties" : { @@ -4843,6 +5249,17 @@ margin-bottom: 20px; } }, "description" : "PacketMod" +}; + defs.PerseusReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + } + }, + "description" : "Perseus" }; defs.PerseusSettings = { "properties" : { @@ -4901,6 +5318,24 @@ margin-bottom: 20px; } }, "description" : "Perseus" +}; + defs.PlutoSdrInputReport = { + "properties" : { + "adcRate" : { + "type" : "integer" + }, + "rssi" : { + "type" : "string" + }, + "gainDB" : { + "type" : "integer" + }, + "temperature" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "PlutoSDR" }; defs.PlutoSdrInputSettings = { "properties" : { @@ -4992,6 +5427,21 @@ margin-bottom: 20px; } }, "description" : "PlutoSDR" +}; + defs.PlutoSdrOutputReport = { + "properties" : { + "dacRate" : { + "type" : "integer" + }, + "rssi" : { + "type" : "string" + }, + "temperature" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "PlutoSDR" }; defs.PlutoSdrOutputSettings = { "properties" : { @@ -5335,6 +5785,69 @@ margin-bottom: 20px; "format" : "float" } } +}; + defs.Range = { + "properties" : { + "min" : { + "type" : "integer" + }, + "max" : { + "type" : "integer" + }, + "step" : { + "type" : "integer" + }, + "scale" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "An arbitrary range of integer values" +}; + defs.RangeFloat = { + "properties" : { + "min" : { + "type" : "number", + "format" : "float" + }, + "max" : { + "type" : "number", + "format" : "float" + }, + "step" : { + "type" : "number", + "format" : "float" + } + }, + "description" : "An arbitrary range of floating point values" +}; + defs.RemoteInputReport = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "sampleRate" : { + "type" : "integer" + }, + "bufferRWBalance" : { + "type" : "integer", + "description" : "percentage off the mid buffer (positive read leads)" + }, + "remoteTimestamp" : { + "type" : "string", + "description" : "string representation of timestamp as sent by the remote instance" + }, + "minNbBlocks" : { + "type" : "integer", + "description" : "Minimum number of blocks retrieved per frame" + }, + "maxNbRecovery" : { + "type" : "integer", + "description" : "Maximum number of recovery blocks used per frame" + } + }, + "description" : "RemoteInput" }; defs.RemoteInputSettings = { "properties" : { @@ -5378,6 +5891,20 @@ margin-bottom: 20px; } }, "description" : "RemoteInput" +}; + defs.RemoteOutputReport = { + "properties" : { + "bufferRWBalance" : { + "type" : "number", + "format" : "float", + "description" : "ratio off the mid buffer (positive read leads)" + }, + "sampleCount" : { + "type" : "integer", + "description" : "count of samples that have been sent" + } + }, + "description" : "RemoteOutput" }; defs.RemoteOutputSettings = { "properties" : { @@ -5621,6 +6148,17 @@ margin-bottom: 20px; } }, "description" : "RigCtl server settings" +}; + defs.RtlSdrReport = { + "properties" : { + "gains" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Gain" + } + } + }, + "description" : "RTLSDR" }; defs.RtlSdrSettings = { "properties" : { @@ -5694,6 +6232,35 @@ margin-bottom: 20px; } }, "description" : "RTLSDR" +}; + defs.SDRPlayReport = { + "properties" : { + "sampleRates" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SampleRate" + } + }, + "bandwidths" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Bandwidth" + } + }, + "intermediateFrequencies" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/Frequency" + } + }, + "frequencyBands" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/FrequencyBand" + } + } + }, + "description" : "SDRplay1" }; defs.SDRPlaySettings = { "properties" : { @@ -5972,6 +6539,14 @@ margin-bottom: 20px; } }, "description" : "SSBMod" +}; + defs.SampleRate = { + "properties" : { + "rate" : { + "type" : "integer" + } + }, + "description" : "A sample rate expressed in samples per second (S/s)" }; defs.SamplingDevice = { "required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial" ], @@ -6088,6 +6663,31 @@ margin-bottom: 20px; } }, "description" : "Simple PTT settings" +}; + defs.SoapySDRFrequencySetting = { + "properties" : { + "name" : { + "type" : "string" + }, + "ranges" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/RangeFloat" + } + } + }, + "description" : "A named frequency setting specified by a range list" +}; + defs.SoapySDRGainSetting = { + "properties" : { + "name" : { + "type" : "string" + }, + "range" : { + "$ref" : "#/definitions/RangeFloat" + } + }, + "description" : "A named gain setting specified by its range" }; defs.SoapySDRInputSettings = { "properties" : { @@ -6283,6 +6883,82 @@ margin-bottom: 20px; } }, "description" : "SoapySDR" +}; + defs.SoapySDRReport = { + "properties" : { + "deviceSettingsArgs" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ArgInfo" + } + }, + "streamSettingsArgs" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ArgInfo" + } + }, + "hasDCAutoCorrection" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "hasDCOffsetValue" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "hasIQBalanceValue" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "hasFrequencyCorrectionValue" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "antennas" : { + "type" : "array", + "items" : { + "type" : "string" + } + }, + "hasAGC" : { + "type" : "integer", + "description" : "boolean not zero for true" + }, + "gainRange" : { + "$ref" : "#/definitions/RangeFloat" + }, + "gainSettings" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SoapySDRGainSetting" + } + }, + "frequencySettings" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/SoapySDRFrequencySetting" + } + }, + "frequencySettingsArgs" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/ArgInfo" + } + }, + "ratesRanges" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/RangeFloat" + } + }, + "bandwidthsRanges" : { + "type" : "array", + "items" : { + "$ref" : "#/definitions/RangeFloat" + } + } + }, + "description" : "SoapySDR" }; defs.SuccessResponse = { "required" : [ "message" ], @@ -6928,6 +7604,29 @@ margin-bottom: 20px; } }, "description" : "WFMMod" +}; + defs.XtrxInputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfully retrieved else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpsLock" : { + "type" : "integer", + "description" : "1 if GPSDO is locked else 0" + } + }, + "description" : "XTRX" }; defs.XtrxInputSettings = { "properties" : { @@ -7019,6 +7718,29 @@ margin-bottom: 20px; } }, "description" : "XTRX" +}; + defs.XtrxOutputReport = { + "properties" : { + "success" : { + "type" : "integer", + "description" : "1 if info was successfully retrieved else 0" + }, + "fifoSize" : { + "type" : "integer" + }, + "fifoFill" : { + "type" : "integer" + }, + "temperature" : { + "type" : "number", + "format" : "float" + }, + "gpsLock" : { + "type" : "integer", + "description" : "1 if GPSDO is locked else 0" + } + }, + "description" : "XTRX" }; defs.XtrxOutputSettings = { "properties" : { @@ -38991,7 +39713,7 @@ except ApiException as e:
- Generated 2020-09-28T19:24:51.767+02:00 + Generated 2020-09-29T00:33:21.870+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h index e02eac1d0..3dedc6f39 100644 --- a/swagger/sdrangel/code/qt5/client/SWGModelFactory.h +++ b/swagger/sdrangel/code/qt5/client/SWGModelFactory.h @@ -23,18 +23,24 @@ #include "SWGATVDemodSettings.h" #include "SWGATVModReport.h" #include "SWGATVModSettings.h" +#include "SWGAirspyHFReport.h" #include "SWGAirspyHFSettings.h" +#include "SWGAirspyReport.h" #include "SWGAirspySettings.h" +#include "SWGArgInfo.h" #include "SWGArgValue.h" #include "SWGAudioDevices.h" #include "SWGAudioInputDevice.h" #include "SWGAudioOutputDevice.h" #include "SWGBFMDemodReport.h" #include "SWGBFMDemodSettings.h" +#include "SWGBandwidth.h" #include "SWGBladeRF1InputSettings.h" #include "SWGBladeRF1OutputSettings.h" +#include "SWGBladeRF2InputReport.h" #include "SWGBladeRF2InputSettings.h" #include "SWGBladeRF2MIMOSettings.h" +#include "SWGBladeRF2OutputReport.h" #include "SWGBladeRF2OutputSettings.h" #include "SWGCWKeyerSettings.h" #include "SWGChannel.h" @@ -55,6 +61,7 @@ #include "SWGDeviceActions.h" #include "SWGDeviceConfig.h" #include "SWGDeviceListItem.h" +#include "SWGDeviceReport.h" #include "SWGDeviceSet.h" #include "SWGDeviceSetList.h" #include "SWGDeviceSettings.h" @@ -70,6 +77,7 @@ #include "SWGFeatureSetList.h" #include "SWGFeatureSetPreset.h" #include "SWGFeatureSettings.h" +#include "SWGFileInputReport.h" #include "SWGFileInputSettings.h" #include "SWGFileSinkActions.h" #include "SWGFileSinkReport.h" @@ -83,22 +91,31 @@ #include "SWGFreeDVModSettings.h" #include "SWGFreqTrackerReport.h" #include "SWGFreqTrackerSettings.h" +#include "SWGFrequency.h" +#include "SWGFrequencyBand.h" +#include "SWGFrequencyRange.h" #include "SWGGLScope.h" #include "SWGGLSpectrum.h" +#include "SWGGain.h" #include "SWGHackRFInputSettings.h" #include "SWGHackRFOutputSettings.h" #include "SWGInstanceChannelsResponse.h" #include "SWGInstanceConfigResponse.h" #include "SWGInstanceDevicesResponse.h" #include "SWGInstanceSummaryResponse.h" +#include "SWGKiwiSDRReport.h" #include "SWGKiwiSDRSettings.h" #include "SWGLimeRFEDevice.h" #include "SWGLimeRFEDevices.h" #include "SWGLimeRFEPower.h" #include "SWGLimeRFESettings.h" +#include "SWGLimeSdrInputReport.h" #include "SWGLimeSdrInputSettings.h" +#include "SWGLimeSdrOutputReport.h" #include "SWGLimeSdrOutputSettings.h" +#include "SWGLocalInputReport.h" #include "SWGLocalInputSettings.h" +#include "SWGLocalOutputReport.h" #include "SWGLocalOutputSettings.h" #include "SWGLocalSinkSettings.h" #include "SWGLocalSourceSettings.h" @@ -108,12 +125,16 @@ #include "SWGNFMDemodSettings.h" #include "SWGNFMModReport.h" #include "SWGNFMModSettings.h" +#include "SWGNamedEnum.h" #include "SWGPacketModActions.h" #include "SWGPacketModActions_tx.h" #include "SWGPacketModReport.h" #include "SWGPacketModSettings.h" +#include "SWGPerseusReport.h" #include "SWGPerseusSettings.h" +#include "SWGPlutoSdrInputReport.h" #include "SWGPlutoSdrInputSettings.h" +#include "SWGPlutoSdrOutputReport.h" #include "SWGPlutoSdrOutputSettings.h" #include "SWGPreferences.h" #include "SWGPreset.h" @@ -126,24 +147,34 @@ #include "SWGPresets.h" #include "SWGRDSReport.h" #include "SWGRDSReport_altFrequencies.h" +#include "SWGRange.h" +#include "SWGRangeFloat.h" +#include "SWGRemoteInputReport.h" #include "SWGRemoteInputSettings.h" +#include "SWGRemoteOutputReport.h" #include "SWGRemoteOutputSettings.h" #include "SWGRemoteSinkSettings.h" #include "SWGRemoteSourceReport.h" #include "SWGRemoteSourceSettings.h" #include "SWGRigCtlServerSettings.h" +#include "SWGRtlSdrReport.h" #include "SWGRtlSdrSettings.h" +#include "SWGSDRPlayReport.h" #include "SWGSDRPlaySettings.h" #include "SWGSSBDemodReport.h" #include "SWGSSBDemodSettings.h" #include "SWGSSBModReport.h" #include "SWGSSBModSettings.h" +#include "SWGSampleRate.h" #include "SWGSamplingDevice.h" #include "SWGSimplePTTActions.h" #include "SWGSimplePTTReport.h" #include "SWGSimplePTTSettings.h" +#include "SWGSoapySDRFrequencySetting.h" +#include "SWGSoapySDRGainSetting.h" #include "SWGSoapySDRInputSettings.h" #include "SWGSoapySDROutputSettings.h" +#include "SWGSoapySDRReport.h" #include "SWGSuccessResponse.h" #include "SWGTestSourceSettings.h" #include "SWGTraceData.h" @@ -156,7 +187,9 @@ #include "SWGWFMDemodSettings.h" #include "SWGWFMModReport.h" #include "SWGWFMModSettings.h" +#include "SWGXtrxInputReport.h" #include "SWGXtrxInputSettings.h" +#include "SWGXtrxOutputReport.h" #include "SWGXtrxOutputSettings.h" namespace SWGSDRangel { @@ -189,12 +222,21 @@ namespace SWGSDRangel { if(QString("SWGATVModSettings").compare(type) == 0) { return new SWGATVModSettings(); } + if(QString("SWGAirspyHFReport").compare(type) == 0) { + return new SWGAirspyHFReport(); + } if(QString("SWGAirspyHFSettings").compare(type) == 0) { return new SWGAirspyHFSettings(); } + if(QString("SWGAirspyReport").compare(type) == 0) { + return new SWGAirspyReport(); + } if(QString("SWGAirspySettings").compare(type) == 0) { return new SWGAirspySettings(); } + if(QString("SWGArgInfo").compare(type) == 0) { + return new SWGArgInfo(); + } if(QString("SWGArgValue").compare(type) == 0) { return new SWGArgValue(); } @@ -213,18 +255,27 @@ namespace SWGSDRangel { if(QString("SWGBFMDemodSettings").compare(type) == 0) { return new SWGBFMDemodSettings(); } + if(QString("SWGBandwidth").compare(type) == 0) { + return new SWGBandwidth(); + } if(QString("SWGBladeRF1InputSettings").compare(type) == 0) { return new SWGBladeRF1InputSettings(); } if(QString("SWGBladeRF1OutputSettings").compare(type) == 0) { return new SWGBladeRF1OutputSettings(); } + if(QString("SWGBladeRF2InputReport").compare(type) == 0) { + return new SWGBladeRF2InputReport(); + } 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(); + } if(QString("SWGBladeRF2OutputSettings").compare(type) == 0) { return new SWGBladeRF2OutputSettings(); } @@ -285,6 +336,9 @@ namespace SWGSDRangel { if(QString("SWGDeviceListItem").compare(type) == 0) { return new SWGDeviceListItem(); } + if(QString("SWGDeviceReport").compare(type) == 0) { + return new SWGDeviceReport(); + } if(QString("SWGDeviceSet").compare(type) == 0) { return new SWGDeviceSet(); } @@ -330,6 +384,9 @@ namespace SWGSDRangel { if(QString("SWGFeatureSettings").compare(type) == 0) { return new SWGFeatureSettings(); } + if(QString("SWGFileInputReport").compare(type) == 0) { + return new SWGFileInputReport(); + } if(QString("SWGFileInputSettings").compare(type) == 0) { return new SWGFileInputSettings(); } @@ -369,12 +426,24 @@ namespace SWGSDRangel { if(QString("SWGFreqTrackerSettings").compare(type) == 0) { return new SWGFreqTrackerSettings(); } + if(QString("SWGFrequency").compare(type) == 0) { + return new SWGFrequency(); + } + if(QString("SWGFrequencyBand").compare(type) == 0) { + return new SWGFrequencyBand(); + } + if(QString("SWGFrequencyRange").compare(type) == 0) { + return new SWGFrequencyRange(); + } if(QString("SWGGLScope").compare(type) == 0) { return new SWGGLScope(); } if(QString("SWGGLSpectrum").compare(type) == 0) { return new SWGGLSpectrum(); } + if(QString("SWGGain").compare(type) == 0) { + return new SWGGain(); + } if(QString("SWGHackRFInputSettings").compare(type) == 0) { return new SWGHackRFInputSettings(); } @@ -393,6 +462,9 @@ namespace SWGSDRangel { if(QString("SWGInstanceSummaryResponse").compare(type) == 0) { return new SWGInstanceSummaryResponse(); } + if(QString("SWGKiwiSDRReport").compare(type) == 0) { + return new SWGKiwiSDRReport(); + } if(QString("SWGKiwiSDRSettings").compare(type) == 0) { return new SWGKiwiSDRSettings(); } @@ -408,15 +480,27 @@ namespace SWGSDRangel { if(QString("SWGLimeRFESettings").compare(type) == 0) { return new SWGLimeRFESettings(); } + if(QString("SWGLimeSdrInputReport").compare(type) == 0) { + return new SWGLimeSdrInputReport(); + } if(QString("SWGLimeSdrInputSettings").compare(type) == 0) { return new SWGLimeSdrInputSettings(); } + if(QString("SWGLimeSdrOutputReport").compare(type) == 0) { + return new SWGLimeSdrOutputReport(); + } if(QString("SWGLimeSdrOutputSettings").compare(type) == 0) { return new SWGLimeSdrOutputSettings(); } + if(QString("SWGLocalInputReport").compare(type) == 0) { + return new SWGLocalInputReport(); + } if(QString("SWGLocalInputSettings").compare(type) == 0) { return new SWGLocalInputSettings(); } + if(QString("SWGLocalOutputReport").compare(type) == 0) { + return new SWGLocalOutputReport(); + } if(QString("SWGLocalOutputSettings").compare(type) == 0) { return new SWGLocalOutputSettings(); } @@ -444,6 +528,9 @@ namespace SWGSDRangel { if(QString("SWGNFMModSettings").compare(type) == 0) { return new SWGNFMModSettings(); } + if(QString("SWGNamedEnum").compare(type) == 0) { + return new SWGNamedEnum(); + } if(QString("SWGPacketModActions").compare(type) == 0) { return new SWGPacketModActions(); } @@ -456,12 +543,21 @@ namespace SWGSDRangel { if(QString("SWGPacketModSettings").compare(type) == 0) { return new SWGPacketModSettings(); } + if(QString("SWGPerseusReport").compare(type) == 0) { + return new SWGPerseusReport(); + } if(QString("SWGPerseusSettings").compare(type) == 0) { return new SWGPerseusSettings(); } + if(QString("SWGPlutoSdrInputReport").compare(type) == 0) { + return new SWGPlutoSdrInputReport(); + } if(QString("SWGPlutoSdrInputSettings").compare(type) == 0) { return new SWGPlutoSdrInputSettings(); } + if(QString("SWGPlutoSdrOutputReport").compare(type) == 0) { + return new SWGPlutoSdrOutputReport(); + } if(QString("SWGPlutoSdrOutputSettings").compare(type) == 0) { return new SWGPlutoSdrOutputSettings(); } @@ -498,9 +594,21 @@ namespace SWGSDRangel { if(QString("SWGRDSReport_altFrequencies").compare(type) == 0) { return new SWGRDSReport_altFrequencies(); } + if(QString("SWGRange").compare(type) == 0) { + return new SWGRange(); + } + if(QString("SWGRangeFloat").compare(type) == 0) { + return new SWGRangeFloat(); + } + if(QString("SWGRemoteInputReport").compare(type) == 0) { + return new SWGRemoteInputReport(); + } if(QString("SWGRemoteInputSettings").compare(type) == 0) { return new SWGRemoteInputSettings(); } + if(QString("SWGRemoteOutputReport").compare(type) == 0) { + return new SWGRemoteOutputReport(); + } if(QString("SWGRemoteOutputSettings").compare(type) == 0) { return new SWGRemoteOutputSettings(); } @@ -516,9 +624,15 @@ namespace SWGSDRangel { if(QString("SWGRigCtlServerSettings").compare(type) == 0) { return new SWGRigCtlServerSettings(); } + if(QString("SWGRtlSdrReport").compare(type) == 0) { + return new SWGRtlSdrReport(); + } if(QString("SWGRtlSdrSettings").compare(type) == 0) { return new SWGRtlSdrSettings(); } + if(QString("SWGSDRPlayReport").compare(type) == 0) { + return new SWGSDRPlayReport(); + } if(QString("SWGSDRPlaySettings").compare(type) == 0) { return new SWGSDRPlaySettings(); } @@ -534,6 +648,9 @@ namespace SWGSDRangel { if(QString("SWGSSBModSettings").compare(type) == 0) { return new SWGSSBModSettings(); } + if(QString("SWGSampleRate").compare(type) == 0) { + return new SWGSampleRate(); + } if(QString("SWGSamplingDevice").compare(type) == 0) { return new SWGSamplingDevice(); } @@ -546,12 +663,21 @@ namespace SWGSDRangel { if(QString("SWGSimplePTTSettings").compare(type) == 0) { return new SWGSimplePTTSettings(); } + if(QString("SWGSoapySDRFrequencySetting").compare(type) == 0) { + return new SWGSoapySDRFrequencySetting(); + } + if(QString("SWGSoapySDRGainSetting").compare(type) == 0) { + return new SWGSoapySDRGainSetting(); + } if(QString("SWGSoapySDRInputSettings").compare(type) == 0) { return new SWGSoapySDRInputSettings(); } if(QString("SWGSoapySDROutputSettings").compare(type) == 0) { return new SWGSoapySDROutputSettings(); } + if(QString("SWGSoapySDRReport").compare(type) == 0) { + return new SWGSoapySDRReport(); + } if(QString("SWGSuccessResponse").compare(type) == 0) { return new SWGSuccessResponse(); } @@ -588,9 +714,15 @@ namespace SWGSDRangel { if(QString("SWGWFMModSettings").compare(type) == 0) { return new SWGWFMModSettings(); } + if(QString("SWGXtrxInputReport").compare(type) == 0) { + return new SWGXtrxInputReport(); + } if(QString("SWGXtrxInputSettings").compare(type) == 0) { return new SWGXtrxInputSettings(); } + if(QString("SWGXtrxOutputReport").compare(type) == 0) { + return new SWGXtrxOutputReport(); + } if(QString("SWGXtrxOutputSettings").compare(type) == 0) { return new SWGXtrxOutputSettings(); }