VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 21:01:45 -05:00
Code Issues Projects Releases Wiki Activity

RadioClock: simplify sampleToScope

Browse Source
This commit is contained in:
f4exb 2021-07-13 16:55:48 +02:00
parent fc9ade2573
commit 86ceb245cd
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/channelrx/radioclock/radioclocksink.cpp
View File

@ -51,6 +51,10 @@ RadioClockSink::RadioClockSink(RadioClock *radioClock) :
m_phaseDiscri.setFMScaling(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE / (2.0f * 20.0/M_PI)); m_phaseDiscri.setFMScaling(RadioClockSettings::RADIOCLOCK_CHANNEL_SAMPLE_RATE / (2.0f * 20.0/M_PI));
applySettings(m_settings, true); applySettings(m_settings, true);
applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true); applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
for (int i = 0; i < 7; i++) {
m_sampleBuffer[i].resize(1);
}
} }
RadioClockSink::~RadioClockSink() RadioClockSink::~RadioClockSink()
@ -66,22 +70,21 @@ void RadioClockSink::sampleToScope(Complex sample)
{ {
if (m_scopeSink) if (m_scopeSink)
{ {
ComplexVector m_sampleBuffer[7]; m_sampleBuffer[0][0] = sample;
m_sampleBuffer[0].push_back(sample); m_sampleBuffer[1][0] = Complex(m_magsq, 0.0f);
m_sampleBuffer[1].push_back(Complex(m_magsq, 0.0f)); m_sampleBuffer[2][0] = Complex(m_threshold, 0.0f);
m_sampleBuffer[2].push_back(Complex(m_threshold, 0.0f)); m_sampleBuffer[3][0] = Complex(m_fmDemodMovingAverage.asDouble(), 0.0f);
m_sampleBuffer[3].push_back(Complex(m_fmDemodMovingAverage.asDouble(), 0.0f)); m_sampleBuffer[4][0] = Complex(m_data, 0.0f);
m_sampleBuffer[4].push_back(Complex(m_data, 0.0f)); m_sampleBuffer[5][0] = Complex(m_sample, 0.0f);
m_sampleBuffer[5].push_back(Complex(m_sample, 0.0f)); m_sampleBuffer[6][0] = Complex(m_gotMinuteMarker, 0.0f);
m_sampleBuffer[6].push_back(Complex(m_gotMinuteMarker, 0.0f));
std::vector<ComplexVector::const_iterator> vbegin; std::vector<ComplexVector::const_iterator> vbegin;
for (int i = 0; i < 7; i++) { for (int i = 0; i < 7; i++) {
vbegin.push_back(m_sampleBuffer[i].begin()); vbegin.push_back(m_sampleBuffer[i].begin());
} }
m_scopeSink->feed(vbegin, m_sampleBuffer[0].end() - m_sampleBuffer[0].begin());
for (int i = 0; i < 7; i++) { m_scopeSink->feed(vbegin, 1);
m_sampleBuffer[i].clear();
}
} }
} }

1
plugins/channelrx/radioclock/radioclocksink.h
View File

@ -138,6 +138,7 @@ private:
int m_zeroCount; int m_zeroCount;
MovingAverageUtil<Real, double, 10> m_fmDemodMovingAverage; MovingAverageUtil<Real, double, 10> m_fmDemodMovingAverage;
int m_bits[4]; int m_bits[4];
ComplexVector m_sampleBuffer[7];
void processOneSample(Complex &ci); void processOneSample(Complex &ci);
MessageQueue *getMessageQueueToChannel() { return m_messageQueueToChannel; } MessageQueue *getMessageQueueToChannel() { return m_messageQueueToChannel; }