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

Rework failsafe : cosmetics

Browse Source
This commit is contained in:
3djc
2019-04-30 12:34:15 +02:00
parent 98dfa4bd98
commit 4f6828aa1c
16 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/model_failsafe.cpp
+2 -2
View File
@@ -37,7 +37,7 @@ void onFailsafeMenu(const char *result)
else if (result == STR_CHANNEL2FAILSAFE) {
failsafe = channelValue;
}
else if (result == STR_OUTPUTS2FAILSAFE) {
else if (result == STR_CHANNELS2FAILSAFE) {
setCustomFailsafe(g_moduleIdx);
}
s_editMode = 0;
@@ -69,7 +69,7 @@ void menuModelFailsafe(event_t event)
POPUP_MENU_ADD_ITEM(STR_NONE);
POPUP_MENU_ADD_ITEM(STR_HOLD);
POPUP_MENU_ADD_ITEM(STR_CHANNEL2FAILSAFE);
POPUP_MENU_ADD_ITEM(STR_OUTPUTS2FAILSAFE);
POPUP_MENU_ADD_ITEM(STR_CHANNELS2FAILSAFE);
POPUP_MENU_START(onFailsafeMenu);
}
radio/src/gui/212x64/model_failsafe.cpp
+1 -1
View File
@@ -172,6 +172,6 @@ void menuModelFailsafe(event_t event)
if (menuVerticalPosition >= sentModuleChannels(g_moduleIdx)) {
// Outputs => Failsafe
lcdDrawText(CENTER_OFS, LCD_H - (FH + 1), STR_OUTPUTS2FAILSAFE, INVERS);
lcdDrawText(CENTER_OFS, LCD_H - (FH + 1), STR_CHANNELS2FAILSAFE, INVERS);
}
}
radio/src/gui/480x272/model_failsafe.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ bool menuModelFailsafe(event_t event)
// draw that menu at the bottom center
flags = CENTERED | (menuVerticalPosition == ch ? INVERS : 0);
lcdDrawSizedText(LCD_W/2, MENU_CONTENT_TOP - FH + 8*(FH+2), STR_OUTPUTS2FAILSAFE, 20, flags);
lcdDrawSizedText(LCD_W/2, MENU_CONTENT_TOP - FH + 8*(FH+2), STR_CHANNELS2FAILSAFE, 20, flags);
break;
}
}
radio/src/translations.cpp
+1 -1
View File
@@ -292,7 +292,7 @@ const char STR_THROTTLENOTIDLE[] = TR_THROTTLENOTIDLE;
const char STR_ALARMSDISABLED[] = TR_ALARMSDISABLED;
const char STR_PRESSANYKEY[] = TR_PRESSANYKEY;
const char STR_TRIMS2OFFSETS[] = TR_TRIMS2OFFSETS;
const char STR_OUTPUTS2FAILSAFE[] = TR_OUTPUTS2FAILSAFE;
const char STR_CHANNELS2FAILSAFE[] = TR_CHANNELS2FAILSAFE;
const char STR_CHANNEL2FAILSAFE[] = TR_CHANNEL2FAILSAFE;
const char STR_MENURADIOSETUP[] = TR_MENURADIOSETUP;
radio/src/translations.h
+1 -1
View File
@@ -511,7 +511,7 @@ extern const char STR_BAD_RADIO_DATA[];
extern const char STR_STORAGE_FORMAT[];
extern const char STR_EEPROMOVERFLOW[];
extern const char STR_TRIMS2OFFSETS[];
extern const char STR_OUTPUTS2FAILSAFE[];
extern const char STR_CHANNELS2FAILSAFE[];
extern const char STR_CHANNEL2FAILSAFE[];
extern const char STR_MENURADIOSETUP[];
extern const char STR_MENUDATEANDTIME[];
radio/src/translations/cz.h.txt
+2 -2
View File
@@ -748,10 +748,10 @@
#define TR_TRIMS2OFFSETS "\006Trimy => Subtrimy"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL "MODEL"
#define TR_MENUSETUP "NASTAVENÍ"
radio/src/translations/de.h.txt
+2 -2
View File
@@ -759,10 +759,10 @@
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL TR("MODELLE", "MODELL WÄHLEN")
#define TR_MENUSETUP TR("MODELL-EINSTELLUNG", "MODELL-EINSTELLUNGEN")
radio/src/translations/en.h.txt
+1 -1
View File
@@ -752,7 +752,7 @@
#else
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#define TR_MENUMODELSEL TR("MODELSEL", "MODEL SELECTION")
#define TR_MENUSETUP TR("SETUP", "MODEL SETUP")
radio/src/translations/es.h.txt
+2 -2
View File
@@ -752,10 +752,10 @@
#define TR_TRIMS2OFFSETS "\006Trims => Offsets"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL TR("MODELSEL", "SELECCION MODELO")
#define TR_MENUSETUP TR("CONF.", "CONF.MODELO")
radio/src/translations/fi.h.txt
+1 -1
View File
@@ -743,7 +743,7 @@
#else
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION")
#define TR_MENUSETUP TR("SETUP","MODEL SETUP")
radio/src/translations/fr.h.txt
+1 -1
View File
@@ -764,7 +764,7 @@
#else
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#define TR_MENUMODELSEL "MODELES"
#define TR_MENUSETUP TR("CONF. MODELE", "CONFIGURATION")
radio/src/translations/it.h.txt
+2 -2
View File
@@ -754,10 +754,10 @@
#define TR_TRIMS2OFFSETS "\006Trim => Offset "
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL "MODELLI"
#define TR_MENUSETUP "CONFIGURA"
radio/src/translations/nl.h.txt
+2 -2
View File
@@ -755,10 +755,10 @@ TR_GYR_VSRCRAW
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL TR("MODELLEN", "MODEL KIEZEN")
#define TR_MENUSETUP TR("MODEL-INSTELLING", "MODEL-INSTELLINGEN")
radio/src/translations/pl.h.txt
+2 -2
View File
@@ -755,10 +755,10 @@
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL TR("WYB.MODEL","WYBÓR MODELU")
#define TR_MENUSETUP TR("USTAW","USTAW MODELU")
radio/src/translations/pt.h.txt
+2 -2
View File
@@ -751,10 +751,10 @@
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL "MODELOS"
#define TR_MENUSETUP "SETUP"
radio/src/translations/se.h.txt
+2 -2
View File
@@ -767,10 +767,10 @@
#define TR_TRIMS2OFFSETS "\006[Spara Trimvärden]"
#endif
#if defined(COLORLCD)
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
#else
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
#endif
#define TR_MENUMODELSEL TR("MODELL","VÄLJ MODELL")
#define TR_MENUSETUP TR("VÄRDEN","MODELLINSTÄLLNINGAR")