From 4ef4dc99399cfa741dffca6fff5fd029f809dc9a Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 6 Oct 2015 09:28:08 +0200 Subject: [PATCH] NFM: Deactivated AF squelch and replaced it by a power level squelch. Adjusted power value. --- plugins/channel/nfm/nfmdemod.cpp | 5 ++++- plugins/channel/nfm/nfmdemod.h | 2 +- plugins/channel/nfm/nfmdemodgui.ui | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/channel/nfm/nfmdemod.cpp b/plugins/channel/nfm/nfmdemod.cpp index b993b0386..dc74250d6 100644 --- a/plugins/channel/nfm/nfmdemod.cpp +++ b/plugins/channel/nfm/nfmdemod.cpp @@ -172,10 +172,13 @@ void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto // AF processing + squelchOpen = (getMagSq() > m_squelchLevel); + + /* if (m_afSquelch.analyze(demod)) { squelchOpen = m_afSquelch.evaluate(); - } + }*/ if (squelchOpen) //if (m_AGC.getAverage() > m_squelchLevel) diff --git a/plugins/channel/nfm/nfmdemod.h b/plugins/channel/nfm/nfmdemod.h index 636e36ab1..d55cf2190 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() / (1<<7); } + Real getMagSq() { return m_AGC.getAverage() / 4534.0; } private: class MsgConfigureNFMDemod : public Message { diff --git a/plugins/channel/nfm/nfmdemodgui.ui b/plugins/channel/nfm/nfmdemodgui.ui index b29163427..d45fbfe90 100644 --- a/plugins/channel/nfm/nfmdemodgui.ui +++ b/plugins/channel/nfm/nfmdemodgui.ui @@ -287,7 +287,7 @@ Threshold min/max in dB - -200 + -1000 0