mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

v7: VORDemod to VORDemodMC conversion in swagger. Part of #1223

pull/1500/head
f4exb 2022-05-01 11:25:15 +02:00
rodzic 046b79cab3
commit c2bcd990b9
24 zmienionych plików z 1164 dodań i 262 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

104
plugins/channelrx/demodvormc/vordemodmc.cpp
Wyświetl plik

@ -43,7 +43,7 @@
MESSAGE_CLASS_DEFINITION(VORDemodMC::MsgConfigureVORDemod, Message)
const char * const VORDemodMC::m_channelIdURI = "sdrangel.channel.vordemod";
const char * const VORDemodMC::m_channelIdURI = "sdrangel.channel.vordemodmc";
const char * const VORDemodMC::m_channelId = "VORDemodMC";
VORDemodMC::VORDemodMC(DeviceAPI *deviceAPI) :
@ -277,8 +277,8 @@ int VORDemodMC::webapiSettingsGet(
QString& errorMessage)
{
(void) errorMessage;
response.setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings());
response.getVorDemodSettings()->init();
response.setVorDemodMcSettings(new SWGSDRangel::SWGVORDemodMCSettings());
response.getVorDemodMcSettings()->init();
webapiFormatChannelSettings(response, m_settings);
return 200;
}
@ -314,53 +314,53 @@ void VORDemodMC::webapiUpdateChannelSettings(
SWGSDRangel::SWGChannelSettings& response)
{
if (channelSettingsKeys.contains("audioMute")) {
settings.m_audioMute = response.getVorDemodSettings()->getAudioMute() != 0;
settings.m_audioMute = response.getVorDemodMcSettings()->getAudioMute() != 0;
}
if (channelSettingsKeys.contains("rgbColor")) {
settings.m_rgbColor = response.getVorDemodSettings()->getRgbColor();
settings.m_rgbColor = response.getVorDemodMcSettings()->getRgbColor();
}
if (channelSettingsKeys.contains("squelch")) {
settings.m_squelch = response.getVorDemodSettings()->getSquelch();
settings.m_squelch = response.getVorDemodMcSettings()->getSquelch();
}
if (channelSettingsKeys.contains("title")) {
settings.m_title = *response.getVorDemodSettings()->getTitle();
settings.m_title = *response.getVorDemodMcSettings()->getTitle();
}
if (channelSettingsKeys.contains("volume")) {
settings.m_volume = response.getVorDemodSettings()->getVolume();
settings.m_volume = response.getVorDemodMcSettings()->getVolume();
}
if (channelSettingsKeys.contains("audioDeviceName")) {
settings.m_audioDeviceName = *response.getVorDemodSettings()->getAudioDeviceName();
settings.m_audioDeviceName = *response.getVorDemodMcSettings()->getAudioDeviceName();
}
if (channelSettingsKeys.contains("streamIndex")) {
settings.m_streamIndex = response.getVorDemodSettings()->getStreamIndex();
settings.m_streamIndex = response.getVorDemodMcSettings()->getStreamIndex();
}
if (channelSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getVorDemodSettings()->getUseReverseApi() != 0;
settings.m_useReverseAPI = response.getVorDemodMcSettings()->getUseReverseApi() != 0;
}
if (channelSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getVorDemodSettings()->getReverseApiAddress();
settings.m_reverseAPIAddress = *response.getVorDemodMcSettings()->getReverseApiAddress();
}
if (channelSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getVorDemodSettings()->getReverseApiPort();
settings.m_reverseAPIPort = response.getVorDemodMcSettings()->getReverseApiPort();
}
if (channelSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getVorDemodSettings()->getReverseApiDeviceIndex();
settings.m_reverseAPIDeviceIndex = response.getVorDemodMcSettings()->getReverseApiDeviceIndex();
}
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getVorDemodSettings()->getReverseApiChannelIndex();
settings.m_reverseAPIChannelIndex = response.getVorDemodMcSettings()->getReverseApiChannelIndex();
}
if (channelSettingsKeys.contains("identThreshold")) {
settings.m_identThreshold = response.getVorDemodSettings()->getIdentThreshold();
settings.m_identThreshold = response.getVorDemodMcSettings()->getIdentThreshold();
}
if (channelSettingsKeys.contains("magDecAdjust")) {
settings.m_magDecAdjust = response.getVorDemodSettings()->getMagDecAdjust() != 0;
settings.m_magDecAdjust = response.getVorDemodMcSettings()->getMagDecAdjust() != 0;
}
if (settings.m_channelMarker && channelSettingsKeys.contains("channelMarker")) {
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getVorDemodSettings()->getChannelMarker());
settings.m_channelMarker->updateFrom(channelSettingsKeys, response.getVorDemodMcSettings()->getChannelMarker());
}
if (settings.m_rollupState && channelSettingsKeys.contains("rollupState")) {
settings.m_rollupState->updateFrom(channelSettingsKeys, response.getVorDemodSettings()->getRollupState());
settings.m_rollupState->updateFrom(channelSettingsKeys, response.getVorDemodMcSettings()->getRollupState());
}
}
@ -369,72 +369,72 @@ int VORDemodMC::webapiReportGet(
QString& errorMessage)
{
(void) errorMessage;
response.setVorDemodReport(new SWGSDRangel::SWGVORDemodReport());
response.getVorDemodReport()->init();
response.setVorDemodMcReport(new SWGSDRangel::SWGVORDemodMCReport());
response.getVorDemodMcReport()->init();
webapiFormatChannelReport(response);
return 200;
}
void VORDemodMC::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const VORDemodMCSettings& settings)
{
response.getVorDemodSettings()->setAudioMute(settings.m_audioMute ? 1 : 0);
response.getVorDemodSettings()->setRgbColor(settings.m_rgbColor);
response.getVorDemodSettings()->setSquelch(settings.m_squelch);
response.getVorDemodSettings()->setVolume(settings.m_volume);
response.getVorDemodMcSettings()->setAudioMute(settings.m_audioMute ? 1 : 0);
response.getVorDemodMcSettings()->setRgbColor(settings.m_rgbColor);
response.getVorDemodMcSettings()->setSquelch(settings.m_squelch);
response.getVorDemodMcSettings()->setVolume(settings.m_volume);
if (response.getVorDemodSettings()->getTitle()) {
*response.getVorDemodSettings()->getTitle() = settings.m_title;
if (response.getVorDemodMcSettings()->getTitle()) {
*response.getVorDemodMcSettings()->getTitle() = settings.m_title;
} else {
response.getVorDemodSettings()->setTitle(new QString(settings.m_title));
response.getVorDemodMcSettings()->setTitle(new QString(settings.m_title));
}
if (response.getVorDemodSettings()->getAudioDeviceName()) {
*response.getVorDemodSettings()->getAudioDeviceName() = settings.m_audioDeviceName;
if (response.getVorDemodMcSettings()->getAudioDeviceName()) {
*response.getVorDemodMcSettings()->getAudioDeviceName() = settings.m_audioDeviceName;
} else {
response.getVorDemodSettings()->setAudioDeviceName(new QString(settings.m_audioDeviceName));
response.getVorDemodMcSettings()->setAudioDeviceName(new QString(settings.m_audioDeviceName));
}
response.getVorDemodSettings()->setStreamIndex(settings.m_streamIndex);
response.getVorDemodSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
response.getVorDemodMcSettings()->setStreamIndex(settings.m_streamIndex);
response.getVorDemodMcSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
if (response.getVorDemodSettings()->getReverseApiAddress()) {
*response.getVorDemodSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
if (response.getVorDemodMcSettings()->getReverseApiAddress()) {
*response.getVorDemodMcSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
} else {
response.getVorDemodSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
response.getVorDemodMcSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
}
response.getVorDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getVorDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getVorDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
response.getVorDemodMcSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getVorDemodMcSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getVorDemodMcSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
response.getVorDemodSettings()->setIdentThreshold(settings.m_identThreshold);
response.getVorDemodSettings()->setMagDecAdjust(settings.m_magDecAdjust ? 1 : 0);
response.getVorDemodMcSettings()->setIdentThreshold(settings.m_identThreshold);
response.getVorDemodMcSettings()->setMagDecAdjust(settings.m_magDecAdjust ? 1 : 0);
if (settings.m_channelMarker)
{
if (response.getVorDemodSettings()->getChannelMarker())
if (response.getVorDemodMcSettings()->getChannelMarker())
{
settings.m_channelMarker->formatTo(response.getVorDemodSettings()->getChannelMarker());
settings.m_channelMarker->formatTo(response.getVorDemodMcSettings()->getChannelMarker());
}
else
{
SWGSDRangel::SWGChannelMarker *swgChannelMarker = new SWGSDRangel::SWGChannelMarker();
settings.m_channelMarker->formatTo(swgChannelMarker);
response.getVorDemodSettings()->setChannelMarker(swgChannelMarker);
response.getVorDemodMcSettings()->setChannelMarker(swgChannelMarker);
}
}
if (settings.m_rollupState)
{
if (response.getVorDemodSettings()->getRollupState())
if (response.getVorDemodMcSettings()->getRollupState())
{
settings.m_rollupState->formatTo(response.getVorDemodSettings()->getRollupState());
settings.m_rollupState->formatTo(response.getVorDemodMcSettings()->getRollupState());
}
else
{
SWGSDRangel::SWGRollupState *swgRollupState = new SWGSDRangel::SWGRollupState();
settings.m_rollupState->formatTo(swgRollupState);
response.getVorDemodSettings()->setRollupState(swgRollupState);
response.getVorDemodMcSettings()->setRollupState(swgRollupState);
}
}
}
@ -445,9 +445,9 @@ void VORDemodMC::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& respon
int nbMagsqSamples;
getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples);
response.getVorDemodReport()->setChannelPowerDb(CalcDb::dbPower(magsqAvg));
response.getVorDemodReport()->setSquelch(m_basebandSink->getSquelchOpen() ? 1 : 0);
response.getVorDemodReport()->setAudioSampleRate(m_basebandSink->getAudioSampleRate());
response.getVorDemodMcReport()->setChannelPowerDb(CalcDb::dbPower(magsqAvg));
response.getVorDemodMcReport()->setSquelch(m_basebandSink->getSquelchOpen() ? 1 : 0);
response.getVorDemodMcReport()->setAudioSampleRate(m_basebandSink->getAudioSampleRate());
}
void VORDemodMC::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const VORDemodMCSettings& settings, bool force)
@ -511,8 +511,8 @@ void VORDemodMC::webapiFormatChannelSettings(
swgChannelSettings->setOriginatorChannelIndex(getIndexInDeviceSet());
swgChannelSettings->setOriginatorDeviceSetIndex(getDeviceSetIndex());
swgChannelSettings->setChannelType(new QString("VORDemodMC"));
swgChannelSettings->setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings());
SWGSDRangel::SWGVORDemodSettings *swgVORDemodSettings = swgChannelSettings->getVorDemodSettings();
swgChannelSettings->setVorDemodMcSettings(new SWGSDRangel::SWGVORDemodMCSettings());
SWGSDRangel::SWGVORDemodMCSettings *swgVORDemodSettings = swgChannelSettings->getVorDemodMcSettings();
// transfer data that has been modified. When force is on transfer all data except reverse API data

