mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

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

pull/162/head
f4exb 2018-03-27 11:32:39 +02:00
rodzic 4fbb8f74c8
commit 4d324875b9
17 zmienionych plików z 51 dodań i 35 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/main.cpp
Wyświetl plik

@ -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"));

2
appsrv/main.cpp
Wyświetl plik

@ -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<int> vsig(catchSignals, catchSignals + sizeof(catchSignals) / sizeof(int));

6
debian/changelog vendored
Wyświetl plik

@ -1,3 +1,9 @@
sdrangel (3.14.0-1) unstable; urgency=medium
* New audio devices management
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> 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

2
plugins/channelrx/demodam/amdemodplugin.cpp
Wyświetl plik

@ -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,

2
plugins/channelrx/demodssb/ssbplugin.cpp
Wyświetl plik

@ -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,

2
plugins/samplesource/airspyhf/airspyhfplugin.cpp
Wyświetl plik

@ -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,

4
plugins/samplesource/airspyhf/readme.md
Wyświetl plik

@ -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
<h3>5: Device to hast sample rate</h3>
<h3>5: Device to host sample rate</h3>
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
<h3>6: Decimation factor</h3>
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.
<h3>7: Transverter mode open dialog</h3>

2
plugins/samplesource/bladerfinput/bladerfinputgui.cpp
Wyświetl plik

@ -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();

20
plugins/samplesource/bladerfinput/bladerfinputgui.ui
Wyświetl plik

@ -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>

2
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
Wyświetl plik

@ -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,

9
plugins/samplesource/bladerfinput/bladerfinputthread.cpp
Wyświetl plik

@ -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;
}

2
plugins/samplesource/bladerfinput/readme.md
Wyświetl plik

@ -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>

2
plugins/samplesource/rtlsdr/readme.md
Wyświetl plik

@ -100,7 +100,7 @@ Use the wheels to adjust the sample rate. Left click on a digit sets the cursor
<h3>7: Decimation factor</h3>
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.
<h3>8: Direct sampling mode</h3>

2
plugins/samplesource/rtlsdr/rtlsdrgui.cpp
Wyświetl plik

@ -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;
}

16
plugins/samplesource/rtlsdr/rtlsdrgui.ui
Wyświetl plik

@ -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>
@ -459,6 +450,11 @@
<string>32</string>
</property>
</item>
<item>
<property name="text">
<string>64</string>
</property>
</item>
</widget>
</item>
</layout>

2
plugins/samplesource/rtlsdr/rtlsdrplugin.cpp
Wyświetl plik

@ -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,

9
plugins/samplesource/rtlsdr/rtlsdrthread.cpp
Wyświetl plik

@ -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;