diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index d414fd207..d47e58733 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -218,8 +218,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget m_channelMarker(this), m_basicSettingsShown(false), m_doApplySettings(true), - m_squelchOpen(false), - m_powerMeterTickCount(0) + m_squelchOpen(false) { ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); @@ -305,27 +304,18 @@ void AMDemodGUI::enterEvent(QEvent*) void AMDemodGUI::tick() { - if (m_powerMeterTickCount < 4) // 200 ms - { - m_powerMeterTickCount++; - } - else - { - Real magsqAvg, magsqPeak; - int nbMagsqSamples; - m_amDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + Real magsqAvg, magsqPeak; + int nbMagsqSamples; + m_amDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); + Real powDbAvg = CalcDb::dbPower(magsqAvg); + Real powDbPeak = CalcDb::dbPower(magsqPeak); - ui->channelPowerMeter->levelChanged( - (100.0f + powDbAvg) / 100.0f, - (100.0f + powDbPeak) / 100.0f, - nbMagsqSamples); + ui->channelPowerMeter->levelChanged( + (100.0f + powDbAvg) / 100.0f, + (100.0f + powDbPeak) / 100.0f, + nbMagsqSamples); - ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); - - m_powerMeterTickCount = 0; - } + ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); bool squelchOpen = m_amDemod->getSquelchOpen(); diff --git a/plugins/channelrx/demodam/amdemodgui.h b/plugins/channelrx/demodam/amdemodgui.h index 13934c5d9..1fdba60ef 100644 --- a/plugins/channelrx/demodam/amdemodgui.h +++ b/plugins/channelrx/demodam/amdemodgui.h @@ -61,7 +61,6 @@ private: DownChannelizer* m_channelizer; AMDemod* m_amDemod; bool m_squelchOpen; - int m_powerMeterTickCount; explicit AMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* parent = NULL); virtual ~AMDemodGUI(); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index a7f17b574..bffe1929d 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -384,27 +384,18 @@ void NFMDemodGUI::blockApplySettings(bool block) void NFMDemodGUI::tick() { - if (m_powerMeterTickCount < 4) // 200 ms - { - m_powerMeterTickCount++; - } - else - { - Real magsqAvg, magsqPeak; - int nbMagsqSamples; - m_nfmDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); - Real powDbAvg = CalcDb::dbPower(magsqAvg); - Real powDbPeak = CalcDb::dbPower(magsqPeak); + Real magsqAvg, magsqPeak; + int nbMagsqSamples; + m_nfmDemod->getMagSqLevels(magsqAvg, magsqPeak, nbMagsqSamples); + Real powDbAvg = CalcDb::dbPower(magsqAvg); + Real powDbPeak = CalcDb::dbPower(magsqPeak); - ui->channelPowerMeter->levelChanged( - (100.0f + powDbAvg) / 100.0f, - (100.0f + powDbPeak) / 100.0f, - nbMagsqSamples); + ui->channelPowerMeter->levelChanged( + (100.0f + powDbAvg) / 100.0f, + (100.0f + powDbPeak) / 100.0f, + nbMagsqSamples); - ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); - - m_powerMeterTickCount = 0; - } + ui->channelPower->setText(QString::number(powDbAvg, 'f', 1)); bool squelchOpen = m_nfmDemod->getSquelchOpen(); diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.h b/plugins/channelrx/demodnfm/nfmdemodgui.h index b302f3103..f9887e6d1 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.h +++ b/plugins/channelrx/demodnfm/nfmdemodgui.h @@ -69,7 +69,6 @@ private: bool m_ctcssOn; bool m_audioMute; bool m_squelchOpen; - int m_powerMeterTickCount; static const int m_rfBW[]; static const int m_fmDev[];