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 a0c3c21..e0b276a 100644 Binary files a/firmware and b/firmware differ diff --git a/firmware.bin b/firmware.bin index 27f4e09..1d492a0 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 4153046..17d0cd9 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/main.c b/ui/main.c index f8e5429..4e6f6d1 100644 --- a/ui/main.c +++ b/ui/main.c @@ -264,7 +264,7 @@ void UI_DisplayMain(void) // show the main large frequency digits UI_DisplayFrequency(String, 32, Line, false, false); // show the remaining 2 small frequency digits - UI_DisplaySmallDigits(2, String + 7, 113, Line + 1, true); + UI_DisplaySmallDigits(2, String + 6, 113, Line + 1, true); #else // show the frequency in the main font sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000); @@ -305,7 +305,7 @@ void UI_DisplayMain(void) // show the main large frequency digits UI_DisplayFrequency(String, 32, Line, false, false); // show the remaining 2 small frequency digits - UI_DisplaySmallDigits(2, String + 7, 113, Line + 1, true); + UI_DisplaySmallDigits(2, String + 6, 113, Line + 1, true); #else // show the frequency in the main font sprintf(String, "%03u.%05u", frequency / 100000, frequency % 100000); diff --git a/ui/menu.c b/ui/menu.c index 5838877..1345559 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -21,6 +21,7 @@ #include "bitmaps.h" #include "board.h" #include "dcs.h" +#include "driver/backlight.h" #include "driver/bk4819.h" #include "driver/eeprom.h" // EEPROM_ReadBuffer() #include "driver/st7565.h" @@ -393,6 +394,14 @@ void UI_DisplayMenu(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 + } + strcpy(String, gSubMenu_BACK_LIGHT[gSubMenuSelection]); break;