From 0309b1ee84ca0fdf7da8f6c5119f3729390896b6 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 13 Mar 2019 09:07:05 +0100 Subject: [PATCH] [X3 / X7] Fixes (still need to understand why ...) --- radio/src/gui/128x64/model_setup.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 8e28cdb8a..aebb0836f 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -20,6 +20,13 @@ #include +// TODO find why we need this (for REGISTER at least) +#if defined(PCBXLITE) + #define EVT_BUTTON_PRESSED() EVT_KEY_FIRST(KEY_ENTER) +#else + #define EVT_BUTTON_PRESSED() EVT_KEY_BREAK(KEY_ENTER) +#endif + #warning "TODO remove it" uint8_t g_moduleIdx; @@ -340,7 +347,7 @@ void runPopupRegister(event_t event) if (warningText) { const uint8_t dialogRows[] = { 0, uint8_t(reusableBuffer.moduleSetup.pxx2.registerStep < REGISTER_RX_NAME_RECEIVED ? READONLY_ROW : 0), uint8_t(reusableBuffer.moduleSetup.pxx2.registerStep < REGISTER_RX_NAME_RECEIVED ? 0 : 1)}; - check(event, 0, nullptr, 0, dialogRows, 2, 2); + check(event, 0, nullptr, 0, dialogRows, 2, 3 - HEADER_LINE); // TODO add a comment for 3 - HEADER_LINE once understood drawMessageBox(); @@ -1216,7 +1223,7 @@ void menuModelSetup(event_t event) lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0)); if (attr) { if (moduleSettings[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) { - if (menuHorizontalPosition == 0 && event == EVT_KEY_FIRST(KEY_ENTER)) { + if (menuHorizontalPosition == 0 && event == EVT_BUTTON_PRESSED()) { startRegisterDialog(moduleIdx); } else if (menuHorizontalPosition == 1) {