From b7d3e0b91d79481e280450468e796976815bbd0f Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Mon, 14 Dec 2020 15:41:37 +0100 Subject: [PATCH] UI: Adapt updateFSM() to new keyboard message format --- openrtx/src/ui.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/openrtx/src/ui.c b/openrtx/src/ui.c index c79e2b91..d4ce74a1 100644 --- a/openrtx/src/ui.c +++ b/openrtx/src/ui.c @@ -382,37 +382,38 @@ void ui_updateFSM(event_t event) // Process pressed keys if(event.type == EVENT_KBD) { - keyboard_t keys = event.payload; + kbd_msg_t msg; + msg.value = event.payload; switch(state.ui_screen) { // VFO screen case MAIN_VFO: // Temporary VFO controls - if(keys & KEY_UP) + if(msg.keys & KEY_UP) { // Advance TX and RX frequency of 12.5KHz state.channel.rx_frequency += 12500; state.channel.tx_frequency += 12500; } - else if(keys & KEY_DOWN) + else if(msg.keys & KEY_DOWN) { // Advance TX and RX frequency of 12.5KHz state.channel.rx_frequency -= 12500; state.channel.tx_frequency -= 12500; } - else if(keys & KEY_ENTER) + else if(msg.keys & KEY_ENTER) // Open Menu state.ui_screen = MENU_TOP; break; // Top menu screen case MENU_TOP: - if(keys & KEY_UP) + if(msg.keys & KEY_UP) { } - else if(keys & KEY_DOWN) + else if(msg.keys & KEY_DOWN) { } - else if(keys & KEY_ESC) + else if(msg.keys & KEY_ESC) // Close Menu state.ui_screen = MAIN_VFO; break;