From 5c9809555b91c034900b60baa651713d0cec0e66 Mon Sep 17 00:00:00 2001 From: bsongis Date: Mon, 9 Mar 2015 21:41:37 +0100 Subject: [PATCH] Fixes #2129 - Only EN and FR done, I will leave the others to the translators --- radio/src/eeprom_conversions.cpp | 2 +- radio/src/fonts/std/font_05x07_extra.png | Bin 184 -> 331 bytes radio/src/gui/Taranis/lcd.cpp | 11 ++++++-- radio/src/gui/Taranis/lcd.h | 1 + radio/src/gui/Taranis/menu_general_setup.cpp | 2 +- .../src/gui/Taranis/menu_general_trainer.cpp | 2 +- radio/src/gui/Taranis/menu_model_setup.cpp | 10 ++----- radio/src/opentx.cpp | 26 +++++------------- radio/src/translations/en.h.txt | 8 ++++-- radio/src/translations/fr.h.txt | 8 ++++-- 10 files changed, 33 insertions(+), 37 deletions(-) diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index 5067a2241..9ab2d7bec 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -1061,7 +1061,7 @@ void ConvertModel_215_to_216(ModelData &model) expo->mode = 3; } for (int c=0; c<4; c++) { - newModel.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*(i+1)+c]); + newModel.inputNames[i][c] = char2idx(STR_VSRCRAW[2+STR_VSRCRAW[0]*(i+1)+c]); } } #endif diff --git a/radio/src/fonts/std/font_05x07_extra.png b/radio/src/fonts/std/font_05x07_extra.png index 79d19024394a9a0c52e3ff73c257e0d31a6860f4..c6f1f39fff0adf572dd3a6cfd9ebc93b672ad0bb 100644 GIT binary patch delta 311 zcmdnNc$&$$Gr-TCmrII^fq{Y7)59eQNZSB02L~IFTq-{2B#>fD@^*J&_z!{$_AZ}1 z(Lt{MJ~O9~im^-Iv2{Rs+02lL66gHf+|;}hAeVu`xhOTUBsE2$JhLQ2!QIn0AVn{g z9Vouu)5S5w;`GtbK)zN34((&V<9Ghs!Mf4Fr^bJhtIFL4vbTFw7!RB&*mXJN&Godj z%k{IYXTPp|Bez58h4>q>t+PIFTcM&~lO$VR?Gquopg_)E?CXEQ&)?P^pQC+yQ_^nh zXQHvP?H!++T%4wMJiaYB>4^-(hR`J;LQ@}j`g8_!Ui!G#V^#8T28PpmYgbgcZBv>c z7=Ab8sMT|`)jy~GUL9?<`%Fl6xM6GHjhCPAzdv`pjN$RQ9byt{VK+gZ@^tlcS?83{ F1OW47ei{G( literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^%0SG)$P6SsYp%QpQfvV}A+A9B|Ns9>Z_d99WHBar zySp%Su*!M>Ih+L^k;M!Q+`=Ht$S`Y;1W=H@#M9T6{T`Dvmj&Ca;1iNSAq!6z#}JO| z$veIS4Pxi1<^Q)?-C)XJ-`n#K6uf_ZsgzqHZ+-2)T*kw5E86C>OEhHtGcfqWzLJGu YPn7KL%qu)!fMzgwy85}Sb4q9e06j4|dH?_b diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp index b2994cd08..14713b9b0 100755 --- a/radio/src/gui/Taranis/lcd.cpp +++ b/radio/src/gui/Taranis/lcd.cpp @@ -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) { diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h index a04e2dd82..0b41ebf7c 100755 --- a/radio/src/gui/Taranis/lcd.h +++ b/radio/src/gui/Taranis/lcd.h @@ -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) diff --git a/radio/src/gui/Taranis/menu_general_setup.cpp b/radio/src/gui/Taranis/menu_general_setup.cpp index e0c0db74f..791ce551e 100755 --- a/radio/src/gui/Taranis/menu_general_setup.cpp +++ b/radio/src/gui/Taranis/menu_general_setup.cpp @@ -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); diff --git a/radio/src/gui/Taranis/menu_general_trainer.cpp b/radio/src/gui/Taranis/menu_general_trainer.cpp index 56c49717f..dea5ec607 100755 --- a/radio/src/gui/Taranis/menu_general_trainer.cpp +++ b/radio/src/gui/Taranis/menu_general_trainer.cpp @@ -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++) { diff --git a/radio/src/gui/Taranis/menu_model_setup.cpp b/radio/src/gui/Taranis/menu_model_setup.cpp index c23635359..feb31b9db 100644 --- a/radio/src/gui/Taranis/menu_model_setup.cpp +++ b/radio/src/gui/Taranis/menu_model_setup.cpp @@ -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; ichn = i; expo->weight = 100; expo->mode = 3; // TODO constant +#if defined(TRANSLATIONS_CZ) for (int c=0; c<4; c++) { -#if defined(TRANSLATIONS_CZ) && defined(CPUARM) g_model.inputNames[i][c] = char2idx(STR_INPUTNAMES[1+STR_INPUTNAMES[0]*(stick_index-1)+c]); + } #else - g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]); + for (int c=0; c<3; c++) { + g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[2+4*stick_index+c]); #endif } + g_model.inputNames[i][3] = '\0'; } eeDirty(EE_MODEL); } @@ -339,35 +342,20 @@ inline void applyDefaultTemplate() #else void applyDefaultTemplate() { - for (int i=0; isrcRaw = MIXSRC_Rud - 1 + stick_index; - expo->curve.type = CURVE_REF_EXPO; - expo->chn = i; - expo->weight = 100; - expo->mode = 3; // TODO constant - for (int c=0; c<4; c++) { -#if defined(TRANSLATIONS_CZ) && defined(CPUARM) - g_model.inputNames[i][c] = char2idx(STR_INPUTNAMES[1+STR_INPUTNAMES[0]*(stick_index-1)+c]); -#else - g_model.inputNames[i][c] = char2idx(STR_VSRCRAW[1+STR_VSRCRAW[0]*stick_index+c]); -#endif - } + defaultInputs(); #endif + for (int i=0; idestCh = i; mix->weight = 100; - #if defined(PCBTARANIS) mix->srcRaw = i+1; #else mix->srcRaw = MIXSRC_Rud - 1 + channel_order(i+1); #endif } - eeDirty(EE_MODEL); } #endif diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 3a93a3fa9..e2a7b4af4 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -445,11 +445,13 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" +#define TR_STICKS_VSRCRAW TR("Rud\0""Ele\0""Thr\0""Ail\0", "\307Rud""\307Ele""\307Thr""\307Ail") + #if defined(PCBTARANIS) && defined(REV9E) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""S4\0 ""LS\0 ""RS\0 ""LS2\0""RS2\0" + #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2" #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 ""SI\0 ""SJ\0 ""SK\0 ""SL\0 ""SM\0 ""SN\0 ""SO\0 ""SP\0 ""SQ\0 ""SR\0 " #elif defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " + #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 ""SI\0 ""SJ\0 ""SK\0 ""SL\0 ""SM\0 ""SN\0 " #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " @@ -508,7 +510,7 @@ #define TR_EXTRA_VSRCRAW #endif -#define TR_VSRCRAW "---\0""Rud\0""Ele\0""Thr\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" TR_SW_VSRCRAW TR_EXTRA_VSRCRAW +#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ON\0""THs""TH%""THt" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 6d86f92b6..c8e886b53 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -445,11 +445,13 @@ #define LEN_VSWITCHES "\003" #define LEN_VSRCRAW "\004" +#define TR_STICKS_VSRCRAW TR("Dir\0""Prf\0""Gaz\0""Ail\0", "\307Dir""\307Prf""\307Gaz""\307Ail") + #if defined(PCBTARANIS) && defined(REV9E) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""S4\0 ""LS\0 ""RS\0 ""LS2\0""RS2\0" + #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\310S4\0""\311LS\0""\311RS\0""\311LS2""\311RS2" #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 ""SI\0 ""SJ\0 ""SK\0 ""SL\0 ""SM\0 ""SN\0 ""SO\0 ""SP\0 ""SQ\0 ""SR\0 " #elif defined(PCBTARANIS) - #define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""S3\0 ""LS\0 ""RS\0 " + #define TR_POTS_VSRCRAW "\310S1\0""\310S2\0""\310S3\0""\311LS\0""\311RS\0" #define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 " #else #define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""P3\0 " @@ -508,7 +510,7 @@ #define TR_EXTRA_VSRCRAW #endif -#define TR_VSRCRAW "---\0""Dir\0""Prf\0""Gaz\0""Ail\0" TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW TR_EXTRA_VSRCRAW +#define TR_VSRCRAW "---\0" TR_STICKS_VSRCRAW TR_POTS_VSRCRAW TR_ROTARY_ENCODERS "MAX\0" TR_CYC_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" TR_SW_VSRCRAW TR_EXTRA_VSRCRAW #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ON\0""GZs""GZ%""GZt"