piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

BIND popup menu fix

Browse Source
This commit is contained in:
Bertrand Songis
2019-05-04 10:31:19 +02:00
parent 7d4adc1afe
commit 85d86306e2
15 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_setup.cpp
+2 -1
View File
@@ -1411,6 +1411,7 @@ void menuModelSetup(event_t event)
killEvents(event); // we stopped BIND / SHARE, we don't want to re-open the menu
event = 0;
}
CLEAR_POPUP();
s_editMode = 0;
}
@@ -1425,7 +1426,7 @@ void menuModelSetup(event_t event)
POPUP_MENU_START(onPXX2BindMenu);
}
else {
drawMessageBox("Waiting for RX...");
POPUP_WAIT(STR_WAITING_FOR_RX);
}
}
}
radio/src/gui/212x64/model_setup.cpp
+2 -3
View File
@@ -1189,7 +1189,7 @@ void menuModelSetup(event_t event)
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
if (isModuleR9M(moduleIdx)) {
lcdDrawTextAlignedLeft(y, TR_MULTI_RFPOWER);
if(isModuleR9M_FCC_VARIANT(moduleIdx)) {
if (isModuleR9M_FCC_VARIANT(moduleIdx)) {
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
if (attr)
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_FCC_POWER_MAX);
@@ -1199,7 +1199,7 @@ void menuModelSetup(event_t event)
if (attr)
CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].pxx.power, 0, R9M_LBT_POWER_MAX);
if (attr && s_editMode == 0 && reusableBuffer.moduleSetup.r9mPower != g_model.moduleData[moduleIdx].pxx.power) {
if((reusableBuffer.moduleSetup.r9mPower + g_model.moduleData[moduleIdx].pxx.power) < 5) //switching between mode 2 and 3 does not require rebind
if ((reusableBuffer.moduleSetup.r9mPower + g_model.moduleData[moduleIdx].pxx.power) < 5) // switching between mode 2 and 3 does not require rebind
POPUP_WARNING(STR_REBIND);
reusableBuffer.moduleSetup.r9mPower = g_model.moduleData[moduleIdx].pxx.power;
}
@@ -1223,7 +1223,6 @@ void menuModelSetup(event_t event)
case ITEM_MODEL_EXTERNAL_MODULE_STATUS:
{
lcdDrawTextAlignedLeft(y, STR_MODULE_STATUS);
char statusText[64];
multiModuleStatus.getStatusString(statusText);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, statusText);
radio/src/translations.cpp
+1
View File
@@ -475,6 +475,7 @@ const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN;
const char STR_CALIB_BTN[] = TR_CALIB_BTN;
const char STR_NO_TOOLS[] = TR_NO_TOOLS;
const char STR_WAITING_FOR_RX[] = TR_WAITING_FOR_RX;
#if defined(SDCARD)
const char STR_BACKUP_MODEL[] = TR_BACKUP_MODEL;
radio/src/translations.h
+1
View File
@@ -673,6 +673,7 @@ extern const char STR_ANALOGS_BTN[];
extern const char STR_CALIB_BTN[];
extern const char STR_NO_TOOLS[];
extern const char STR_WAITING_FOR_RX[];
#if defined(SDCARD)
extern const char STR_BACKUP_MODEL[];
radio/src/translations/cz.h.txt
+1
View File
@@ -830,6 +830,7 @@
#define TR_CAT_NOT_EMPTY "Kategorie není prázdná"
#define TR_SDCARD_ERROR "Chyba SD karty"
#define TR_NO_SDCARD "Není SD karta"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "Žádné nástroje k dispozici"
#define TR_SDCARD_FULL "Plná SD karta"
#define TR_INCOMPATIBLE "Nekompatibilní"
radio/src/translations/de.h.txt
+1
View File
@@ -842,6 +842,7 @@
#define TR_CAT_NOT_EMPTY "Kategorie nicht leer"
#define TR_SDCARD_ERROR "SD-Kartenfehler"
#define TR_NO_SDCARD "Keine SD-Karte"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD-Karte voll"
#define TR_INCOMPATIBLE "Nicht kompatibel"
radio/src/translations/en.h.txt
+1
View File
@@ -832,6 +832,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR TR("SD error", "SD card error")
#define TR_NO_SDCARD "No SD card"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD card full"
#define TR_INCOMPATIBLE "Incompatible"
radio/src/translations/es.h.txt
+1
View File
@@ -844,6 +844,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR "SDCARD Error"
#define TR_NO_SDCARD "No SDCARD"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD Card Full"
#define TR_INCOMPATIBLE "Incompatible"
radio/src/translations/fi.h.txt
+1
View File
@@ -832,6 +832,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR "SDCARD Error"
#define TR_NO_SDCARD "No SDCARD"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD Card Full"
#define TR_INCOMPATIBLE "Incompatible"
radio/src/translations/fr.h.txt
+1
View File
@@ -845,6 +845,7 @@
#define TR_CAT_NOT_EMPTY "Categorie non vide"
#define TR_SDCARD_ERROR "Erreur carte SD"
#define TR_NO_SDCARD "Carte SD indisponible"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "Carte SD pleine"
#define TR_INCOMPATIBLE "Incompatible"
radio/src/translations/it.h.txt
+1
View File
@@ -838,6 +838,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR "Errore SD"
#define TR_NO_SDCARD "No SDCARD"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD Card Piena"
#define TR_INCOMPATIBLE "Incompatibile"
radio/src/translations/nl.h.txt
+1
View File
@@ -839,6 +839,7 @@ TR_GYR_VSRCRAW
#define TR_CAT_NOT_EMPTY "Categorie is niet leeg"
#define TR_SDCARD_ERROR "SD-Kaart fout"
#define TR_NO_SDCARD "Geen SD-Kaart"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD-Kaart vol"
#define TR_INCOMPATIBLE "Niet compatibel"
radio/src/translations/pl.h.txt
+1
View File
@@ -839,6 +839,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR "Błąd karty SD"
#define TR_NO_SDCARD "Brak karty SD"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "Karta Pełna "
#define TR_INCOMPATIBLE "Niekompatybilne"
radio/src/translations/pt.h.txt
+1
View File
@@ -843,6 +843,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR "SDCARD Erro"
#define TR_NO_SDCARD "Sem SDCARD"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD Card Full"
#define TR_INCOMPATIBLE "Incompativel"
radio/src/translations/se.h.txt
+1
View File
@@ -851,6 +851,7 @@
#define TR_CAT_NOT_EMPTY "Category is not empty"
#define TR_SDCARD_ERROR "SDCARD-fel"
#define TR_NO_SDCARD "SDCARD saknas"
#define TR_WAITING_FOR_RX "Waiting for RX..."
#define TR_NO_TOOLS "No tools available"
#define TR_SDCARD_FULL "SD-kort Fullt"
#define TR_INCOMPATIBLE "Inkompatibel"