piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #2129 - Only EN and FR done, I will leave the others to the

Browse Source 
translators
This commit is contained in:
bsongis
2015-03-09 21:41:47 +01:00
parent e7071e26ea
commit 5c9809555b
10 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/Taranis/lcd.cpp
+9 -2
View File
@@ -299,8 +299,7 @@ void lcd_putsLeft(coord_t y, const pm_char * s)
#if !defined(BOOT)
void lcd_putsiAtt(coord_t x, coord_t y, const pm_char * s,uint8_t idx, LcdFlags flags)
{
uint8_t length;
length = pgm_read_byte(s++);
uint8_t length = pgm_read_byte(s++);
lcd_putsnAtt(x, y, s+length*idx, length, flags & ~(BSS|ZCHAR));
}
@@ -625,6 +624,14 @@ void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags
lcd_outdezNAtt(lcdNextPos, y, idx, att|LEFT, 2);
}
#if defined(PCBTARANIS)
void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
{
uint8_t length = STR_VSRCRAW[0];
lcd_putsnAtt(x, y, STR_VSRCRAW+2+length*(idx+1), length-1, att);
}
#endif
void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att)
{
if (idx == 0) {
radio/src/gui/Taranis/lcd.h
+1
View File
@@ -168,6 +168,7 @@ void lcd_outdez8(coord_t x, coord_t y, int8_t val);
void putsStrIdx(coord_t x, coord_t y, const pm_char *str, uint8_t idx, LcdFlags att=0);
void putsModelName(coord_t x, coord_t y, char *name, uint8_t id, LcdFlags att);
void putsSwitches(coord_t x, coord_t y, int8_t swtch, LcdFlags att=0);
void putsStickName(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
void putsMixerSource(coord_t x, coord_t y, uint8_t idx, LcdFlags att=0);
void putsFlightMode(coord_t x, coord_t y, int8_t idx, LcdFlags att=0);
#if !defined(BOOT)
radio/src/gui/Taranis/menu_general_setup.cpp
+1 -1
View File
@@ -500,7 +500,7 @@ void menuGeneralSetup(uint8_t event)
case ITEM_SETUP_STICK_MODE:
lcd_putcAtt(2*FW, y, '1'+g_eeGeneral.stickMode, attr);
for (uint8_t i=0; i<4; i++) {
putsMixerSource((6+4*i)*FW, y, MIXSRC_Rud + pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i), 0);
putsStickName((6+4*i)*FW, y, pgm_read_byte(modn12x3 + 4*g_eeGeneral.stickMode + i), 0);
}
if (attr && s_editMode>0) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3);
radio/src/gui/Taranis/menu_general_trainer.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void menuGeneralTrainer(uint8_t event)
uint8_t chan = channel_order(i);
volatile TrainerMix *td = &g_eeGeneral.trainer.mix[chan-1];
putsMixerSource(0, y, MIXSRC_Rud-1+chan, (sub==i && CURSOR_ON_LINE()) ? INVERS : 0);
putsStickName(0, y, chan-1, (sub==i && CURSOR_ON_LINE()) ? INVERS : 0);
for (int j=0; j<3; j++) {
radio/src/gui/Taranis/menu_model_setup.cpp
+3 -7
View File
@@ -495,7 +495,7 @@ void menuModelSetup(uint8_t event)
}
}
if (g_model.potsWarnMode) {
coord_t x = MODEL_SETUP_2ND_COLUMN+27;
coord_t x = MODEL_SETUP_2ND_COLUMN+25;
for (int i=0; i<NUM_POTS; ++i) {
if (i<NUM_XPOTS && !IS_POT_AVAILABLE(POT1+i)) {
if (attr && (m_posHorz==i+1)) REPEAT_LAST_CURSOR_MOVE();
@@ -504,7 +504,7 @@ void menuModelSetup(uint8_t event)
#if defined(REV9E)
if (i == NUM_XPOTS) {
y += FH;
x = MODEL_SETUP_2ND_COLUMN+27;
x = MODEL_SETUP_2ND_COLUMN;
}
#endif
LcdFlags flags = ((m_posHorz==i+1) && attr) ? BLINK : 0;
@@ -512,11 +512,7 @@ void menuModelSetup(uint8_t event)
flags |= INVERS;
}
lcd_putsiAtt(x, y, STR_VSRCRAW, NUM_STICKS+1+i, flags);
#if defined(REV9E)
x += (2*FW+7);
#else
x += (2*FW+3);
#endif
x = lcdNextPos+3;
}
}
}