1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-17 16:24:08 -04:00

Bumped to v3.14.0 and allow decimation by 64 on all input plugins (missing yet: BladeRF and RTLSDR)

This commit is contained in:
f4exb
2018-03-27 11:32:39 +02:00
parent 4fbb8f74c8
commit 4d324875b9
17 changed files with 51 additions and 35 deletions
@@ -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();
@@ -35,16 +35,7 @@
<property name="spacing">
<number>3</number>
</property>
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>2</number>
</property>
<item>
@@ -234,7 +225,7 @@
<property name="toolTip">
<string>XB200 board mode</string>
</property>
<property name="currentText">
<property name="currentText" stdset="0">
<string>None</string>
</property>
<property name="currentIndex">
@@ -379,7 +370,7 @@
<string>Decimation factor</string>
</property>
<property name="currentIndex">
<number>3</number>
<number>0</number>
</property>
<item>
<property name="text">
@@ -411,6 +402,11 @@
<string>32</string>
</property>
</item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
</widget>
</item>
</layout>
@@ -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,
@@ -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;
}
+1 -1
View File
@@ -66,7 +66,7 @@ Use the wheels to adjust the sample rate. Left click on a digit sets the cursor
<h3>5: Decimation factor</h3>
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.
<h3>6: Baseband center frequency position relative the the BladeRF Rx center frequency</h3>