diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index f088efe7a..047d75b4a 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -342,8 +342,8 @@ enum TelemetryScreenType { #define TELEMETRY_SCREEN_TYPE(screenIndex) TelemetryScreenType((g_model.screensType >> (2*(screenIndex))) & 0x03) #define IS_BARS_SCREEN(screenIndex) (TELEMETRY_SCREEN_TYPE(screenIndex) == TELEMETRY_SCREEN_TYPE_GAUGES) -#define FAILSAFE_CHANNEL_HOLD 2000 -#define FAILSAFE_CHANNEL_NOPULSE 2001 +constexpr int16_t FAILSAFE_CHANNEL_HOLD = 2000; +constexpr int16_t FAILSAFE_CHANNEL_NOPULSE = 2001; #define LEN_SCRIPT_FILENAME 6 #define LEN_SCRIPT_NAME 6 diff --git a/radio/src/gui/128x64/model_failsafe.cpp b/radio/src/gui/128x64/model_failsafe.cpp index d0dfb8270..0d413ba43 100644 --- a/radio/src/gui/128x64/model_failsafe.cpp +++ b/radio/src/gui/128x64/model_failsafe.cpp @@ -64,7 +64,7 @@ void menuModelFailsafe(event_t event) wbar -= 6; #endif - if (sub==k && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) { + if (sub == k && !READ_ONLY() && event == EVT_KEY_LONG(KEY_ENTER)) { killEvents(event); POPUP_MENU_ADD_ITEM(STR_NONE); POPUP_MENU_ADD_ITEM(STR_HOLD); @@ -73,9 +73,6 @@ void menuModelFailsafe(event_t event) POPUP_MENU_START(onFailsafeMenu); } - const int32_t channelValue = channelOutputs[k]; - int32_t failsafeValue = g_model.failsafeChannels[k]; - // Channel putsChn(0, y, k + 1, SMLSIZE); @@ -85,20 +82,22 @@ void menuModelFailsafe(event_t event) flags |= INVERS; if (s_editMode > 0) { flags |= BLINK; + CHECK_INCDEC_MODELVAR(event, g_model.failsafeChannels[k], -lim, +lim); if (g_model.failsafeChannels[k] > +lim && g_model.failsafeChannels[k] < FAILSAFE_CHANNEL_HOLD) { g_model.failsafeChannels[k] = 0; // switching from HOLD/NOPULSE to value edit } - CHECK_INCDEC_MODELVAR(event, g_model.failsafeChannels[k], -lim, +lim); } } + const int32_t channelValue = channelOutputs[k]; + int32_t failsafeValue = g_model.failsafeChannels[k]; const coord_t xValue = x+LCD_W-4-wbar; if (failsafeValue == FAILSAFE_CHANNEL_HOLD) { - lcdDrawText(xValue, y, STR_HOLD, RIGHT|flags); + lcdDrawText(xValue, y, STR_HOLD_UPPERCASE, RIGHT|flags); failsafeValue = 0; } else if (failsafeValue == FAILSAFE_CHANNEL_NOPULSE) { - lcdDrawText(xValue, y, STR_NONE, RIGHT|flags); + lcdDrawText(xValue, y, STR_NONE_UPPERCASE, RIGHT|flags); failsafeValue = 0; } else { diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index da159cd9f..632f0a8bb 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -262,7 +262,9 @@ const char STR_FAILSAFESET[] = TR_FAILSAFESET; const char STR_REG_ID[] = TR_REG_ID; const char STR_OWNER_ID[] = TR_OWNER_ID; const char STR_HOLD[] = TR_HOLD; +const char STR_HOLD_UPPERCASE[] = TR_HOLD_UPPERCASE; const char STR_NONE[] = TR_NONE; +const char STR_NONE_UPPERCASE[] = TR_NONE_UPPERCASE; const char STR_MENUSENSOR[] = TR_MENUSENSOR; const char STR_POWERMETER_PEAK[] = TR_POWERMETER_PEAK; const char STR_POWERMETER_POWER[] = TR_POWERMETER_POWER; diff --git a/radio/src/translations.h b/radio/src/translations.h index 8c3e01393..62ae35b04 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -420,7 +420,9 @@ extern const char STR_RECEIVER[]; extern const char STR_REG_ID[]; extern const char STR_OWNER_ID[]; extern const char STR_HOLD[]; +extern const char STR_HOLD_UPPERCASE[]; extern const char STR_NONE[]; +extern const char STR_NONE_UPPERCASE[]; extern const char STR_MENUSENSOR[]; extern const char STR_POWERMETER_PEAK[]; extern const char STR_POWERMETER_POWER[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 14359e0c6..f926036a8 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -906,7 +906,9 @@ #define TR_OWNER_ID "ID vlastníka" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "DRŽET" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "NIC" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENZOR" #define TR_POWERMETER_PEAK "Špička" #define TR_POWERMETER_POWER "Výkon" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index bc1bfeabd..b75bd5f07 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -913,7 +913,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 44add86af..35cc79e9e 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -908,7 +908,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 5dbc4923a..f066b56b6 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -917,7 +917,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 7b3953d7e..c00319310 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -910,7 +910,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 25136127c..4cd56f5c5 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -923,7 +923,9 @@ #define TR_OWNER_ID "ID Radio" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "CAPTEUR" #define TR_POWERMETER_PEAK "Pic" #define TR_POWERMETER_POWER "Puiss" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 361af3130..22a8009fe 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -911,7 +911,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index b1a8ce36b..d84f64843 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -911,7 +911,9 @@ TR_GYR_VSRCRAW #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 00bd6583f..6816cc440 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -911,7 +911,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "CZUJNIK" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 03a7cd1d1..37f3b8113 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -915,7 +915,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 1549fda8e..a07e6c760 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -922,7 +922,9 @@ #define TR_OWNER_ID "Owner ID" #define TR_PINMAPSET "PINMAP" #define TR_HOLD "Hold" +#define TR_HOLD_UPPERCASE "HOLD" #define TR_NONE "None" +#define TR_NONE_UPPERCASE "NONE" #define TR_MENUSENSOR "SENSOR" #define TR_POWERMETER_PEAK "Peak" #define TR_POWERMETER_POWER "Power"