From b345abf6bcf8494521daf85afbd217278f7d0eae Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 22 Feb 2019 11:08:08 +0100 Subject: [PATCH] Do not display ok on register until RX is ready --- radio/src/gui/128x64/model_setup.cpp | 12 ++++++------ 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 + 14 files changed, 19 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 50713920c..2e69b997f 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -329,10 +329,10 @@ void runPopupRegister(event_t event) if (reusableBuffer.moduleSetup.pxx2.registerStep >= REGISTER_RX_NAME_RECEIVED) { lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + FH, STR_RX_NAME); editName(WARNING_LINE_X + 8*FW, WARNING_LINE_Y - 2 + FH, reusableBuffer.moduleSetup.pxx2.registerRxName, PXX2_LEN_RX_NAME, event, menuVerticalPosition == 1); + lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH + 2, TR_ENTER, menuVerticalPosition == 2 && menuHorizontalPosition == 0 ? INVERS : 0); } - lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH + 2, TR_ENTER, menuVerticalPosition == 2 && menuHorizontalPosition == 0 ? INVERS : 0); - lcdDrawText(WARNING_LINE_X + 8*FW, WARNING_LINE_Y+2*FH + 2, TR_EXIT, menuVerticalPosition == 2 && menuHorizontalPosition == 1 ? INVERS : 0); + lcdDrawText(WARNING_LINE_X + 8*FW, WARNING_LINE_Y+2*FH + 2, TR_EXIT, menuVerticalPosition == 2 && menuHorizontalPosition == 1 ? INVERS : 0); reusableBuffer.moduleSetup.pxx2.registerPopupVerticalPosition = menuVerticalPosition; reusableBuffer.moduleSetup.pxx2.registerPopupHorizontalPosition = menuHorizontalPosition; @@ -1159,11 +1159,11 @@ void menuModelSetup(event_t event) { uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); lcdDrawTextAlignedLeft(y, STR_MODULE); - lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, (menuHorizontalPosition == 0 ? attr : 0)); - lcdDrawText(lcdLastRightPos, y, "[Reg]", (menuHorizontalPosition == 1 ? attr : 0)); + lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_REGISTER_BUTTON, (menuHorizontalPosition == 0 ? attr : 0)); + 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 == 1 && event == EVT_KEY_FIRST(KEY_ENTER)) { + if (menuHorizontalPosition == 0 && event == EVT_KEY_FIRST(KEY_ENTER)) { moduleSettings[moduleIdx].mode = MODULE_MODE_REGISTER; reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_START; memcpy(reusableBuffer.moduleSetup.pxx2.registrationID, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID); @@ -1173,7 +1173,7 @@ void menuModelSetup(event_t event) s_editMode = 0; POPUP_INPUT("", runPopupRegister); } - else if (menuHorizontalPosition == 0) { + else if (menuHorizontalPosition == 1) { moduleSettings[moduleIdx].mode = MODULE_MODE_RANGECHECK; } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 5a87cb002..c272fa26b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -584,6 +584,7 @@ const char STR_BLCOLOR[] = TR_BLCOLOR; const char STR_TRAINER[] = TR_TRAINER; const char STR_MODULE_BIND[] = TR_MODULE_BIND; +const char STR_REGISTER_BUTTON[] = TR_REGISTER_BUTTON; const char STR_RXADD_BUTTON[] = TR_RXADD_BUTTON; const char STR_BINDING_1_8_TELEM_ON[] = TR_BINDING_CH1_8_TELEM_ON; const char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF; diff --git a/radio/src/translations.h b/radio/src/translations.h index 1ac8564d7..9eea8e197 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -849,6 +849,7 @@ extern const char STR_EXPONAME[]; extern const char STR_TRAINER[]; extern const char STR_MODULE_BIND[]; +extern const char STR_REGISTER_BUTTON[]; extern const char STR_RXADD_BUTTON[]; extern const char STR_BINDING_1_8_TELEM_ON[]; extern const char STR_BINDING_1_8_TELEM_OFF[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index b0f226537..fb41acd80 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -961,6 +961,7 @@ #define TR_BUZZER INDENT"Pípák" #define TR_BYTES "[B]" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index fda129655..171b5e6e5 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -966,6 +966,7 @@ #define TR_BUZZER INDENT "Summer" #define TR_BYTES "Bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b16ac76c2..93bf49ce1 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -965,6 +965,7 @@ #define TR_BUZZER INDENT "Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON BUTTON("Add") #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index cd874fa3b..598dfbdd3 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -972,6 +972,7 @@ #define TR_BUZZER INDENT"Zumbador" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Enlace]" +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE "[Limites]" #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 3704d8c5e..e0564376a 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -964,6 +964,7 @@ #define TR_BUZZER INDENT"Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE "[Range]" #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 4f4d5e390..64d8b9850 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -976,6 +976,7 @@ #define TR_BUZZER INDENT "Bipeur" #define TR_BYTES "bytes" #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE BUTTON(TR("Prt", "Port.")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 871c04895..e2227a893 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -966,6 +966,7 @@ #define TR_BUZZER INDENT"Buzzer" #define TR_BYTES "Bytes" #define TR_MODULE_BIND "[Bind]" +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE "[Range]" #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index d5c7c1ad2..430733f98 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -967,6 +967,7 @@ #define TR_BUZZER INDENT "Zoemer" #define TR_BYTES "bytes" #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE TR("[Rng]", "[Range]") #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index fbeff71e6..8c1e425fb 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -967,6 +967,7 @@ #define TR_BUZZER INDENT"Brzęczyk" #define TR_BYTES "bajty" #define TR_MODULE_BIND TR("[BND]","[Bind]") +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE TR("[Zas]","Zasięg") #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index e27ffbf45..8df7999eb 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -971,6 +971,7 @@ #define TR_BUZZER INDENT"Buzzer" #define TR_BYTES "bytes" #define TR_MODULE_BIND "[Bind]" +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE "[Range]" #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 5882b7e32..5cb0b44c9 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -980,6 +980,7 @@ #define TR_BUZZER INDENT"Summer" #define TR_BYTES "byte" #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") +#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register")) #define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_MODULE_RANGE TR("[Tst]", "[Testa]") #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))