mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-28 15:56:33 -04:00
SSBMod YAML file
This commit is contained in:
parent
6e1005018f
commit
b151b00182
@ -65,8 +65,6 @@ void SSBModSettings::resetToDefaults()
|
|||||||
m_agcThresholdGate = 192;
|
m_agcThresholdGate = 192;
|
||||||
m_agcThresholdDelay = 2400;
|
m_agcThresholdDelay = 2400;
|
||||||
m_rgbColor = QColor(0, 255, 0).rgb();
|
m_rgbColor = QColor(0, 255, 0).rgb();
|
||||||
m_udpAddress = "127.0.0.1";
|
|
||||||
m_udpPort = 9999;
|
|
||||||
m_title = "SSB Modulator";
|
m_title = "SSB Modulator";
|
||||||
m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName;
|
m_audioDeviceName = AudioDeviceManager::m_defaultDeviceName;
|
||||||
}
|
}
|
||||||
|
@ -49,9 +49,6 @@ struct SSBModSettings
|
|||||||
int m_agcThresholdDelay;
|
int m_agcThresholdDelay;
|
||||||
quint32 m_rgbColor;
|
quint32 m_rgbColor;
|
||||||
|
|
||||||
QString m_udpAddress;
|
|
||||||
uint16_t m_udpPort;
|
|
||||||
|
|
||||||
QString m_title;
|
QString m_title;
|
||||||
QString m_audioDeviceName;
|
QString m_audioDeviceName;
|
||||||
|
|
||||||
|
@ -1130,6 +1130,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModReport" : {
|
"NFMModReport" : {
|
||||||
"$ref" : "#/definitions/NFMModReport"
|
"$ref" : "#/definitions/NFMModReport"
|
||||||
},
|
},
|
||||||
|
"SSBModReport" : {
|
||||||
|
"$ref" : "#/definitions/SSBModReport"
|
||||||
|
},
|
||||||
"WFMModReport" : {
|
"WFMModReport" : {
|
||||||
"$ref" : "#/definitions/WFMModReport"
|
"$ref" : "#/definitions/WFMModReport"
|
||||||
}
|
}
|
||||||
@ -1160,6 +1163,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModSettings" : {
|
"NFMModSettings" : {
|
||||||
"$ref" : "#/definitions/NFMModSettings"
|
"$ref" : "#/definitions/NFMModSettings"
|
||||||
},
|
},
|
||||||
|
"SSBModSettings" : {
|
||||||
|
"$ref" : "#/definitions/SSBModSettings"
|
||||||
|
},
|
||||||
"WFMModSettings" : {
|
"WFMModSettings" : {
|
||||||
"$ref" : "#/definitions/WFMModSettings"
|
"$ref" : "#/definitions/WFMModSettings"
|
||||||
}
|
}
|
||||||
@ -1979,6 +1985,105 @@ margin-bottom: 20px;
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "RTLSDR"
|
"description" : "RTLSDR"
|
||||||
|
};
|
||||||
|
defs.SSBModReport = {
|
||||||
|
"properties" : {
|
||||||
|
"channelPowerDB" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float",
|
||||||
|
"description" : "power transmitted in channel (dB)"
|
||||||
|
},
|
||||||
|
"audioSampleRate" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelSampleRate" : {
|
||||||
|
"type" : "integer"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description" : "AMMod"
|
||||||
|
};
|
||||||
|
defs.SSBModSettings = {
|
||||||
|
"properties" : {
|
||||||
|
"inputFrequencyOffset" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64"
|
||||||
|
},
|
||||||
|
"bandwidth" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"lowCutoff" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"usb" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"toneFrequency" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"volumeFactor" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"spanLog2" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"audioBinaural" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"audioFlipChannels" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"dsb" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"audioMute" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"playLoop" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agc" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcOrder" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"agcTime" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThresholdEnable" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThreshold" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThresholdGate" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThresholdDelay" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"rgbColor" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"title" : {
|
||||||
|
"type" : "string"
|
||||||
|
},
|
||||||
|
"audioDeviceName" : {
|
||||||
|
"type" : "string"
|
||||||
|
},
|
||||||
|
"modAFInput" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"cwKeyer" : {
|
||||||
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description" : "SSBMod"
|
||||||
};
|
};
|
||||||
defs.SamplingDevice = {
|
defs.SamplingDevice = {
|
||||||
"required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
|
"required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
|
||||||
@ -20334,7 +20439,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2018-04-08T18:14:01.611+02:00
|
Generated 2018-04-12T23:48:02.735+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1753,6 +1753,8 @@ definitions:
|
|||||||
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
|
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
|
||||||
NFMModSettings:
|
NFMModSettings:
|
||||||
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
|
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModSettings"
|
||||||
|
SSBModSettings:
|
||||||
|
$ref: "/doc/swagger/include/SSBMod.yaml#/SSBModSettings"
|
||||||
WFMModSettings:
|
WFMModSettings:
|
||||||
$ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings"
|
$ref: "/doc/swagger/include/WFMMod.yaml#/WFMModSettings"
|
||||||
|
|
||||||
@ -1774,6 +1776,8 @@ definitions:
|
|||||||
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
$ref: "/doc/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
||||||
NFMModReport:
|
NFMModReport:
|
||||||
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
|
$ref: "/doc/swagger/include/NFMMod.yaml#/NFMModReport"
|
||||||
|
SSBModReport:
|
||||||
|
$ref: "/doc/swagger/include/SSBMod.yaml#/SSBModReport"
|
||||||
WFMModReport:
|
WFMModReport:
|
||||||
$ref: "/doc/swagger/include/WFMMod.yaml#/WFMModReport"
|
$ref: "/doc/swagger/include/WFMMod.yaml#/WFMModReport"
|
||||||
|
|
||||||
|
@ -1753,6 +1753,8 @@ definitions:
|
|||||||
$ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
|
$ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodSettings"
|
||||||
NFMModSettings:
|
NFMModSettings:
|
||||||
$ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings"
|
$ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModSettings"
|
||||||
|
SSBModSettings:
|
||||||
|
$ref: "http://localhost:8081/api/swagger/include/SSBMod.yaml#/SSBModSettings"
|
||||||
WFMModSettings:
|
WFMModSettings:
|
||||||
$ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings"
|
$ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModSettings"
|
||||||
|
|
||||||
@ -1774,6 +1776,8 @@ definitions:
|
|||||||
$ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
$ref: "http://localhost:8081/api/swagger/include/NFMDemod.yaml#/NFMDemodReport"
|
||||||
NFMModReport:
|
NFMModReport:
|
||||||
$ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModReport"
|
$ref: "http://localhost:8081/api/swagger/include/NFMMod.yaml#/NFMModReport"
|
||||||
|
SSBModReport:
|
||||||
|
$ref: "http://localhost:8081/api/swagger/include/SSBMod.yaml#/SSBModReport"
|
||||||
WFMModReport:
|
WFMModReport:
|
||||||
$ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModReport"
|
$ref: "http://localhost:8081/api/swagger/include/WFMMod.yaml#/WFMModReport"
|
||||||
|
|
||||||
|
@ -1130,6 +1130,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModReport" : {
|
"NFMModReport" : {
|
||||||
"$ref" : "#/definitions/NFMModReport"
|
"$ref" : "#/definitions/NFMModReport"
|
||||||
},
|
},
|
||||||
|
"SSBModReport" : {
|
||||||
|
"$ref" : "#/definitions/SSBModReport"
|
||||||
|
},
|
||||||
"WFMModReport" : {
|
"WFMModReport" : {
|
||||||
"$ref" : "#/definitions/WFMModReport"
|
"$ref" : "#/definitions/WFMModReport"
|
||||||
}
|
}
|
||||||
@ -1160,6 +1163,9 @@ margin-bottom: 20px;
|
|||||||
"NFMModSettings" : {
|
"NFMModSettings" : {
|
||||||
"$ref" : "#/definitions/NFMModSettings"
|
"$ref" : "#/definitions/NFMModSettings"
|
||||||
},
|
},
|
||||||
|
"SSBModSettings" : {
|
||||||
|
"$ref" : "#/definitions/SSBModSettings"
|
||||||
|
},
|
||||||
"WFMModSettings" : {
|
"WFMModSettings" : {
|
||||||
"$ref" : "#/definitions/WFMModSettings"
|
"$ref" : "#/definitions/WFMModSettings"
|
||||||
}
|
}
|
||||||
@ -1979,6 +1985,105 @@ margin-bottom: 20px;
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description" : "RTLSDR"
|
"description" : "RTLSDR"
|
||||||
|
};
|
||||||
|
defs.SSBModReport = {
|
||||||
|
"properties" : {
|
||||||
|
"channelPowerDB" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float",
|
||||||
|
"description" : "power transmitted in channel (dB)"
|
||||||
|
},
|
||||||
|
"audioSampleRate" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"channelSampleRate" : {
|
||||||
|
"type" : "integer"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description" : "AMMod"
|
||||||
|
};
|
||||||
|
defs.SSBModSettings = {
|
||||||
|
"properties" : {
|
||||||
|
"inputFrequencyOffset" : {
|
||||||
|
"type" : "integer",
|
||||||
|
"format" : "int64"
|
||||||
|
},
|
||||||
|
"bandwidth" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"lowCutoff" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"usb" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"toneFrequency" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"volumeFactor" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"spanLog2" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"audioBinaural" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"audioFlipChannels" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"dsb" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"audioMute" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"playLoop" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agc" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcOrder" : {
|
||||||
|
"type" : "number",
|
||||||
|
"format" : "float"
|
||||||
|
},
|
||||||
|
"agcTime" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThresholdEnable" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThreshold" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThresholdGate" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"agcThresholdDelay" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"rgbColor" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"title" : {
|
||||||
|
"type" : "string"
|
||||||
|
},
|
||||||
|
"audioDeviceName" : {
|
||||||
|
"type" : "string"
|
||||||
|
},
|
||||||
|
"modAFInput" : {
|
||||||
|
"type" : "integer"
|
||||||
|
},
|
||||||
|
"cwKeyer" : {
|
||||||
|
"$ref" : "#/definitions/CWKeyerSettings"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"description" : "SSBMod"
|
||||||
};
|
};
|
||||||
defs.SamplingDevice = {
|
defs.SamplingDevice = {
|
||||||
"required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
|
"required" : [ "bandwidth", "centerFrequency", "hwType", "index", "sequence", "serial", "state", "streamIndex" ],
|
||||||
@ -20334,7 +20439,7 @@ except ApiException as e:
|
|||||||
</div>
|
</div>
|
||||||
<div id="generator">
|
<div id="generator">
|
||||||
<div class="content">
|
<div class="content">
|
||||||
Generated 2018-04-08T18:14:01.611+02:00
|
Generated 2018-04-12T23:48:02.735+02:00
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -40,6 +40,8 @@ SWGChannelReport::SWGChannelReport() {
|
|||||||
m_nfm_demod_report_isSet = false;
|
m_nfm_demod_report_isSet = false;
|
||||||
nfm_mod_report = nullptr;
|
nfm_mod_report = nullptr;
|
||||||
m_nfm_mod_report_isSet = false;
|
m_nfm_mod_report_isSet = false;
|
||||||
|
ssb_mod_report = nullptr;
|
||||||
|
m_ssb_mod_report_isSet = false;
|
||||||
wfm_mod_report = nullptr;
|
wfm_mod_report = nullptr;
|
||||||
m_wfm_mod_report_isSet = false;
|
m_wfm_mod_report_isSet = false;
|
||||||
}
|
}
|
||||||
@ -62,6 +64,8 @@ SWGChannelReport::init() {
|
|||||||
m_nfm_demod_report_isSet = false;
|
m_nfm_demod_report_isSet = false;
|
||||||
nfm_mod_report = new SWGNFMModReport();
|
nfm_mod_report = new SWGNFMModReport();
|
||||||
m_nfm_mod_report_isSet = false;
|
m_nfm_mod_report_isSet = false;
|
||||||
|
ssb_mod_report = new SWGSSBModReport();
|
||||||
|
m_ssb_mod_report_isSet = false;
|
||||||
wfm_mod_report = new SWGWFMModReport();
|
wfm_mod_report = new SWGWFMModReport();
|
||||||
m_wfm_mod_report_isSet = false;
|
m_wfm_mod_report_isSet = false;
|
||||||
}
|
}
|
||||||
@ -84,6 +88,9 @@ SWGChannelReport::cleanup() {
|
|||||||
if(nfm_mod_report != nullptr) {
|
if(nfm_mod_report != nullptr) {
|
||||||
delete nfm_mod_report;
|
delete nfm_mod_report;
|
||||||
}
|
}
|
||||||
|
if(ssb_mod_report != nullptr) {
|
||||||
|
delete ssb_mod_report;
|
||||||
|
}
|
||||||
if(wfm_mod_report != nullptr) {
|
if(wfm_mod_report != nullptr) {
|
||||||
delete wfm_mod_report;
|
delete wfm_mod_report;
|
||||||
}
|
}
|
||||||
@ -112,6 +119,8 @@ SWGChannelReport::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&nfm_mod_report, pJson["NFMModReport"], "SWGNFMModReport", "SWGNFMModReport");
|
::SWGSDRangel::setValue(&nfm_mod_report, pJson["NFMModReport"], "SWGNFMModReport", "SWGNFMModReport");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&ssb_mod_report, pJson["SSBModReport"], "SWGSSBModReport", "SWGSSBModReport");
|
||||||
|
|
||||||
::SWGSDRangel::setValue(&wfm_mod_report, pJson["WFMModReport"], "SWGWFMModReport", "SWGWFMModReport");
|
::SWGSDRangel::setValue(&wfm_mod_report, pJson["WFMModReport"], "SWGWFMModReport", "SWGWFMModReport");
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -148,6 +157,9 @@ SWGChannelReport::asJsonObject() {
|
|||||||
if((nfm_mod_report != nullptr) && (nfm_mod_report->isSet())){
|
if((nfm_mod_report != nullptr) && (nfm_mod_report->isSet())){
|
||||||
toJsonValue(QString("NFMModReport"), nfm_mod_report, obj, QString("SWGNFMModReport"));
|
toJsonValue(QString("NFMModReport"), nfm_mod_report, obj, QString("SWGNFMModReport"));
|
||||||
}
|
}
|
||||||
|
if((ssb_mod_report != nullptr) && (ssb_mod_report->isSet())){
|
||||||
|
toJsonValue(QString("SSBModReport"), ssb_mod_report, obj, QString("SWGSSBModReport"));
|
||||||
|
}
|
||||||
if((wfm_mod_report != nullptr) && (wfm_mod_report->isSet())){
|
if((wfm_mod_report != nullptr) && (wfm_mod_report->isSet())){
|
||||||
toJsonValue(QString("WFMModReport"), wfm_mod_report, obj, QString("SWGWFMModReport"));
|
toJsonValue(QString("WFMModReport"), wfm_mod_report, obj, QString("SWGWFMModReport"));
|
||||||
}
|
}
|
||||||
@ -215,6 +227,16 @@ SWGChannelReport::setNfmModReport(SWGNFMModReport* nfm_mod_report) {
|
|||||||
this->m_nfm_mod_report_isSet = true;
|
this->m_nfm_mod_report_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGSSBModReport*
|
||||||
|
SWGChannelReport::getSsbModReport() {
|
||||||
|
return ssb_mod_report;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGChannelReport::setSsbModReport(SWGSSBModReport* ssb_mod_report) {
|
||||||
|
this->ssb_mod_report = ssb_mod_report;
|
||||||
|
this->m_ssb_mod_report_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
SWGWFMModReport*
|
SWGWFMModReport*
|
||||||
SWGChannelReport::getWfmModReport() {
|
SWGChannelReport::getWfmModReport() {
|
||||||
return wfm_mod_report;
|
return wfm_mod_report;
|
||||||
@ -236,6 +258,7 @@ SWGChannelReport::isSet(){
|
|||||||
if(am_mod_report != nullptr && am_mod_report->isSet()){ isObjectUpdated = true; break;}
|
if(am_mod_report != nullptr && am_mod_report->isSet()){ isObjectUpdated = true; break;}
|
||||||
if(nfm_demod_report != nullptr && nfm_demod_report->isSet()){ isObjectUpdated = true; break;}
|
if(nfm_demod_report != nullptr && nfm_demod_report->isSet()){ isObjectUpdated = true; break;}
|
||||||
if(nfm_mod_report != nullptr && nfm_mod_report->isSet()){ isObjectUpdated = true; break;}
|
if(nfm_mod_report != nullptr && nfm_mod_report->isSet()){ isObjectUpdated = true; break;}
|
||||||
|
if(ssb_mod_report != nullptr && ssb_mod_report->isSet()){ isObjectUpdated = true; break;}
|
||||||
if(wfm_mod_report != nullptr && wfm_mod_report->isSet()){ isObjectUpdated = true; break;}
|
if(wfm_mod_report != nullptr && wfm_mod_report->isSet()){ isObjectUpdated = true; break;}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include "SWGAMModReport.h"
|
#include "SWGAMModReport.h"
|
||||||
#include "SWGNFMDemodReport.h"
|
#include "SWGNFMDemodReport.h"
|
||||||
#include "SWGNFMModReport.h"
|
#include "SWGNFMModReport.h"
|
||||||
|
#include "SWGSSBModReport.h"
|
||||||
#include "SWGWFMModReport.h"
|
#include "SWGWFMModReport.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -65,6 +66,9 @@ public:
|
|||||||
SWGNFMModReport* getNfmModReport();
|
SWGNFMModReport* getNfmModReport();
|
||||||
void setNfmModReport(SWGNFMModReport* nfm_mod_report);
|
void setNfmModReport(SWGNFMModReport* nfm_mod_report);
|
||||||
|
|
||||||
|
SWGSSBModReport* getSsbModReport();
|
||||||
|
void setSsbModReport(SWGSSBModReport* ssb_mod_report);
|
||||||
|
|
||||||
SWGWFMModReport* getWfmModReport();
|
SWGWFMModReport* getWfmModReport();
|
||||||
void setWfmModReport(SWGWFMModReport* wfm_mod_report);
|
void setWfmModReport(SWGWFMModReport* wfm_mod_report);
|
||||||
|
|
||||||
@ -90,6 +94,9 @@ private:
|
|||||||
SWGNFMModReport* nfm_mod_report;
|
SWGNFMModReport* nfm_mod_report;
|
||||||
bool m_nfm_mod_report_isSet;
|
bool m_nfm_mod_report_isSet;
|
||||||
|
|
||||||
|
SWGSSBModReport* ssb_mod_report;
|
||||||
|
bool m_ssb_mod_report_isSet;
|
||||||
|
|
||||||
SWGWFMModReport* wfm_mod_report;
|
SWGWFMModReport* wfm_mod_report;
|
||||||
bool m_wfm_mod_report_isSet;
|
bool m_wfm_mod_report_isSet;
|
||||||
|
|
||||||
|
@ -40,6 +40,8 @@ SWGChannelSettings::SWGChannelSettings() {
|
|||||||
m_nfm_demod_settings_isSet = false;
|
m_nfm_demod_settings_isSet = false;
|
||||||
nfm_mod_settings = nullptr;
|
nfm_mod_settings = nullptr;
|
||||||
m_nfm_mod_settings_isSet = false;
|
m_nfm_mod_settings_isSet = false;
|
||||||
|
ssb_mod_settings = nullptr;
|
||||||
|
m_ssb_mod_settings_isSet = false;
|
||||||
wfm_mod_settings = nullptr;
|
wfm_mod_settings = nullptr;
|
||||||
m_wfm_mod_settings_isSet = false;
|
m_wfm_mod_settings_isSet = false;
|
||||||
}
|
}
|
||||||
@ -62,6 +64,8 @@ SWGChannelSettings::init() {
|
|||||||
m_nfm_demod_settings_isSet = false;
|
m_nfm_demod_settings_isSet = false;
|
||||||
nfm_mod_settings = new SWGNFMModSettings();
|
nfm_mod_settings = new SWGNFMModSettings();
|
||||||
m_nfm_mod_settings_isSet = false;
|
m_nfm_mod_settings_isSet = false;
|
||||||
|
ssb_mod_settings = new SWGSSBModSettings();
|
||||||
|
m_ssb_mod_settings_isSet = false;
|
||||||
wfm_mod_settings = new SWGWFMModSettings();
|
wfm_mod_settings = new SWGWFMModSettings();
|
||||||
m_wfm_mod_settings_isSet = false;
|
m_wfm_mod_settings_isSet = false;
|
||||||
}
|
}
|
||||||
@ -84,6 +88,9 @@ SWGChannelSettings::cleanup() {
|
|||||||
if(nfm_mod_settings != nullptr) {
|
if(nfm_mod_settings != nullptr) {
|
||||||
delete nfm_mod_settings;
|
delete nfm_mod_settings;
|
||||||
}
|
}
|
||||||
|
if(ssb_mod_settings != nullptr) {
|
||||||
|
delete ssb_mod_settings;
|
||||||
|
}
|
||||||
if(wfm_mod_settings != nullptr) {
|
if(wfm_mod_settings != nullptr) {
|
||||||
delete wfm_mod_settings;
|
delete wfm_mod_settings;
|
||||||
}
|
}
|
||||||
@ -112,6 +119,8 @@ SWGChannelSettings::fromJsonObject(QJsonObject &pJson) {
|
|||||||
|
|
||||||
::SWGSDRangel::setValue(&nfm_mod_settings, pJson["NFMModSettings"], "SWGNFMModSettings", "SWGNFMModSettings");
|
::SWGSDRangel::setValue(&nfm_mod_settings, pJson["NFMModSettings"], "SWGNFMModSettings", "SWGNFMModSettings");
|
||||||
|
|
||||||
|
::SWGSDRangel::setValue(&ssb_mod_settings, pJson["SSBModSettings"], "SWGSSBModSettings", "SWGSSBModSettings");
|
||||||
|
|
||||||
::SWGSDRangel::setValue(&wfm_mod_settings, pJson["WFMModSettings"], "SWGWFMModSettings", "SWGWFMModSettings");
|
::SWGSDRangel::setValue(&wfm_mod_settings, pJson["WFMModSettings"], "SWGWFMModSettings", "SWGWFMModSettings");
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -148,6 +157,9 @@ SWGChannelSettings::asJsonObject() {
|
|||||||
if((nfm_mod_settings != nullptr) && (nfm_mod_settings->isSet())){
|
if((nfm_mod_settings != nullptr) && (nfm_mod_settings->isSet())){
|
||||||
toJsonValue(QString("NFMModSettings"), nfm_mod_settings, obj, QString("SWGNFMModSettings"));
|
toJsonValue(QString("NFMModSettings"), nfm_mod_settings, obj, QString("SWGNFMModSettings"));
|
||||||
}
|
}
|
||||||
|
if((ssb_mod_settings != nullptr) && (ssb_mod_settings->isSet())){
|
||||||
|
toJsonValue(QString("SSBModSettings"), ssb_mod_settings, obj, QString("SWGSSBModSettings"));
|
||||||
|
}
|
||||||
if((wfm_mod_settings != nullptr) && (wfm_mod_settings->isSet())){
|
if((wfm_mod_settings != nullptr) && (wfm_mod_settings->isSet())){
|
||||||
toJsonValue(QString("WFMModSettings"), wfm_mod_settings, obj, QString("SWGWFMModSettings"));
|
toJsonValue(QString("WFMModSettings"), wfm_mod_settings, obj, QString("SWGWFMModSettings"));
|
||||||
}
|
}
|
||||||
@ -215,6 +227,16 @@ SWGChannelSettings::setNfmModSettings(SWGNFMModSettings* nfm_mod_settings) {
|
|||||||
this->m_nfm_mod_settings_isSet = true;
|
this->m_nfm_mod_settings_isSet = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SWGSSBModSettings*
|
||||||
|
SWGChannelSettings::getSsbModSettings() {
|
||||||
|
return ssb_mod_settings;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
SWGChannelSettings::setSsbModSettings(SWGSSBModSettings* ssb_mod_settings) {
|
||||||
|
this->ssb_mod_settings = ssb_mod_settings;
|
||||||
|
this->m_ssb_mod_settings_isSet = true;
|
||||||
|
}
|
||||||
|
|
||||||
SWGWFMModSettings*
|
SWGWFMModSettings*
|
||||||
SWGChannelSettings::getWfmModSettings() {
|
SWGChannelSettings::getWfmModSettings() {
|
||||||
return wfm_mod_settings;
|
return wfm_mod_settings;
|
||||||
@ -236,6 +258,7 @@ SWGChannelSettings::isSet(){
|
|||||||
if(am_mod_settings != nullptr && am_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
if(am_mod_settings != nullptr && am_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
||||||
if(nfm_demod_settings != nullptr && nfm_demod_settings->isSet()){ isObjectUpdated = true; break;}
|
if(nfm_demod_settings != nullptr && nfm_demod_settings->isSet()){ isObjectUpdated = true; break;}
|
||||||
if(nfm_mod_settings != nullptr && nfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
if(nfm_mod_settings != nullptr && nfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
||||||
|
if(ssb_mod_settings != nullptr && ssb_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
||||||
if(wfm_mod_settings != nullptr && wfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
if(wfm_mod_settings != nullptr && wfm_mod_settings->isSet()){ isObjectUpdated = true; break;}
|
||||||
}while(false);
|
}while(false);
|
||||||
return isObjectUpdated;
|
return isObjectUpdated;
|
||||||
|
@ -26,6 +26,7 @@
|
|||||||
#include "SWGAMModSettings.h"
|
#include "SWGAMModSettings.h"
|
||||||
#include "SWGNFMDemodSettings.h"
|
#include "SWGNFMDemodSettings.h"
|
||||||
#include "SWGNFMModSettings.h"
|
#include "SWGNFMModSettings.h"
|
||||||
|
#include "SWGSSBModSettings.h"
|
||||||
#include "SWGWFMModSettings.h"
|
#include "SWGWFMModSettings.h"
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
@ -65,6 +66,9 @@ public:
|
|||||||
SWGNFMModSettings* getNfmModSettings();
|
SWGNFMModSettings* getNfmModSettings();
|
||||||
void setNfmModSettings(SWGNFMModSettings* nfm_mod_settings);
|
void setNfmModSettings(SWGNFMModSettings* nfm_mod_settings);
|
||||||
|
|
||||||
|
SWGSSBModSettings* getSsbModSettings();
|
||||||
|
void setSsbModSettings(SWGSSBModSettings* ssb_mod_settings);
|
||||||
|
|
||||||
SWGWFMModSettings* getWfmModSettings();
|
SWGWFMModSettings* getWfmModSettings();
|
||||||
void setWfmModSettings(SWGWFMModSettings* wfm_mod_settings);
|
void setWfmModSettings(SWGWFMModSettings* wfm_mod_settings);
|
||||||
|
|
||||||
@ -90,6 +94,9 @@ private:
|
|||||||
SWGNFMModSettings* nfm_mod_settings;
|
SWGNFMModSettings* nfm_mod_settings;
|
||||||
bool m_nfm_mod_settings_isSet;
|
bool m_nfm_mod_settings_isSet;
|
||||||
|
|
||||||
|
SWGSSBModSettings* ssb_mod_settings;
|
||||||
|
bool m_ssb_mod_settings_isSet;
|
||||||
|
|
||||||
SWGWFMModSettings* wfm_mod_settings;
|
SWGWFMModSettings* wfm_mod_settings;
|
||||||
bool m_wfm_mod_settings_isSet;
|
bool m_wfm_mod_settings_isSet;
|
||||||
|
|
||||||
|
@ -60,6 +60,8 @@
|
|||||||
#include "SWGPresetTransfer.h"
|
#include "SWGPresetTransfer.h"
|
||||||
#include "SWGPresets.h"
|
#include "SWGPresets.h"
|
||||||
#include "SWGRtlSdrSettings.h"
|
#include "SWGRtlSdrSettings.h"
|
||||||
|
#include "SWGSSBModReport.h"
|
||||||
|
#include "SWGSSBModSettings.h"
|
||||||
#include "SWGSamplingDevice.h"
|
#include "SWGSamplingDevice.h"
|
||||||
#include "SWGSuccessResponse.h"
|
#include "SWGSuccessResponse.h"
|
||||||
#include "SWGWFMModReport.h"
|
#include "SWGWFMModReport.h"
|
||||||
@ -206,6 +208,12 @@ namespace SWGSDRangel {
|
|||||||
if(QString("SWGRtlSdrSettings").compare(type) == 0) {
|
if(QString("SWGRtlSdrSettings").compare(type) == 0) {
|
||||||
return new SWGRtlSdrSettings();
|
return new SWGRtlSdrSettings();
|
||||||
}
|
}
|
||||||
|
if(QString("SWGSSBModReport").compare(type) == 0) {
|
||||||
|
return new SWGSSBModReport();
|
||||||
|
}
|
||||||
|
if(QString("SWGSSBModSettings").compare(type) == 0) {
|
||||||
|
return new SWGSSBModSettings();
|
||||||
|
}
|
||||||
if(QString("SWGSamplingDevice").compare(type) == 0) {
|
if(QString("SWGSamplingDevice").compare(type) == 0) {
|
||||||
return new SWGSamplingDevice();
|
return new SWGSamplingDevice();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user