2
plugins/channelrx/demodvormc/vordemodmcplugin.h
Wyświetl plik

@ -28,7 +28,7 @@ class BasebandSampleSink;
class VORDemodMCPlugin : public QObject, PluginInterface {
Q_OBJECT
Q_INTERFACES(PluginInterface)
Q_PLUGIN_METADATA(IID "sdrangel.channel.vordemod")
Q_PLUGIN_METADATA(IID "sdrangel.channel.vordemodmc")
public:
explicit VORDemodMCPlugin(QObject* parent = NULL);

4
plugins/channelrx/demodvormc/vordemodmcwebapiadapter.cpp
Wyświetl plik

@ -31,8 +31,8 @@ int VORDemodMCWebAPIAdapter::webapiSettingsGet(
QString& errorMessage)
{
(void) errorMessage;
response.setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings());
response.getVorDemodSettings()->init();
response.setVorDemodMcSettings(new SWGSDRangel::SWGVORDemodMCSettings());
response.getVorDemodMcSettings()->init();
VORDemodMC::webapiFormatChannelSettings(response, m_settings);
return 200;

4
plugins/channelrx/demodvorsc/vordemodscwebapiadapter.cpp
Wyświetl plik

@ -31,8 +31,8 @@ int VORDemodSCWebAPIAdapter::webapiSettingsGet(
QString& errorMessage)
{
(void) errorMessage;
response.setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings());
response.getVorDemodSettings()->init();
response.setVorDemodScSettings(new SWGSDRangel::SWGVORDemodSCSettings());
response.getVorDemodScSettings()->init();
VORDemodSC::webapiFormatChannelSettings(response, m_settings);
return 200;

134
sdrbase/resources/webapi/doc/html2/index.html
Wyświetl plik

@ -3377,8 +3377,8 @@ margin-bottom: 20px;
"UDPSinkReport" : {
"$ref" : "#/definitions/UDPSinkReport"
},
"VORDemodReport" : {
"$ref" : "#/definitions/VORDemodReport"
"VORDemodMCReport" : {
"$ref" : "#/definitions/VORDemodMCReport"
},
"VORDemodSCReport" : {
"$ref" : "#/definitions/VORDemodSCReport"
@ -3538,8 +3538,8 @@ margin-bottom: 20px;
"UDPSinkSettings" : {
"$ref" : "#/definitions/UDPSinkSettings"
},
"VORDemodSettings" : {
"$ref" : "#/definitions/VORDemodSettings"
"VORDemodMCSettings" : {
"$ref" : "#/definitions/VORDemodMCSettings"
},
"VORDemodSCSettings" : {
"$ref" : "#/definitions/VORDemodSCSettings"
@ -13616,7 +13616,7 @@ margin-bottom: 20px;
},
"description" : "USRP"
};
defs.VORDemodReport = {
defs.VORDemodMCReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
@ -13631,7 +13631,67 @@ margin-bottom: 20px;
"type" : "integer"
}
},
"description" : "VORDemod"
"description" : "VORDemodMC"
};
defs.VORDemodMCSettings = {
"properties" : {
"squelch" : {
"type" : "number",
"format" : "float",
"description" : "power squelch threshold in decibels"
},
"volume" : {
"type" : "number",
"format" : "float"
},
"audioMute" : {
"type" : "integer"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"audioDeviceName" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
},
"identThreshold" : {
"type" : "integer",
"description" : "Morse code ident threshold (linear SNR)"
},
"magDecAdjust" : {
"type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
},
"rollupState" : {
"$ref" : "#/definitions/RollupState"
}
},
"description" : "VORDemodMC"
};
defs.VORDemodSCReport = {
"properties" : {
@ -13752,66 +13812,6 @@ margin-bottom: 20px;
}
},
"description" : "VORDemodSC"
};
defs.VORDemodSettings = {
"properties" : {
"squelch" : {
"type" : "number",
"format" : "float",
"description" : "power squelch threshold in decibels"
},
"volume" : {
"type" : "number",
"format" : "float"
},
"audioMute" : {
"type" : "integer"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"audioDeviceName" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
},
"identThreshold" : {
"type" : "integer",
"description" : "Morse code ident threshold (linear SNR)"
},
"magDecAdjust" : {
"type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
},
"rollupState" : {
"$ref" : "#/definitions/RollupState"
}
},
"description" : "VORDemod"
};
defs.VORLocalizerActions = {
"properties" : {
@ -52552,7 +52552,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2022-03-05T04:59:37.901+01:00
Generated 2022-05-01T10:49:23.866+02:00
</div>
</div>
</div>

4
sdrbase/resources/webapi/doc/swagger/include/ChannelReport.yaml
Wyświetl plik

@ -77,8 +77,8 @@ ChannelReport:
$ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceReport"
UDPSinkReport:
$ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkReport"
VORDemodReport:
$ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodReport"
VORDemodMCReport:
$ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCReport"
VORDemodSCReport:
$ref: "/doc/swagger/include/VORDemodSC.yaml#/VORDemodSCReport"
WFMDemodReport:

4
sdrbase/resources/webapi/doc/swagger/include/ChannelSettings.yaml
Wyświetl plik

@ -101,8 +101,8 @@ ChannelSettings:
$ref: "/doc/swagger/include/UDPSource.yaml#/UDPSourceSettings"
UDPSinkSettings:
$ref: "/doc/swagger/include/UDPSink.yaml#/UDPSinkSettings"
VORDemodSettings:
$ref: "/doc/swagger/include/VORDemod.yaml#/VORDemodSettings"
VORDemodMCSettings:
$ref: "/doc/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings"
VORDemodSCSettings:
$ref: "/doc/swagger/include/VORDemodSC.yaml#/VORDemodSCSettings"
WFMDemodSettings:

8
sdrbase/resources/webapi/doc/swagger/include/VORDemod.yaml
Wyświetl plik

@ -1,5 +1,5 @@
VORDemodSettings:
description: VORDemod
VORDemodMCSettings:
description: VORDemodMC
properties:
squelch:
description: power squelch threshold in decibels
@ -41,8 +41,8 @@ VORDemodSettings:
rollupState:
$ref: "/doc/swagger/include/RollupState.yaml#/RollupState"
VORDemodReport:
description: VORDemod
VORDemodMCReport:
description: VORDemodMC
properties:
channelPowerDB:
description: power received in channel (dB)

55
sdrbase/resources/webapi/doc/swagger/include/VORDemodMC.yaml 100644
Wyświetl plik

@ -0,0 +1,55 @@
VORDemodMCSettings:
description: VORDemodMC
properties:
squelch:
description: power squelch threshold in decibels
type: number
format: float
volume:
type: number
format: float
audioMute:
type: integer
rgbColor:
type: integer
title:
type: string
audioDeviceName:
type: string
streamIndex:
description: MIMO channel. Not relevant when connected to SI (single Rx).
type: integer
useReverseAPI:
description: Synchronize with reverse API (1 for yes, 0 for no)
type: integer
reverseAPIAddress:
type: string
reverseAPIPort:
type: integer
reverseAPIDeviceIndex:
type: integer
reverseAPIChannelIndex:
type: integer
identThreshold:
description: Morse code ident threshold (linear SNR)
type: integer
magDecAdjust:
description: Adjust radial lines on map for magnetic declination of VOR
type: integer
channelMarker:
$ref: "/doc/swagger/include/ChannelMarker.yaml#/ChannelMarker"
rollupState:
$ref: "/doc/swagger/include/RollupState.yaml#/RollupState"
VORDemodMCReport:
description: VORDemodMC
properties:
channelPowerDB:
description: power received in channel (dB)
type: number
format: float
squelch:
description: squelch status (1 if open else 0)
type: integer
audioSampleRate:
type: integer

15
sdrbase/webapi/webapirequestmapper.cpp
Wyświetl plik

@ -4357,10 +4357,15 @@ bool WebAPIRequestMapper::getChannelSettings(
channelSettings->setUdpSinkSettings(new SWGSDRangel::SWGUDPSinkSettings());
channelSettings->getUdpSinkSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "VORDemodMCSettings")
{
channelSettings->setVorDemodMcSettings(new SWGSDRangel::SWGVORDemodMCSettings());
channelSettings->getVorDemodMcSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "VORDemodSettings")
{
channelSettings->setVorDemodSettings(new SWGSDRangel::SWGVORDemodSettings());
channelSettings->getVorDemodSettings()->fromJsonObject(settingsJsonObject);
channelSettings->setVorDemodScSettings(new SWGSDRangel::SWGVORDemodSCSettings());
channelSettings->getVorDemodScSettings()->fromJsonObject(settingsJsonObject);
}
else if (channelSettingsKey == "WFMDemodSettings")
{
@ -5077,7 +5082,8 @@ void WebAPIRequestMapper::resetChannelSettings(SWGSDRangel::SWGChannelSettings&
channelSettings.setSsbModSettings(nullptr);
channelSettings.setUdpSourceSettings(nullptr);
channelSettings.setUdpSinkSettings(nullptr);
channelSettings.setVorDemodSettings(nullptr);
channelSettings.setVorDemodMcSettings(nullptr);
channelSettings.setVorDemodScSettings(nullptr);
channelSettings.setWfmDemodSettings(nullptr);
channelSettings.setWfmModSettings(nullptr);
}
@ -5108,7 +5114,8 @@ void WebAPIRequestMapper::resetChannelReport(SWGSDRangel::SWGChannelReport& chan
channelReport.setSsbModReport(nullptr);
channelReport.setUdpSourceReport(nullptr);
channelReport.setUdpSinkReport(nullptr);
channelReport.setVorDemodReport(nullptr);
channelReport.setVorDemodMcReport(nullptr);
channelReport.setVorDemodScReport(nullptr);
channelReport.setWfmDemodReport(nullptr);
channelReport.setWfmModReport(nullptr);
}

2
sdrbase/webapi/webapiutils.cpp
Wyświetl plik

@ -69,6 +69,7 @@ const QMap<QString, QString> WebAPIUtils::m_channelURIToSettingsKey = {
{"sdrangel.channeltx.udpsink", "UDPSinkSettings"}, // remap
{"sdrangel.channel.udpsink", "UDPSinkSettings"},
{"sdrangel.channel.udpsrc", "UDPSourceSettings"}, // remap
{"sdrangel.channel.vordemodmc", "VORDemodMCSettings"},
{"sdrangel.channel.vordemod", "VORDemodSettings"},
{"sdrangel.channel.wfmdemod", "WFMDemodSettings"},
{"de.maintech.sdrangelove.channel.wfm", "WFMDemodSettings"}, // remap
@ -167,6 +168,7 @@ const QMap<QString, QString> WebAPIUtils::m_channelTypeToSettingsKey = {
{"SSBDemod", "SSBDemodSettings"},
{"UDPSink", "UDPSinkSettings"},
{"UDPSource", "UDPSourceSettings"},
{"VORDemodMC", "VORDemodMCSettings"},
{"VORDemod", "VORDemodSettings"},
{"WFMDemod", "WFMDemodSettings"},
{"WFMMod", "WFMModSettings"},

4
swagger/sdrangel/api/swagger/include/ChannelReport.yaml
Wyświetl plik

@ -77,8 +77,8 @@ ChannelReport:
$ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceReport"
UDPSinkReport:
$ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkReport"
VORDemodReport:
$ref: "http://swgserver:8081/api/swagger/include/VORDemod.yaml#/VORDemodReport"
VORDemodMCReport:
$ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCReport"
VORDemodSCReport:
$ref: "http://swgserver:8081/api/swagger/include/VORDemodSC.yaml#/VORDemodSCReport"
WFMDemodReport:

4
swagger/sdrangel/api/swagger/include/ChannelSettings.yaml
Wyświetl plik

@ -101,8 +101,8 @@ ChannelSettings:
$ref: "http://swgserver:8081/api/swagger/include/UDPSource.yaml#/UDPSourceSettings"
UDPSinkSettings:
$ref: "http://swgserver:8081/api/swagger/include/UDPSink.yaml#/UDPSinkSettings"
VORDemodSettings:
$ref: "http://swgserver:8081/api/swagger/include/VORDemod.yaml#/VORDemodSettings"
VORDemodMCSettings:
$ref: "http://swgserver:8081/api/swagger/include/VORDemodMC.yaml#/VORDemodMCSettings"
VORDemodSCSettings:
$ref: "http://swgserver:8081/api/swagger/include/VORDemodSC.yaml#/VORDemodSCSettings"
WFMDemodSettings:

8
swagger/sdrangel/api/swagger/include/VORDemod.yaml → swagger/sdrangel/api/swagger/include/VORDemodMC.yaml
Wyświetl plik

@ -1,5 +1,5 @@
VORDemodSettings:
description: VORDemod
VORDemodMCSettings:
description: VORDemodMC
properties:
squelch:
description: power squelch threshold in decibels
@ -41,8 +41,8 @@ VORDemodSettings:
rollupState:
$ref: "http://swgserver:8081/api/swagger/include/RollupState.yaml#/RollupState"
VORDemodReport:
description: VORDemod
VORDemodMCReport:
description: VORDemodMC
properties:
channelPowerDB:
description: power received in channel (dB)

134
swagger/sdrangel/code/html2/index.html
Wyświetl plik

@ -3377,8 +3377,8 @@ margin-bottom: 20px;
"UDPSinkReport" : {
"$ref" : "#/definitions/UDPSinkReport"
},
"VORDemodReport" : {
"$ref" : "#/definitions/VORDemodReport"
"VORDemodMCReport" : {
"$ref" : "#/definitions/VORDemodMCReport"
},
"VORDemodSCReport" : {
"$ref" : "#/definitions/VORDemodSCReport"
@ -3538,8 +3538,8 @@ margin-bottom: 20px;
"UDPSinkSettings" : {
"$ref" : "#/definitions/UDPSinkSettings"
},
"VORDemodSettings" : {
"$ref" : "#/definitions/VORDemodSettings"
"VORDemodMCSettings" : {
"$ref" : "#/definitions/VORDemodMCSettings"
},
"VORDemodSCSettings" : {
"$ref" : "#/definitions/VORDemodSCSettings"
@ -13616,7 +13616,7 @@ margin-bottom: 20px;
},
"description" : "USRP"
};
defs.VORDemodReport = {
defs.VORDemodMCReport = {
"properties" : {
"channelPowerDB" : {
"type" : "number",
@ -13631,7 +13631,67 @@ margin-bottom: 20px;
"type" : "integer"
}
},
"description" : "VORDemod"
"description" : "VORDemodMC"
};
defs.VORDemodMCSettings = {
"properties" : {
"squelch" : {
"type" : "number",
"format" : "float",
"description" : "power squelch threshold in decibels"
},
"volume" : {
"type" : "number",
"format" : "float"
},
"audioMute" : {
"type" : "integer"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"audioDeviceName" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
},
"identThreshold" : {
"type" : "integer",
"description" : "Morse code ident threshold (linear SNR)"
},
"magDecAdjust" : {
"type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
},
"rollupState" : {
"$ref" : "#/definitions/RollupState"
}
},
"description" : "VORDemodMC"
};
defs.VORDemodSCReport = {
"properties" : {
@ -13752,66 +13812,6 @@ margin-bottom: 20px;
}
},
"description" : "VORDemodSC"
};
defs.VORDemodSettings = {
"properties" : {
"squelch" : {
"type" : "number",
"format" : "float",
"description" : "power squelch threshold in decibels"
},
"volume" : {
"type" : "number",
"format" : "float"
},
"audioMute" : {
"type" : "integer"
},
"rgbColor" : {
"type" : "integer"
},
"title" : {
"type" : "string"
},
"audioDeviceName" : {
"type" : "string"
},
"streamIndex" : {
"type" : "integer",
"description" : "MIMO channel. Not relevant when connected to SI (single Rx)."
},
"useReverseAPI" : {
"type" : "integer",
"description" : "Synchronize with reverse API (1 for yes, 0 for no)"
},
"reverseAPIAddress" : {
"type" : "string"
},
"reverseAPIPort" : {
"type" : "integer"
},
"reverseAPIDeviceIndex" : {
"type" : "integer"
},
"reverseAPIChannelIndex" : {
"type" : "integer"
},
"identThreshold" : {
"type" : "integer",
"description" : "Morse code ident threshold (linear SNR)"
},
"magDecAdjust" : {
"type" : "integer",
"description" : "Adjust radial lines on map for magnetic declination of VOR"
},
"channelMarker" : {
"$ref" : "#/definitions/ChannelMarker"
},
"rollupState" : {
"$ref" : "#/definitions/RollupState"
}
},
"description" : "VORDemod"
};
defs.VORLocalizerActions = {
"properties" : {
@ -52552,7 +52552,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2022-03-05T04:59:37.901+01:00
Generated 2022-05-01T10:49:23.866+02:00
</div>
</div>
</div>

32
swagger/sdrangel/code/qt5/client/SWGChannelReport.cpp
Wyświetl plik

@ -98,8 +98,8 @@ SWGChannelReport::SWGChannelReport() {
m_udp_source_report_isSet = false;
udp_sink_report = nullptr;
m_udp_sink_report_isSet = false;
vor_demod_report = nullptr;
m_vor_demod_report_isSet = false;
vor_demod_mc_report = nullptr;
m_vor_demod_mc_report_isSet = false;
vor_demod_sc_report = nullptr;
m_vor_demod_sc_report_isSet = false;
wfm_demod_report = nullptr;
@ -184,8 +184,8 @@ SWGChannelReport::init() {
m_udp_source_report_isSet = false;
udp_sink_report = new SWGUDPSinkReport();
m_udp_sink_report_isSet = false;
vor_demod_report = new SWGVORDemodReport();
m_vor_demod_report_isSet = false;
vor_demod_mc_report = new SWGVORDemodMCReport();
m_vor_demod_mc_report_isSet = false;
vor_demod_sc_report = new SWGVORDemodSCReport();
m_vor_demod_sc_report_isSet = false;
wfm_demod_report = new SWGWFMDemodReport();
@ -299,8 +299,8 @@ SWGChannelReport::cleanup() {
if(udp_sink_report != nullptr) {
delete udp_sink_report;
}
if(vor_demod_report != nullptr) {
delete vor_demod_report;
if(vor_demod_mc_report != nullptr) {
delete vor_demod_mc_report;
}
if(vor_demod_sc_report != nullptr) {
delete vor_demod_sc_report;
@ -394,7 +394,7 @@ SWGChannelReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&udp_sink_report, pJson["UDPSinkReport"], "SWGUDPSinkReport", "SWGUDPSinkReport");
::SWGSDRangel::setValue(&vor_demod_report, pJson["VORDemodReport"], "SWGVORDemodReport", "SWGVORDemodReport");
::SWGSDRangel::setValue(&vor_demod_mc_report, pJson["VORDemodMCReport"], "SWGVORDemodMCReport", "SWGVORDemodMCReport");
::SWGSDRangel::setValue(&vor_demod_sc_report, pJson["VORDemodSCReport"], "SWGVORDemodSCReport", "SWGVORDemodSCReport");
@ -523,8 +523,8 @@ SWGChannelReport::asJsonObject() {
if((udp_sink_report != nullptr) && (udp_sink_report->isSet())){
toJsonValue(QString("UDPSinkReport"), udp_sink_report, obj, QString("SWGUDPSinkReport"));
}
if((vor_demod_report != nullptr) && (vor_demod_report->isSet())){
toJsonValue(QString("VORDemodReport"), vor_demod_report, obj, QString("SWGVORDemodReport"));
if((vor_demod_mc_report != nullptr) && (vor_demod_mc_report->isSet())){
toJsonValue(QString("VORDemodMCReport"), vor_demod_mc_report, obj, QString("SWGVORDemodMCReport"));
}
if((vor_demod_sc_report != nullptr) && (vor_demod_sc_report->isSet())){
toJsonValue(QString("VORDemodSCReport"), vor_demod_sc_report, obj, QString("SWGVORDemodSCReport"));
@ -889,14 +889,14 @@ SWGChannelReport::setUdpSinkReport(SWGUDPSinkReport* udp_sink_report) {
this->m_udp_sink_report_isSet = true;
}
SWGVORDemodReport*
SWGChannelReport::getVorDemodReport() {
return vor_demod_report;
SWGVORDemodMCReport*
SWGChannelReport::getVorDemodMcReport() {
return vor_demod_mc_report;
}
void
SWGChannelReport::setVorDemodReport(SWGVORDemodReport* vor_demod_report) {
this->vor_demod_report = vor_demod_report;
this->m_vor_demod_report_isSet = true;
SWGChannelReport::setVorDemodMcReport(SWGVORDemodMCReport* vor_demod_mc_report) {
this->vor_demod_mc_report = vor_demod_mc_report;
this->m_vor_demod_mc_report_isSet = true;
}
SWGVORDemodSCReport*
@ -1039,7 +1039,7 @@ SWGChannelReport::isSet(){
if(udp_sink_report && udp_sink_report->isSet()){
isObjectUpdated = true; break;
}
if(vor_demod_report && vor_demod_report->isSet()){
if(vor_demod_mc_report && vor_demod_mc_report->isSet()){
isObjectUpdated = true; break;
}
if(vor_demod_sc_report && vor_demod_sc_report->isSet()){

10
swagger/sdrangel/code/qt5/client/SWGChannelReport.h
Wyświetl plik

@ -55,7 +55,7 @@
#include "SWGSigMFFileSinkReport.h"
#include "SWGUDPSinkReport.h"
#include "SWGUDPSourceReport.h"
#include "SWGVORDemodReport.h"
#include "SWGVORDemodMCReport.h"
#include "SWGVORDemodSCReport.h"
#include "SWGWFMDemodReport.h"
#include "SWGWFMModReport.h"
@ -184,8 +184,8 @@ public:
SWGUDPSinkReport* getUdpSinkReport();
void setUdpSinkReport(SWGUDPSinkReport* udp_sink_report);
SWGVORDemodReport* getVorDemodReport();
void setVorDemodReport(SWGVORDemodReport* vor_demod_report);
SWGVORDemodMCReport* getVorDemodMcReport();
void setVorDemodMcReport(SWGVORDemodMCReport* vor_demod_mc_report);
SWGVORDemodSCReport* getVorDemodScReport();
void setVorDemodScReport(SWGVORDemodSCReport* vor_demod_sc_report);
@ -305,8 +305,8 @@ private:
SWGUDPSinkReport* udp_sink_report;
bool m_udp_sink_report_isSet;
SWGVORDemodReport* vor_demod_report;
bool m_vor_demod_report_isSet;
SWGVORDemodMCReport* vor_demod_mc_report;
bool m_vor_demod_mc_report_isSet;
SWGVORDemodSCReport* vor_demod_sc_report;
bool m_vor_demod_sc_report_isSet;

32
swagger/sdrangel/code/qt5/client/SWGChannelSettings.cpp
Wyświetl plik

@ -120,8 +120,8 @@ SWGChannelSettings::SWGChannelSettings() {
m_udp_source_settings_isSet = false;
udp_sink_settings = nullptr;
m_udp_sink_settings_isSet = false;
vor_demod_settings = nullptr;
m_vor_demod_settings_isSet = false;
vor_demod_mc_settings = nullptr;
m_vor_demod_mc_settings_isSet = false;
vor_demod_sc_settings = nullptr;
m_vor_demod_sc_settings_isSet = false;
wfm_demod_settings = nullptr;
@ -228,8 +228,8 @@ SWGChannelSettings::init() {
m_udp_source_settings_isSet = false;
udp_sink_settings = new SWGUDPSinkSettings();
m_udp_sink_settings_isSet = false;
vor_demod_settings = new SWGVORDemodSettings();
m_vor_demod_settings_isSet = false;
vor_demod_mc_settings = new SWGVORDemodMCSettings();
m_vor_demod_mc_settings_isSet = false;
vor_demod_sc_settings = new SWGVORDemodSCSettings();
m_vor_demod_sc_settings_isSet = false;
wfm_demod_settings = new SWGWFMDemodSettings();
@ -372,8 +372,8 @@ SWGChannelSettings::cleanup() {
if(udp_sink_settings != nullptr) {
delete udp_sink_settings;
}
if(vor_demod_settings != nullptr) {
delete vor_demod_settings;
if(vor_demod_mc_settings != nullptr) {
delete vor_demod_mc_settings;
}
if(vor_demod_sc_settings != nullptr) {
delete vor_demod_sc_settings;
@ -489,7 +489,7 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&udp_sink_settings, pJson["UDPSinkSettings"], "SWGUDPSinkSettings", "SWGUDPSinkSettings");
::SWGSDRangel::setValue(&vor_demod_settings, pJson["VORDemodSettings"], "SWGVORDemodSettings", "SWGVORDemodSettings");
::SWGSDRangel::setValue(&vor_demod_mc_settings, pJson["VORDemodMCSettings"], "SWGVORDemodMCSettings", "SWGVORDemodMCSettings");
::SWGSDRangel::setValue(&vor_demod_sc_settings, pJson["VORDemodSCSettings"], "SWGVORDemodSCSettings", "SWGVORDemodSCSettings");
@ -651,8 +651,8 @@ SWGChannelSettings::asJsonObject() {
if((udp_sink_settings != nullptr) && (udp_sink_settings->isSet())){
toJsonValue(QString("UDPSinkSettings"), udp_sink_settings, obj, QString("SWGUDPSinkSettings"));
}
if((vor_demod_settings != nullptr) && (vor_demod_settings->isSet())){
toJsonValue(QString("VORDemodSettings"), vor_demod_settings, obj, QString("SWGVORDemodSettings"));
if((vor_demod_mc_settings != nullptr) && (vor_demod_mc_settings->isSet())){
toJsonValue(QString("VORDemodMCSettings"), vor_demod_mc_settings, obj, QString("SWGVORDemodMCSettings"));
}
if((vor_demod_sc_settings != nullptr) && (vor_demod_sc_settings->isSet())){
toJsonValue(QString("VORDemodSCSettings"), vor_demod_sc_settings, obj, QString("SWGVORDemodSCSettings"));
@ -1127,14 +1127,14 @@ SWGChannelSettings::setUdpSinkSettings(SWGUDPSinkSettings* udp_sink_settings) {
this->m_udp_sink_settings_isSet = true;
}
SWGVORDemodSettings*
SWGChannelSettings::getVorDemodSettings() {
return vor_demod_settings;
SWGVORDemodMCSettings*
SWGChannelSettings::getVorDemodMcSettings() {
return vor_demod_mc_settings;
}
void
SWGChannelSettings::setVorDemodSettings(SWGVORDemodSettings* vor_demod_settings) {
this->vor_demod_settings = vor_demod_settings;
this->m_vor_demod_settings_isSet = true;
SWGChannelSettings::setVorDemodMcSettings(SWGVORDemodMCSettings* vor_demod_mc_settings) {
this->vor_demod_mc_settings = vor_demod_mc_settings;
this->m_vor_demod_mc_settings_isSet = true;
}
SWGVORDemodSCSettings*
@ -1310,7 +1310,7 @@ SWGChannelSettings::isSet(){
if(udp_sink_settings && udp_sink_settings->isSet()){
isObjectUpdated = true; break;
}
if(vor_demod_settings && vor_demod_settings->isSet()){
if(vor_demod_mc_settings && vor_demod_mc_settings->isSet()){
isObjectUpdated = true; break;
}
if(vor_demod_sc_settings && vor_demod_sc_settings->isSet()){

10
swagger/sdrangel/code/qt5/client/SWGChannelSettings.h
Wyświetl plik

@ -64,8 +64,8 @@
#include "SWGSigMFFileSinkSettings.h"
#include "SWGUDPSinkSettings.h"
#include "SWGUDPSourceSettings.h"
#include "SWGVORDemodMCSettings.h"
#include "SWGVORDemodSCSettings.h"
#include "SWGVORDemodSettings.h"
#include "SWGWFMDemodSettings.h"
#include "SWGWFMModSettings.h"
#include <QString>
@ -226,8 +226,8 @@ public:
SWGUDPSinkSettings* getUdpSinkSettings();
void setUdpSinkSettings(SWGUDPSinkSettings* udp_sink_settings);
SWGVORDemodSettings* getVorDemodSettings();
void setVorDemodSettings(SWGVORDemodSettings* vor_demod_settings);
SWGVORDemodMCSettings* getVorDemodMcSettings();
void setVorDemodMcSettings(SWGVORDemodMCSettings* vor_demod_mc_settings);
SWGVORDemodSCSettings* getVorDemodScSettings();
void setVorDemodScSettings(SWGVORDemodSCSettings* vor_demod_sc_settings);
@ -380,8 +380,8 @@ private:
SWGUDPSinkSettings* udp_sink_settings;
bool m_udp_sink_settings_isSet;
SWGVORDemodSettings* vor_demod_settings;
bool m_vor_demod_settings_isSet;
SWGVORDemodMCSettings* vor_demod_mc_settings;
bool m_vor_demod_mc_settings_isSet;
SWGVORDemodSCSettings* vor_demod_sc_settings;
bool m_vor_demod_sc_settings_isSet;

18
swagger/sdrangel/code/qt5/client/SWGModelFactory.h
Wyświetl plik

@ -302,10 +302,10 @@
#include "SWGUSRPInputSettings.h"
#include "SWGUSRPOutputReport.h"
#include "SWGUSRPOutputSettings.h"
#include "SWGVORDemodReport.h"
#include "SWGVORDemodMCReport.h"
#include "SWGVORDemodMCSettings.h"
#include "SWGVORDemodSCReport.h"
#include "SWGVORDemodSCSettings.h"
#include "SWGVORDemodSettings.h"
#include "SWGVORLocalizerActions.h"
#include "SWGVORLocalizerReport.h"
#include "SWGVORLocalizerSettings.h"
@ -1763,8 +1763,13 @@ namespace SWGSDRangel {
obj->init();
return obj;
}
if(QString("SWGVORDemodReport").compare(type) == 0) {
SWGVORDemodReport *obj = new SWGVORDemodReport();
if(QString("SWGVORDemodMCReport").compare(type) == 0) {
SWGVORDemodMCReport *obj = new SWGVORDemodMCReport();
obj->init();
return obj;
}
if(QString("SWGVORDemodMCSettings").compare(type) == 0) {
SWGVORDemodMCSettings *obj = new SWGVORDemodMCSettings();
obj->init();
return obj;
}
@ -1778,11 +1783,6 @@ namespace SWGSDRangel {
obj->init();
return obj;
}
if(QString("SWGVORDemodSettings").compare(type) == 0) {
SWGVORDemodSettings *obj = new SWGVORDemodSettings();
obj->init();
return obj;
}
if(QString("SWGVORLocalizerActions").compare(type) == 0) {
SWGVORLocalizerActions *obj = new SWGVORLocalizerActions();
obj->init();

154
swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.cpp 100644
Wyświetl plik

@ -0,0 +1,154 @@
/**
* 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 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: 6.0.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.
*/
#include "SWGVORDemodMCReport.h"
#include "SWGHelpers.h"
#include <QJsonDocument>
#include <QJsonArray>
#include <QObject>
#include <QDebug>
namespace SWGSDRangel {
SWGVORDemodMCReport::SWGVORDemodMCReport(QString* json) {
init();
this->fromJson(*json);
}
SWGVORDemodMCReport::SWGVORDemodMCReport() {
channel_power_db = 0.0f;
m_channel_power_db_isSet = false;
squelch = 0;
m_squelch_isSet = false;
audio_sample_rate = 0;
m_audio_sample_rate_isSet = false;
}
SWGVORDemodMCReport::~SWGVORDemodMCReport() {
this->cleanup();
}
void
SWGVORDemodMCReport::init() {
channel_power_db = 0.0f;
m_channel_power_db_isSet = false;
squelch = 0;
m_squelch_isSet = false;
audio_sample_rate = 0;
m_audio_sample_rate_isSet = false;
}
void
SWGVORDemodMCReport::cleanup() {
}
SWGVORDemodMCReport*
SWGVORDemodMCReport::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object();
this->fromJsonObject(jsonObject);
return this;
}
void
SWGVORDemodMCReport::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&channel_power_db, pJson["channelPowerDB"], "float", "");
::SWGSDRangel::setValue(&squelch, pJson["squelch"], "qint32", "");
::SWGSDRangel::setValue(&audio_sample_rate, pJson["audioSampleRate"], "qint32", "");
}
QString
SWGVORDemodMCReport::asJson ()
{
QJsonObject* obj = this->asJsonObject();
QJsonDocument doc(*obj);
QByteArray bytes = doc.toJson();
delete obj;
return QString(bytes);
}
QJsonObject*
SWGVORDemodMCReport::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if(m_channel_power_db_isSet){
obj->insert("channelPowerDB", QJsonValue(channel_power_db));
}
if(m_squelch_isSet){
obj->insert("squelch", QJsonValue(squelch));
}
if(m_audio_sample_rate_isSet){
obj->insert("audioSampleRate", QJsonValue(audio_sample_rate));
}
return obj;
}
float
SWGVORDemodMCReport::getChannelPowerDb() {
return channel_power_db;
}
void
SWGVORDemodMCReport::setChannelPowerDb(float channel_power_db) {
this->channel_power_db = channel_power_db;
this->m_channel_power_db_isSet = true;
}
qint32
SWGVORDemodMCReport::getSquelch() {
return squelch;
}
void
SWGVORDemodMCReport::setSquelch(qint32 squelch) {
this->squelch = squelch;
this->m_squelch_isSet = true;
}
qint32
SWGVORDemodMCReport::getAudioSampleRate() {
return audio_sample_rate;
}
void
SWGVORDemodMCReport::setAudioSampleRate(qint32 audio_sample_rate) {
this->audio_sample_rate = audio_sample_rate;
this->m_audio_sample_rate_isSet = true;
}
bool
SWGVORDemodMCReport::isSet(){
bool isObjectUpdated = false;
do{
if(m_channel_power_db_isSet){
isObjectUpdated = true; break;
}
if(m_squelch_isSet){
isObjectUpdated = true; break;
}
if(m_audio_sample_rate_isSet){
isObjectUpdated = true; break;
}
}while(false);
return isObjectUpdated;
}
}

70
swagger/sdrangel/code/qt5/client/SWGVORDemodMCReport.h 100644
Wyświetl plik

@ -0,0 +1,70 @@
/**
* 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 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: 6.0.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.
*/
/*
* SWGVORDemodMCReport.h
*
* VORDemodMC
*/
#ifndef SWGVORDemodMCReport_H_
#define SWGVORDemodMCReport_H_
#include <QJsonObject>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGVORDemodMCReport: public SWGObject {
public:
SWGVORDemodMCReport();
SWGVORDemodMCReport(QString* json);
virtual ~SWGVORDemodMCReport();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGVORDemodMCReport* fromJson(QString &jsonString) override;
float getChannelPowerDb();
void setChannelPowerDb(float channel_power_db);
qint32 getSquelch();
void setSquelch(qint32 squelch);
qint32 getAudioSampleRate();
void setAudioSampleRate(qint32 audio_sample_rate);
virtual bool isSet() override;
private:
float channel_power_db;
bool m_channel_power_db_isSet;
qint32 squelch;
bool m_squelch_isSet;
qint32 audio_sample_rate;
bool m_audio_sample_rate_isSet;
};
}
#endif /* SWGVORDemodMCReport_H_ */

463
swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.cpp 100644
Wyświetl plik

@ -0,0 +1,463 @@
/**
* 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 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: 6.0.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.
*/
#include "SWGVORDemodMCSettings.h"
#include "SWGHelpers.h"
#include <QJsonDocument>
#include <QJsonArray>
#include <QObject>
#include <QDebug>
namespace SWGSDRangel {
SWGVORDemodMCSettings::SWGVORDemodMCSettings(QString* json) {
init();
this->fromJson(*json);
}
SWGVORDemodMCSettings::SWGVORDemodMCSettings() {
squelch = 0.0f;
m_squelch_isSet = false;
volume = 0.0f;
m_volume_isSet = false;
audio_mute = 0;
m_audio_mute_isSet = false;
rgb_color = 0;
m_rgb_color_isSet = false;
title = nullptr;
m_title_isSet = false;
audio_device_name = nullptr;
m_audio_device_name_isSet = false;
stream_index = 0;
m_stream_index_isSet = false;
use_reverse_api = 0;
m_use_reverse_api_isSet = false;
reverse_api_address = nullptr;
m_reverse_api_address_isSet = false;
reverse_api_port = 0;
m_reverse_api_port_isSet = false;
reverse_api_device_index = 0;
m_reverse_api_device_index_isSet = false;
reverse_api_channel_index = 0;
m_reverse_api_channel_index_isSet = false;
ident_threshold = 0;
m_ident_threshold_isSet = false;
mag_dec_adjust = 0;
m_mag_dec_adjust_isSet = false;
channel_marker = nullptr;
m_channel_marker_isSet = false;
rollup_state = nullptr;
m_rollup_state_isSet = false;
}
SWGVORDemodMCSettings::~SWGVORDemodMCSettings() {
this->cleanup();
}
void
SWGVORDemodMCSettings::init() {
squelch = 0.0f;
m_squelch_isSet = false;
volume = 0.0f;
m_volume_isSet = false;
audio_mute = 0;
m_audio_mute_isSet = false;
rgb_color = 0;
m_rgb_color_isSet = false;
title = new QString("");
m_title_isSet = false;
audio_device_name = new QString("");
m_audio_device_name_isSet = false;
stream_index = 0;
m_stream_index_isSet = false;
use_reverse_api = 0;
m_use_reverse_api_isSet = false;
reverse_api_address = new QString("");
m_reverse_api_address_isSet = false;
reverse_api_port = 0;
m_reverse_api_port_isSet = false;
reverse_api_device_index = 0;
m_reverse_api_device_index_isSet = false;
reverse_api_channel_index = 0;
m_reverse_api_channel_index_isSet = false;
ident_threshold = 0;
m_ident_threshold_isSet = false;
mag_dec_adjust = 0;
m_mag_dec_adjust_isSet = false;
channel_marker = new SWGChannelMarker();
m_channel_marker_isSet = false;
rollup_state = new SWGRollupState();
m_rollup_state_isSet = false;
}
void
SWGVORDemodMCSettings::cleanup() {
if(title != nullptr) {
delete title;
}
if(audio_device_name != nullptr) {
delete audio_device_name;
}
if(reverse_api_address != nullptr) {
delete reverse_api_address;
}
if(channel_marker != nullptr) {
delete channel_marker;
}
if(rollup_state != nullptr) {
delete rollup_state;
}
}
SWGVORDemodMCSettings*
SWGVORDemodMCSettings::fromJson(QString &json) {
QByteArray array (json.toStdString().c_str());
QJsonDocument doc = QJsonDocument::fromJson(array);
QJsonObject jsonObject = doc.object();
this->fromJsonObject(jsonObject);
return this;
}
void
SWGVORDemodMCSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&squelch, pJson["squelch"], "float", "");
::SWGSDRangel::setValue(&volume, pJson["volume"], "float", "");
::SWGSDRangel::setValue(&audio_mute, pJson["audioMute"], "qint32", "");
::SWGSDRangel::setValue(&rgb_color, pJson["rgbColor"], "qint32", "");
::SWGSDRangel::setValue(&title, pJson["title"], "QString", "QString");
::SWGSDRangel::setValue(&audio_device_name, pJson["audioDeviceName"], "QString", "QString");
::SWGSDRangel::setValue(&stream_index, pJson["streamIndex"], "qint32", "");
::SWGSDRangel::setValue(&use_reverse_api, pJson["useReverseAPI"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_address, pJson["reverseAPIAddress"], "QString", "QString");
::SWGSDRangel::setValue(&reverse_api_port, pJson["reverseAPIPort"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_device_index, pJson["reverseAPIDeviceIndex"], "qint32", "");
::SWGSDRangel::setValue(&reverse_api_channel_index, pJson["reverseAPIChannelIndex"], "qint32", "");
::SWGSDRangel::setValue(&ident_threshold, pJson["identThreshold"], "qint32", "");
::SWGSDRangel::setValue(&mag_dec_adjust, pJson["magDecAdjust"], "qint32", "");
::SWGSDRangel::setValue(&channel_marker, pJson["channelMarker"], "SWGChannelMarker", "SWGChannelMarker");
::SWGSDRangel::setValue(&rollup_state, pJson["rollupState"], "SWGRollupState", "SWGRollupState");
}
QString
SWGVORDemodMCSettings::asJson ()
{
QJsonObject* obj = this->asJsonObject();
QJsonDocument doc(*obj);
QByteArray bytes = doc.toJson();
delete obj;
return QString(bytes);
}
QJsonObject*
SWGVORDemodMCSettings::asJsonObject() {
QJsonObject* obj = new QJsonObject();
if(m_squelch_isSet){
obj->insert("squelch", QJsonValue(squelch));
}
if(m_volume_isSet){
obj->insert("volume", QJsonValue(volume));
}
if(m_audio_mute_isSet){
obj->insert("audioMute", QJsonValue(audio_mute));
}
if(m_rgb_color_isSet){
obj->insert("rgbColor", QJsonValue(rgb_color));
}
if(title != nullptr && *title != QString("")){
toJsonValue(QString("title"), title, obj, QString("QString"));
}
if(audio_device_name != nullptr && *audio_device_name != QString("")){
toJsonValue(QString("audioDeviceName"), audio_device_name, obj, QString("QString"));
}
if(m_stream_index_isSet){
obj->insert("streamIndex", QJsonValue(stream_index));
}
if(m_use_reverse_api_isSet){
obj->insert("useReverseAPI", QJsonValue(use_reverse_api));
}
if(reverse_api_address != nullptr && *reverse_api_address != QString("")){
toJsonValue(QString("reverseAPIAddress"), reverse_api_address, obj, QString("QString"));
}
if(m_reverse_api_port_isSet){
obj->insert("reverseAPIPort", QJsonValue(reverse_api_port));
}
if(m_reverse_api_device_index_isSet){
obj->insert("reverseAPIDeviceIndex", QJsonValue(reverse_api_device_index));
}
if(m_reverse_api_channel_index_isSet){
obj->insert("reverseAPIChannelIndex", QJsonValue(reverse_api_channel_index));
}
if(m_ident_threshold_isSet){
obj->insert("identThreshold", QJsonValue(ident_threshold));
}
if(m_mag_dec_adjust_isSet){
obj->insert("magDecAdjust", QJsonValue(mag_dec_adjust));
}
if((channel_marker != nullptr) && (channel_marker->isSet())){
toJsonValue(QString("channelMarker"), channel_marker, obj, QString("SWGChannelMarker"));
}
if((rollup_state != nullptr) && (rollup_state->isSet())){
toJsonValue(QString("rollupState"), rollup_state, obj, QString("SWGRollupState"));
}
return obj;
}
float
SWGVORDemodMCSettings::getSquelch() {
return squelch;
}
void
SWGVORDemodMCSettings::setSquelch(float squelch) {
this->squelch = squelch;
this->m_squelch_isSet = true;
}
float
SWGVORDemodMCSettings::getVolume() {
return volume;
}
void
SWGVORDemodMCSettings::setVolume(float volume) {
this->volume = volume;
this->m_volume_isSet = true;
}
qint32
SWGVORDemodMCSettings::getAudioMute() {
return audio_mute;
}
void
SWGVORDemodMCSettings::setAudioMute(qint32 audio_mute) {
this->audio_mute = audio_mute;
this->m_audio_mute_isSet = true;
}
qint32
SWGVORDemodMCSettings::getRgbColor() {
return rgb_color;
}
void
SWGVORDemodMCSettings::setRgbColor(qint32 rgb_color) {
this->rgb_color = rgb_color;
this->m_rgb_color_isSet = true;
}
QString*
SWGVORDemodMCSettings::getTitle() {
return title;
}
void
SWGVORDemodMCSettings::setTitle(QString* title) {
this->title = title;
this->m_title_isSet = true;
}
QString*
SWGVORDemodMCSettings::getAudioDeviceName() {
return audio_device_name;
}
void
SWGVORDemodMCSettings::setAudioDeviceName(QString* audio_device_name) {
this->audio_device_name = audio_device_name;
this->m_audio_device_name_isSet = true;
}
qint32
SWGVORDemodMCSettings::getStreamIndex() {
return stream_index;
}
void
SWGVORDemodMCSettings::setStreamIndex(qint32 stream_index) {
this->stream_index = stream_index;
this->m_stream_index_isSet = true;
}
qint32
SWGVORDemodMCSettings::getUseReverseApi() {
return use_reverse_api;
}
void
SWGVORDemodMCSettings::setUseReverseApi(qint32 use_reverse_api) {
this->use_reverse_api = use_reverse_api;
this->m_use_reverse_api_isSet = true;
}
QString*
SWGVORDemodMCSettings::getReverseApiAddress() {
return reverse_api_address;
}
void
SWGVORDemodMCSettings::setReverseApiAddress(QString* reverse_api_address) {
this->reverse_api_address = reverse_api_address;
this->m_reverse_api_address_isSet = true;
}
qint32
SWGVORDemodMCSettings::getReverseApiPort() {
return reverse_api_port;
}
void
SWGVORDemodMCSettings::setReverseApiPort(qint32 reverse_api_port) {
this->reverse_api_port = reverse_api_port;
this->m_reverse_api_port_isSet = true;
}
qint32
SWGVORDemodMCSettings::getReverseApiDeviceIndex() {
return reverse_api_device_index;
}
void
SWGVORDemodMCSettings::setReverseApiDeviceIndex(qint32 reverse_api_device_index) {
this->reverse_api_device_index = reverse_api_device_index;
this->m_reverse_api_device_index_isSet = true;
}
qint32
SWGVORDemodMCSettings::getReverseApiChannelIndex() {
return reverse_api_channel_index;
}
void
SWGVORDemodMCSettings::setReverseApiChannelIndex(qint32 reverse_api_channel_index) {
this->reverse_api_channel_index = reverse_api_channel_index;
this->m_reverse_api_channel_index_isSet = true;
}
qint32
SWGVORDemodMCSettings::getIdentThreshold() {
return ident_threshold;
}
void
SWGVORDemodMCSettings::setIdentThreshold(qint32 ident_threshold) {
this->ident_threshold = ident_threshold;
this->m_ident_threshold_isSet = true;
}
qint32
SWGVORDemodMCSettings::getMagDecAdjust() {
return mag_dec_adjust;
}
void
SWGVORDemodMCSettings::setMagDecAdjust(qint32 mag_dec_adjust) {
this->mag_dec_adjust = mag_dec_adjust;
this->m_mag_dec_adjust_isSet = true;
}
SWGChannelMarker*
SWGVORDemodMCSettings::getChannelMarker() {
return channel_marker;
}
void
SWGVORDemodMCSettings::setChannelMarker(SWGChannelMarker* channel_marker) {
this->channel_marker = channel_marker;
this->m_channel_marker_isSet = true;
}
SWGRollupState*
SWGVORDemodMCSettings::getRollupState() {
return rollup_state;
}
void
SWGVORDemodMCSettings::setRollupState(SWGRollupState* rollup_state) {
this->rollup_state = rollup_state;
this->m_rollup_state_isSet = true;
}
bool
SWGVORDemodMCSettings::isSet(){
bool isObjectUpdated = false;
do{
if(m_squelch_isSet){
isObjectUpdated = true; break;
}
if(m_volume_isSet){
isObjectUpdated = true; break;
}
if(m_audio_mute_isSet){
isObjectUpdated = true; break;
}
if(m_rgb_color_isSet){
isObjectUpdated = true; break;
}
if(title && *title != QString("")){
isObjectUpdated = true; break;
}
if(audio_device_name && *audio_device_name != QString("")){
isObjectUpdated = true; break;
}
if(m_stream_index_isSet){
isObjectUpdated = true; break;
}
if(m_use_reverse_api_isSet){
isObjectUpdated = true; break;
}
if(reverse_api_address && *reverse_api_address != QString("")){
isObjectUpdated = true; break;
}
if(m_reverse_api_port_isSet){
isObjectUpdated = true; break;
}
if(m_reverse_api_device_index_isSet){
isObjectUpdated = true; break;
}
if(m_reverse_api_channel_index_isSet){
isObjectUpdated = true; break;
}
if(m_ident_threshold_isSet){
isObjectUpdated = true; break;
}
if(m_mag_dec_adjust_isSet){
isObjectUpdated = true; break;
}
if(channel_marker && channel_marker->isSet()){
isObjectUpdated = true; break;
}
if(rollup_state && rollup_state->isSet()){
isObjectUpdated = true; break;
}
}while(false);
return isObjectUpdated;
}
}

151
swagger/sdrangel/code/qt5/client/SWGVORDemodMCSettings.h 100644
Wyświetl plik

@ -0,0 +1,151 @@
/**
* 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 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: 6.0.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.
*/
/*
* SWGVORDemodMCSettings.h
*
* VORDemodMC
*/
#ifndef SWGVORDemodMCSettings_H_
#define SWGVORDemodMCSettings_H_
#include <QJsonObject>
#include "SWGChannelMarker.h"
#include "SWGRollupState.h"
#include <QString>
#include "SWGObject.h"
#include "export.h"
namespace SWGSDRangel {
class SWG_API SWGVORDemodMCSettings: public SWGObject {
public:
SWGVORDemodMCSettings();
SWGVORDemodMCSettings(QString* json);
virtual ~SWGVORDemodMCSettings();
void init();
void cleanup();
virtual QString asJson () override;
virtual QJsonObject* asJsonObject() override;
virtual void fromJsonObject(QJsonObject &json) override;
virtual SWGVORDemodMCSettings* fromJson(QString &jsonString) override;
float getSquelch();
void setSquelch(float squelch);
float getVolume();
void setVolume(float volume);
qint32 getAudioMute();
void setAudioMute(qint32 audio_mute);
qint32 getRgbColor();
void setRgbColor(qint32 rgb_color);
QString* getTitle();
void setTitle(QString* title);
QString* getAudioDeviceName();
void setAudioDeviceName(QString* audio_device_name);
qint32 getStreamIndex();
void setStreamIndex(qint32 stream_index);
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);
qint32 getReverseApiChannelIndex();
void setReverseApiChannelIndex(qint32 reverse_api_channel_index);
qint32 getIdentThreshold();
void setIdentThreshold(qint32 ident_threshold);
qint32 getMagDecAdjust();
void setMagDecAdjust(qint32 mag_dec_adjust);
SWGChannelMarker* getChannelMarker();
void setChannelMarker(SWGChannelMarker* channel_marker);
SWGRollupState* getRollupState();
void setRollupState(SWGRollupState* rollup_state);
virtual bool isSet() override;
private:
float squelch;
bool m_squelch_isSet;
float volume;
bool m_volume_isSet;
qint32 audio_mute;
bool m_audio_mute_isSet;
qint32 rgb_color;
bool m_rgb_color_isSet;
QString* title;
bool m_title_isSet;
QString* audio_device_name;
bool m_audio_device_name_isSet;
qint32 stream_index;
bool m_stream_index_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;
qint32 reverse_api_channel_index;
bool m_reverse_api_channel_index_isSet;
qint32 ident_threshold;
bool m_ident_threshold_isSet;
qint32 mag_dec_adjust;
bool m_mag_dec_adjust_isSet;
SWGChannelMarker* channel_marker;
bool m_channel_marker_isSet;
SWGRollupState* rollup_state;
bool m_rollup_state_isSet;
};
}
#endif /* SWGVORDemodMCSettings_H_ */