From ee2cc196ddfa1da27d3dd49ab966df828ff00d2a Mon Sep 17 00:00:00 2001
From: OneOfEleven <N/A>
Date: Sat, 11 Nov 2023 13:36:35 +0000
Subject: [PATCH] .

---
 app/main.c          |   5 +----
 firmware.bin        | Bin 61356 -> 61356 bytes
 firmware.packed.bin | Bin 61374 -> 61374 bytes
 frequencies.c       |   6 +++---
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/main.c b/app/main.c
index c9a8290..184f03b 100644
--- a/app/main.c
+++ b/app/main.c
@@ -1033,9 +1033,6 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t directio
 						//	freq = FREQUENCY_floor_to_step(freq, g_scan_initial_step_size, g_scan_initial_lower, g_scan_initial_upper);
 						//}
 					#endif
-
-//					if (band == BAND2_108MHz)
-//						freq = FREQUENCY_floor_to_step(freq, g_scan_initial_step_size, g_scan_initial_lower, g_scan_initial_upper);
 				}
 
 				freq += g_scan_initial_step_size * direction;
@@ -1056,7 +1053,7 @@ void MAIN_Key_UP_DOWN(bool key_pressed, bool key_held, scan_state_dir_t directio
 					//	freq = FREQUENCY_floor_to_step(freq, g_scan_initial_step_size, g_scan_initial_lower, g_scan_initial_upper);
 				#endif
 
-				if (band == BAND2_108MHz)
+				if (band == BAND2_108MHz)   // cope with the 8.333kHz step size
 					freq = FREQUENCY_floor_to_step(freq, g_scan_initial_step_size, g_scan_initial_lower, g_scan_initial_upper);
 
 				if (FREQUENCY_rx_freq_check(freq) < 0)
diff --git a/firmware.bin b/firmware.bin
index 17453c37495d837265ef62e028e0961187871d8e..018e749beb8c95d4647097f79b6f08cbae234ae2 100644
GIT binary patch
delta 770
zcmY+BTS!z<6o%J6$MK$BbizrDBc(E3AZJD`ONJi0Jrr0Lbg_~wG9&2<8KotrH80YM
zd`TFoP)x|&5?DSIJqZ@{Fk+|;L4s*E_Rxc1)OVtn;CyHO`(JCXz4kdhQL`s%_GZ?r
zc<rh0OjIuWO>>s}=Xa65X^{cQ5V0~MB8L9aTw_vD5!$C3_4Ck<L{+Wl?Gt8F?yN|@
zgMG4Xv+F@j#H*jQU2`RsV)|gG_O|;?cL>=Em(r-EZ9BT#J|E61D?=RvQDXHIPs3$+
zN7W#4hPVKA>@21KHppXrZ$hMw{1W!PCR#i%(H=b!o-x#0d+3qhGf%?gMk(NIxJb7-
zL#(CR{rHvXUW?txMb{G>62#iRn4#^-&islZ9ElU_zj<lq#{a@elW-?Zqy@I%?SeQ?
z53$~h-o%u5(MQp#_*KLd;yL0CUEMWi)L%t9ZIZE_t=DOP6Plm}n#n%|XN(B>7tq0a
zlo-CP<QaMphT#K5VS?Nzh(i2`NDR;UgA2qncvFzfXe(l}Tvj1!FwVjezQSSf>W@!@
z@#>cL^wk=kCMwFyMT)~BRa7<Pi?tiCT6gp(<|GsrRaTzbSgd;^2aMET18Zc;4CH#H
zzrtQNdfzA;(_NzhbL$Xyc@HD-8NNacBpBr7yn{jKvt~jTtORGB1G(U}v&ZwY|DCnY
z+EaVQDk!jg8+?ANz+d7oED03p<KuIST#hW(`=@`azcOGS{5Gt7diCrDBg2)h<PfJh
LOqs1JT`BnkhBxEp

delta 770
zcmY+BT}TvB6vxk<+10g7qjk;2q><3Y>cQPLboF72Kp%oW$b!m+=tC(56Qd%7U6C{s
zA{s#`qKyiL49qKm27yme7`>zzY5S5S+NRM%6hZw4dI{z?=YRj_+;h*J8BUqQDRZPC
zu3Xw5AM_~Gp6n^~eg7&lx+F3Vc_LQcw20_$J<TQsvA%<<Q$Ovi^Qb2M(>`ft)l*iI
z2K)3tjk|wEB%mJ+bhxu>Fw3D<m)#AUzFy=FIG;lWZSSCm?6zd#fqkeLh!Sg**a+?L
zhN=nTGVwQDW@iokcS9-bTk|59$ggML3!=p{f!?U+lgoyhv|l|4`+ty7+$am24efMW
zHN?u*zK73EUm126H`qo@WQtXr%h2}1U?5h3BQCN2o0n!@{7;;;0KGXP*Pt4&4qTkx
z$9g}yk}0pF8_?PKCx~l_EyOGO%+LoTei7-kS%d9t?Vx=ex}Y1blD`ek7}MmR!9CWq
z#ALUUC+G=y4R2xIf!s$(LB@<o8qfKIzldk?7Qw@41uK#-#fWB%7HHrr9D{&<|2UeV
z652o7YWTaTsITWXNs&`jB?4mY!E4g@$2`TERXakFNL8aAnLcb}C&stRqFGT=CObRr
z4YU2mxfwk)TVd{c$z7)49i-qhq(P!lUd}rjbv|o8_+b+`>&>tQ0(Q|{Y0<y4wp)8!
zFId5#6)F#ftzfviys|nJ)W_#m*SQ@T(ubD*C`Se(_K`1BI*@KN@<rTUB}X~UVbQ#)
Hyh_Pm2C(7J

diff --git a/firmware.packed.bin b/firmware.packed.bin
index 07021da934a7e402e9c8ccae3a766774ec3bb415..1f56856656407801db8dca6bf76deecfb01cc71c 100644
GIT binary patch
delta 1410
zcmV-|1%3Ly-vhqi1F!}l2YsT@0S4n(vkf2{UjetXDSxL30UwjmhZ_}!?Ge@;+Vm{W
zSbe)IDJXX~1ConHvjK=}0|9oEZHrR@xU<2FM+gDfvk8=A0|{2{5!Q&^^ej-5b(cE@
zEFMC(PP4U_dj$!H9748LvJaNOvpJnJ0~Pr05!OH5^eh9seY+SbD0ja*l8fz=fuI{v
z?haH1w%3<yux||81^42~sk=w%&m2Ows$UPbOC&sm@FwAI$8ToF+GMc5`$}*+|M#9J
zJX2dyBS{_@h&zD-GW=QyQ8v0=M8^K6Ih{~EYP0R2>jD8Wli8y)8I}%AeA}efi#q}(
z;NAoPf6NF}1sOP(OQEwRq`LzZx;468=Pdq)u5wTu^8^w0=|A)=MU(ZXCtZmRR0Zii
zmrKN84EvTE;^|zwN9hn8Lbh_T50(?jJf!|6;cl{FX67hlu)q3Ca60q$o+lnsTTwci
z9vGlFfdU&6S|}UUx?MUb{)Ug8P&^my5!R$J^b8qXeY-)kd8pe0f5>_s7#G%oA}IV?
z2$kBpeHknMh5~U=9QN)J)+gQcEbv@?yQ9Y_S0d7qtCAzYa_d$|v=EM9+qdFOTzJga
zi=P4|;P5v9e{&5~1vu1~Yj1!I`)nKH=^s}|$z||DmSKqxmKY~Igb(xKPRD^}=E`fZ
zpDv_u8nE}CCjh)#7IBh$9vGR|fg(=)S_sWCx?Mjk{)Vcv>8n2m0W-5HvTp(z$u<Cg
z>$g+|-kO(d)Nc&iF+JkxjJZeY)3dR(2q6dj3gvo0*?F_T)m8!w*jZ-T=zNRDeFa@-
zlOouZ0$xqCxY#rULAve{)?wZBETLb0yWYeoSIaw+i>S}QQe9|wl(Ar7<WS>tL(Qbt
zizosm;8!;Qf1wRj1^m>PYmtBq`;_$J$>@_U+$J4FhxLDc%HgddY?3Sppz4}$RP@cJ
zvaf0{MmZ(mvvAz-4F#g^fN4{+W$OO{1y}RLvbU3I?96{{54`v6Nvb{;(>rZ%L)FAe
ziIn4)1sb|NtwTC$a8$&!J{Z^H<sxy|F9?yC`w=MSvD4SQ0$Cta5tZ(IxC}VwDZ6`p
zWf1~`%BvK2gArX59NG6kG=p!j7&+KEqV6!iao|6#04n~m00pXb*)91gEV%wxubROc
zD2LtAGQ@uZEPS@q$w=!vQ;#B43=QVyIREnIfCD;&J?$q*3tK1m+dFOYl+;ms{TOM*
z`}Ptu#;V?<*cneUL0yxtWW8ZB{V4B0Xk->}o08oKZj^Er9uM5HMNsG(&1p>SKi0^2
z!2r;ItN=Xs&T(+*8n;WZC_(%1SK^w3R(RIBvKD{!XB$k#_l<wn8)CHseQ!0T@@n+!
zi{nr_=~>8PI(9B!l;J)n@{+_(XQ>|uuG{PzE9Tb4%e-}IS_4v^j}?I|G2l4rA9`yR
zY}V7J6k&lJeR6u?u_Gw^N|tO?{Xh7wMa3n>KlvpLpT;*O%n0HS@*7&)lqi?U<TYZA
zy0?E2^EQ8c^_Hhn?R7!n2x%%e#)TiAn)Z+dI{Zr8b~-&YAJnvXcZay;0%5WqZIPJu
z86oD4<>K-_bsc08mEd%-3>n=M-XBj#B22Q9$OB=M0eur~q=FAF+bp*aFN<pP{vOFt
zs5aRuU(JRjV2Dn)CXgL%jno>*>9aF8jN5;OLggk2O1Ago9QJ-zgfCA|HHX#@kbuVX
zHg&pZ;Ta@PM|rX9Upmmjl?o!i5ge)NgMCD=nx>|#WJFUVW3$;1(HukSaIrsYV`dWW
zqN`_1q;hy?e9VzR622M3X-w=A+kr5HPKPduM@5sOV<7(CT;4Bk>-e+@<H?&=N9hjW
Q@j|wbT%VWZ$UTG;W$q}WLjV8(

delta 1410
zcmV-|1%3Ly-vhqi1F!}l2XLW-Sy|%=vkf2{UjenVDSxL30U49ghZ_}u?Ge@;+Vm{W
zSbe)IDJXX~1ConJvjK=}0|9W8ZHrR@y0gKHM+gDdvk8=A0|_VT5!Q;`^ej@7b(cE@
zE*?U*K(n=%dj$!B9748NvJaNAvpJnJ0~Px25!NBy^eh9seY+SbD0jI#l8f(?fuI{v
z@D5Z3wAYtwux||81NY*|r@Ke#$s9tqs$UPbO(Z;o@FwAI$8ToF+GMc5{Yr2;`S+eD
zJX2dyBS{_@iaUV<GW=QyFE+YeM8^K6Ih{~EWV7v{>jD8Yli8y)8JG@CeA%Sdi#Y-%
z;NAoPf6NF}1sOP(OTV)vq`LzZxHY<6=Pdq)sB%yo^8^w0=|A)=N0arZCtZsTR0Zii
zmrKN84EvTE;^|tuN9htALbi0V50(?jJf!|6;cl{FX67hlu)q9Ea60|=o+lnsTTwci
z9vGrHfdUm0S|}UUx?MOZ{)Ug8P&^Us5!R$J^b8wZeY-=md8pe0f5v(q7#G%oA}IV?
z2$kBpeIG0ShWv3*9PsWD)+yceEb?4^yQRk{S0d7qtCAzYa_d$|v@VWd+qdFOTzJga
zi=6@`;Py8Fe{~I11t!#&Yi)oG`)nKH=^s}|$z||DmSKqxmKrBKgb(xKPQig@=E`fZ
zpDv_u8nXAECjz`%7IBb!9vGR|fg(=)S_sWCx?Mjk{)VKp>8n2m0Wq^FvTp(z&o%&m
z>$g+|-kO(d)Nc&iF+Jkxin&MW-LtW@2q6dY3AQ31*(kHX)m8!wrCDa#=zNRDeFdqz
zlOouZ0)IfWxY#rULA34>)??lDETdn2yWqqqSH(M$i>lASQe9|wl(Ar7<WS>tL(8Pr
zizWgk;8iyOf1?dl1^U#NYp;L|`;zqH$>x(S+$J4Kgr+AU%CM~>Y?3Sppz4}$RP@cJ
zvaf0^L^&hpvvAz-4F#d>fNxf_W$OO{1yu3Gx4M&Q?96|453_>j8MG-=w@w~h0>+s^
zm5sB7a36_$z8*1lE>V$`J1my=(kEBlT5Hgk_I)dps;1G|159&3P@3ZqyLltBIq!0B
z2m^Zd!QKR6z!nJ_4z%SsV2C@WOb@It*4Sk1R+LPPK`ra!7fPpm-Yk$UL$>@$;)Sj_
zAj!&uC&hmhe=L@RrX2BgN{%g1Zy>bqCy<)8rA{Bo7|eef1sy(=;T~G2h1ddMybcK6
zl<i$Gp5DUB&k<ffMiGMMeX(OA=6(8eXnGnVfZfLv0*D(LA4su*Qx)|}(|HNl37)1E
z+!mEgnn+TbmQ*Fl8ka5oZcVnaNubI8X-BH=vO<6IBn%JIw3|G@Piv=6Xe>15<UalR
z=A|Qh>|MSBZ+(6Qk*gkDx0=LOXWeBe$DQ?kOog_lrs;VcFiSD>+Ay+yGUHw7d}wA@
zWBb9#25jJWZz4$7`9MXkPs?cu_HU!2Fv(WHX{sPv+{1A<oL<!)=1wWe#2Uw{<T6LE
z=(K+mmJ~d0_?e(m;~QYJ3u;e8la5b-inFCQX#YvRNp(FwQP=xxc9zz{O=h@SYu=y#
zeHW#l=<W4BdviculIjqeLmAgy-B4UcGa{AN$P{tl7I<fS`~P4gk1VhsT>U@zu0^C@
z;AZ)98qbC`amjbL7||GM`<ptDtg$mDow|Rb1K=Wm54_jAS@eEKm2PMb5QBhKu<3y6
za7D!?pgRUzTMqEHJPhXEfk0`=Vi~CWnlu3B+qSpFa6AEKXZDH!z;t@Jefe}47;h5x
zvf?8G<zi_MXtcux7W+!mcqG+8*5q4@N3aXyEIx?FL*XKi2y0hu4EwYR<H?&=N9hjW
Q@j|wbT%VWZ$UTIpa@A|1$N&HU

diff --git a/frequencies.c b/frequencies.c
index 94f27be..4308856 100644
--- a/frequencies.c
+++ b/frequencies.c
@@ -200,8 +200,8 @@ uint32_t FREQUENCY_wrap_to_step_band(uint32_t freq, const uint32_t step_size, co
 #ifdef ENABLE_SCAN_RANGES
 	const freq_scan_range_table_t FREQ_SCAN_RANGE_TABLE[] =
 	{
-		{ 2760125,  2800000, 1000},
-		{ 2696500,  2785600, 1000},
+		{ 2760125,  2760125 + (1000 * 40), 1000},
+		{ 2696500,  2696500 + (1000 * 80), 1000},
 		{ 2600000,  2800000, 1000},
 		{ 2800000,  2970000, 1000},
 		{ 5000000,  5200000, 1000},
@@ -217,7 +217,7 @@ uint32_t FREQUENCY_wrap_to_step_band(uint32_t freq, const uint32_t step_size, co
 		{21900000, 22500000, 1500},
 		{24000000, 39000000, 2500},
 		{43000000, 44000000, 1250},
-		{44600625, 44619376, 1250},
+		{44600625, 44600625 + (1250 * 16), 1250},
 		{44000000, 47000000, 1250}
 	};