VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Provision for x^-2 samples in nfmdemod

This commit is contained in:
f4exb 2015-05-14 15:17:37 +02:00
parent 5f1da35490
commit 51396e01ac
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/channel/nfm/nfmdemod.cpp
View File

@ -107,6 +107,8 @@ void NFMDemod::feed(SampleVector::const_iterator begin, SampleVector::const_iter
qint16 sample; qint16 sample;
if(m_squelchState > 0) { if(m_squelchState > 0) {
m_squelchState--; m_squelchState--;
// demod
/* /*
Real argument = arg(ci); Real argument = arg(ci);
Real demod = argument - m_lastArgument; Real demod = argument - m_lastArgument;
@ -114,19 +116,20 @@ void NFMDemod::feed(SampleVector::const_iterator begin, SampleVector::const_iter
*/ */
Complex d = conj(m_m1Sample) * ci; Complex d = conj(m_m1Sample) * ci;
m_m2Sample = m_m1Sample;
m_m1Sample = ci;
Real demod = atan2(d.imag(), d.real()); Real demod = atan2(d.imag(), d.real());
//Real demod = arctan2(d.imag(), d.real()); demod /= M_PI;
/*
/*
Real argument1 = arg(ci);//atan2(ci.imag(), ci.real()); Real argument1 = arg(ci);//atan2(ci.imag(), ci.real());
Real argument2 = m_lastSample.real(); Real argument2 = m_lastSample.real();
Real demod = angleDist(argument2, argument1); Real demod = angleDist(argument2, argument1);
m_lastSample = Complex(argument1, 0); m_lastSample = Complex(argument1, 0);
*/ */
m_m2Sample = m_m1Sample;
m_m1Sample = ci;
demod /= M_PI; // AF processing
demod = m_lowpass.filter(demod); demod = m_lowpass.filter(demod);