Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 08:45:24 +03:00
Code Issues Wiki Activity

[Sky9x] Translations added

Browse source
This commit is contained in:
bsongis 2015-04-19 22:37:24 +02:00
parent 1964ac207c
commit 5c25d10622
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/gui/9X/menu_model_setup.cpp
View file

@ -332,7 +332,7 @@ void menuModelSetup(uint8_t event)
#if defined(CPUARM) #if defined(CPUARM)
case ITEM_MODEL_DISPLAY_TRIMS: case ITEM_MODEL_DISPLAY_TRIMS:
g_model.displayTrims = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, "Display Trims", "\006No\0 ChangeYes", g_model.displayTrims, 0, 2, attr, event); g_model.displayTrims = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_DISPLAY_TRIMS, STR_VDISPLAYTRIMS, g_model.displayTrims, 0, 2, attr, event);
break; break;
#endif #endif
@ -467,7 +467,7 @@ void menuModelSetup(uint8_t event)
#if defined(CPUARM) #if defined(CPUARM)
case ITEM_MODEL_USE_GLOBAL_FUNCTIONS: case ITEM_MODEL_USE_GLOBAL_FUNCTIONS:
lcd_putsLeft(y, "Use Global Funcs"); lcd_putsLeft(y, STR_USE_GLOBAL_FUNCS);
menu_lcd_onoff(MODEL_SETUP_2ND_COLUMN, y, !g_model.noGlobalFunctions, attr); menu_lcd_onoff(MODEL_SETUP_2ND_COLUMN, y, !g_model.noGlobalFunctions, attr);
if (attr) g_model.noGlobalFunctions = !checkIncDecModel(event, !g_model.noGlobalFunctions, 0, 1); if (attr) g_model.noGlobalFunctions = !checkIncDecModel(event, !g_model.noGlobalFunctions, 0, 1);
break; break;

18
radio/src/gui/9X/view_main.cpp
View file

@ -93,8 +93,8 @@ void displayTrims(uint8_t phase)
static coord_t x[4] = {TRIM_LH_X, TRIM_LV_X, TRIM_RV_X, TRIM_RH_X}; static coord_t x[4] = {TRIM_LH_X, TRIM_LV_X, TRIM_RV_X, TRIM_RH_X};
static uint8_t vert[4] = {0,1,1,0}; static uint8_t vert[4] = {0,1,1,0};
coord_t xm, ym; coord_t xm, ym;
xm = x[CONVERT_MODE(i)]; uint8_t stickIndex = CONVERT_MODE(i);
xm = x[stickIndex];
uint8_t att = ROUND; uint8_t att = ROUND;
int16_t val = getTrimValue(phase, i); int16_t val = getTrimValue(phase, i);
@ -134,6 +134,13 @@ void displayTrims(uint8_t phase)
if (exttrim) { if (exttrim) {
lcd_hline(xm-1, ym, 3); lcd_hline(xm-1, ym, 3);
} }
#endif
#if defined(CPUARM)
if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && dir != 0) {
if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
lcd_outdezAtt(dir>0 ? 22 : 54, xm-2, -abs(dir/5), TINSIZE|VERTICAL);
}
}
#endif #endif
} }
else { else {
@ -153,6 +160,13 @@ void displayTrims(uint8_t phase)
if (exttrim) { if (exttrim) {
lcd_vline(xm, ym-1, 3); lcd_vline(xm, ym-1, 3);
} }
#endif
#if defined(CPUARM)
if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && dir != 0) {
if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || (trimsDisplayTimer > 0 && (trimsDisplayMask & (1<<i)))) {
lcd_outdezAtt((stickIndex==0 ? TRIM_LH_X : TRIM_RH_X)+(dir>0 ? -11 : 20), ym-2, -abs(dir/5), TINSIZE);
}
}
#endif #endif
} }
lcd_square(xm-3, ym-3, 7, att); lcd_square(xm-3, ym-3, 7, att);

4
radio/src/translations/en.h.txt
View file

@ -591,11 +591,11 @@
#define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ELIMITS TR("E.Limits", "Extended Limits")
#define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_ETRIMS TR("E.Trims", "Extended Trims")
#define TR_TRIMINC "Trim Step" #define TR_TRIMINC "Trim Step"
#define TR_DISPLAY_TRIMS "Display Trims" #define TR_DISPLAY_TRIMS TR("Show Trims", "Display Trims")
#define TR_TTRACE TR("T-Source", INDENT "Source") #define TR_TTRACE TR("T-Source", INDENT "Source")
#define TR_TTRIM TR("T-Trim", INDENT "Trim Idle Only") #define TR_TTRIM TR("T-Trim", INDENT "Trim Idle Only")
#define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep")
#define TR_USE_GLOBAL_FUNCS "Use Global Funcs" #define TR_USE_GLOBAL_FUNCS TR("Glob.Funcs", "Use Global Funcs")
#define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol")
#if defined(CPUARM) #if defined(CPUARM)
#define TR_PPMFRAME INDENT "PPM frame" #define TR_PPMFRAME INDENT "PPM frame"