From 4d324875b986f6a72e7194a9949752376da0c5b8 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 27 Mar 2018 11:32:39 +0200 Subject: [PATCH] Bumped to v3.14.0 and allow decimation by 64 on all input plugins (missing yet: BladeRF and RTLSDR) --- app/main.cpp | 2 +- appsrv/main.cpp | 2 +- debian/changelog | 6 ++++++ plugins/channelrx/demodam/amdemodplugin.cpp | 2 +- plugins/channelrx/demodssb/ssbplugin.cpp | 2 +- .../samplesource/airspyhf/airspyhfplugin.cpp | 2 +- plugins/samplesource/airspyhf/readme.md | 4 ++-- .../bladerfinput/bladerfinputgui.cpp | 2 +- .../bladerfinput/bladerfinputgui.ui | 20 ++++++++----------- .../bladerfinput/bladerfinputplugin.cpp | 2 +- .../bladerfinput/bladerfinputthread.cpp | 9 +++++++++ plugins/samplesource/bladerfinput/readme.md | 2 +- plugins/samplesource/rtlsdr/readme.md | 2 +- plugins/samplesource/rtlsdr/rtlsdrgui.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrgui.ui | 16 ++++++--------- plugins/samplesource/rtlsdr/rtlsdrplugin.cpp | 2 +- plugins/samplesource/rtlsdr/rtlsdrthread.cpp | 9 +++++++++ 17 files changed, 51 insertions(+), 35 deletions(-) diff --git a/app/main.cpp b/app/main.cpp index 11d688047..dcea8759c 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -35,7 +35,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo */ QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangel"); - QCoreApplication::setApplicationVersion("3.13.1"); + QCoreApplication::setApplicationVersion("3.14.0"); #if 1 qApp->setStyle(QStyleFactory::create("fusion")); diff --git a/appsrv/main.cpp b/appsrv/main.cpp index 03f1dabb5..235a11ff1 100644 --- a/appsrv/main.cpp +++ b/appsrv/main.cpp @@ -56,7 +56,7 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo QCoreApplication::setOrganizationName("f4exb"); QCoreApplication::setApplicationName("SDRangelSrv"); - QCoreApplication::setApplicationVersion("3.13.1"); + QCoreApplication::setApplicationVersion("3.14.0"); int catchSignals[] = {SIGQUIT, SIGINT, SIGTERM, SIGHUP}; std::vector vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int)); diff --git a/debian/changelog b/debian/changelog index 9846c9427..1aa85ad37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +sdrangel (3.14.0-1) unstable; urgency=medium + + * New audio devices management + + -- Edouard Griffiths, F4EXB Sun, 1 Apr 2018 06:14:18 +0100 + sdrangel (3.13.1-1) unstable; urgency=medium * Web API: settings and report enry points for AM demod and AirspyHF diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index c3350a6aa..e293003cc 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -8,7 +8,7 @@ const PluginDescriptor AMDemodPlugin::m_pluginDescriptor = { QString("AM Demodulator"), - QString("3.13.1"), + QString("3.14.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index c0c40dac6..07bf4b1d4 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -8,7 +8,7 @@ const PluginDescriptor SSBPlugin::m_pluginDescriptor = { QString("SSB Demodulator"), - QString("3.12.0"), + QString("3.14.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/airspyhf/airspyhfplugin.cpp b/plugins/samplesource/airspyhf/airspyhfplugin.cpp index 4d4f29321..cb81e2874 100644 --- a/plugins/samplesource/airspyhf/airspyhfplugin.cpp +++ b/plugins/samplesource/airspyhf/airspyhfplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor AirspyHFPlugin::m_pluginDescriptor = { QString("AirspyHF Input"), - QString("3.13.1"), + QString("3.14.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/airspyhf/readme.md b/plugins/samplesource/airspyhf/readme.md index 158968bba..9e6c96c0f 100644 --- a/plugins/samplesource/airspyhf/readme.md +++ b/plugins/samplesource/airspyhf/readme.md @@ -62,7 +62,7 @@ Use this combo box to select the HF or VHF range. This will set the limits of th - HF: 9 kHz to 31 MHz - VHF: 60 to 260 MHz -

5: Device to hast sample rate

+

5: Device to host sample rate

This is the device to host sample rate in kilo samples per second (kS/s). @@ -70,7 +70,7 @@ Although the combo box is there to present a choice of sample rates at present t

6: Decimation factor

-The I/Q stream from the AirspyHF to host is downsampled by a power of two before being sent to the passband. Possible values are increasing powers of two: 1 (no decimation), 2, 4, 8, 16, 32, 64. When using audio channel plugins (AM, DSD, NFM, SSB...) please make sure that the sample rate is not less than 48 kHz (no decimation by 32 or 64). +The I/Q stream from the AirspyHF to host is downsampled by a power of two before being sent to the passband. Possible values are increasing powers of two: 1 (no decimation), 2, 4, 8, 16, 32, 64. When using audio channel plugins (AM, DSD, NFM, SSB...) please make sure that the sample rate is not less than the audio sample rate.

7: Transverter mode open dialog

diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp index 1ee1a2d54..c3b264b80 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp @@ -254,7 +254,7 @@ void BladerfInputGui::on_bandwidth_currentIndexChanged(int index) void BladerfInputGui::on_decim_currentIndexChanged(int index) { - if ((index <0) || (index > 5)) + if ((index <0) || (index > 6)) return; m_settings.m_log2Decim = index; sendSettings(); diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.ui b/plugins/samplesource/bladerfinput/bladerfinputgui.ui index 744d3e7cf..3d880f06f 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputgui.ui +++ b/plugins/samplesource/bladerfinput/bladerfinputgui.ui @@ -35,16 +35,7 @@ 3 - - 2 - - - 2 - - - 2 - - + 2 @@ -234,7 +225,7 @@ XB200 board mode - + None @@ -379,7 +370,7 @@ Decimation factor - 3 + 0 @@ -411,6 +402,11 @@ 32 + + + 64 + + diff --git a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp index 02a2ebd34..82c29131a 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputplugin.cpp @@ -27,7 +27,7 @@ const PluginDescriptor BlderfInputPlugin::m_pluginDescriptor = { QString("BladeRF Input"), - QString("3.11.0"), + QString("3.14.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/bladerfinput/bladerfinputthread.cpp b/plugins/samplesource/bladerfinput/bladerfinputthread.cpp index e0dec6855..ebe8de4fc 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputthread.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputthread.cpp @@ -114,6 +114,9 @@ void BladerfInputThread::callback(const qint16* buf, qint32 len) case 5: m_decimators.decimate32_inf(&it, buf, len); break; + case 6: + m_decimators.decimate64_inf(&it, buf, len); + break; default: break; } @@ -137,6 +140,9 @@ void BladerfInputThread::callback(const qint16* buf, qint32 len) case 5: m_decimators.decimate32_sup(&it, buf, len); break; + case 6: + m_decimators.decimate64_sup(&it, buf, len); + break; default: break; } @@ -160,6 +166,9 @@ void BladerfInputThread::callback(const qint16* buf, qint32 len) case 5: m_decimators.decimate32_cen(&it, buf, len); break; + case 6: + m_decimators.decimate64_cen(&it, buf, len); + break; default: break; } diff --git a/plugins/samplesource/bladerfinput/readme.md b/plugins/samplesource/bladerfinput/readme.md index 5bc853e2b..c62f96997 100644 --- a/plugins/samplesource/bladerfinput/readme.md +++ b/plugins/samplesource/bladerfinput/readme.md @@ -66,7 +66,7 @@ Use the wheels to adjust the sample rate. Left click on a digit sets the cursor

5: Decimation factor

-The I/Q stream from the BladeRF ADC is doensampled by a power of two before being sent to the passband. Possible values are increasing powers of two: 1 (no decimation), 2, 4, 8, 16, 32. +The I/Q stream from the BladeRF ADC is doensampled by a power of two before being sent to the passband. Possible values are increasing powers of two: 1 (no decimation), 2, 4, 8, 16, 32, 64.

6: Baseband center frequency position relative the the BladeRF Rx center frequency

diff --git a/plugins/samplesource/rtlsdr/readme.md b/plugins/samplesource/rtlsdr/readme.md index 0e28d4efd..f74aa533d 100644 --- a/plugins/samplesource/rtlsdr/readme.md +++ b/plugins/samplesource/rtlsdr/readme.md @@ -100,7 +100,7 @@ Use the wheels to adjust the sample rate. Left click on a digit sets the cursor

7: Decimation factor

-The I/Q stream from the RTLSDR ADC is doensampled by a power of two before being sent to the passband. Possible values are increasing powers of two: 1 (no decimation), 2, 4, 8, 16, 32. +The I/Q stream from the RTLSDR ADC is doensampled by a power of two before being sent to the passband. Possible values are increasing powers of two: 1 (no decimation), 2, 4, 8, 16, 32, 64.

8: Direct sampling mode

diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index 7b97cc9c8..8b2c72963 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -277,7 +277,7 @@ void RTLSDRGui::on_centerFrequency_changed(quint64 value) void RTLSDRGui::on_decim_currentIndexChanged(int index) { - if ((index <0) || (index > 5)) + if ((index <0) || (index > 6)) { return; } diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.ui b/plugins/samplesource/rtlsdr/rtlsdrgui.ui index 5cfd01cb9..2b9775381 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.ui +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.ui @@ -35,16 +35,7 @@ 3 - - 2 - - - 2 - - - 2 - - + 2 @@ -459,6 +450,11 @@ 32 + + + 64 + + diff --git a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp index bb75eb0ba..9188cbd27 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrplugin.cpp @@ -14,7 +14,7 @@ const PluginDescriptor RTLSDRPlugin::m_pluginDescriptor = { QString("RTL-SDR Input"), - QString("3.13.1"), + QString("3.14.0"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/rtlsdr/rtlsdrthread.cpp b/plugins/samplesource/rtlsdr/rtlsdrthread.cpp index 6c1ee8a17..7c00695a9 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrthread.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrthread.cpp @@ -116,6 +116,9 @@ void RTLSDRThread::callback(const quint8* buf, qint32 len) break; case 5: m_decimators.decimate32_inf(&it, buf, len); + break; + case 6: + m_decimators.decimate64_inf(&it, buf, len); break; default: break; @@ -139,6 +142,9 @@ void RTLSDRThread::callback(const quint8* buf, qint32 len) break; case 5: m_decimators.decimate32_sup(&it, buf, len); + break; + case 6: + m_decimators.decimate64_sup(&it, buf, len); break; default: break; @@ -162,6 +168,9 @@ void RTLSDRThread::callback(const quint8* buf, qint32 len) break; case 5: m_decimators.decimate32_cen(&it, buf, len); + break; + case 6: + m_decimators.decimate64_cen(&it, buf, len); break; default: break;