1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-04 14:17:50 -04:00

AF squelch: reset after setting threshold. Removed NFM demod deferred init

This commit is contained in:
f4exb 2017-06-06 02:16:28 +02:00
parent 91021678b2
commit 604273742a
3 changed files with 2 additions and 9 deletions

View File

@ -272,8 +272,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg
m_channelMarker(this), m_channelMarker(this),
m_basicSettingsShown(false), m_basicSettingsShown(false),
m_doApplySettings(true), m_doApplySettings(true),
m_squelchOpen(false), m_squelchOpen(false)
m_autoInitCount(0)
{ {
ui->setupUi(this); ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true); setAttribute(Qt::WA_DeleteOnClose, true);
@ -429,10 +428,4 @@ void NFMDemodGUI::tick()
m_squelchOpen = squelchOpen; m_squelchOpen = squelchOpen;
} }
if (m_autoInitCount < 100) // ~5s
{
if (m_autoInitCount == 99) applySettings(true);
m_autoInitCount++;
}
} }

View File

@ -69,7 +69,6 @@ private:
bool m_ctcssOn; bool m_ctcssOn;
bool m_audioMute; bool m_audioMute;
bool m_squelchOpen; bool m_squelchOpen;
uint32_t m_autoInitCount;
static const int m_rfBW[]; static const int m_rfBW[];
static const int m_fmDev[]; static const int m_fmDev[];

View File

@ -304,4 +304,5 @@ void AFSquelch::setThreshold(double threshold)
{ {
qDebug("AFSquelch::setThreshold: threshold: %f", threshold); qDebug("AFSquelch::setThreshold: threshold: %f", threshold);
m_threshold = threshold; m_threshold = threshold;
reset();
} }