VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-27 15:26:33 -04:00
Code Issues Projects Releases Wiki Activity

Channel Analyzer: fixed sink initialization and removed unused baseband public set baseband sample rate

Browse Source
This commit is contained in:
f4exb 2020-07-20 02:07:40 +02:00
parent 9b10ddc668
commit cb3be14515
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
View File

@ -175,11 +175,3 @@ int ChannelAnalyzerBaseband::getChannelSampleRate() const
{
return m_channelizer->getChannelSampleRate();
}
void ChannelAnalyzerBaseband::setBasebandSampleRate(int sampleRate)
{
m_channelizer->setBasebandSampleRate(sampleRate);
int desiredSampleRate = getSinkSampleRate(m_settings);
m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), desiredSampleRate, m_channelizer->getChannelFrequencyOffset());
}

1
plugins/channelrx/chanalyzer/chanalyzerbaseband.h
View File

@ -67,7 +67,6 @@ public:
int getChannelSampleRate() const;
double getMagSq() { return m_sink.getMagSq(); }
double getMagSqAvg() const { return (double) m_sink.getMagSqAvg(); }
void setBasebandSampleRate(int sampleRate);
void setSampleSink(BasebandSampleSink* sampleSink) { m_sink.setSampleSink(sampleSink); }
bool isPllLocked() const { return m_sink.isPllLocked(); }
Real getPllFrequency() const { return m_sink.getPllFrequency(); }

3
plugins/channelrx/chanalyzer/chanalyzersink.cpp
View File

@ -29,6 +29,7 @@ const unsigned int ChannelAnalyzerSink::m_corrFFTLen = 4*m_ssbFftLen;
ChannelAnalyzerSink::ChannelAnalyzerSink() :
m_channelSampleRate(48000),
m_channelFrequencyOffset(0),
m_sinkSampleRate(48000),
m_sampleSink(nullptr)
{
m_usb = true;
@ -41,7 +42,7 @@ ChannelAnalyzerSink::ChannelAnalyzerSink() :
m_corr = new fftcorr(2*m_corrFFTLen); // 8k for 4k effective samples
m_pll.computeCoefficients(0.002f, 0.5f, 10.0f); // bandwidth, damping factor, loop gain
applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
applyChannelSettings(m_channelSampleRate, m_sinkSampleRate, m_channelFrequencyOffset, true);
applySettings(m_settings, true);
}