VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 23:55:13 -05:00
Code Issues Projects Releases Wiki Activity

RTL-SDR: offset tuning support: REST API and version update

Browse Source
This commit is contained in:
f4exb 2018-11-26 13:31:51 +01:00
parent 772a150136
commit 5d0f9c7878
12 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/main.cpp
View File

@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
*/
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel");
QCoreApplication::setApplicationVersion("4.3.0");
QCoreApplication::setApplicationVersion("4.3.1");
#if QT_VERSION >= 0x050600
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps

2
appbench/main.cpp
View File

@ -57,7 +57,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelBench");
QCoreApplication::setApplicationVersion("4.3.0");
QCoreApplication::setApplicationVersion("4.3.1");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

2
appsrv/main.cpp
View File

@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangelSrv");
QCoreApplication::setApplicationVersion("4.3.0");
QCoreApplication::setApplicationVersion("4.3.1");
int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP};
std::vector<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
sdrangel (4.3.1-1) unstable; urgency=medium
* RTL-SDR: offset tuning support
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 02 Dec 2018 21:14:18 +0100
sdrangel (4.3.0-1) unstable; urgency=medium
* SoapySDR support

2
plugins/samplesource/rtlsdr/rtlsdrgui.ui
View File

@ -496,7 +496,7 @@
<item>
<widget class="QCheckBox" name="offsetTuning">
<property name="toolTip">
<string>Offset tuning</string>
<string>Offset tuning (applies to some tuners only incl. E4000)</string>
</property>
<property name="text">
<string>Ofs</string>

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

