Merge branch '2.3' of https://github.com/opentx/opentx into 2.3

This commit is contained in:
MRC3742
2019-08-27 13:09:32 -04:00
211 changed files with 5643 additions and 2331 deletions
-18
View File
@@ -24,7 +24,6 @@
ISTR(OFFON);
ISTR(MMMINV);
ISTR(NCHANNELS);
ISTR(VBEEPMODE);
ISTR(TRNMODE);
ISTR(TRNCHN);
@@ -32,7 +31,6 @@ ISTR(VTRIMINC);
ISTR(VDISPLAYTRIMS);
ISTR(RETA123);
ISTR(VPROTOS);
ISTR(POSNEG);
ISTR(VBLMODE);
ISTR(VCURVEFUNC);
ISTR(VMLTPX);
@@ -43,18 +41,12 @@ ISTR(VFSWFUNC);
ISTR(VFSWRESET);
ISTR(FUNCSOUNDS);
ISTR(VTELEMUNIT);
ISTR(VALARM);
ISTR(VALARMFN);
ISTR(VTELPROTO);
ISTR(GPSFORMAT);
ISTR(AMPSRC);
ISTR(VARIOSRC);
ISTR(VTELEMSCREENTYPE);
ISTR(VKEYS);
ISTR(VSWITCHES);
ISTR(VSRCRAW);
ISTR(VTMRMODES);
ISTR(DATETIME);
ISTR(VPERSISTENT);
ISTR(VLCD);
ISTR(VUNITSSYSTEM);
@@ -77,18 +69,12 @@ ISTR(XJT_ACCST_RF_PROTOCOLS);
ISTR(ISRM_RF_PROTOCOLS);
ISTR(R9M_PXX2_RF_PROTOCOLS);
ISTR(DSM_PROTOCOLS);
ISTR(VOLTSRC);
ISTR(CURVE_TYPES);
ISTR(VSENSORTYPES);
ISTR(VFORMULAS);
ISTR(VPREC);
ISTR(VCELLINDEX);
ISTR(VANTENNATYPES);
#if !defined(GRAPHICS)
ISTR(VBEEPLEN);
#endif
ISTR(AUX_SERIAL_MODES);
ISTR(SWTYPES);
ISTR(POTTYPES);
@@ -630,7 +616,6 @@ const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS;
const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS;
#endif
#if defined(TELEMETRY_FRSKY)
const char STR_TIMEZONE[] = TR_TIMEZONE;
const char STR_ADJUST_RTC[] = TR_ADJUST_RTC;
const char STR_GPS[] = TR_GPS;
@@ -639,7 +624,6 @@ const char STR_VARIO[] = TR_VARIO;
const char STR_PITCH_AT_ZERO[] = TR_PITCH_AT_ZERO;
const char STR_PITCH_AT_MAX[] = TR_PITCH_AT_MAX;
const char STR_REPEAT_AT_ZERO[] = TR_REPEAT_AT_ZERO;
#endif
#if defined(EEPROM)
const char STR_BAD_RADIO_DATA[] = TR_BADEEPROMDATA;
@@ -658,9 +642,7 @@ const char STR_STORAGE_FORMAT[] = TR_STORAGE_FORMAT;
const char STR_MENUCUSTOMSCRIPTS[] = TR_MENUCUSTOMSCRIPTS;
#endif
#if defined(TELEMETRY_FRSKY)
const char STR_MENUTELEMETRY[] = TR_MENUTELEMETRY;
#endif
#if defined(DSM2) || defined(PXX)
const char STR_RECEIVER_NUM[] = TR_RECEIVER_NUM;