From 821e4e9ec842a49858f95f50729de35b3d916923 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 5 Oct 2015 09:17:44 +0200 Subject: [PATCH] NFM demod: fixed volume and scaling of magnitude squared --- plugins/channel/nfm/nfmdemod.cpp | 2 +- plugins/channel/nfm/nfmdemod.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/channel/nfm/nfmdemod.cpp b/plugins/channel/nfm/nfmdemod.cpp index 070d46132..b993b0386 100644 --- a/plugins/channel/nfm/nfmdemod.cpp +++ b/plugins/channel/nfm/nfmdemod.cpp @@ -218,7 +218,7 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto { demod = m_bandpass.filter(demod); demod *= m_running.m_volume; - sample = demod * 4; // denominator = bandpass filter number of taps + sample = demod * 10; } } else diff --git a/plugins/channel/nfm/nfmdemod.h b/plugins/channel/nfm/nfmdemod.h index 524362656..636e36ab1 100644 --- a/plugins/channel/nfm/nfmdemod.h +++ b/plugins/channel/nfm/nfmdemod.h @@ -64,7 +64,7 @@ public: m_ctcssIndexSelected = selectedCtcssIndex; } - Real getMagSq() { return m_AGC.getAverage(); } + Real getMagSq() { return m_AGC.getAverage() / (1<<7); } private: class MsgConfigureNFMDemod : public Message {