Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 16:55:20 +03:00
Code Issues Wiki Activity

Popup to inform of successful register and bind

Browse source
This commit is contained in:
3djc 2019-02-07 07:44:05 +01:00
parent dfd12ff978
commit b9c5cbc265
14 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
radio/src/telemetry/telemetry.cpp
View file

@ -19,7 +19,6 @@
*/ */
#include <opentx.h> #include <opentx.h>
#include "opentx.h"
uint8_t telemetryStreaming = 0; uint8_t telemetryStreaming = 0;
uint8_t R9ModuleStreaming = 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) { if (memcmp(&frame[4], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0) {
reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK; reusableBuffer.modelsetup.pxx2_register_or_bind_step = REGISTER_OK;
moduleSettings[module].mode = MODULE_MODE_NORMAL; 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) { 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; reusableBuffer.modelsetup.pxx2_register_or_bind_step = BIND_OK;
moduleSettings[module].mode = MODULE_MODE_NORMAL; moduleSettings[module].mode = MODULE_MODE_NORMAL;
POPUP_WARNING(STR_BIND_OK);
} }
} }
} }

1
radio/src/translations.cpp
View file

@ -353,6 +353,7 @@ const char STR_MENUGLOBALVARS[] = TR_MENUGLOBALVARS;
const char STR_RECEIVER_NUM[] = TR_RECEIVER_NUM; const char STR_RECEIVER_NUM[] = TR_RECEIVER_NUM;
const char STR_RECEIVER[] = TR_RECEIVER; const char STR_RECEIVER[] = TR_RECEIVER;
const char STR_REBIND[] = TR_REBIND; const char STR_REBIND[] = TR_REBIND;
const char STR_BIND_OK[] = TR_BIND_OK;
#endif #endif
const char STR_SYNCMENU[] = TR_SYNCMENU; const char STR_SYNCMENU[] = TR_SYNCMENU;

1
radio/src/translations.h
View file

@ -569,6 +569,7 @@ extern const char STR_SUBTYPE[];
extern const char STR_RECEIVER_NUM[]; extern const char STR_RECEIVER_NUM[];
extern const char STR_RECEIVER[]; extern const char STR_RECEIVER[];
extern const char STR_REBIND[]; extern const char STR_REBIND[];
extern const char STR_BIND_OK[];
#endif #endif
extern const char STR_SYNCMENU[]; extern const char STR_SYNCMENU[];

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

@ -775,6 +775,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING TR("Bind...","Binding") #define TR_MODULE_BINDING TR("Bind...","Binding")
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -780,6 +780,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -778,6 +778,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING TR("Bind...","Binding") #define TR_MODULE_BINDING TR("Bind...","Binding")
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -786,6 +786,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -778,6 +778,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -791,6 +791,7 @@
#define TR_MODULE_WAITFORBIND "Binder d'abord" #define TR_MODULE_WAITFORBIND "Binder d'abord"
#define TR_MODULE_BINDING "Bind..." #define TR_MODULE_BINDING "Bind..."
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Télem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Télem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Télem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Télem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Télem ON"

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

@ -780,6 +780,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -781,6 +781,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -781,6 +781,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -786,6 +786,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"

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

@ -794,6 +794,7 @@
#define TR_MODULE_WAITFORBIND "Bind to load protocol" #define TR_MODULE_WAITFORBIND "Bind to load protocol"
#define TR_MODULE_BINDING "Binding" #define TR_MODULE_BINDING "Binding"
#define TR_REBIND "Rebinding required" #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_ON "Ch1-8 Telem ON"
#define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF" #define TR_BINDING_CH1_8_TELEM_OFF "Ch1-8 Telem OFF"
#define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON" #define TR_BINDING_CH9_16_TELEM_ON "Ch9-16 Telem ON"