diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index a7e2fe0b0..ae08449c3 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -395,7 +395,7 @@ void LimeSDROutputGUI::on_hwInterp_currentIndexChanged(int index) void LimeSDROutputGUI::on_swInterp_currentIndexChanged(int index) { - if ((index <0) || (index > 5)) + if ((index <0) || (index > 6)) return; m_settings.m_log2SoftInterp = index; sendSettings(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.ui b/plugins/samplesink/limesdroutput/limesdroutputgui.ui index c9bc67345..0d3eceeaa 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.ui +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.ui @@ -295,7 +295,7 @@ TSP hardware interpolation factor - 2 + 0 @@ -383,6 +383,11 @@ 32 + + + 64 + + diff --git a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp index a7b5591ca..82e7af93f 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputplugin.cpp @@ -30,7 +30,7 @@ const PluginDescriptor LimeSDROutputPlugin::m_pluginDescriptor = { QString("LimeSDR Output"), - QString("3.4.0"), + QString("3.4.4"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp index 0048bcd16..0f5f3043d 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp @@ -84,9 +84,9 @@ void LimeSDROutputThread::run() } count = 0; - msleep = LIMESDROUTPUT_BLOCKSIZE/(m_sampleRate/1e6f); - mdelta = msleep/100; - msleep = (3*msleep)/4; // to start faster +// msleep = LIMESDROUTPUT_BLOCKSIZE/(m_sampleRate/1e6f); +// mdelta = msleep/100; +// msleep = (3*msleep)/4; // to start faster while (m_running) { @@ -104,25 +104,25 @@ void LimeSDROutputThread::run() qDebug("LimeSDROutputThread::run written %d/%d samples", res, LIMESDROUTPUT_BLOCKSIZE); } - usleep(msleep); - - if (count < 10) - { - count++; - } - else - { - if (LMS_GetStreamStatus(m_stream, &streamStatus) == 0) - { - if (streamStatus.fifoFilledCount < (4*streamStatus.fifoSize)/5) { // FIFO at 80% - msleep -= mdelta; - } else { - msleep += mdelta; - } - } - - count = 0; - } +// usleep(msleep); +// +// if (count < 10) +// { +// count++; +// } +// else +// { +// if (LMS_GetStreamStatus(m_stream, &streamStatus) == 0) +// { +// if (streamStatus.fifoFilledCount < (4*streamStatus.fifoSize)/5) { // FIFO at 80% +// msleep -= mdelta; +// } else { +// msleep += mdelta; +// } +// } +// +// count = 0; +// } } if (LMS_StopStream(m_stream) < 0) { diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index e8ca12ab4..a745446b3 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -427,7 +427,7 @@ void LimeSDRInputGUI::on_hwDecim_currentIndexChanged(int index) void LimeSDRInputGUI::on_swDecim_currentIndexChanged(int index) { - if ((index <0) || (index > 5)) + if ((index <0) || (index > 6)) return; m_settings.m_log2SoftDecim = index; sendSettings(); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.ui b/plugins/samplesource/limesdrinput/limesdrinputgui.ui index 135166fa0..d8ddb8325 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.ui +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.ui @@ -330,7 +330,7 @@ TSP hardware decimation factor - 2 + 0 @@ -418,6 +418,11 @@ 32 + + + 64 + + diff --git a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp index 7f6a5be86..5e54a47db 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputplugin.cpp @@ -31,7 +31,7 @@ const PluginDescriptor LimeSDRInputPlugin::m_pluginDescriptor = { QString("LimeSDR Input"), - QString("3.4.0"), + QString("3.4.4"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true, diff --git a/plugins/samplesource/limesdrinput/limesdrinputthread.cpp b/plugins/samplesource/limesdrinput/limesdrinputthread.cpp index 1af495f12..752eff8bf 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputthread.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputthread.cpp @@ -132,6 +132,9 @@ void LimeSDRInputThread::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; } @@ -155,6 +158,9 @@ void LimeSDRInputThread::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; } @@ -178,6 +184,9 @@ void LimeSDRInputThread::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; }