From 3c429753f364ece9f4a2ce1398b2f579581a7d0e Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Wed, 13 Sep 2023 17:42:31 +0100 Subject: [PATCH] Added fix and modified 100% battery level --- app/app.c | 6 +++--- firmware | Bin 171432 -> 171432 bytes firmware.bin | Bin 51632 -> 51632 bytes firmware.packed.bin | Bin 51650 -> 51650 bytes misc.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/app.c b/app/app.c index 7da0bc6..f38feab 100644 --- a/app/app.c +++ b/app/app.c @@ -1418,7 +1418,7 @@ void APP_TimeSlice500ms(void) UI_UpdateRSSI(gCurrentRSSI); } - if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF) + if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gCssScanMode == CSS_SCAN_MODE_OFF) { if (gBacklightCountdown > 0) @@ -1427,9 +1427,9 @@ void APP_TimeSlice500ms(void) GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn backlight off #ifndef DISABLE_AIRCOPY - if (gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND)) + if (gScanState == SCAN_OFF && gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND)) #else - if (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND) + if (gScanState == SCAN_OFF && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND)) #endif { if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode) diff --git a/firmware b/firmware index 1f0949c9cbc369e07e200dff6ff2e0e8c7f76c38..db86f3de1e19019626da0fdb526a5754c2978d49 100644 GIT binary patch delta 1382 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 Z2M!(CG*%9&vaR}mXwjI=3E7W*{{bos!lVEI delta 1188 zcmXX`T}&KR6ux(7fB2~d99N)=FuM~FxCK&1DP>u91ys7j&jZ0ojHyIo`XD-OG#wg+ zwM4QCZHgDQX^EQF0<{|JqC`wcc+r#xlY6TVY@5{8YDZ04Cu%ag?aq#usmYxC-Jf&L zz2`gU%q7fSV&Cl+*uU~uOVTlUQTC|-x#%Z0LSh-uWtZ(aAU~v*27)Sws>q_f<0I#L zMW$U!KDO69J;$(Bx|VPwklaWirVGeg$|+dJR2GN}QBmQQg(#DLNrlKm-?i;I;?QUA z08vzeFRJhLa;SkkKLJoZnYZ26kXai8bk4>~IxRP=K9%n}5xt*{4^pJM5YL|ab9%KmB?5ygNQRDd|h-jH6mjQQ;2+Mw;7V{tJ8X`5ylW9c@n ze?K29R7|m6ovSSG1oVBaS>D5VD0FuLGN-lT&EVdWcH6Xw0KutmWnf?*E@>}^4H&go z*Q{m`V;#^Q4FqcCU5ZN&rC~s1v#{o3`iq%owT&n6EA5MquI6^iWihvYJy#I8F)`SM zVvxPkG``E4MuiFddB8Mg?+RMZn6#iMDftqLmE(cX!@kecptg>PDr99KDh{+G*$nmo zuaGk`crL`l5_~@7Z@6v&@eu{ZYEs*2|Bd;XNINRi^q!pq{hNe-LGcQ8O3t{9{|SlS zRckk6Nm7(`5MXCuH#_+hqYghjgZtR{Hh#IItFX}mwH!IT>d^nd>mAj;W9%MDImF5h zpnT%dYtq|mXUZ}-Y<7t7C+rVPP{KoDzo$6^1-G8TuZKhYwCS$AO-y6cbTmFj;VDjk z6@MQt&HvWAs=;N`7{a&0)uq#>q&kpu%QW6HTNv?QX{`rMV+Pkns_w(q?;32}MO)*X zegF?eLhvb!BTJLtWbTOd@n^v4PUlv>d^Ik{Pj~)##iO6fyiovzi9#SG@_=xF;V=0> z_?5|zOumk;_44txekh$u@Uegj>jC{B1p`%}G{Scl)0Mt2_t&aZWhWy@Nyr;zoIcHx z&8jEaq(FhwKeR;FBQ9b-ZM=}ZXs7l>_Fj*3!I9Rvoi zC3pp}US&N#=|tR?+kdvlG)8mHDp$|ZkC-h)!^wpeZ|5!Od*>$Hx0xtcKph~nH{0am zKwD3_;@0P_H}ON=O|S^}bvHe5nMGL4q7^tGEVD>Ko;$K~vU_x_XgF7`i1tt6Z<01* KD_r8U(*FQLSk8t3 diff --git a/firmware.packed.bin b/firmware.packed.bin index c27b87d056c8497b15c174370dfb38bc2f02e2d5..7273796cf3fdbc4d1d3ba5705e850e3a2c695f52 100644 GIT binary patch delta 2251 zcmV;+2sHP?lLNw&1F-%!0pGL#HrWDySe=@BBGzB|IFO+wWbOY}d}}b^)JO`huN(CI zrBd7U1W_w|Jq9EkGin-&ky zvC3L0#df$JISoRU{1q(bO~w>nZ~N6{2LALp1LG` zo}fXxZ|&W55xvNt92>Wu7N2c zERD!)EWo3Oy8f+zOfivDj_e_P%$HJknRRPdI40VCAs1%MNV>Y5mF8b?sc3k>8hTrQpyP8NIqRl`C?hOh z*d`*8C1vgYSIc`)K2%5xrmDco)OL_w@FiInuqXDGd*IuhwRcoVv_5NK``znITmwed ztN7$4z*^b>U*zaiCA=}0OLb-p+t?A}>Cs$A$rAcPmV8_fwnV`^q%1DsZc$`r#>`=` zpJ}ad8p#u$2a;HSTTwTk9yp)ffg)Y^S_p~Qx_zF{{-$e{P&^C>5%xSg^bF^@eVe=@ zD0isclB+5xz;Yv8NVM;3VEY8?OkBG()}S~%H>-Z38waeQSJe4*q!X}37%NQeS~t%f zUunDnqDXCh?C7M57X%sw+CIjZt{PpPu0qCycsfV#5ZpU|w55hHYactorid{KeL&Ay z)4F{d&Hkp5mQXx2NMU2KNb~|MV>|Xb2m>!?n$*Kb3GjlWp!saENJ$G!n@vvx`1SiT z$0<2}*)e~r!>aNU#i<~k9v6d7G2j`%bbF$pfxJOTQtPhxxz!4-h_GWEuv7bKL}N}@&71Vb6{6bAMhGYeK+90o=^LdJPMNd>ooeFh@+LP_ zy3<3KM_(i62|kj0?!nzAqY?$wdxAwvg&_+SEZkw}6zw&N-h}8K6S5Z?qF~ z%2DTk{E=-KKnbzGa><07s(L5ZPWj}Jp(SMP?pF8GV`OtE5(cTjaMO2@PRmYb8!saL zn_EEA=&D_Gd*ro%pDbz^X9U?{KU!O-KA24MO0LzYPkrkVk-C%S7yPoz;pnCwx*l5& zCH!>P554voJ--O1gajz(X3e3xv4qtnTtd5lG?Mmv7()rMycWpw?m@6RjamSb3cjsT zKB&!~>-V&dY%hPWPQ548&^5+m;S|Ap^5iV zUpMk$dNjkQHf-WhD8;N~vhEZ3!bCe)Z4}MVmUD>=*rI9^F1cJs$>sV&mb6w6w%y7+q?;|_Zbf8f#u8$%pS-Vsa2mP@ zm}in$TTwTk9yqMsfg+LhS_nPUx_!UO{-)@cP&~N{5%v=}^bF0qeVc?KD0l1LlBC;S@?{+>4?YpRKAkiW%$Rm{UcJG8GsQ^7N}OczrqUZRS)zp(n2DJhR zmry*x3laA4JM;{dyM3G6ASieC-;%5TXnGz_-}2h9Q~POrV{Qc5VAfiY3?#x+*%v>o zp+wYOcOoK~7LVg0TFJR`9f$F`0m@HICk(y!5EJwo2I9V&kVT%QLA7sPJ5m_N7E^|& z9HYyP8s7zA^8JF+h_*pck?_Nf&5h;$gSREk+erehuN(OMc8R75ELkXgB?mXaTwTO@ zUXM<-5-6Q42OaM>!!p*OP(2rzPxAw=AE-}#=n>AcE3+j+?ExD`Z86pCQdOw{R=+de zlU+nF6o2VVT=+@WtC;5{z)aBwKX>a?C9|MJWNi-$ ZscqzvEJLGj$iA!~y{NMjvaJ^a=dJWsP6hw~ delta 2251 zcmV;+2sHP?lLNw&1F-%!0o=3yHrWDyS)H1CBGzB|JCLCzWbOY}d}}b^+eiwouN(CI zq*B`S1W_w|Jq9$uTw1_+Mu+X#k{Dp{cr)lX!!p*OBRz(zSD`peWKmKs>El<6n-&ky zvC3O1#df$JISoRU`xPwaPIVuCE)`{pR^*!#@HxhNPXK^ITff5z`%7?4l!f3PhVp zSIe3ye9;uHt5=}_RJ${5ed!XGy0@NU0kJt`gVH8Bqp5*B{B$pm+~m2x&j4QGWi`L# zt-BJil+1NoLcTMZ_Zw(hTD47oALzv`fgxD8Nmz2Hx^{0Cgw2@bP&ahaXq>*djb?Y7 z9BM3~D11W(<-lB8z`>VJ4dP=I34pdf7MD}1YK6O4t@ zY5fZ@&mNFW`cpNmldQNF%>$S9iC?g)V&dY$his9#+CpbtxbR_`F$QB*Z}QGCADhLB z5+R}A=Wy#S|Ez2)D?kZq}%!VU*l~RpY{IpwtSg}P+|MT~lawpeY z`IRdSq))#8t%FS%`*R^VowY#m+)7G(nH*v=Cmk`Dt3%Res{pWw(wk#o`{3wITxvqr ztLxw;z=Y8NU#Z|!C9*M>OXXz@+jJ7*>8M>t$*TK8md{iVw(QD0q^K_8ZVYE;#>!!^ zpQ^5K8Wj+p2WeP;TTwZm9yoN}fg(@#S_tmZx_x}b{-$}AP&}Io5%$nK^bF*=eVeZ$ zD0iXVlB>-rz;ZBMNVLyuVEZxXOkA@<)~i#JCCfw!5;TpQPks7%l)9iGKZCI`_8B~( z@fWnZS~g*?(P;ha-}*>p%Fa4WU6x&)c0)T-Y{$AemM78flzKkutEKYWcA~eMLFD(|-MZFY#gKGY85aCebzlBI2Zhx=)wR zb&nRj$fj(68gfAigWm>V3?X0rBHnITx?7yRWaZuVW_zyd4f_+wSK-%Gc7dh|Jp$a0 zBloiVQUd8Bqo9CmWQR*rZqV1x^UBnqB|QhNX_x;~wK9Bt77~-YuundNPwiAT?IuUc ziGeZ;XMGO0*U1p{<{=0y~YQ-wGsL zx>)TRU!j~^CZVwq{HN&k4SD!%%Ooxa zz!uT~U%&HGMf^FJOYLP0+oc)e>FrfV$;JCZmYARqmH>P~$T+UxeW2Y%W}=#&K*o)8 z>d3BtoY(WLImgD|1z__1?bB4SaZr@-u8a|l<^F@WK+FeCBCf9+_xy1}|3p6u8z)nk zq4P%x$%0y^ZfvnbQ>$wOvy0oY{qr%$%rPgD8wbD09@K+zj1#g&3M!J4`OdXuO9Bp-{i`m=)CE=R(+A-zGmq4+Dggb@523jCfrLy$MiEH9(~rE!vf zNADQg98I;MOk>yO@c6*fBV}3Gfe42*4#N9FmN--owj{tjq%kGoZo6b=#@=DDpLDH%a2mi8 zo(CF3T`@VI9yoN}fg*hNS_mT3x_!vb{-#)vP&^n25%y&`^bE_oeVc_LD0i9OlBIFO+wWbKJoE7$o}XnO;$ymN*9(D-h{KLR9&Bkf5!R8qis zT88Z3svl(VY&%L_dIBqaR1z1MPxAw=AE-}#=n>AcEVCs-?ExD^Z86pCQdOw{R=+dY z