[all] Custom functions reworked

[all] Expo function rewritten and many other flash savings (thanks Andreas)
[stock] LONG key press duration is longer
[stock] Rotary Encoder bugs fixed
[stock/gruvin9x] Play Both function added
!!! TRANSLATIONS ALL NEED TO BE UPDATED BEFORE NEXT RELEASE
This commit is contained in:
bsongis
2013-02-15 20:11:12 +00:00
parent 5cda44ac0b
commit d64a71f5ab
22 changed files with 456 additions and 388 deletions
+11 -11
View File
@@ -133,35 +133,35 @@
#else
#define TR_SDCLOGS "[Logov\200n\204 SD]"
#endif
#define TR_FSW_VOLUME "Hlasitost\0 "
#define TR_FSW_BG_MUSIC "BgHudba\0 ""BgHudba Pauza"
#define TR_CFN_VOLUME "Hlasitost\0 "
#define TR_CFN_BG_MUSIC "BgHudba\0 ""BgHudba Pauza"
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "Logování SD\0 "
#else
#define TR_SDCLOGS "[Logování SD]"
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Nastav \0 "
#define TR_CFN_ADJUST_GVAR "Nastav \0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0 "
#define TR_CFN_TEST "Test\0 "
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "Bezpe\201\0 ""Tren\202r \0 ""Instant Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Podsv\203tlen\204\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "Bezpe\201\0 ""Tren\202r \0 ""Instant Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Podsv\203tlen\204\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Timer1""Timer2""V\207e ""Telem."
+11 -11
View File
@@ -125,33 +125,33 @@
#else
#define TR_SDCLOGS "[SD Aufz.]\0 "
#endif
#define TR_FSW_VOLUME "Lautst\201rke\0 "
#define TR_FSW_BG_MUSIC "Musik Start\0 ""Musik Pause\0 "
#define TR_CFN_VOLUME "Lautst\201rke\0 "
#define TR_CFN_BG_MUSIC "Musik Start\0 ""Musik Pause\0 "
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "SD Aufz.\0 "
#else
#define TR_SDCLOGS "[SD Aufz.]\0 "
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "\200ndere \0 "
#define TR_CFN_ADJUST_GVAR "\200ndere \0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0 "
#define TR_CFN_TEST "Test\0 "
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "Sicher\0 ""Lehrsch.\0 ""Instant. Trim" TR_SOUND TR_HAPTIC "R\205cksetz.\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Beleuchtung\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "Sicher\0 ""Lehrsch.\0 ""Instant. Trim" TR_SOUND TR_HAPTIC "R\205cksetz.\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Beleuchtung\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "S.Uhr1""S.Uhr2""Alle ""Telem."
+25 -28
View File
@@ -120,50 +120,47 @@
#endif
#if defined(VOICE)
#define TR_PLAY_TRACK "Play Track\0"
#define TR_PLAY_BOTH "Play Both\0 "
#define TR_PLAY_VALUE "Play Value\0"
#if defined(PCBSKY9X)
#define TR_PLAY_TRACK "Play\0 "
#else
#define TR_PLAY_TRACK "Play Track\0"
#endif
#define TR_PLAY_BOTH "Play Bth\0 "
#define TR_PLAY_VALUE "Play Val\0 "
#else
#define TR_PLAY_TRACK "[PlayTrack]"
#define TR_PLAY_BOTH "[Play Both]" // TODO could be avoided
#define TR_PLAY_BOTH "[Play Both]"
#define TR_PLAY_VALUE "[PlayValue]"
#endif
#if defined(CPUARM)
#if defined(SDCARD)
#define TR_SDCLOGS "SD Logs\0 "
#else
#define TR_SDCLOGS "[SD Logs]\0 "
#endif
#define TR_FSW_VOLUME "Volume\0 "
#define TR_FSW_BG_MUSIC "BgMusic\0 ""BgMusic ||\0"
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "SD Logs\0 "
#else
#define TR_SDCLOGS "[SD Logs]\0 "
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME "Volume\0 "
#define TR_CFN_BG_MUSIC "BgMusic\0 ""BgMusic ||\0"
#if defined(SDCARD)
#define TR_SDCLOGS "SD Logs\0 "
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_SDCLOGS "[SD Logs]\0 "
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Adjust \0 "
#define TR_CFN_ADJUST_GVAR "Adjust \0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0"
#define TR_CFN_TEST "Test\0"
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "Safety\0 ""Trainer \0 ""Inst. Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Backlight\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#if defined(CPUARM)
#define TR_VFSWFUNC "Safety\0 ""Trainer \0 ""Inst. Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Backlight\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC "Safety\0 ""Trainer \0 ""Inst. Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_SDCLOGS "Backlight\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST
#else
#define TR_VFSWFUNC "Safety\0 ""Trainer \0 ""Inst. Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE "Backlight\0 " TR_CFN_ADJUST_GVAR TR_CFN_TEST
#endif
#define LEN_VFSWRESET TR("\006","\012")
#define TR_VFSWRESET "Timer 1 ""Timer 2 ""All ""Telemetry"
+11 -11
View File
@@ -134,35 +134,35 @@
#else
#define TR_SDCLOGS "[SD Logs]\0 "
#endif
#define TR_FSW_VOLUME "Volumen\0 "
#define TR_FSW_BG_MUSIC "BgMusica\0 ""BgMusica||\0"
#define TR_CFN_VOLUME "Volumen\0 "
#define TR_CFN_BG_MUSIC "BgMusica\0 ""BgMusica||\0"
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "SD Logs\0 "
#else
#define TR_SDCLOGS "[SD Logs]\0 "
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Ajuste \0 "
#define TR_CFN_ADJUST_GVAR "Ajuste \0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0"
#define TR_CFN_TEST "Test\0"
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Panel luz\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Inst. Trim\0" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Panel luz\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET TR("\006","\012")
#define TR_VFSWRESET "Reloj 1 ""Reloj 2 ""Todo ""Telemetr."
+11 -11
View File
@@ -125,33 +125,33 @@
#else
#define TR_SDCLOGS "[Logs SD]\0 "
#endif
#define TR_FSW_VOLUME "Volume\0 "
#define TR_FSW_BG_MUSIC "Musique\0 ""Pause Musique"
#define TR_CFN_VOLUME "Volume\0 "
#define TR_CFN_BG_MUSIC "Musique\0 ""Pause Musique"
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "Logs carte SD"
#else
#define TR_SDCLOGS "[Logs SD]\0 "
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Ajuster\0 "
#define TR_CFN_ADJUST_GVAR "Ajuster\0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0 "
#define TR_CFN_TEST "Test\0 "
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "S\200cur.\0 ""Ecolage \0 ""Trim instant." TR_SOUND TR_HAPTIC "Remise \202 0\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "R\200tro\200cl.\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "S\200cur.\0 ""Ecolage \0 ""Trim instant." TR_SOUND TR_HAPTIC "Remise \202 0\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "R\200tro\200cl.\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Timer1""Timer2""Timers""T\200l\200m."
+11 -11
View File
@@ -124,32 +124,32 @@
#else
#define TR_SDCLOGS "[SDCARD Logs]"
#endif
#define TR_FSW_VOLUME "Volume\0 "
#define TR_FSW_BG_MUSIC "BgMusic\0 ""BgMusic Pause"
#define TR_CFN_VOLUME "Volume\0 "
#define TR_CFN_BG_MUSIC "BgMusic\0 ""BgMusic Pause"
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "SDCARD Logs"
#else
#define TR_SDCLOGS "[SDCARD Logs]"
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Adjust \0 "
#define TR_CFN_ADJUST_GVAR "Adjust \0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0 "
#define TR_CFN_TEST "Test\0 "
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "Blocco\0 ""Trainer \0 ""Instant Trim " TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Retroillum.\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "Blocco\0 ""Trainer \0 ""Instant Trim " TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Retroillum.\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Timer1""Timer2""Tutto ""Telem."
+11 -11
View File
@@ -125,33 +125,33 @@
#else
#define TR_SDCLOGS "[SDCARD Logs]"
#endif
#define TR_FSW_VOLUME "Volume\0 "
#define TR_FSW_BG_MUSIC "BgMusic\0 ""BgMusic ||\0 "
#define TR_CFN_VOLUME "Volume\0 "
#define TR_CFN_BG_MUSIC "BgMusic\0 ""BgMusic ||\0 "
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "SDCARD Logs\0 "
#else
#define TR_SDCLOGS "[SDCARD Logs]"
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Ajuste\0 "
#define TR_CFN_ADJUST_GVAR "Ajuste\0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Teste\0 "
#define TR_CFN_TEST "Teste\0 "
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Backlight\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "Seguro\0 ""Aprendiz\0 ""Ajuste Rapido" TR_SOUND TR_HAPTIC "Reset\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Backlight\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET "\006"
#define TR_VFSWRESET "Tempo1""Tempo2""Todo ""Telem."
+11 -11
View File
@@ -133,35 +133,35 @@
#else
#define TR_SDCLOGS "[SDCARD Logg]"
#endif
#define TR_FSW_VOLUME "Volym\0 "
#define TR_FSW_BG_MUSIC "BgMusik\0 ""BgMusik ||\0"
#define TR_CFN_VOLUME "Volym\0 "
#define TR_CFN_BG_MUSIC "BgMusik\0 ""BgMusik ||\0"
#elif defined(PCBGRUVIN9X)
#if defined(SDCARD)
#define TR_SDCLOGS "SDCARD Loggar"
#else
#define TR_SDCLOGS "[SDCARD Logg]"
#endif
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#else
#define TR_SDCLOGS
#define TR_FSW_VOLUME
#define TR_FSW_BG_MUSIC
#define TR_CFN_VOLUME
#define TR_CFN_BG_MUSIC
#endif
#ifdef GVARS
#define TR_FSW_ADJUST_GVAR "Justera\0 "
#define TR_CFN_ADJUST_GVAR "Justera\0 "
#else
#define TR_FSW_ADJUST_GVAR
#define TR_CFN_ADJUST_GVAR
#endif
#ifdef DEBUG
#define TR_FSW_TEST "Test\0"
#define TR_CFN_TEST "Test\0"
#else
#define TR_FSW_TEST
#define TR_CFN_TEST
#endif
#define TR_VFSWFUNC "S\201kra\0 ""Trainer \0 ""S\201tt Trim\0 " TR_SOUND TR_HAPTIC "Nollst\201ll\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_FSW_VOLUME "Belysning\0 " TR_FSW_BG_MUSIC TR_FSW_ADJUST_GVAR TR_FSW_TEST
#define TR_VFSWFUNC "S\201kra\0 ""Trainer \0 ""S\201tt Trim\0 " TR_SOUND TR_HAPTIC "Nollst\201ll\0 " TR_VVARIO TR_PLAY_TRACK TR_PLAY_VALUE TR_SDCLOGS TR_CFN_VOLUME "Belysning\0 " TR_CFN_BG_MUSIC TR_CFN_ADJUST_GVAR TR_CFN_TEST
#define LEN_VFSWRESET TR("\006","\012")
#define TR_VFSWRESET "Timer1 ""Timer2 ""Allt ""Telemetri"