Merge branch '2.3' into 2.4
# Conflicts: # radio/src/fonts/480x272/font_dblsize.png # radio/src/fonts/480x272/font_xxlsize.png # radio/src/gui/128x64/model_setup.cpp # radio/src/gui/128x64/radio_setup.cpp # radio/src/gui/480x272/model_receiver_options.cpp # radio/src/gui/480x272/model_setup.cpp # radio/src/gui/480x272/radio_calibration.cpp # radio/src/gui/480x272/radio_hardware.cpp # radio/src/gui/common/stdlcd/draw_functions.cpp # radio/src/gui/gui_common.cpp # radio/src/keys.h # radio/src/lua/interface.cpp # radio/src/pulses/afhds3.h # radio/src/rtos.h # radio/src/switches.cpp # radio/src/targets/common/arm/stm32/aux_serial_driver.cpp # radio/src/targets/horus/CMakeLists.txt # radio/src/targets/horus/lcd_driver.cpp # radio/src/targets/horus/startup_stm32f42_43xxx.s # radio/src/targets/taranis/CMakeLists.txt # radio/src/telemetry/crossfire.h # radio/src/telemetry/multi.cpp # radio/src/translations.cpp # radio/src/translations/it.h.txt # radio/src/translations/untranslated.h # radio/util/font2png.py # tools/commit-tests.sh
This commit is contained in:
@@ -86,6 +86,7 @@ ISTR(SPORT_UPDATE_POWER_MODES);
|
||||
ISTR(CRSF_BAUDRATE);
|
||||
ISTR(PPM_POL);
|
||||
ISTR(SBUS_INVERSION_VALUES);
|
||||
ISTR(SPORT_MODES);
|
||||
|
||||
#if defined(PCBSKY9X) && defined(REVX)
|
||||
ISTR(VOUTPUT_TYPE);
|
||||
@@ -98,6 +99,8 @@ ISTR(VSWASHTYPE);
|
||||
#if defined(MULTIMODULE)
|
||||
ISTR(MULTI_PROTOCOLS);
|
||||
ISTR(MULTI_POWER);
|
||||
ISTR(MULTI_TELEMETRY_MODE);
|
||||
ISTR(MULTI_WBUS_MODE);
|
||||
#endif
|
||||
|
||||
#if defined(BLUETOOTH)
|
||||
@@ -832,6 +835,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_WBUS[] = TR_MULTI_WBUS;
|
||||
const char STR_MULTI_TELEMETRY[] = TR_MULTI_TELEMETRY;
|
||||
const char STR_MULTI_VIDFREQ[] = TR_MULTI_VIDFREQ;
|
||||
const char STR_MULTI_OPTION[] = TR_MULTI_OPTION;
|
||||
@@ -957,3 +961,4 @@ const char STR_ABOUT_PARENTS_3[] = TR_ABOUT_PARENTS_3;
|
||||
const char STR_ABOUT_PARENTS_4[] = TR_ABOUT_PARENTS_4;
|
||||
|
||||
const char STR_AUTH_FAILURE[] = TR_AUTH_FAILURE;
|
||||
const char STR_PROTOCOL[] = TR_PROTOCOL;
|
||||
|
||||
Reference in New Issue
Block a user