Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 01:05:10 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
3djc 2019-11-27 12:41:20 +01:00
parent 75f04c89b0
commit a56411a837
15 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/telemetry/frsky_pxx2.cpp
View file

@ -38,7 +38,7 @@ void processGetHardwareInfoFrame(uint8_t module, const uint8_t * frame)
if (!globalData.upgradeModulePopup && destination->information.modelID == PXX2_MODULE_ISRM_S_X10S && if (!globalData.upgradeModulePopup && destination->information.modelID == PXX2_MODULE_ISRM_S_X10S &&
destination->information.swVersion.major == 0 && destination->information.swVersion.minor == 1 && destination->information.swVersion.revision < 5) { destination->information.swVersion.major == 0 && destination->information.swVersion.minor == 1 && destination->information.swVersion.revision < 5) {
globalData.upgradeModulePopup = 1; globalData.upgradeModulePopup = 1;
POPUP_WARNING(STR_MODULE_UPGRADE); POPUP_WARNING(STR_MODULE_UPGRADE_ALERT);
} }
} }
else if (index < PXX2_MAX_RECEIVERS_PER_MODULE && modelId < DIM(PXX2ReceiversNames)) { else if (index < PXX2_MAX_RECEIVERS_PER_MODULE && modelId < DIM(PXX2ReceiversNames)) {
@ -227,7 +227,7 @@ void processAuthenticationFrame(uint8_t module, const uint8_t * frame)
if (!globalData.upgradeModulePopup) { if (!globalData.upgradeModulePopup) {
if (globalData.authenticationCount >= 2) { if (globalData.authenticationCount >= 2) {
globalData.upgradeModulePopup = 1; globalData.upgradeModulePopup = 1;
POPUP_WARNING(STR_MODULE_UPGRADE); POPUP_WARNING(STR_MODULE_UPGRADE_ALERT);
} }
else { else {
globalData.authenticationCount += 1; globalData.authenticationCount += 1;

2
radio/src/telemetry/multi.cpp
View file

@ -549,7 +549,7 @@ void MultiModuleStatus::getStatusString(char * statusText) const
} }
if (major == 1 && minor < 3 && SLOW_BLINK_ON_PHASE) { if (major == 1 && minor < 3 && SLOW_BLINK_ON_PHASE) {
strcpy(statusText, STR_MODULE_UPDATE); strcpy(statusText, STR_MODULE_UPGRADE);
} }
else { else {
char * tmp = statusText; char * tmp = statusText;

4
radio/src/translations.cpp
View file

@ -675,8 +675,8 @@ const char STR_MODULE_NO_INPUT[] = TR_MODULE_NO_INPUT;
const char STR_MODULE_WAITFORBIND[] = TR_MODULE_WAITFORBIND; const char STR_MODULE_WAITFORBIND[] = TR_MODULE_WAITFORBIND;
const char STR_MODULE_NO_TELEMETRY[] = TR_MODULE_NO_TELEMETRY; const char STR_MODULE_NO_TELEMETRY[] = TR_MODULE_NO_TELEMETRY;
const char STR_MODULE_BINDING[] = TR_MODULE_BINDING; const char STR_MODULE_BINDING[] = TR_MODULE_BINDING;
const char STR_MODULE_UPGRADE[] = TR_MODULE_UPGRADE; const char STR_MODULE_UPGRADE_ALERT[] = TR_MODULE_UPGRADE_ALERT;
const char STR_MODULE_UPDATE[] = TR_MODULE_UPDATE; const char STR_MODULE_UPGRADE[] = TR_MODULE_UPGRADE;
const char STR_PROTOCOL_INVALID[] = TR_PROTOCOL_INVALID; const char STR_PROTOCOL_INVALID[] = TR_PROTOCOL_INVALID;
const char STR_MODULE_STATUS[] = TR_MODULE_STATUS; const char STR_MODULE_STATUS[] = TR_MODULE_STATUS;
const char STR_MODULE_SYNC[] = TR_MODULE_SYNC; const char STR_MODULE_SYNC[] = TR_MODULE_SYNC;

2
radio/src/translations.h
View file

@ -398,8 +398,8 @@ extern const char STR_MODULE_NO_INPUT[];
extern const char STR_MODULE_WAITFORBIND[]; extern const char STR_MODULE_WAITFORBIND[];
extern const char STR_MODULE_NO_TELEMETRY[]; extern const char STR_MODULE_NO_TELEMETRY[];
extern const char STR_MODULE_BINDING[]; extern const char STR_MODULE_BINDING[];
extern const char STR_MODULE_UPGRADE_ALERT[];
extern const char STR_MODULE_UPGRADE[]; extern const char STR_MODULE_UPGRADE[];
extern const char STR_MODULE_UPDATE[];
extern const char STR_PROTOCOL_INVALID[]; extern const char STR_PROTOCOL_INVALID[];
extern const char STR_MODULE_STATUS[]; extern const char STR_MODULE_STATUS[];
extern const char STR_MODULE_SYNC[]; extern const char STR_MODULE_SYNC[];

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

@ -643,8 +643,8 @@
#define TR_MODULE_NO_TELEMETRY TR3("Bez telemetrie", "Bez MULTI_TELEMETIE", "Nedetekována MULTI_TELEMETRIE") #define TR_MODULE_NO_TELEMETRY TR3("Bez telemetrie", "Bez MULTI_TELEMETIE", "Nedetekována MULTI_TELEMETRIE")
#define TR_MODULE_WAITFORBIND "Párovat při zavedení protokolu" #define TR_MODULE_WAITFORBIND "Párovat při zavedení protokolu"
#define TR_MODULE_BINDING TR("Bind...","Párování") #define TR_MODULE_BINDING TR("Bind...","Párování")
#define TR_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Nutno přepárovat" #define TR_REBIND "Nutno přepárovat"
#define TR_REG_OK "Registrace ok" #define TR_REG_OK "Registrace ok"
#define TR_BIND_OK "Úspěšné párovaní" #define TR_BIND_OK "Úspěšné párovaní"

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

@ -645,8 +645,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -644,8 +644,8 @@
#define TR_MODULE_NO_TELEMETRY TR3("No telemetry", "No MULTI_TELEMETRY", "No MULTI_TELEMETRY detected") #define TR_MODULE_NO_TELEMETRY TR3("No telemetry", "No MULTI_TELEMETRY", "No MULTI_TELEMETRY detected")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -668,8 +668,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -662,8 +662,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -665,8 +665,8 @@
#define TR_MODULE_NO_TELEMETRY TR3("Pas de télm.", "Télémétrie absente", "Télémétrie absente(act. MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3("Pas de télm.", "Télémétrie absente", "Télémétrie absente(act. MULTI_TELEMETRY)")
#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_MODULE_UPGRADE "Mise à jour requise" #define TR_MODULE_UPGRADE_ALERT "Mise à jour requise"
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebind requis" #define TR_REBIND "Rebind requis"
#define TR_REG_OK "Enregistr. ok" #define TR_REG_OK "Enregistr. ok"
#define TR_BIND_OK "Bind ok" #define TR_BIND_OK "Bind ok"

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

@ -664,8 +664,8 @@
#define TR_MODULE_NO_TELEMETRY TR3("No telemetria", "MULTI_TELEMETRY disattivato", "Nessuna telem. (abilita MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3("No telemetria", "MULTI_TELEMETRY disattivato", "Nessuna telem. (abilita MULTI_TELEMETRY)")
#define TR_MODULE_WAITFORBIND "Associa per caricare il protocollo" #define TR_MODULE_WAITFORBIND "Associa per caricare il protocollo"
#define TR_MODULE_BINDING "Associa" #define TR_MODULE_BINDING "Associa"
#define TR_MODULE_UPGRADE TR3("Richiede agg.", "Richiede agg. modulo", "Modulo\nRichiede agg.") #define TR_MODULE_UPGRADE_ALERT TR3("Richiede agg.", "Richiede agg. modulo", "Modulo\nRichiede agg.")
#define TR_MODULE_UPDATE TR("Richiede agg.", "Richiede agg. modulo") #define TR_MODULE_UPGRADE TR("Richiede agg.", "Richiede agg. modulo")
#define TR_REBIND "Richiede associazione" #define TR_REBIND "Richiede associazione"
#define TR_REG_OK "Registrazione ok" #define TR_REG_OK "Registrazione ok"
#define TR_BIND_OK "Associazione riuscita" #define TR_BIND_OK "Associazione riuscita"

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

@ -650,8 +650,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -663,8 +663,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -654,8 +654,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"

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

@ -663,8 +663,8 @@
#define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)") #define TR_MODULE_NO_TELEMETRY TR3( "No telmetry", "No MULTI_TELEMETRY", "No telemetry (enable MULTI_TELEMETRY)")
#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_MODULE_UPGRADE TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required") #define TR_MODULE_UPGRADE_ALERT TR3("Upg. needed", "Module upgrade required", "Module\nUpgrade required")
#define TR_MODULE_UPDATE TR("Upd. needed", "Module update required") #define TR_MODULE_UPGRADE TR("Upg. needed", "Module upgrade required")
#define TR_REBIND "Rebinding required" #define TR_REBIND "Rebinding required"
#define TR_REG_OK "Registration ok" #define TR_REG_OK "Registration ok"
#define TR_BIND_OK "Bind successful" #define TR_BIND_OK "Bind successful"