Merge against latest 2.3
This commit is contained in:
@@ -30,7 +30,6 @@ ISTR(TRNCHN);
|
||||
ISTR(VTRIMINC);
|
||||
ISTR(VDISPLAYTRIMS);
|
||||
ISTR(RETA123);
|
||||
ISTR(VPROTOS);
|
||||
ISTR(VBLMODE);
|
||||
ISTR(VCURVEFUNC);
|
||||
ISTR(VMLTPX);
|
||||
@@ -76,11 +75,11 @@ ISTR(VSENSORTYPES);
|
||||
ISTR(VFORMULAS);
|
||||
ISTR(VPREC);
|
||||
ISTR(VCELLINDEX);
|
||||
ISTR(VANTENNATYPES);
|
||||
ISTR(AUX_SERIAL_MODES);
|
||||
ISTR(SWTYPES);
|
||||
ISTR(POTTYPES);
|
||||
ISTR(SLIDERTYPES);
|
||||
ISTR(ANTENNA_MODES);
|
||||
|
||||
#if defined(PCBSKY9X) && defined(REVX)
|
||||
ISTR(VOUTPUT_TYPE);
|
||||
@@ -128,6 +127,7 @@ const char STR_SWITCH[] = TR_SWITCH;
|
||||
const char STR_TRIMS[] = TR_TRIMS;
|
||||
const char STR_FADEIN[] = TR_FADEIN;
|
||||
const char STR_FADEOUT[] = TR_FADEOUT;
|
||||
const char STR_DEFAULT[] = TR_DEFAULT;
|
||||
const char STR_CHECKTRIMS[] = TR_CHECKTRIMS;
|
||||
const char STR_MODE[] = TR_MODE;
|
||||
const char STR_NOFREEEXPO[] = TR_NOFREEEXPO;
|
||||
@@ -142,6 +142,7 @@ const char STR_CURVE[] = TR_CURVE;
|
||||
const char STR_FLMODE[] = TR_FLMODE;
|
||||
const char STR_MIXWARNING[] = TR_MIXWARNING;
|
||||
const char STR_OFF[] = TR_OFF;
|
||||
const char STR_ANTENNA[] = TR_ANTENNA;
|
||||
const char STR_NO_INFORMATION[] = TR_NO_INFORMATION;
|
||||
const char STR_MULTPX[] = TR_MULTPX;
|
||||
const char STR_DELAYDOWN[] = TR_DELAYDOWN;
|
||||
@@ -226,8 +227,8 @@ const char STR_MENULOGICALSWITCH[] = TR_MENULOGICALSWITCH;
|
||||
const char STR_MENULOGICALSWITCHES[] = TR_MENULOGICALSWITCHES;
|
||||
const char STR_MENUCUSTOMFUNC[] = TR_MENUCUSTOMFUNC;
|
||||
const char STR_SPLASHSCREEN[] = TR_SPLASHSCREEN;
|
||||
const char STR_PWR_ON_SPEED[] = TR_PWR_ON_SPEED;
|
||||
const char STR_PWR_OFF_SPEED[] = TR_PWR_OFF_SPEED;
|
||||
const char STR_PWR_ON_DELAY[] = TR_PWR_ON_DELAY;
|
||||
const char STR_PWR_OFF_DELAY[] = TR_PWR_OFF_DELAY;
|
||||
const char STR_THROTTLEWARNING[] = TR_THROTTLEWARNING;
|
||||
const char STR_SWITCHWARNING[] = TR_SWITCHWARNING;
|
||||
const char STR_POTWARNINGSTATE[] = TR_POTWARNINGSTATE;
|
||||
@@ -459,13 +460,14 @@ const char STR_BINDING_1_8_TELEM_OFF[] = TR_BINDING_CH1_8_TELEM_OFF;
|
||||
const char STR_BINDING_9_16_TELEM_ON[] = TR_BINDING_CH9_16_TELEM_ON;
|
||||
const char STR_BINDING_9_16_TELEM_OFF[] = TR_BINDING_CH9_16_TELEM_OFF;
|
||||
const char STR_CHANNELRANGE[] = TR_CHANNELRANGE;
|
||||
const char STR_ANTENNASELECTION[] = TR_ANTENNASELECTION;
|
||||
const char STR_ANTENNACONFIRM1[] = TR_ANTENNACONFIRM1;
|
||||
const char STR_ANTENNACONFIRM2[] = TR_ANTENNACONFIRM2;
|
||||
const char STR_USE_INTERNAL_ANTENNA[] = TR_USE_INTERNAL_ANTENNA;
|
||||
const char STR_USE_EXTERNAL_ANTENNA[] = TR_USE_EXTERNAL_ANTENNA;
|
||||
const char STR_MODULE_PROTOCOL_FLEX_WARN_LINE1[] = TR_MODULE_PROTOCOL_FLEX_WARN_LINE1;
|
||||
const char STR_R9M_PROTO_FCC_WARN_LINE1[] = TR_R9M_PROTO_FCC_WARN_LINE1;
|
||||
const char STR_R9M_PROTO_EU_WARN_LINE1[] = TR_R9M_PROTO_EU_WARN_LINE1;
|
||||
const char STR_R9M_PROTO_WARN_LINE2[] = TR_R9M_PROTO_WARN_LINE2;
|
||||
const char STR_MODULE_PROTOCOL_FCC_WARN_LINE1[] = TR_MODULE_PROTOCOL_FCC_WARN_LINE1;
|
||||
const char STR_MODULE_PROTOCOL_EU_WARN_LINE1[] = TR_MODULE_PROTOCOL_EU_WARN_LINE1;
|
||||
const char STR_MODULE_PROTOCOL_WARN_LINE2[] = TR_MODULE_PROTOCOL_WARN_LINE2;
|
||||
const char STR_SET[] = TR_SET;
|
||||
const char STR_PREFLIGHT[] = TR_PREFLIGHT;
|
||||
const char STR_CHECKLIST[] = TR_CHECKLIST;
|
||||
@@ -667,6 +669,7 @@ const char STR_MULTI_RFTUNE[] = TR_MULTI_RFTUNE;
|
||||
const char STR_MULTI_TELEMETRY[] = TR_MULTI_TELEMETRY;
|
||||
const char STR_MULTI_VIDFREQ[] = TR_MULTI_VIDFREQ;
|
||||
const char STR_MULTI_OPTION[] = TR_MULTI_OPTION;
|
||||
const char STR_MULTI_FIXEDID[] = TR_MULTI_FIXEDID;
|
||||
const char STR_MULTI_AUTOBIND[] = TR_MULTI_AUTOBIND;
|
||||
const char STR_MULTI_DSM_AUTODTECT[] = TR_MULTI_DSM_AUTODTECT;
|
||||
const char STR_MULTI_LOWPOWER[] = TR_MULTI_LOWPOWER;
|
||||
|
||||
Reference in New Issue
Block a user