chore: improve translation string management (#6502)
This commit is contained in:
@@ -87,7 +87,7 @@ void menuModelCurveOne(event_t event)
|
||||
CurveHeader & crv = g_model.curves[s_currIdxSubMenu];
|
||||
int8_t * points = curveAddress(s_currIdxSubMenu);
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, STR_CV, s_currIdxSubMenu+1);
|
||||
drawStringWithIndex(strlen(STR_MENUCURVES)*FW+FW, 0, STR_CV, s_currIdxSubMenu+1);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
|
||||
@@ -59,7 +59,7 @@ void menuModelCustomScriptOne(event_t event)
|
||||
{
|
||||
ScriptData & sd = g_model.scriptsData[s_currIdx];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUCUSTOMSCRIPTS)*FW+FW, 0, "LUA", s_currIdx+1, 0);
|
||||
drawStringWithIndex(strlen(STR_MENUCUSTOMSCRIPTS)*FW+FW, 0, "LUA", s_currIdx+1, 0);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, 0);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
@@ -90,7 +90,7 @@ void menuModelCustomScriptOne(event_t event)
|
||||
}
|
||||
}
|
||||
else if (i == ITEM_MODEL_CUSTOMSCRIPT_NAME) {
|
||||
lcdDrawTextAlignedLeft(y, TR_NAME);
|
||||
lcdDrawTextAlignedLeft(y, STR_NAME);
|
||||
editName(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.name, sizeof(sd.name), event,
|
||||
(attr != 0), attr, old_editMode);
|
||||
} else if (i == ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL) {
|
||||
|
||||
@@ -151,7 +151,7 @@ void menuModelFlightModeOne(event_t event)
|
||||
|
||||
#if defined(GVARS)
|
||||
case ITEM_MODEL_FLIGHT_MODE_GVARS_LABEL:
|
||||
lcdDrawTextAlignedLeft(y, TR_MENU_GLOBAL_VARS);
|
||||
lcdDrawTextAlignedLeft(y, STR_MENU_GLOBAL_VARS);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
@@ -70,7 +70,7 @@ void menuModelGVarOne(event_t event)
|
||||
{
|
||||
GVarData * gvar = &g_model.gvars[s_currIdxSubMenu];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_GVARS)*FW+FW, 0, STR_GV, s_currIdxSubMenu+1, 0);
|
||||
drawStringWithIndex(strlen(STR_GVARS)*FW+FW, 0, STR_GV, s_currIdxSubMenu+1, 0);
|
||||
drawGVarValue(32*FW, 0, s_currIdxSubMenu, getGVarValue(s_currIdxSubMenu, getFlightMode()));
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID);
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ void menuModelExpoOne(event_t event)
|
||||
}
|
||||
|
||||
ExpoData * ed = expoAddress(s_currIdx);
|
||||
drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
|
||||
drawSource(strlen(STR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ void menuModelMixOne(event_t event)
|
||||
}
|
||||
|
||||
MixData * md2 = mixAddress(s_currIdx) ;
|
||||
putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);
|
||||
putsChn(strlen(STR_MIXES)*FW+FW, 0, md2->destCh+1,0);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ void menuModelLimitsOne(event_t event)
|
||||
break;
|
||||
|
||||
case ITEM_OUTPUTONE_OFFSET:
|
||||
ld->offset = gvValEdit(TR_LIMITS_HEADERS_SUBTRIM, ld->offset, 0, -1000, 1000, y, attr, event, active, 0);
|
||||
ld->offset = gvValEdit(STR_LIMITS_HEADERS_SUBTRIM, ld->offset, 0, -1000, 1000, y, attr, event, active, 0);
|
||||
break;
|
||||
|
||||
case ITEM_OUTPUTONE_MIN:
|
||||
@@ -164,7 +164,7 @@ void menuModelLimitsOne(event_t event)
|
||||
|
||||
#if defined(PPM_CENTER_ADJUSTABLE)
|
||||
case ITEM_OUTPUTONE_PPM_CENTER:
|
||||
lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_PPMCENTER);
|
||||
lcdDrawTextAlignedLeft(y, STR_LIMITS_HEADERS_PPMCENTER);
|
||||
lcdDrawNumber(LIMITS_ONE_2ND_COLUMN, y, PPM_CENTER+ld->ppmCenter, attr);
|
||||
if (active) {
|
||||
CHECK_INCDEC_MODELVAR(event, ld->ppmCenter, -PPM_CENTER_MAX, +PPM_CENTER_MAX);
|
||||
@@ -174,7 +174,7 @@ void menuModelLimitsOne(event_t event)
|
||||
|
||||
#if defined(PPM_LIMITS_SYMETRICAL)
|
||||
case ITEM_OUTPUTONE_SYMETRICAL:
|
||||
lcdDrawTextAlignedLeft(y, TR_LIMITS_HEADERS_SUBTRIMMODE);
|
||||
lcdDrawTextAlignedLeft(y, STR_LIMITS_HEADERS_SUBTRIMMODE);
|
||||
lcdDrawSizedText(LIMITS_ONE_2ND_COLUMN, y,
|
||||
ld->symetrical ? "=" : STR_CHAR_DELTA, 2, attr);
|
||||
if (active) {
|
||||
|
||||
@@ -1556,18 +1556,18 @@ void menuModelSetup(event_t event)
|
||||
MODULE_SUBTYPE_R9M_EU) {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
}
|
||||
#if POPUP_LEVEL >= 3
|
||||
else if (g_model.moduleData[moduleIdx].subType ==
|
||||
MODULE_SUBTYPE_R9M_EU) {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_EU_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
} else {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_FCC_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1754,7 +1754,7 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
if (bluetooth.distantAddr[0]) {
|
||||
lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CLEAR, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
bluetooth.state = BLUETOOTH_STATE_CLEAR_REQUESTED;
|
||||
memclear(bluetooth.distantAddr, sizeof(bluetooth.distantAddr));
|
||||
@@ -1765,7 +1765,7 @@ void menuModelSetup(event_t event)
|
||||
if (bluetooth.state < BLUETOOTH_STATE_IDLE)
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr);
|
||||
else
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_DISCOVER), attr);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISCOVER, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
if (bluetooth.state < BLUETOOTH_STATE_IDLE) {
|
||||
bluetooth.state = BLUETOOTH_STATE_OFF;
|
||||
@@ -1914,7 +1914,7 @@ void menuModelSetup(event_t event)
|
||||
#endif
|
||||
{
|
||||
lcdDrawTextIndented(y, STR_MODULE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0));
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_REGISTER, (menuHorizontalPosition == 0 ? attr : 0));
|
||||
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
|
||||
if (attr) {
|
||||
if (moduleState[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
|
||||
@@ -2186,7 +2186,7 @@ void menuModelSetup(event_t event)
|
||||
if (event && !s_editMode && reusableBuffer.moduleSetup.antennaMode != g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode) {
|
||||
if (reusableBuffer.moduleSetup.antennaMode == ANTENNA_MODE_EXTERNAL && !isExternalAntennaEnabled()) {
|
||||
POPUP_CONFIRMATION(STR_ANTENNACONFIRM1, onModelAntennaSwitchConfirm);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, sizeof(TR_ANTENNACONFIRM2), 0);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, strlen(STR_ANTENNACONFIRM2), 0);
|
||||
}
|
||||
else {
|
||||
g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode = reusableBuffer.moduleSetup.antennaMode;
|
||||
@@ -2518,7 +2518,7 @@ void menuModelSetup(event_t event)
|
||||
expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_RADIO_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_RADIO_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_RADIO_MENU_TABS);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_GF:
|
||||
g_model.radioGFDisabled = viewOptChoice(y, STR_MENUSPECIALFUNCS, g_model.radioGFDisabled, attr, event);
|
||||
@@ -2527,7 +2527,7 @@ void menuModelSetup(event_t event)
|
||||
g_model.radioTrainerDisabled = viewOptChoice(y, STR_MENUTRAINER, g_model.radioTrainerDisabled, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_MODEL_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_MODEL_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_MODEL_MENU_TABS);
|
||||
break;
|
||||
#if defined(HELI)
|
||||
case ITEM_VIEW_OPTIONS_HELI:
|
||||
@@ -2575,14 +2575,14 @@ void menuModelSetup(event_t event)
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON:
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_SETTINGS), attr);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_USBJOYSTICK_SETTINGS, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
pushMenu(menuModelUSBJoystick);
|
||||
}
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_USBJOYSTICK_APPLY_CHANGES, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
onUSBJoystickModelChanged();
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ void menuModelSensor(event_t event)
|
||||
0 // Logs
|
||||
});
|
||||
|
||||
lcdDrawNumber(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
|
||||
lcdDrawNumber(strlen(STR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT);
|
||||
|
||||
if (!isGPSSensor(s_currIdx+1))
|
||||
drawSensorCustomValue(SENSOR_2ND_COLUMN, 0, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx), LEFT);
|
||||
|
||||
@@ -795,7 +795,7 @@ void menuRadioSetup(event_t event)
|
||||
expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_RADIO_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_RADIO_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_RADIO_MENU_TABS);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_GF:
|
||||
g_eeGeneral.radioGFDisabled = viewOptCheckBox(y, STR_MENUSPECIALFUNCS, g_eeGeneral.radioGFDisabled, attr, event, g_model.radioGFDisabled);
|
||||
@@ -804,7 +804,7 @@ void menuRadioSetup(event_t event)
|
||||
g_eeGeneral.radioTrainerDisabled = viewOptCheckBox(y, STR_MENUTRAINER, g_eeGeneral.radioTrainerDisabled, attr, event, g_model.radioTrainerDisabled);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_MODEL_TAB:
|
||||
lcdDrawText(INDENT_WIDTH-2, y, TR_MODEL_MENU_TABS);
|
||||
lcdDrawText(INDENT_WIDTH-2, y, STR_MODEL_MENU_TABS);
|
||||
break;
|
||||
#if defined(HELI)
|
||||
case ITEM_VIEW_OPTIONS_HELI:
|
||||
|
||||
@@ -154,7 +154,7 @@ void menuStatisticsDebug(event_t event)
|
||||
y += FH;
|
||||
|
||||
#if defined(LUA)
|
||||
lcdDrawTextAlignedLeft(y, TR_LUA_SCRIPTS_LABEL);
|
||||
lcdDrawTextAlignedLeft(y, STR_LUA_SCRIPTS_LABEL);
|
||||
lcdDrawText(MENU_DEBUG_COL1_OFS, y+1, STR_DURATION_MS, SMLSIZE);
|
||||
lcdDrawNumber(lcdLastRightPos, y, 10*maxLuaDuration, LEFT);
|
||||
lcdDrawText(lcdLastRightPos+2, y+1, STR_INTERVAL_MS, SMLSIZE);
|
||||
|
||||
@@ -90,9 +90,12 @@ void menuModelCurveOne(event_t event)
|
||||
CurveHeader & crv = g_model.curves[s_currIdxSubMenu];
|
||||
int8_t * points = curveAddress(s_currIdxSubMenu);
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUCURVES)*FW+FW, 0, "CV", s_currIdxSubMenu+1);
|
||||
drawStringWithIndex(strlen(STR_MENUCURVES)*FW+FW, 0, "CV", s_currIdxSubMenu+1);
|
||||
|
||||
lcdDrawText(11*FW+FW/2, 0, TR_PT "\002X\006Y");
|
||||
char str[10];
|
||||
char* s = strAppend(str, STR_PT);
|
||||
strAppend(s, "\002X\006Y");
|
||||
lcdDrawText(11*FW+FW/2, 0, str);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
@@ -53,7 +53,7 @@ void menuModelCustomScriptOne(event_t event)
|
||||
{
|
||||
ScriptData & sd = g_model.scriptsData[s_currIdx];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUCUSTOMSCRIPTS)*FW+FW, 0, "LUA", s_currIdx+1, 0);
|
||||
drawStringWithIndex(strlen(STR_MENUCUSTOMSCRIPTS)*FW+FW, 0, "LUA", s_currIdx+1, 0);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
@@ -84,7 +84,7 @@ void menuModelCustomScriptOne(event_t event)
|
||||
}
|
||||
}
|
||||
else if (i == ITEM_MODEL_CUSTOMSCRIPT_NAME) {
|
||||
lcdDrawTextAlignedLeft(y, TR_NAME);
|
||||
lcdDrawTextAlignedLeft(y, STR_NAME);
|
||||
editName(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.name, sizeof(sd.name), event,
|
||||
(attr != 0), attr, old_editMode);
|
||||
} else if (i == ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL) {
|
||||
|
||||
@@ -72,7 +72,7 @@ void menuModelGVarOne(event_t event)
|
||||
{
|
||||
GVarData * gvar = &g_model.gvars[s_currIdx];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_GVARS)*FW+FW, 0, STR_GV, s_currIdx+1, 0);
|
||||
drawStringWithIndex(strlen(STR_GVARS)*FW+FW, 0, STR_GV, s_currIdx+1, 0);
|
||||
drawGVarValue(32*FW, 0, s_currIdx, getGVarValue(s_currIdx, getFlightMode()));
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ void menuModelExpoOne(event_t event)
|
||||
}
|
||||
|
||||
ExpoData * ed = expoAddress(s_currIdx);
|
||||
drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
|
||||
drawSource(strlen(STR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
@@ -98,7 +98,7 @@ void menuModelMixOne(event_t event)
|
||||
}
|
||||
|
||||
MixData * md2 = mixAddress(s_currIdx) ;
|
||||
putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);
|
||||
putsChn(strlen(STR_MIXES)*FW+FW, 0, md2->destCh+1,0);
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
|
||||
uint8_t old_editMode = s_editMode;
|
||||
|
||||
@@ -1199,18 +1199,18 @@ void menuModelSetup(event_t event)
|
||||
MODULE_SUBTYPE_R9M_EU) {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_FLEX_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(STR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
}
|
||||
#if POPUP_LEVEL >= 3
|
||||
else if (g_model.moduleData[EXTERNAL_MODULE].subType ==
|
||||
MODULE_SUBTYPE_R9M_EU) {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_EU_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(TR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
} else {
|
||||
POPUP_WARNING(STR_MODULE_PROTOCOL_FCC_WARN_LINE1);
|
||||
SET_WARNING_INFO(STR_MODULE_PROTOCOL_WARN_LINE2,
|
||||
sizeof(TR_MODULE_PROTOCOL_WARN_LINE2) - 1, 0);
|
||||
strlen(TR_MODULE_PROTOCOL_WARN_LINE2), 0);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@@ -1358,7 +1358,7 @@ void menuModelSetup(event_t event)
|
||||
}
|
||||
if (bluetooth.distantAddr[0]) {
|
||||
lcdDrawText(INDENT_WIDTH, y+1, bluetooth.distantAddr, TINSIZE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_CLEAR), attr);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_CLEAR, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
bluetooth.state = BLUETOOTH_STATE_CLEAR_REQUESTED;
|
||||
memclear(bluetooth.distantAddr, sizeof(bluetooth.distantAddr));
|
||||
@@ -1369,7 +1369,7 @@ void menuModelSetup(event_t event)
|
||||
if (bluetooth.state < BLUETOOTH_STATE_IDLE)
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_BUTTON_INIT, attr);
|
||||
else
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_DISCOVER), attr);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_DISCOVER, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
if (bluetooth.state < BLUETOOTH_STATE_IDLE) {
|
||||
bluetooth.state = BLUETOOTH_STATE_OFF;
|
||||
@@ -1900,7 +1900,7 @@ void menuModelSetup(event_t event)
|
||||
{
|
||||
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
|
||||
lcdDrawTextIndented(y, STR_MODULE);
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, BUTTON(TR_REGISTER), (menuHorizontalPosition == 0 ? attr : 0));
|
||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN, y, STR_REGISTER, (menuHorizontalPosition == 0 ? attr : 0));
|
||||
lcdDrawText(lcdLastRightPos + 3, y, STR_MODULE_RANGE, (menuHorizontalPosition == 1 ? attr : 0));
|
||||
if (attr) {
|
||||
if (moduleState[moduleIdx].mode == MODULE_MODE_NORMAL && s_editMode > 0) {
|
||||
@@ -1946,7 +1946,7 @@ void menuModelSetup(event_t event)
|
||||
expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_RADIO_TAB:
|
||||
lcdDrawTextIndented(y, TR_RADIO_MENU_TABS);
|
||||
lcdDrawTextIndented(y, STR_RADIO_MENU_TABS);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_GF:
|
||||
g_model.radioGFDisabled = viewOptChoice(y, STR_MENUSPECIALFUNCS, g_model.radioGFDisabled, attr, event, g_eeGeneral.radioGFDisabled);
|
||||
@@ -1955,7 +1955,7 @@ void menuModelSetup(event_t event)
|
||||
g_model.radioTrainerDisabled = viewOptChoice(y, STR_MENUTRAINER, g_model.radioTrainerDisabled, attr, event, g_eeGeneral.radioTrainerDisabled);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_MODEL_TAB:
|
||||
lcdDrawTextIndented(y, TR_MODEL_MENU_TABS);
|
||||
lcdDrawTextIndented(y, STR_MODEL_MENU_TABS);
|
||||
break;
|
||||
#if defined(HELI)
|
||||
case ITEM_VIEW_OPTIONS_HELI:
|
||||
@@ -2008,14 +2008,14 @@ void menuModelSetup(event_t event)
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_USBJOYSTICK_CH_BUTTON:
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_SETTINGS), attr);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_USBJOYSTICK_SETTINGS, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
pushMenu(menuModelUSBJoystick);
|
||||
}
|
||||
break;
|
||||
|
||||
case ITEM_MODEL_SETUP_USBJOYSTICK_APPLY:
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_USBJOYSTICK_APPLY_CHANGES), attr);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_USBJOYSTICK_APPLY_CHANGES, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
onUSBJoystickModelChanged();
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ void menuModelSensor(event_t event)
|
||||
{
|
||||
TelemetrySensor * sensor = &g_model.telemetrySensors[s_currIdx];
|
||||
|
||||
drawStringWithIndex(PSIZE(TR_MENUSENSOR)*FW+FW, 0, STR_SENSOR, s_currIdx+1);
|
||||
drawStringWithIndex(strlen(STR_MENUSENSOR)*FW+FW, 0, STR_SENSOR, s_currIdx+1);
|
||||
drawSensorCustomValue(25*FW, 0, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx));
|
||||
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
|
||||
|
||||
|
||||
@@ -741,7 +741,7 @@ void menuRadioSetup(event_t event)
|
||||
expandState.viewOpt = expandableSection(y, STR_ENABLED_FEATURES, expandState.viewOpt, attr, event);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_RADIO_TAB:
|
||||
lcdDrawTextIndented(y, TR_RADIO_MENU_TABS);
|
||||
lcdDrawTextIndented(y, STR_RADIO_MENU_TABS);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_GF:
|
||||
g_eeGeneral.radioGFDisabled = viewOptCheckBox(y, STR_MENUSPECIALFUNCS, g_eeGeneral.radioGFDisabled, attr, event, g_model.radioGFDisabled);
|
||||
@@ -750,7 +750,7 @@ void menuRadioSetup(event_t event)
|
||||
g_eeGeneral.radioTrainerDisabled = viewOptCheckBox(y, STR_MENUTRAINER, g_eeGeneral.radioTrainerDisabled, attr, event, g_model.radioTrainerDisabled);
|
||||
break;
|
||||
case ITEM_VIEW_OPTIONS_MODEL_TAB:
|
||||
lcdDrawTextIndented(y, TR_MODEL_MENU_TABS);
|
||||
lcdDrawTextIndented(y, STR_MODEL_MENU_TABS);
|
||||
break;
|
||||
#if defined(HELI)
|
||||
case ITEM_VIEW_OPTIONS_HELI:
|
||||
|
||||
@@ -239,8 +239,9 @@ ComboChannelBar::ComboChannelBar(Window* parent, const rect_t& rect,
|
||||
channel);
|
||||
|
||||
// Channel number
|
||||
char chanString[] = TR_CH "32 ";
|
||||
strAppendSigned(&chanString[2], channel + 1, 2);
|
||||
char chanString[10];
|
||||
char* s = strAppend(chanString, STR_CH);
|
||||
strAppendSigned(s, channel + 1);
|
||||
new StaticText(this, {PAD_TINY + invMask->width, 0, LV_SIZE_CONTENT, ChannelBar::VAL_H}, chanString,
|
||||
txtColIdx, FONT(XS) | LEFT);
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ void SwitchWarnDialog::checkEvents()
|
||||
}
|
||||
|
||||
ThrottleWarnDialog::ThrottleWarnDialog(const char* msg) :
|
||||
FullScreenDialog(WARNING_TYPE_ALERT, TR_THROTTLE_UPPERCASE, msg,
|
||||
FullScreenDialog(WARNING_TYPE_ALERT, STR_THROTTLE_UPPERCASE, msg,
|
||||
STR_PRESS_ANY_KEY_TO_SKIP)
|
||||
{
|
||||
setCloseCondition(std::bind(&ThrottleWarnDialog::warningInactive, this));
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
#include "edgetx.h"
|
||||
#include "strhelpers.h"
|
||||
#include "telemetry/telemetry_sensors.h"
|
||||
#include "translations.h"
|
||||
|
||||
#include <cmath>
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "file_carosell.h"
|
||||
|
||||
#include "translations.h"
|
||||
#include "translations/translations.h"
|
||||
|
||||
extern inline tmr10ms_t getTicks()
|
||||
{
|
||||
|
||||
@@ -101,7 +101,7 @@ void FullScreenDialog::build()
|
||||
} else {
|
||||
if (type == WARNING_TYPE_CONFIRM) {
|
||||
auto btn = new TextButton(
|
||||
this, {LCD_W / 3 - TWOBTN_W / 2, LCD_H - TWOBTN_H - PAD_LARGE, TWOBTN_W, TWOBTN_H}, STR_EXIT,
|
||||
this, {LCD_W / 3 - TWOBTN_W / 2, LCD_H - TWOBTN_H - PAD_LARGE, TWOBTN_W, TWOBTN_H}, STR_CANCEL,
|
||||
[=]() {
|
||||
deleteLater();
|
||||
return 0;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include "menu.h"
|
||||
#include "etx_lv_theme.h"
|
||||
#include "translations.h"
|
||||
#include "translations/translations.h"
|
||||
|
||||
static const lv_obj_class_t menu_button_class = {
|
||||
.base_class = &button_class,
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <list>
|
||||
|
||||
#include "audio.h"
|
||||
#include "translations.h"
|
||||
#include "translations/translations.h"
|
||||
|
||||
#include "widgets_container_impl.h"
|
||||
#include "view_main_decoration.h"
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
#include "page.h"
|
||||
#include "sourcechoice.h"
|
||||
#include "etx_lv_theme.h"
|
||||
#include "translations.h"
|
||||
|
||||
#define SET_DIRTY() storageDirty(EE_MODEL)
|
||||
|
||||
|
||||
@@ -182,8 +182,10 @@ class MixGroup : public InputMixGroupBase
|
||||
g_model.limitData[idx - MIXSRC_FIRST_CH].name[0] != '\0') {
|
||||
chText = lv_label_create(lvobj);
|
||||
etx_font(chText, FONT_XS_INDEX);
|
||||
lv_label_set_text_fmt(chText, TR_CH "%" PRIu32,
|
||||
UINT32_C(idx - MIXSRC_FIRST_CH + 1));
|
||||
char chanStr[10];
|
||||
char* s = strAppend(chanStr, STR_CH);
|
||||
strAppendUnsigned(s, idx - MIXSRC_FIRST_CH + 1);
|
||||
lv_label_set_text(chText, chanStr);
|
||||
lv_obj_set_pos(chText, PAD_TINY, CHNUM_Y-1);
|
||||
}
|
||||
|
||||
|
||||
@@ -117,9 +117,12 @@ class OutputLineButton : public ListLineButton
|
||||
#if !NARROW_LAYOUT
|
||||
lv_obj_add_state(source, ETX_STATE_NAME_FONT_SMALL);
|
||||
#endif
|
||||
lv_label_set_text_fmt(source, "%s\n" TR_CH "%u",
|
||||
getSourceString(MIXSRC_FIRST_CH + index),
|
||||
index + 1);
|
||||
char chanStr[LEN_CHANNEL_NAME + 16];
|
||||
char* s = strAppend(chanStr, getSourceString(MIXSRC_FIRST_CH + index));
|
||||
s = strAppend(s, "\n");
|
||||
s = strAppend(s, STR_CH);
|
||||
strAppendUnsigned(s, index + 1);
|
||||
lv_label_set_text(source, chanStr);
|
||||
} else {
|
||||
#if !NARROW_LAYOUT
|
||||
lv_obj_clear_state(source, ETX_STATE_NAME_FONT_SMALL);
|
||||
|
||||
@@ -357,9 +357,9 @@ void ModelSetupPage::build(Window * window)
|
||||
{STR_EXTERNALRF, []() { new ModulePage(EXTERNAL_MODULE); }, []() { return g_model.moduleData[EXTERNAL_MODULE].type > 0; }},
|
||||
{STR_TRAINER, []() { new TrainerPage(); }, []() { return g_model.trainerData.mode > 0; }},
|
||||
// Timer buttons
|
||||
{TR_TIMER "1", []() { new TimerWindow(0); }, []() { return g_model.timers[0].mode > 0; }},
|
||||
{TR_TIMER "2", []() { new TimerWindow(1); }, []() { return g_model.timers[1].mode > 0; }},
|
||||
{TR_TIMER "3", []() { new TimerWindow(2); }, []() { return g_model.timers[2].mode > 0; }},
|
||||
{STR_TIMER_1, []() { new TimerWindow(0); }, []() { return g_model.timers[0].mode > 0; }},
|
||||
{STR_TIMER_2, []() { new TimerWindow(1); }, []() { return g_model.timers[1].mode > 0; }},
|
||||
{STR_TIMER_3, []() { new TimerWindow(2); }, []() { return g_model.timers[2].mode > 0; }},
|
||||
|
||||
{STR_PREFLIGHT, []() { new PreflightChecks(); }},
|
||||
{STR_TRIMS, []() { new TrimsSetup(); }},
|
||||
|
||||
@@ -127,7 +127,7 @@ void OutputEditWindow::buildBody(Window *form)
|
||||
new ModelTextEdit(line, rect_t{}, output->name, sizeof(output->name));
|
||||
|
||||
// Offset
|
||||
new StaticText(line, rect_t{}, TR_LIMITS_HEADERS_SUBTRIM);
|
||||
new StaticText(line, rect_t{}, STR_LIMITS_HEADERS_SUBTRIM);
|
||||
auto off = new GVarNumberEdit(line, -LIMIT_STD_MAX, +LIMIT_STD_MAX,
|
||||
GET_SET_DEFAULT(output->offset), PREC1);
|
||||
off->setFastStep(20);
|
||||
@@ -140,7 +140,7 @@ void OutputEditWindow::buildBody(Window *form)
|
||||
|
||||
// Min
|
||||
line = form->newLine(grid);
|
||||
minText = new StaticText(line, rect_t{}, TR_MIN);
|
||||
minText = new StaticText(line, rect_t{}, STR_MIN);
|
||||
etx_solid_bg(minText->getLvObj(), COLOR_THEME_ACTIVE_INDEX, ETX_STATE_MINMAX_HIGHLIGHT);
|
||||
etx_font(minText->getLvObj(), FONT_BOLD_INDEX, ETX_STATE_MINMAX_HIGHLIGHT);
|
||||
minEdit = new GVarNumberEdit(line, -limit, 0,
|
||||
@@ -156,7 +156,7 @@ void OutputEditWindow::buildBody(Window *form)
|
||||
});
|
||||
|
||||
// Max
|
||||
maxText = new StaticText(line, rect_t{}, TR_MAX);
|
||||
maxText = new StaticText(line, rect_t{}, STR_MAX);
|
||||
etx_solid_bg(maxText->getLvObj(), COLOR_THEME_ACTIVE_INDEX, ETX_STATE_MINMAX_HIGHLIGHT);
|
||||
etx_font(maxText->getLvObj(), FONT_BOLD_INDEX, ETX_STATE_MINMAX_HIGHLIGHT);
|
||||
maxEdit = new GVarNumberEdit(line, 0, +limit,
|
||||
@@ -181,12 +181,12 @@ void OutputEditWindow::buildBody(Window *form)
|
||||
});
|
||||
|
||||
// Curve
|
||||
new StaticText(line, rect_t{}, TR_CURVE);
|
||||
new StaticText(line, rect_t{}, STR_CURVE);
|
||||
new CurveChoice(line, GET_SET_DEFAULT(output->curve), nullptr, channel + MIXSRC_FIRST_CH);
|
||||
|
||||
// PPM center
|
||||
line = form->newLine(grid);
|
||||
auto label = new StaticText(line, rect_t{}, TR_LIMITS_HEADERS_PPMCENTER);
|
||||
auto label = new StaticText(line, rect_t{}, STR_LIMITS_HEADERS_PPMCENTER);
|
||||
lv_label_set_long_mode(label->getLvObj(), LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_style_grid_cell_x_align(label->getLvObj(), LV_GRID_ALIGN_STRETCH,
|
||||
0);
|
||||
@@ -200,7 +200,7 @@ void OutputEditWindow::buildBody(Window *form)
|
||||
center->setDefault(PPM_CENTER);
|
||||
|
||||
// Subtrims mode
|
||||
label = new StaticText(line, rect_t{}, TR_LIMITS_HEADERS_SUBTRIMMODE);
|
||||
label = new StaticText(line, rect_t{}, STR_LIMITS_HEADERS_SUBTRIMMODE);
|
||||
lv_label_set_long_mode(label->getLvObj(), LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_style_grid_cell_x_align(label->getLvObj(), LV_GRID_ALIGN_STRETCH,
|
||||
0);
|
||||
|
||||
@@ -388,8 +388,9 @@ class ModuleWindow : public Window
|
||||
if (isModuleRFAccess(moduleIdx)) {
|
||||
for (uint8_t receiverIdx = 0; receiverIdx < PXX2_MAX_RECEIVERS_PER_MODULE;
|
||||
receiverIdx++) {
|
||||
char label[] = TR_RECEIVER " X";
|
||||
label[sizeof(label) - 2] = '1' + receiverIdx;
|
||||
char label[40];
|
||||
char* s = strAppend(label, STR_RECEIVER);
|
||||
strAppendUnsigned(s, receiverIdx + 1);
|
||||
|
||||
auto line = newLine(grid);
|
||||
new StaticText(line, rect_t{}, label);
|
||||
|
||||
@@ -134,7 +134,7 @@ class FrskyOtaFlashDialog : public BaseDialog
|
||||
if (reusableBuffer.sdManager.otaUpdateInformation.step == BIND_INFO_REQUEST) {
|
||||
uint8_t modelId = reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.modelID;
|
||||
if (isPXX2ReceiverOptionAvailable(modelId, RECEIVER_OPTION_OTA_TO_UPDATE_SELF)) {
|
||||
char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, TR_CURRENT_VERSION);
|
||||
char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, STR_CURRENT_VERSION);
|
||||
tmp = strAppendUnsigned(tmp, 1 + reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.major);
|
||||
*tmp++ = '.';
|
||||
tmp = strAppendUnsigned(tmp, reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.minor);
|
||||
|
||||
@@ -27,16 +27,16 @@
|
||||
PageDef screensMenuItems[] = {
|
||||
{ ICON_RADIO_EDIT_THEME, STR_QM_THEMES, STR_MAIN_MENU_THEMES, PAGE_CREATE, QuickMenu::UI_THEMES, [](PageDef& pageDef) { return new ThemeSetupPage(pageDef); }, radioThemesEnabled},
|
||||
{ ICON_THEME_SETUP, STR_QM_TOP_BAR, STR_USER_INTERFACE, PAGE_CREATE, QuickMenu::UI_SETUP, [](PageDef& pageDef) { return new ScreenUserInterfacePage(pageDef); }},
|
||||
{ ICON_THEME_VIEW1, STR_QM_SCREEN_1, TR_MAIN_VIEW_X "1", PAGE_CREATE, QuickMenu::UI_SCREEN1, [](PageDef& pageDef) { return new ScreenSetupPage(0, pageDef); }},
|
||||
{ ICON_THEME_VIEW2, STR_QM_SCREEN_2, TR_MAIN_VIEW_X "2", PAGE_CREATE, QuickMenu::UI_SCREEN2, [](PageDef& pageDef) { return new ScreenSetupPage(1, pageDef); }, []() { return customScreens[1] != nullptr; }},
|
||||
{ ICON_THEME_VIEW3, STR_QM_SCREEN_3, TR_MAIN_VIEW_X "3", PAGE_CREATE, QuickMenu::UI_SCREEN3, [](PageDef& pageDef) { return new ScreenSetupPage(2, pageDef); }, []() { return customScreens[2] != nullptr; }},
|
||||
{ ICON_THEME_VIEW4, STR_QM_SCREEN_4, TR_MAIN_VIEW_X "4", PAGE_CREATE, QuickMenu::UI_SCREEN4, [](PageDef& pageDef) { return new ScreenSetupPage(3, pageDef); }, []() { return customScreens[3] != nullptr; }},
|
||||
{ ICON_THEME_VIEW5, STR_QM_SCREEN_5, TR_MAIN_VIEW_X "5", PAGE_CREATE, QuickMenu::UI_SCREEN5, [](PageDef& pageDef) { return new ScreenSetupPage(4, pageDef); }, []() { return customScreens[4] != nullptr; }},
|
||||
{ ICON_THEME_VIEW6, STR_QM_SCREEN_6, TR_MAIN_VIEW_X "6", PAGE_CREATE, QuickMenu::UI_SCREEN6, [](PageDef& pageDef) { return new ScreenSetupPage(5, pageDef); }, []() { return customScreens[5] != nullptr; }},
|
||||
{ ICON_THEME_VIEW7, STR_QM_SCREEN_7, TR_MAIN_VIEW_X "7", PAGE_CREATE, QuickMenu::UI_SCREEN7, [](PageDef& pageDef) { return new ScreenSetupPage(6, pageDef); }, []() { return customScreens[6] != nullptr; }},
|
||||
{ ICON_THEME_VIEW8, STR_QM_SCREEN_8, TR_MAIN_VIEW_X "8", PAGE_CREATE, QuickMenu::UI_SCREEN8, [](PageDef& pageDef) { return new ScreenSetupPage(7, pageDef); }, []() { return customScreens[7] != nullptr; }},
|
||||
{ ICON_THEME_VIEW9, STR_QM_SCREEN_9, TR_MAIN_VIEW_X "9", PAGE_CREATE, QuickMenu::UI_SCREEN9, [](PageDef& pageDef) { return new ScreenSetupPage(8, pageDef); }, []() { return customScreens[8] != nullptr; }},
|
||||
{ ICON_THEME_VIEW10, STR_QM_SCREEN_10, TR_MAIN_VIEW_X "10", PAGE_CREATE, QuickMenu::UI_SCREEN10, [](PageDef& pageDef) { return new ScreenSetupPage(9, pageDef); }, []() { return customScreens[9] != nullptr; }},
|
||||
{ ICON_THEME_VIEW1, STR_QM_SCREEN_1, STR_MAIN_VIEW_1, PAGE_CREATE, QuickMenu::UI_SCREEN1, [](PageDef& pageDef) { return new ScreenSetupPage(0, pageDef); }},
|
||||
{ ICON_THEME_VIEW2, STR_QM_SCREEN_2, STR_MAIN_VIEW_2, PAGE_CREATE, QuickMenu::UI_SCREEN2, [](PageDef& pageDef) { return new ScreenSetupPage(1, pageDef); }, []() { return customScreens[1] != nullptr; }},
|
||||
{ ICON_THEME_VIEW3, STR_QM_SCREEN_3, STR_MAIN_VIEW_3, PAGE_CREATE, QuickMenu::UI_SCREEN3, [](PageDef& pageDef) { return new ScreenSetupPage(2, pageDef); }, []() { return customScreens[2] != nullptr; }},
|
||||
{ ICON_THEME_VIEW4, STR_QM_SCREEN_4, STR_MAIN_VIEW_4, PAGE_CREATE, QuickMenu::UI_SCREEN4, [](PageDef& pageDef) { return new ScreenSetupPage(3, pageDef); }, []() { return customScreens[3] != nullptr; }},
|
||||
{ ICON_THEME_VIEW5, STR_QM_SCREEN_5, STR_MAIN_VIEW_5, PAGE_CREATE, QuickMenu::UI_SCREEN5, [](PageDef& pageDef) { return new ScreenSetupPage(4, pageDef); }, []() { return customScreens[4] != nullptr; }},
|
||||
{ ICON_THEME_VIEW6, STR_QM_SCREEN_6, STR_MAIN_VIEW_6, PAGE_CREATE, QuickMenu::UI_SCREEN6, [](PageDef& pageDef) { return new ScreenSetupPage(5, pageDef); }, []() { return customScreens[5] != nullptr; }},
|
||||
{ ICON_THEME_VIEW7, STR_QM_SCREEN_7, STR_MAIN_VIEW_7, PAGE_CREATE, QuickMenu::UI_SCREEN7, [](PageDef& pageDef) { return new ScreenSetupPage(6, pageDef); }, []() { return customScreens[6] != nullptr; }},
|
||||
{ ICON_THEME_VIEW8, STR_QM_SCREEN_8, STR_MAIN_VIEW_8, PAGE_CREATE, QuickMenu::UI_SCREEN8, [](PageDef& pageDef) { return new ScreenSetupPage(7, pageDef); }, []() { return customScreens[7] != nullptr; }},
|
||||
{ ICON_THEME_VIEW9, STR_QM_SCREEN_9, STR_MAIN_VIEW_9, PAGE_CREATE, QuickMenu::UI_SCREEN9, [](PageDef& pageDef) { return new ScreenSetupPage(8, pageDef); }, []() { return customScreens[8] != nullptr; }},
|
||||
{ ICON_THEME_VIEW10, STR_QM_SCREEN_10, STR_MAIN_VIEW_10, PAGE_CREATE, QuickMenu::UI_SCREEN10, [](PageDef& pageDef) { return new ScreenSetupPage(9, pageDef); }, []() { return customScreens[9] != nullptr; }},
|
||||
{ ICON_THEME_ADD_VIEW, STR_QM_ADD_SCREEN, nullptr, PAGE_ACTION, QuickMenu::UI_ADD_PG, nullptr, []() { return customScreens[9] == nullptr; },
|
||||
[](QuickSubMenu* subMenu) {
|
||||
int newIdx = 1;
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
#include "standalone_lua.h"
|
||||
|
||||
#include "translations.h"
|
||||
#include "view_main.h"
|
||||
#include "dma2d.h"
|
||||
#include "lua/lua_event.h"
|
||||
|
||||
@@ -24,8 +24,6 @@
|
||||
#include "board.h"
|
||||
#include "lcd.h"
|
||||
|
||||
#include "translations.h"
|
||||
|
||||
#include "fw_version.h"
|
||||
#include "translations/bl_translations.h"
|
||||
#include "bootloader/boot.h"
|
||||
|
||||
@@ -364,8 +364,8 @@ void menuModelExposAll(event_t event)
|
||||
s_copyTgtOfs = next_ofs;
|
||||
}
|
||||
|
||||
lcdDrawNumber(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, getExposCount(), RIGHT);
|
||||
lcdDrawText(FW*sizeof(TR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
|
||||
lcdDrawNumber(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, getExposCount(), RIGHT);
|
||||
lcdDrawText(FW*strlen(STR_MENUINPUTS)+FW+FW/2, 0, STR_MAX(MAX_EXPOS));
|
||||
|
||||
#if LCD_DEPTH > 1
|
||||
// Value
|
||||
|
||||
@@ -141,8 +141,8 @@ void displayMixInfos(coord_t y, MixData * md)
|
||||
void displayMixLine(coord_t y, MixData * md, bool active)
|
||||
{
|
||||
if(active && md->name[0]) {
|
||||
lcdDrawFilledRect(FW*sizeof(TR_MIXES)+FW/2, 0, FW*4+1, MENU_HEADER_HEIGHT, 0xFF, ERASE);
|
||||
lcdDrawSizedText(FW*sizeof(TR_MIXES)+FW/2, 0, md->name, sizeof(md->name), 0);
|
||||
lcdDrawFilledRect(FW*strlen(STR_MIXES)+FW/2, 0, FW*4+1, MENU_HEADER_HEIGHT, 0xFF, ERASE);
|
||||
lcdDrawSizedText(FW*strlen(STR_MIXES)+FW/2, 0, md->name, sizeof(md->name), 0);
|
||||
if (!md->flightModes || ((md->curve.value || md->swtch) && ((get_tmr10ms() / 200) & 1)))
|
||||
displayMixInfos(y, md);
|
||||
else
|
||||
@@ -279,7 +279,7 @@ void menuModelMixAll(event_t event)
|
||||
s_copyTgtOfs = next_ofs;
|
||||
}
|
||||
|
||||
lcdDrawNumber(FW*sizeof(TR_MIXES)+FW/2, 0, getMixCount(), 0);
|
||||
lcdDrawNumber(FW*strlen(STR_MIXES)+FW/2, 0, getMixCount(), 0);
|
||||
lcdDrawText(lcdNextPos, 0, STR_MAX(MAX_MIXERS));
|
||||
|
||||
// Value
|
||||
|
||||
@@ -215,7 +215,7 @@ void runPopupRegister(event_t event)
|
||||
// RX name
|
||||
if (reusableBuffer.moduleSetup.pxx2.registerStep < REGISTER_RX_NAME_RECEIVED) {
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, STR_WAITING);
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT, menuVerticalPosition == ITEM_REGISTER_BUTTONS ? INVERS : 0);
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, STR_EXIT, menuVerticalPosition == ITEM_REGISTER_BUTTONS ? INVERS : 0);
|
||||
}
|
||||
else {
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 4 + 2 * FH, STR_RX_NAME);
|
||||
@@ -225,13 +225,13 @@ void runPopupRegister(event_t event)
|
||||
event, menuVerticalPosition == ITEM_REGISTER_RECEIVER_NAME, 0,
|
||||
backupEditMode);
|
||||
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, TR_ENTER,
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y - 2 + 3 * FH, STR_ENTER,
|
||||
menuVerticalPosition == ITEM_REGISTER_BUTTONS &&
|
||||
menuHorizontalPosition == 0
|
||||
? INVERS
|
||||
: 0);
|
||||
|
||||
lcdDrawText(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 2 + 3 * FH, TR_EXIT,
|
||||
lcdDrawText(WARNING_LINE_X + 8 * FW, WARNING_LINE_Y - 2 + 3 * FH, STR_EXIT,
|
||||
menuVerticalPosition == ITEM_REGISTER_BUTTONS &&
|
||||
menuHorizontalPosition == 1
|
||||
? INVERS
|
||||
|
||||
@@ -87,7 +87,7 @@ void menuModelUSBJoystickOne(event_t event)
|
||||
break;
|
||||
|
||||
case USBJ_FIELD_INVERSION:
|
||||
lcdDrawTextAlignedLeft(y, TR_USBJOYSTICK_CH_INVERSION);
|
||||
lcdDrawTextAlignedLeft(y, STR_USBJOYSTICK_CH_INVERSION);
|
||||
drawCheckBox(USBJ_ONE_2ND_COLUMN, y, cch->inversion, attr);
|
||||
if (attr) cch->inversion = checkIncDecModel(event, cch->inversion, 0, 1);
|
||||
break;
|
||||
@@ -123,7 +123,7 @@ void menuModelUSBJoystickOne(event_t event)
|
||||
break;
|
||||
|
||||
case USBJ_FIELD_BTNNUM:
|
||||
lcdDrawTextAlignedLeft(y, TR_USBJOYSTICK_CH_BTNNUM);
|
||||
lcdDrawTextAlignedLeft(y, STR_USBJOYSTICK_CH_BTNNUM);
|
||||
uint8_t last = cch->lastBtnNumNoCLip();
|
||||
uint8_t limited = 0;
|
||||
if(last >= USBJ_BUTTON_SIZE) {
|
||||
|
||||
@@ -174,7 +174,7 @@ void runPopupWarning(event_t event)
|
||||
break;
|
||||
|
||||
case WARNING_TYPE_ASTERISK:
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+4*FH+2, BUTTON(TR_EXIT));
|
||||
lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+4*FH+2, STR_EXIT_BTN);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
@@ -410,7 +410,7 @@ void menuRadioHardware(event_t event)
|
||||
switch(k) {
|
||||
case ITEM_RADIO_HARDWARE_LABEL_STICKS:
|
||||
lcdDrawTextAlignedLeft(y, STR_STICKS);
|
||||
lcdDrawText(HW_SETTINGS_COLUMN2, y, BUTTON(TR_CALIBRATION), attr);
|
||||
lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_CALIBRATION, attr);
|
||||
if (attr && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
pushMenu(menuRadioCalibration);
|
||||
}
|
||||
@@ -548,7 +548,7 @@ void menuRadioHardware(event_t event)
|
||||
if (!s_editMode && reusableBuffer.radioHardware.antennaMode != g_eeGeneral.antennaMode) {
|
||||
if (!isExternalAntennaEnabled() && (reusableBuffer.radioHardware.antennaMode == ANTENNA_MODE_EXTERNAL || (reusableBuffer.radioHardware.antennaMode == ANTENNA_MODE_PER_MODEL && g_model.moduleData[INTERNAL_MODULE].pxx.antennaMode == ANTENNA_MODE_EXTERNAL))) {
|
||||
POPUP_CONFIRMATION(STR_ANTENNACONFIRM1, onHardwareAntennaSwitchConfirm);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, sizeof(TR_ANTENNACONFIRM2), 0);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, strlen(STR_ANTENNACONFIRM2), 0);
|
||||
}
|
||||
else {
|
||||
g_eeGeneral.antennaMode = reusableBuffer.radioHardware.antennaMode;
|
||||
|
||||
@@ -90,7 +90,7 @@ void onUpdateStateChanged()
|
||||
uint8_t modelId = reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.modelID;
|
||||
if (isPXX2ReceiverOptionAvailable(modelId, RECEIVER_OPTION_OTA_TO_UPDATE_SELF)) {
|
||||
POPUP_CONFIRMATION(getPXX2ReceiverName(modelId), onUpdateConfirmation);
|
||||
char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, TR_CURRENT_VERSION);
|
||||
char *tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, STR_CURRENT_VERSION);
|
||||
tmp = strAppendUnsigned(tmp, 1 + reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.major);
|
||||
*tmp++ = '.';
|
||||
tmp = strAppendUnsigned(tmp, reusableBuffer.sdManager.otaUpdateInformation.receiverInformation.swVersion.minor);
|
||||
@@ -100,7 +100,7 @@ void onUpdateStateChanged()
|
||||
}
|
||||
else {
|
||||
POPUP_WARNING(STR_OTA_UPDATE_ERROR);
|
||||
SET_WARNING_INFO(STR_UNSUPPORTED_RX, sizeof(TR_UNSUPPORTED_RX) - 1, 0);
|
||||
SET_WARNING_INFO(STR_UNSUPPORTED_RX, strlen(STR_UNSUPPORTED_RX) - 1, 0);
|
||||
moduleState[reusableBuffer.sdManager.otaUpdateInformation.module].mode = MODULE_MODE_NORMAL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ void menuRadioTrainer(event_t event)
|
||||
attr = (menuVerticalPosition==HEADER_LINE+4) ? blink : 0;
|
||||
if (g_model.trainerData.mode == TRAINER_MODE_MASTER_TRAINER_JACK) {
|
||||
lcdDrawTextAlignedLeft(y, STR_MULTIPLIER);
|
||||
lcdDrawNumber(LEN_MULTIPLIER * FW + 3 * FW, y, g_eeGeneral.PPM_Multiplier + 10, attr | PREC1 | RIGHT);
|
||||
lcdDrawNumber(strlen(STR_MULTIPLIER) * FW + 3 * FW, y, g_eeGeneral.PPM_Multiplier + 10, attr | PREC1 | RIGHT);
|
||||
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.PPM_Multiplier, -10, 40);
|
||||
}
|
||||
y += FH;
|
||||
|
||||
@@ -271,7 +271,7 @@ void menuRadioVersion(event_t event)
|
||||
y += 5 * (FH - 1) + 2;
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_FIRMWARE_OPTIONS), menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS ? INVERS : 0);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_FIRMWARE_OPTIONS, menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS ? INVERS : 0);
|
||||
y += FH;
|
||||
if (menuVerticalPosition == ITEM_RADIO_FIRMWARE_OPTIONS && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
s_editMode = EDIT_SELECT_FIELD;
|
||||
@@ -280,7 +280,7 @@ void menuRadioVersion(event_t event)
|
||||
#endif
|
||||
|
||||
#if defined(PXX2) || defined(CROSSFIRE)
|
||||
lcdDrawText(INDENT_WIDTH, y, BUTTON(TR_MODULES_RX_VERSION), menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
|
||||
lcdDrawText(INDENT_WIDTH, y, STR_MODULES_RX_VERSION, menuVerticalPosition == ITEM_RADIO_MODULES_VERSION ? INVERS : 0);
|
||||
y += FH;
|
||||
if (menuVerticalPosition == ITEM_RADIO_MODULES_VERSION && event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||
s_editMode = EDIT_SELECT_FIELD;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <stdint.h>
|
||||
#include "fonts.h"
|
||||
#include "definitions.h"
|
||||
#include "translations/untranslated.h"
|
||||
#include "translations/translations.h"
|
||||
|
||||
#if defined(TRANSLATIONS_FR)
|
||||
static uint16_t _utf8_lut[] = {
|
||||
|
||||
@@ -809,7 +809,7 @@ void checkExternalAntenna()
|
||||
}
|
||||
#else
|
||||
POPUP_CONFIRMATION(STR_ANTENNACONFIRM1, onAntennaSwitchConfirm);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, sizeof(TR_ANTENNACONFIRM2), 0);
|
||||
SET_WARNING_INFO(STR_ANTENNACONFIRM2, strlen(STR_ANTENNACONFIRM2), 0);
|
||||
#endif
|
||||
}
|
||||
} else if (g_eeGeneral.antennaMode == ANTENNA_MODE_ASK ||
|
||||
|
||||
Reference in New Issue
Block a user