VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

IQ swap: initial implementation in non MIMO plugins

Browse Source
This commit is contained in:
f4exb
2020-06-21 11:46:08 +02:00
parent ed5ebd6361
commit 24aa55027c
83 changed files with 4845 additions and 2834 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/hackrfinput/hackrfinput.cpp
+17 -8
View File
@@ -47,8 +47,8 @@ HackRFInput::HackRFInput(DeviceAPI *deviceAPI) :
m_deviceAPI(deviceAPI),
m_fileSink(nullptr),
m_settings(),
m_dev(0),
m_hackRFThread(0),
m_dev(nullptr),
m_hackRFThread(nullptr),
m_deviceDescription("HackRF"),
m_running(false)
{
@@ -157,7 +157,7 @@ bool HackRFInput::start()
m_hackRFThread->setSamplerate(m_settings.m_devSampleRate);
m_hackRFThread->setLog2Decimation(m_settings.m_log2Decim);
m_hackRFThread->setFcPos((int) m_settings.m_fcPos);
m_hackRFThread->setIQOrder(m_settings.m_iqOrder);
m_hackRFThread->startWork();
qDebug("HackRFInput::startInput: started");
@@ -188,11 +188,11 @@ void HackRFInput::stop()
qDebug("HackRFInput::stop");
// QMutexLocker mutexLocker(&m_mutex);
if (m_hackRFThread != 0)
if (m_hackRFThread)
{
m_hackRFThread->stopWork();
delete m_hackRFThread;
m_hackRFThread = 0;
m_hackRFThread = nullptr;
}
m_running = false;
@@ -418,7 +418,7 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
}
else
{
if (m_hackRFThread != 0)
if (m_hackRFThread)
{
qDebug("HackRFInput::applySettings: sample rate set to %llu S/s", settings.m_devSampleRate);
m_hackRFThread->setSamplerate(settings.m_devSampleRate);
@@ -432,13 +432,22 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
reverseAPIKeys.append("log2Decim");
forwardChange = true;
if (m_hackRFThread != 0)
if (m_hackRFThread)
{
m_hackRFThread->setLog2Decimation(settings.m_log2Decim);
qDebug() << "HackRFInput: set decimation to " << (1<<settings.m_log2Decim);
}
}
if ((m_settings.m_iqOrder != settings.m_iqOrder) || force)
{
reverseAPIKeys.append("iqOrder");
if (m_hackRFThread) {
m_hackRFThread->setIQOrder(settings.m_iqOrder);
}
}
if (force || (m_settings.m_centerFrequency != settings.m_centerFrequency)) {
reverseAPIKeys.append("centerFrequency");
}
@@ -486,7 +495,7 @@ bool HackRFInput::applySettings(const HackRFInputSettings& settings, bool force)
if ((m_settings.m_fcPos != settings.m_fcPos) || force)
{
if (m_hackRFThread != 0)
if (m_hackRFThread)
{
m_hackRFThread->setFcPos((int) settings.m_fcPos);
qDebug() << "HackRFInput: set fc pos (enum) to " << (int) settings.m_fcPos;
plugins/samplesource/hackrfinput/hackrfinputsettings.cpp
+3
View File
@@ -43,6 +43,7 @@ void HackRFInputSettings::resetToDefaults()
m_fileRecordName = "";
m_transverterMode = false;
m_transverterDeltaFrequency = 0;
m_iqOrder = true;
m_useReverseAPI = false;
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
@@ -70,6 +71,7 @@ QByteArray HackRFInputSettings::serialize() const
s.writeU32(17, m_reverseAPIDeviceIndex);
s.writeBool(18, m_transverterMode);
s.writeS64(19, m_transverterDeltaFrequency);
s.writeBool(20, m_iqOrder);
return s.final();
}
@@ -115,6 +117,7 @@ bool HackRFInputSettings::deserialize(const QByteArray& data)
m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
d.readBool(18, &m_transverterMode, false);
d.readS64(19, &m_transverterDeltaFrequency, 0);
d.readBool(20, &m_iqOrder, true);
return true;
}
plugins/samplesource/hackrfinput/hackrfinputsettings.h
+1
View File
@@ -43,6 +43,7 @@ struct HackRFInputSettings {
QString m_fileRecordName;
bool m_transverterMode;
qint64 m_transverterDeltaFrequency;
bool m_iqOrder;
bool m_useReverseAPI;
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
plugins/samplesource/hackrfinput/hackrfinputthread.cpp
+122 -23
View File
@@ -31,7 +31,8 @@ HackRFInputThread::HackRFInputThread(hackrf_device* dev, SampleSinkFifo* sampleF
m_sampleFifo(sampleFifo),
m_samplerate(10),
m_log2Decim(0),
m_fcPos(0)
m_fcPos(0),
m_iqOrder(true)
{
std::fill(m_buf, m_buf + 2*HACKRF_BLOCKSIZE, 0);
}
@@ -122,13 +123,13 @@ void HackRFInputThread::run()
}
// Decimate according to specified log2 (ex: log2=4 => decim=16)
void HackRFInputThread::callback(const qint8* buf, qint32 len)
void HackRFInputThread::callbackIQ(const qint8* buf, qint32 len)
{
SampleVector::iterator it = m_convertBuffer.begin();
if (m_log2Decim == 0)
{
m_decimators.decimate1(&it, buf, len);
m_decimatorsIQ.decimate1(&it, buf, len);
}
else
{
@@ -137,22 +138,22 @@ void HackRFInputThread::callback(const qint8* buf, qint32 len)
switch (m_log2Decim)
{
case 1:
m_decimators.decimate2_inf(&it, buf, len);
m_decimatorsIQ.decimate2_inf(&it, buf, len);
break;
case 2:
m_decimators.decimate4_inf_txsync(&it, buf, len);
m_decimatorsIQ.decimate4_inf_txsync(&it, buf, len);
break;
case 3:
m_decimators.decimate8_inf_txsync(&it, buf, len);
m_decimatorsIQ.decimate8_inf_txsync(&it, buf, len);
break;
case 4:
m_decimators.decimate16_inf_txsync(&it, buf, len);
m_decimatorsIQ.decimate16_inf_txsync(&it, buf, len);
break;
case 5:
m_decimators.decimate32_inf_txsync(&it, buf, len);
m_decimatorsIQ.decimate32_inf_txsync(&it, buf, len);
break;
case 6:
m_decimators.decimate64_inf_txsync(&it, buf, len);
m_decimatorsIQ.decimate64_inf_txsync(&it, buf, len);
break;
default:
break;
@@ -163,22 +164,22 @@ void HackRFInputThread::callback(const qint8* buf, qint32 len)
switch (m_log2Decim)
{
case 1:
m_decimators.decimate2_sup(&it, buf, len);
m_decimatorsIQ.decimate2_sup(&it, buf, len);
break;
case 2:
m_decimators.decimate4_sup_txsync(&it, buf, len);
m_decimatorsIQ.decimate4_sup_txsync(&it, buf, len);
break;
case 3:
m_decimators.decimate8_sup_txsync(&it, buf, len);
m_decimatorsIQ.decimate8_sup_txsync(&it, buf, len);
break;
case 4:
m_decimators.decimate16_sup_txsync(&it, buf, len);
m_decimatorsIQ.decimate16_sup_txsync(&it, buf, len);
break;
case 5:
m_decimators.decimate32_sup_txsync(&it, buf, len);
m_decimatorsIQ.decimate32_sup_txsync(&it, buf, len);
break;
case 6:
m_decimators.decimate64_sup_txsync(&it, buf, len);
m_decimatorsIQ.decimate64_sup_txsync(&it, buf, len);
break;
default:
break;
@@ -189,22 +190,22 @@ void HackRFInputThread::callback(const qint8* buf, qint32 len)
switch (m_log2Decim)
{
case 1:
m_decimators.decimate2_cen(&it, buf, len);
m_decimatorsIQ.decimate2_cen(&it, buf, len);
break;
case 2:
m_decimators.decimate4_cen(&it, buf, len);
m_decimatorsIQ.decimate4_cen(&it, buf, len);
break;
case 3:
m_decimators.decimate8_cen(&it, buf, len);
m_decimatorsIQ.decimate8_cen(&it, buf, len);
break;
case 4:
m_decimators.decimate16_cen(&it, buf, len);
m_decimatorsIQ.decimate16_cen(&it, buf, len);
break;
case 5:
m_decimators.decimate32_cen(&it, buf, len);
m_decimatorsIQ.decimate32_cen(&it, buf, len);
break;
case 6:
m_decimators.decimate64_cen(&it, buf, len);
m_decimatorsIQ.decimate64_cen(&it, buf, len);
break;
default:
break;
@@ -215,11 +216,109 @@ void HackRFInputThread::callback(const qint8* buf, qint32 len)
m_sampleFifo->write(m_convertBuffer.begin(), it);
}
void HackRFInputThread::callbackQI(const qint8* buf, qint32 len)
{
SampleVector::iterator it = m_convertBuffer.begin();
if (m_log2Decim == 0)
{
m_decimatorsQI.decimate1(&it, buf, len);
}
else
{
if (m_fcPos == 0) // Infra
{
switch (m_log2Decim)
{
case 1:
m_decimatorsQI.decimate2_inf(&it, buf, len);
break;
case 2:
m_decimatorsQI.decimate4_inf_txsync(&it, buf, len);
break;
case 3:
m_decimatorsQI.decimate8_inf_txsync(&it, buf, len);
break;
case 4:
m_decimatorsQI.decimate16_inf_txsync(&it, buf, len);
break;
case 5:
m_decimatorsQI.decimate32_inf_txsync(&it, buf, len);
break;
case 6:
m_decimatorsQI.decimate64_inf_txsync(&it, buf, len);
break;
default:
break;
}
}
else if (m_fcPos == 1) // Supra
{
switch (m_log2Decim)
{
case 1:
m_decimatorsQI.decimate2_sup(&it, buf, len);
break;
case 2:
m_decimatorsQI.decimate4_sup_txsync(&it, buf, len);
break;
case 3:
m_decimatorsQI.decimate8_sup_txsync(&it, buf, len);
break;
case 4:
m_decimatorsQI.decimate16_sup_txsync(&it, buf, len);
break;
case 5:
m_decimatorsQI.decimate32_sup_txsync(&it, buf, len);
break;
case 6:
m_decimatorsQI.decimate64_sup_txsync(&it, buf, len);
break;
default:
break;
}
}
else if (m_fcPos == 2) // Center
{
switch (m_log2Decim)
{
case 1:
m_decimatorsQI.decimate2_cen(&it, buf, len);
break;
case 2:
m_decimatorsQI.decimate4_cen(&it, buf, len);
break;
case 3:
m_decimatorsQI.decimate8_cen(&it, buf, len);
break;
case 4:
m_decimatorsQI.decimate16_cen(&it, buf, len);
break;
case 5:
m_decimatorsQI.decimate32_cen(&it, buf, len);
break;
case 6:
m_decimatorsQI.decimate64_cen(&it, buf, len);
break;
default:
break;
}
}
}
m_sampleFifo->write(m_convertBuffer.begin(), it);
}
int HackRFInputThread::rx_callback(hackrf_transfer* transfer)
{
HackRFInputThread *thread = (HackRFInputThread *) transfer->rx_ctx;
qint32 bytes_to_write = transfer->valid_length;
thread->callback((qint8 *) transfer->buffer, bytes_to_write);
return 0;
if (thread->m_iqOrder) {
thread->callbackIQ((qint8 *) transfer->buffer, bytes_to_write);
} else {
thread->callbackQI((qint8 *) transfer->buffer, bytes_to_write);
}
return 0;
}
plugins/samplesource/hackrfinput/hackrfinputthread.h
+6 -2
View File
@@ -40,6 +40,7 @@ public:
void setSamplerate(uint32_t samplerate);
void setLog2Decimation(unsigned int log2_decim);
void setFcPos(int fcPos);
void setIQOrder(bool iqOrder) { m_iqOrder = iqOrder; }
private:
QMutex m_startWaitMutex;
@@ -54,11 +55,14 @@ private:
int m_samplerate;
unsigned int m_log2Decim;
int m_fcPos;
bool m_iqOrder;
Decimators<qint32, qint8, SDR_RX_SAMP_SZ, 8> m_decimators;
Decimators<qint32, qint8, SDR_RX_SAMP_SZ, 8, true> m_decimatorsIQ;
Decimators<qint32, qint8, SDR_RX_SAMP_SZ, 8, false> m_decimatorsQI;
void run();
void callback(const qint8* buf, qint32 len);
void callbackIQ(const qint8* buf, qint32 len);
void callbackQI(const qint8* buf, qint32 len);
static int rx_callback(hackrf_transfer* transfer);
};