fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Federico Amedeo Izzo 2021-01-12 20:03:45 +01:00
parent 1a894c67df
commit 5a0a4886ee
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openrtx/src/ui/ui.c
View File

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