From 7a58dbc0cb153c4e5461583467b5d5b04829b77a Mon Sep 17 00:00:00 2001
From: OneOfEleven <OneOfEleven@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:18:41 +0100
Subject: [PATCH] AM fix update

---
 app/app.c           |  17 +++++++++--------
 firmware            | Bin 166700 -> 166700 bytes
 firmware.bin        | Bin 51796 -> 51796 bytes
 firmware.packed.bin | Bin 51814 -> 51814 bytes
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/app.c b/app/app.c
index 7308bd5..c228c59 100644
--- a/app/app.c
+++ b/app/app.c
@@ -1400,8 +1400,8 @@ void APP_CheckKeys(void)
 		//                 1 = -27dB
 		//                 0 = -33dB
 
-		// -90dBm, any higher and the AM demodulator starts to saturate/clip (distort)
-		const uint16_t desired_rssi = (-90 + 160) * 2;   // dBm to ADC sample
+		// -87dBm, any higher and the AM demodulator starts to saturate/clip (distort)
+		const uint16_t desired_rssi = (-87 + 160) * 2;   // dBm to ADC sample
 
 		// start with current settings
 		register uint16_t new_lna_short = am_lna_short;
@@ -1424,7 +1424,8 @@ void APP_CheckKeys(void)
 		}
 		else
 		{
-			max_lna = 5;
+//			max_lna = 4;
+			max_lna = 7;
 			max_pga = 7;
 		}
 
@@ -1447,21 +1448,21 @@ void APP_CheckKeys(void)
 		if (rssi > desired_rssi)
 		{	// decrease gain
 
+			if (new_lna > orig_lna)
+				new_lna--;
+			else
 			if (new_pga > orig_pga)
 				new_pga--;
 			else
 			if (new_mixer > orig_mixer)
 				new_mixer--;
 			else
-			if (new_lna > orig_lna)
+			if (new_lna > 0)
 				new_lna--;
 			else
 			if (new_pga > 0)
 				new_pga--;
 			else
-			if (new_lna > 0)
-				new_lna--;
-			else
 			if (new_mixer > 0)
 				new_mixer--;
 //			else
@@ -1477,7 +1478,7 @@ void APP_CheckKeys(void)
 		if (am_fix_increase_counter == 0)
 		{	// increase gain
 
-			if (rssi < (desired_rssi - 7))
+			if (rssi < (desired_rssi - 10))
 			{	// increase gain
 				if (new_pga < max_pga)
 				{
diff --git a/firmware b/firmware
index 5a86fe0f91569552c027ccb0e630b890619f0113..b432de59ec2de71590e0af0991139996983bece1 100644
GIT binary patch
delta 116
zcmZ28jcd&`u7)j)`-~acr|&mrv=*PF!FrQPPxB_D-L_3e%GHV0nGD*-7u%-`nlQR5
zvgt70WVBhb>C$s%U8b9iwre+?ea@hF@*;!I=Zg%w$1i-{UT(q|H$lwM+|bm*$e5Rl
S!Qa&_To=mS{`v@`<1qk+n<;1j

delta 116
zcmZ28jcd&`u7)j)`-~Y`r|&mrv=;BtV7<wvqj{6jX2~Wa<?6)hOa^V^i!IXyO&DDj
znRS_NGTN@)bm=*h9@9-myKS4!K4;K5d67Zy$3+I+;}<?`FE?R~n;@2Knw)50p32L`
S;P2`dt_$UEe|?0}@fZM_!z$MR

diff --git a/firmware.bin b/firmware.bin
index c972ae988a1d997dff4615bf572a6d1538d1f7af..761de49b26a18f6eee73e431f2fb385b74667426 100644
GIT binary patch
delta 110
zcmcaIh55=9<_-Id8QCZAH?|g^q``WVNl)`8qusVmM#|NR)tL<1#uwWs3!1npvgt70
zWVBhb>C$s%U8b9iwre+?ea@hF@*;!I=Zg%w$1i-{Ty7FKLCnzH(A2`nn3s#e-_<Q#
M7s}oI`bZ`#004$4bN~PV

delta 110
zcmcaIh55=9<_-Id8CfUqH?|h<(O|vFrlWb2(PqgeBjxJE>P!Z0<BKhm1x;KPnRS_N
zGTN@)bm=*h9@9-myKS4!K4;K5d67Zy$3+I+;}<?`E;osrAeL;JoM>R4%FD&z@9Gw=
M3*~NpeI%0=0265`;{X5v

diff --git a/firmware.packed.bin b/firmware.packed.bin
index f08b6afb95eb0bafb86bb20ed694617b4c7fd55b..e94c4487c236175c5ef48cf4b971885977286bbc 100644
GIT binary patch
delta 126
zcmaDhh56YO<_&BL?3IffLL*+rZ01!sD9ku>@_A!x@lT(#to(vLPQJdiEl&Kf`HpI_
z{U_3|<V{vIaaH`Ws?jx2;rhnIhHGTMeJ$(1!1?K%M&)bvNz1o<K2SfaeedRWleh_D
k-%oDewj@cvj#F^vtFpz6Zmm9j?9$Ske;>(YWy)m%0PM3o1poj5

delta 126
zcmaDhh56YO<_&BL?Ai-2F$TQh+RUqPP?&M{<nzYX;%`1@S$PF~oP2%zlsNIj<~ypz
z_Mb?<k~>+^#8vU{>PFW<#d{kM8?Kf6_O-0%H0P&t8r84aCoSFo`9S@w_8ptsP2whq
kEj|78(VFziI!?ivugVrPinPn!;+ON?{QF2IE7PZC0J2m)A^-pY