From b9c5cbc26554864f32cb269ba17913c78a167f3a Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 7 Feb 2019 07:44:05 +0100 Subject: [PATCH] Popup to inform of successful register and bind --- radio/src/telemetry/telemetry.cpp | 3 ++- 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, 15 insertions(+), 1 deletion(-) diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index b01a2c102..4b2ec1606 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -19,7 +19,6 @@ */ #include -#include "opentx.h" uint8_t telemetryStreaming = 0; uint8_t R9ModuleStreaming = 0; @@ -87,6 +86,7 @@ void processRegisterFrame(uint8_t module, uint8_t * frame) if (memcmp(&frame[4], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) { reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK; moduleSettings[module].mode = MODULE_MODE_NORMAL; + POPUP_WARNING("Registration ok"); } } } @@ -127,6 +127,7 @@ void processBindFrame(uint8_t module, uint8_t * frame) if (memcmp(reusableBuffer.modelsetup.pxx2_bind_candidate_receivers_ids[reusableBuffer.modelsetup.pxx2_bind_selected_receiver_index], MY_RX_ID /*TODO &frame[4]*/, PXX2_LEN_RX_ID) == 0) { reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK; moduleSettings[module].mode = MODULE_MODE_NORMAL; + POPUP_WARNING(STR_BIND_OK); } } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 9c812a8fc..16046479a 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -353,6 +353,7 @@ const char STR_MENUGLOBALVARS[] = TR_MENUGLOBALVARS; const char STR_RECEIVER_NUM[] = TR_RECEIVER_NUM; const char STR_RECEIVER[] = TR_RECEIVER; const char STR_REBIND[] = TR_REBIND; +const char STR_BIND_OK[] = TR_BIND_OK; #endif const char STR_SYNCMENU[] = TR_SYNCMENU; diff --git a/radio/src/translations.h b/radio/src/translations.h index 9568ea578..4fd6aec72 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -569,6 +569,7 @@ extern const char STR_SUBTYPE[]; extern const char STR_RECEIVER_NUM[]; extern const char STR_RECEIVER[]; extern const char STR_REBIND[]; +extern const char STR_BIND_OK[]; #endif extern const char STR_SYNCMENU[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 36e175d62..e8b973f7f 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -775,6 +775,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING TR("Bind...","Binding") #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 32b6de2da..906460929 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -780,6 +780,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 6edf4de4f..836b62b41 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -778,6 +778,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING TR("Bind...","Binding") #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index d76a696ca..d02fa0ff1 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -786,6 +786,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 5f296d2eb..127248589 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -778,6 +778,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index f33a27a41..bba915bd6 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -791,6 +791,7 @@ #define TR_MODULE_WAITFORBIND "Binder d'abord" #define TR_MODULE_BINDING "Bind..." #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Télem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Télem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Télem ON" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index a424f757b..f76adde43 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -780,6 +780,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 7133edf11..590ad431a 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -781,6 +781,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 08476dc1e..053eaa28b 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -781,6 +781,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 9e5516969..12d5f52da 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -786,6 +786,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a96f79b3b..f164fe65c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -794,6 +794,7 @@ #define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_BINDING "Binding" #define TR_REBIND "Rebinding required" +#define TR_BIND_OK "Bind successful" #define TR_BINDING_CH1_8_TELEM_ON "Ch1-8 Telem ON" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"