Rework failsafe : cosmetics
This commit is contained in:
@@ -37,7 +37,7 @@ void onFailsafeMenu(const char *result)
|
|||||||
else if (result == STR_CHANNEL2FAILSAFE) {
|
else if (result == STR_CHANNEL2FAILSAFE) {
|
||||||
failsafe = channelValue;
|
failsafe = channelValue;
|
||||||
}
|
}
|
||||||
else if (result == STR_OUTPUTS2FAILSAFE) {
|
else if (result == STR_CHANNELS2FAILSAFE) {
|
||||||
setCustomFailsafe(g_moduleIdx);
|
setCustomFailsafe(g_moduleIdx);
|
||||||
}
|
}
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
@@ -69,7 +69,7 @@ void menuModelFailsafe(event_t event)
|
|||||||
POPUP_MENU_ADD_ITEM(STR_NONE);
|
POPUP_MENU_ADD_ITEM(STR_NONE);
|
||||||
POPUP_MENU_ADD_ITEM(STR_HOLD);
|
POPUP_MENU_ADD_ITEM(STR_HOLD);
|
||||||
POPUP_MENU_ADD_ITEM(STR_CHANNEL2FAILSAFE);
|
POPUP_MENU_ADD_ITEM(STR_CHANNEL2FAILSAFE);
|
||||||
POPUP_MENU_ADD_ITEM(STR_OUTPUTS2FAILSAFE);
|
POPUP_MENU_ADD_ITEM(STR_CHANNELS2FAILSAFE);
|
||||||
POPUP_MENU_START(onFailsafeMenu);
|
POPUP_MENU_START(onFailsafeMenu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -172,6 +172,6 @@ void menuModelFailsafe(event_t event)
|
|||||||
|
|
||||||
if (menuVerticalPosition >= sentModuleChannels(g_moduleIdx)) {
|
if (menuVerticalPosition >= sentModuleChannels(g_moduleIdx)) {
|
||||||
// Outputs => Failsafe
|
// Outputs => Failsafe
|
||||||
lcdDrawText(CENTER_OFS, LCD_H - (FH + 1), STR_OUTPUTS2FAILSAFE, INVERS);
|
lcdDrawText(CENTER_OFS, LCD_H - (FH + 1), STR_CHANNELS2FAILSAFE, INVERS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ bool menuModelFailsafe(event_t event)
|
|||||||
|
|
||||||
// draw that menu at the bottom center
|
// draw that menu at the bottom center
|
||||||
flags = CENTERED | (menuVerticalPosition == ch ? INVERS : 0);
|
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;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -292,7 +292,7 @@ const char STR_THROTTLENOTIDLE[] = TR_THROTTLENOTIDLE;
|
|||||||
const char STR_ALARMSDISABLED[] = TR_ALARMSDISABLED;
|
const char STR_ALARMSDISABLED[] = TR_ALARMSDISABLED;
|
||||||
const char STR_PRESSANYKEY[] = TR_PRESSANYKEY;
|
const char STR_PRESSANYKEY[] = TR_PRESSANYKEY;
|
||||||
const char STR_TRIMS2OFFSETS[] = TR_TRIMS2OFFSETS;
|
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_CHANNEL2FAILSAFE[] = TR_CHANNEL2FAILSAFE;
|
||||||
const char STR_MENURADIOSETUP[] = TR_MENURADIOSETUP;
|
const char STR_MENURADIOSETUP[] = TR_MENURADIOSETUP;
|
||||||
|
|
||||||
|
|||||||
@@ -511,7 +511,7 @@ extern const char STR_BAD_RADIO_DATA[];
|
|||||||
extern const char STR_STORAGE_FORMAT[];
|
extern const char STR_STORAGE_FORMAT[];
|
||||||
extern const char STR_EEPROMOVERFLOW[];
|
extern const char STR_EEPROMOVERFLOW[];
|
||||||
extern const char STR_TRIMS2OFFSETS[];
|
extern const char STR_TRIMS2OFFSETS[];
|
||||||
extern const char STR_OUTPUTS2FAILSAFE[];
|
extern const char STR_CHANNELS2FAILSAFE[];
|
||||||
extern const char STR_CHANNEL2FAILSAFE[];
|
extern const char STR_CHANNEL2FAILSAFE[];
|
||||||
extern const char STR_MENURADIOSETUP[];
|
extern const char STR_MENURADIOSETUP[];
|
||||||
extern const char STR_MENUDATEANDTIME[];
|
extern const char STR_MENUDATEANDTIME[];
|
||||||
|
|||||||
@@ -748,10 +748,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trimy => Subtrimy"
|
#define TR_TRIMS2OFFSETS "\006Trimy => Subtrimy"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL "MODEL"
|
#define TR_MENUMODELSEL "MODEL"
|
||||||
#define TR_MENUSETUP "NASTAVENÍ"
|
#define TR_MENUSETUP "NASTAVENÍ"
|
||||||
|
|||||||
@@ -759,10 +759,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL TR("MODELLE", "MODELL WÄHLEN")
|
#define TR_MENUMODELSEL TR("MODELLE", "MODELL WÄHLEN")
|
||||||
#define TR_MENUSETUP TR("MODELL-EINSTELLUNG", "MODELL-EINSTELLUNGEN")
|
#define TR_MENUSETUP TR("MODELL-EINSTELLUNG", "MODELL-EINSTELLUNGEN")
|
||||||
|
|||||||
@@ -752,7 +752,7 @@
|
|||||||
#else
|
#else
|
||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#define TR_MENUMODELSEL TR("MODELSEL", "MODEL SELECTION")
|
#define TR_MENUMODELSEL TR("MODELSEL", "MODEL SELECTION")
|
||||||
#define TR_MENUSETUP TR("SETUP", "MODEL SETUP")
|
#define TR_MENUSETUP TR("SETUP", "MODEL SETUP")
|
||||||
|
|||||||
@@ -752,10 +752,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trims => Offsets"
|
#define TR_TRIMS2OFFSETS "\006Trims => Offsets"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL TR("MODELSEL", "SELECCION MODELO")
|
#define TR_MENUMODELSEL TR("MODELSEL", "SELECCION MODELO")
|
||||||
#define TR_MENUSETUP TR("CONF.", "CONF.MODELO")
|
#define TR_MENUSETUP TR("CONF.", "CONF.MODELO")
|
||||||
|
|||||||
@@ -743,7 +743,7 @@
|
|||||||
#else
|
#else
|
||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION")
|
#define TR_MENUMODELSEL TR("MODELSEL","MODEL SELECTION")
|
||||||
#define TR_MENUSETUP TR("SETUP","MODEL SETUP")
|
#define TR_MENUSETUP TR("SETUP","MODEL SETUP")
|
||||||
|
|||||||
@@ -764,7 +764,7 @@
|
|||||||
#else
|
#else
|
||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#define TR_MENUMODELSEL "MODELES"
|
#define TR_MENUMODELSEL "MODELES"
|
||||||
#define TR_MENUSETUP TR("CONF. MODELE", "CONFIGURATION")
|
#define TR_MENUSETUP TR("CONF. MODELE", "CONFIGURATION")
|
||||||
|
|||||||
@@ -754,10 +754,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trim => Offset "
|
#define TR_TRIMS2OFFSETS "\006Trim => Offset "
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL "MODELLI"
|
#define TR_MENUMODELSEL "MODELLI"
|
||||||
#define TR_MENUSETUP "CONFIGURA"
|
#define TR_MENUSETUP "CONFIGURA"
|
||||||
|
|||||||
@@ -755,10 +755,10 @@ TR_GYR_VSRCRAW
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL TR("MODELLEN", "MODEL KIEZEN")
|
#define TR_MENUMODELSEL TR("MODELLEN", "MODEL KIEZEN")
|
||||||
#define TR_MENUSETUP TR("MODEL-INSTELLING", "MODEL-INSTELLINGEN")
|
#define TR_MENUSETUP TR("MODEL-INSTELLING", "MODEL-INSTELLINGEN")
|
||||||
|
|||||||
@@ -755,10 +755,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL TR("WYB.MODEL","WYBÓR MODELU")
|
#define TR_MENUMODELSEL TR("WYB.MODEL","WYBÓR MODELU")
|
||||||
#define TR_MENUSETUP TR("USTAW","USTAW MODELU")
|
#define TR_MENUSETUP TR("USTAW","USTAW MODELU")
|
||||||
|
|||||||
@@ -751,10 +751,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
#define TR_TRIMS2OFFSETS "\006Trims => Subtrims"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL "MODELOS"
|
#define TR_MENUMODELSEL "MODELOS"
|
||||||
#define TR_MENUSETUP "SETUP"
|
#define TR_MENUSETUP "SETUP"
|
||||||
|
|||||||
@@ -767,10 +767,10 @@
|
|||||||
#define TR_TRIMS2OFFSETS "\006[Spara Trimvärden]"
|
#define TR_TRIMS2OFFSETS "\006[Spara Trimvärden]"
|
||||||
#endif
|
#endif
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
#define TR_OUTPUTS2FAILSAFE "Outputs=>Failsafe"
|
#define TR_CHANNELS2FAILSAFE "Channels=>Failsafe"
|
||||||
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
#define TR_CHANNEL2FAILSAFE "Channel=>Failsafe"
|
||||||
#else
|
#else
|
||||||
#define TR_OUTPUTS2FAILSAFE "\006Outputs => Failsafe"
|
#define TR_CHANNELS2FAILSAFE "\006Outputs => Failsafe"
|
||||||
#endif
|
#endif
|
||||||
#define TR_MENUMODELSEL TR("MODELL","VÄLJ MODELL")
|
#define TR_MENUMODELSEL TR("MODELL","VÄLJ MODELL")
|
||||||
#define TR_MENUSETUP TR("VÄRDEN","MODELLINSTÄLLNINGAR")
|
#define TR_MENUSETUP TR("VÄRDEN","MODELLINSTÄLLNINGAR")
|
||||||
|
|||||||
Reference in New Issue
Block a user