VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-23 18:52:28 -04:00
Code Issues Projects Releases Wiki Activity

RTL-SDR: added RF bandwidth setting in web API

Browse Source
This commit is contained in:
f4exb 2018-01-16 20:03:18 +01:00
parent 9f88ea6199
commit a793a74dd2
6 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/samplesource/rtlsdr/rtlsdrinput.cpp
View File

@ -604,6 +604,9 @@ int RTLSDRInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("transverterMode")) { if (deviceSettingsKeys.contains("transverterMode")) {
settings.m_transverterMode = response.getRtlSdrSettings()->getTransverterMode() != 0; settings.m_transverterMode = response.getRtlSdrSettings()->getTransverterMode() != 0;
} }
if (deviceSettingsKeys.contains("rfBandwidth")) {
settings.m_rfBandwidth = response.getRtlSdrSettings()->getRfBandwidth() != 0;
}
MsgConfigureRTLSDR *msg = MsgConfigureRTLSDR::create(settings, force); MsgConfigureRTLSDR *msg = MsgConfigureRTLSDR::create(settings, force);
m_inputMessageQueue.push(msg); m_inputMessageQueue.push(msg);
@ -633,6 +636,7 @@ void RTLSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
response.getRtlSdrSettings()->setNoModMode(settings.m_noModMode ? 1 : 0); response.getRtlSdrSettings()->setNoModMode(settings.m_noModMode ? 1 : 0);
response.getRtlSdrSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency); response.getRtlSdrSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
response.getRtlSdrSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0); response.getRtlSdrSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);
response.getRtlSdrSettings()->setRfBandwidth(settings.m_rfBandwidth);
} }
int RTLSDRInput::webapiRunGet( int RTLSDRInput::webapiRunGet(

5
sdrbase/resources/index.html
View File

@ -1593,6 +1593,9 @@ margin-bottom: 20px;
"transverterDeltaFrequency" : { "transverterDeltaFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "int64" "format" : "int64"
},
"rfBandwidth" : {
"type" : "integer"
} }
}, },
"description" : "RTLSDR" "description" : "RTLSDR"
@ -16906,7 +16909,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2018-01-07T01:23:55.663+01:00 Generated 2018-01-16T19:54:59.982+01:00
</div> </div>
</div> </div>
</div> </div>

2
swagger/sdrangel/api/swagger/include/RtlSdr.yaml
View File

@ -29,4 +29,6 @@ RtlSdrSettings:
transverterDeltaFrequency: transverterDeltaFrequency:
type: integer type: integer
format: int64 format: int64
rfBandwidth:
type: integer

5
swagger/sdrangel/code/html2/index.html
View File

@ -1593,6 +1593,9 @@ margin-bottom: 20px;
"transverterDeltaFrequency" : { "transverterDeltaFrequency" : {
"type" : "integer", "type" : "integer",
"format" : "int64" "format" : "int64"
},
"rfBandwidth" : {
"type" : "integer"
} }
}, },
"description" : "RTLSDR" "description" : "RTLSDR"
@ -16906,7 +16909,7 @@ except ApiException as e:
</div> </div>
<div id="generator"> <div id="generator">
<div class="content"> <div class="content">
Generated 2018-01-07T01:23:55.663+01:00 Generated 2018-01-16T19:54:59.982+01:00
</div> </div>
</div> </div>
</div> </div>

14
swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp
View File

@ -50,6 +50,7 @@ SWGRtlSdrSettings::init() {
no_mod_mode = 0; no_mod_mode = 0;
transverter_mode = 0; transverter_mode = 0;
transverter_delta_frequency = 0L; transverter_delta_frequency = 0L;
rf_bandwidth = 0;
} }
void void
@ -67,6 +68,7 @@ SWGRtlSdrSettings::cleanup() {
} }
SWGRtlSdrSettings* SWGRtlSdrSettings*
@ -93,6 +95,7 @@ SWGRtlSdrSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&no_mod_mode, pJson["noModMode"], "qint32", ""); ::SWGSDRangel::setValue(&no_mod_mode, pJson["noModMode"], "qint32", "");
::SWGSDRangel::setValue(&transverter_mode, pJson["transverterMode"], "qint32", ""); ::SWGSDRangel::setValue(&transverter_mode, pJson["transverterMode"], "qint32", "");
::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", "");
::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "qint32", "");
} }
QString QString
@ -135,6 +138,8 @@ SWGRtlSdrSettings::asJsonObject() {
obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency));
obj->insert("rfBandwidth", QJsonValue(rf_bandwidth));
return obj; return obj;
} }
@ -255,6 +260,15 @@ SWGRtlSdrSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen
this->transverter_delta_frequency = transverter_delta_frequency; this->transverter_delta_frequency = transverter_delta_frequency;
} }
qint32
SWGRtlSdrSettings::getRfBandwidth() {
return rf_bandwidth;
}
void
SWGRtlSdrSettings::setRfBandwidth(qint32 rf_bandwidth) {
this->rf_bandwidth = rf_bandwidth;
}
} }

4
swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h
View File

@ -80,6 +80,9 @@ public:
qint64 getTransverterDeltaFrequency(); qint64 getTransverterDeltaFrequency();
void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency);
qint32 getRfBandwidth();
void setRfBandwidth(qint32 rf_bandwidth);
private: private:
qint32 dev_sample_rate; qint32 dev_sample_rate;
@ -95,6 +98,7 @@ private:
qint32 no_mod_mode; qint32 no_mod_mode;
qint32 transverter_mode; qint32 transverter_mode;
qint64 transverter_delta_frequency; qint64 transverter_delta_frequency;
qint32 rf_bandwidth;
}; };
} }