From c744615b3a2d20817fa3627ff05f32d0e8e0fd77 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 9 Feb 2018 08:42:28 +0100
Subject: [PATCH] SSB demod: set minimum squelch threshold to -120 dB with
 constant

---
 plugins/channelrx/demodssb/ssbdemod.cpp         | 2 +-
 plugins/channelrx/demodssb/ssbdemodgui.cpp      | 2 +-
 plugins/channelrx/demodssb/ssbdemodgui.ui       | 2 +-
 plugins/channelrx/demodssb/ssbdemodsettings.cpp | 3 +++
 plugins/channelrx/demodssb/ssbdemodsettings.h   | 3 +++
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp
index c1afdfac4..0a00ac757 100644
--- a/plugins/channelrx/demodssb/ssbdemod.cpp
+++ b/plugins/channelrx/demodssb/ssbdemod.cpp
@@ -426,7 +426,7 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force)
         (m_settings.m_agcClamping != settings.m_agcClamping) || force)
     {
         int agcNbSamples = 48 * (1<<settings.m_agcTimeLog2);
-        m_agc.setThresholdEnable(settings.m_agcPowerThreshold != -110);
+        m_agc.setThresholdEnable(settings.m_agcPowerThreshold != -SSBDemodSettings::m_minPowerThresholdDB);
         double agcPowerThreshold = CalcDb::powerFromdB(settings.m_agcPowerThreshold) * (SDR_RX_SCALED*SDR_RX_SCALED);
         int agcThresholdGate = 48 * settings.m_agcThresholdGate; // ms
         bool agcClamping = settings.m_agcClamping;
diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp
index d71b135b3..8725f45c8 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp
@@ -523,7 +523,7 @@ void SSBDemodGUI::displayUDPAddress()
 
 void SSBDemodGUI::displayAGCPowerThreshold(int value)
 {
-    if (value == -110)
+    if (value == -SSBDemodSettings::m_minPowerThresholdDB)
     {
         ui->agcPowerThresholdText->setText("---");
     }
diff --git a/plugins/channelrx/demodssb/ssbdemodgui.ui b/plugins/channelrx/demodssb/ssbdemodgui.ui
index b9260db25..1eb189c2e 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.ui
+++ b/plugins/channelrx/demodssb/ssbdemodgui.ui
@@ -777,7 +777,7 @@
          <string>Power threshold (dB)</string>
         </property>
         <property name="minimum">
-         <number>-110</number>
+         <number>-120</number>
         </property>
         <property name="maximum">
          <number>0</number>
diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.cpp b/plugins/channelrx/demodssb/ssbdemodsettings.cpp
index bff130abd..60a2a8c17 100644
--- a/plugins/channelrx/demodssb/ssbdemodsettings.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodsettings.cpp
@@ -21,6 +21,9 @@
 #include "settings/serializable.h"
 #include "ssbdemodsettings.h"
 
+const int SSBDemodSettings::m_minPowerThresholdDB = -120;
+const float SSBDemodSettings::m_mminPowerThresholdDBf = 120.0f;
+
 SSBDemodSettings::SSBDemodSettings() :
     m_channelMarker(0),
     m_spectrumGUI(0)
diff --git a/plugins/channelrx/demodssb/ssbdemodsettings.h b/plugins/channelrx/demodssb/ssbdemodsettings.h
index fe491125a..fda0e1fad 100644
--- a/plugins/channelrx/demodssb/ssbdemodsettings.h
+++ b/plugins/channelrx/demodssb/ssbdemodsettings.h
@@ -53,6 +53,9 @@ struct SSBDemodSettings
     void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; }
     QByteArray serialize() const;
     bool deserialize(const QByteArray& data);
+
+    static const int m_minPowerThresholdDB;
+    static const float m_mminPowerThresholdDBf;
 };