From 046d88bb586e19dcdfc8d211e78f79bdd906ecd1 Mon Sep 17 00:00:00 2001
From: OneOfEleven <N/A>
Date: Sun, 26 Nov 2023 05:57:00 +0000
Subject: [PATCH] .

---
 firmware.bin        | Bin 60804 -> 60804 bytes
 firmware.packed.bin | Bin 60822 -> 60822 bytes
 ui/main.c           |  27 ++++++++++++++++++---------
 ui/menu.h           |   4 ++--
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/firmware.bin b/firmware.bin
index 3163ab26c45cc955ec76a952eaf825337e4cfe58..37364059de07a065fee6c3fb1ec084bbaa0dfb28 100644
GIT binary patch
delta 523
zcmXYp-D^^D9LB%D^E)S}y}%ZYqb@s5*4uGnI$ceW={ZH}+RROmQc1D!Zc-4Z3%3OW
zZx#ecSb4^Z>SlN1kLW7!9~e8<t~x{~B6@*=(1jF<onkl7^LZY4o>dL6YPj)|VseGs
z*ZpLR+F{LK(04RUeL@Gx1G|ti526CPgN~p@vR%f9mciM11*fVFEK_nJ&OEZ0NW`q>
z<93NenD$M>QP2T*9h>1?EEnI%6e0`ZY)r{$CfME5Ggo<t`0Nt!(0;D-Anfyoe$80Y
zM!Rmb^D)skB-y2-LNYdFD5z_CB5sx7EJW3+-Wr{qD^j1WEF^)JnNIaLxLK8luyHo+
zr(~+mONvcv+D05aymgGeYht<Y#C63+)$0-b0V|rIHRZKR;sm(;DvY5``sqsObR0iP
zXDOv+8+NWV(*o0B<zD6F^k6S2vBHHiXK6M2T}#g=p-EQolyxKF9#T-?MwS(jl1?H2
z^7wX}QGiG4ukQUnrbg#Y>#|&2a*^87vjGdHV|0n`;$svERYQl7ORm(c$VJv`DH;{Y
z-s6d&>3ku7D?f3OoY{3AIKCfT-0b2#&Kuyo9<Pt{_^14VDR1CK={++xE^=4qW<=<p
z6S+k45<s69IZ+S|aEshbbbbN)F7oi>>jCE9Xp%&~{Y3vUK*B$qnEr|Z<kH^AU!D`Q
AS^xk5

delta 524
zcmZp<&D?UEdBYMW)~L87)3nVina)daK4g5#_>z&ENo;eYv~wsYAEO{+5@SAN(dM%S
z%sllUwlb(Cd$(_p&S0IuG>v)MW+$!-3Et8bo1NG$#sg_aYbl0cxmk|PlVZJMz30Rv
zIfXdJc+HNv&CYOT#e-;HZ3ZV}=?VsIhKmayXfrrN*|Q%60QIr}MW+EpgS=dfg({>g
zgq;Jugn%T&h3*Ib-jWpznhdrV+8!KG^7T()dMqiy5X8VTne{{aFXq_{+JYCf85~R<
zjpZt|D`rdI-o!LnU7P)evCMTn#+yz+!|!d<P@X)aHb4=i*zy8{D&uUH`3=_0lQq4W
zW=6z{DK|(rY>IGZ{UAG;y-v|h?5}l&gtJ9~0@r~}|G)G9WuDDwE)5i6o-I-E04T!t
zmvMG<tb{Y;?1)gHoGGI*^W=KnQx{o*rZZmn`Mv57`-TsDCuh{@u%x_YVAwpRZUG0^
zcV=c5FBVaz43^Dy?RLD3dXsCXNHXeeo<1d%g)wdO+ZiU->?SFRsTQdgn>DT|v&lj^
zItqUIWeP@S3PuJ-#tH_eRz~JlCZ>xsZn3IrxhQz}`?xUt*LG0|2y$g$_^;!l;Nt88
vWazpm_;?0~F#Ols+<SjJ2P;_9X3rO&8Np1G&5o~>nOUwgJZGMq@m2-^q1Uk}

diff --git a/firmware.packed.bin b/firmware.packed.bin
index 8685d4cdd274b8dc55bad77872a184198317379a..223941ff94ca3c5a810ea78182e04f346d7e15cd 100644
GIT binary patch
delta 684
zcmV;d0#p5#+XI%{1F)n51?~)Lp@g%k0?!x;+9<(RG}Lp7OtXO-g#-tA_Rs|Z?^d%7
zAjeP%pp|?XfY*-$O|#u_0}OwW_)6$x;CVKH4^od2NEAl2SVwMtVjS=!QJWPf2lBvN
zTES^US38O?AwH2YsL&v~2!hIOroOzF-T<o>0|-dMI@MUK77Wm_%RnjWRs`Cii9(%c
zj+1t#f+zeR4dI`xk4@(DAoPsX-D^UrTg+_;D@Zc2M3VTTotSze)LMV|7CU->Dv6qe
zV1-B=Ap;dfs=#yBcbsKw6e($BIj+*aMX|!jb}!S8YSMbgamY-r#%KjOGk@B{PeYq!
zy?M?@>gSa3Yc1DFvx(#VK4N_Epz%YKX3Q|8Hu5Bd4<_MnmnmY;rn1-h+ucohr)ZmB
zClFo%@v{qH_UF7oH;sRPP?h0_9znMHy@#k&EXqOo2f7mVx3-CA%RdJlha&Tn6+^v1
zY<e6^4e32%K(F~)Us(8#$Tb{28BXcI&Ak6iE$QQrNU=)SN!3_>iNJNEswT2xx~J{%
zVdgXk`~zj#J{x7GR9~ICLiOEo4We7FSNh?khO%iNgY)3pUphy=TeHcIyJ#EhGgpQO
zP&abZ=pok3^PGndz5Tl=D0kJ?lB;bZz;gCkNR-WIVEgdxOnjtm)~gZhCBTE(0ACa1
zR3#NTmrJvxexL{nqi*`UuAzrHuNt#XhdvDfLz9h^837=(r<7F$0Y<a^m^3>Fz#!KG
zK0B|oIMgEs9Wy|jKS`zHmVGLzh^Dcsa4thJBKDsJ&KW_7PmQB^+65&NZ3rK2n%0ZB
z2!wJC1r3z3pG%)lrw=&TN-3pu%xS3~jR1g?vz_0!2nB?qBr3(TS?Kct1&=PI6)dw+
S>LUXLkg<KclX&eM0{DdiGet)L

delta 684
zcmV;d0#p5#+XI%{1F)n51?n(v&eyZ40?!x;-YCsh%h#ESQL}*?g#-tD@X!TVzE`si
zAjeP%zm*Rekk{@5P_x}|0}Ov*Zn}F1jd?bh^i_;;l@dT4a{l}m`DVk6Yc7U;or&{C
z8QM|~Nz&D_@;#9<sL&v~2!hINroOzF-T<o?0}n{TI@MUK77Wm_%R?#ZRs`Cii9(%c
zj+Az%f+zeR4dI`yk4@(CAoPsX-D^UrThDC>D@Zc2M3wlxotSze)LMV|7dv`?DT$hd
zV1-B=Ap;dfs=#yBbSZt1F8KpjV&l`eSz7BV#!QnYv-3yrXghyk4`kO;a;H9+l4~ej
zy>L}A77na(s%{P5u!-IK0Bv9CuJJ;b%NYy5@ey0X2436^CLd#-ohh}?hJs~6zA2+*
z4<mjFwXP#u*QSLzCdq$Z7$})ijB(`u9YUu{Y;c$n{g&YL33e%YB)<|X#0#B}5+8ro
zaotSFCg~$(D{>l6Oc?mpmng&~IaK-qTVzo%M|FCZNK`G5xRDkjdp@C26oH9a^<OV9
zoHu*Ja}?X+)jC*xp13KqB;M7Kh(+(1+8f9KEUDKYgQ|mqnIlKYTN{!{#c-|{`yGR~
zQOt_;YbvOK1d;QzeVfQBD0c|flB?`2z)~SlNVG0)VA~VKOkDX&)~o;QCBWd>0AEAk
zR3(kqmus`6exL{nS821mjG<*X(j2o+hdvDfL6eP?837`*r<7F$0YtO?m^3>F#U|GR
zXKJpqIMgEs9X3XsKM?femVGLzh^Dcsa4thJBKDsJ&K^LBNsgm<+65&QZ3rK2n%0ZB
z350SD1r3z3pG==mrw=&TN-3sv%xS3~jR1g=vz_0!2nB<qBrM0XS?Kct1&A-C6E3q+
S>LUXLpt72{lX&eM0;@lYoI0-n

diff --git a/ui/main.c b/ui/main.c
index 1ac2a71..d2ac0dc 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -47,9 +47,9 @@
 
 //#define SHOW_RX_TEST_VALUES
 
+// calibrate the RSSI reading .. roughly
 //const int     rssi_offset_band_123  = 0;
 //const int     rssi_offset_band_4567 = 0;
-
 const int     rssi_offset_band_123  = -44;
 const int     rssi_offset_band_4567 = -18;
 
@@ -425,13 +425,22 @@ void big_freq(const uint32_t frequency, const unsigned int x, const unsigned int
 			max_rssi  = g_panadapter_max_rssi;
 			min_rssi  = g_panadapter_min_rssi;
 			span_rssi = max_rssi - min_rssi;
-			if (span_rssi < 40)  // minimum vertical range (20dB)
-			{
-				span_rssi = 40;
-				if (min_rssi > (255 - span_rssi))
-					min_rssi =  255 - span_rssi;
-				max_rssi = min_rssi + span_rssi;
-			}
+			if (span_rssi < 30)
+				span_rssi = 30;
+			if (min_rssi > (255 - span_rssi))
+				min_rssi =  255 - span_rssi;
+			max_rssi = min_rssi + span_rssi;
+
+			#if 0
+				{	// show the min/max RSSI values
+					char str[16];
+					sprintf(str, "%u", min_rssi);
+					UI_PrintStringSmall(str, 2, 0, line + 0);
+					//sprintf(str, "%u", max_rssi);
+					sprintf(str, "%u", span_rssi);
+					UI_PrintStringSmall(str, LCD_WIDTH - 2 - (7 * strlen(str)), 0, line + 0);
+				}
+			#endif
 
 			#ifdef ENABLE_PANADAPTER_PEAK_FREQ
 				if (g_panadapter_peak_freq > 0)
@@ -439,7 +448,7 @@ void big_freq(const uint32_t frequency, const unsigned int x, const unsigned int
 					char str[16];
 					sprintf(str, "%u.%05u", g_panadapter_peak_freq / 100000, g_panadapter_peak_freq % 100000);
 					NUMBER_trim_trailing_zeros(str);
-					UI_PrintStringSmall(str, 8, 0, line + 0);
+					UI_PrintStringSmall(str, 2 + (7 * 4), 0, line + 0);
 				}
 			#endif
 		}
diff --git a/ui/menu.h b/ui/menu.h
index 41c391e..a5b4ae4 100644
--- a/ui/menu.h
+++ b/ui/menu.h
@@ -101,11 +101,11 @@ enum
 	MENU_UP_CODE,
 	MENU_DN_CODE,
 	MENU_DTMF_ST,
-	MENU_DTMF_RSP,
 	MENU_DTMF_HOLD,
 	MENU_DTMF_PRE,
-	MENU_DTMF_DCD,
 	MENU_DTMF_LIST,
+	MENU_DTMF_RSP,
+	MENU_DTMF_DCD,
 #ifdef ENABLE_DTMF_LIVE_DECODER
 	MENU_DTMF_LIVE_DEC,
 #endif