diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index 51bfa37fa..9ecf65865 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -38,6 +38,7 @@ webapi/doc/swagger/include/DATVMod.yaml webapi/doc/swagger/include/DemodAnalyzer.yaml webapi/doc/swagger/include/DOA2.yaml + webapi/doc/swagger/include/DSCDemod.yaml webapi/doc/swagger/include/DSDDemod.yaml webapi/doc/swagger/include/DeviceActions.yaml webapi/doc/swagger/include/DeviceSettings.yaml diff --git a/sdrbase/resources/webapi/doc/html2/index.html b/sdrbase/resources/webapi/doc/html2/index.html index ad20c5244..8f4279c4b 100644 --- a/sdrbase/resources/webapi/doc/html2/index.html +++ b/sdrbase/resources/webapi/doc/html2/index.html @@ -3588,6 +3588,9 @@ margin-bottom: 20px; "DOA2Report" : { "$ref" : "#/definitions/DOA2Report" }, + "DSCDemodReport" : { + "$ref" : "#/definitions/DSCDemodReport" + }, "DSDDemodReport" : { "$ref" : "#/definitions/DSDDemodReport" }, @@ -3758,6 +3761,9 @@ margin-bottom: 20px; "DOA2Settings" : { "$ref" : "#/definitions/DOA2Settings" }, + "DSCDemodSettings" : { + "$ref" : "#/definitions/DSCDemodSettings" + }, "DSDDemodSettings" : { "$ref" : "#/definitions/DSDDemodSettings" }, @@ -4856,6 +4862,91 @@ margin-bottom: 20px; } }, "description" : "DOA2" +}; + defs.DSCDemodReport = { + "properties" : { + "channelPowerDB" : { + "type" : "number", + "format" : "float", + "description" : "power transmitted in channel (dB)" + }, + "channelSampleRate" : { + "type" : "integer" + } + }, + "description" : "DSCDemod" +}; + defs.DSCDemodSettings = { + "properties" : { + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "rfBandwidth" : { + "type" : "number", + "format" : "float" + }, + "filterInvalid" : { + "type" : "integer" + }, + "filterColumn" : { + "type" : "integer" + }, + "filter" : { + "type" : "string" + }, + "udpEnabled" : { + "type" : "integer" + }, + "udpAddress" : { + "type" : "string" + }, + "udpPort" : { + "type" : "integer" + }, + "logFilename" : { + "type" : "string" + }, + "logEnabled" : { + "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" + }, + "scopeConfig" : { + "$ref" : "#/definitions/GLScope" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "DSCDemod" }; defs.DSDDemodReport = { "properties" : { @@ -7099,6 +7190,15 @@ margin-bottom: 20px; "type" : "integer", "description" : "(0 Az/El, 1 X/Y 85, 2 X/Y 30)" }, + "inputController" : { + "type" : "string", + "description" : "Name of input controller" + }, + "inputSensitivity" : { + "type" : "number", + "format" : "float", + "description" : "Input controller sensitivity" + }, "title" : { "type" : "string" }, @@ -13232,6 +13332,14 @@ margin-bottom: 20px; "type" : "integer", "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" }, + "targetAzimuth" : { + "type" : "number", + "format" : "float" + }, + "targetElevation" : { + "type" : "number", + "format" : "float" + }, "satelliteState" : { "type" : "array", "items" : { @@ -13369,6 +13477,14 @@ margin-bottom: 20px; "$ref" : "#/definitions/SatelliteDeviceSettingsList" } }, + "azimuthOffset" : { + "type" : "number", + "format" : "float" + }, + "elevationOffset" : { + "type" : "number", + "format" : "float" + }, "title" : { "type" : "string" }, @@ -57571,7 +57687,7 @@ except ApiException as e:
- Generated 2023-04-22T13:14:49.587+02:00 + Generated 2023-06-08T05:18:29.115+02:00
diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml index 0b271a67d..65aadcd56 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml @@ -35,6 +35,8 @@ ChannelReport: $ref: "/doc/swagger/include/DATVMod.yaml#/DATVModReport" DOA2Report: $ref: "/doc/swagger/include/DOA2.yaml#/DOA2Report" + DSCDemodReport: + $ref: "/doc/swagger/include/DSCDemod.yaml#/DSCDemodReport" DSDDemodReport: $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodReport" IEEE_802_15_4_ModReport: diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml index d95d70a94..6f608bc56 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml @@ -51,6 +51,8 @@ ChannelSettings: $ref: "/doc/swagger/include/DABDemod.yaml#/DABDemodSettings" DOA2Settings: $ref: "/doc/swagger/include/DOA2.yaml#/DOA2Settings" + DSCDemodSettings: + $ref: "/doc/swagger/include/DSCDemod.yaml#/DSCDemodSettings" DSDDemodSettings: $ref: "/doc/swagger/include/DSDDemod.yaml#/DSDDemodSettings" FileSinkSettings: diff --git a/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml new file mode 100644 index 000000000..ce6605a2f --- /dev/null +++ b/sdrbase/resources/webapi/doc/swagger/include/DSCDemod.yaml @@ -0,0 +1,59 @@ +DSCDemodSettings: + description: DSCDemod + properties: + inputFrequencyOffset: + type: integer + format: int64 + rfBandwidth: + type: number + format: float + filterInvalid: + type: integer + filterColumn: + type: integer + filter: + type: string + udpEnabled: + type: integer + udpAddress: + type: string + udpPort: + type: integer + logFilename: + type: string + logEnabled: + 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 + scopeConfig: + $ref: "/doc/swagger/include/GLScope.yaml#/GLScope" + channelMarker: + $ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker" + rollupState: + $ref: "/doc/swagger/include/RollupState.yaml#/RollupState" + +DSCDemodReport: + description: DSCDemod + properties: + channelPowerDB: + description: power transmitted in channel (dB) + type: number + format: float + channelSampleRate: + type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml index 4512c9d78..746da8aff 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml @@ -58,6 +58,13 @@ GS232ControllerSettings: coordinates: description: (0 Az/El, 1 X/Y 85, 2 X/Y 30) type: integer + inputController: + description: Name of input controller + type: string + inputSensitivity: + description: Input controller sensitivity + type: number + format: float title: type: string rgbColor: diff --git a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml index 83f67f040..1317c111f 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml @@ -97,6 +97,12 @@ SatelliteTrackerSettings: type: array items: $ref: "/doc/swagger/include/SatelliteTracker.yaml#/SatelliteDeviceSettingsList" + azimuthOffset: + type: number + format: float + elevationOffset: + type: number + format: float title: type: string rgbColor: @@ -179,6 +185,12 @@ SatelliteTrackerReport: * 1 - idle * 2 - running * 3 - error + targetAzimuth: + type: number + format: float + targetElevation: + type: number + format: float satelliteState: type: array items: diff --git a/swagger/sdrangel/api/swagger/include/DSCDemod.yaml b/swagger/sdrangel/api/swagger/include/DSCDemod.yaml new file mode 100644 index 000000000..ec7724654 --- /dev/null +++ b/swagger/sdrangel/api/swagger/include/DSCDemod.yaml @@ -0,0 +1,59 @@ +DSCDemodSettings: + description: DSCDemod + properties: + inputFrequencyOffset: + type: integer + format: int64 + rfBandwidth: + type: number + format: float + filterInvalid: + type: integer + filterColumn: + type: integer + filter: + type: string + udpEnabled: + type: integer + udpAddress: + type: string + udpPort: + type: integer + logFilename: + type: string + logEnabled: + 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 + scopeConfig: + $ref: "http://swgserver:8081/api/swagger/include/GLScope.yaml#/GLScope" + channelMarker: + $ref: "http://swgserver:8081/api/swagger/include/ChannelMarker.yaml#/ChannelMarker" + rollupState: + $ref: "http://swgserver:8081/api/swagger/include/RollupState.yaml#/RollupState" + +DSCDemodReport: + description: DSCDemod + properties: + channelPowerDB: + description: power transmitted in channel (dB) + type: number + format: float + channelSampleRate: + type: integer diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index ad20c5244..8f4279c4b 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -3588,6 +3588,9 @@ margin-bottom: 20px; "DOA2Report" : { "$ref" : "#/definitions/DOA2Report" }, + "DSCDemodReport" : { + "$ref" : "#/definitions/DSCDemodReport" + }, "DSDDemodReport" : { "$ref" : "#/definitions/DSDDemodReport" }, @@ -3758,6 +3761,9 @@ margin-bottom: 20px; "DOA2Settings" : { "$ref" : "#/definitions/DOA2Settings" }, + "DSCDemodSettings" : { + "$ref" : "#/definitions/DSCDemodSettings" + }, "DSDDemodSettings" : { "$ref" : "#/definitions/DSDDemodSettings" }, @@ -4856,6 +4862,91 @@ margin-bottom: 20px; } }, "description" : "DOA2" +}; + defs.DSCDemodReport = { + "properties" : { + "channelPowerDB" : { + "type" : "number", + "format" : "float", + "description" : "power transmitted in channel (dB)" + }, + "channelSampleRate" : { + "type" : "integer" + } + }, + "description" : "DSCDemod" +}; + defs.DSCDemodSettings = { + "properties" : { + "inputFrequencyOffset" : { + "type" : "integer", + "format" : "int64" + }, + "rfBandwidth" : { + "type" : "number", + "format" : "float" + }, + "filterInvalid" : { + "type" : "integer" + }, + "filterColumn" : { + "type" : "integer" + }, + "filter" : { + "type" : "string" + }, + "udpEnabled" : { + "type" : "integer" + }, + "udpAddress" : { + "type" : "string" + }, + "udpPort" : { + "type" : "integer" + }, + "logFilename" : { + "type" : "string" + }, + "logEnabled" : { + "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" + }, + "scopeConfig" : { + "$ref" : "#/definitions/GLScope" + }, + "channelMarker" : { + "$ref" : "#/definitions/ChannelMarker" + }, + "rollupState" : { + "$ref" : "#/definitions/RollupState" + } + }, + "description" : "DSCDemod" }; defs.DSDDemodReport = { "properties" : { @@ -7099,6 +7190,15 @@ margin-bottom: 20px; "type" : "integer", "description" : "(0 Az/El, 1 X/Y 85, 2 X/Y 30)" }, + "inputController" : { + "type" : "string", + "description" : "Name of input controller" + }, + "inputSensitivity" : { + "type" : "number", + "format" : "float", + "description" : "Input controller sensitivity" + }, "title" : { "type" : "string" }, @@ -13232,6 +13332,14 @@ margin-bottom: 20px; "type" : "integer", "description" : "Running state\n * 0 - not started\n * 1 - idle\n * 2 - running\n * 3 - error\n" }, + "targetAzimuth" : { + "type" : "number", + "format" : "float" + }, + "targetElevation" : { + "type" : "number", + "format" : "float" + }, "satelliteState" : { "type" : "array", "items" : { @@ -13369,6 +13477,14 @@ margin-bottom: 20px; "$ref" : "#/definitions/SatelliteDeviceSettingsList" } }, + "azimuthOffset" : { + "type" : "number", + "format" : "float" + }, + "elevationOffset" : { + "type" : "number", + "format" : "float" + }, "title" : { "type" : "string" }, @@ -57571,7 +57687,7 @@ except ApiException as e:
- Generated 2023-04-22T13:14:49.587+02:00 + Generated 2023-06-08T05:18:29.115+02:00