mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-11-14 04:03:25 -05:00
Metis MISO: fixed REST API. Changelogs and version updates
This commit is contained in:
parent
962d056f87
commit
30b738c4b3
@ -1,3 +1,10 @@
|
|||||||
|
sdrangel (5.10.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Metis/HPSDR MISO plugin. Implements #344
|
||||||
|
* Device API: fixed channel add/remove on streams with index > 0
|
||||||
|
|
||||||
|
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 09 Sep 2020 13:48:40 +0200
|
||||||
|
|
||||||
sdrangel (5.9.4-1) unstable; urgency=medium
|
sdrangel (5.9.4-1) unstable; urgency=medium
|
||||||
|
|
||||||
* GLSpectrum: fixed settings and waterfall share serialization. Fixes #609
|
* GLSpectrum: fixed settings and waterfall share serialization. Fixes #609
|
||||||
|
|||||||
@ -17,8 +17,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
|
|||||||
|
|
||||||
# configure version
|
# configure version
|
||||||
set(sdrangel_VERSION_MAJOR "5")
|
set(sdrangel_VERSION_MAJOR "5")
|
||||||
set(sdrangel_VERSION_MINOR "9")
|
set(sdrangel_VERSION_MINOR "10")
|
||||||
set(sdrangel_VERSION_PATCH "4")
|
set(sdrangel_VERSION_PATCH "0")
|
||||||
set(sdrangel_VERSION_SUFFIX "")
|
set(sdrangel_VERSION_SUFFIX "")
|
||||||
|
|
||||||
# SDRAngel cmake options
|
# SDRAngel cmake options
|
||||||
|
|||||||
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
|||||||
|
sdrangel (5.10.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Metis/HPSDR MISO plugin. Implements #344
|
||||||
|
* Device API: fixed channel add/remove on streams with index > 0
|
||||||
|
|
||||||
|
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Wed, 09 Sep 2020 13:48:40 +0200
|
||||||
|
|
||||||
sdrangel (5.9.4-1) unstable; urgency=medium
|
sdrangel (5.9.4-1) unstable; urgency=medium
|
||||||
|
|
||||||
* GLSpectrum: fixed settings and waterfall share serialization. Fixes #609
|
* GLSpectrum: fixed settings and waterfall share serialization. Fixes #609
|
||||||
|
|||||||
@ -551,13 +551,30 @@ void MetisMISO::webapiUpdateDeviceSettings(
|
|||||||
if (deviceSettingsKeys.contains("txEnable")) {
|
if (deviceSettingsKeys.contains("txEnable")) {
|
||||||
settings.m_txEnable = response.getMetisMisoSettings()->getTxEnable() != 0;
|
settings.m_txEnable = response.getMetisMisoSettings()->getTxEnable() != 0;
|
||||||
}
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx1CenterFrequency")) {
|
||||||
for (int i = 0; i < MetisMISOSettings::m_maxReceivers; i++)
|
settings.m_rxCenterFrequencies[0] = response.getMetisMisoSettings()->getRx1CenterFrequency();
|
||||||
{
|
}
|
||||||
QString keyword = QString("rx%1CenterFrequency").arg(i+1);
|
if (deviceSettingsKeys.contains("rx2CenterFrequency")) {
|
||||||
settings.m_rxCenterFrequencies[i] = response.getMetisMisoSettings()->getRxCenterFrequencies()->at(i);
|
settings.m_rxCenterFrequencies[1] = response.getMetisMisoSettings()->getRx2CenterFrequency();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx3CenterFrequency")) {
|
||||||
|
settings.m_rxCenterFrequencies[2] = response.getMetisMisoSettings()->getRx3CenterFrequency();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx4CenterFrequency")) {
|
||||||
|
settings.m_rxCenterFrequencies[3] = response.getMetisMisoSettings()->getRx4CenterFrequency();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx5CenterFrequency")) {
|
||||||
|
settings.m_rxCenterFrequencies[4] = response.getMetisMisoSettings()->getRx5CenterFrequency();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx6CenterFrequency")) {
|
||||||
|
settings.m_rxCenterFrequencies[5] = response.getMetisMisoSettings()->getRx6CenterFrequency();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx7CenterFrequency")) {
|
||||||
|
settings.m_rxCenterFrequencies[6] = response.getMetisMisoSettings()->getRx7CenterFrequency();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx8CenterFrequency")) {
|
||||||
|
settings.m_rxCenterFrequencies[7] = response.getMetisMisoSettings()->getRx8CenterFrequency();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deviceSettingsKeys.contains("txCenterFrequency")) {
|
if (deviceSettingsKeys.contains("txCenterFrequency")) {
|
||||||
settings.m_txCenterFrequency = response.getMetisMisoSettings()->getTxCenterFrequency();
|
settings.m_txCenterFrequency = response.getMetisMisoSettings()->getTxCenterFrequency();
|
||||||
}
|
}
|
||||||
@ -576,6 +593,30 @@ void MetisMISO::webapiUpdateDeviceSettings(
|
|||||||
if (deviceSettingsKeys.contains("iqOrder")) {
|
if (deviceSettingsKeys.contains("iqOrder")) {
|
||||||
settings.m_iqOrder = response.getMetisMisoSettings()->getIqOrder() != 0;
|
settings.m_iqOrder = response.getMetisMisoSettings()->getIqOrder() != 0;
|
||||||
}
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx1SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[0] = response.getMetisMisoSettings()->getRx1SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx2SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[1] = response.getMetisMisoSettings()->getRx2SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx3SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[2] = response.getMetisMisoSettings()->getRx3SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx4SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[3] = response.getMetisMisoSettings()->getRx4SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx5SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[4] = response.getMetisMisoSettings()->getRx5SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx6SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[5] = response.getMetisMisoSettings()->getRx6SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx7SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[6] = response.getMetisMisoSettings()->getRx7SubsamplingIndex();
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx8SubsamplingIndex")) {
|
||||||
|
settings.m_rxSubsamplingIndexes[7] = response.getMetisMisoSettings()->getRx8SubsamplingIndex();
|
||||||
|
}
|
||||||
if (deviceSettingsKeys.contains("sampleRateIndex")) {
|
if (deviceSettingsKeys.contains("sampleRateIndex")) {
|
||||||
settings.m_sampleRateIndex = response.getMetisMisoSettings()->getSampleRateIndex();
|
settings.m_sampleRateIndex = response.getMetisMisoSettings()->getSampleRateIndex();
|
||||||
}
|
}
|
||||||
@ -625,9 +666,23 @@ void MetisMISO::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& respo
|
|||||||
response.getMetisMisoSettings()->setNbReceivers(settings.m_nbReceivers);
|
response.getMetisMisoSettings()->setNbReceivers(settings.m_nbReceivers);
|
||||||
response.getMetisMisoSettings()->setTxEnable(settings.m_txEnable ? 1 : 0);
|
response.getMetisMisoSettings()->setTxEnable(settings.m_txEnable ? 1 : 0);
|
||||||
|
|
||||||
for (int i = 0; i < MetisMISOSettings::m_maxReceivers; i++) {
|
response.getMetisMisoSettings()->setRx1CenterFrequency(settings.m_rxCenterFrequencies[0]);
|
||||||
response.getMetisMisoSettings()->getRxCenterFrequencies()->replace(i, settings.m_rxCenterFrequencies[i]);
|
response.getMetisMisoSettings()->setRx2CenterFrequency(settings.m_rxCenterFrequencies[1]);
|
||||||
}
|
response.getMetisMisoSettings()->setRx3CenterFrequency(settings.m_rxCenterFrequencies[2]);
|
||||||
|
response.getMetisMisoSettings()->setRx4CenterFrequency(settings.m_rxCenterFrequencies[3]);
|
||||||
|
response.getMetisMisoSettings()->setRx5CenterFrequency(settings.m_rxCenterFrequencies[4]);
|
||||||
|
response.getMetisMisoSettings()->setRx6CenterFrequency(settings.m_rxCenterFrequencies[5]);
|
||||||
|
response.getMetisMisoSettings()->setRx7CenterFrequency(settings.m_rxCenterFrequencies[6]);
|
||||||
|
response.getMetisMisoSettings()->setRx8CenterFrequency(settings.m_rxCenterFrequencies[7]);
|
||||||
|
|
||||||
|
response.getMetisMisoSettings()->setRx1SubsamplingIndex(settings.m_rxSubsamplingIndexes[0]);
|
||||||
|
response.getMetisMisoSettings()->setRx2SubsamplingIndex(settings.m_rxSubsamplingIndexes[1]);
|
||||||
|
response.getMetisMisoSettings()->setRx3SubsamplingIndex(settings.m_rxSubsamplingIndexes[2]);
|
||||||
|
response.getMetisMisoSettings()->setRx4SubsamplingIndex(settings.m_rxSubsamplingIndexes[3]);
|
||||||
|
response.getMetisMisoSettings()->setRx5SubsamplingIndex(settings.m_rxSubsamplingIndexes[4]);
|
||||||
|
response.getMetisMisoSettings()->setRx6SubsamplingIndex(settings.m_rxSubsamplingIndexes[5]);
|
||||||
|
response.getMetisMisoSettings()->setRx7SubsamplingIndex(settings.m_rxSubsamplingIndexes[6]);
|
||||||
|
response.getMetisMisoSettings()->setRx8SubsamplingIndex(settings.m_rxSubsamplingIndexes[7]);
|
||||||
|
|
||||||
response.getMetisMisoSettings()->setTxCenterFrequency(settings.m_txCenterFrequency);
|
response.getMetisMisoSettings()->setTxCenterFrequency(settings.m_txCenterFrequency);
|
||||||
response.getMetisMisoSettings()->setRxTransverterMode(settings.m_rxTransverterMode ? 1 : 0);
|
response.getMetisMisoSettings()->setRxTransverterMode(settings.m_rxTransverterMode ? 1 : 0);
|
||||||
@ -673,13 +728,54 @@ void MetisMISO::webapiReverseSendSettings(const QList<QString>& deviceSettingsKe
|
|||||||
swgMetisMISOSettings->setTxEnable(settings.m_txEnable ? 1 : 0);
|
swgMetisMISOSettings->setTxEnable(settings.m_txEnable ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < MetisMISOSettings::m_maxReceivers; i++)
|
if (deviceSettingsKeys.contains("rx1CenterFrequency") || force) {
|
||||||
{
|
swgMetisMISOSettings->setRx1CenterFrequency(settings.m_rxCenterFrequencies[0]);
|
||||||
QString keyword = QString("rx%1CenterFrequency").arg(i+1);
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx2CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx2CenterFrequency(settings.m_rxCenterFrequencies[1]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx3CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx3CenterFrequency(settings.m_rxCenterFrequencies[2]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx4CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx4CenterFrequency(settings.m_rxCenterFrequencies[3]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx5CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx5CenterFrequency(settings.m_rxCenterFrequencies[4]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx6CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx6CenterFrequency(settings.m_rxCenterFrequencies[5]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx7CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx7CenterFrequency(settings.m_rxCenterFrequencies[6]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx8CenterFrequency") || force) {
|
||||||
|
swgMetisMISOSettings->setRx8CenterFrequency(settings.m_rxCenterFrequencies[7]);
|
||||||
|
}
|
||||||
|
|
||||||
if (deviceSettingsKeys.contains(keyword) || force) {
|
if (deviceSettingsKeys.contains("rx1SubsamplingIndex") || force) {
|
||||||
swgMetisMISOSettings->getRxCenterFrequencies()->replace(i, settings.m_rxCenterFrequencies[i]);
|
swgMetisMISOSettings->setRx1SubsamplingIndex(settings.m_rxSubsamplingIndexes[0]);
|
||||||
}
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx2SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx2SubsamplingIndex(settings.m_rxSubsamplingIndexes[1]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx3SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx3SubsamplingIndex(settings.m_rxSubsamplingIndexes[2]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx4SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx4SubsamplingIndex(settings.m_rxSubsamplingIndexes[3]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx5SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx5SubsamplingIndex(settings.m_rxSubsamplingIndexes[4]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx6SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx6SubsamplingIndex(settings.m_rxSubsamplingIndexes[5]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx7SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx7SubsamplingIndex(settings.m_rxSubsamplingIndexes[6]);
|
||||||
|
}
|
||||||
|
if (deviceSettingsKeys.contains("rx8SubsamplingIndex") || force) {
|
||||||
|
swgMetisMISOSettings->setRx8SubsamplingIndex(settings.m_rxSubsamplingIndexes[7]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (deviceSettingsKeys.contains("txCenterFrequency") || force) {
|
if (deviceSettingsKeys.contains("txCenterFrequency") || force) {
|
||||||
|
|||||||
@ -349,6 +349,8 @@ void MetisMISOGui::displaySettings()
|
|||||||
ui->spectrumSource->setCurrentIndex(m_spectrumStreamIndex);
|
ui->spectrumSource->setCurrentIndex(m_spectrumStreamIndex);
|
||||||
ui->nbRxIndex->setCurrentIndex(m_settings.m_nbReceivers - 1);
|
ui->nbRxIndex->setCurrentIndex(m_settings.m_nbReceivers - 1);
|
||||||
ui->samplerateIndex->setCurrentIndex(m_settings.m_sampleRateIndex);
|
ui->samplerateIndex->setCurrentIndex(m_settings.m_sampleRateIndex);
|
||||||
|
ui->LOppm->setValue(m_settings.m_LOppmTenths);
|
||||||
|
ui->LOppmText->setText(QString("%1").arg(QString::number(m_settings.m_LOppmTenths/10.0, 'f', 1)));
|
||||||
ui->log2Decim->setCurrentIndex(m_settings.m_log2Decim);
|
ui->log2Decim->setCurrentIndex(m_settings.m_log2Decim);
|
||||||
ui->dcBlock->setChecked(m_settings.m_dcBlock);
|
ui->dcBlock->setChecked(m_settings.m_dcBlock);
|
||||||
ui->iqCorrection->setChecked(m_settings.m_iqCorrection);
|
ui->iqCorrection->setChecked(m_settings.m_iqCorrection);
|
||||||
|
|||||||
@ -5509,13 +5509,45 @@ margin-bottom: 20px;
|
|||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "Enable Tx * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device\n"
|
"description" : "Enable Tx * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device\n"
|
||||||
},
|
},
|
||||||
"rxCenterFrequencies" : {
|
"rx1CenterFrequency" : {
|
||||||
"type" : "array",
|
"type" : "integer",
|
||||||
"description" : "center fequencies of receivers",
|
"format" : "int64",
|
||||||
"items" : {
|
"description" : "center fequencies of receiver 1"
|
||||||
"type" : "integer",
|
},
|
||||||
"format" : "int64"
|
"rx2CenterFrequency" : {
|
||||||
}
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 2"
|
||||||
|
},
|
||||||
|
"rx3CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 3"
|
||||||
|
},
|
||||||
|
"rx4CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 4"
|
||||||
|
},
|
||||||
|
"rx5CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 5"
|
||||||
|
},
|
||||||
|
"rx6CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 6"
|
||||||
|
},
|
||||||
|
"rx7CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 7"
|
||||||
|
},
|
||||||
|
"rx8CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 8"
|
||||||
},
|
},
|
||||||
"txCenterFrequency" : {
|
"txCenterFrequency" : {
|
||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
@ -5541,12 +5573,37 @@ margin-bottom: 20px;
|
|||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "I/Q samples order * 0 - I then Q (direct) * 1 - Q then I (reversed)\n"
|
"description" : "I/Q samples order * 0 - I then Q (direct) * 1 - Q then I (reversed)\n"
|
||||||
},
|
},
|
||||||
"rxSubsamplingIndexes" : {
|
"rx1SubsamplingIndex" : {
|
||||||
"type" : "array",
|
"type" : "integer",
|
||||||
"description" : "subsampling band indexes of receivers",
|
"description" : "subsampling band indexes of receiver 1"
|
||||||
"items" : {
|
},
|
||||||
"type" : "integer"
|
"rx2SubsamplingIndex" : {
|
||||||
}
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 2"
|
||||||
|
},
|
||||||
|
"rx3SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 3"
|
||||||
|
},
|
||||||
|
"rx4SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 4"
|
||||||
|
},
|
||||||
|
"rx5SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 5"
|
||||||
|
},
|
||||||
|
"rx6SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 6"
|
||||||
|
},
|
||||||
|
"rx7SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 7"
|
||||||
|
},
|
||||||
|
"rx8SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 8"
|
||||||
},
|
},
|
||||||
"sampleRateIndex" : {
|
"sampleRateIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
@ -37565,7 +37622,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2020-09-08T08:55:28.204+02:00
|
Generated 2020-09-09T22:58:44.320+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -10,12 +10,38 @@ MetisMISOSettings:
|
|||||||
Enable Tx
|
Enable Tx
|
||||||
* 0 - disabled sends null payload to Metis device
|
* 0 - disabled sends null payload to Metis device
|
||||||
* 1 - enabled sends Tx payload to Metis device
|
* 1 - enabled sends Tx payload to Metis device
|
||||||
rxCenterFrequencies:
|
rx1CenterFrequency:
|
||||||
description: center fequencies of receivers
|
description: center fequencies of receiver 1
|
||||||
type: array
|
type: integer
|
||||||
items:
|
format: int64
|
||||||
type: integer
|
rx2CenterFrequency:
|
||||||
format: int64
|
description: center fequencies of receiver 2
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx3CenterFrequency:
|
||||||
|
description: center fequencies of receiver 3
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx4CenterFrequency:
|
||||||
|
description: center fequencies of receiver 4
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx5CenterFrequency:
|
||||||
|
description: center fequencies of receiver 5
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx6CenterFrequency:
|
||||||
|
description: center fequencies of receiver 6
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx7CenterFrequency:
|
||||||
|
description: center fequencies of receiver 7
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx8CenterFrequency:
|
||||||
|
description: center fequencies of receiver 8
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
txCenterFrequency:
|
txCenterFrequency:
|
||||||
type: integer
|
type: integer
|
||||||
format: int64
|
format: int64
|
||||||
@ -43,11 +69,30 @@ MetisMISOSettings:
|
|||||||
I/Q samples order
|
I/Q samples order
|
||||||
* 0 - I then Q (direct)
|
* 0 - I then Q (direct)
|
||||||
* 1 - Q then I (reversed)
|
* 1 - Q then I (reversed)
|
||||||
rxSubsamplingIndexes:
|
rx1SubsamplingIndex:
|
||||||
description: subsampling band indexes of receivers
|
description: subsampling band indexes of receiver 1
|
||||||
type: array
|
type: integer
|
||||||
items:
|
rx2SubsamplingIndex:
|
||||||
type: integer
|
description: subsampling band indexes of receiver 2
|
||||||
|
type: integer
|
||||||
|
rx3SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 3
|
||||||
|
type: integer
|
||||||
|
rx4SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 4
|
||||||
|
type: integer
|
||||||
|
rx5SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 5
|
||||||
|
type: integer
|
||||||
|
rx6SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 6
|
||||||
|
type: integer
|
||||||
|
rx7SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 7
|
||||||
|
type: integer
|
||||||
|
rx8SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 8
|
||||||
|
type: integer
|
||||||
sampleRateIndex:
|
sampleRateIndex:
|
||||||
type: integer
|
type: integer
|
||||||
log2Decim:
|
log2Decim:
|
||||||
|
|||||||
@ -121,6 +121,7 @@ const QMap<QString, QString> WebAPIRequestMapper::m_deviceIdToSettingsKey = {
|
|||||||
{"sdrangel.samplesource.localinput", "localInputSettings"},
|
{"sdrangel.samplesource.localinput", "localInputSettings"},
|
||||||
{"sdrangel.samplesink.localoutput", "localOutputSettings"},
|
{"sdrangel.samplesink.localoutput", "localOutputSettings"},
|
||||||
{"sdrangel.samplesource.localoutput", "localOutputSettings"}, // remap
|
{"sdrangel.samplesource.localoutput", "localOutputSettings"}, // remap
|
||||||
|
{"sdrangel.samplemimo.metismiso", "metisMISOSettings"},
|
||||||
{"sdrangel.samplesource.perseus", "perseusSettings"},
|
{"sdrangel.samplesource.perseus", "perseusSettings"},
|
||||||
{"sdrangel.samplesource.plutosdr", "plutoSdrInputSettings"},
|
{"sdrangel.samplesource.plutosdr", "plutoSdrInputSettings"},
|
||||||
{"sdrangel.samplesink.plutosdr", "plutoSdrOutputSettings"},
|
{"sdrangel.samplesink.plutosdr", "plutoSdrOutputSettings"},
|
||||||
@ -238,6 +239,7 @@ const QMap<QString, QString> WebAPIRequestMapper::m_sinkDeviceHwIdToActionsKey =
|
|||||||
|
|
||||||
const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToSettingsKey= {
|
const QMap<QString, QString> WebAPIRequestMapper::m_mimoDeviceHwIdToSettingsKey= {
|
||||||
{"BladeRF2", "bladeRF2MIMOSettings"},
|
{"BladeRF2", "bladeRF2MIMOSettings"},
|
||||||
|
{"MetisMISO", "metisMISOSettings"},
|
||||||
{"TestMI", "testMISettings"},
|
{"TestMI", "testMISettings"},
|
||||||
{"TestMOSync", "testMOSyncSettings"}
|
{"TestMOSync", "testMOSyncSettings"}
|
||||||
};
|
};
|
||||||
@ -3729,6 +3731,11 @@ bool WebAPIRequestMapper::getDeviceSettings(
|
|||||||
deviceSettings->setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
|
deviceSettings->setLimeSdrOutputSettings(new SWGSDRangel::SWGLimeSdrOutputSettings());
|
||||||
deviceSettings->getLimeSdrOutputSettings()->fromJsonObject(settingsJsonObject);
|
deviceSettings->getLimeSdrOutputSettings()->fromJsonObject(settingsJsonObject);
|
||||||
}
|
}
|
||||||
|
else if (deviceSettingsKey == "metisMISOSettings")
|
||||||
|
{
|
||||||
|
deviceSettings->setMetisMisoSettings(new SWGSDRangel::SWGMetisMISOSettings());
|
||||||
|
deviceSettings->getMetisMisoSettings()->fromJsonObject(settingsJsonObject);
|
||||||
|
}
|
||||||
else if (deviceSettingsKey == "perseusSettings")
|
else if (deviceSettingsKey == "perseusSettings")
|
||||||
{
|
{
|
||||||
deviceSettings->setPerseusSettings(new SWGSDRangel::SWGPerseusSettings());
|
deviceSettings->setPerseusSettings(new SWGSDRangel::SWGPerseusSettings());
|
||||||
|
|||||||
@ -10,12 +10,38 @@ MetisMISOSettings:
|
|||||||
Enable Tx
|
Enable Tx
|
||||||
* 0 - disabled sends null payload to Metis device
|
* 0 - disabled sends null payload to Metis device
|
||||||
* 1 - enabled sends Tx payload to Metis device
|
* 1 - enabled sends Tx payload to Metis device
|
||||||
rxCenterFrequencies:
|
rx1CenterFrequency:
|
||||||
description: center fequencies of receivers
|
description: center fequencies of receiver 1
|
||||||
type: array
|
type: integer
|
||||||
items:
|
format: int64
|
||||||
type: integer
|
rx2CenterFrequency:
|
||||||
format: int64
|
description: center fequencies of receiver 2
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx3CenterFrequency:
|
||||||
|
description: center fequencies of receiver 3
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx4CenterFrequency:
|
||||||
|
description: center fequencies of receiver 4
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx5CenterFrequency:
|
||||||
|
description: center fequencies of receiver 5
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx6CenterFrequency:
|
||||||
|
description: center fequencies of receiver 6
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx7CenterFrequency:
|
||||||
|
description: center fequencies of receiver 7
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
|
rx8CenterFrequency:
|
||||||
|
description: center fequencies of receiver 8
|
||||||
|
type: integer
|
||||||
|
format: int64
|
||||||
txCenterFrequency:
|
txCenterFrequency:
|
||||||
type: integer
|
type: integer
|
||||||
format: int64
|
format: int64
|
||||||
@ -43,11 +69,30 @@ MetisMISOSettings:
|
|||||||
I/Q samples order
|
I/Q samples order
|
||||||
* 0 - I then Q (direct)
|
* 0 - I then Q (direct)
|
||||||
* 1 - Q then I (reversed)
|
* 1 - Q then I (reversed)
|
||||||
rxSubsamplingIndexes:
|
rx1SubsamplingIndex:
|
||||||
description: subsampling band indexes of receivers
|
description: subsampling band indexes of receiver 1
|
||||||
type: array
|
type: integer
|
||||||
items:
|
rx2SubsamplingIndex:
|
||||||
type: integer
|
description: subsampling band indexes of receiver 2
|
||||||
|
type: integer
|
||||||
|
rx3SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 3
|
||||||
|
type: integer
|
||||||
|
rx4SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 4
|
||||||
|
type: integer
|
||||||
|
rx5SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 5
|
||||||
|
type: integer
|
||||||
|
rx6SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 6
|
||||||
|
type: integer
|
||||||
|
rx7SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 7
|
||||||
|
type: integer
|
||||||
|
rx8SubsamplingIndex:
|
||||||
|
description: subsampling band indexes of receiver 8
|
||||||
|
type: integer
|
||||||
sampleRateIndex:
|
sampleRateIndex:
|
||||||
type: integer
|
type: integer
|
||||||
log2Decim:
|
log2Decim:
|
||||||
|
|||||||
@ -5509,13 +5509,45 @@ margin-bottom: 20px;
|
|||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "Enable Tx * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device\n"
|
"description" : "Enable Tx * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device\n"
|
||||||
},
|
},
|
||||||
"rxCenterFrequencies" : {
|
"rx1CenterFrequency" : {
|
||||||
"type" : "array",
|
"type" : "integer",
|
||||||
"description" : "center fequencies of receivers",
|
"format" : "int64",
|
||||||
"items" : {
|
"description" : "center fequencies of receiver 1"
|
||||||
"type" : "integer",
|
},
|
||||||
"format" : "int64"
|
"rx2CenterFrequency" : {
|
||||||
}
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 2"
|
||||||
|
},
|
||||||
|
"rx3CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 3"
|
||||||
|
},
|
||||||
|
"rx4CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 4"
|
||||||
|
},
|
||||||
|
"rx5CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 5"
|
||||||
|
},
|
||||||
|
"rx6CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 6"
|
||||||
|
},
|
||||||
|
"rx7CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 7"
|
||||||
|
},
|
||||||
|
"rx8CenterFrequency" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64",
|
||||||
|
"description" : "center fequencies of receiver 8"
|
||||||
},
|
},
|
||||||
"txCenterFrequency" : {
|
"txCenterFrequency" : {
|
||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
@ -5541,12 +5573,37 @@ margin-bottom: 20px;
|
|||||||
"type" : "integer",
|
"type" : "integer",
|
||||||
"description" : "I/Q samples order * 0 - I then Q (direct) * 1 - Q then I (reversed)\n"
|
"description" : "I/Q samples order * 0 - I then Q (direct) * 1 - Q then I (reversed)\n"
|
||||||
},
|
},
|
||||||
"rxSubsamplingIndexes" : {
|
"rx1SubsamplingIndex" : {
|
||||||
"type" : "array",
|
"type" : "integer",
|
||||||
"description" : "subsampling band indexes of receivers",
|
"description" : "subsampling band indexes of receiver 1"
|
||||||
"items" : {
|
},
|
||||||
"type" : "integer"
|
"rx2SubsamplingIndex" : {
|
||||||
}
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 2"
|
||||||
|
},
|
||||||
|
"rx3SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 3"
|
||||||
|
},
|
||||||
|
"rx4SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 4"
|
||||||
|
},
|
||||||
|
"rx5SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 5"
|
||||||
|
},
|
||||||
|
"rx6SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 6"
|
||||||
|
},
|
||||||
|
"rx7SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 7"
|
||||||
|
},
|
||||||
|
"rx8SubsamplingIndex" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"description" : "subsampling band indexes of receiver 8"
|
||||||
},
|
},
|
||||||
"sampleRateIndex" : {
|
"sampleRateIndex" : {
|
||||||
"type" : "integer"
|
"type" : "integer"
|
||||||
@ -37565,7 +37622,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2020-09-08T08:55:28.204+02:00
|
Generated 2020-09-09T22:58:44.320+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -32,8 +32,22 @@ SWGMetisMISOSettings::SWGMetisMISOSettings() {
|
|||||||
m_nb_receivers_isSet = false;
|
m_nb_receivers_isSet = false;
|
||||||
tx_enable = 0;
|
tx_enable = 0;
|
||||||
m_tx_enable_isSet = false;
|
m_tx_enable_isSet = false;
|
||||||
rx_center_frequencies = new QList<qint64>();
|
rx1_center_frequency = 0L;
|
||||||
m_rx_center_frequencies_isSet = false;
|
m_rx1_center_frequency_isSet = false;
|
||||||
|
rx2_center_frequency = 0L;
|
||||||
|
m_rx2_center_frequency_isSet = false;
|
||||||
|
rx3_center_frequency = 0L;
|
||||||
|
m_rx3_center_frequency_isSet = false;
|
||||||
|
rx4_center_frequency = 0L;
|
||||||
|
m_rx4_center_frequency_isSet = false;
|
||||||
|
rx5_center_frequency = 0L;
|
||||||
|
m_rx5_center_frequency_isSet = false;
|
||||||
|
rx6_center_frequency = 0L;
|
||||||
|
m_rx6_center_frequency_isSet = false;
|
||||||
|
rx7_center_frequency = 0L;
|
||||||
|
m_rx7_center_frequency_isSet = false;
|
||||||
|
rx8_center_frequency = 0L;
|
||||||
|
m_rx8_center_frequency_isSet = false;
|
||||||
tx_center_frequency = 0L;
|
tx_center_frequency = 0L;
|
||||||
m_tx_center_frequency_isSet = false;
|
m_tx_center_frequency_isSet = false;
|
||||||
rx_transverter_mode = 0;
|
rx_transverter_mode = 0;
|
||||||
@ -46,8 +60,22 @@ SWGMetisMISOSettings::SWGMetisMISOSettings() {
|
|||||||
m_tx_transverter_delta_frequency_isSet = false;
|
m_tx_transverter_delta_frequency_isSet = false;
|
||||||
iq_order = 0;
|
iq_order = 0;
|
||||||
m_iq_order_isSet = false;
|
m_iq_order_isSet = false;
|
||||||
rx_subsampling_indexes = new QList<qint32>();
|
rx1_subsampling_index = 0;
|
||||||
m_rx_subsampling_indexes_isSet = false;
|
m_rx1_subsampling_index_isSet = false;
|
||||||
|
rx2_subsampling_index = 0;
|
||||||
|
m_rx2_subsampling_index_isSet = false;
|
||||||
|
rx3_subsampling_index = 0;
|
||||||
|
m_rx3_subsampling_index_isSet = false;
|
||||||
|
rx4_subsampling_index = 0;
|
||||||
|
m_rx4_subsampling_index_isSet = false;
|
||||||
|
rx5_subsampling_index = 0;
|
||||||
|
m_rx5_subsampling_index_isSet = false;
|
||||||
|
rx6_subsampling_index = 0;
|
||||||
|
m_rx6_subsampling_index_isSet = false;
|
||||||
|
rx7_subsampling_index = 0;
|
||||||
|
m_rx7_subsampling_index_isSet = false;
|
||||||
|
rx8_subsampling_index = 0;
|
||||||
|
m_rx8_subsampling_index_isSet = false;
|
||||||
sample_rate_index = 0;
|
sample_rate_index = 0;
|
||||||
m_sample_rate_index_isSet = false;
|
m_sample_rate_index_isSet = false;
|
||||||
log2_decim = 0;
|
log2_decim = 0;
|
||||||
@ -88,8 +116,22 @@ SWGMetisMISOSettings::init() {
|
|||||||
m_nb_receivers_isSet = false;
|
m_nb_receivers_isSet = false;
|
||||||
tx_enable = 0;
|
tx_enable = 0;
|
||||||
m_tx_enable_isSet = false;
|
m_tx_enable_isSet = false;
|
||||||
rx_center_frequencies = new QList<qint64>();
|
rx1_center_frequency = 0L;
|
||||||
m_rx_center_frequencies_isSet = false;
|
m_rx1_center_frequency_isSet = false;
|
||||||
|
rx2_center_frequency = 0L;
|
||||||
|
m_rx2_center_frequency_isSet = false;
|
||||||
|
rx3_center_frequency = 0L;
|
||||||
|
m_rx3_center_frequency_isSet = false;
|
||||||
|
rx4_center_frequency = 0L;
|
||||||
|
m_rx4_center_frequency_isSet = false;
|
||||||
|
rx5_center_frequency = 0L;
|
||||||
|
m_rx5_center_frequency_isSet = false;
|
||||||
|
rx6_center_frequency = 0L;
|
||||||
|
m_rx6_center_frequency_isSet = false;
|
||||||
|
rx7_center_frequency = 0L;
|
||||||
|
m_rx7_center_frequency_isSet = false;
|
||||||
|
rx8_center_frequency = 0L;
|
||||||
|
m_rx8_center_frequency_isSet = false;
|
||||||
tx_center_frequency = 0L;
|
tx_center_frequency = 0L;
|
||||||
m_tx_center_frequency_isSet = false;
|
m_tx_center_frequency_isSet = false;
|
||||||
rx_transverter_mode = 0;
|
rx_transverter_mode = 0;
|
||||||
@ -102,8 +144,22 @@ SWGMetisMISOSettings::init() {
|
|||||||
m_tx_transverter_delta_frequency_isSet = false;
|
m_tx_transverter_delta_frequency_isSet = false;
|
||||||
iq_order = 0;
|
iq_order = 0;
|
||||||
m_iq_order_isSet = false;
|
m_iq_order_isSet = false;
|
||||||
rx_subsampling_indexes = new QList<qint32>();
|
rx1_subsampling_index = 0;
|
||||||
m_rx_subsampling_indexes_isSet = false;
|
m_rx1_subsampling_index_isSet = false;
|
||||||
|
rx2_subsampling_index = 0;
|
||||||
|
m_rx2_subsampling_index_isSet = false;
|
||||||
|
rx3_subsampling_index = 0;
|
||||||
|
m_rx3_subsampling_index_isSet = false;
|
||||||
|
rx4_subsampling_index = 0;
|
||||||
|
m_rx4_subsampling_index_isSet = false;
|
||||||
|
rx5_subsampling_index = 0;
|
||||||
|
m_rx5_subsampling_index_isSet = false;
|
||||||
|
rx6_subsampling_index = 0;
|
||||||
|
m_rx6_subsampling_index_isSet = false;
|
||||||
|
rx7_subsampling_index = 0;
|
||||||
|
m_rx7_subsampling_index_isSet = false;
|
||||||
|
rx8_subsampling_index = 0;
|
||||||
|
m_rx8_subsampling_index_isSet = false;
|
||||||
sample_rate_index = 0;
|
sample_rate_index = 0;
|
||||||
m_sample_rate_index_isSet = false;
|
m_sample_rate_index_isSet = false;
|
||||||
log2_decim = 0;
|
log2_decim = 0;
|
||||||
@ -150,6 +206,20 @@ SWGMetisMISOSettings::cleanup() {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -179,8 +249,22 @@ SWGMetisMISOSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&tx_enable, pJson["txEnable"], "qint32", "");
|
::SWGSDRangel::setValue(&tx_enable, pJson["txEnable"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx1_center_frequency, pJson["rx1CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx2_center_frequency, pJson["rx2CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx3_center_frequency, pJson["rx3CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx4_center_frequency, pJson["rx4CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx5_center_frequency, pJson["rx5CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx6_center_frequency, pJson["rx6CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx7_center_frequency, pJson["rx7CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx8_center_frequency, pJson["rx8CenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
::SWGSDRangel::setValue(&rx_center_frequencies, pJson["rxCenterFrequencies"], "QList", "qint64");
|
|
||||||
::SWGSDRangel::setValue(&tx_center_frequency, pJson["txCenterFrequency"], "qint64", "");
|
::SWGSDRangel::setValue(&tx_center_frequency, pJson["txCenterFrequency"], "qint64", "");
|
||||||
|
|
||||||
::SWGSDRangel::setValue(&rx_transverter_mode, pJson["rxTransverterMode"], "qint32", "");
|
::SWGSDRangel::setValue(&rx_transverter_mode, pJson["rxTransverterMode"], "qint32", "");
|
||||||
@ -193,8 +277,22 @@ SWGMetisMISOSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", "");
|
::SWGSDRangel::setValue(&iq_order, pJson["iqOrder"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx1_subsampling_index, pJson["rx1SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx2_subsampling_index, pJson["rx2SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx3_subsampling_index, pJson["rx3SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx4_subsampling_index, pJson["rx4SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx5_subsampling_index, pJson["rx5SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx6_subsampling_index, pJson["rx6SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx7_subsampling_index, pJson["rx7SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&rx8_subsampling_index, pJson["rx8SubsamplingIndex"], "qint32", "");
|
||||||
|
|
||||||
::SWGSDRangel::setValue(&rx_subsampling_indexes, pJson["rxSubsamplingIndexes"], "QList", "qint32");
|
|
||||||
::SWGSDRangel::setValue(&sample_rate_index, pJson["sampleRateIndex"], "qint32", "");
|
::SWGSDRangel::setValue(&sample_rate_index, pJson["sampleRateIndex"], "qint32", "");
|
||||||
|
|
||||||
::SWGSDRangel::setValue(&log2_decim, pJson["log2Decim"], "qint32", "");
|
::SWGSDRangel::setValue(&log2_decim, pJson["log2Decim"], "qint32", "");
|
||||||
@ -245,8 +343,29 @@ SWGMetisMISOSettings::asJsonObject() {
|
|||||||
if(m_tx_enable_isSet){
|
if(m_tx_enable_isSet){
|
||||||
obj->insert("txEnable", QJsonValue(tx_enable));
|
obj->insert("txEnable", QJsonValue(tx_enable));
|
||||||
}
|
}
|
||||||
if(rx_center_frequencies && rx_center_frequencies->size() > 0){
|
if(m_rx1_center_frequency_isSet){
|
||||||
toJsonArray((QList<void*>*)rx_center_frequencies, obj, "rxCenterFrequencies", "");
|
obj->insert("rx1CenterFrequency", QJsonValue(rx1_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx2_center_frequency_isSet){
|
||||||
|
obj->insert("rx2CenterFrequency", QJsonValue(rx2_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx3_center_frequency_isSet){
|
||||||
|
obj->insert("rx3CenterFrequency", QJsonValue(rx3_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx4_center_frequency_isSet){
|
||||||
|
obj->insert("rx4CenterFrequency", QJsonValue(rx4_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx5_center_frequency_isSet){
|
||||||
|
obj->insert("rx5CenterFrequency", QJsonValue(rx5_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx6_center_frequency_isSet){
|
||||||
|
obj->insert("rx6CenterFrequency", QJsonValue(rx6_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx7_center_frequency_isSet){
|
||||||
|
obj->insert("rx7CenterFrequency", QJsonValue(rx7_center_frequency));
|
||||||
|
}
|
||||||
|
if(m_rx8_center_frequency_isSet){
|
||||||
|
obj->insert("rx8CenterFrequency", QJsonValue(rx8_center_frequency));
|
||||||
}
|
}
|
||||||
if(m_tx_center_frequency_isSet){
|
if(m_tx_center_frequency_isSet){
|
||||||
obj->insert("txCenterFrequency", QJsonValue(tx_center_frequency));
|
obj->insert("txCenterFrequency", QJsonValue(tx_center_frequency));
|
||||||
@ -266,8 +385,29 @@ SWGMetisMISOSettings::asJsonObject() {
|
|||||||
if(m_iq_order_isSet){
|
if(m_iq_order_isSet){
|
||||||
obj->insert("iqOrder", QJsonValue(iq_order));
|
obj->insert("iqOrder", QJsonValue(iq_order));
|
||||||
}
|
}
|
||||||
if(rx_subsampling_indexes && rx_subsampling_indexes->size() > 0){
|
if(m_rx1_subsampling_index_isSet){
|
||||||
toJsonArray((QList<void*>*)rx_subsampling_indexes, obj, "rxSubsamplingIndexes", "");
|
obj->insert("rx1SubsamplingIndex", QJsonValue(rx1_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx2_subsampling_index_isSet){
|
||||||
|
obj->insert("rx2SubsamplingIndex", QJsonValue(rx2_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx3_subsampling_index_isSet){
|
||||||
|
obj->insert("rx3SubsamplingIndex", QJsonValue(rx3_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx4_subsampling_index_isSet){
|
||||||
|
obj->insert("rx4SubsamplingIndex", QJsonValue(rx4_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx5_subsampling_index_isSet){
|
||||||
|
obj->insert("rx5SubsamplingIndex", QJsonValue(rx5_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx6_subsampling_index_isSet){
|
||||||
|
obj->insert("rx6SubsamplingIndex", QJsonValue(rx6_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx7_subsampling_index_isSet){
|
||||||
|
obj->insert("rx7SubsamplingIndex", QJsonValue(rx7_subsampling_index));
|
||||||
|
}
|
||||||
|
if(m_rx8_subsampling_index_isSet){
|
||||||
|
obj->insert("rx8SubsamplingIndex", QJsonValue(rx8_subsampling_index));
|
||||||
}
|
}
|
||||||
if(m_sample_rate_index_isSet){
|
if(m_sample_rate_index_isSet){
|
||||||
obj->insert("sampleRateIndex", QJsonValue(sample_rate_index));
|
obj->insert("sampleRateIndex", QJsonValue(sample_rate_index));
|
||||||
@ -335,14 +475,84 @@ SWGMetisMISOSettings::setTxEnable(qint32 tx_enable) {
|
|||||||
this->m_tx_enable_isSet = true;
|
this->m_tx_enable_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<qint64>*
|
qint64
|
||||||
SWGMetisMISOSettings::getRxCenterFrequencies() {
|
SWGMetisMISOSettings::getRx1CenterFrequency() {
|
||||||
return rx_center_frequencies;
|
return rx1_center_frequency;
|
||||||
}
|
}
|
||||||
void
|
void
|
||||||
SWGMetisMISOSettings::setRxCenterFrequencies(QList<qint64>* rx_center_frequencies) {
|
SWGMetisMISOSettings::setRx1CenterFrequency(qint64 rx1_center_frequency) {
|
||||||
this->rx_center_frequencies = rx_center_frequencies;
|
this->rx1_center_frequency = rx1_center_frequency;
|
||||||
this->m_rx_center_frequencies_isSet = true;
|
this->m_rx1_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx2CenterFrequency() {
|
||||||
|
return rx2_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx2CenterFrequency(qint64 rx2_center_frequency) {
|
||||||
|
this->rx2_center_frequency = rx2_center_frequency;
|
||||||
|
this->m_rx2_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx3CenterFrequency() {
|
||||||
|
return rx3_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx3CenterFrequency(qint64 rx3_center_frequency) {
|
||||||
|
this->rx3_center_frequency = rx3_center_frequency;
|
||||||
|
this->m_rx3_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx4CenterFrequency() {
|
||||||
|
return rx4_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx4CenterFrequency(qint64 rx4_center_frequency) {
|
||||||
|
this->rx4_center_frequency = rx4_center_frequency;
|
||||||
|
this->m_rx4_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx5CenterFrequency() {
|
||||||
|
return rx5_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx5CenterFrequency(qint64 rx5_center_frequency) {
|
||||||
|
this->rx5_center_frequency = rx5_center_frequency;
|
||||||
|
this->m_rx5_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx6CenterFrequency() {
|
||||||
|
return rx6_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx6CenterFrequency(qint64 rx6_center_frequency) {
|
||||||
|
this->rx6_center_frequency = rx6_center_frequency;
|
||||||
|
this->m_rx6_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx7CenterFrequency() {
|
||||||
|
return rx7_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx7CenterFrequency(qint64 rx7_center_frequency) {
|
||||||
|
this->rx7_center_frequency = rx7_center_frequency;
|
||||||
|
this->m_rx7_center_frequency_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint64
|
||||||
|
SWGMetisMISOSettings::getRx8CenterFrequency() {
|
||||||
|
return rx8_center_frequency;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx8CenterFrequency(qint64 rx8_center_frequency) {
|
||||||
|
this->rx8_center_frequency = rx8_center_frequency;
|
||||||
|
this->m_rx8_center_frequency_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
qint64
|
qint64
|
||||||
@ -405,14 +615,84 @@ SWGMetisMISOSettings::setIqOrder(qint32 iq_order) {
|
|||||||
this->m_iq_order_isSet = true;
|
this->m_iq_order_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<qint32>*
|
qint32
|
||||||
SWGMetisMISOSettings::getRxSubsamplingIndexes() {
|
SWGMetisMISOSettings::getRx1SubsamplingIndex() {
|
||||||
return rx_subsampling_indexes;
|
return rx1_subsampling_index;
|
||||||
}
|
}
|
||||||
void
|
void
|
||||||
SWGMetisMISOSettings::setRxSubsamplingIndexes(QList<qint32>* rx_subsampling_indexes) {
|
SWGMetisMISOSettings::setRx1SubsamplingIndex(qint32 rx1_subsampling_index) {
|
||||||
this->rx_subsampling_indexes = rx_subsampling_indexes;
|
this->rx1_subsampling_index = rx1_subsampling_index;
|
||||||
this->m_rx_subsampling_indexes_isSet = true;
|
this->m_rx1_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx2SubsamplingIndex() {
|
||||||
|
return rx2_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx2SubsamplingIndex(qint32 rx2_subsampling_index) {
|
||||||
|
this->rx2_subsampling_index = rx2_subsampling_index;
|
||||||
|
this->m_rx2_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx3SubsamplingIndex() {
|
||||||
|
return rx3_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx3SubsamplingIndex(qint32 rx3_subsampling_index) {
|
||||||
|
this->rx3_subsampling_index = rx3_subsampling_index;
|
||||||
|
this->m_rx3_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx4SubsamplingIndex() {
|
||||||
|
return rx4_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx4SubsamplingIndex(qint32 rx4_subsampling_index) {
|
||||||
|
this->rx4_subsampling_index = rx4_subsampling_index;
|
||||||
|
this->m_rx4_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx5SubsamplingIndex() {
|
||||||
|
return rx5_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx5SubsamplingIndex(qint32 rx5_subsampling_index) {
|
||||||
|
this->rx5_subsampling_index = rx5_subsampling_index;
|
||||||
|
this->m_rx5_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx6SubsamplingIndex() {
|
||||||
|
return rx6_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx6SubsamplingIndex(qint32 rx6_subsampling_index) {
|
||||||
|
this->rx6_subsampling_index = rx6_subsampling_index;
|
||||||
|
this->m_rx6_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx7SubsamplingIndex() {
|
||||||
|
return rx7_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx7SubsamplingIndex(qint32 rx7_subsampling_index) {
|
||||||
|
this->rx7_subsampling_index = rx7_subsampling_index;
|
||||||
|
this->m_rx7_subsampling_index_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
qint32
|
||||||
|
SWGMetisMISOSettings::getRx8SubsamplingIndex() {
|
||||||
|
return rx8_subsampling_index;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGMetisMISOSettings::setRx8SubsamplingIndex(qint32 rx8_subsampling_index) {
|
||||||
|
this->rx8_subsampling_index = rx8_subsampling_index;
|
||||||
|
this->m_rx8_subsampling_index_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
qint32
|
qint32
|
||||||
@ -566,10 +846,28 @@ SWGMetisMISOSettings::isSet(){
|
|||||||
if(m_tx_enable_isSet){
|
if(m_tx_enable_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
if(m_rx_center_frequencies_isSet){
|
if(m_rx1_center_frequency_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
if(rx_center_frequencies && (rx_center_frequencies->size() > 0)){
|
if(m_rx2_center_frequency_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx3_center_frequency_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx4_center_frequency_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx5_center_frequency_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx6_center_frequency_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx7_center_frequency_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx8_center_frequency_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
if(m_tx_center_frequency_isSet){
|
if(m_tx_center_frequency_isSet){
|
||||||
@ -590,10 +888,28 @@ SWGMetisMISOSettings::isSet(){
|
|||||||
if(m_iq_order_isSet){
|
if(m_iq_order_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
if(m_rx_subsampling_indexes_isSet){
|
if(m_rx1_subsampling_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
if(rx_subsampling_indexes && (rx_subsampling_indexes->size() > 0)){
|
if(m_rx2_subsampling_index_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx3_subsampling_index_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx4_subsampling_index_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx5_subsampling_index_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx6_subsampling_index_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx7_subsampling_index_isSet){
|
||||||
|
isObjectUpdated = true; break;
|
||||||
|
}
|
||||||
|
if(m_rx8_subsampling_index_isSet){
|
||||||
isObjectUpdated = true; break;
|
isObjectUpdated = true; break;
|
||||||
}
|
}
|
||||||
if(m_sample_rate_index_isSet){
|
if(m_sample_rate_index_isSet){
|
||||||
|
|||||||
@ -22,7 +22,6 @@
|
|||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
|
||||||
|
|
||||||
#include <QList>
|
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
#include "SWGObject.h"
|
#include "SWGObject.h"
|
||||||
@ -49,8 +48,29 @@ public:
|
|||||||
qint32 getTxEnable();
|
qint32 getTxEnable();
|
||||||
void setTxEnable(qint32 tx_enable);
|
void setTxEnable(qint32 tx_enable);
|
||||||
|
|
||||||
QList<qint64>* getRxCenterFrequencies();
|
qint64 getRx1CenterFrequency();
|
||||||
void setRxCenterFrequencies(QList<qint64>* rx_center_frequencies);
|
void setRx1CenterFrequency(qint64 rx1_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx2CenterFrequency();
|
||||||
|
void setRx2CenterFrequency(qint64 rx2_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx3CenterFrequency();
|
||||||
|
void setRx3CenterFrequency(qint64 rx3_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx4CenterFrequency();
|
||||||
|
void setRx4CenterFrequency(qint64 rx4_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx5CenterFrequency();
|
||||||
|
void setRx5CenterFrequency(qint64 rx5_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx6CenterFrequency();
|
||||||
|
void setRx6CenterFrequency(qint64 rx6_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx7CenterFrequency();
|
||||||
|
void setRx7CenterFrequency(qint64 rx7_center_frequency);
|
||||||
|
|
||||||
|
qint64 getRx8CenterFrequency();
|
||||||
|
void setRx8CenterFrequency(qint64 rx8_center_frequency);
|
||||||
|
|
||||||
qint64 getTxCenterFrequency();
|
qint64 getTxCenterFrequency();
|
||||||
void setTxCenterFrequency(qint64 tx_center_frequency);
|
void setTxCenterFrequency(qint64 tx_center_frequency);
|
||||||
@ -70,8 +90,29 @@ public:
|
|||||||
qint32 getIqOrder();
|
qint32 getIqOrder();
|
||||||
void setIqOrder(qint32 iq_order);
|
void setIqOrder(qint32 iq_order);
|
||||||
|
|
||||||
QList<qint32>* getRxSubsamplingIndexes();
|
qint32 getRx1SubsamplingIndex();
|
||||||
void setRxSubsamplingIndexes(QList<qint32>* rx_subsampling_indexes);
|
void setRx1SubsamplingIndex(qint32 rx1_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx2SubsamplingIndex();
|
||||||
|
void setRx2SubsamplingIndex(qint32 rx2_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx3SubsamplingIndex();
|
||||||
|
void setRx3SubsamplingIndex(qint32 rx3_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx4SubsamplingIndex();
|
||||||
|
void setRx4SubsamplingIndex(qint32 rx4_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx5SubsamplingIndex();
|
||||||
|
void setRx5SubsamplingIndex(qint32 rx5_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx6SubsamplingIndex();
|
||||||
|
void setRx6SubsamplingIndex(qint32 rx6_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx7SubsamplingIndex();
|
||||||
|
void setRx7SubsamplingIndex(qint32 rx7_subsampling_index);
|
||||||
|
|
||||||
|
qint32 getRx8SubsamplingIndex();
|
||||||
|
void setRx8SubsamplingIndex(qint32 rx8_subsampling_index);
|
||||||
|
|
||||||
qint32 getSampleRateIndex();
|
qint32 getSampleRateIndex();
|
||||||
void setSampleRateIndex(qint32 sample_rate_index);
|
void setSampleRateIndex(qint32 sample_rate_index);
|
||||||
@ -125,8 +166,29 @@ private:
|
|||||||
qint32 tx_enable;
|
qint32 tx_enable;
|
||||||
bool m_tx_enable_isSet;
|
bool m_tx_enable_isSet;
|
||||||
|
|
||||||
QList<qint64>* rx_center_frequencies;
|
qint64 rx1_center_frequency;
|
||||||
bool m_rx_center_frequencies_isSet;
|
bool m_rx1_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx2_center_frequency;
|
||||||
|
bool m_rx2_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx3_center_frequency;
|
||||||
|
bool m_rx3_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx4_center_frequency;
|
||||||
|
bool m_rx4_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx5_center_frequency;
|
||||||
|
bool m_rx5_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx6_center_frequency;
|
||||||
|
bool m_rx6_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx7_center_frequency;
|
||||||
|
bool m_rx7_center_frequency_isSet;
|
||||||
|
|
||||||
|
qint64 rx8_center_frequency;
|
||||||
|
bool m_rx8_center_frequency_isSet;
|
||||||
|
|
||||||
qint64 tx_center_frequency;
|
qint64 tx_center_frequency;
|
||||||
bool m_tx_center_frequency_isSet;
|
bool m_tx_center_frequency_isSet;
|
||||||
@ -146,8 +208,29 @@ private:
|
|||||||
qint32 iq_order;
|
qint32 iq_order;
|
||||||
bool m_iq_order_isSet;
|
bool m_iq_order_isSet;
|
||||||
|
|
||||||
QList<qint32>* rx_subsampling_indexes;
|
qint32 rx1_subsampling_index;
|
||||||
bool m_rx_subsampling_indexes_isSet;
|
bool m_rx1_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx2_subsampling_index;
|
||||||
|
bool m_rx2_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx3_subsampling_index;
|
||||||
|
bool m_rx3_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx4_subsampling_index;
|
||||||
|
bool m_rx4_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx5_subsampling_index;
|
||||||
|
bool m_rx5_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx6_subsampling_index;
|
||||||
|
bool m_rx6_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx7_subsampling_index;
|
||||||
|
bool m_rx7_subsampling_index_isSet;
|
||||||
|
|
||||||
|
qint32 rx8_subsampling_index;
|
||||||
|
bool m_rx8_subsampling_index_isSet;
|
||||||
|
|
||||||
qint32 sample_rate_index;
|
qint32 sample_rate_index;
|
||||||
bool m_sample_rate_index_isSet;
|
bool m_sample_rate_index_isSet;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user