piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3796 from opentx/3djc/Horus-fix-model-setup-pots

Browse Source 
Fix model setup screen for Horus of pots and slides checks handling
This commit is contained in:
3djc
2016-09-14 08:15:40 +02:00
committed by GitHub
parent edee15b21d b4f957a166
commit bbb2fe2dbc
14 changed files with 142 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/model_setup.cpp
+86 -36
View File
@@ -56,7 +56,9 @@ enum MenuModelSetupItems {
ITEM_MODEL_CHECKLIST_DISPLAY,
ITEM_MODEL_THROTTLE_WARNING,
ITEM_MODEL_SWITCHES_WARNING,
ITEM_MODEL_POT_WARNING,
ITEM_MODEL_SLIDPOT_WARNING_STATE,
ITEM_MODEL_POTS_WARNING,
ITEM_MODEL_SLIDERS_WARNING,
ITEM_MODEL_BEEP_CENTER,
ITEM_MODEL_USE_GLOBAL_FUNCTIONS,
ITEM_MODEL_INTERNAL_MODULE_LABEL,
@@ -87,6 +89,7 @@ enum MenuModelSetupItems {
#define MODEL_SETUP_BIND_OFS 40
#define MODEL_SETUP_RANGE_OFS 80
#define MODEL_SETUP_SET_FAILSAFE_OFS 100
#define MODEL_SETUP_SLIDPOT_SPACING 45
void onModelSetupBitmapMenu(const char * result)
{
@@ -216,7 +219,9 @@ int getSwitchWarningsCount()
#endif
#define SW_WARN_ITEMS() uint8_t(NAVIGATION_LINE_BY_LINE|(getSwitchWarningsCount()-1))
#define POT_WARN_ITEMS() ((g_model.potsWarnMode >> 6) ? uint8_t(NUM_POTS+NUM_SLIDERS) : (uint8_t)0)
#define POT_WARN_ROWS (uint8_t)0
#define POT_WARN_ITEMS() ((g_model.potsWarnMode) ? uint8_t(NAVIGATION_LINE_BY_LINE|(NUM_POTS-1)) : (uint8_t)0)
#define SLIDER_WARN_ITEMS() ((g_model.potsWarnMode) ? uint8_t(NAVIGATION_LINE_BY_LINE|(NUM_SLIDERS-1)) : (uint8_t)0)
bool menuModelSetup(event_t event)
{
@@ -233,7 +238,7 @@ bool menuModelSetup(event_t event)
MENU(STR_MENUSETUP, MODEL_ICONS, menuTabModel, MENU_MODEL_SETUP, ITEM_MODEL_SETUP_MAX,
{ 0, 0, TIMERS_ROWS, 0, 1, 0, 0,
LABEL(Throttle), 0, 0, 0,
LABEL(PreflightCheck), 0, 0, SW_WARN_ITEMS(), POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1), 0,
LABEL(PreflightCheck), 0, 0, SW_WARN_ITEMS(), POT_WARN_ROWS, (g_model.potsWarnMode ? POT_WARN_ITEMS() : HIDDEN_ROW), (g_model.potsWarnMode ? SLIDER_WARN_ITEMS() : HIDDEN_ROW), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_SLIDERS+NUM_ROTARY_ENCODERS-1), 0,
LABEL(InternalModule),
INTERNAL_MODULE_MODE_ROWS,
INTERNAL_MODULE_CHANNELS_ROWS,
@@ -482,46 +487,91 @@ bool menuModelSetup(event_t event)
break;
}
case ITEM_MODEL_POT_WARNING:
{
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_POTWARNING);
case ITEM_MODEL_SLIDPOT_WARNING_STATE:
lcdDrawText(MENUS_MARGIN_LEFT, y,STR_POTWARNINGSTATE);
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, PSTR("\004""OFF\0""Man\0""Auto"), g_model.potsWarnMode, attr);
if (attr) {
if (menuHorizontalPosition) s_editMode = 0;
if (!READ_ONLY() && menuHorizontalPosition) {
switch (event) {
case EVT_KEY_LONG(KEY_ENTER):
killEvents(event);
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
SAVE_POT_POSITION(menuHorizontalPosition-1);
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
break;
case EVT_KEY_BREAK(KEY_ENTER):
g_model.potsWarnEnabled ^= (1 << (menuHorizontalPosition-1));
storageDirty(EE_MODEL);
break;
}
}
}
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, PSTR("\004""OFF\0""Man\0""Auto"), g_model.potsWarnMode, (menuHorizontalPosition == 0) ? attr : 0);
if (g_model.potsWarnMode) {
coord_t x = MODEL_SETUP_2ND_COLUMN+30;
for (int i=0; i<NUM_POTS+NUM_SLIDERS; ++i) {
LcdFlags flags = (((menuHorizontalPosition==i+1) && attr) ? INVERS : 0);
flags |= (g_model.potsWarnEnabled & (1 << i)) ? TEXT_DISABLE_COLOR : TEXT_COLOR;
lcdDrawTextAtIndex(x, y, STR_VSRCRAW, NUM_STICKS+1+i, flags);
x += 20;
}
}
if (attr && (menuHorizontalPosition == 0)) {
CHECK_INCDEC_MODELVAR(event, g_model.potsWarnMode, POTS_WARN_OFF, POTS_WARN_AUTO);
storageDirty(EE_MODEL);
}
break;
case ITEM_MODEL_POTS_WARNING:
{
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_POTWARNING);
if (attr) {
if (!READ_ONLY() && menuHorizontalPosition >= 0 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
SAVE_POT_POSITION(menuHorizontalPosition);
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
}
if (!READ_ONLY() && menuHorizontalPosition >= 0 && s_editMode && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
g_model.potsWarnEnabled ^= (1 << (menuHorizontalPosition));
storageDirty(EE_MODEL);
}
}
if (attr && menuHorizontalPosition < 0) {
lcdDrawSolidFilledRect(MODEL_SETUP_2ND_COLUMN-INVERT_HORZ_MARGIN, y-INVERT_VERT_MARGIN+1, NUM_POTS*MODEL_SETUP_SLIDPOT_SPACING+INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
}
if (g_model.potsWarnMode) {
coord_t x = MODEL_SETUP_2ND_COLUMN;
for (int i=0; i<NUM_POTS; ++i) {
LcdFlags flags = (((menuHorizontalPosition==i) && attr) ? INVERS : 0);
flags |= (g_model.potsWarnEnabled & (1 << i)) ? TEXT_DISABLE_COLOR : TEXT_COLOR;
if (attr && menuHorizontalPosition < 0) {
flags |= INVERS;
}
lcdDrawTextAtIndex(x, y, STR_VSRCRAW, NUM_STICKS+1+i, flags);
x += MODEL_SETUP_SLIDPOT_SPACING;
}
}
break;
}
case ITEM_MODEL_SLIDERS_WARNING:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_SLIDERWARNING);
if (attr) {
if (!READ_ONLY() && menuHorizontalPosition+1 && event==EVT_KEY_LONG(KEY_ENTER)) {
killEvents(event);
if (g_model.potsWarnMode == POTS_WARN_MANUAL) {
SAVE_POT_POSITION(menuHorizontalPosition+NUM_POTS);
AUDIO_WARNING1();
storageDirty(EE_MODEL);
}
}
if (!READ_ONLY() && menuHorizontalPosition+1 && s_editMode && event==EVT_KEY_BREAK(KEY_ENTER)) {
s_editMode = 0;
g_model.potsWarnEnabled ^= (1 << (menuHorizontalPosition+NUM_POTS));
storageDirty(EE_MODEL);
}
}
if (attr && menuHorizontalPosition < 0) {
lcdDrawSolidFilledRect(MODEL_SETUP_2ND_COLUMN-INVERT_HORZ_MARGIN, y-INVERT_VERT_MARGIN+1, NUM_SLIDERS*MODEL_SETUP_SLIDPOT_SPACING+INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
}
if (g_model.potsWarnMode) {
coord_t x = MODEL_SETUP_2ND_COLUMN;
for (int i=NUM_POTS; i<NUM_POTS+NUM_SLIDERS; ++i) {
LcdFlags flags = (((menuHorizontalPosition==i-NUM_POTS) && attr) ? INVERS : 0);
flags |= (g_model.potsWarnEnabled & (1 << i)) ? TEXT_DISABLE_COLOR : TEXT_COLOR;
if (attr && menuHorizontalPosition < 0) {
flags |= INVERS;
}
lcdDrawTextAtIndex(x, y, STR_VSRCRAW, NUM_STICKS+1+i, flags);
x += MODEL_SETUP_SLIDPOT_SPACING;
}
}
break;
case ITEM_MODEL_BEEP_CENTER:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BEEPCTR);
lcdNextPos = MODEL_SETUP_2ND_COLUMN - 3;
radio/src/translations.cpp
+3 -1
View File
@@ -260,6 +260,9 @@ const pm_char STR_BLOFFBRIGHTNESS[] PROGMEM = TR_BLOFFBRIGHTNESS;
const pm_char STR_SPLASHSCREEN[] PROGMEM = TR_SPLASHSCREEN;
const pm_char STR_THROTTLEWARNING[] PROGMEM = TR_THROTTLEWARNING;
const pm_char STR_SWITCHWARNING[] PROGMEM = TR_SWITCHWARNING;
const pm_char STR_POTWARNINGSTATE[] PROGMEM = TR_POTWARNINGSTATE;
const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING;
const pm_char STR_SLIDERWARNING[] PROGMEM = TR_SLIDERWARNING;
#ifdef TELEMETRY_FRSKY
const pm_char STR_TIMEZONE[] PROGMEM = TR_TIMEZONE;
const pm_char STR_ADJUST_RTC[] PROGMEM = TR_ADJUST_RTC;
@@ -668,7 +671,6 @@ const pm_char STR_MODEL_SELECT[] PROGMEM = TR_MODEL_SELECT;
const pm_char STR_ALTITUDE[] PROGMEM = TR_ALTITUDE;
const pm_char STR_SCALE[] PROGMEM = TR_SCALE;
const pm_char STR_VIEW_CHANNELS[] PROGMEM = TR_VIEW_CHANNELS;
const pm_char STR_POTWARNING[] PROGMEM = TR_POTWARNING;
const pm_char STR_UART3MODE[] PROGMEM = TR_UART3MODE;
const pm_char STR_THROTTLE_LABEL[] PROGMEM = TR_THROTTLE_LABEL;
const pm_char STR_SCRIPT[] PROGMEM = TR_SCRIPT;
radio/src/translations.h
+3
View File
@@ -490,6 +490,9 @@ extern const pm_char STR_BLOFFBRIGHTNESS[];
extern const pm_char STR_SPLASHSCREEN[];
extern const pm_char STR_THROTTLEWARNING[];
extern const pm_char STR_SWITCHWARNING[];
extern const pm_char STR_POTWARNINGSTATE[];
extern const pm_char STR_POTWARNING[];
extern const pm_char STR_SLIDERWARNING[];
extern const pm_char STR_TIMEZONE[];
extern const pm_char STR_ADJUST_RTC[];
extern const pm_char STR_GPS[];
radio/src/translations/cz.h.txt
+2
View File
@@ -753,6 +753,8 @@
#define TR_SPLASHSCREEN TR("úvodníLogo", "Zobrazit úvodní logo")
#define TR_THROTTLEWARNING TR("* Plyn", INDENT "Kontrola plynu")
#define TR_SWITCHWARNING TR("* Spínače", INDENT "Polohy spínačů")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("* Potenc.", INDENT "Nastavení Pot.")
#define TR_TIMEZONE "časové pásmo"
#define TR_ADJUST_RTC INDENT "Upravit RTC"
radio/src/translations/de.h.txt
+30 -28
View File
@@ -20,16 +20,16 @@
*/
// DE translations author: Helmut Renz
// German checked 01.07.2016 r122 opentx V2.2.0 für X12S,X9E, X9D+,X9D,Th9,9XR,9XR-Pro
// German checked 01.07.2016 r122 opentx V2.2.0 für X12S,X9E, X9D+,X9D,Th9,9XR,9XR-Pro
/*
* !!!!! DO NOT EDIT de.h - EDIT de.h.txt INSTEAD !!!!!!!
*
* In order to make translations easier de.h.txt is parsed and national
* characters are replaced by bitmap codes. The result is de.h.
*
* See translate.py in the util folder for the list of character codes
*
* !!!!! DO NOT EDIT de.h - EDIT de.h.txt INSTEAD !!!!!!!
* See translate.py in the util folder for the list of character codes
*
* !!!!! DO NOT EDIT de.h - EDIT de.h.txt INSTEAD !!!!!!!
*/
/*
@@ -80,7 +80,7 @@
#define LEN_SWTYPES "\006"
#define TR_SWTYPES "Kein\0 ""Taster""2POS\0 ""3POS\0"
#define LEN_POTTYPES "\017"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "Kein\0 ""Poti mit Raste ""Stufen-Schalter""Poti ohne Raste\0"
#define LEN_SLIDERTYPES "\006"
@@ -98,7 +98,7 @@
#define LEN_COUNTRYCODES TR("\002", "\007")
#define TR_COUNTRYCODES TR("US""JP""EU", "Amerika""Japan\0 ""Europa\0")
#define LEN_TARANIS_PROTOCOLS "\004"
#define LEN_TARANIS_PROTOCOLS "\004"
#define TR_TARANIS_PROTOCOLS "AUS\0""PPM\0""XJT\0""DSM?""CRSF""MULT"
#define LEN_TELEMETRY_PROTOCOLS "\017"
@@ -241,7 +241,7 @@
#if LCD_W >= 212
#define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator
#define TR_CSWSTICKY "SRFF\0" // Sticky = RS-Flip-Flop
#define TR_CSWRANGE "Range" // Range = Bereichsabfrage von bis
#define TR_CSWRANGE "Range" // Range = Bereichsabfrage von bis
#define TR_CSWSTAY "Puls\0" // Edge = einstellbarer Impuls
#else
#define TR_CSWTIMER "Takt\0" // TIM = Takt = Taktgenerator
@@ -270,7 +270,7 @@
#define LEN_VFSWFUNC "\012"
#if defined(VARIO)
#if defined(VARIO)
#define TR_VVARIO "Vario\0 " // nur 10 Zeichen String!
#else
#define TR_VVARIO "[Vario]\0 "
@@ -294,7 +294,7 @@
#else
#define TR_PLAY_TRACK "Sag Text\0 "
#endif
#define TR_PLAY_BOTH "Sag Beide "
#define TR_PLAY_BOTH "Sag Beide "
#define TR_PLAY_VALUE TR("Sag Wert\0 ", "Sag Wert ")
#else
#define TR_PLAY_TRACK "[Sag Text]"
@@ -345,7 +345,7 @@
#define TR_SF_RESERVE "[Reserve]\0"
#if defined(CPUARM)
#define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " "SetFailsfe" "RangeCheck" "ModuleBind" TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_SCREENSHOT TR_SF_TEST
#define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0""Setze \0 " TR_ADJUST_GVAR "Lautstr.\0 " "SetFailsfe" "RangeCheck" "ModuleBind" TR_SOUND TR_PLAY_TRACK TR_PLAY_VALUE TR_SF_RESERVE TR_SF_PLAY_SCRIPT TR_SF_RESERVE TR_SF_BG_MUSIC TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_SCREENSHOT TR_SF_TEST
#elif defined(PCBGRUVIN9X)
#define TR_VFSWFUNC TR_SF_SAFETY "Lehrer \0 ""Inst. Trim""Rücksetz.\0" TR_ADJUST_GVAR TR_SOUND TR_PLAY_TRACK TR_PLAY_BOTH TR_PLAY_VALUE TR_VVARIO TR_HAPTIC TR_SDCLOGS "LCD Licht\0" TR_SF_TEST
#else
@@ -388,8 +388,8 @@
#define TR_TELEM_TIME TR("Zeit", "Zeit\0")
#define TR_SWR TR("SWR\0", "SWR\0 ")
#define TR_RX_BATT TR("[NA]", "[NA]\0")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#define TR_A3_A4 TR("A3\0 ""A4\0 ", "A3\0 ""A4\0 ")
#define TR_A3_A4_MIN TR("A3-\0""A4-\0", "A3-\0 ""A4-\0 ")
#else
#define TR_TELEM_RESERVE
#define TR_TELEM_TIME
@@ -399,7 +399,7 @@
#define TR_A3_A4_MIN
#endif
#define TR_ASPD_MAX TR("ASp+", "ASpd+")
#define TR_ASPD_MAX TR("ASp+", "ASpd+")
#if LCD_W >= 212
#define TR_TELEM_RSSI_RX "RSSI\0"
@@ -474,7 +474,7 @@
#define LEN_VTELEMSCREENTYPE "\007"
#define TR_VTELEMSCREENTYPE " None "" Werte "" Balken"" Script"
#else
#define LEN_VTELEMSCREENTYPE "\007"
#define LEN_VTELEMSCREENTYPE "\007"
#define TR_VTELEMSCREENTYPE " Werte "" Balken"
#endif
@@ -681,7 +681,7 @@
#define TR_TRIMINC TR("Trim Schr.", "Trimmschritte")
#define TR_DISPLAY_TRIMS TR("Trim anzeig", "Trimwerte anzeigen")
#define TR_TTRACE TR("Gasquelle", INDENT "Gas-Timerquelle")
#define TR_TTRIM TR("Gastrim", INDENT "Gas-Leerlauftrim")
#define TR_TTRIM TR("Gastrim", INDENT "Gas-Leerlauftrim")
#define TR_BEEPCTR TR("Mitt.Piep", "Mittelstell. -Pieps")
#define TR_USE_GLOBAL_FUNCS TR("Glob. Funkt.", "Globale Funkt verw.")
#if defined(PCBSKY9X) && defined(REVX)
@@ -707,8 +707,8 @@
#define TR_ELEVATOR "Nick Quelle"
#define TR_SWASHRING TR("Ring Begrenz", "Ring Begrenzung")
#define TR_ELEDIRECTION TR("Nick Richtung", "Nick Servo Richtung")
#define TR_AILDIRECTION TR("Roll Richtung", "Roll Servo Richtung")
#define TR_COLDIRECTION TR("Pitch Richtung", "Pitch Servo Richtung")
#define TR_AILDIRECTION TR("Roll Richtung", "Roll Servo Richtung")
#define TR_COLDIRECTION TR("Pitch Richtung", "Pitch Servo Richtung")
#define TR_MODE INDENT "Modus"
#define TR_SUBTYPE INDENT "Subtype"
#define TR_NOFREEEXPO "Expos voll!"
@@ -770,6 +770,8 @@
#define TR_SPLASHSCREEN TR("Startbild Ein", "Startbild Ein für")
#define TR_THROTTLEWARNING TR("Gasalarm", INDENT "Gas Alarm")
#define TR_SWITCHWARNING TR("Sch. Alarm", INDENT "Schalter-Alarm")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("Pot Warn.", INDENT "Poti-Warnung")
#define TR_TIMEZONE TR("Zeitzone", "GPS-Zeitzone +/-Std")
#define TR_ADJUST_RTC INDENT "Uhrzeit per GPS setzen"
@@ -820,14 +822,14 @@
#endif
#define TR_MENUTORESET CENTER TR_ENTER " für Reset"
#define TR_PPM_TRAINER "TR"
#define TR_PPM_TRAINER "TR"
#define TR_CH "CH"
#define TR_MODEL "MODELL"
#define TR_FP "FP"
#define TR_MIX "MIX"
#define TR_EEPROMLOWMEM "EEPROM voll"
#define TR_ALERT "WARNUNG"
#define TR_PRESSANYKEYTOSKIP TR("Taste drücken",CENTER"Taste drücken")
#define TR_PRESSANYKEYTOSKIP TR("Taste drücken",CENTER"Taste drücken")
#define TR_THROTTLENOTIDLE "Gas nicht Null!"
#define TR_ALARMSDISABLED "Alarme ausgeschaltet"
#define TR_PRESSANYKEY TR("Taste drücken",CENTER"Taste drücken")
@@ -893,7 +895,7 @@
#define TR_MULTI_AUTOBIND INDENT "Autobind"
#define TR_MULTI_LOWPOWER TR(INDENT "Low power", INDENT "Low power mode")
#define TR_SYNCMENU "Sync [MENU]"
#define TR_LIMIT INDENT "Grenzen"
#define TR_LIMIT INDENT "Grenzen"
#define TR_MINRSSI "Min. RSSI"
#define TR_LATITUDE "Breite:"
#define TR_LONGITUDE "Länge:"
@@ -937,8 +939,8 @@
#define TR_EMERGENCY_MODE "EMERGENCY MODE"
#define TR_PCBREV_ERROR "PCB error"
#define TR_NO_FAILSAFE TR("Failsafe not set", "Failsafe nicht programmiert")
#define TR_KEYSTUCK "Taste klemmt" //Key stuck=Taste klemmt
#define TR_INVERT_THR TR("Gas umkehren?", "Vollgas hinten?") // Th9x 9XR
#define TR_KEYSTUCK "Taste klemmt" //Key stuck=Taste klemmt
#define TR_INVERT_THR TR("Gas umkehren?", "Vollgas hinten?") // Th9x 9XR
#define TR_SPEAKER_VOLUME INDENT "Lautstärke"
#define TR_LCD "Bildschirm"
#define TR_BRIGHTNESS INDENT "Helligkeit"
@@ -973,7 +975,7 @@
#define TR_REMOVED " gelöscht"
#define TR_SD_INFO "Information"
#define TR_SD_FORMAT "Formatieren"
#define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung
#define TR_NA "N/V" //NV=Nicht Verfügbar Kurz-Meldung
#define TR_HARDWARE TR("Hardware einst. ", "Namen und Hardware einst.")
#define TR_FORMATTING "Formatierung..."
#define TR_TEMP_CALIB "Temp. abgl."
@@ -1030,8 +1032,8 @@
#define TR_ABOUT_US "Die Programmierer"
#define TR_SETUP_SCREENS "Setup Hautbildschirme"
#define TR_MONITOR_SCREENS "Monitore Mischer Kanal Logik"
#define TR_AND_SWITCH "UND Schalt" //UND mit weiterem Schaltern
#define TR_SF "SF" //Spezial Funktionen
#define TR_AND_SWITCH "UND Schalt" //UND mit weiterem Schaltern
#define TR_SF "SF" //Spezial Funktionen
#define TR_GF "GF" // Globale Funktionen
#define TR_SPEAKER INDENT "Lautspr"
#define TR_BUZZER INDENT "Summer"
@@ -1071,7 +1073,7 @@
#define TR_PT "Pt"
#define TR_PTS "Pts"
#define TR_SMOOTH "Runden"
#define TR_COPY_STICKS_TO_OFS "Kopie Stick to Servo-Mitte"
#define TR_COPY_STICKS_TO_OFS "Kopie Stick to Servo-Mitte"
#define TR_COPY_TRIMS_TO_OFS "Kopie Trimm to Servo-Mitte" // "Trim to Subtrim"
#define TR_INCDEC "Inc/Decrement"
#define TR_GLOBALVAR "Global Var"
@@ -1175,7 +1177,7 @@
#define TR_ABOUT_MIKE_2 "Code- und Treiber-Guru"
#define TR_ABOUT_MIKE_3 "Wohl einer der Besten."
#define TR_ABOUT_MIKE_4 "Sehr inspirierend."
#define TR_ABOUT_ROMOLO_1 "Romolo Manfredini"
#define TR_ABOUT_ROMOLO_2 "Companion9x-Hauptentwickler"
#define TR_ABOUT_ROMOLO_3 ""
@@ -1216,7 +1218,7 @@
#define TR_CHR_SHORT 's' // Taste short
#define TR_CHR_LONG 'l' // Taste long
#define TR_CHR_TOGGLE 't' // Taste als togglefunktion = Ein Aus Ein
#define TR_CHR_TOGGLE 't' // Taste als togglefunktion = Ein Aus Ein
#define TR_CHR_HOUR 'h' // Stunden
#define TR_CHR_INPUT 'I' // Values between A-I will work
radio/src/translations/en.h.txt
+2
View File
@@ -736,6 +736,8 @@
#define TR_SPLASHSCREEN "Splash screen"
#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT) "T-Warning", INDENT "Throttle state")
#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "S-Warning", INDENT "Switch positions")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Pot warn.", INDENT "Pot positions")
#define TR_TIMEZONE TR("Time Zone", INDENT "Time zone")
#define TR_ADJUST_RTC INDENT "Adjust RTC"
radio/src/translations/es.h.txt
+2
View File
@@ -726,6 +726,8 @@
#define TR_SPLASHSCREEN "Ptalla.inicio"
#define TR_THROTTLEWARNING TR("Aviso-A", INDENT "Aviso Acelerador")
#define TR_SWITCHWARNING TR("Aviso-I", INDENT "Aviso Intrptor")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE TR("Zona Hora", "GPS Zona Hora")
#define TR_ADJUST_RTC INDENT "Adjust RTC"
radio/src/translations/fi.h.txt
+2
View File
@@ -726,6 +726,8 @@
#define TR_SPLASHSCREEN "Splash screen"
#define TR_THROTTLEWARNING TR("T-Warning", INDENT "Throttle Warning")
#define TR_SWITCHWARNING TR("S-Warning", INDENT "Switch Warning")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE TR("Time Zone","GPS Time zone")
#define TR_ADJUST_RTC INDENT "Adjust RTC"
radio/src/translations/fr.h.txt
+2
View File
@@ -752,6 +752,8 @@
#define TR_SPLASHSCREEN "Logo d'accueil"
#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT) "Alerte gaz", INDENT "Alerte gaz")
#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "Alerte int", INDENT "Pos. interrupteurs")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Alerte pot", INDENT "Pos. potentios")
#define TR_TIMEZONE "Fuseau horaire"
#define TR_ADJUST_RTC INDENT "Ajust. heure auto"
radio/src/translations/it.h.txt
+2
View File
@@ -752,6 +752,8 @@
#define TR_SPLASHSCREEN TR("Schermo avvio", "Schermata di avvio")
#define TR_THROTTLEWARNING TR("All. Mot.", INDENT "Allarme Motore")
#define TR_SWITCHWARNING TR("Avv. Int.", INDENT "Avviso Interr.")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("Avv. Pot.", INDENT "Avviso Pot.")
#define TR_TIMEZONE "Ora locale"
#define TR_ADJUST_RTC INDENT "Aggiusta RTC"
radio/src/translations/nl.h.txt
+2 -1
View File
@@ -740,11 +740,12 @@
#define TR_SPLASHSCREEN "Startscherm Aan"
#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT) "T-Warning", INDENT "Throttle Status")
#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "S-Warning", INDENT "Switch Posities")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Pot Warn.", INDENT "Pot Posities")
#define TR_TIMEZONE TR("Tijdzone", "GPS-Tijdzone +/-Std")
#define TR_ADJUST_RTC INDENT "Klok middels GPS instellen"
#define TR_GPS "----GPS--------------"
#define TR_RXCHANNELORD TR("Kan.Volgorde", "Kanaalvolgorde")
#define TR_STICKS "Sticks"
#define TR_POTS "Pots"
radio/src/translations/pl.h.txt
+2
View File
@@ -754,6 +754,8 @@
#define TR_SPLASHSCREEN "Logo ekranu"
#define TR_THROTTLEWARNING TR(IF_CPUARM(INDENT)"OstrzGaz", INDENT "OstrzeżenieGaz")
#define TR_SWITCHWARNING TR(IF_CPUARM(INDENT) "OstrzPrzeł", INDENT "PozycjaPrzeł")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR(IF_CPUARM(INDENT) "Ostrz.Poten.", INDENT "PozycjaPotencj.")
#define TR_TIMEZONE TR("Strefa czasowa" ,"Strefa czasowa GPS")
#define TR_ADJUST_RTC INDENT "RegulujRTC"
radio/src/translations/pt.h.txt
+2
View File
@@ -721,6 +721,8 @@
#define TR_SPLASHSCREEN "Splash screen"
#define TR_THROTTLEWARNING TR("Avisa Acel", INDENT "Avisa Acel")
#define TR_SWITCHWARNING TR("Avisa Chav", INDENT "Avisa Chav")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("Pot Warn.", INDENT "Pot Warning")
#define TR_TIMEZONE "Time Zone"
#define TR_ADJUST_RTC INDENT "Adjust RTC"
radio/src/translations/se.h.txt
+2
View File
@@ -765,6 +765,8 @@
#define TR_BLCOLOR INDENT "Color"
#define TR_THROTTLEWARNING TR("Gasvarning", INDENT "Gasvarning")
#define TR_SWITCHWARNING TR("Bryt.varn.", INDENT "Brytarvarning")
#define TR_POTWARNINGSTATE TR(IF_CPUARM(INDENT) "Pot&Slid.", INDENT "Pots & sliders")
#define TR_SLIDERWARNING TR(IF_CPUARM(INDENT) "Slid. pos.", INDENT "Slider positions")
#define TR_POTWARNING TR("Rattvarn.", INDENT "Rattvarning")
#define TR_TIMEZONE TR("Tidszon", "GPS Tidszon")
#define TR_ADJUST_RTC INDENT "Adjust RTC"