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

Invert lines in EXPO submenu (in order to have conditions all together)

Browse source 
Translations updated
This commit is contained in:
bsongis 2012-02-28 22:44:26 +00:00
parent d1689d3e81
commit 46b17b8d91
6 changed files with 32 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
docs/open9x manual francais.pdf
View file

Binary file not shown.

2
src/frsky.cpp
View file

@ -635,6 +635,8 @@ void resetTelemetry()
frskyHubData.gpsLatitude_ap = 7455;
frskyHubData.gpsLongitude_bp = 1006;
frskyHubData.gpsLongitude_ap = 9533;
frskyHubData.gpsFix = 1;
frskyHubData.cellsCount = 6;
#endif
}

22
src/model_menus.cpp
View file

@ -1119,28 +1119,28 @@ inline void editExpoVals(uint8_t event, uint8_t which, bool edit, uint8_t y, uin
if (edit) CHECK_INFLIGHT_INCDEC_MODELVAR(event, ed->expo, -100, 100, 0, STR_DREXPO);
break;
case 2:
putsCurve(6*FW+5, y, ed->curve+(ed->curve >= CURVE_BASE+4 ? 4 : 0), invBlk);
if (invBlk) CHECK_INCDEC_MODELVAR(event, ed->curve, 0, 15);
if (invBlk && ed->curve>=CURVE_BASE && event==EVT_KEY_FIRST(KEY_MENU)) {
s_curveChan = ed->curve - (ed->curve >= CURVE_BASE+4 ? CURVE_BASE-4 : CURVE_BASE);
pushMenu(menuProcCurveOne);
}
break;
case 3:
{
int8_t phase = ed->negPhase ? -ed->phase : +ed->phase;
putsFlightPhase(6*FW+5, y, phase, invBlk);
if(edit) { phase = checkIncDecModel(event, phase, -MAX_PHASES, MAX_PHASES); ed->negPhase = (phase < 0); ed->phase = abs(phase); }
}
break;
case 3:
case 4:
putsSwitches(6*FW+5, y, ed->swtch, invBlk);
if(edit) CHECK_INCDEC_MODELVAR(event, ed->swtch, -MAX_DRSWITCH, MAX_DRSWITCH);
break;
case 4:
case 5:
lcd_putsiAtt(6*FW+5, y, STR_VWHEN, 3-ed->mode, invBlk);
if(edit) ed->mode = 4 - checkIncDecModel(event, 4-ed->mode, 1, 3);
break;
case 5:
putsCurve(6*FW+5, y, ed->curve+(ed->curve >= CURVE_BASE+4 ? 4 : 0), invBlk);
if(invBlk) CHECK_INCDEC_MODELVAR(event, ed->curve, 0, 15);
if(invBlk && ed->curve>=CURVE_BASE && event==EVT_KEY_FIRST(KEY_MENU)) {
s_curveChan = ed->curve - (ed->curve >= CURVE_BASE+4 ? CURVE_BASE-4 : CURVE_BASE);
pushMenu(menuProcCurveOne);
}
break;
}
}
@ -1547,7 +1547,7 @@ void menuProcMixAll(uint8_t event)
void menuProcLimits(uint8_t event)
{
MENU(STR_MENULIMITS, menuTabModel, e_Limits, NUM_CHNOUT+1, {0, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3});
MENU(STR_MENULIMITS, menuTabModel, e_Limits, NUM_CHNOUT+1, {0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3});
int8_t sub = m_posVert - 1;

2
src/open9x.cpp
View file

@ -1207,7 +1207,7 @@ void perOut(int16_t *chanOut, uint8_t phase)
//========== MIXER LOOP ===============
mixWarning = 0;
for(uint8_t i=0; i<MAX_MIXERS; i++) {
for (uint8_t i=0; i<MAX_MIXERS; i++) {
MixData *md = mixaddress( i ) ;

13
src/translations/en.h
View file

@ -48,7 +48,7 @@
#define TR_CURVMODES "EDIT ""PRSET""A.THR"
#define LEN_EXPLABELS "\006"
#define TR_EXPLABELS "Weight""Expo ""Phase ""Swtch ""When ""Curve "" " // TODO remove all the trailing spaces
#define TR_EXPLABELS "Weight""Expo ""Curve ""Phase ""Swtch ""When "" " // TODO remove all the trailing spaces
#define LEN_VMLTPX "\010"
#define TR_VMLTPX "Add ""Multiply""Replace "
@ -69,11 +69,16 @@
#define TR_SDCLOGGS
#endif
#ifdef SOMO
#define TR_SOMO "Play track\0 "
#define TR_SOMO "Play Track\0 "
#else
#define TR_SOMO
#endif
#define TR_VFSWFUNC "Security \0 ""Trainer \0 ""Instant Trim ""Play Sound\0 " TR_SOMO TR_SDCLOGGS
#ifdef AUDIO
#define TR_SOUND "Play Sound\0 "
#else
#define TR_SOUND "Beep\0 "
#endif
#define TR_VFSWFUNC "Security \0 ""Trainer \0 ""Instant Trim " TR_SOUND TR_SOMO TR_SDCLOGGS
#define LEN_FUNCSOUNDS "\006"
#define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick ""Haptc1""Haptc2""Haptc3"
@ -294,7 +299,7 @@
#define TR_MENUFUNCSWITCHES "FUNC SWITCHES"
#define TR_MENUTELEMETRY "TELEMETRY"
#define TR_MENUTEMPLATES "TEMPLATES"
#define TR_MENUSTAT "STAT"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_RXNUM "RxNum"
#define TR_SYNCMENU "Sync [MENU]"

13
src/translations/fr.h
View file

@ -48,7 +48,7 @@
#define TR_CURVMODES "EDIT ""PRSET""A.GAZ"
#define LEN_EXPLABELS "\006"
#define TR_EXPLABELS "Ratio ""Expo ""Phase ""Inter ""Mode ""Courbe"" "
#define TR_EXPLABELS "Ratio ""Expo ""Courbe""Phase ""Inter ""Mode "" "
#define LEN_VMLTPX "\010"
#define TR_VMLTPX "Ajouter ""Multiply""Remplace"
@ -73,7 +73,12 @@
#else
#define TR_SOMO
#endif
#define TR_VFSWFUNC "Securite \0 ""Ecolage \0 ""Trim instant ""Jouer son\0 " TR_SOMO TR_SDCLOGGS
#ifdef AUDIO
#define TR_SOUND "Jouer son\0 "
#else
#define TR_SOUND "Beep\0 "
#endif
#define TR_VFSWFUNC "Securite \0 ""Ecolage \0 ""Trim instant " TR_SOUND TR_SOMO TR_SDCLOGGS
#define LEN_FUNCSOUNDS "\006"
#define TR_FUNCSOUNDS "Warn1 ""Warn2 ""Cheep ""Ring ""SciFi ""Robot ""Chirp ""Tada ""Crickt""Siren ""AlmClk""Ratata""Tick ""Haptc1""Haptc2""Haptc3"
@ -223,7 +228,7 @@
#define TR_SWITCHWARNING "Alerte Inter"
#define TR_MEMORYWARNING "Alerte Memoire"
#define TR_ALARMWARNING "Alerte Alarme"
#define TR_NODATAALARM "PAS DE DONNEES Alarme"
#define TR_NODATAALARM "Alerte Telem."
#define TR_RXCHANNELORD "Ordre Voies Rx"
#define TR_MODE "Mode"
#define TR_SLAVE "Esclave"
@ -294,7 +299,7 @@
#define TR_MENUFUNCSWITCHES "INTERS FONCTIONS"
#define TR_MENUTELEMETRY "TELEMETRIE"
#define TR_MENUTEMPLATES "GABARITS"
#define TR_MENUSTAT "STAT"
#define TR_MENUSTAT "STATS"
#define TR_MENUDEBUG "DEBUG"
#define TR_RXNUM "RxNum"
#define TR_SYNCMENU "Sync [MENU]"