diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index da8b1ae88..5e42edc11 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -870,7 +870,7 @@ enum menuModelSetupItems { ITEM_MODEL_EXTENDED_LIMITS, ITEM_MODEL_EXTENDED_TRIMS, ITEM_MODEL_TRIM_INC, - ITEM_MODEL_THROTTLE_LABEL, + CASE_PCBTARANIS(ITEM_MODEL_THROTTLE_LABEL) ITEM_MODEL_THROTTLE_REVERSED, ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRIM, @@ -972,13 +972,13 @@ void menuModelSetup(uint8_t event) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0,LABEL(Throttle), 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2 }); #else #define CURSOR_ON_CELL (true) #define MODEL_SETUP_MAX_LINES ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX) uint8_t protocol = g_model.protocol; - MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,LABEL(Throttle), 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) }); + MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, IF_PERSISTENT_TIMERS(0) 0, 0, 2, IF_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, 0, 0, 0, 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, FIELD_PROTOCOL_MAX, 2, CASE_PCBSKY9X(1) CASE_PCBSKY9X(2) }); #endif if (!MENU_CHECK(menuTabModel, e_ModelSetup, MODEL_SETUP_MAX_LINES)) { @@ -1123,9 +1123,11 @@ void menuModelSetup(uint8_t event) g_model.trimInc = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_TRIMINC, STR_VTRIMINC, g_model.trimInc, -2, 2, attr, event); break; +#if defined(PCBTARANIS) case ITEM_MODEL_THROTTLE_LABEL: lcd_putsLeft(y, STR_THROTTLE_LABEL); break; +#endif case ITEM_MODEL_THROTTLE_REVERSED: g_model.throttleReversed = onoffMenuItem(g_model.throttleReversed, MODEL_SETUP_2ND_COLUMN, y, STR_THROTTLEREVERSE, attr, event ) ; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index b30c2f26e..12dff79c1 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -211,7 +211,6 @@ const pm_char STR_ALARMWARNING[] PROGMEM = TR_ALARMWARNING; #if defined(ROTARY_ENCODERS) const pm_char STR_RENAVIG[] PROGMEM = TR_RENAVIG; #endif -const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; const pm_char STR_THROTTLEREVERSE[] PROGMEM = TR_THROTTLEREVERSE; const pm_char STR_MINUTEBEEP[] PROGMEM = TR_MINUTEBEEP; const pm_char STR_BEEPCOUNTDOWN[] PROGMEM = TR_BEEPCOUNTDOWN; @@ -502,6 +501,7 @@ const pm_char STR_VIEW_TEXT[] PROGMEM = "View text"; const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE; const pm_char STR_POT1TYPE[] PROGMEM = TR_POT1TYPE; const pm_char STR_POT2TYPE[] PROGMEM = TR_POT2TYPE; + const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations.h b/radio/src/translations.h index ec882c0a2..5154676b8 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -370,7 +370,6 @@ extern const pm_char STR_INACTIVITYALARM[]; extern const pm_char STR_MEMORYWARNING[]; extern const pm_char STR_ALARMWARNING[]; extern const pm_char STR_RENAVIG[]; -extern const pm_char STR_THROTTLE_LABEL[]; extern const pm_char STR_THROTTLEREVERSE[]; extern const pm_char STR_MINUTEBEEP[]; extern const pm_char STR_BEEPCOUNTDOWN[]; @@ -693,6 +692,7 @@ extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_UART3MODE[]; extern const pm_char STR_POT1TYPE[]; extern const pm_char STR_POT2TYPE[]; + extern const pm_char STR_THROTTLE_LABEL[]; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 09d101a40..91b85620d 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanál +/- 125%") #define TR_ETRIMS TR("širšíTrim", "Široký trim") #define TR_TRIMINC TR("KrokTrimu", "Krok trimu") -#define TR_TTRACE TR(INDENT "StopaPlyn", INDENT "Stopař plynu") -#define TR_TTRIM TR(INDENT "TrimPlynu", INDENT "Trim-volnoběh") +#define TR_TTRACE TR("StopaPlyn", INDENT "Stopař plynu") +#define TR_TTRIM TR("TrimPlynu", INDENT "Trim-volnoběh") #define TR_BEEPCTR "(\043)Středy" #define TR_PROTO INDENT"Protokol" #define TR_PPMFRAME "PPM frame" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Vypnutý zvuk" #define TR_RENAVIG "Navig. RotEnc" #define TR_THROTTLE_LABEL "Plyn" -#define TR_THROTTLEREVERSE INDENT "Revers" +#define TR_THROTTLEREVERSE TR("ReversPlyn", INDENT"Revers plynu") #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Oznamovat minuty") #define TR_BEEPCOUNTDOWN INDENT"Odpočet" #define TR_PERSISTENT INDENT"Trvalé" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index eae9626d5..e93fcd68f 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Erw.Limit","Erweit. Limits") #define TR_ETRIMS TR("Erw.Trims","Erweit. Trimmung") #define TR_TRIMINC TR("Trim Schr.","Trimm Schritte") -#define TR_TTRACE TR(INDENT "Gasquelle", INDENT "Gas Quelle") -#define TR_TTRIM TR(INDENT "Gastrim",INDENT "Gas Trimmung") +#define TR_TTRACE TR("Gasquelle", INDENT "Gas Quelle") +#define TR_TTRIM TR("Gastrim",INDENT "Gas Trimmung") #define TR_BEEPCTR TR("Mitt.Piep","Mittelst. Pieps") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protokoll") #define TR_PPMFRAME "PPM Einst." @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Ton aus" #define TR_RENAVIG "Drehgeb. Navig." #define TR_THROTTLE_LABEL "Gas" -#define TR_THROTTLEREVERSE TR(INDENT "Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis +#define TR_THROTTLEREVERSE TR("Gas invers", INDENT "Vollgas hinten?") //Änderung wg TH9x, Taranis #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Jede Minute") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"M-Zeit",INDENT"Modell Zeit") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index b34cd334b..a7c5f9938 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -450,8 +450,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE INDENT "Source" -#define TR_TTRIM INDENT "Idle Trim" +#define TR_TTRACE TR("T-Source", INDENT "Source") +#define TR_TTRIM TR("T-IdleTrim", INDENT "Idle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -515,7 +515,7 @@ #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE INDENT "Reverse" +#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Reverse") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index c01910b4e..d361be05b 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("E.Limite","Ampliar Limites") #define TR_ETRIMS TR("E.Trims","Ampliar Trims") #define TR_TRIMINC "Paso Trim" -#define TR_TTRACE TR( INDENT "Fuente-A", INDENT "Fuente Acelerad") -#define TR_TTRIM TR(INDENT "Trim-A", INDENT "Trim Acelerad") +#define TR_TTRACE TR("Fuente-A", INDENT "Fuente Acelerad") +#define TR_TTRIM TR("Trim-A", INDENT "Trim Acelerad") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT"Proto",INDENT"Protocol") #define TR_PPMFRAME "Trama PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Sin Sonido" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT "Invert_Acel", INDENT "Invertir Acel.") +#define TR_THROTTLEREVERSE TR("Invert_Acel", INDENT "Invertir Acel.") #define TR_MINUTEBEEP TR(INDENT"Minuto",INDENT"Cada Minuto") #define TR_BEEPCOUNTDOWN INDENT"Cuentaatras" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 41509b804..d0541e7f2 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("E.Limits", "Extended Limits") #define TR_ETRIMS TR("E.Trims", "Extended Trims") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR(INDENT "T-Source", INDENT "Throttle Source") -#define TR_TTRIM TR(INDENT "T-Trim", INDENT "Throttle Trim") +#define TR_TTRACE TR("T-Source", INDENT "Throttle Source") +#define TR_TTRIM TR("T-Trim", INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep", "Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocol") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Sound Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT "T-Reverse", INDENT "Throttle reverse") +#define TR_THROTTLEREVERSE TR("T-Reverse", INDENT "Throttle reverse") #define TR_MINUTEBEEP TR(INDENT"Minute",INDENT"Minute call") #define TR_BEEPCOUNTDOWN INDENT"Countdown" #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistent") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 88135ba8b..6fec8a7d7 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limites ét","Limites étendues") #define TR_ETRIMS TR("Trims ét.","Trims étendus") #define TR_TRIMINC TR("Pas Trim","Pas des trims") -#define TR_TTRACE INDENT"Source gaz" -#define TR_TTRIM INDENT"Trim gaz" +#define TR_TTRACE TR("Source gaz",INDENT"Source gaz") +#define TR_TTRIM TR("Trim gaz",INDENT"Trim gaz") #define TR_BEEPCTR TR("Bips centr","Bips centrage") #define TR_PROTO TR(INDENT"Proto.",INDENT"Protocole") #define TR_PPMFRAME INDENT"Trame PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING TR(INDENT"Silence",INDENT"Sons désactivés") #define TR_RENAVIG "Navig EncRot" #define TR_THROTTLE_LABEL "Gaz" -#define TR_THROTTLEREVERSE TR(INDENT"Inv. gaz",INDENT"Inversion gaz") +#define TR_THROTTLEREVERSE TR("Inv. gaz",INDENT"Inversion gaz") #define TR_MINUTEBEEP TR(INDENT"Bip min.",INDENT"Annonces minutes") #define TR_BEEPCOUNTDOWN TR(INDENT"Bip fin",INDENT"Compte à rebours") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistant") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index cba63389d..7e3283647 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limiti.E","Limiti Estesi") #define TR_ETRIMS TR("Trim Ext","Trim Estesi") #define TR_TRIMINC "Trim Step" -#define TR_TTRACE TR(INDENT "T-Source",INDENT "Throttle Source") -#define TR_TTRIM TR(INDENT "T-Trim",INDENT "Throttle Trim") +#define TR_TTRACE TR("T-Source",INDENT "Throttle Source") +#define TR_TTRIM TR("T-Trim",INDENT "Throttle Trim") #define TR_BEEPCTR TR("Ctr Beep","Center Beep") #define TR_PROTO TR(INDENT "Proto", INDENT "Protocollo") #define TR_PPMFRAME TR("PPM frame", INDENT "PPM frame") @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Spento" #define TR_RENAVIG "Navig RotEnc " #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT "Thr inv.", INDENT "Throttle Inverso") +#define TR_THROTTLEREVERSE TR("Thr inv.", INDENT "Throttle Inverso") #define TR_MINUTEBEEP INDENT"Minuto" #define TR_BEEPCOUNTDOWN TR(INDENT"Conto rov",INDENT"Conto rovescia") #define TR_PERSISTENT TR(INDENT"Persist.",INDENT"Persistente") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f2434da46..065201e6d 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Limit+25%", "Kanał +/- 125%") #define TR_ETRIMS TR("Trymery 100%", "Poszerzone Trymery") #define TR_TRIMINC TR("Krok Trymera", "Krok trymera") -#define TR_TTRACE TR(INDENT"Źródło gazu", INDENT"Źródło gazu") -#define TR_TTRIM TR(INDENT"Trymer gazu", INDENT"Trymer gazu") +#define TR_TTRACE TR("Źródło gazu", INDENT"Źródło gazu") +#define TR_TTRIM TR("Trymer gazu", INDENT"Trymer gazu") #define TR_BEEPCTR "(\043)Pikanie środka" #define TR_PROTO INDENT"Protokól" #define TR_PPMFRAME "Ramka PPM" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Wyłącz dźwięk" #define TR_RENAVIG "Nawigacja potencjometrem" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE TR(INDENT"Odwróć gaz", INDENT"Odwróć gaz") +#define TR_THROTTLEREVERSE TR("Odwróć gaz", INDENT"Odwróć gaz") #define TR_MINUTEBEEP TR(INDENT"Minuta", INDENT"Pik co minutę") #define TR_BEEPCOUNTDOWN TR(INDENT"Odliczanie", INDENT"Odliczanie") #define TR_PERSISTENT INDENT"Dokładny" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 8e8c17b2c..aa6662795 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS "E.Limits" #define TR_ETRIMS "E.Trims" #define TR_TRIMINC "Trim Step" -#define TR_TTRACE INDENT"T-Trace" -#define TR_TTRIM INDENT"T-Trim" +#define TR_TTRACE TR("T-Trace",INDENT"T-Trace") +#define TR_TTRIM TR("T-Trim",INDENT"T-Trim") #define TR_BEEPCTR "Ctr Beep" #define TR_PROTO INDENT"Proto" #define TR_PPMFRAME "PPM frame" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Som Off" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE INDENT"Inverte Acel." +#define TR_THROTTLEREVERSE TR("Inverte Acel.",INDENT"Inverte Acel.") #define TR_MINUTEBEEP INDENT"Beep Minuto" #define TR_BEEPCOUNTDOWN INDENT"Beep Regressivo" #define TR_PERSISTENT INDENT"Persist." diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 0fac67a01..024726df1 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -440,8 +440,8 @@ #define TR_ELIMITS TR("Gränser++","Utökade Gränser") #define TR_ETRIMS TR("Trimmar++","Utökade Trimmar") #define TR_TRIMINC TR("Trimning","Trimökning") -#define TR_TTRACE INDENT"Följ Gas" -#define TR_TTRIM INDENT"Gastrim" +#define TR_TTRACE TR("Följ Gas",INDENT"Följ Gas") +#define TR_TTRIM TR("Gastrim",INDENT"Gastrim") #define TR_BEEPCTR TR("Cent.pip", "Centerpip") #define TR_PROTO TR(INDENT"Proto",INDENT"Protokoll") #define TR_PPMFRAME "PPM-paket" @@ -505,7 +505,7 @@ #define TR_ALARMWARNING INDENT"Ljud Av" #define TR_RENAVIG "RotEnc Navig" #define TR_THROTTLE_LABEL "Throttle" -#define TR_THROTTLEREVERSE INDENT"Revers.Gas" +#define TR_THROTTLEREVERSE TR("Revers.Gas",INDENT"Revers.Gas") #define TR_MINUTEBEEP INDENT"Minutpip" #define TR_BEEPCOUNTDOWN INDENT"Räkna Ned" #define TR_PERSISTENT TR("Jämt på ",INDENT"Alltid På")