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

Do not display ok on register until RX is ready

Browse source
This commit is contained in:
3djc 2019-02-22 11:08:08 +01:00
parent 16e54f27e0
commit b345abf6bc
14 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -329,10 +329,10 @@ void runPopupRegister(event_t event)
if (reusableBuffer.moduleSetup.pxx2.registerStep >= REGISTER_RX_NAME_RECEIVED) { if (reusableBuffer.moduleSetup.pxx2.registerStep >= REGISTER_RX_NAME_RECEIVED) {
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + FH, STR_RX_NAME); 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); 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.registerPopupVerticalPosition = menuVerticalPosition;
reusableBuffer.moduleSetup.pxx2.registerPopupHorizontalPosition = menuHorizontalPosition; reusableBuffer.moduleSetup.pxx2.registerPopupHorizontalPosition = menuHorizontalPosition;
@ -1159,11 +1159,11 @@ void menuModelSetup(event_t event)
{ {
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k); uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
lcdDrawTextAlignedLeft(y, STR_MODULE); lcdDrawTextAlignedLeft(y, STR_MODULE);
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_MODULE_RANGE, (menuHorizontalPosition == 0 ? attr : 0)); lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_REGISTER_BUTTON, (menuHorizontalPosition == 0 ? attr : 0));
lcdDrawText(lcdLastRightPos, y, "[Reg]", (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 == 1 && event == EVT_KEY_FIRST(KEY_ENTER)) { if (menuHorizontalPosition == 0 && event == EVT_KEY_FIRST(KEY_ENTER)) {
moduleSettings[moduleIdx].mode = MODULE_MODE_REGISTER; moduleSettings[moduleIdx].mode = MODULE_MODE_REGISTER;
reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_START; reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_START;
memcpy(reusableBuffer.moduleSetup.pxx2.registrationID, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID); memcpy(reusableBuffer.moduleSetup.pxx2.registrationID, g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID);
@ -1173,7 +1173,7 @@ void menuModelSetup(event_t event)
s_editMode = 0; s_editMode = 0;
POPUP_INPUT("", runPopupRegister); POPUP_INPUT("", runPopupRegister);
} }
else if (menuHorizontalPosition == 0) { else if (menuHorizontalPosition == 1) {
moduleSettings[moduleIdx].mode = MODULE_MODE_RANGECHECK; moduleSettings[moduleIdx].mode = MODULE_MODE_RANGECHECK;
} }
} }

1
radio/src/translations.cpp
View file

@ -584,6 +584,7 @@ const char STR_BLCOLOR[] = TR_BLCOLOR;
const char STR_TRAINER[] = TR_TRAINER; const char STR_TRAINER[] = TR_TRAINER;
const char STR_MODULE_BIND[] = TR_MODULE_BIND; 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_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_ON[] = TR_BINDING_CH1_8_TELEM_ON;
const char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF; const char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF;

1
radio/src/translations.h
View file

@ -849,6 +849,7 @@ extern const char STR_EXPONAME[];
extern const char STR_TRAINER[]; extern const char STR_TRAINER[];
extern const char STR_MODULE_BIND[]; extern const char STR_MODULE_BIND[];
extern const char STR_REGISTER_BUTTON[];
extern const char STR_RXADD_BUTTON[]; extern const char STR_RXADD_BUTTON[];
extern const char STR_BINDING_1_8_TELEM_ON[]; extern const char STR_BINDING_1_8_TELEM_ON[];
extern const char STR_BINDING_1_8_TELEM_OFF[]; extern const char STR_BINDING_1_8_TELEM_OFF[];

1
radio/src/translations/cz.h.txt
View file

@ -961,6 +961,7 @@
#define TR_BUZZER INDENT"Pípák" #define TR_BUZZER INDENT"Pípák"
#define TR_BYTES "[B]" #define TR_BYTES "[B]"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range"))
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/de.h.txt
View file

@ -966,6 +966,7 @@
#define TR_BUZZER INDENT "Summer" #define TR_BUZZER INDENT "Summer"
#define TR_BYTES "Bytes" #define TR_BYTES "Bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro #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_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/en.h.txt
View file

@ -965,6 +965,7 @@
#define TR_BUZZER INDENT "Buzzer" #define TR_BUZZER INDENT "Buzzer"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON BUTTON("Add") #define TR_RXADD_BUTTON BUTTON("Add")
#define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range"))
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/es.h.txt
View file

@ -972,6 +972,7 @@
#define TR_BUZZER INDENT"Zumbador" #define TR_BUZZER INDENT"Zumbador"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Enlace]" #define TR_MODULE_BIND "[Enlace]"
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Limites]" #define TR_MODULE_RANGE "[Limites]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/fi.h.txt
View file

@ -964,6 +964,7 @@
#define TR_BUZZER INDENT"Buzzer" #define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]" #define TR_MODULE_BIND "[Bind]"
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]" #define TR_MODULE_RANGE "[Range]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/fr.h.txt
View file

@ -976,6 +976,7 @@
#define TR_BUZZER INDENT "Bipeur" #define TR_BUZZER INDENT "Bipeur"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"
#define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind"))
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE BUTTON(TR("Prt", "Port.")) #define TR_MODULE_RANGE BUTTON(TR("Prt", "Port."))
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/it.h.txt
View file

@ -966,6 +966,7 @@
#define TR_BUZZER INDENT"Buzzer" #define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "Bytes" #define TR_BYTES "Bytes"
#define TR_MODULE_BIND "[Bind]" #define TR_MODULE_BIND "[Bind]"
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]" #define TR_MODULE_RANGE "[Range]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/nl.h.txt
View file

@ -967,6 +967,7 @@
#define TR_BUZZER INDENT "Zoemer" #define TR_BUZZER INDENT "Zoemer"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Rng]", "[Range]") #define TR_MODULE_RANGE TR("[Rng]", "[Range]")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/pl.h.txt
View file

@ -967,6 +967,7 @@
#define TR_BUZZER INDENT"Brzęczyk" #define TR_BUZZER INDENT"Brzęczyk"
#define TR_BYTES "bajty" #define TR_BYTES "bajty"
#define TR_MODULE_BIND TR("[BND]","[Bind]") #define TR_MODULE_BIND TR("[BND]","[Bind]")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Zas]","Zasięg") #define TR_MODULE_RANGE TR("[Zas]","Zasięg")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/pt.h.txt
View file

@ -971,6 +971,7 @@
#define TR_BUZZER INDENT"Buzzer" #define TR_BUZZER INDENT"Buzzer"
#define TR_BYTES "bytes" #define TR_BYTES "bytes"
#define TR_MODULE_BIND "[Bind]" #define TR_MODULE_BIND "[Bind]"
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE "[Range]" #define TR_MODULE_RANGE "[Range]"
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))

1
radio/src/translations/se.h.txt
View file

@ -980,6 +980,7 @@
#define TR_BUZZER INDENT"Summer" #define TR_BUZZER INDENT"Summer"
#define TR_BYTES "byte" #define TR_BYTES "byte"
#define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_MODULE_BIND TR("[Bnd]", "[Bind]")
#define TR_REGISTER_BUTTON BUTTON(TR("Reg", "Register"))
#define TR_RXADD_BUTTON "BUTTON(Add)" #define TR_RXADD_BUTTON "BUTTON(Add)"
#define TR_MODULE_RANGE TR("[Tst]", "[Testa]") #define TR_MODULE_RANGE TR("[Tst]", "[Testa]")
#define TR_DEL_BUTTON BUTTON(TR("Del", "Delete")) #define TR_DEL_BUTTON BUTTON(TR("Del", "Delete"))