Improve BackLt (35/63)

This commit is contained in:
Armel FAUVEAU
2024-04-05 06:28:51 +02:00
parent 623a86b298
commit 4cd00a0a97
8 changed files with 11 additions and 18 deletions

View File

@@ -504,7 +504,7 @@ void ACTION_BackLightOnDemand(void)
if(gBackLight == false) if(gBackLight == false)
{ {
gBacklightTimeOriginal = gEeprom.BACKLIGHT_TIME; gBacklightTimeOriginal = gEeprom.BACKLIGHT_TIME;
gEeprom.BACKLIGHT_TIME = 17; gEeprom.BACKLIGHT_TIME = 61;
gBackLight = true; gBackLight = true;
} }
else else
@@ -515,7 +515,7 @@ void ACTION_BackLightOnDemand(void)
} }
else else
{ {
gEeprom.BACKLIGHT_TIME = 17; gEeprom.BACKLIGHT_TIME = 61;
} }
} }

View File

@@ -1483,7 +1483,7 @@ void APP_TimeSlice500ms(void)
// don't turn off backlight if user is in backlight menu option // don't turn off backlight if user is in backlight menu option
&& !(gScreenToDisplay == DISPLAY_MENU && (UI_MENU_GetCurrentMenuId() == MENU_ABR || UI_MENU_GetCurrentMenuId() == MENU_ABR_MAX)) && !(gScreenToDisplay == DISPLAY_MENU && (UI_MENU_GetCurrentMenuId() == MENU_ABR || UI_MENU_GetCurrentMenuId() == MENU_ABR_MAX))
&& --gBacklightCountdown_500ms == 0 && --gBacklightCountdown_500ms == 0
&& gEeprom.BACKLIGHT_TIME < 17 && gEeprom.BACKLIGHT_TIME < 61
) { ) {
BACKLIGHT_TurnOff(); BACKLIGHT_TurnOff();
} }

View File

@@ -129,7 +129,7 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
case MENU_ABR: case MENU_ABR:
//*pMin = 0; //*pMin = 0;
*pMax = 17; *pMax = 61;
break; break;
case MENU_ABR_MIN: case MENU_ABR_MIN:

View File

@@ -110,13 +110,10 @@ void BACKLIGHT_TurnOn(void)
switch (gEeprom.BACKLIGHT_TIME) { switch (gEeprom.BACKLIGHT_TIME) {
default: default:
case 1 ... 11: // 5 sec * value case 1 ... 60: // 5 sec * value
gBacklightCountdown_500ms = 1 + (gEeprom.BACKLIGHT_TIME * 5) * 2; gBacklightCountdown_500ms = 1 + (gEeprom.BACKLIGHT_TIME * 5) * 2;
break; break;
case 12 ... 16: // 1 min $ value case 61: // always on
gBacklightCountdown_500ms = 1 + ((gEeprom.BACKLIGHT_TIME - 11) * 60) * 2;
break;
case 17: // always on
gBacklightCountdown_500ms = 0; gBacklightCountdown_500ms = 0;
break; break;
} }

View File

@@ -219,7 +219,7 @@ void BATTERY_TimeSlice500ms(void)
ST7565_HardwareReset(); ST7565_HardwareReset();
if (gEeprom.BACKLIGHT_TIME < 17) { if (gEeprom.BACKLIGHT_TIME < 61) {
BACKLIGHT_TurnOff(); BACKLIGHT_TurnOff();
} }
} }

2
main.c
View File

@@ -151,7 +151,7 @@ void Main(void)
{ {
FUNCTION_Select(FUNCTION_POWER_SAVE); FUNCTION_Select(FUNCTION_POWER_SAVE);
if (gEeprom.BACKLIGHT_TIME < 17) // backlight is not set to be always on if (gEeprom.BACKLIGHT_TIME < 61) // backlight is not set to be always on
BACKLIGHT_TurnOff(); // turn the backlight OFF BACKLIGHT_TurnOff(); // turn the backlight OFF
else else
BACKLIGHT_TurnOn(); // turn the backlight ON BACKLIGHT_TurnOn(); // turn the backlight ON

View File

@@ -67,7 +67,7 @@ void SETTINGS_InitEEPROM(void)
gEeprom.CROSS_BAND_RX_TX = (Data[2] < 3) ? Data[2] : CROSS_BAND_OFF; gEeprom.CROSS_BAND_RX_TX = (Data[2] < 3) ? Data[2] : CROSS_BAND_OFF;
gEeprom.BATTERY_SAVE = (Data[3] < 5) ? Data[3] : 4; gEeprom.BATTERY_SAVE = (Data[3] < 5) ? Data[3] : 4;
gEeprom.DUAL_WATCH = (Data[4] < 3) ? Data[4] : DUAL_WATCH_CHAN_A; gEeprom.DUAL_WATCH = (Data[4] < 3) ? Data[4] : DUAL_WATCH_CHAN_A;
gEeprom.BACKLIGHT_TIME = (Data[5] < 18) ? Data[5] : 3; gEeprom.BACKLIGHT_TIME = (Data[5] < 62) ? Data[5] : 12;
gEeprom.TAIL_TONE_ELIMINATION = (Data[6] < 2) ? Data[6] : false; gEeprom.TAIL_TONE_ELIMINATION = (Data[6] < 2) ? Data[6] : false;
gEeprom.VFO_OPEN = (Data[7] < 2) ? Data[7] : true; gEeprom.VFO_OPEN = (Data[7] < 2) ? Data[7] : true;

View File

@@ -662,13 +662,9 @@ void UI_DisplayMenu(void)
{ {
sprintf(String, "%s", "OFF"); sprintf(String, "%s", "OFF");
} }
else if(gSubMenuSelection < 12) else if(gSubMenuSelection < 61)
{ {
sprintf(String, "%d sec", gSubMenuSelection * 5); sprintf(String, "%02dm:%02ds", (((gSubMenuSelection) * 5) / 60), (((gSubMenuSelection) * 5) % 60));
}
else if(gSubMenuSelection < 17)
{
sprintf(String, "%d min", gSubMenuSelection - 11);
} }
else else
{ {