1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 12:51:49 -05:00

Web API: NFMDemod settings: removed input sample rate which is not set via API (internal)

This commit is contained in:
f4exb 2017-12-29 05:47:51 +01:00
parent af58d18eac
commit cf79a7bb56
5 changed files with 2 additions and 28 deletions

View File

@ -1299,9 +1299,6 @@ margin-bottom: 20px;
}; };
defs.NFMDemodSettings = { defs.NFMDemodSettings = {
"properties" : { "properties" : {
"inputSampleRate" : {
"type" : "integer"
},
"inputFrequencyOffset" : { "inputFrequencyOffset" : {
"type" : "integer", "type" : "integer",
"format" : "int64" "format" : "int64"
@ -16391,7 +16388,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2017-12-29T01:07:32.200+01:00 Generated 2017-12-29T05:27:24.640+01:00
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,8 +1,6 @@
NFMDemodSettings: NFMDemodSettings:
description: NFMDemod description: NFMDemod
properties: properties:
inputSampleRate:
type: integer
inputFrequencyOffset: inputFrequencyOffset:
type: integer type: integer
format: int64 format: int64

View File

@ -1299,9 +1299,6 @@ margin-bottom: 20px;
}; };
defs.NFMDemodSettings = { defs.NFMDemodSettings = {
"properties" : { "properties" : {
"inputSampleRate" : {
"type" : "integer"
},
"inputFrequencyOffset" : { "inputFrequencyOffset" : {
"type" : "integer", "type" : "integer",
"format" : "int64" "format" : "int64"
@ -16391,7 +16388,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2017-12-29T01:07:32.200+01:00 Generated 2017-12-29T05:27:24.640+01:00
</div> </div>
</div> </div>
</div> </div>

View File

@ -37,7 +37,6 @@ SWGNFMDemodSettings::~SWGNFMDemodSettings() {
void void
SWGNFMDemodSettings::init() { SWGNFMDemodSettings::init() {
input_sample_rate = 0;
input_frequency_offset = 0L; input_frequency_offset = 0L;
rf_bandwidth = 0.0f; rf_bandwidth = 0.0f;
af_bandwidth = 0.0f; af_bandwidth = 0.0f;
@ -73,7 +72,6 @@ SWGNFMDemodSettings::cleanup() {
if(udp_address != nullptr) { if(udp_address != nullptr) {
delete udp_address; delete udp_address;
} }
@ -96,7 +94,6 @@ SWGNFMDemodSettings::fromJson(QString &json) {
void void
SWGNFMDemodSettings::fromJsonObject(QJsonObject &pJson) { SWGNFMDemodSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&input_sample_rate, pJson["inputSampleRate"], "qint32", "");
::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", ""); ::SWGSDRangel::setValue(&input_frequency_offset, pJson["inputFrequencyOffset"], "qint64", "");
::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", ""); ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "float", "");
::SWGSDRangel::setValue(&af_bandwidth, pJson["afBandwidth"], "float", ""); ::SWGSDRangel::setValue(&af_bandwidth, pJson["afBandwidth"], "float", "");
@ -130,8 +127,6 @@ QJsonObject*
SWGNFMDemodSettings::asJsonObject() { SWGNFMDemodSettings::asJsonObject() {
QJsonObject* obj = new QJsonObject(); QJsonObject* obj = new QJsonObject();
obj->insert("inputSampleRate", QJsonValue(input_sample_rate));
obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset)); obj->insert("inputFrequencyOffset", QJsonValue(input_frequency_offset));
obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); obj->insert("rfBandwidth", QJsonValue(rf_bandwidth));
@ -169,15 +164,6 @@ SWGNFMDemodSettings::asJsonObject() {
return obj; return obj;
} }
qint32
SWGNFMDemodSettings::getInputSampleRate() {
return input_sample_rate;
}
void
SWGNFMDemodSettings::setInputSampleRate(qint32 input_sample_rate) {
this->input_sample_rate = input_sample_rate;
}
qint64 qint64
SWGNFMDemodSettings::getInputFrequencyOffset() { SWGNFMDemodSettings::getInputFrequencyOffset() {
return input_frequency_offset; return input_frequency_offset;

View File

@ -42,9 +42,6 @@ public:
void fromJsonObject(QJsonObject &json); void fromJsonObject(QJsonObject &json);
SWGNFMDemodSettings* fromJson(QString &jsonString); SWGNFMDemodSettings* fromJson(QString &jsonString);
qint32 getInputSampleRate();
void setInputSampleRate(qint32 input_sample_rate);
qint64 getInputFrequencyOffset(); qint64 getInputFrequencyOffset();
void setInputFrequencyOffset(qint64 input_frequency_offset); void setInputFrequencyOffset(qint64 input_frequency_offset);
@ -98,7 +95,6 @@ public:
private: private:
qint32 input_sample_rate;
qint64 input_frequency_offset; qint64 input_frequency_offset;
float rf_bandwidth; float rf_bandwidth;
float af_bandwidth; float af_bandwidth;