From 85d86306e27c7f5cfc35397107c8e3823bab8ce7 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 4 May 2019 10:31:19 +0200 Subject: [PATCH] BIND popup menu fix --- radio/src/gui/128x64/model_setup.cpp | 3 ++- radio/src/gui/212x64/model_setup.cpp | 5 ++--- radio/src/translations.cpp | 1 + radio/src/translations.h | 1 + radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 1 + radio/src/translations/en.h.txt | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fi.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 1 + radio/src/translations/nl.h.txt | 1 + radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 1 + radio/src/translations/se.h.txt | 1 + 15 files changed, 17 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 156d2aa7c..4d397f4be 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -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); } } } diff --git a/radio/src/gui/212x64/model_setup.cpp b/radio/src/gui/212x64/model_setup.cpp index e36ba06c7..3af230347 100644 --- a/radio/src/gui/212x64/model_setup.cpp +++ b/radio/src/gui/212x64/model_setup.cpp @@ -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); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 127ff088f..f0b116bcf 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -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; diff --git a/radio/src/translations.h b/radio/src/translations.h index d4a1a31e2..99f9a105d 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -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[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index a30fa32c0..ab2f909fe 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -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í" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 7a1cf8619..9a3364ce2 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -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" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 81889da7c..1b98cbf3d 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -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" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 559bec481..4492f672a 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -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" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 31b9ff9be..7e490f1cc 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -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" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 57bc7ddcf..e1349a78e 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -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" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 564c099b7..d8fd09808 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -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" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 3bf3849d7..aa20b0810 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -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" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 99ed5032f..75b2e3992 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -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" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 361b1048e..0c386ead2 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -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" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a351d7530..602fb4572 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -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"