diff --git a/app/menu.c b/app/menu.c index 02bdb9e..8bde584 100644 --- a/app/menu.c +++ b/app/menu.c @@ -166,7 +166,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax) case MENU_ABR: *pMin = 0; - *pMax = 5; + *pMax = ARRAY_SIZE(gSubMenu_BACK_LIGHT) - 1; break; case MENU_F_LOCK: @@ -518,11 +518,9 @@ void MENU_AcceptSetting(void) break; case MENU_ABR: + gEeprom.BACKLIGHT = 1; // turn the light on to let them find there way around for a bit + BACKLIGHT_TurnOn(); gEeprom.BACKLIGHT = gSubMenuSelection; - if (gSubMenuSelection == 0) - GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT); - else - BACKLIGHT_TurnOn(); break; case MENU_TDR: diff --git a/firmware b/firmware index 1d6ce71..5fd3fe0 100644 Binary files a/firmware and b/firmware differ diff --git a/firmware.bin b/firmware.bin index d56a706..dc508df 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 02552f0..22bda94 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/ui/menu.c b/ui/menu.c index de8dd1c..5838877 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -241,6 +241,16 @@ const char gSubMenu_F_LOCK[6][4] = "438" }; +const char gSubMenu_BACK_LIGHT[6][7] = +{ + "OFF", + "10 sec", + "20 sec", + "40 sec", + "80 sec", + "ON" +}; + #ifdef ENABLE_COMPANDER const char gSubMenu_Compand[4][6] = { @@ -383,26 +393,7 @@ void UI_DisplayMenu(void) break; case MENU_ABR: - #if 0 - if (gSubMenuSelection == 0) - strcpy(String, "OFF"); - else - if (gSubMenuSelection < 5) - sprintf(String, "%d sec", gSubMenuSelection * 10); - else - strcpy(String, "ON"); - #else - switch (gSubMenuSelection) - { - case 0: strcpy(String, "OFF"); break; - case 1: strcpy(String, "10 sec"); break; - case 2: strcpy(String, "20 sec"); break; - case 3: strcpy(String, "40 sec"); break; - case 4: strcpy(String, "80 sec"); break; - case 5: strcpy(String, "ON"); break; - default: strcpy(String, "???"); break; - } - #endif + strcpy(String, gSubMenu_BACK_LIGHT[gSubMenuSelection]); break; case MENU_AM: diff --git a/ui/menu.h b/ui/menu.h index 1b0cac8..a0ae914 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -121,6 +121,7 @@ extern const char gSubMenu_PONMSG[4][5]; extern const char gSubMenu_ROGER[3][6]; extern const char gSubMenu_RESET[2][4]; extern const char gSubMenu_F_LOCK[6][4]; +extern const char gSubMenu_BACK_LIGHT[6][7]; #ifdef ENABLE_COMPANDER extern const char gSubMenu_Compand[4][6]; #endif