From 7e6ab8204b57477568083235d9eb33f0bee81585 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 15 Jan 2017 17:03:32 +0100 Subject: [PATCH] NFM and DSD plugins: use double for base type of moving average. There was an overflow with float on high power signals (over ~5 dBm) preventing the squelch to close back --- plugins/channelrx/demoddsd/dsddemod.h | 2 +- plugins/channelrx/demodnfm/nfmdemod.h | 2 +- plugins/channelrx/demodnfm/nfmplugin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/channelrx/demoddsd/dsddemod.h b/plugins/channelrx/demoddsd/dsddemod.h index 4ed5f011d..90a810cbc 100644 --- a/plugins/channelrx/demoddsd/dsddemod.h +++ b/plugins/channelrx/demoddsd/dsddemod.h @@ -262,7 +262,7 @@ private: bool m_squelchOpen; Real m_lastArgument; - MovingAverage m_movingAverage; + MovingAverage m_movingAverage; Real m_magsq; Real m_magsqSum; Real m_magsqPeak; diff --git a/plugins/channelrx/demodnfm/nfmdemod.h b/plugins/channelrx/demodnfm/nfmdemod.h index 35b888b97..ef8c9046b 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.h +++ b/plugins/channelrx/demodnfm/nfmdemod.h @@ -207,7 +207,7 @@ private: //Complex m_m1Sample; //Complex m_m2Sample; MagAGC m_AGC; - MovingAverage m_movingAverage; + MovingAverage m_movingAverage; AFSquelch m_afSquelch; Real m_agcLevel; // AGC will aim to this level Real m_agcFloor; // AGC will not go below this level diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 7d1f95e6f..8252fbe52 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -7,7 +7,7 @@ const PluginDescriptor NFMPlugin::m_pluginDescriptor = { QString("NFM Demodulator"), - QString("2.5.0"), + QString("3.1.1"), QString("(c) Edouard Griffiths, F4EXB"), QString("https://github.com/f4exb/sdrangel"), true,