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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 RT>t69kMDJxnK!K!2LLJy!lVEI delta 1188 zcmdlmnHhxMnKAlpes6Y@seZM$bOnPp>%~=In(@N_?+JfafY}TeEROTc{Li;KObD=ds}Z(`GCxOw1#b_KIG!-bs>SQP$$Z~nueJjYA9 zK)7IzmvF%xKjR8UZT5>(!TOmmFn#F$#h|QQV4YJj&4*cA_d;?VgSOU%DPUvOF7$wD zrHd26wA{ruZ=(w73Ss9yFQE!yXR(Xg6|CCA7yf^L_@f)Fg5`om1%n3TMfMMQzZjI; zyo3wtpt!+HxS$!VhVMetsPtmcOuQ)E z!JwUZp&Tr(a3L2=i(X6t(}EX^CbL@G*ZcUV_*z#mXfs^A@!;?G%6}lUm@g#uD)j#S ze(4X$FB})#y=5wlD`cFRFaH0Y@gve(rhw(cfuCH;+6@fK)&&g8!Ct}zKlc9rKIM<= z^I)*)%oo7{c+u+l|L?g!te*RM3O8^U{8iSfm?$Ud#Bg!?b0crV3h4@NHfM$l6Q5g5 zK51<(Xam;De}O@P<-?7ij7pZ11#Ki5bth}vsH$!Isa?US&2Z7$@zB9 z+9#<$)NCrlR@DMCxgNcubn=^9XtIPjc0EXZcwUV)MB_e?*XHdJcGD{u#>>W&AwYa zH7c4VCOBvpZ1O%J!Th1^Cph)o)GuIEVE!=wzj6huHtU7I5#Q7PtOiGI-ycXGXTGo! zoMy@|tngmxC0zl^QiT_ndkI%CX!BfPw7$JbxPU>M{o)dD>3SAz<{NB^i#+~*Px)t5 z!K}r6ae=pV1*3N4%{iMzo!&A^PkP2^d2*9v0fQ#Pg`Q_t-U3Qi9+CxYAEx|ooh<93 z&&WU7*F|6C1P6nH02hOT0yBfc3T_4k1`ald%@bTwa`_|wsTL@M3x!V?etd7(%)Du> FH~>Oe&V~R0 diff --git a/firmware.packed.bin b/firmware.packed.bin index c27b87d056c8497b15c174370dfb38bc2f02e2d5..7273796cf3fdbc4d1d3ba5705e850e3a2c695f52 100644 GIT binary patch delta 2251 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 M7T&a0oXO!n00U=b+5i9m diff --git a/misc.c b/misc.c index 8815951..5a53cfd 100644 --- a/misc.c +++ b/misc.c @@ -23,7 +23,7 @@ const uint8_t g_scan_delay = 21; // 210ms const uint8_t g_menu_timeout = 2 * 30; // 30 seconds -const uint16_t gMax_bat_v = 840; // 8.4V +const uint16_t gMax_bat_v = 843; // 8.43V const uint16_t gMin_bat_v = 660; // 6.6V const uint32_t gDefaultAesKey[4] = {0x4AA5CC60, 0x0312CC5F, 0xFFD2DABB, 0x6BBA7F92};