LimeSDR MIMO: REST API

pull/714/head
f4exb 2020-11-10 22:55:36 +01:00
rodzic f1544852b9
commit 475ee68667
12 zmienionych plików z 2633 dodań i 3 usunięć

Wyświetl plik

@ -3633,6 +3633,9 @@ margin-bottom: 20px;
"limeSdrOutputSettings" : {
"$ref" : "#/definitions/LimeSdrOutputSettings"
},
"limeSdrMIMOSettings" : {
"$ref" : "#/definitions/LimeSdrMIMOSettings"
},
"localInputSettings" : {
"$ref" : "#/definitions/LocalInputSettings"
},
@ -5458,6 +5461,229 @@ margin-bottom: 20px;
}
},
"description" : "LimeSDR"
};
defs.LimeSdrMIMOSettings = {
"properties" : {
"devSampleRate" : {
"type" : "integer"
},
"gpioDir" : {
"type" : "integer",
"format" : "int8",
"description" : "GPIO pin direction LSB first; 0 input, 1 output"
},
"gpioPins" : {
"type" : "integer",
"format" : "int8",
"description" : "GPIO pins to write; LSB first"
},
"extClock" : {
"type" : "integer",
"description" : "Boolean 1 if external clock source else 0"
},
"extClockFreq" : {
"type" : "integer",
"description" : "Frequency (Hz) of external clock source"
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Boolean"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"rxCenterFrequency" : {
"type" : "integer",
"format" : "int64"
},
"log2HardDecim" : {
"type" : "integer"
},
"log2SoftDecim" : {
"type" : "integer"
},
"dcBlock" : {
"type" : "integer",
"description" : "Boolean"
},
"iqCorrection" : {
"type" : "integer",
"description" : "Boolean"
},
"rxTransverterMode" : {
"type" : "integer",
"description" : "Boolean"
},
"rxTransverterDeltaFrequency" : {
"type" : "integer",
"format" : "int64"
},
"iqOrder" : {
"type" : "integer",
"description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n"
},
"ncoEnableRx" : {
"type" : "integer",
"description" : "Boolean 1 to enable TSP NCO and mixing else 0"
},
"ncoFrequencyRx" : {
"type" : "integer",
"description" : "Rx Actual NCO frequency (the resulting frequency with mixing is displayed)"
},
"lpfBWRx0" : {
"type" : "number",
"format" : "float",
"description" : "Rx[0] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableRx0" : {
"type" : "integer",
"description" : "Boolean 1 to enable Rx[0] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWRx0" : {
"type" : "number",
"format" : "float",
"description" : "Rx[0] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainRx0" : {
"type" : "integer",
"description" : "Rx[0] Optimally distributed gain (dB)"
},
"antennaPathRx0" : {
"type" : "integer",
"description" : "Rx[0] Antenna connection (PathRxRFE):\n * 0 - None\n * 1 - LNA High\n * 2 - LNA low\n * 3 - LNA Wide\n * 4 - LB TX1\n * 5 - LB TX2\n"
},
"gainModeRx0" : {
"type" : "integer",
"description" : "Rx[0] Gain mode:\n * 0 - auto\n * 1 - manual\n"
},
"lnaGainRx0" : {
"type" : "integer",
"description" : "Rx[0] Manual LNA gain"
},
"tiaGainRx0" : {
"type" : "integer",
"description" : "Rx[0] Manual TIA gain"
},
"pgaGainRx0" : {
"type" : "integer",
"description" : "Rx[0] Manual PGA gain"
},
"lpfBWRx1" : {
"type" : "number",
"format" : "float",
"description" : "Rx[1] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableRx1" : {
"type" : "integer",
"description" : "Boolean 1 to enable Rx[1] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWRx1" : {
"type" : "number",
"format" : "float",
"description" : "Rx[1] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainRx1" : {
"type" : "integer",
"description" : "Rx[1] Optimally distributed gain (dB)"
},
"antennaPathRx1" : {
"type" : "integer",
"description" : "Rx[1] Antenna connection (PathRxRFE):\n * 0 - None\n * 1 - LNA High\n * 2 - LNA low\n * 3 - LNA Wide\n * 4 - LB TX1\n * 5 - LB TX2\n"
},
"gainModeRx1" : {
"type" : "integer",
"description" : "Rx[1] Gain mode:\n * 0 - auto\n * 1 - manual\n"
},
"lnaGainRx1" : {
"type" : "integer",
"description" : "Rx[1] Manual LNA gain"
},
"tiaGainRx1" : {
"type" : "integer",
"description" : "Rx[1] Manual TIA gain"
},
"pgaGainRx1" : {
"type" : "integer",
"description" : "Rx[1] Manual PGA gain"
},
"txCenterFrequency" : {
"type" : "integer",
"format" : "int64"
},
"log2HardInterp" : {
"type" : "integer"
},
"log2SoftInterp" : {
"type" : "integer"
},
"txTransverterMode" : {
"type" : "integer",
"description" : "Boolean"
},
"txTransverterDeltaFrequency" : {
"type" : "integer",
"format" : "int64"
},
"ncoEnableTx" : {
"type" : "integer",
"description" : "Boolean 1 to enable TSP NCO and mixing else 0"
},
"ncoFrequencyTx" : {
"type" : "integer",
"description" : "Tx Actual NCO frequency (the resulting frequency with mixing is displayed)"
},
"lpfBWTx0" : {
"type" : "number",
"format" : "float",
"description" : "Tx[0] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableTx0" : {
"type" : "integer",
"description" : "Boolean 1 to enable Tx[0] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWTx0" : {
"type" : "number",
"format" : "float",
"description" : "Tx[0] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainTx0" : {
"type" : "integer",
"description" : "Tx[0] Optimally distributed gain (dB)"
},
"antennaPathTx0" : {
"type" : "integer",
"description" : "Tx[0] Antenna connection (PathTxRFE):\n * 0 - None\n * 1 - RF connector 1\n * 2 - RF connector 2\n"
},
"lpfBWTx1" : {
"type" : "number",
"format" : "float",
"description" : "Tx[1] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableTx1" : {
"type" : "integer",
"description" : "Boolean 1 to enable Tx[1] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWTx1" : {
"type" : "number",
"format" : "float",
"description" : "Tx[1] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainTx1" : {
"type" : "integer",
"description" : "Tx[1] Optimally distributed gain (dB)"
},
"antennaPathTx1" : {
"type" : "integer",
"description" : "Tx[1] Antenna connection (PathTxRFE):\n * 0 - None\n * 1 - RF connector 1\n * 2 - RF connector 2\n"
}
},
"description" : "LimeSDR"
};
defs.LimeSdrOutputReport = {
"properties" : {
@ -41149,7 +41375,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2020-11-10T21:31:22.328+01:00
Generated 2020-11-10T22:27:11.499+01:00
</div>
</div>
</div>

Wyświetl plik

@ -46,6 +46,8 @@ DeviceSettings:
$ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings"
limeSdrOutputSettings:
$ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings"
limeSdrMIMOSettings:
$ref: "/doc/swagger/include/LimeSdr.yaml#/LimeSdrMIMOSettings"
localInputSettings:
$ref: "/doc/swagger/include/LocalInput.yaml#/LocalInputSettings"
localOutputSettings:

Wyświetl plik

@ -118,6 +118,213 @@ LimeSdrOutputSettings:
reverseAPIDeviceIndex:
type: integer
LimeSdrMIMOSettings:
description: LimeSDR
properties:
# General
devSampleRate:
type: integer
gpioDir:
description: GPIO pin direction LSB first; 0 input, 1 output
type: integer
format: int8
gpioPins:
description: GPIO pins to write; LSB first
type: integer
format: int8
extClock:
description: Boolean 1 if external clock source else 0
type: integer
extClockFreq:
description: Frequency (Hz) of external clock source
type: integer
useReverseAPI:
description: Boolean
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer
# Rx general
rxCenterFrequency:
type: integer
format: int64
log2HardDecim:
type: integer
log2SoftDecim:
type: integer
dcBlock:
description: Boolean
type: integer
iqCorrection:
description: Boolean
type: integer
rxTransverterMode:
description: Boolean
type: integer
rxTransverterDeltaFrequency:
type: integer
format: int64
iqOrder:
type: integer
description: >
IQ samples order
* 0 - Q then I (swapped)
* 1 - I then Q (straight)
ncoEnableRx:
description: Boolean 1 to enable TSP NCO and mixing else 0
type: integer
ncoFrequencyRx:
description: Rx Actual NCO frequency (the resulting frequency with mixing is displayed)
type: integer
# Rx channel 0
lpfBWRx0:
description: Rx[0] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableRx0:
description: Boolean 1 to enable Rx[0] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWRx0:
description: Rx[0] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainRx0:
description: Rx[0] Optimally distributed gain (dB)
type: integer
antennaPathRx0:
description: >
Rx[0] Antenna connection (PathRxRFE):
* 0 - None
* 1 - LNA High
* 2 - LNA low
* 3 - LNA Wide
* 4 - LB TX1
* 5 - LB TX2
type: integer
gainModeRx0:
description: >
Rx[0] Gain mode:
* 0 - auto
* 1 - manual
type: integer
lnaGainRx0:
description: Rx[0] Manual LNA gain
type: integer
tiaGainRx0:
description: Rx[0] Manual TIA gain
type: integer
pgaGainRx0:
description: Rx[0] Manual PGA gain
type: integer
# Rx channel 1
lpfBWRx1:
description: Rx[1] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableRx1:
description: Boolean 1 to enable Rx[1] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWRx1:
description: Rx[1] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainRx1:
description: Rx[1] Optimally distributed gain (dB)
type: integer
antennaPathRx1:
description: >
Rx[1] Antenna connection (PathRxRFE):
* 0 - None
* 1 - LNA High
* 2 - LNA low
* 3 - LNA Wide
* 4 - LB TX1
* 5 - LB TX2
type: integer
gainModeRx1:
description: >
Rx[1] Gain mode:
* 0 - auto
* 1 - manual
type: integer
lnaGainRx1:
description: Rx[1] Manual LNA gain
type: integer
tiaGainRx1:
description: Rx[1] Manual TIA gain
type: integer
pgaGainRx1:
description: Rx[1] Manual PGA gain
type: integer
# Tx general
txCenterFrequency:
type: integer
format: int64
log2HardInterp:
type: integer
log2SoftInterp:
type: integer
txTransverterMode:
description: Boolean
type: integer
txTransverterDeltaFrequency:
type: integer
format: int64
ncoEnableTx:
description: Boolean 1 to enable TSP NCO and mixing else 0
type: integer
ncoFrequencyTx:
description: Tx Actual NCO frequency (the resulting frequency with mixing is displayed)
type: integer
# Tx channel 0
lpfBWTx0:
description: Tx[0] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableTx0:
description: Boolean 1 to enable Tx[0] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWTx0:
description: Tx[0] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainTx0:
description: Tx[0] Optimally distributed gain (dB)
type: integer
antennaPathTx0:
description: >
Tx[0] Antenna connection (PathTxRFE):
* 0 - None
* 1 - RF connector 1
* 2 - RF connector 2
type: integer
# Tx channel 1
lpfBWTx1:
description: Tx[1] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableTx1:
description: Boolean 1 to enable Tx[1] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWTx1:
description: Tx[1] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainTx1:
description: Tx[1] Optimally distributed gain (dB)
type: integer
antennaPathTx1:
description: >
Tx[1] Antenna connection (PathTxRFE):
* 0 - None
* 1 - RF connector 1
* 2 - RF connector 2
type: integer
LimeSdrInputReport:
description: LimeSDR
properties:

Wyświetl plik

@ -3835,11 +3835,20 @@ bool WebAPIRequestMapper::getDeviceSettings(
deviceSettings->setBladeRf2InputSettings(new SWGSDRangel::SWGBladeRF2InputSettings());
deviceSettings->getBladeRf2InputSettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "bladeRF2InputSettings")
else if (deviceSettingsKey == "bladeRF2OutputSettings")
{
deviceSettings->setBladeRf2OutputSettings(new SWGSDRangel::SWGBladeRF2OutputSettings());
deviceSettings->getBladeRf2OutputSettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "bladeRF2MIMOSettings")
{
if (deviceSettingsKeys.contains("streams") && settingsJsonObject["streams"].isArray()) {
appendSettingsArrayKeys(settingsJsonObject, "streams", deviceSettingsKeys);
}
deviceSettings->setBladeRf2MimoSettings(new SWGSDRangel::SWGBladeRF2MIMOSettings());
deviceSettings->getBladeRf2MimoSettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "fcdProSettings")
{
deviceSettings->setFcdProSettings(new SWGSDRangel::SWGFCDProSettings());
@ -3880,6 +3889,15 @@ bool WebAPIRequestMapper::getDeviceSettings(
deviceSettings->setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
deviceSettings->getLimeSdrOutputSettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "limeSdrMIMOSettings")
{
if (deviceSettingsKeys.contains("streams") && settingsJsonObject["streams"].isArray()) {
appendSettingsArrayKeys(settingsJsonObject, "streams", deviceSettingsKeys);
}
deviceSettings->setLimeSdrMimoSettings(new SWGSDRangel::SWGLimeSdrMIMOSettings());
deviceSettings->getLimeSdrMimoSettings()->fromJsonObject(settingsJsonObject);
}
else if (deviceSettingsKey == "perseusSettings")
{
deviceSettings->setPerseusSettings(new SWGSDRangel::SWGPerseusSettings());

Wyświetl plik

@ -46,6 +46,8 @@ DeviceSettings:
$ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrInputSettings"
limeSdrOutputSettings:
$ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrOutputSettings"
limeSdrMIMOSettings:
$ref: "http://swgserver:8081/api/swagger/include/LimeSdr.yaml#/LimeSdrMIMOSettings"
localInputSettings:
$ref: "http://swgserver:8081/api/swagger/include/LocalInput.yaml#/LocalInputSettings"
localOutputSettings:

Wyświetl plik

@ -118,6 +118,213 @@ LimeSdrOutputSettings:
reverseAPIDeviceIndex:
type: integer
LimeSdrMIMOSettings:
description: LimeSDR
properties:
# General
devSampleRate:
type: integer
gpioDir:
description: GPIO pin direction LSB first; 0 input, 1 output
type: integer
format: int8
gpioPins:
description: GPIO pins to write; LSB first
type: integer
format: int8
extClock:
description: Boolean 1 if external clock source else 0
type: integer
extClockFreq:
description: Frequency (Hz) of external clock source
type: integer
useReverseAPI:
description: Boolean
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer
# Rx general
rxCenterFrequency:
type: integer
format: int64
log2HardDecim:
type: integer
log2SoftDecim:
type: integer
dcBlock:
description: Boolean
type: integer
iqCorrection:
description: Boolean
type: integer
rxTransverterMode:
description: Boolean
type: integer
rxTransverterDeltaFrequency:
type: integer
format: int64
iqOrder:
type: integer
description: >
IQ samples order
* 0 - Q then I (swapped)
* 1 - I then Q (straight)
ncoEnableRx:
description: Boolean 1 to enable TSP NCO and mixing else 0
type: integer
ncoFrequencyRx:
description: Rx Actual NCO frequency (the resulting frequency with mixing is displayed)
type: integer
# Rx channel 0
lpfBWRx0:
description: Rx[0] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableRx0:
description: Boolean 1 to enable Rx[0] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWRx0:
description: Rx[0] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainRx0:
description: Rx[0] Optimally distributed gain (dB)
type: integer
antennaPathRx0:
description: >
Rx[0] Antenna connection (PathRxRFE):
* 0 - None
* 1 - LNA High
* 2 - LNA low
* 3 - LNA Wide
* 4 - LB TX1
* 5 - LB TX2
type: integer
gainModeRx0:
description: >
Rx[0] Gain mode:
* 0 - auto
* 1 - manual
type: integer
lnaGainRx0:
description: Rx[0] Manual LNA gain
type: integer
tiaGainRx0:
description: Rx[0] Manual TIA gain
type: integer
pgaGainRx0:
description: Rx[0] Manual PGA gain
type: integer
# Rx channel 1
lpfBWRx1:
description: Rx[1] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableRx1:
description: Boolean 1 to enable Rx[1] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWRx1:
description: Rx[1] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainRx1:
description: Rx[1] Optimally distributed gain (dB)
type: integer
antennaPathRx1:
description: >
Rx[1] Antenna connection (PathRxRFE):
* 0 - None
* 1 - LNA High
* 2 - LNA low
* 3 - LNA Wide
* 4 - LB TX1
* 5 - LB TX2
type: integer
gainModeRx1:
description: >
Rx[1] Gain mode:
* 0 - auto
* 1 - manual
type: integer
lnaGainRx1:
description: Rx[1] Manual LNA gain
type: integer
tiaGainRx1:
description: Rx[1] Manual TIA gain
type: integer
pgaGainRx1:
description: Rx[1] Manual PGA gain
type: integer
# Tx general
txCenterFrequency:
type: integer
format: int64
log2HardInterp:
type: integer
log2SoftInterp:
type: integer
txTransverterMode:
description: Boolean
type: integer
txTransverterDeltaFrequency:
type: integer
format: int64
ncoEnableTx:
description: Boolean 1 to enable TSP NCO and mixing else 0
type: integer
ncoFrequencyTx:
description: Tx Actual NCO frequency (the resulting frequency with mixing is displayed)
type: integer
# Tx channel 0
lpfBWTx0:
description: Tx[0] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableTx0:
description: Boolean 1 to enable Tx[0] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWTx0:
description: Tx[0] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainTx0:
description: Tx[0] Optimally distributed gain (dB)
type: integer
antennaPathTx0:
description: >
Tx[0] Antenna connection (PathTxRFE):
* 0 - None
* 1 - RF connector 1
* 2 - RF connector 2
type: integer
# Tx channel 1
lpfBWTx1:
description: Tx[1] LMS analog lowpass filter bandwidth (Hz)
type: number
format: float
lpfFIREnableTx1:
description: Boolean 1 to enable Tx[1] LMS digital lowpass FIR filters else 0
type: integer
lpfFIRBWTx1:
description: Tx[1] LMS digital lowpass FIR filters bandwidth (Hz)
type: number
format: float
gainTx1:
description: Tx[1] Optimally distributed gain (dB)
type: integer
antennaPathTx1:
description: >
Tx[1] Antenna connection (PathTxRFE):
* 0 - None
* 1 - RF connector 1
* 2 - RF connector 2
type: integer
LimeSdrInputReport:
description: LimeSDR
properties:

Wyświetl plik

@ -3633,6 +3633,9 @@ margin-bottom: 20px;
"limeSdrOutputSettings" : {
"$ref" : "#/definitions/LimeSdrOutputSettings"
},
"limeSdrMIMOSettings" : {
"$ref" : "#/definitions/LimeSdrMIMOSettings"
},
"localInputSettings" : {
"$ref" : "#/definitions/LocalInputSettings"
},
@ -5458,6 +5461,229 @@ margin-bottom: 20px;
}
},
"description" : "LimeSDR"
};
defs.LimeSdrMIMOSettings = {
"properties" : {
"devSampleRate" : {
"type" : "integer"
},
"gpioDir" : {
"type" : "integer",
"format" : "int8",
"description" : "GPIO pin direction LSB first; 0 input, 1 output"
},
"gpioPins" : {
"type" : "integer",
"format" : "int8",
"description" : "GPIO pins to write; LSB first"
},
"extClock" : {
"type" : "integer",
"description" : "Boolean 1 if external clock source else 0"
},
"extClockFreq" : {
"type" : "integer",
"description" : "Frequency (Hz) of external clock source"
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Boolean"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"rxCenterFrequency" : {
"type" : "integer",
"format" : "int64"
},
"log2HardDecim" : {
"type" : "integer"
},
"log2SoftDecim" : {
"type" : "integer"
},
"dcBlock" : {
"type" : "integer",
"description" : "Boolean"
},
"iqCorrection" : {
"type" : "integer",
"description" : "Boolean"
},
"rxTransverterMode" : {
"type" : "integer",
"description" : "Boolean"
},
"rxTransverterDeltaFrequency" : {
"type" : "integer",
"format" : "int64"
},
"iqOrder" : {
"type" : "integer",
"description" : "IQ samples order\n * 0 - Q then I (swapped)\n * 1 - I then Q (straight)\n"
},
"ncoEnableRx" : {
"type" : "integer",
"description" : "Boolean 1 to enable TSP NCO and mixing else 0"
},
"ncoFrequencyRx" : {
"type" : "integer",
"description" : "Rx Actual NCO frequency (the resulting frequency with mixing is displayed)"
},
"lpfBWRx0" : {
"type" : "number",
"format" : "float",
"description" : "Rx[0] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableRx0" : {
"type" : "integer",
"description" : "Boolean 1 to enable Rx[0] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWRx0" : {
"type" : "number",
"format" : "float",
"description" : "Rx[0] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainRx0" : {
"type" : "integer",
"description" : "Rx[0] Optimally distributed gain (dB)"
},
"antennaPathRx0" : {
"type" : "integer",
"description" : "Rx[0] Antenna connection (PathRxRFE):\n * 0 - None\n * 1 - LNA High\n * 2 - LNA low\n * 3 - LNA Wide\n * 4 - LB TX1\n * 5 - LB TX2\n"
},
"gainModeRx0" : {
"type" : "integer",
"description" : "Rx[0] Gain mode:\n * 0 - auto\n * 1 - manual\n"
},
"lnaGainRx0" : {
"type" : "integer",
"description" : "Rx[0] Manual LNA gain"
},
"tiaGainRx0" : {
"type" : "integer",
"description" : "Rx[0] Manual TIA gain"
},
"pgaGainRx0" : {
"type" : "integer",
"description" : "Rx[0] Manual PGA gain"
},
"lpfBWRx1" : {
"type" : "number",
"format" : "float",
"description" : "Rx[1] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableRx1" : {
"type" : "integer",
"description" : "Boolean 1 to enable Rx[1] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWRx1" : {
"type" : "number",
"format" : "float",
"description" : "Rx[1] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainRx1" : {
"type" : "integer",
"description" : "Rx[1] Optimally distributed gain (dB)"
},
"antennaPathRx1" : {
"type" : "integer",
"description" : "Rx[1] Antenna connection (PathRxRFE):\n * 0 - None\n * 1 - LNA High\n * 2 - LNA low\n * 3 - LNA Wide\n * 4 - LB TX1\n * 5 - LB TX2\n"
},
"gainModeRx1" : {
"type" : "integer",
"description" : "Rx[1] Gain mode:\n * 0 - auto\n * 1 - manual\n"
},
"lnaGainRx1" : {
"type" : "integer",
"description" : "Rx[1] Manual LNA gain"
},
"tiaGainRx1" : {
"type" : "integer",
"description" : "Rx[1] Manual TIA gain"
},
"pgaGainRx1" : {
"type" : "integer",
"description" : "Rx[1] Manual PGA gain"
},
"txCenterFrequency" : {
"type" : "integer",
"format" : "int64"
},
"log2HardInterp" : {
"type" : "integer"
},
"log2SoftInterp" : {
"type" : "integer"
},
"txTransverterMode" : {
"type" : "integer",
"description" : "Boolean"
},
"txTransverterDeltaFrequency" : {
"type" : "integer",
"format" : "int64"
},
"ncoEnableTx" : {
"type" : "integer",
"description" : "Boolean 1 to enable TSP NCO and mixing else 0"
},
"ncoFrequencyTx" : {
"type" : "integer",
"description" : "Tx Actual NCO frequency (the resulting frequency with mixing is displayed)"
},
"lpfBWTx0" : {
"type" : "number",
"format" : "float",
"description" : "Tx[0] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableTx0" : {
"type" : "integer",
"description" : "Boolean 1 to enable Tx[0] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWTx0" : {
"type" : "number",
"format" : "float",
"description" : "Tx[0] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainTx0" : {
"type" : "integer",
"description" : "Tx[0] Optimally distributed gain (dB)"
},
"antennaPathTx0" : {
"type" : "integer",
"description" : "Tx[0] Antenna connection (PathTxRFE):\n * 0 - None\n * 1 - RF connector 1\n * 2 - RF connector 2\n"
},
"lpfBWTx1" : {
"type" : "number",
"format" : "float",
"description" : "Tx[1] LMS analog lowpass filter bandwidth (Hz)"
},
"lpfFIREnableTx1" : {
"type" : "integer",
"description" : "Boolean 1 to enable Tx[1] LMS digital lowpass FIR filters else 0"
},
"lpfFIRBWTx1" : {
"type" : "number",
"format" : "float",
"description" : "Tx[1] LMS digital lowpass FIR filters bandwidth (Hz)"
},
"gainTx1" : {
"type" : "integer",
"description" : "Tx[1] Optimally distributed gain (dB)"
},
"antennaPathTx1" : {
"type" : "integer",
"description" : "Tx[1] Antenna connection (PathTxRFE):\n * 0 - None\n * 1 - RF connector 1\n * 2 - RF connector 2\n"
}
},
"description" : "LimeSDR"
};
defs.LimeSdrOutputReport = {
"properties" : {
@ -41149,7 +41375,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2020-11-10T21:31:22.328+01:00
Generated 2020-11-10T22:27:11.499+01:00
</div>
</div>
</div>

Wyświetl plik

@ -66,6 +66,8 @@ SWGDeviceSettings::SWGDeviceSettings() {
m_lime_sdr_input_settings_isSet = false;
lime_sdr_output_settings = nullptr;
m_lime_sdr_output_settings_isSet = false;
lime_sdr_mimo_settings = nullptr;
m_lime_sdr_mimo_settings_isSet = false;
local_input_settings = nullptr;
m_local_input_settings_isSet = false;
local_output_settings = nullptr;
@ -150,6 +152,8 @@ SWGDeviceSettings::init() {
m_lime_sdr_input_settings_isSet = false;
lime_sdr_output_settings = new SWGLimeSdrOutputSettings();
m_lime_sdr_output_settings_isSet = false;
lime_sdr_mimo_settings = new SWGLimeSdrMIMOSettings();
m_lime_sdr_mimo_settings_isSet = false;
local_input_settings = new SWGLocalInputSettings();
m_local_input_settings_isSet = false;
local_output_settings = new SWGLocalOutputSettings();
@ -245,6 +249,9 @@ SWGDeviceSettings::cleanup() {
if(lime_sdr_output_settings != nullptr) {
delete lime_sdr_output_settings;
}
if(lime_sdr_mimo_settings != nullptr) {
delete lime_sdr_mimo_settings;
}
if(local_input_settings != nullptr) {
delete local_input_settings;
}
@ -353,6 +360,8 @@ SWGDeviceSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&lime_sdr_output_settings, pJson["limeSdrOutputSettings"], "SWGLimeSdrOutputSettings", "SWGLimeSdrOutputSettings");
::SWGSDRangel::setValue(&lime_sdr_mimo_settings, pJson["limeSdrMIMOSettings"], "SWGLimeSdrMIMOSettings", "SWGLimeSdrMIMOSettings");
::SWGSDRangel::setValue(&local_input_settings, pJson["localInputSettings"], "SWGLocalInputSettings", "SWGLocalInputSettings");
::SWGSDRangel::setValue(&local_output_settings, pJson["localOutputSettings"], "SWGLocalOutputSettings", "SWGLocalOutputSettings");
@ -464,6 +473,9 @@ SWGDeviceSettings::asJsonObject() {
if((lime_sdr_output_settings != nullptr) && (lime_sdr_output_settings->isSet())){
toJsonValue(QString("limeSdrOutputSettings"), lime_sdr_output_settings, obj, QString("SWGLimeSdrOutputSettings"));
}
if((lime_sdr_mimo_settings != nullptr) && (lime_sdr_mimo_settings->isSet())){
toJsonValue(QString("limeSdrMIMOSettings"), lime_sdr_mimo_settings, obj, QString("SWGLimeSdrMIMOSettings"));
}
if((local_input_settings != nullptr) && (local_input_settings->isSet())){
toJsonValue(QString("localInputSettings"), local_input_settings, obj, QString("SWGLocalInputSettings"));
}
@ -715,6 +727,16 @@ SWGDeviceSettings::setLimeSdrOutputSettings(SWGLimeSdrOutputSettings* lime_sdr_o
this->m_lime_sdr_output_settings_isSet = true;
}
SWGLimeSdrMIMOSettings*
SWGDeviceSettings::getLimeSdrMimoSettings() {
return lime_sdr_mimo_settings;
}
void
SWGDeviceSettings::setLimeSdrMimoSettings(SWGLimeSdrMIMOSettings* lime_sdr_mimo_settings) {
this->lime_sdr_mimo_settings = lime_sdr_mimo_settings;
this->m_lime_sdr_mimo_settings_isSet = true;
}
SWGLocalInputSettings*
SWGDeviceSettings::getLocalInputSettings() {
return local_input_settings;
@ -967,6 +989,9 @@ SWGDeviceSettings::isSet(){
if(lime_sdr_output_settings && lime_sdr_output_settings->isSet()){
isObjectUpdated = true; break;
}
if(lime_sdr_mimo_settings && lime_sdr_mimo_settings->isSet()){
isObjectUpdated = true; break;
}
if(local_input_settings && local_input_settings->isSet()){
isObjectUpdated = true; break;
}

Wyświetl plik

@ -37,6 +37,7 @@
#include "SWGHackRFOutputSettings.h"
#include "SWGKiwiSDRSettings.h"
#include "SWGLimeSdrInputSettings.h"
#include "SWGLimeSdrMIMOSettings.h"
#include "SWGLimeSdrOutputSettings.h"
#include "SWGLocalInputSettings.h"
#include "SWGLocalOutputSettings.h"
@ -134,6 +135,9 @@ public:
SWGLimeSdrOutputSettings* getLimeSdrOutputSettings();
void setLimeSdrOutputSettings(SWGLimeSdrOutputSettings* lime_sdr_output_settings);
SWGLimeSdrMIMOSettings* getLimeSdrMimoSettings();
void setLimeSdrMimoSettings(SWGLimeSdrMIMOSettings* lime_sdr_mimo_settings);
SWGLocalInputSettings* getLocalInputSettings();
void setLocalInputSettings(SWGLocalInputSettings* local_input_settings);
@ -252,6 +256,9 @@ private:
SWGLimeSdrOutputSettings* lime_sdr_output_settings;
bool m_lime_sdr_output_settings_isSet;
SWGLimeSdrMIMOSettings* lime_sdr_mimo_settings;
bool m_lime_sdr_mimo_settings_isSet;
SWGLocalInputSettings* local_input_settings;
bool m_local_input_settings_isSet;

Wyświetl plik

@ -0,0 +1,377 @@
/**
* SDRangel
* This is the web REST/JSON API of SDRangel SDR software. SDRangel is an Open Source Qt5/OpenGL 3.0+ (4.3+ in Windows) GUI and server Software Defined Radio and signal analyzer in software. It supports Airspy, BladeRF, HackRF, LimeSDR, PlutoSDR, RTL-SDR, SDRplay RSP1, USRP and FunCube --- Limitations and specifcities: * In SDRangel GUI the first Rx device set cannot be deleted. Conversely the server starts with no device sets and its number of device sets can be reduced to zero by as many calls as necessary to /sdrangel/deviceset with DELETE method. * Preset import and export from/to file is a server only feature. * Device set focus is a GUI only feature. * The following channels are not implemented (status 501 is returned): ATV and DATV demodulators, Channel Analyzer NG, LoRa demodulator * The device settings and report structures contains only the sub-structure corresponding to the device type. The DeviceSettings and DeviceReport structures documented here shows all of them but only one will be or should be present at a time * The channel settings and report structures contains only the sub-structure corresponding to the channel type. The ChannelSettings and ChannelReport structures documented here shows all of them but only one will be or should be present at a time ---
*
* OpenAPI spec version: 4.15.0
* Contact: f4exb06@gmail.com
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/*
* SWGLimeSdrMIMOSettings.h
*
* LimeSDR
*/
#ifndef SWGLimeSdrMIMOSettings_H_
#define SWGLimeSdrMIMOSettings_H_
#include <QJsonObject>
#include <QString>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGLimeSdrMIMOSettings: public SWGObject {
public:
SWGLimeSdrMIMOSettings();
SWGLimeSdrMIMOSettings(QString* json);
virtual ~SWGLimeSdrMIMOSettings();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGLimeSdrMIMOSettings* fromJson(QString &jsonString) override;
qint32 getDevSampleRate();
void setDevSampleRate(qint32 dev_sample_rate);
qint32 getGpioDir();
void setGpioDir(qint32 gpio_dir);
qint32 getGpioPins();
void setGpioPins(qint32 gpio_pins);
qint32 getExtClock();
void setExtClock(qint32 ext_clock);
qint32 getExtClockFreq();
void setExtClockFreq(qint32 ext_clock_freq);
qint32 getUseReverseApi();
void setUseReverseApi(qint32 use_reverse_api);
QString* getReverseApiAddress();
void setReverseApiAddress(QString* reverse_api_address);
qint32 getReverseApiPort();
void setReverseApiPort(qint32 reverse_api_port);
qint32 getReverseApiDeviceIndex();
void setReverseApiDeviceIndex(qint32 reverse_api_device_index);
qint64 getRxCenterFrequency();
void setRxCenterFrequency(qint64 rx_center_frequency);
qint32 getLog2HardDecim();
void setLog2HardDecim(qint32 log2_hard_decim);
qint32 getLog2SoftDecim();
void setLog2SoftDecim(qint32 log2_soft_decim);
qint32 getDcBlock();
void setDcBlock(qint32 dc_block);
qint32 getIqCorrection();
void setIqCorrection(qint32 iq_correction);
qint32 getRxTransverterMode();
void setRxTransverterMode(qint32 rx_transverter_mode);
qint64 getRxTransverterDeltaFrequency();
void setRxTransverterDeltaFrequency(qint64 rx_transverter_delta_frequency);
qint32 getIqOrder();
void setIqOrder(qint32 iq_order);
qint32 getNcoEnableRx();
void setNcoEnableRx(qint32 nco_enable_rx);
qint32 getNcoFrequencyRx();
void setNcoFrequencyRx(qint32 nco_frequency_rx);
float getLpfBwRx0();
void setLpfBwRx0(float lpf_bw_rx0);
qint32 getLpfFirEnableRx0();
void setLpfFirEnableRx0(qint32 lpf_fir_enable_rx0);
float getLpfFirbwRx0();
void setLpfFirbwRx0(float lpf_firbw_rx0);
qint32 getGainRx0();
void setGainRx0(qint32 gain_rx0);
qint32 getAntennaPathRx0();
void setAntennaPathRx0(qint32 antenna_path_rx0);
qint32 getGainModeRx0();
void setGainModeRx0(qint32 gain_mode_rx0);
qint32 getLnaGainRx0();
void setLnaGainRx0(qint32 lna_gain_rx0);
qint32 getTiaGainRx0();
void setTiaGainRx0(qint32 tia_gain_rx0);
qint32 getPgaGainRx0();
void setPgaGainRx0(qint32 pga_gain_rx0);
float getLpfBwRx1();
void setLpfBwRx1(float lpf_bw_rx1);
qint32 getLpfFirEnableRx1();
void setLpfFirEnableRx1(qint32 lpf_fir_enable_rx1);
float getLpfFirbwRx1();
void setLpfFirbwRx1(float lpf_firbw_rx1);
qint32 getGainRx1();
void setGainRx1(qint32 gain_rx1);
qint32 getAntennaPathRx1();
void setAntennaPathRx1(qint32 antenna_path_rx1);
qint32 getGainModeRx1();
void setGainModeRx1(qint32 gain_mode_rx1);
qint32 getLnaGainRx1();
void setLnaGainRx1(qint32 lna_gain_rx1);
qint32 getTiaGainRx1();
void setTiaGainRx1(qint32 tia_gain_rx1);
qint32 getPgaGainRx1();
void setPgaGainRx1(qint32 pga_gain_rx1);
qint64 getTxCenterFrequency();
void setTxCenterFrequency(qint64 tx_center_frequency);
qint32 getLog2HardInterp();
void setLog2HardInterp(qint32 log2_hard_interp);
qint32 getLog2SoftInterp();
void setLog2SoftInterp(qint32 log2_soft_interp);
qint32 getTxTransverterMode();
void setTxTransverterMode(qint32 tx_transverter_mode);
qint64 getTxTransverterDeltaFrequency();
void setTxTransverterDeltaFrequency(qint64 tx_transverter_delta_frequency);
qint32 getNcoEnableTx();
void setNcoEnableTx(qint32 nco_enable_tx);
qint32 getNcoFrequencyTx();
void setNcoFrequencyTx(qint32 nco_frequency_tx);
float getLpfBwTx0();
void setLpfBwTx0(float lpf_bw_tx0);
qint32 getLpfFirEnableTx0();
void setLpfFirEnableTx0(qint32 lpf_fir_enable_tx0);
float getLpfFirbwTx0();
void setLpfFirbwTx0(float lpf_firbw_tx0);
qint32 getGainTx0();
void setGainTx0(qint32 gain_tx0);
qint32 getAntennaPathTx0();
void setAntennaPathTx0(qint32 antenna_path_tx0);
float getLpfBwTx1();
void setLpfBwTx1(float lpf_bw_tx1);
qint32 getLpfFirEnableTx1();
void setLpfFirEnableTx1(qint32 lpf_fir_enable_tx1);
float getLpfFirbwTx1();
void setLpfFirbwTx1(float lpf_firbw_tx1);
qint32 getGainTx1();
void setGainTx1(qint32 gain_tx1);
qint32 getAntennaPathTx1();
void setAntennaPathTx1(qint32 antenna_path_tx1);
virtual bool isSet() override;
private:
qint32 dev_sample_rate;
bool m_dev_sample_rate_isSet;
qint32 gpio_dir;
bool m_gpio_dir_isSet;
qint32 gpio_pins;
bool m_gpio_pins_isSet;
qint32 ext_clock;
bool m_ext_clock_isSet;
qint32 ext_clock_freq;
bool m_ext_clock_freq_isSet;
qint32 use_reverse_api;
bool m_use_reverse_api_isSet;
QString* reverse_api_address;
bool m_reverse_api_address_isSet;
qint32 reverse_api_port;
bool m_reverse_api_port_isSet;
qint32 reverse_api_device_index;
bool m_reverse_api_device_index_isSet;
qint64 rx_center_frequency;
bool m_rx_center_frequency_isSet;
qint32 log2_hard_decim;
bool m_log2_hard_decim_isSet;
qint32 log2_soft_decim;
bool m_log2_soft_decim_isSet;
qint32 dc_block;
bool m_dc_block_isSet;
qint32 iq_correction;
bool m_iq_correction_isSet;
qint32 rx_transverter_mode;
bool m_rx_transverter_mode_isSet;
qint64 rx_transverter_delta_frequency;
bool m_rx_transverter_delta_frequency_isSet;
qint32 iq_order;
bool m_iq_order_isSet;
qint32 nco_enable_rx;
bool m_nco_enable_rx_isSet;
qint32 nco_frequency_rx;
bool m_nco_frequency_rx_isSet;
float lpf_bw_rx0;
bool m_lpf_bw_rx0_isSet;
qint32 lpf_fir_enable_rx0;
bool m_lpf_fir_enable_rx0_isSet;
float lpf_firbw_rx0;
bool m_lpf_firbw_rx0_isSet;
qint32 gain_rx0;
bool m_gain_rx0_isSet;
qint32 antenna_path_rx0;
bool m_antenna_path_rx0_isSet;
qint32 gain_mode_rx0;
bool m_gain_mode_rx0_isSet;
qint32 lna_gain_rx0;
bool m_lna_gain_rx0_isSet;
qint32 tia_gain_rx0;
bool m_tia_gain_rx0_isSet;
qint32 pga_gain_rx0;
bool m_pga_gain_rx0_isSet;
float lpf_bw_rx1;
bool m_lpf_bw_rx1_isSet;
qint32 lpf_fir_enable_rx1;
bool m_lpf_fir_enable_rx1_isSet;
float lpf_firbw_rx1;
bool m_lpf_firbw_rx1_isSet;
qint32 gain_rx1;
bool m_gain_rx1_isSet;
qint32 antenna_path_rx1;
bool m_antenna_path_rx1_isSet;
qint32 gain_mode_rx1;
bool m_gain_mode_rx1_isSet;
qint32 lna_gain_rx1;
bool m_lna_gain_rx1_isSet;
qint32 tia_gain_rx1;
bool m_tia_gain_rx1_isSet;
qint32 pga_gain_rx1;
bool m_pga_gain_rx1_isSet;
qint64 tx_center_frequency;
bool m_tx_center_frequency_isSet;
qint32 log2_hard_interp;
bool m_log2_hard_interp_isSet;
qint32 log2_soft_interp;
bool m_log2_soft_interp_isSet;
qint32 tx_transverter_mode;
bool m_tx_transverter_mode_isSet;
qint64 tx_transverter_delta_frequency;
bool m_tx_transverter_delta_frequency_isSet;
qint32 nco_enable_tx;
bool m_nco_enable_tx_isSet;
qint32 nco_frequency_tx;
bool m_nco_frequency_tx_isSet;
float lpf_bw_tx0;
bool m_lpf_bw_tx0_isSet;
qint32 lpf_fir_enable_tx0;
bool m_lpf_fir_enable_tx0_isSet;
float lpf_firbw_tx0;
bool m_lpf_firbw_tx0_isSet;
qint32 gain_tx0;
bool m_gain_tx0_isSet;
qint32 antenna_path_tx0;
bool m_antenna_path_tx0_isSet;
float lpf_bw_tx1;
bool m_lpf_bw_tx1_isSet;
qint32 lpf_fir_enable_tx1;
bool m_lpf_fir_enable_tx1_isSet;
float lpf_firbw_tx1;
bool m_lpf_firbw_tx1_isSet;
qint32 gain_tx1;
bool m_gain_tx1_isSet;
qint32 antenna_path_tx1;
bool m_antenna_path_tx1_isSet;
};
}
#endif /* SWGLimeSdrMIMOSettings_H_ */

Wyświetl plik

@ -130,6 +130,7 @@
#include "SWGLimeRFESettings.h"
#include "SWGLimeSdrInputReport.h"
#include "SWGLimeSdrInputSettings.h"
#include "SWGLimeSdrMIMOSettings.h"
#include "SWGLimeSdrOutputReport.h"
#include "SWGLimeSdrOutputSettings.h"
#include "SWGLocalInputReport.h"
@ -575,6 +576,9 @@ namespace SWGSDRangel {
if(QString("SWGLimeSdrInputSettings").compare(type) == 0) {
return new SWGLimeSdrInputSettings();
}
if(QString("SWGLimeSdrMIMOSettings").compare(type) == 0) {
return new SWGLimeSdrMIMOSettings();
}
if(QString("SWGLimeSdrOutputReport").compare(type) == 0) {
return new SWGLimeSdrOutputReport();
}