diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
index a5d1d953d..f114f4925 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp
@@ -111,7 +111,7 @@ bool RTLSDRInput::startInput(int device)
qDebug("RTLSDRInput open: %s %s, SN: %s", vendor, product, serial);
m_deviceDescription = QString("%1 (SN %2)").arg(product).arg(serial);
- if((res = rtlsdr_set_sample_rate(m_dev, 2000000)) < 0) {
+ if((res = rtlsdr_set_sample_rate(m_dev, 1536000)) < 0) {
qCritical("could not set sample rate: %s", strerror(errno));
goto failed;
}
@@ -182,7 +182,7 @@ const QString& RTLSDRInput::getDeviceDescription() const
int RTLSDRInput::getSampleRate() const
{
- return 2000000 / (1 << m_settings.m_decimation);
+ return 1536000 / (1 << m_settings.m_decimation);
}
quint64 RTLSDRInput::getCenterFrequency() const
@@ -210,7 +210,8 @@ bool RTLSDRInput::applySettings(const GeneralSettings& generalSettings, const Se
if((m_generalSettings.m_centerFrequency != generalSettings.m_centerFrequency) || force) {
m_generalSettings.m_centerFrequency = generalSettings.m_centerFrequency;
if(m_dev != NULL) {
- if(rtlsdr_set_center_freq(m_dev, m_generalSettings.m_centerFrequency) != 0)
+ if(rtlsdr_set_center_freq(m_dev, m_generalSettings.m_centerFrequency
+ + 384000) != 0)
qDebug("osmosdr_set_center_freq(%lld) failed", m_generalSettings.m_centerFrequency);
}
}
diff --git a/plugins/samplesource/rtlsdr/rtlsdrthread.cpp b/plugins/samplesource/rtlsdr/rtlsdrthread.cpp
index 8c8a17c42..fae16bef8 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrthread.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrthread.cpp
@@ -28,7 +28,7 @@ RTLSDRThread::RTLSDRThread(rtlsdr_dev_t* dev, SampleFifo* sampleFifo, QObject* p
m_dev(dev),
m_convertBuffer(BLOCKSIZE),
m_sampleFifo(sampleFifo),
- m_decimation(1)
+ m_decimation(2)
{
}
@@ -74,6 +74,8 @@ void RTLSDRThread::run()
m_running = false;
}
+#if 0
+
void RTLSDRThread::decimate2(SampleVector::iterator* it, const quint8* buf, qint32 len)
{
for(int pos = 0; pos < len; pos += 2) {
@@ -130,18 +132,89 @@ void RTLSDRThread::decimate16(SampleVector::iterator* it, const quint8* buf, qin
}
}
+#else
+
+void RTLSDRThread::decimate2(SampleVector::iterator* it, const quint8* buf, qint32 len)
+{
+ qint16 xreal, yimag;
+ for (int pos = 0; pos < len + 7; pos += 8) {
+ xreal = buf[pos+0] - buf[pos+3];
+ yimag = buf[pos+1] + buf[pos+2] - 255;
+ Sample s( xreal << 5, yimag << 5 );
+ **it = s;
+ (*it)++;
+ xreal = buf[pos+7] - buf[pos+4];
+ yimag = 255 - buf[pos+5] - buf[pos+6];
+ Sample t( xreal << 5, yimag << 5 );
+ **it = t;
+ (*it)++;
+ }
+}
+void RTLSDRThread::decimate4(SampleVector::iterator* it, const quint8* buf, qint32 len)
+{
+ qint16 xreal, yimag;
+ for (int pos = 0; pos < len + 7; pos += 8) {
+ xreal = buf[pos+0] - buf[pos+3] + buf[pos+7] - buf[pos+4];
+ yimag = buf[pos+1] - buf[pos+5] + buf[pos+2] - buf[pos+6];
+ Sample s( xreal << 5, yimag << 5 );
+ **it = s;
+ (*it)++;
+ }
+}
+
+void RTLSDRThread::decimate8(SampleVector::iterator* it, const quint8* buf, qint32 len)
+{
+ qint16 xreal, yimag;
+ for (int pos = 0; pos < len + 15; pos += 8) {
+ xreal = buf[pos+0] - buf[pos+3] + buf[pos+7] - buf[pos+4];
+ yimag = buf[pos+1] - buf[pos+5] + buf[pos+2] - buf[pos+6];
+ pos += 8;
+ xreal += buf[pos+0] - buf[pos+3] + buf[pos+7] - buf[pos+4];
+ yimag += buf[pos+1] - buf[pos+5] + buf[pos+2] - buf[pos+6];
+
+ Sample s( xreal << 4, yimag << 4 );
+ **it = s;
+ (*it)++;
+ }
+}
+
+void RTLSDRThread::decimate16(SampleVector::iterator* it, const quint8* buf, qint32 len)
+{
+ // Offset tuning: 4x downsample and rotate, then
+ // downsample 4x more. [ rotate: 0, 1, -3, 2, -4, -5, 7, -6]
+ qint16 xreal, yimag;
+ for (int step = 0; step < len - 31; step +=32) {
+ xreal = yimag = 0;
+ for (int pos = step; pos < step + 32; pos += 8) {
+ xreal += buf[pos+0] - buf[pos+3] + buf[pos+7] - buf[pos+4];
+ yimag += buf[pos+1] - buf[pos+5] + buf[pos+2] - buf[pos+6];
+ }
+ Sample s( xreal << 4, yimag << 4 );
+ **it = s;
+ (*it)++;
+ }
+}
+#endif
+
void RTLSDRThread::callback(const quint8* buf, qint32 len)
{
+ qint16 xreal, yimag, phase;
SampleVector::iterator it = m_convertBuffer.begin();
switch(m_decimation) {
case 0: // 1:1 = no decimation
- for(int pos = 0; pos < len; pos += 2) {
- *it = Sample((((qint8)buf[pos]) - 128) << 8, (((qint8)buf[pos + 1]) - 128) << 8);
- ++it;
+ // just rotation
+ phase = -1;
+ for (int pos = 0; pos < len + 3; pos += 4) {
+ phase *= -1;
+ xreal = phase * (buf[pos+0] - 127);
+ yimag = phase * (buf[pos+1] - 127);
+ *it++ = Sample( xreal<<6,yimag<<6);
+ xreal = phase * (128 - buf[pos+3]);
+ yimag = phase * (buf[pos+2] - 127);
+ *it++ = Sample( xreal<<6,yimag<<6);
}
break;
-
case 1: // 1:2
decimate2(&it, buf, len);
break;
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index 9cbfb0fb1..dc75cb546 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -306,12 +306,12 @@ void MainWindow::handleMessages()
{
Message* message;
while((message = m_messageQueue->accept()) != NULL) {
- qDebug("Message: %s", message->getIdentifier());
+ //qDebug("Message: %s", message->getIdentifier());
if(DSPEngineReport::match(message)) {
DSPEngineReport* rep = (DSPEngineReport*)message;
m_sampleRate = rep->getSampleRate();
m_centerFrequency = rep->getCenterFrequency();
- qDebug("SampleRate:%d, CenterFrequency:%llu", rep->getSampleRate(), rep->getCenterFrequency());
+ //qDebug("SampleRate:%d, CenterFrequency:%llu", rep->getSampleRate(), rep->getCenterFrequency());
updateCenterFreqDisplay();
updateSampleRate();
message->completed();
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index 60e2c431e..b6ff71072 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -7,7 +7,7 @@
0
0
1012
- 706
+ 600