From b3a861a47c2b936b08817d1b85f95b74857c5c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Thu, 15 Sep 2022 15:59:52 +0200 Subject: [PATCH] Usability improvements Remove DMR from macro menu until we actually support it. Remove print of M17 source callsign Bank and channel visualization is more compact to make room for additional data on a single screen. Refactor mode screen to fit all data into a single screen. --- openrtx/src/ui/ui.c | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index d2a81f11..6f2db86c 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -1043,6 +1043,18 @@ void ui_updateFSM(bool *sync_rtx) // Open Menu state.ui_screen = MENU_TOP; } + else if(msg.keys & KEY_ESC) + { + // Save VFO channel + state.vfo_channel = state.channel; + int result = _ui_fsm_loadChannel(state.channel_index, sync_rtx); + // Read successful and channel is valid + if(result != -1) + { + // Switch to MEM screen + state.ui_screen = MAIN_MEM; + } + } else if(msg.keys & KEY_HASH) { // Enable dst ID input @@ -1072,25 +1084,6 @@ void ui_updateFSM(bool *sync_rtx) *sync_rtx = true; } } - 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; - } - else if(msg.keys & KEY_ESC) - { - // Save VFO channel - state.vfo_channel = state.channel; - int result = _ui_fsm_loadChannel(state.channel_index, sync_rtx); - // Read successful and channel is valid - if(result != -1) - { - // Switch to MEM screen - state.ui_screen = MAIN_MEM; - } - } else if(input_isNumberPressed(msg)) { // Open Frequency input screen