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

UI: Add macro menu to MEM mode. Fix main_state save and restore

replace/d9341c056353d70ba5ffc4b82602d87452dacec1
Federico Amedeo Izzo 2021-01-12 20:03:45 +01:00
rodzic 1a894c67df
commit 5a0a4886ee
1 zmienionych plików z 16 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -427,10 +427,10 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
}
else if(msg.keys & KEY_ENTER)
{
// Save current main state
ui_state.last_main_state = state.ui_screen;
// Open Menu
state.ui_screen = MENU_TOP;
// Save current main state
ui_state.last_main_state = MAIN_VFO;
}
else if(msg.keys & KEY_ESC)
{
@ -466,6 +466,8 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
}
else if(msg.keys & KEY_MONI)
{
// Save current main state
ui_state.last_main_state = state.ui_screen;
// Open Macro Menu
_ui_drawDarkOverlay();
state.ui_screen = MENU_MACRO;
@ -578,10 +580,10 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
case MAIN_MEM:
if(msg.keys & KEY_ENTER)
{
// Save current main state
ui_state.last_main_state = state.ui_screen;
// Open Menu
state.ui_screen = MENU_TOP;
// Save current main state
ui_state.last_main_state = MAIN_MEM;
}
else if(msg.keys & KEY_ESC)
{
@ -620,6 +622,14 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
*sync_rtx = true;
}
}
else if(msg.keys & KEY_MONI)
{
// Save current main state
ui_state.last_main_state = state.ui_screen;
// Open Macro Menu
_ui_drawDarkOverlay();
state.ui_screen = MENU_MACRO;
}
break;
// Top menu screen
case MENU_TOP:
@ -745,7 +755,8 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
}
// Exit from this menu when monitor key is released
if(!(msg.keys & KEY_MONI))
state.ui_screen = MAIN_VFO;
// Close Macro Menu, switch to last main state
state.ui_screen = ui_state.last_main_state;
break;
// Settings menu screen
case MENU_SETTINGS: