mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

UI: Add Brightness/Contrast change

replace/e269c74f7d6587e6b97fd95aa263d018092baab0
Federico Amedeo Izzo 2021-01-29 22:41:42 +01:00
rodzic 1f240ba132
commit c9ee09b1f6
2 zmienionych plików z 38 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

40
openrtx/src/ui/ui.c
Wyświetl plik

@ -494,6 +494,24 @@ void _ui_fsm_insertVFONumber(kbd_msg_t msg, bool *sync_rtx) {
} }
} }
void _ui_changeBrightness(int variation)
{
if(variation >= 0)
settings.brightness = (255 - settings.brightness < variation) ? 255 : settings.brightness + variation;
else
settings.brightness = (settings.brightness < -variation) ? 0 : settings.brightness + variation;
platform_setBacklightLevel(settings.brightness);
}
void _ui_changeContrast(int variation)
{
if(variation >= 0)
settings.contrast = (255 - settings.contrast < variation) ? 255 : settings.contrast + variation;
else
settings.contrast = (settings.contrast < -variation) ? 0 : settings.contrast + variation;
display_setContrast(settings.contrast);
}
void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) { void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) {
ui_state.input_number = input_getPressedNumber(msg); ui_state.input_number = input_getPressedNumber(msg);
// CTCSS Encode/Decode Selection // CTCSS Encode/Decode Selection
@ -537,12 +555,10 @@ void _ui_fsm_menuMacro(kbd_msg_t msg, bool *sync_rtx) {
*sync_rtx = true; *sync_rtx = true;
break; break;
case 7: case 7:
settings.brightness = (settings.brightness + 25 > 255) ? 255 : settings.brightness + 25; _ui_changeBrightness(+25);
platform_setBacklightLevel(settings.brightness);
break; break;
case 8: case 8:
settings.brightness = (settings.brightness - 25 < 0) ? 0 : settings.brightness - 25; _ui_changeBrightness(-25);
platform_setBacklightLevel(settings.brightness);
break; break;
} }
@ -941,9 +957,25 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
} }
if(msg.keys & KEY_LEFT) if(msg.keys & KEY_LEFT)
{ {
if(strcmp(display_items[ui_state.menu_selected], "Brightness") == 0)
{
_ui_changeBrightness(-25);
}
else if(strcmp(display_items[ui_state.menu_selected], "Contrast") == 0)
{
_ui_changeContrast(-25);
}
} }
else if(msg.keys & KEY_RIGHT) else if(msg.keys & KEY_RIGHT)
{ {
if(strcmp(display_items[ui_state.menu_selected], "Brightness") == 0)
{
_ui_changeBrightness(+25);
}
else if(strcmp(display_items[ui_state.menu_selected], "Contrast") == 0)
{
_ui_changeContrast(+25);
}
} }
else if(msg.keys & KEY_ESC) else if(msg.keys & KEY_ESC)
{ {

4
openrtx/src/ui/ui_menu.c
Wyświetl plik

@ -117,9 +117,9 @@ int _ui_getDisplayValueName(char *buf, uint8_t max_len, uint8_t index)
{ {
if(index >= display_num) return -1; if(index >= display_num) return -1;
uint8_t value = 0; uint8_t value = 0;
if(strcmp(display_items[index], "Brightness")) if(strcmp(display_items[index], "Brightness") == 0)
value = settings.brightness; value = settings.brightness;
else if(strcmp(display_items[index], "Contrast")) else if(strcmp(display_items[index], "Contrast") == 0)
value = settings.contrast; value = settings.contrast;
snprintf(buf, max_len, "%d", value); snprintf(buf, max_len, "%d", value);
return 0; return 0;