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%T_DSL?WVKO8T3wGWYGD1kwN$Pg|FMoO&H@Qh#8t2npzkc^Kvox
RySjzzLb=;tA7OMn1^|YeDQExy

delta 116
zcmZ28jcd&`u7)j)`-~Y`r|&mrv=;BtV7<wvqj{6jX2~Wa<?6)hOa^V^i!IXyO&DDj
znRS_NGTN@)bm=*h9*||XZPVH33_2$-GU)xd$e?@t!iVkUCX8_t#F9;u6AjE$dAS(;
RUERWUq1^4Sk1#qO0|1)CD%Su2

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%T_DSL?WVKO8T3wGWYGD1kwN$Pg|C~-P2whq8JZiKS{NDgaxwV3x`pdP
Lxtm`f$z%lp0EQ@Z

delta 110
zcmcaIh55=9<_-Id8CfUqH?|h<(O|vFrlWb2(PqgeBjxJE>P!Z0<BKhm1x;KPnRS_N
zGTN@)bm=*h9*||XZPVH33_2$-GU)xd$e?@t!iUY}CUFzQl1-Bn4a`${xfuLi-NJRD
L+|93#WU>MP6KN^q

diff --git a/firmware.packed.bin b/firmware.packed.bin
index f08b6afb95eb0bafb86bb20ed694617b4c7fd55b..e94c4487c236175c5ef48cf4b971885977286bbc 100644
GIT binary patch
delta 126
zcmV-^0D=GJlmq6J1F!}l2YI7_Raog<vkf4@69Ji%&oet0^7CpsPEzrc*R_UT7sEHW
zdltXQXVh+!Av8rH_^N?LQ6Sf`!!fKK_Vsp;&<XO+D0%A#lBcxuz<-*Dy|afjUXT{|
g$+xzoVlRFP5t-_CqX9;ROpXT|8?*bwX$1mp1njds1poj5

delta 126
zcmV-^0D=GJlmq6J1F!}l2P>h{0Z{A;vkf4@69Jo(&oet0?DJ|mN>K5W*SC~j7sEHW
zdltXQXVh(zAv8rH{i}gRQ6b*3!!fNM_Vsp*%L($%D0}M%lBK`%z<-*DxU+{eUXT{0
g%jM#%XL)`J5t-_CqX86$9@-BcO|$#NX$1oErm|E$A^-pY