Merge branch 'bsongis/pxx2' into bsongis/x-lites

This commit is contained in:
Bertrand Songis
2019-02-01 14:19:08 +01:00
55 changed files with 612 additions and 509 deletions
+2
View File
@@ -93,6 +93,7 @@ const char STR_OPEN9X[] =
ISTR(VTRAINERMODES)
ISTR(TARANIS_PROTOCOLS)
ISTR(R9M_REGION)
ISTR(R9MFLEX_FREQ)
ISTR(R9M_FCC_POWER_VALUES)
ISTR(R9M_LBT_POWER_VALUES)
ISTR(TELEMETRY_PROTOCOLS)
@@ -145,6 +146,7 @@ const char STR_PPMFRAME[] = TR_PPMFRAME;
const char STR_REFRESHRATE[] = TR_REFRESHRATE;
const char SSTR_WARN_BATTVOLTAGE[] = STR_WARN_BATTVOLTAGE;
const char STR_MS[] = TR_MS;
const char STR_FREQUENCY[] = TR_FREQUENCY;
const char STR_SWITCH[] = TR_SWITCH;
const char STR_TRIMS[] = TR_TRIMS;
const char STR_FADEIN[] = TR_FADEIN;