@ -598,6 +598,9 @@ int RTLSDRInput::webapiSettingsPutPatch(
if (deviceSettingsKeys.contains("noModMode")) {
settings.m_noModMode = response.getRtlSdrSettings()->getNoModMode() != 0;
}
if (deviceSettingsKeys.contains("offsetTuning")) {
settings.m_offsetTuning = response.getRtlSdrSettings()->getOffsetTuning() != 0;
}
if (deviceSettingsKeys.contains("transverterDeltaFrequency")) {
settings.m_transverterDeltaFrequency = response.getRtlSdrSettings()->getTransverterDeltaFrequency();
}
@ -638,6 +641,7 @@ void RTLSDRInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& res
response.getRtlSdrSettings()->setLog2Decim(settings.m_log2Decim);
response.getRtlSdrSettings()->setLowSampleRate(settings.m_lowSampleRate ? 1 : 0);
response.getRtlSdrSettings()->setNoModMode(settings.m_noModMode ? 1 : 0);
response.getRtlSdrSettings()->setOffsetTuning(settings.m_offsetTuning ? 1 : 0);
response.getRtlSdrSettings()->setTransverterDeltaFrequency(settings.m_transverterDeltaFrequency);
response.getRtlSdrSettings()->setTransverterMode(settings.m_transverterMode ? 1 : 0);
response.getRtlSdrSettings()->setRfBandwidth(settings.m_rfBandwidth);

5
sdrbase/resources/webapi/doc/html2/index.html
View File

@ -3474,6 +3474,9 @@ margin-bottom: 20px;
"noModMode" : {
"type" : "integer"
},
"offsetTuning" : {
"type" : "integer"
},
"transverterMode" : {
"type" : "integer"
},
@ -23614,7 +23617,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2018-11-14T01:13:54.986+01:00
Generated 2018-11-26T13:24:54.460+01:00
</div>
</div>
</div>

4
sdrbase/resources/webapi/doc/swagger/include/RtlSdr.yaml
View File

@ -24,11 +24,13 @@ RtlSdrSettings:
type: integer
noModMode:
type: integer
offsetTuning:
type: integer
transverterMode:
type: integer
transverterDeltaFrequency:
type: integer
format: int64
format: int64
rfBandwidth:
type: integer
fileRecordName:

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

@ -24,11 +24,13 @@ RtlSdrSettings:
type: integer
noModMode:
type: integer
offsetTuning:
type: integer
transverterMode:
type: integer
transverterDeltaFrequency:
type: integer
format: int64
format: int64
rfBandwidth:
type: integer
fileRecordName:

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

@ -3474,6 +3474,9 @@ margin-bottom: 20px;
"noModMode" : {
"type" : "integer"
},
"offsetTuning" : {
"type" : "integer"
},
"transverterMode" : {
"type" : "integer"
},
@ -23614,7 +23617,7 @@ except ApiException as e:
</div>
<div id="generator">
<div class="content">
Generated 2018-11-14T01:13:54.986+01:00
Generated 2018-11-26T13:24:54.460+01:00
</div>
</div>
</div>

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

@ -50,6 +50,8 @@ SWGRtlSdrSettings::SWGRtlSdrSettings() {
m_agc_isSet = false;
no_mod_mode = 0;
m_no_mod_mode_isSet = false;
offset_tuning = 0;
m_offset_tuning_isSet = false;
transverter_mode = 0;
m_transverter_mode_isSet = false;
transverter_delta_frequency = 0L;
@ -88,6 +90,8 @@ SWGRtlSdrSettings::init() {
m_agc_isSet = false;
no_mod_mode = 0;
m_no_mod_mode_isSet = false;
offset_tuning = 0;
m_offset_tuning_isSet = false;
transverter_mode = 0;
m_transverter_mode_isSet = false;
transverter_delta_frequency = 0L;
@ -114,6 +118,7 @@ SWGRtlSdrSettings::cleanup() {
if(file_record_name != nullptr) {
delete file_record_name;
}
@ -152,6 +157,8 @@ SWGRtlSdrSettings::fromJsonObject(QJsonObject &pJson) {
::SWGSDRangel::setValue(&no_mod_mode, pJson["noModMode"], "qint32", "");
::SWGSDRangel::setValue(&offset_tuning, pJson["offsetTuning"], "qint32", "");
::SWGSDRangel::setValue(&transverter_mode, pJson["transverterMode"], "qint32", "");
::SWGSDRangel::setValue(&transverter_delta_frequency, pJson["transverterDeltaFrequency"], "qint64", "");
@ -209,6 +216,9 @@ SWGRtlSdrSettings::asJsonObject() {
if(m_no_mod_mode_isSet){
obj->insert("noModMode", QJsonValue(no_mod_mode));
}
if(m_offset_tuning_isSet){
obj->insert("offsetTuning", QJsonValue(offset_tuning));
}
if(m_transverter_mode_isSet){
obj->insert("transverterMode", QJsonValue(transverter_mode));
}
@ -335,6 +345,16 @@ SWGRtlSdrSettings::setNoModMode(qint32 no_mod_mode) {
this->m_no_mod_mode_isSet = true;
}
qint32
SWGRtlSdrSettings::getOffsetTuning() {
return offset_tuning;
}
void
SWGRtlSdrSettings::setOffsetTuning(qint32 offset_tuning) {
this->offset_tuning = offset_tuning;
this->m_offset_tuning_isSet = true;
}
qint32
SWGRtlSdrSettings::getTransverterMode() {
return transverter_mode;
@ -391,6 +411,7 @@ SWGRtlSdrSettings::isSet(){
if(m_iq_imbalance_isSet){ isObjectUpdated = true; break;}
if(m_agc_isSet){ isObjectUpdated = true; break;}
if(m_no_mod_mode_isSet){ isObjectUpdated = true; break;}
if(m_offset_tuning_isSet){ isObjectUpdated = true; break;}
if(m_transverter_mode_isSet){ isObjectUpdated = true; break;}
if(m_transverter_delta_frequency_isSet){ isObjectUpdated = true; break;}
if(m_rf_bandwidth_isSet){ isObjectUpdated = true; break;}

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

@ -75,6 +75,9 @@ public:
qint32 getNoModMode();
void setNoModMode(qint32 no_mod_mode);
qint32 getOffsetTuning();
void setOffsetTuning(qint32 offset_tuning);
qint32 getTransverterMode();
void setTransverterMode(qint32 transverter_mode);
@ -124,6 +127,9 @@ private:
qint32 no_mod_mode;
bool m_no_mod_mode_isSet;
qint32 offset_tuning;
bool m_offset_tuning_isSet;
qint32 transverter_mode;
bool m_transverter_mode_isSet;