VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-10-08 00:00:42 -04:00
Code Issues Projects Releases Wiki Activity

Interferometer and BladeRF2 MIMO fixes

Browse Source
This commit is contained in:
f4exb
2019-12-29 06:04:02 +01:00
parent 2ebcb42bd9
commit afc5b97863
11 changed files with 158 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplemimo/bladerf2mimo/bladerf2mimogui.cpp
+1
View File
@@ -490,6 +490,7 @@ void BladeRF2MIMOGui::on_sampleRate_changed(quint64 value)
}
}
displaySampleRate();
displayFcTooltip();
sendSettings();
}
plugins/samplemimo/bladerf2mimo/bladerf2mithread.cpp
+14 -3
View File
@@ -129,17 +129,26 @@ void BladeRF2MIThread::callback(const qint16* buf, qint32 samplesPerChannel)
}
std::vector<SampleVector::const_iterator> vbegin;
int lengths[2];
for (unsigned int channel = 0; channel < 2; channel++)
{
channelCallback(&buf[2*samplesPerChannel*channel], 2*samplesPerChannel, channel);
lengths[channel] = channelCallback(&buf[2*samplesPerChannel*channel], 2*samplesPerChannel, channel);
vbegin.push_back(m_convertBuffer[channel].begin());
}
m_sampleFifo->writeSync(vbegin, samplesPerChannel/(1<<m_log2Decim));
if (lengths[0] == lengths[1])
{
m_sampleFifo->writeSync(vbegin, lengths[0]);
}
else
{
qWarning("BladeRF2MIThread::callback: unequal channel lengths: [0]=%d [1]=%d", lengths[0], lengths[1]);
m_sampleFifo->writeSync(vbegin, std::min(lengths[0], lengths[1]));
}
}
void BladeRF2MIThread::channelCallback(const qint16* buf, qint32 len, int channel)
int BladeRF2MIThread::channelCallback(const qint16* buf, qint32 len, int channel)
{
SampleVector::iterator it = m_convertBuffer[channel].begin();
@@ -228,4 +237,6 @@ void BladeRF2MIThread::channelCallback(const qint16* buf, qint32 len, int channe
}
}
}
return it - m_convertBuffer[channel].begin();
}
plugins/samplemimo/bladerf2mimo/bladerf2mithread.h
+1 -1
View File
@@ -63,7 +63,7 @@ private:
void run();
void callback(const qint16* buf, qint32 samplesPerChannel);
void channelCallback(const qint16* buf, qint32 len, int channel);
int channelCallback(const qint16* buf, qint32 len, int channel);
};
#endif // PLUGINS_SAMPLEMIMO_BLADERF2MIMO_BLADERF2MITHREAD_H_