mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

NFM demod: quadrature squelch attack and decay

pull/27/head
f4exb 2017-05-12 10:45:18 +02:00
rodzic 67f318e6ed
commit 07fc282d89
1 zmienionych plików z 6 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
plugins/channelrx/demodnfm/nfmdemod.cpp
Wyświetl plik

@ -183,25 +183,21 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
if ( (m_running.m_deltaSquelch && ((deviation > m_squelchLevel) || (deviation < -m_squelchLevel))) ||
(!m_running.m_deltaSquelch && (m_movingAverage.average() < m_squelchLevel)) )
{
if (m_squelchCount < m_squelchGate)
if (m_squelchCount > 0)
{
m_squelchCount = 0; // return to 0
}
else
{
m_squelchCount--; // grace period
m_squelchCount--;
}
}
else
{
if (m_squelchCount < m_squelchGate + 2)
if (m_squelchCount < m_squelchGate + 480)
{
m_squelchCount++;
}
}
//squelchOpen = (getMag() > m_squelchLevel);
m_squelchOpen = m_squelchCount >= m_squelchGate; // wait for AGC to stabilize
m_squelchOpen = (m_squelchCount > m_squelchGate);
/*
if (m_afSquelch.analyze(demod))
@ -248,8 +244,9 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
}
else
{
Real squelchFactor = (Real) (m_squelchCount - m_squelchGate) / 480.0f;
demod = m_bandpass.filter(demod);
sample = demod * m_running.m_volume;
sample = demod * m_running.m_volume * squelchFactor * squelchFactor;
}
}
else