Merge with latest 2.3
This commit is contained in:
@@ -70,6 +70,8 @@ ISTR(XJT_ACCST_RF_PROTOCOLS);
|
||||
ISTR(ISRM_RF_PROTOCOLS);
|
||||
ISTR(R9M_PXX2_RF_PROTOCOLS);
|
||||
ISTR(DSM_PROTOCOLS);
|
||||
ISTR(AFHDS3_PROTOCOLS);
|
||||
ISTR(AFHDS3_POWERS);
|
||||
ISTR(CURVE_TYPES);
|
||||
ISTR(VSENSORTYPES);
|
||||
ISTR(VFORMULAS);
|
||||
@@ -98,6 +100,7 @@ ISTR(INPUTNAMES);
|
||||
|
||||
#if defined(MULTIMODULE)
|
||||
ISTR(MULTI_PROTOCOLS);
|
||||
ISTR(MULTI_POWER);
|
||||
#endif
|
||||
|
||||
#if defined(BLUETOOTH)
|
||||
@@ -125,6 +128,7 @@ const char STR_TRIMINC[] = TR_TRIMINC;
|
||||
const char STR_DISPLAY_TRIMS[] = TR_DISPLAY_TRIMS;
|
||||
const char STR_TTRACE[] = TR_TTRACE;
|
||||
const char STR_TTRIM[] = TR_TTRIM;
|
||||
const char STR_TTRIM_SW[] = TR_TTRIM_SW;
|
||||
const char STR_BEEPCTR[] = TR_BEEPCTR;
|
||||
const char STR_USE_GLOBAL_FUNCS[] = TR_USE_GLOBAL_FUNCS;
|
||||
const char STR_PPMFRAME[] = TR_PPMFRAME;
|
||||
@@ -364,6 +368,7 @@ const char STR_SPECTRUM_ANALYSER_EXT[] = TR_SPECTRUM_ANALYSER_EXT;
|
||||
const char STR_SPECTRUM_ANALYSER_INT[] = TR_SPECTRUM_ANALYSER_INT;
|
||||
const char STR_WAITING_FOR_RX[] = TR_WAITING_FOR_RX;
|
||||
const char STR_WAITING_FOR_TX[] = TR_WAITING_FOR_TX;
|
||||
const char STR_WARN_5VOLTS[] = TR_WARN_5VOLTS;
|
||||
const char STR_CAT_NOT_EMPTY[] = TR_CAT_NOT_EMPTY;
|
||||
const char STR_WARNING[] = TR_WARNING;
|
||||
const char STR_THROTTLE_WARNING[] = TR_THROTTLE_WARNING;
|
||||
@@ -445,8 +450,10 @@ const char STR_FIRMWARE_UPDATE_SUCCESS[] = TR_FIRMWARE_UPDATE_SUCCESS;
|
||||
const char STR_WRITING[] = TR_WRITING;
|
||||
const char STR_FLASH_EXTERNAL_DEVICE[] = TR_FLASH_EXTERNAL_DEVICE;
|
||||
const char STR_FLASH_RECEIVER_OTA[] = TR_FLASH_RECEIVER_OTA;
|
||||
const char STR_FLASH_RECEIVER_OTA_BY_EXTERNAL[] = TR_FLASH_RECEIVER_OTA_BY_EXTERNAL;
|
||||
const char STR_FLASH_RECEIVER_OTA_BY_INTERNAL[] = TR_FLASH_RECEIVER_OTA_BY_INTERNAL;
|
||||
const char STR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA[] = TR_FLASH_RECEIVER_BY_EXTERNAL_MODULE_OTA;
|
||||
const char STR_FLASH_RECEIVER_BY_INTERNAL_MODULE_OTA[] = TR_FLASH_RECEIVER_BY_INTERNAL_MODULE_OTA;
|
||||
const char STR_FLASH_FLIGHT_CONTROLLER_BY_EXTERNAL_MODULE_OTA[] = TR_FLASH_FLIGHT_CONTROLLER_BY_EXTERNAL_MODULE_OTA;
|
||||
const char STR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA[] = TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA;
|
||||
const char STR_FLASH_BLUETOOTH_MODULE[] = TR_FLASH_BLUETOOTH_MODULE;
|
||||
const char STR_FLASH_POWER_MANAGEMENT_UNIT[] = TR_FLASH_POWER_MANAGEMENT_UNIT;
|
||||
const char STR_CONFIRM_FORMAT[] = TR_CONFIRM_FORMAT;
|
||||
@@ -640,6 +647,9 @@ const char STR_LAYOUT[] = TR_LAYOUT;
|
||||
const char STR_ADD_MAIN_VIEW[] = TR_ADD_MAIN_VIEW;
|
||||
const char STR_BACKGROUND_COLOR[] = TR_BACKGROUND_COLOR;
|
||||
const char STR_MAIN_COLOR[] = TR_MAIN_COLOR;
|
||||
const char STR_BAR2_COLOR[] = TR_BAR2_COLOR;
|
||||
const char STR_BAR1_COLOR[] = TR_BAR1_COLOR;
|
||||
const char STR_TEXT_COLOR[] = TR_TEXT_COLOR;
|
||||
const char STR_TEXT_VIEWER[] = TR_TEXT_VIEWER;
|
||||
const char STR_RF_POWER[] = TR_RF_POWER;
|
||||
const char STR_BYTES[] = TR_BYTES;
|
||||
@@ -764,6 +774,7 @@ const char STR_GYRO_MAX[] = TR_GYRO_MAX;
|
||||
#if defined(PWM_BACKLIGHT) || defined(COLORLCD)
|
||||
const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS;
|
||||
const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS;
|
||||
const char STR_KEYS_BACKLIGHT[] = TR_KEYS_BACKLIGHT;
|
||||
#endif
|
||||
|
||||
const char STR_TIMEZONE[] = TR_TIMEZONE;
|
||||
@@ -805,6 +816,7 @@ const char STR_BIND_OK[] = TR_BIND_OK;
|
||||
|
||||
const char STR_MULTI_CUSTOM[] = TR_MULTI_CUSTOM;
|
||||
const char STR_MULTI_RFTUNE[] = TR_MULTI_RFTUNE;
|
||||
const char STR_MULTI_RFPOWER[] = TR_MULTI_RFPOWER;
|
||||
const char STR_MULTI_TELEMETRY[] = TR_MULTI_TELEMETRY;
|
||||
const char STR_MULTI_VIDFREQ[] = TR_MULTI_VIDFREQ;
|
||||
const char STR_MULTI_OPTION[] = TR_MULTI_OPTION;
|
||||
@@ -829,8 +841,16 @@ const char STR_MULTI_SERVOFREQ[] = TR_MULTI_SERVOFREQ;
|
||||
const char STR_MULTI_MAX_THROW[] = TR_MULTI_MAX_THROW;
|
||||
const char STR_MULTI_RFCHAN[] = TR_MULTI_RFCHAN;
|
||||
const char STR_NEEDS_FILE[] = TR_NEEDS_FILE;
|
||||
const char STR_EXT_MULTI_SPEC[] = TR_EXT_MULTI_SPEC;
|
||||
const char STR_INT_MULTI_SPEC[] = TR_INT_MULTI_SPEC;
|
||||
const char STR_EXT_MULTI_SPEC[] = TR_EXT_MULTI_SPEC;
|
||||
const char STR_INT_MULTI_SPEC[] = TR_INT_MULTI_SPEC;
|
||||
|
||||
#if defined(AFHDS3)
|
||||
const char STR_AFHDS3_RX_FREQ[] = TR_AFHDS3_RX_FREQ;
|
||||
const char STR_AFHDS3_ACTUAL_POWER[] = TR_AFHDS3_ACTUAL_POWER;
|
||||
const char STR_AFHDS3_POWER_SOURCE[] = TR_AFHDS3_POWER_SOURCE;
|
||||
const char STR_AFHDS3_ONE_TO_ONE_TELEMETRY[] =TR_AFHDS3_ONE_TO_ONE_TELEMETRY;
|
||||
const char STR_AFHDS3_ONE_TO_MANY[] = TR_AFHDS3_ONE_TO_MANY;
|
||||
#endif
|
||||
|
||||
#if LCD_W < 212
|
||||
const char STR_SUBTYPE[] = TR_SUBTYPE;
|
||||
|
||||
Reference in New Issue
Block a user