diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index 8236ec205..43fbe80b3 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -604,6 +604,9 @@ int RTLSDRInput::webapiSettingsPutPatch( if (deviceSettingsKeys.contains("transverterMode")) { settings.m_transverterMode = response.getRtlSdrSettings()->getTransverterMode() != 0; } + if (deviceSettingsKeys.contains("rfBandwidth")) { + settings.m_rfBandwidth = response.getRtlSdrSettings()->getRfBandwidth() != 0; + } MsgConfigureRTLSDR *msg = MsgConfigureRTLSDR::create(settings, force); m_inputMessageQueue.push(msg); @@ -633,6 +636,7 @@ void RTLSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res response.getRtlSdrSettings()->setNoModMode(settings.m_noModMode ? 1 : 0); response.getRtlSdrSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency); response.getRtlSdrSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0); + response.getRtlSdrSettings()->setRfBandwidth(settings.m_rfBandwidth); } int RTLSDRInput::webapiRunGet( diff --git a/sdrbase/resources/index.html b/sdrbase/resources/index.html index 23f6218e6..3fa9fbdbf 100644 --- a/sdrbase/resources/index.html +++ b/sdrbase/resources/index.html @@ -1593,6 +1593,9 @@ margin-bottom: 20px; "transverterDeltaFrequency" : { "type" : "integer", "format" : "int64" + }, + "rfBandwidth" : { + "type" : "integer" } }, "description" : "RTLSDR" @@ -16906,7 +16909,7 @@ except ApiException as e:
- Generated 2018-01-07T01:23:55.663+01:00 + Generated 2018-01-16T19:54:59.982+01:00
diff --git a/swagger/sdrangel/api/swagger/include/RtlSdr.yaml b/swagger/sdrangel/api/swagger/include/RtlSdr.yaml index 5aac2a064..16e7446bc 100644 --- a/swagger/sdrangel/api/swagger/include/RtlSdr.yaml +++ b/swagger/sdrangel/api/swagger/include/RtlSdr.yaml @@ -29,4 +29,6 @@ RtlSdrSettings: transverterDeltaFrequency: type: integer format: int64 + rfBandwidth: + type: integer \ No newline at end of file diff --git a/swagger/sdrangel/code/html2/index.html b/swagger/sdrangel/code/html2/index.html index 23f6218e6..3fa9fbdbf 100644 --- a/swagger/sdrangel/code/html2/index.html +++ b/swagger/sdrangel/code/html2/index.html @@ -1593,6 +1593,9 @@ margin-bottom: 20px; "transverterDeltaFrequency" : { "type" : "integer", "format" : "int64" + }, + "rfBandwidth" : { + "type" : "integer" } }, "description" : "RTLSDR" @@ -16906,7 +16909,7 @@ except ApiException as e:
- Generated 2018-01-07T01:23:55.663+01:00 + Generated 2018-01-16T19:54:59.982+01:00
diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp index ea3e4a73f..ca074c924 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp +++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.cpp @@ -50,6 +50,7 @@ SWGRtlSdrSettings::init() { no_mod_mode = 0; transverter_mode = 0; transverter_delta_frequency = 0L; + rf_bandwidth = 0; } void @@ -67,6 +68,7 @@ SWGRtlSdrSettings::cleanup() { + } SWGRtlSdrSettings* @@ -93,6 +95,7 @@ SWGRtlSdrSettings::fromJsonObject(QJsonObject &pJson) { ::SWGSDRangel::setValue(&no_mod_mode, pJson["noModMode"], "qint32", ""); ::SWGSDRangel::setValue(&transverter_mode, pJson["transverterMode"], "qint32", ""); ::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", ""); + ::SWGSDRangel::setValue(&rf_bandwidth, pJson["rfBandwidth"], "qint32", ""); } QString @@ -135,6 +138,8 @@ SWGRtlSdrSettings::asJsonObject() { obj->insert("transverterDeltaFrequency", QJsonValue(transverter_delta_frequency)); + obj->insert("rfBandwidth", QJsonValue(rf_bandwidth)); + return obj; } @@ -255,6 +260,15 @@ SWGRtlSdrSettings::setTransverterDeltaFrequency(qint64 transverter_delta_frequen this->transverter_delta_frequency = transverter_delta_frequency; } +qint32 +SWGRtlSdrSettings::getRfBandwidth() { + return rf_bandwidth; +} +void +SWGRtlSdrSettings::setRfBandwidth(qint32 rf_bandwidth) { + this->rf_bandwidth = rf_bandwidth; +} + } diff --git a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h index b9d6a1599..2d1c767eb 100644 --- a/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h +++ b/swagger/sdrangel/code/qt5/client/SWGRtlSdrSettings.h @@ -80,6 +80,9 @@ public: qint64 getTransverterDeltaFrequency(); void setTransverterDeltaFrequency(qint64 transverter_delta_frequency); + qint32 getRfBandwidth(); + void setRfBandwidth(qint32 rf_bandwidth); + private: qint32 dev_sample_rate; @@ -95,6 +98,7 @@ private: qint32 no_mod_mode; qint32 transverter_mode; qint64 transverter_delta_frequency; + qint32 rf_bandwidth; }; }