From dee38f429f05cf9bfc12e24ab8354cff3299f44b Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Wed, 20 Sep 2023 10:20:12 +0100 Subject: [PATCH] Fixed big freq '00' bug and backlight off exit key bug. --- app/app.c | 4 ++-- app/menu.c | 10 +++++++++- firmware | Bin 165728 -> 165728 bytes firmware.bin | Bin 50588 -> 50628 bytes firmware.packed.bin | Bin 50606 -> 50646 bytes ui/main.c | 4 ++-- ui/menu.c | 9 +++++++++ 7 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/app.c b/app/app.c index 5f71a57..90301cd 100644 --- a/app/app.c +++ b/app/app.c @@ -1934,7 +1934,7 @@ void APP_TimeSlice500ms(void) ST7565_Configure_GPIO_B11(); //if (gEeprom.BACKLIGHT < 5) - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); + GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn the backlight off } #ifdef ENABLE_VOICE else @@ -2067,7 +2067,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) // const bool backlight_was_on = (gBacklightCountdown > 0 || gEeprom.BACKLIGHT >= 5); const bool backlight_was_on = GPIO_CheckBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); - if (Key == KEY_EXIT && !backlight_was_on) + if (Key == KEY_EXIT && !backlight_was_on && gEeprom.BACKLIGHT > 0) { // just turn the light on for now BACKLIGHT_TurnOn(); gBeepToPlay = BEEP_NONE; diff --git a/app/menu.c b/app/menu.c index 8bde584..c6f1f48 100644 --- a/app/menu.c +++ b/app/menu.c @@ -908,6 +908,14 @@ void MENU_ShowCurrentSetting(void) break; case MENU_ABR: + if (gEeprom.BACKLIGHT == 0) + { // turn the light on so the user can see the screen + const uint8_t value = gEeprom.BACKLIGHT; + gEeprom.BACKLIGHT = 1; + BACKLIGHT_TurnOn(); + gEeprom.BACKLIGHT = value; // restore the setting + } + gSubMenuSelection = gEeprom.BACKLIGHT; break; @@ -1154,7 +1162,7 @@ static void MENU_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) #endif NUMBER_Get(gInputBox, &Frequency); - gSubMenuSelection = FREQUENCY_FloorToStep(Frequency + 62, gTxVfo->StepFrequency, 0); + gSubMenuSelection = FREQUENCY_FloorToStep(Frequency + 75, gTxVfo->StepFrequency, 0); gInputBoxIndex = 0; return; diff --git a/firmware b/firmware index a0c3c21edeaed364d36ac433c23b4d4090ddc69d..e0b276aad648bdc1a9a1154375e1735252f90716 100644 GIT binary patch delta 16788 zcmZ{L33yaR)^?rS-B}<=LK4UVNiPHvI)N-e5&~oe(rLmXF08VOVUrGsBmy=d2w_Lm zVi7?FB{~X3V`MZ63g76=_?dPaBF;<@p+#kE*V}u4Z#B*2hX47Kr&9HvbL!N&Ri~;> z)xGK1)vaS!w>=g8j=j&ANE#-72*2V-5`VPE_RdYE^QSkw9iUlHjiO7MdQUe;8}CO{ zPRICMqG?iuujL)0M~MF1lCPpIM1Qorr>2j?Xidw`?$l33oA@ht&@`&!nx4dIFF)Lq zj9`A$lg6lNL`%;&8bieS-SK3nzqO3&O-m%2+R~Un)fAK9iEfQ=Hbl*rQt zkU@%d^Qr-~l-hX90P08I@Gl0?C|by42U1q}a<{0km5&=pg*1e37)V2?nx7s>^JyTD zPp5n7N4_kbUhn>#U&_j`F>Scx7jDd;bMzg*kwK;LmCjgGWjWiUWf6`Koe``M`Dk7~ zhz1t_)2n8gbL7^c%ws=0_UJo|m8uv!AIVq^%1jsC9A)k?e%d|Snt=RfKwG169CvDK z)Q+D6!lr-l#zE-G`CMhBf%G&t8cCOy@0M84bWQuXlnPTeT3Y8C!RXNIcQHd#!W2u1 zxu1m`4ZPM!pCx+H#`XxNEk!CrDn~jU$+R9mE0c=pTYfl``lJRt5$5EY8H?r98P#n*`QM&5%&8V<>+9y^I*n1n*r^?pU8l`STaniP$vikOxsDm7 zwiNwqXrM=Ctc_*Gwz0w8+Fmgy)v-ZgZA{;2O0qPXyICkV$#SBq(cG&p$ug#cWtG}q znplL|Dsp&>|k4$U%Sd>b2h#GF*K$GpedUQY&%qnqcTnRKa^9p;Pm zYKPrJFpK#MSh!=FYm52NT4u~?+rnoLrDW4kms-CAwrw)^?1;~N!{(Ehcp8GX{TsHC zHp!xL=w0!d7uzweg3GwdT}1HY5x*)~33Qs%_HcewLc5SlAx{Dmns+@)^q_TPlmUEaXFm zQJ?U+X3;Bicr}1^4D@2;+WKA=T0ZMY$D~~5EDm~x8dLS86P;8QYneRW0Igwd0kdEao7N47QtfS>t#URMH#Z;OPF424Rx{yd9#3)lyPjI?-5H zI-VJ0g4L2PXH}(`dewYXzsIU^3~(30K+L2z!dNkb(Nb7fP|Y%!E%tK$ggltUY~3#l z5BVJnLSY>yq1#XwFp^D}Ly#9^oM%xxKJ$tJ^Lv?LP?gaVYstVPWK`wfD#Ti*SpL(& zBEm|Z?9Q~OFyF+S>%d&>t76*0-I(?f%)@%5tDyV%bHiy(1RLnPmd`xbc;9>)(0#UR ziaDM2v-o5kug<4FrLs4|P6cP1e6r80vYXADf{q*3rq)$d`sGP3(wC!OeDW1<1$YT{ z{vj$`naL-=>i_XtA@j?}`SE

$lJOzt?i{$XX^jTHGIAQ(?m2#D4hz|2>}!)W8!9 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