Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

[X3 / X7] Fixes (still need to understand why ...)

Browse source
This commit is contained in:
Bertrand Songis 2019-03-13 09:07:05 +01:00
parent 5b7dc2a692
commit 0309b1ee84
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
radio/src/gui/128x64/model_setup.cpp
View file

@ -20,6 +20,13 @@
#include <opentx.h> #include <opentx.h>
// 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" #warning "TODO remove it"
uint8_t g_moduleIdx; uint8_t g_moduleIdx;
@ -340,7 +347,7 @@ void runPopupRegister(event_t event)
if (warningText) { 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)}; 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(); drawMessageBox();
@ -1216,7 +1223,7 @@ void menuModelSetup(event_t event)
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0)); lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
if (attr) { if (attr) {
if (moduleSettings[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) { 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); startRegisterDialog(moduleIdx);
} }
else if (menuHorizontalPosition == 1) { else if (menuHorizontalPosition == 1) {