From e79258d8a22e8ea16dd3686a1802f808e8a0a58d Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 31 Aug 2016 01:06:25 +0200 Subject: [PATCH] =?UTF-8?q?[Horus]=C2=A0GVARS=20love?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- radio/src/gui/480x272/model_gvars.cpp | 16 +++++++++++----- radio/src/translations.cpp | 1 + radio/src/translations.h | 2 ++ radio/src/translations/cz.h.txt | 11 +++++++++++ radio/src/translations/de.h.txt | 11 +++++++++++ radio/src/translations/en.h.txt | 11 +++++++++++ radio/src/translations/es.h.txt | 11 +++++++++++ radio/src/translations/fi.h.txt | 11 +++++++++++ radio/src/translations/fr.h.txt | 11 +++++++++++ radio/src/translations/it.h.txt | 11 +++++++++++ radio/src/translations/nl.h.txt | 11 +++++++++++ radio/src/translations/pl.h.txt | 11 +++++++++++ radio/src/translations/pt.h.txt | 11 +++++++++++ radio/src/translations/se.h.txt | 11 +++++++++++ 14 files changed, 135 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/480x272/model_gvars.cpp b/radio/src/gui/480x272/model_gvars.cpp index 6a2a13e6a..3a603c765 100644 --- a/radio/src/gui/480x272/model_gvars.cpp +++ b/radio/src/gui/480x272/model_gvars.cpp @@ -20,7 +20,7 @@ #include "opentx.h" -void onGVARSMenu(const char *result) +void onGVARSMenu(const char * result) { int8_t sub = menuVerticalPosition; @@ -40,7 +40,7 @@ void onGVARSMenu(const char *result) } } -#define GVARS_FM_COLUMN(p) (160 + (p)*38) +#define GVARS_FM_COLUMN(p) (150 + (p)*41) bool menuModelGVars(event_t event) { @@ -49,7 +49,13 @@ bool menuModelGVars(event_t event) int sub = menuVerticalPosition; int curfm = getFlightMode(); - for (int l=0; l= 0 && menuHorizontalPosition>=0) { + drawColumnHeader(STR_GVAR_HEADERS, NULL, menuHorizontalPosition); + } +#endif + + for (uint8_t l=0; lgvars[i]; int16_t vmin, vmax; if (v > GVAR_MAX) { uint8_t p = v - GVAR_MAX - 1; if (p >= j-1) p++; - drawFlightMode(x-21, y, p+1, attr | ((j-1 == curfm) ? BOLD : 0)); + drawFlightMode(x, y, p+1, attr | RIGHT | ((j-1 == curfm) ? BOLD : 0)); vmin = GVAR_MAX+1; vmax = GVAR_MAX+MAX_FLIGHT_MODES-1; } else { diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 44deda2b3..65b9c1628 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -577,6 +577,7 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const char * const STR_LIMITS_HEADERS[] = TR_LIMITS_HEADERS; const char * const STR_LSW_HEADERS[] = TR_LSW_HEADERS; const char * const STR_LSW_DESCRIPTIONS[] = TR_LSW_DESCRIPTIONS; + const char * const STR_GVAR_HEADERS[] = TR_GVAR_HEADERS; #endif #if defined(CPUARM) diff --git a/radio/src/translations.h b/radio/src/translations.h index 7c719025b..ffcda1311 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -858,12 +858,14 @@ extern const pm_char STR_BLCOLOR[]; #define TR_LIMITS_HEADERS { HINT(TR_LIMITS_HEADERS_NAME), HINT(TR_LIMITS_HEADERS_SUBTRIM), HINT(TR_LIMITS_HEADERS_MIN), HINT(TR_LIMITS_HEADERS_MAX), HINT(TR_LIMITS_HEADERS_DIRECTION), HINT(TR_LIMITS_HEADERS_CURVE), HINT(TR_LIMITS_HEADERS_PPMCENTER), HINT(TR_LIMITS_HEADERS_SUBTRIMMODE) } #define TR_LSW_HEADERS { HINT(TR_LSW_HEADERS_FUNCTION), HINT(TR_LSW_HEADERS_V1), HINT(TR_LSW_HEADERS_V2), HINT(TR_LSW_HEADERS_V2), HINT(TR_LSW_HEADERS_ANDSW), HINT(TR_LSW_HEADERS_DURATION), HINT(TR_LSW_HEADERS_DELAY) } +#define TR_GVAR_HEADERS { HINT(TR_GVAR_HEADERS_NAME), HINT(TR_GVAR_HEADERS_FM0), HINT(TR_GVAR_HEADERS_FM1), HINT(TR_GVAR_HEADERS_FM2), HINT(TR_GVAR_HEADERS_FM3), HINT(TR_GVAR_HEADERS_FM4), HINT(TR_GVAR_HEADERS_FM5), HINT(TR_GVAR_HEADERS_FM6), HINT(TR_GVAR_HEADERS_FM7), HINT(TR_GVAR_HEADERS_FM8) } #if LCD_W >= 212 extern const char * const STR_PHASES_HEADERS[]; extern const char * const STR_LIMITS_HEADERS[]; extern const char * const STR_LSW_HEADERS[]; extern const char * const STR_LSW_DESCRIPTIONS[]; + extern const char * const STR_GVAR_HEADERS[]; #endif #if defined(CPUARM) diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 467b876a5..276f58839 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1125,6 +1125,17 @@ #define TR_LSW_HEADERS_DURATION "Trvání" #define TR_LSW_HEADERS_DELAY "Zpoždění" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 36852eca8..c3e8ddb74 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1143,6 +1143,17 @@ #define TR_LSW_HEADERS_DURATION "Min Dauer" #define TR_LSW_HEADERS_DELAY "Verzögerung" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Vergleich oder Funktion", "Erste Variable", "Zweite Variable/Konstante", "Zweite Variable/Konstante", "Weitere UND Bedingung für Freigabe des Log Schalters", "ON-Zeit des Log Schalters wenn Bedingung ok", "Mindestdauer der Bedingung damit Log Schalter ON geht" } diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 649a04504..535261072 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1114,6 +1114,17 @@ #define TR_LSW_HEADERS_DURATION "Min Duration" #define TR_LSW_HEADERS_DELAY "Delay" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 97a442988..ea5ccef41 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1088,6 +1088,17 @@ #define TR_LSW_HEADERS_DURATION "Duracion" #define TR_LSW_HEADERS_DELAY "Retardo" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 48ab5da8e..f4a88e9e0 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1088,6 +1088,17 @@ #define TR_LSW_HEADERS_DURATION "Min Duration" #define TR_LSW_HEADERS_DELAY "Delay" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 475cb71e4..22dc13312 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1120,6 +1120,17 @@ #define TR_LSW_HEADERS_DURATION "Durée min." #define TR_LSW_HEADERS_DELAY "Délai" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Type de comparaison ou fonction", "Première variable", "Seconde variable ou constante", "Seconde variable ou constante", "Condition supplémentaire pour activer la ligne", "Durée minimale d'activation de l'inter logique", "Durée min de la condition avant l'activation de l'inter" } diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index ecc476c31..c4958e52a 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1123,6 +1123,17 @@ #define TR_LSW_HEADERS_DURATION "Durata" #define TR_LSW_HEADERS_DELAY "Ritardo" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index da00a9b91..d0fcf331d 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1137,6 +1137,17 @@ #define TR_LSW_HEADERS_DURATION "Duur" #define TR_LSW_HEADERS_DELAY "Vertraging" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 3263c58e0..76e61f956 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1125,6 +1125,17 @@ #define TR_LSW_HEADERS_DURATION "CzasTrwa" #define TR_LSW_HEADERS_DELAY "Opóźn" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index e1f3a7077..735452308 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1083,6 +1083,17 @@ #define TR_LSW_HEADERS_DURATION "Min Duration" #define TR_LSW_HEADERS_DELAY "Delay" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" } diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 6cde5c121..a4ae8bce5 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1137,6 +1137,17 @@ #define TR_LSW_HEADERS_DURATION "Tidslängd" #define TR_LSW_HEADERS_DELAY "Fördröj" +#define TR_GVAR_HEADERS_NAME "Name" +#define TR_GVAR_HEADERS_FM0 "Value on FM0" +#define TR_GVAR_HEADERS_FM1 "Value on FM1" +#define TR_GVAR_HEADERS_FM2 "Value on FM2" +#define TR_GVAR_HEADERS_FM3 "Value on FM3" +#define TR_GVAR_HEADERS_FM4 "Value on FM4" +#define TR_GVAR_HEADERS_FM5 "Value on FM5" +#define TR_GVAR_HEADERS_FM6 "Value on FM6" +#define TR_GVAR_HEADERS_FM7 "Value on FM7" +#define TR_GVAR_HEADERS_FM8 "Value on FM8" + // Horus footer descriptions #define TR_LSW_DESCRIPTIONS { "Comparison type or function", "First variable", "Second variable or constant", "Second variable or constant", "Additional condition for line to be enabled", "Minimum ON duration of the logical switch", "Minimum TRUE duration for the switch to become ON" }