From 93d2da8ae47c7fcddc6fb50b3b99d91f593b3344 Mon Sep 17 00:00:00 2001
From: David Freese <iam_w1hkj@w1hkj.com>
Date: Sat, 3 Jan 2015 14:25:43 -0600
Subject: [PATCH] MFSK squelch

  * decreased and normalized mfsk decoder squelch metric
---
 src/mfsk/mfsk.cxx | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/mfsk/mfsk.cxx b/src/mfsk/mfsk.cxx
index df76b27d..b5768fa1 100644
--- a/src/mfsk/mfsk.cxx
+++ b/src/mfsk/mfsk.cxx
@@ -536,35 +536,37 @@ void mfsk::decodesymbol(unsigned char symbol)
 		if (symcounter) {
 			if ((c = dec1->decode(symbolpair, &met)) == -1)
 				return;
-			met1 = decayavg(met1, met, 32);
+			met1 = decayavg(met1, met, 50);//32);
 			if (met1 < met2)
 				return;
-			metric = met1 / 1.5;
+			metric = met1;
 		} else {
 			if ((c = dec2->decode(symbolpair, &met)) == -1)
 				return;
-			met2 = decayavg(met2, met, 32);
+			met2 = decayavg(met2, met, 50);//32);
 			if (met2 < met1)
 				return;
-			metric = met2 / 1.5;
+			metric = met2;
 		}
 	} else {
 		if (symcounter) return;
 		if ((c = dec2->decode(symbolpair, &met)) == -1)
 			return;
-		met2 = decayavg(met2, met, 32);
-		metric = met2 / 1.5;
+		met2 = decayavg(met2, met, 50);//32);
+		metric = met2;
 	}
 
 	if (progdefaults.Pskmails2nreport && (mailserver || mailclient)) {
 		// s2n reporting: re-calibrate
-		s2n_metric = metric * 3 - 42;
+		s2n_metric = metric * 4.5 - 42;
 		s2n_metric = CLAMP(s2n_metric, 0.0, 100.0);
 	}
 
 	// Re-scale the metric and update main window
-	metric -= 32.0;
-	if (metric <= 5.0) metric = 5.0;
+	metric -= 60.0;
+	metric *= 0.5;
+
+	metric = CLAMP(metric, 0.0, 100.0);
 	display_metric(metric);
 
 	if (progStatus.sqlonoff && metric < progStatus.sldrSquelchValue)