From db870cbecd7b6f3a17820765e0f315b695af78bf Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 23 Jun 2020 19:56:29 +0200 Subject: [PATCH] IQ swap: REST API: generated code --- sdrbase/resources/webapi/doc/html2/index.html | 62 ++++++++- .../webapi/doc/swagger/include/AMMod.yaml | 2 +- .../webapi/doc/swagger/include/Airspy.yaml | 8 +- .../webapi/doc/swagger/include/AirspyHF.yaml | 8 +- .../webapi/doc/swagger/include/BladeRF1.yaml | 6 + .../webapi/doc/swagger/include/BladeRF2.yaml | 30 ++-- .../doc/swagger/include/ChannelActions.yaml | 2 +- .../doc/swagger/include/ChannelAnalyzer.yaml | 4 +- .../doc/swagger/include/ChannelSettings.yaml | 48 +++---- .../doc/swagger/include/DeviceActions.yaml | 36 ++--- .../doc/swagger/include/DeviceSettings.yaml | 58 ++++---- .../webapi/doc/swagger/include/FCDPro.yaml | 6 + .../doc/swagger/include/FCDProPlus.yaml | 6 + .../webapi/doc/swagger/include/FreeDVMod.yaml | 2 +- .../webapi/doc/swagger/include/GLScope.yaml | 4 +- .../webapi/doc/swagger/include/HackRF.yaml | 6 + .../webapi/doc/swagger/include/LimeSdr.yaml | 6 + .../webapi/doc/swagger/include/NFMMod.yaml | 2 +- .../webapi/doc/swagger/include/Perseus.yaml | 8 +- .../webapi/doc/swagger/include/PlutoSdr.yaml | 6 + .../webapi/doc/swagger/include/Preset.yaml | 10 +- .../webapi/doc/swagger/include/RtlSdr.yaml | 8 +- .../webapi/doc/swagger/include/SDRPlay.yaml | 14 +- .../webapi/doc/swagger/include/SSBMod.yaml | 2 +- .../webapi/doc/swagger/include/SoapySDR.yaml | 26 ++-- .../webapi/doc/swagger/include/WFMMod.yaml | 2 +- .../webapi/doc/swagger/include/Xtrx.yaml | 8 +- .../resources/webapi/doc/swagger/swagger.yaml | 130 +++++++++--------- swagger/sdrangel/code/html2/index.html | 62 ++++++++- .../code/qt5/client/SWGAirspyHFSettings.cpp | 23 ++++ .../code/qt5/client/SWGAirspyHFSettings.h | 6 + .../code/qt5/client/SWGAirspySettings.cpp | 23 ++++ .../code/qt5/client/SWGAirspySettings.h | 6 + .../qt5/client/SWGBladeRF1InputSettings.cpp | 23 ++++ .../qt5/client/SWGBladeRF1InputSettings.h | 6 + .../qt5/client/SWGBladeRF2InputSettings.cpp | 23 ++++ .../qt5/client/SWGBladeRF2InputSettings.h | 6 + .../qt5/client/SWGBladeRF2MIMOSettings.cpp | 23 ++++ .../code/qt5/client/SWGBladeRF2MIMOSettings.h | 6 + .../code/qt5/client/SWGFCDProPlusSettings.cpp | 23 ++++ .../code/qt5/client/SWGFCDProPlusSettings.h | 6 + .../code/qt5/client/SWGFCDProSettings.cpp | 23 ++++ .../code/qt5/client/SWGFCDProSettings.h | 6 + .../qt5/client/SWGHackRFInputSettings.cpp | 23 ++++ .../code/qt5/client/SWGHackRFInputSettings.h | 6 + .../qt5/client/SWGLimeSdrInputSettings.cpp | 23 ++++ .../code/qt5/client/SWGLimeSdrInputSettings.h | 6 + .../code/qt5/client/SWGPerseusSettings.cpp | 23 ++++ .../code/qt5/client/SWGPerseusSettings.h | 6 + .../qt5/client/SWGPlutoSdrInputSettings.cpp | 23 ++++ .../qt5/client/SWGPlutoSdrInputSettings.h | 6 + .../code/qt5/client/SWGRtlSdrSettings.cpp | 23 ++++ .../code/qt5/client/SWGRtlSdrSettings.h | 6 + .../code/qt5/client/SWGSDRPlaySettings.cpp | 23 ++++ .../code/qt5/client/SWGSDRPlaySettings.h | 6 + .../qt5/client/SWGSoapySDRInputSettings.cpp | 23 ++++ .../qt5/client/SWGSoapySDRInputSettings.h | 6 + .../code/qt5/client/SWGXtrxInputSettings.cpp | 23 ++++ .../code/qt5/client/SWGXtrxInputSettings.h | 6 + 59 files changed, 826 insertions(+), 181 deletions(-) diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 8b9783808..446506ad2 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -1186,6 +1186,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "bandIndex" : { "type" : "integer" }, @@ -1298,6 +1302,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1637,6 +1645,10 @@ margin-bottom: 20px; "iqCorrection" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1777,6 +1789,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1850,6 +1866,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "txCenterFrequency" : { "type" : "integer", "format" : "int64" @@ -3112,6 +3132,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -3207,6 +3231,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -3870,6 +3898,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -4332,6 +4364,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -4948,6 +4984,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5069,6 +5109,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5833,6 +5877,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "rfBandwidth" : { "type" : "integer" }, @@ -5942,6 +5990,10 @@ margin-bottom: 20px; "basebandGain" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -6301,6 +6353,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -7290,6 +7346,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "LMS power mode (0 save max to 7 perf max)" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -33395,7 +33455,7 @@ except ApiException as e:
- Generated 2020-06-15T13:39:42.927+02:00 + Generated 2020-06-23T19:48:55.770+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml index a54700d72..68ecb57b7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AMMod.yaml @@ -44,7 +44,7 @@ AMModSettings: reverseAPIChannelIndex: type: integer cwKeyer: - $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings" + $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings" AMModReport: description: AMMod diff --git a/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml b/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml index 1894a43d1..79049672a 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Airspy.yaml @@ -37,6 +37,12 @@ AirspySettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: @@ -55,7 +61,7 @@ AirspyReport: sampleRates: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/SampleRate" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate" AirspyActions: description: Airspy diff --git a/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml b/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml index ea1270b39..ddc1618b8 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AirspyHF.yaml @@ -15,6 +15,12 @@ AirspyHFSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) bandIndex: type: integer fileRecordName: @@ -54,7 +60,7 @@ AirspyHFReport: sampleRates: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/SampleRate" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate" AirspyHFActions: description: AirspyHF diff --git a/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml b/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml index e97460bdc..d65e2fb60 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/BladeRF1.yaml @@ -28,6 +28,12 @@ BladeRF1InputSettings: type: integer iqCorrection: type: integer + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: diff --git a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml index 5d71ed373..6bde2ccf7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/BladeRF2.yaml @@ -29,6 +29,12 @@ BladeRF2InputSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: @@ -45,17 +51,17 @@ BladeRF2InputReport: description: BladeRF2 properties: frequencyRange: - $ref: "/doc/swagger/include/Structs.yaml#/FrequencyRange" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/FrequencyRange" sampleRateRange: - $ref: "/doc/swagger/include/Structs.yaml#/Range" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range" bandwidthRange: - $ref: "/doc/swagger/include/Structs.yaml#/Range" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range" globalGainRange: - $ref: "/doc/swagger/include/Structs.yaml#/Range" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range" gainModes: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/NamedEnum" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/NamedEnum" BladeRF2InputActions: description: BladeRF2 @@ -104,13 +110,13 @@ BladeRF2OutputReport: description: BladeRF2 properties: frequencyRange: - $ref: "/doc/swagger/include/Structs.yaml#/FrequencyRange" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/FrequencyRange" sampleRateRange: - $ref: "/doc/swagger/include/Structs.yaml#/Range" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range" bandwidthRange: - $ref: "/doc/swagger/include/Structs.yaml#/Range" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range" globalGainRange: - $ref: "/doc/swagger/include/Structs.yaml#/Range" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Range" BladeRF2MIMOSettings: description: BladeRF2 @@ -152,6 +158,12 @@ BladeRF2MIMOSettings: rxTransverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) txCenterFrequency: type: integer format: int64 diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml index 8aab2576b..dcc6496dd 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelActions.yaml @@ -18,4 +18,4 @@ ChannelActions: description: Optional for reverse API. This is the channel index from where the message comes from. type: integer FileSourceActions: - $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceActions" + $ref: "http://swgserver:8081/api/swagger/include/FileSource.yaml#/FileSourceActions" diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml index 377aa1af7..c109ca69d 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelAnalyzer.yaml @@ -39,6 +39,6 @@ ChannelAnalyzerSettings: title: type: string spectrumConfig: - $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" scopeConfig: - $ref: "/doc/swagger/include/GLScope.yaml#/GLScope" + $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope" diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index ab097133d..fa36107b9 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -18,50 +18,50 @@ ChannelSettings: description: Optional for reverse API. This is the channel index from where the message comes from. type: integer AMDemodSettings: - $ref: "/doc/swagger/include/AMDemod.yaml#/AMDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/AMDemod.yaml#/AMDemodSettings" AMModSettings: - $ref: "/doc/swagger/include/AMMod.yaml#/AMModSettings" + $ref: "http://swgserver:8081/api/swagger/include/AMMod.yaml#/AMModSettings" ATVDemodSettings: - $ref: "/doc/swagger/include/ATVDemod.yaml#/ATVDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/ATVDemod.yaml#/ATVDemodSettings" ATVModSettings: - $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModSettings" + $ref: "http://swgserver:8081/api/swagger/include/ATVMod.yaml#/ATVModSettings" BFMDemodSettings: - $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/BFMDemod.yaml#/BFMDemodSettings" ChannelAnalyzerSettings: - $ref: "/doc/swagger/include/ChannelAnalyzer.yaml#/ChannelAnalyzerSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelAnalyzer.yaml#/ChannelAnalyzerSettings" DATVDemodSettings: - $ref: "/doc/swagger/include/DATVDemod.yaml#/DATVDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/DATVDemod.yaml#/DATVDemodSettings" DSDDemodSettings: - $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodSettings" FileSourceSettings: - $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceSettings" + $ref: "http://swgserver:8081/api/swagger/include/FileSource.yaml#/FileSourceSettings" FreeDVDemodSettings: - $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/FreeDVDemod.yaml#/FreeDVDemodSettings" FreeDVModSettings: - $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModSettings" + $ref: "http://swgserver:8081/api/swagger/include/FreeDVMod.yaml#/FreeDVModSettings" FreqTrackerSettings: - $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerSettings" + $ref: "http://swgserver:8081/api/swagger/include/FreqTracker.yaml#/FreqTrackerSettings" NFMDemodSettings: - $ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings" NFMModSettings: - $ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings" + $ref: "http://swgserver:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings" LocalSinkSettings: - $ref: "/doc/swagger/include/LocalSink.yaml#/LocalSinkSettings" + $ref: "http://swgserver:8081/api/swagger/include/LocalSink.yaml#/LocalSinkSettings" LocalSourceSettings: - $ref: "/doc/swagger/include/LocalSource.yaml#/LocalSourceSettings" + $ref: "http://swgserver:8081/api/swagger/include/LocalSource.yaml#/LocalSourceSettings" RemoteSinkSettings: - $ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" + $ref: "http://swgserver:8081/api/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" RemoteSourceSettings: - $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" + $ref: "http://swgserver:8081/api/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" SSBModSettings: - $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModSettings" + $ref: "http://swgserver:8081/api/swagger/include/SSBMod.yaml#/SSBModSettings" SSBDemodSettings: - $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodSettings" UDPSourceSettings: - $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings" + $ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceSettings" UDPSinkSettings: - $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings" + $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings" WFMDemodSettings: - $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodSettings" + $ref: "http://swgserver:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodSettings" WFMModSettings: - $ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings" + $ref: "http://swgserver:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings" diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml index beab35b84..03cf6c2a9 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceActions.yaml @@ -15,38 +15,38 @@ DeviceActions: description: Optional for reverse API. This is the device set index from where the message comes from. type: integer airspyActions: - $ref: "/doc/swagger/include/Airspy.yaml#/AirspyActions" + $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspyActions" airspyHFActions: - $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFActions" + $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFActions" bladeRF1InputActions: - $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1InputActions" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1InputActions" bladeRF2InputActions: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputActions" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputActions" fcdProActions: - $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProActions" + $ref: "http://swgserver:8081/api/swagger/include/FCDPro.yaml#/FCDProActions" fcdProPlusActions: - $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusActions" + $ref: "http://swgserver:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusActions" hackRFInputActions: - $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputActions" + $ref: "http://swgserver:8081/api/swagger/include/HackRF.yaml#/HackRFInputActions" kiwiSDRActions: - $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRActions" + $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRActions" limeSdrInputActions: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputActions" + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputActions" localInputActions: - $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputActions" + $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputActions" perseusActions: - $ref: "/doc/swagger/include/Perseus.yaml#/PerseusActions" + $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusActions" plutoSdrInputActions: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputActions" + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputActions" remoteInputActions: - $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputActions" + $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputActions" rtlSdrActions: - $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrActions" + $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrActions" sdrPlayActions: - $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlayActions" + $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlayActions" soapySDRInputActions: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRInputActions" + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRInputActions" testSourceActions: - $ref: "/doc/swagger/include/TestSource.yaml#/TestSourceActions" + $ref: "http://swgserver:8081/api/swagger/include/TestSource.yaml#/TestSourceActions" xtrxInputActions: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputActions" + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputActions" diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml index 7393b6bc7..f97a77916 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml @@ -15,60 +15,60 @@ DeviceSettings: description: Optional for reverse API. This is the device set index from where the message comes from. type: integer airspySettings: - $ref: "/doc/swagger/include/Airspy.yaml#/AirspySettings" + $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspySettings" airspyHFSettings: - $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFSettings" + $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFSettings" bladeRF1InputSettings: - $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1InputSettings" bladeRF2InputSettings: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputSettings" bladeRF1OutputSettings: - $ref: "/doc/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF1.yaml#/BladeRF1OutputSettings" bladeRF2OutputSettings: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputSettings" bladeRF2MIMOSettings: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2MIMOSettings" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2MIMOSettings" fcdProSettings: - $ref: "/doc/swagger/include/FCDPro.yaml#/FCDProSettings" + $ref: "http://swgserver:8081/api/swagger/include/FCDPro.yaml#/FCDProSettings" fcdProPlusSettings: - $ref: "/doc/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" + $ref: "http://swgserver:8081/api/swagger/include/FCDProPlus.yaml#/FCDProPlusSettings" fileInputSettings: - $ref: "/doc/swagger/include/FileInput.yaml#/FileInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/FileInput.yaml#/FileInputSettings" hackRFInputSettings: - $ref: "/doc/swagger/include/HackRF.yaml#/HackRFInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/HackRF.yaml#/HackRFInputSettings" hackRFOutputSettings: - $ref: "/doc/swagger/include/HackRF.yaml#/HackRFOutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/HackRF.yaml#/HackRFOutputSettings" kiwiSDRSettings: - $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings" + $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRSettings" limeSdrInputSettings: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings" limeSdrOutputSettings: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings" localInputSettings: - $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputSettings" localOutputSettings: - $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputSettings" perseusSettings: - $ref: "/doc/swagger/include/Perseus.yaml#/PerseusSettings" + $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusSettings" plutoSdrInputSettings: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputSettings" plutoSdrOutputSettings: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputSettings" rtlSdrSettings: - $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrSettings" + $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrSettings" remoteOutputSettings: - $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" remoteInputSettings: - $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputSettings" sdrPlaySettings: - $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlaySettings" + $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlaySettings" soapySDRInputSettings: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRInputSettings" soapySDROutputSettings: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDROutputSettings" testSourceSettings: - $ref: "/doc/swagger/include/TestSource.yaml#/TestSourceSettings" + $ref: "http://swgserver:8081/api/swagger/include/TestSource.yaml#/TestSourceSettings" xtrxInputSettings: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputSettings" + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputSettings" xtrxOutputSettings: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputSettings" + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputSettings" diff --git a/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml b/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml index 98d949bc1..ab69fc7b5 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FCDPro.yaml @@ -51,6 +51,12 @@ FCDProSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: diff --git a/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml b/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml index b8c95ce96..9c57d23ce 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FCDProPlus.yaml @@ -37,6 +37,12 @@ FCDProPlusSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: diff --git a/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml index 0ec6d1c6f..cfa9e8259 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FreeDVMod.yaml @@ -43,7 +43,7 @@ FreeDVModSettings: reverseAPIChannelIndex: type: integer cwKeyer: - $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings" + $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings" FreeDVModReport: description: FreeDVMod diff --git a/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml b/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml index 21ca03bc5..a8dcc7d4b 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GLScope.yaml @@ -139,8 +139,8 @@ GLScope: tracesData: type: array items: - $ref: "/doc/swagger/include/GLScope.yaml#/TraceData" + $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/TraceData" triggersData: type: array items: - $ref: "/doc/swagger/include/GLScope.yaml#/TriggerData" + $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/TriggerData" diff --git a/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml b/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml index 7b6d93bd5..374c0bcb9 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/HackRF.yaml @@ -34,6 +34,12 @@ HackRFInputSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) useReverseAPI: description: Synchronize with reverse API (1 for yes, 0 for no) type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml index 3f7f54b1d..c122d419c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml @@ -45,6 +45,12 @@ LimeSdrInputSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string gpioDir: diff --git a/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml index e8bdc6575..6fbff54e1 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/NFMMod.yaml @@ -50,7 +50,7 @@ NFMModSettings: reverseAPIChannelIndex: type: integer cwKeyer: - $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings" + $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings" NFMModReport: description: NFMMod diff --git a/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml b/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml index 56e1eacf4..b8dc2ad78 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Perseus.yaml @@ -24,6 +24,12 @@ PerseusSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string attenuator: @@ -45,7 +51,7 @@ PerseusReport: sampleRates: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/SampleRate" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate" PerseusActions: description: Perseus diff --git a/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml index 60192fee7..2111d0a52 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/PlutoSdr.yaml @@ -50,6 +50,12 @@ PlutoSdrInputSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: diff --git a/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml b/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml index ffcf4e39c..538a5b87e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Preset.yaml @@ -8,7 +8,7 @@ DeviceConfig: deviceSequence: type: integer config: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" ChannelConfig: description: Represents a Preset::ChannelConfig object @@ -17,7 +17,7 @@ ChannelConfig: description: Channel type ID in URI form type: string config: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" Preset: description: Represents a Preset object @@ -33,7 +33,7 @@ Preset: type: integer format: int64 spectrumConfig: - $ref: "/doc/swagger/include/GLSpectrum.yaml#/GLSpectrum" + $ref: "http://swgserver:8081/api/swagger/include/GLSpectrum.yaml#/GLSpectrum" dcOffsetCorrection: description: boolean type: integer @@ -43,11 +43,11 @@ Preset: channelConfigs: type: array items: - $ref: "/doc/swagger/include/Preset.yaml#/ChannelConfig" + $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/ChannelConfig" deviceConfigs: type: array items: - $ref: "/doc/swagger/include/Preset.yaml#/DeviceConfig" + $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/DeviceConfig" layout: description: screen and dock layout is a QByteArray handled by Qt::QMainWindow translated to base64 type: string diff --git a/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml index 764e64bbd..5b338ed2c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml @@ -31,6 +31,12 @@ RtlSdrSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) rfBandwidth: type: integer fileRecordName: @@ -51,7 +57,7 @@ RtlSdrReport: gains: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/Gain" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Gain" RtlSdrActions: description: RTLSDR diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml index e53e909f7..ff4f9fd74 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRPlay.yaml @@ -33,6 +33,12 @@ SDRPlaySettings: type: integer basebandGain: type: integer + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: @@ -51,19 +57,19 @@ SDRPlayReport: sampleRates: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/SampleRate" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/SampleRate" bandwidths: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/Bandwidth" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Bandwidth" intermediateFrequencies: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/Frequency" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Frequency" frequencyBands: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/FrequencyBand" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/FrequencyBand" SDRPlayActions: description: SDRplay1 diff --git a/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml index 49de3f04a..5885edc6f 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SSBMod.yaml @@ -55,7 +55,7 @@ SSBModSettings: reverseAPIChannelIndex: type: integer cwKeyer: - $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings" + $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings" SSBModReport: description: SSBMod diff --git a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml index 348035b1d..eaf88b30e 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml @@ -24,6 +24,12 @@ SoapySDRInputSettings: transverterDeltaFrequency: type: integer format: int64 + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string antenna: @@ -50,9 +56,9 @@ SoapySDRInputSettings: description: boolean not zero for true type: integer dcCorrection: - $ref: "/doc/swagger/include/Structs.yaml#/Complex" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex" iqCorrection: - $ref: "/doc/swagger/include/Structs.yaml#/Complex" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex" streamArgSettings: type: array items: @@ -113,9 +119,9 @@ SoapySDROutputSettings: description: boolean not zero for true type: integer dcCorrection: - $ref: "/doc/swagger/include/Structs.yaml#/Complex" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex" iqCorrection: - $ref: "/doc/swagger/include/Structs.yaml#/Complex" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/Complex" streamArgSettings: type: array items: @@ -165,7 +171,7 @@ SoapySDRReport: description: boolean not zero for true type: integer gainRange: - $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" gainSettings: type: array items: @@ -181,11 +187,11 @@ SoapySDRReport: ratesRanges: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" bandwidthsRanges: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" definitions: @@ -195,7 +201,7 @@ definitions: name: type: string range: - $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" SoapySDRFrequencySetting: description: A named frequency setting specified by a range list @@ -205,7 +211,7 @@ definitions: ranges: type: array items: - $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" ArgValue: descripion: Generic argument value @@ -235,7 +241,7 @@ definitions: units: type: string range: - $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" + $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" valueOptions: type: array items: diff --git a/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml index d87997db8..8d5d4b64f 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/WFMMod.yaml @@ -46,7 +46,7 @@ WFMModSettings: reverseAPIChannelIndex: type: integer cwKeyer: - $ref: "/doc/swagger/include/CWKeyer.yaml#/CWKeyerSettings" + $ref: "http://swgserver:8081/api/swagger/include/CWKeyer.yaml#/CWKeyerSettings" WFMModReport: description: WFMMod diff --git a/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml b/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml index abaea7388..273bd22ac 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Xtrx.yaml @@ -52,6 +52,12 @@ XtrxInputSettings: pwrmode: description: LMS power mode (0 save max to 7 perf max) type: integer + iqOrder: + type: integer + description: > + IQ samples order + * 0 - Q then I (swapped) + * 1 - I then Q (straight) fileRecordName: type: string useReverseAPI: @@ -152,4 +158,4 @@ XtrxOutputReport: format: float gpsLock: description: 1 if GPSDO is locked else 0 - type: integer \ No newline at end of file + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 2214d0edd..0a90fb5eb 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -565,7 +565,7 @@ paths: "200": description: On success return configuration information for the given device in input schema: - $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFESettings" + $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFESettings" "500": $ref: "#/responses/Response_500" "501": @@ -583,7 +583,7 @@ paths: description: Give device serial path in devicePath field. To switch Rx and/or Tx on or off use the run API. required: true schema: - $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFESettings" + $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFESettings" responses: "200": description: Success @@ -611,7 +611,7 @@ paths: description: Give device serial path in devicePath field and run status in rxOn and txOn required: true schema: - $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFESettings" + $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFESettings" responses: "200": description: Success @@ -643,7 +643,7 @@ paths: "200": description: On success return forward and reflected powers in centi-Bels schema: - $ref: "/doc/swagger/include/LimeRFE.yaml#/LimeRFEPower" + $ref: "http://swgserver:8081/api/swagger/include/LimeRFE.yaml#/LimeRFEPower" "400": description: Error schema: @@ -1036,7 +1036,7 @@ paths: "200": description: On success returns current settings values schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -1061,12 +1061,12 @@ paths: description: Device settings to apply required: true schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success returns new settings values schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -1091,12 +1091,12 @@ paths: description: Device settings to apply required: true schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success returns new settings values schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" "404": description: Invalid device set index or device not found schema: @@ -1152,7 +1152,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1186,7 +1186,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1261,7 +1261,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1300,7 +1300,7 @@ paths: description: Originator information in the reverse API case required: false schema: - $ref: "/doc/swagger/include/DeviceSettings.yaml#/DeviceSettings" + $ref: "http://swgserver:8081/api/swagger/include/DeviceSettings.yaml#/DeviceSettings" responses: "200": description: On success return state before change @@ -1400,7 +1400,7 @@ paths: description: Action(s) to apply to the device required: true schema: - $ref: "/doc/swagger/include/DeviceActions.yaml#/DeviceActions" + $ref: "http://swgserver:8081/api/swagger/include/DeviceActions.yaml#/DeviceActions" responses: "202": description: Message to perform action was sent successfully @@ -1437,7 +1437,7 @@ paths: description: Channel identification (no settings data) required: true schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "202": description: Message to add a channel was sent successfully @@ -1477,7 +1477,7 @@ paths: "200": description: On success return deleted channel settings schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1513,7 +1513,7 @@ paths: "200": description: On success return channel settings schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1547,12 +1547,12 @@ paths: description: Channel settings to apply required: true schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "200": description: On success return channel new settings schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1586,12 +1586,12 @@ paths: description: Channel settings to apply required: true schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" responses: "200": description: On success return channel new settings schema: - $ref: "/doc/swagger/include/ChannelSettings.yaml#/ChannelSettings" + $ref: "http://swgserver:8081/api/swagger/include/ChannelSettings.yaml#/ChannelSettings" "400": description: Invalid device set or channel index schema: @@ -1664,7 +1664,7 @@ paths: description: Action(s) to apply to the channel required: true schema: - $ref: "/doc/swagger/include/ChannelActions.yaml#/ChannelActions" + $ref: "http://swgserver:8081/api/swagger/include/ChannelActions.yaml#/ChannelActions" responses: "202": description: Message to perform action was sent successfully @@ -1735,17 +1735,17 @@ definitions: description: Preferences, Presets and Commands of the MainSettings saved by Qt properties: preferences: - $ref: "/doc/swagger/include/Preferences.yaml#/Preferences" + $ref: "http://swgserver:8081/api/swagger/include/Preferences.yaml#/Preferences" workingPreset: - $ref: "/doc/swagger/include/Preset.yaml#/Preset" + $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/Preset" presets: type: array items: - $ref: "/doc/swagger/include/Preset.yaml#/Preset" + $ref: "http://swgserver:8081/api/swagger/include/Preset.yaml#/Preset" commands: type: array items: - $ref: "/doc/swagger/include/Command.yaml#/Command" + $ref: "http://swgserver:8081/api/swagger/include/Command.yaml#/Command" InstanceDevicesResponse: description: "Summarized information about logical devices from hardware devices attached to this SDRangel instance" @@ -2280,47 +2280,47 @@ definitions: 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" + $ref: "http://swgserver:8081/api/swagger/include/Airspy.yaml#/AirspyReport" airspyHFReport: - $ref: "/doc/swagger/include/AirspyHF.yaml#/AirspyHFReport" + $ref: "http://swgserver:8081/api/swagger/include/AirspyHF.yaml#/AirspyHFReport" bladeRF2InputReport: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2InputReport" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2InputReport" bladeRF2OutputReport: - $ref: "/doc/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport" + $ref: "http://swgserver:8081/api/swagger/include/BladeRF2.yaml#/BladeRF2OutputReport" fileInputReport: - $ref: "/doc/swagger/include/FileInput.yaml#/FileInputReport" + $ref: "http://swgserver:8081/api/swagger/include/FileInput.yaml#/FileInputReport" limeSdrInputReport: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputReport" + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputReport" kiwiSDRReport: - $ref: "/doc/swagger/include/KiwiSDR.yaml#/KiwiSDRReport" + $ref: "http://swgserver:8081/api/swagger/include/KiwiSDR.yaml#/KiwiSDRReport" limeSdrOutputReport: - $ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputReport" + $ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputReport" localInputReport: - $ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputReport" + $ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputReport" localOutputReport: - $ref: "/doc/swagger/include/LocalOutput.yaml#/LocalOutputReport" + $ref: "http://swgserver:8081/api/swagger/include/LocalOutput.yaml#/LocalOutputReport" perseusReport: - $ref: "/doc/swagger/include/Perseus.yaml#/PerseusReport" + $ref: "http://swgserver:8081/api/swagger/include/Perseus.yaml#/PerseusReport" plutoSdrInputReport: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrInputReport" + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrInputReport" plutoSdrOutputReport: - $ref: "/doc/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputReport" + $ref: "http://swgserver:8081/api/swagger/include/PlutoSdr.yaml#/PlutoSdrOutputReport" rtlSdrReport: - $ref: "/doc/swagger/include/RtlSdr.yaml#/RtlSdrReport" + $ref: "http://swgserver:8081/api/swagger/include/RtlSdr.yaml#/RtlSdrReport" remoteOutputReport: - $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputReport" + $ref: "http://swgserver:8081/api/swagger/include/RemoteOutput.yaml#/RemoteOutputReport" remoteInputReport: - $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputReport" + $ref: "http://swgserver:8081/api/swagger/include/RemoteInput.yaml#/RemoteInputReport" sdrPlayReport: - $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlayReport" + $ref: "http://swgserver:8081/api/swagger/include/SDRPlay.yaml#/SDRPlayReport" soapySDRInputReport: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRReport" + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRReport" soapySDROutputReport: - $ref: "/doc/swagger/include/SoapySDR.yaml#/SoapySDRReport" + $ref: "http://swgserver:8081/api/swagger/include/SoapySDR.yaml#/SoapySDRReport" xtrxInputReport: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxInputReport" + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxInputReport" xtrxOutputReport: - $ref: "/doc/swagger/include/Xtrx.yaml#/XtrxOutputReport" + $ref: "http://swgserver:8081/api/swagger/include/Xtrx.yaml#/XtrxOutputReport" ChannelReport: description: Base channel report. Only the channel report corresponding to the channel specified in the channelType field is or should be present. @@ -2333,41 +2333,41 @@ definitions: description: 0 for Rx only, 1 for Tx only or 2 for any number and direction (default 0) type: integer AMDemodReport: - $ref: "/doc/swagger/include/AMDemod.yaml#/AMDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/AMDemod.yaml#/AMDemodReport" AMModReport: - $ref: "/doc/swagger/include/AMMod.yaml#/AMModReport" + $ref: "http://swgserver:8081/api/swagger/include/AMMod.yaml#/AMModReport" ATVModReport: - $ref: "/doc/swagger/include/ATVMod.yaml#/ATVModReport" + $ref: "http://swgserver:8081/api/swagger/include/ATVMod.yaml#/ATVModReport" BFMDemodReport: - $ref: "/doc/swagger/include/BFMDemod.yaml#/BFMDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/BFMDemod.yaml#/BFMDemodReport" DSDDemodReport: - $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/DSDDemod.yaml#/DSDDemodReport" FileSourceReport: - $ref: "/doc/swagger/include/FileSource.yaml#/FileSourceReport" + $ref: "http://swgserver:8081/api/swagger/include/FileSource.yaml#/FileSourceReport" FreeDVDemodReport: - $ref: "/doc/swagger/include/FreeDVDemod.yaml#/FreeDVDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/FreeDVDemod.yaml#/FreeDVDemodReport" FreeDVModReport: - $ref: "/doc/swagger/include/FreeDVMod.yaml#/FreeDVModReport" + $ref: "http://swgserver:8081/api/swagger/include/FreeDVMod.yaml#/FreeDVModReport" FreqTrackerReport: - $ref: "/doc/swagger/include/FreqTracker.yaml#/FreqTrackerReport" + $ref: "http://swgserver:8081/api/swagger/include/FreqTracker.yaml#/FreqTrackerReport" NFMDemodReport: - $ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodReport" NFMModReport: - $ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport" + $ref: "http://swgserver:8081/api/swagger/include/NFMMod.yaml#/NFMModReport" SSBDemodReport: - $ref: "/doc/swagger/include/SSBDemod.yaml#/SSBDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/SSBDemod.yaml#/SSBDemodReport" RemoteSourceReport: - $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceReport" + $ref: "http://swgserver:8081/api/swagger/include/RemoteSource.yaml#/RemoteSourceReport" SSBModReport: - $ref: "/doc/swagger/include/SSBMod.yaml#/SSBModReport" + $ref: "http://swgserver:8081/api/swagger/include/SSBMod.yaml#/SSBModReport" UDPSourceReport: - $ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceReport" + $ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceReport" UDPSinkReport: - $ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkReport" + $ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkReport" WFMDemodReport: - $ref: "/doc/swagger/include/WFMDemod.yaml#/WFMDemodReport" + $ref: "http://swgserver:8081/api/swagger/include/WFMDemod.yaml#/WFMDemodReport" WFMModReport: - $ref: "/doc/swagger/include/WFMMod.yaml#/WFMModReport" + $ref: "http://swgserver:8081/api/swagger/include/WFMMod.yaml#/WFMModReport" responses: diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 8b9783808..446506ad2 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1186,6 +1186,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "bandIndex" : { "type" : "integer" }, @@ -1298,6 +1302,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1637,6 +1645,10 @@ margin-bottom: 20px; "iqCorrection" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1777,6 +1789,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -1850,6 +1866,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "txCenterFrequency" : { "type" : "integer", "format" : "int64" @@ -3112,6 +3132,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -3207,6 +3231,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -3870,6 +3898,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -4332,6 +4364,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -4948,6 +4984,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5069,6 +5109,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -5833,6 +5877,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "rfBandwidth" : { "type" : "integer" }, @@ -5942,6 +5990,10 @@ margin-bottom: 20px; "basebandGain" : { "type" : "integer" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -6301,6 +6353,10 @@ margin-bottom: 20px; "type" : "integer", "format" : "int64" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -7290,6 +7346,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "LMS power mode (0 save max to 7 perf max)" }, + "iqOrder" : { + "type" : "integer", + "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" + }, "fileRecordName" : { "type" : "string" }, @@ -33395,7 +33455,7 @@ except ApiException as e:
- Generated 2020-06-15T13:39:42.927+02:00 + Generated 2020-06-23T19:48:55.770+02:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp index 0675f1421..ef8a3b996 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.cpp @@ -40,6 +40,8 @@ SWGAirspyHFSettings::SWGAirspyHFSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; band_index = 0; m_band_index_isSet = false; file_record_name = nullptr; @@ -86,6 +88,8 @@ SWGAirspyHFSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; band_index = 0; m_band_index_isSet = false; file_record_name = new QString(""); @@ -123,6 +127,7 @@ SWGAirspyHFSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -164,6 +169,8 @@ SWGAirspyHFSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&band_index, pJson["bandIndex"], "qint32", ""); ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); @@ -224,6 +231,9 @@ SWGAirspyHFSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_band_index_isSet){ obj->insert("bandIndex", QJsonValue(band_index)); } @@ -327,6 +337,16 @@ SWGAirspyHFSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGAirspyHFSettings::getIqOrder() { + return iq_order; +} +void +SWGAirspyHFSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGAirspyHFSettings::getBandIndex() { return band_index; @@ -480,6 +500,9 @@ SWGAirspyHFSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_band_index_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h index e37100acb..abed1f5d1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAirspyHFSettings.h @@ -60,6 +60,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getBandIndex(); void setBandIndex(qint32 band_index); @@ -121,6 +124,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 band_index; bool m_band_index_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp index 025c18e99..855deac6a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.cpp @@ -58,6 +58,8 @@ SWGAirspySettings::SWGAirspySettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -106,6 +108,8 @@ SWGAirspySettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -135,6 +139,7 @@ SWGAirspySettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -187,6 +192,8 @@ SWGAirspySettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -258,6 +265,9 @@ SWGAirspySettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -427,6 +437,16 @@ SWGAirspySettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGAirspySettings::getIqOrder() { + return iq_order; +} +void +SWGAirspySettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGAirspySettings::getFileRecordName() { return file_record_name; @@ -527,6 +547,9 @@ SWGAirspySettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h index 9aa737dca..d9963541f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGAirspySettings.h @@ -87,6 +87,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -151,6 +154,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp index e949d46f9..e78c1c0d9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.cpp @@ -54,6 +54,8 @@ SWGBladeRF1InputSettings::SWGBladeRF1InputSettings() { m_dc_block_isSet = false; iq_correction = 0; m_iq_correction_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -98,6 +100,8 @@ SWGBladeRF1InputSettings::init() { m_dc_block_isSet = false; iq_correction = 0; m_iq_correction_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -125,6 +129,7 @@ SWGBladeRF1InputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -173,6 +178,8 @@ SWGBladeRF1InputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&iq_correction, pJson["iqCorrection"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -238,6 +245,9 @@ SWGBladeRF1InputSettings::asJsonObject() { if(m_iq_correction_isSet){ obj->insert("iqCorrection", QJsonValue(iq_correction)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -387,6 +397,16 @@ SWGBladeRF1InputSettings::setIqCorrection(qint32 iq_correction) { this->m_iq_correction_isSet = true; } +qint32 +SWGBladeRF1InputSettings::getIqOrder() { + return iq_order; +} +void +SWGBladeRF1InputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGBladeRF1InputSettings::getFileRecordName() { return file_record_name; @@ -481,6 +501,9 @@ SWGBladeRF1InputSettings::isSet(){ if(m_iq_correction_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h index 3470dfbe2..3d947660e 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF1InputSettings.h @@ -81,6 +81,9 @@ public: qint32 getIqCorrection(); void setIqCorrection(qint32 iq_correction); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -139,6 +142,9 @@ private: qint32 iq_correction; bool m_iq_correction_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp index f5694fb72..7771f16a7 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.cpp @@ -54,6 +54,8 @@ SWGBladeRF2InputSettings::SWGBladeRF2InputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -98,6 +100,8 @@ SWGBladeRF2InputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -125,6 +129,7 @@ SWGBladeRF2InputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -173,6 +178,8 @@ SWGBladeRF2InputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -238,6 +245,9 @@ SWGBladeRF2InputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -387,6 +397,16 @@ SWGBladeRF2InputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGBladeRF2InputSettings::getIqOrder() { + return iq_order; +} +void +SWGBladeRF2InputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGBladeRF2InputSettings::getFileRecordName() { return file_record_name; @@ -481,6 +501,9 @@ SWGBladeRF2InputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h index 5cddebf6e..87026ac64 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2InputSettings.h @@ -81,6 +81,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -139,6 +142,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp index c3190ad7c..fcd83214e 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.cpp @@ -58,6 +58,8 @@ SWGBladeRF2MIMOSettings::SWGBladeRF2MIMOSettings() { m_rx_transverter_mode_isSet = false; rx_transverter_delta_frequency = 0L; m_rx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; tx_center_frequency = 0L; m_tx_center_frequency_isSet = false; log2_interp = 0; @@ -124,6 +126,8 @@ SWGBladeRF2MIMOSettings::init() { m_rx_transverter_mode_isSet = false; rx_transverter_delta_frequency = 0L; m_rx_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; tx_center_frequency = 0L; m_tx_center_frequency_isSet = false; log2_interp = 0; @@ -178,6 +182,7 @@ SWGBladeRF2MIMOSettings::cleanup() { + if(file_record_name != nullptr) { @@ -232,6 +237,8 @@ SWGBladeRF2MIMOSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&rx_transverter_delta_frequency, pJson["rxTransverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&tx_center_frequency, pJson["txCenterFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&log2_interp, pJson["log2Interp"], "qint32", ""); @@ -321,6 +328,9 @@ SWGBladeRF2MIMOSettings::asJsonObject() { if(m_rx_transverter_delta_frequency_isSet){ obj->insert("rxTransverterDeltaFrequency", QJsonValue(rx_transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_tx_center_frequency_isSet){ obj->insert("txCenterFrequency", QJsonValue(tx_center_frequency)); } @@ -517,6 +527,16 @@ SWGBladeRF2MIMOSettings::setRxTransverterDeltaFrequency(qint64 rx_transverter_de this->m_rx_transverter_delta_frequency_isSet = true; } +qint32 +SWGBladeRF2MIMOSettings::getIqOrder() { + return iq_order; +} +void +SWGBladeRF2MIMOSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint64 SWGBladeRF2MIMOSettings::getTxCenterFrequency() { return tx_center_frequency; @@ -707,6 +727,9 @@ SWGBladeRF2MIMOSettings::isSet(){ if(m_rx_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_tx_center_frequency_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h index 74c6d6622..d10968c08 100644 --- a/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGBladeRF2MIMOSettings.h @@ -87,6 +87,9 @@ public: qint64 getRxTransverterDeltaFrequency(); void setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint64 getTxCenterFrequency(); void setTxCenterFrequency(qint64 tx_center_frequency); @@ -178,6 +181,9 @@ private: qint64 rx_transverter_delta_frequency; bool m_rx_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint64 tx_center_frequency; bool m_tx_center_frequency_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp index 190f01d40..ae801cdf1 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.cpp @@ -58,6 +58,8 @@ SWGFCDProPlusSettings::SWGFCDProPlusSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -106,6 +108,8 @@ SWGFCDProPlusSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -135,6 +139,7 @@ SWGFCDProPlusSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -187,6 +192,8 @@ SWGFCDProPlusSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -258,6 +265,9 @@ SWGFCDProPlusSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -427,6 +437,16 @@ SWGFCDProPlusSettings::setTransverterDeltaFrequency(qint64 transverter_delta_fre this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGFCDProPlusSettings::getIqOrder() { + return iq_order; +} +void +SWGFCDProPlusSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGFCDProPlusSettings::getFileRecordName() { return file_record_name; @@ -527,6 +547,9 @@ SWGFCDProPlusSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h index 6cf7646c9..701006f44 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProPlusSettings.h @@ -87,6 +87,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -151,6 +154,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp index 0a19a9744..17f361e25 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.cpp @@ -76,6 +76,8 @@ SWGFCDProSettings::SWGFCDProSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -142,6 +144,8 @@ SWGFCDProSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -178,6 +182,7 @@ SWGFCDProSettings::cleanup() { + if(file_record_name != nullptr) { @@ -250,6 +255,8 @@ SWGFCDProSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -348,6 +355,9 @@ SWGFCDProSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -607,6 +617,16 @@ SWGFCDProSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGFCDProSettings::getIqOrder() { + return iq_order; +} +void +SWGFCDProSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGFCDProSettings::getFileRecordName() { return file_record_name; @@ -734,6 +754,9 @@ SWGFCDProSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h index 13d7c1c88..61dae6ea3 100644 --- a/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGFCDProSettings.h @@ -114,6 +114,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -205,6 +208,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp index f2109c3ae..3106c400d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.cpp @@ -58,6 +58,8 @@ SWGHackRFInputSettings::SWGHackRFInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = nullptr; @@ -104,6 +106,8 @@ SWGHackRFInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; use_reverse_api = 0; m_use_reverse_api_isSet = false; reverse_api_address = new QString(""); @@ -134,6 +138,7 @@ SWGHackRFInputSettings::cleanup() { + if(reverse_api_address != nullptr) { delete reverse_api_address; } @@ -182,6 +187,8 @@ SWGHackRFInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); ::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString"); @@ -251,6 +258,9 @@ SWGHackRFInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_use_reverse_api_isSet){ obj->insert("useReverseAPI", QJsonValue(use_reverse_api)); } @@ -417,6 +427,16 @@ SWGHackRFInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_fr this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGHackRFInputSettings::getIqOrder() { + return iq_order; +} +void +SWGHackRFInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGHackRFInputSettings::getUseReverseApi() { return use_reverse_api; @@ -507,6 +527,9 @@ SWGHackRFInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_use_reverse_api_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h index ec68601ea..1c79ae501 100644 --- a/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGHackRFInputSettings.h @@ -87,6 +87,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getUseReverseApi(); void setUseReverseApi(qint32 use_reverse_api); @@ -148,6 +151,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 use_reverse_api; bool m_use_reverse_api_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp index 96b1b367c..79a4eaf5b 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.cpp @@ -70,6 +70,8 @@ SWGLimeSdrInputSettings::SWGLimeSdrInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; gpio_dir = 0; @@ -134,6 +136,8 @@ SWGLimeSdrInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; gpio_dir = 0; @@ -171,6 +175,7 @@ SWGLimeSdrInputSettings::cleanup() { + if(file_record_name != nullptr) { @@ -239,6 +244,8 @@ SWGLimeSdrInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&gpio_dir, pJson["gpioDir"], "qint32", ""); @@ -332,6 +339,9 @@ SWGLimeSdrInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -567,6 +577,16 @@ SWGLimeSdrInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_f this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGLimeSdrInputSettings::getIqOrder() { + return iq_order; +} +void +SWGLimeSdrInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGLimeSdrInputSettings::getFileRecordName() { return file_record_name; @@ -705,6 +725,9 @@ SWGLimeSdrInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h index 4e5220807..fbf4d79ac 100644 --- a/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGLimeSdrInputSettings.h @@ -105,6 +105,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -193,6 +196,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp index 8c33c8333..a588ea4f4 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.cpp @@ -46,6 +46,8 @@ SWGPerseusSettings::SWGPerseusSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; attenuator = 0; @@ -84,6 +86,8 @@ SWGPerseusSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; attenuator = 0; @@ -109,6 +113,7 @@ SWGPerseusSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -150,6 +155,8 @@ SWGPerseusSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&attenuator, pJson["attenuator"], "qint32", ""); @@ -205,6 +212,9 @@ SWGPerseusSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -317,6 +327,16 @@ SWGPerseusSettings::setTransverterDeltaFrequency(qint64 transverter_delta_freque this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGPerseusSettings::getIqOrder() { + return iq_order; +} +void +SWGPerseusSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGPerseusSettings::getFileRecordName() { return file_record_name; @@ -409,6 +429,9 @@ SWGPerseusSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h index 724a1e552..6bf70288c 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPerseusSettings.h @@ -69,6 +69,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -118,6 +121,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp index b8bceb44f..f7d2d9d1f 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.cpp @@ -68,6 +68,8 @@ SWGPlutoSdrInputSettings::SWGPlutoSdrInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -126,6 +128,8 @@ SWGPlutoSdrInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -159,6 +163,7 @@ SWGPlutoSdrInputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; @@ -222,6 +227,8 @@ SWGPlutoSdrInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -308,6 +315,9 @@ SWGPlutoSdrInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -527,6 +537,16 @@ SWGPlutoSdrInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGPlutoSdrInputSettings::getIqOrder() { + return iq_order; +} +void +SWGPlutoSdrInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGPlutoSdrInputSettings::getFileRecordName() { return file_record_name; @@ -642,6 +662,9 @@ SWGPlutoSdrInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h index 1d14cd8e4..68a8eac17 100644 --- a/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGPlutoSdrInputSettings.h @@ -102,6 +102,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -181,6 +184,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp index ddece17c8..30749debb 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp @@ -56,6 +56,8 @@ SWGRtlSdrSettings::SWGRtlSdrSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; rf_bandwidth = 0; m_rf_bandwidth_isSet = false; file_record_name = nullptr; @@ -104,6 +106,8 @@ SWGRtlSdrSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; rf_bandwidth = 0; m_rf_bandwidth_isSet = false; file_record_name = new QString(""); @@ -135,6 +139,7 @@ SWGRtlSdrSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -185,6 +190,8 @@ SWGRtlSdrSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "qint32", ""); ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); @@ -255,6 +262,9 @@ SWGRtlSdrSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(m_rf_bandwidth_isSet){ obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); } @@ -417,6 +427,16 @@ SWGRtlSdrSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGRtlSdrSettings::getIqOrder() { + return iq_order; +} +void +SWGRtlSdrSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + qint32 SWGRtlSdrSettings::getRfBandwidth() { return rf_bandwidth; @@ -524,6 +544,9 @@ SWGRtlSdrSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h index d0d819fec..4e758653a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h @@ -84,6 +84,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + qint32 getRfBandwidth(); void setRfBandwidth(qint32 rf_bandwidth); @@ -148,6 +151,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + qint32 rf_bandwidth; bool m_rf_bandwidth_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp index 8b80a255c..302c960af 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.cpp @@ -58,6 +58,8 @@ SWGSDRPlaySettings::SWGSDRPlaySettings() { m_mixer_amp_on_isSet = false; baseband_gain = 0; m_baseband_gain_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -106,6 +108,8 @@ SWGSDRPlaySettings::init() { m_mixer_amp_on_isSet = false; baseband_gain = 0; m_baseband_gain_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -135,6 +139,7 @@ SWGSDRPlaySettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -187,6 +192,8 @@ SWGSDRPlaySettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&baseband_gain, pJson["basebandGain"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -258,6 +265,9 @@ SWGSDRPlaySettings::asJsonObject() { if(m_baseband_gain_isSet){ obj->insert("basebandGain", QJsonValue(baseband_gain)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -427,6 +437,16 @@ SWGSDRPlaySettings::setBasebandGain(qint32 baseband_gain) { this->m_baseband_gain_isSet = true; } +qint32 +SWGSDRPlaySettings::getIqOrder() { + return iq_order; +} +void +SWGSDRPlaySettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGSDRPlaySettings::getFileRecordName() { return file_record_name; @@ -527,6 +547,9 @@ SWGSDRPlaySettings::isSet(){ if(m_baseband_gain_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h index a628b2e48..ff3bcb585 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSDRPlaySettings.h @@ -87,6 +87,9 @@ public: qint32 getBasebandGain(); void setBasebandGain(qint32 baseband_gain); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -151,6 +154,9 @@ private: qint32 baseband_gain; bool m_baseband_gain_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp index 1e0f262be..bc8b3c65a 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.cpp @@ -46,6 +46,8 @@ SWGSoapySDRInputSettings::SWGSoapySDRInputSettings() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; antenna = nullptr; @@ -106,6 +108,8 @@ SWGSoapySDRInputSettings::init() { m_transverter_mode_isSet = false; transverter_delta_frequency = 0L; m_transverter_delta_frequency_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; antenna = new QString(""); @@ -153,6 +157,7 @@ SWGSoapySDRInputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -235,6 +240,8 @@ SWGSoapySDRInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&antenna, pJson["antenna"], "QString", "QString"); @@ -312,6 +319,9 @@ SWGSoapySDRInputSettings::asJsonObject() { if(m_transverter_delta_frequency_isSet){ obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -457,6 +467,16 @@ SWGSoapySDRInputSettings::setTransverterDeltaFrequency(qint64 transverter_delta_ this->m_transverter_delta_frequency_isSet = true; } +qint32 +SWGSoapySDRInputSettings::getIqOrder() { + return iq_order; +} +void +SWGSoapySDRInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGSoapySDRInputSettings::getFileRecordName() { return file_record_name; @@ -659,6 +679,9 @@ SWGSoapySDRInputSettings::isSet(){ if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h index c5f04c010..4d9393359 100644 --- a/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGSoapySDRInputSettings.h @@ -72,6 +72,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -154,6 +157,9 @@ private: qint64 transverter_delta_frequency; bool m_transverter_delta_frequency_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet; diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp index 5442492ec..3226043b9 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.cpp @@ -64,6 +64,8 @@ SWGXtrxInputSettings::SWGXtrxInputSettings() { m_ext_clock_freq_isSet = false; pwrmode = 0; m_pwrmode_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = nullptr; m_file_record_name_isSet = false; use_reverse_api = 0; @@ -118,6 +120,8 @@ SWGXtrxInputSettings::init() { m_ext_clock_freq_isSet = false; pwrmode = 0; m_pwrmode_isSet = false; + iq_order = 0; + m_iq_order_isSet = false; file_record_name = new QString(""); m_file_record_name_isSet = false; use_reverse_api = 0; @@ -150,6 +154,7 @@ SWGXtrxInputSettings::cleanup() { + if(file_record_name != nullptr) { delete file_record_name; } @@ -208,6 +213,8 @@ SWGXtrxInputSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&pwrmode, pJson["pwrmode"], "qint32", ""); + ::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", ""); + ::SWGSDRangel::setValue(&file_record_name, pJson["fileRecordName"], "QString", "QString"); ::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", ""); @@ -288,6 +295,9 @@ SWGXtrxInputSettings::asJsonObject() { if(m_pwrmode_isSet){ obj->insert("pwrmode", QJsonValue(pwrmode)); } + if(m_iq_order_isSet){ + obj->insert("iqOrder", QJsonValue(iq_order)); + } if(file_record_name != nullptr && *file_record_name != QString("")){ toJsonValue(QString("fileRecordName"), file_record_name, obj, QString("QString")); } @@ -487,6 +497,16 @@ SWGXtrxInputSettings::setPwrmode(qint32 pwrmode) { this->m_pwrmode_isSet = true; } +qint32 +SWGXtrxInputSettings::getIqOrder() { + return iq_order; +} +void +SWGXtrxInputSettings::setIqOrder(qint32 iq_order) { + this->iq_order = iq_order; + this->m_iq_order_isSet = true; +} + QString* SWGXtrxInputSettings::getFileRecordName() { return file_record_name; @@ -596,6 +616,9 @@ SWGXtrxInputSettings::isSet(){ if(m_pwrmode_isSet){ isObjectUpdated = true; break; } + if(m_iq_order_isSet){ + isObjectUpdated = true; break; + } if(file_record_name && *file_record_name != QString("")){ isObjectUpdated = true; break; } diff --git a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h index 462c39bf4..f1934af3d 100644 --- a/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGXtrxInputSettings.h @@ -96,6 +96,9 @@ public: qint32 getPwrmode(); void setPwrmode(qint32 pwrmode); + qint32 getIqOrder(); + void setIqOrder(qint32 iq_order); + QString* getFileRecordName(); void setFileRecordName(QString* file_record_name); @@ -169,6 +172,9 @@ private: qint32 pwrmode; bool m_pwrmode_isSet; + qint32 iq_order; + bool m_iq_order_isSet; + QString* file_record_name; bool m_file_record_name_isSet;