diff --git a/README.md b/README.md index b6ce7b0..fe9d793 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ To enable the custom option just uncomment the line by removing the starting '#' * "TXP" menu, renamed to "TX-PWR" * "SAVE" menu, renamed to "B-SAVE" * "WX" menu, renamed to "CROS-B" - 'WX' normally means weather here in the UK -* "ABR" menu, renamed to "BAK-LT", shows extended backlight times +* "ABR" menu, renamed to "BAK-LT", shows extended backlight times, now has always ON option * "SCR" menu, renamed to "SCRAM" * "MIC" menu, shows mic gain in dB's, now includes the max mic gain possible (+15.5dB) * "VOL" menu, renamed to "BATVOL", shows voltage and percentage diff --git a/app/app.c b/app/app.c index cdb2e88..ae079dc 100644 --- a/app/app.c +++ b/app/app.c @@ -1301,7 +1301,8 @@ void APP_TimeSlice500ms(void) { if (gBacklightCountdown) if (--gBacklightCountdown == 0) - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); // turn backlight off + if (gEeprom.BACKLIGHT < 5) + 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)) @@ -1397,7 +1398,8 @@ void APP_TimeSlice500ms(void) gReducedService = true; FUNCTION_Select(FUNCTION_POWER_SAVE); ST7565_Configure_GPIO_B11(); - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); + //if (gEeprom.BACKLIGHT < 5) + GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); } #ifndef DISABLE_VOICE else diff --git a/driver/backlight.c b/driver/backlight.c index bf2e1ba..c50c77d 100644 --- a/driver/backlight.c +++ b/driver/backlight.c @@ -23,7 +23,7 @@ uint8_t gBacklightCountdown; void BACKLIGHT_TurnOn(void) { - if (gEeprom.BACKLIGHT) + if (gEeprom.BACKLIGHT > 0) { GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); #if 0 diff --git a/firmware b/firmware index 6f715c1..92a7bab 100644 Binary files a/firmware and b/firmware differ diff --git a/firmware.bin b/firmware.bin index 92bb02a..4e9d0a4 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 3f3decf..70c634a 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/main.c b/main.c index 9b2eb85..910f66f 100644 --- a/main.c +++ b/main.c @@ -110,7 +110,8 @@ void Main(void) if (!gChargingWithTypeC && !gBatteryDisplayLevel) { FUNCTION_Select(FUNCTION_POWER_SAVE); - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); + //if (gEeprom.BACKLIGHT < 5) + GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); gReducedService = true; } else diff --git a/ui/menu.c b/ui/menu.c index e061ac6..591f67c 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -382,7 +382,10 @@ void UI_DisplayMenu(void) if (gSubMenuSelection == 0) strcpy(String, "OFF"); else + if (gSubMenuSelection < 5) sprintf(String, "%d sec", gSubMenuSelection * 10); + else + strcpy(String, "ON"); break; case MENU_AM: