diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index bb93cc0cb..1e4f37bf5 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -60,6 +60,7 @@ webapi/doc/swagger/include/HackRF.yaml webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml webapi/doc/swagger/include/Interferometer.yaml + webapi/doc/swagger/include/JogdialController.yaml webapi/doc/swagger/include/LimeRFE.yaml webapi/doc/swagger/include/LimeSdr.yaml webapi/doc/swagger/include/KiwiSDR.yaml @@ -90,6 +91,8 @@ webapi/doc/swagger/include/RemoteSource.yaml webapi/doc/swagger/include/RemoteInput.yaml webapi/doc/swagger/include/RemoteOutput.yaml + webapi/doc/swagger/include/RemoteTCPInput.yaml + webapi/doc/swagger/include/RemoteTCPSink.yaml webapi/doc/swagger/include/RigCtlServer.yaml webapi/doc/swagger/include/RollupState.yaml webapi/doc/swagger/include/SatelliteTracker.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index 29d5a9a71..762c2bdb2 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3624,6 +3624,9 @@ margin-bottom: 20px; "RemoteSourceSettings" : { "$ref" : "#/definitions/RemoteSourceSettings" }, + "RemoteTCPSinkSettings" : { + "$ref" : "#/definitions/RemoteTCPSinkSettings" + }, "SigMFFileSinkSettings" : { "$ref" : "#/definitions/SigMFFileSinkSettings" }, @@ -5020,6 +5023,9 @@ margin-bottom: 20px; "remoteInputReport" : { "$ref" : "#/definitions/RemoteInputReport" }, + "remoteTCPInputReport" : { + "$ref" : "#/definitions/RemoteTCPInputReport" + }, "sdrPlayReport" : { "$ref" : "#/definitions/SDRPlayReport" }, @@ -5196,6 +5202,9 @@ margin-bottom: 20px; "remoteInputSettings" : { "$ref" : "#/definitions/RemoteInputSettings" }, + "remoteTCPInputSettings" : { + "$ref" : "#/definitions/RemoteTCPInputSettings" + }, "sdrPlaySettings" : { "$ref" : "#/definitions/SDRPlaySettings" }, @@ -11318,6 +11327,155 @@ margin-bottom: 20px; } }, "description" : "Remote channel source settings" +}; + defs.RemoteTCPInputReport = { + "properties" : { + "sampleRate" : { + "type" : "integer" + } + }, + "description" : "RemoteTCPInput" +}; + defs.RemoteTCPInputSettings = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "loPpmCorrection" : { + "type" : "integer" + }, + "dcBlock" : { + "type" : "integer" + }, + "iqCorrection" : { + "type" : "integer" + }, + "biasTee" : { + "type" : "integer" + }, + "directSampling" : { + "type" : "integer" + }, + "devSampleRate" : { + "type" : "integer" + }, + "log2Decim" : { + "type" : "integer" + }, + "gain" : { + "type" : "integer" + }, + "agc" : { + "type" : "integer" + }, + "rfBW" : { + "type" : "integer" + }, + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "channelGain" : { + "type" : "integer" + }, + "channelSampleRate" : { + "type" : "integer" + }, + "channelDecimation" : { + "type" : "integer" + }, + "sampleBits" : { + "type" : "integer" + }, + "dataAddress" : { + "type" : "string" + }, + "dataPort" : { + "type" : "integer" + }, + "overrideRemoteSettings" : { + "type" : "integer" + }, + "preFill" : { + "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + } + }, + "description" : "RemoteTCPInput" +}; + defs.RemoteTCPSinkSettings = { + "properties" : { + "channelSampleRate" : { + "type" : "integer" + }, + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "gain" : { + "type" : "integer" + }, + "sampleBits" : { + "type" : "integer" + }, + "dataAddress" : { + "type" : "string", + "description" : "Receiving TCP data address" + }, + "dataPort" : { + "type" : "integer", + "description" : "Receiving TCP data port" + }, + "protocol" : { + "type" : "integer" + }, + "rgbColor" : { + "type" : "integer" + }, + "title" : { + "type" : "string" + }, + "streamIndex" : { + "type" : "integer", + "description" : "MIMO channel. Not relevant when connected to SI (single Rx)." + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + }, + "reverseAPIChannelIndex" : { + "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "Remote TCP channel sink settings" }; defs.RigCtlServerActions = { "properties" : { @@ -11680,6 +11838,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" }, + "biasTee" : { + "type" : "integer", + "description" : "Bias tee\n * 0 - inactive\n * 1 - active\n" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -56435,7 +56597,7 @@ except ApiException as e:
- Generated 2022-07-10T10:00:03.872+02:00 + Generated 2022-08-16T14:53:35.735+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index 5f9c3c79c..85ff54cf1 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -97,6 +97,8 @@ ChannelSettings: $ref: "/doc/swagger/include/RemoteSink.yaml#/RemoteSinkSettings" RemoteSourceSettings: $ref: "/doc/swagger/include/RemoteSource.yaml#/RemoteSourceSettings" + RemoteTCPSinkSettings: + $ref: "/doc/swagger/include/RemoteTCPSink.yaml#/RemoteTCPSinkSettings" SigMFFileSinkSettings: $ref: "/doc/swagger/include/SigMFFileSink.yaml#/SigMFFileSinkSettings" SSBModSettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml index 20e51c4a6..62c8719f0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceReports.yaml @@ -49,6 +49,8 @@ DeviceReport: $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputReport" remoteInputReport: $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputReport" + remoteTCPInputReport: + $ref: "/doc/swagger/include/RemoteTCPInput.yaml#/RemoteTCPInputReport" sdrPlayReport: $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlayReport" sdrPlayV3Report: diff --git a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml index 8c29e39d5..d3332a6ca 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DeviceSettings.yaml @@ -72,6 +72,8 @@ DeviceSettings: $ref: "/doc/swagger/include/RemoteOutput.yaml#/RemoteOutputSettings" remoteInputSettings: $ref: "/doc/swagger/include/RemoteInput.yaml#/RemoteInputSettings" + remoteTCPInputSettings: + $ref: "/doc/swagger/include/RemoteTCPInput.yaml#/RemoteTCPInputSettings" sdrPlaySettings: $ref: "/doc/swagger/include/SDRPlay.yaml#/SDRPlaySettings" sdrPlayV3Settings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteTCPInput.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteTCPInput.yaml new file mode 100644 index 000000000..df1bf0f8f --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteTCPInput.yaml @@ -0,0 +1,60 @@ +RemoteTCPInputSettings: + description: RemoteTCPInput + properties: + centerFrequency: + type: integer + format: int64 + loPpmCorrection: + type: integer + dcBlock: + type: integer + iqCorrection: + type: integer + biasTee: + type: integer + directSampling: + type: integer + devSampleRate: + type: integer + log2Decim: + type: integer + gain: + type: integer + agc: + type: integer + rfBW: + type: integer + inputFrequencyOffset: + type: integer + format: int64 + channelGain: + type: integer + channelSampleRate: + type: integer + channelDecimation: + type: integer + sampleBits: + type: integer + dataAddress: + type: string + dataPort: + type: integer + overrideRemoteSettings: + type: integer + preFill: + type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + +RemoteTCPInputReport: + description: RemoteTCPInput + properties: + sampleRate: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteTCPSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteTCPSink.yaml new file mode 100644 index 000000000..4152765bf --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteTCPSink.yaml @@ -0,0 +1,42 @@ +RemoteTCPSinkSettings: + description: "Remote TCP channel sink settings" + properties: + channelSampleRate: + type: integer + inputFrequencyOffset: + type: integer + format: int64 + gain: + type: integer + sampleBits: + type: integer + dataAddress: + description: "Receiving TCP data address" + type: string + dataPort: + description: "Receiving TCP data port" + type: integer + protocol: + type: integer + rgbColor: + type: integer + title: + type: string + streamIndex: + description: MIMO channel. Not relevant when connected to SI (single Rx). + type: integer + useReverseAPI: + description: Synchronize with reverse API (1 for yes, 0 for no) + type: integer + reverseAPIAddress: + type: string + reverseAPIPort: + type: integer + reverseAPIDeviceIndex: + type: integer + reverseAPIChannelIndex: + type: integer + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" + rollupState: + $ref: "/doc/swagger/include/RollupState.yaml#/RollupState" diff --git a/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml b/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml index db184656d..4854cb601 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SDRPlayV3.yaml @@ -49,6 +49,12 @@ SDRPlayV3Settings: IQ samples order * 0 - Q then I (swapped) * 1 - I then Q (straight) + biasTee: + type: integer + description: > + Bias tee + * 0 - inactive + * 1 - active useReverseAPI: description: Synchronize with reverse API (1 for yes, 0 for no) type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 29d5a9a71..762c2bdb2 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3624,6 +3624,9 @@ margin-bottom: 20px; "RemoteSourceSettings" : { "$ref" : "#/definitions/RemoteSourceSettings" }, + "RemoteTCPSinkSettings" : { + "$ref" : "#/definitions/RemoteTCPSinkSettings" + }, "SigMFFileSinkSettings" : { "$ref" : "#/definitions/SigMFFileSinkSettings" }, @@ -5020,6 +5023,9 @@ margin-bottom: 20px; "remoteInputReport" : { "$ref" : "#/definitions/RemoteInputReport" }, + "remoteTCPInputReport" : { + "$ref" : "#/definitions/RemoteTCPInputReport" + }, "sdrPlayReport" : { "$ref" : "#/definitions/SDRPlayReport" }, @@ -5196,6 +5202,9 @@ margin-bottom: 20px; "remoteInputSettings" : { "$ref" : "#/definitions/RemoteInputSettings" }, + "remoteTCPInputSettings" : { + "$ref" : "#/definitions/RemoteTCPInputSettings" + }, "sdrPlaySettings" : { "$ref" : "#/definitions/SDRPlaySettings" }, @@ -11318,6 +11327,155 @@ margin-bottom: 20px; } }, "description" : "Remote channel source settings" +}; + defs.RemoteTCPInputReport = { + "properties" : { + "sampleRate" : { + "type" : "integer" + } + }, + "description" : "RemoteTCPInput" +}; + defs.RemoteTCPInputSettings = { + "properties" : { + "centerFrequency" : { + "type" : "integer", + "format" : "int64" + }, + "loPpmCorrection" : { + "type" : "integer" + }, + "dcBlock" : { + "type" : "integer" + }, + "iqCorrection" : { + "type" : "integer" + }, + "biasTee" : { + "type" : "integer" + }, + "directSampling" : { + "type" : "integer" + }, + "devSampleRate" : { + "type" : "integer" + }, + "log2Decim" : { + "type" : "integer" + }, + "gain" : { + "type" : "integer" + }, + "agc" : { + "type" : "integer" + }, + "rfBW" : { + "type" : "integer" + }, + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "channelGain" : { + "type" : "integer" + }, + "channelSampleRate" : { + "type" : "integer" + }, + "channelDecimation" : { + "type" : "integer" + }, + "sampleBits" : { + "type" : "integer" + }, + "dataAddress" : { + "type" : "string" + }, + "dataPort" : { + "type" : "integer" + }, + "overrideRemoteSettings" : { + "type" : "integer" + }, + "preFill" : { + "type" : "integer" + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + } + }, + "description" : "RemoteTCPInput" +}; + defs.RemoteTCPSinkSettings = { + "properties" : { + "channelSampleRate" : { + "type" : "integer" + }, + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "gain" : { + "type" : "integer" + }, + "sampleBits" : { + "type" : "integer" + }, + "dataAddress" : { + "type" : "string", + "description" : "Receiving TCP data address" + }, + "dataPort" : { + "type" : "integer", + "description" : "Receiving TCP data port" + }, + "protocol" : { + "type" : "integer" + }, + "rgbColor" : { + "type" : "integer" + }, + "title" : { + "type" : "string" + }, + "streamIndex" : { + "type" : "integer", + "description" : "MIMO channel. Not relevant when connected to SI (single Rx)." + }, + "useReverseAPI" : { + "type" : "integer", + "description" : "Synchronize with reverse API (1 for yes, 0 for no)" + }, + "reverseAPIAddress" : { + "type" : "string" + }, + "reverseAPIPort" : { + "type" : "integer" + }, + "reverseAPIDeviceIndex" : { + "type" : "integer" + }, + "reverseAPIChannelIndex" : { + "type" : "integer" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "Remote TCP channel sink settings" }; defs.RigCtlServerActions = { "properties" : { @@ -11680,6 +11838,10 @@ margin-bottom: 20px; "type" : "integer", "description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n" }, + "biasTee" : { + "type" : "integer", + "description" : "Bias tee\n * 0 - inactive\n * 1 - active\n" + }, "useReverseAPI" : { "type" : "integer", "description" : "Synchronize with reverse API (1 for yes, 0 for no)" @@ -56435,7 +56597,7 @@ except ApiException as e:
- Generated 2022-07-10T10:00:03.872+02:00 + Generated 2022-08-16T14:53:35.735+02:00