diff --git a/radio/src/gui/colorlcd/access_settings.cpp b/radio/src/gui/colorlcd/access_settings.cpp index 60ec0c3e021..ae48eb0afcc 100644 --- a/radio/src/gui/colorlcd/access_settings.cpp +++ b/radio/src/gui/colorlcd/access_settings.cpp @@ -763,14 +763,14 @@ class OutputMappingChoice : public Choice if (capabilities & (1 << RECEIVER_CAPABILITY_ENABLE_PWM_CH5_CH6)) { if (CH_ENABLE_SPORT == output_pin) { setTextHandler([=] (int val) { - if (val == channels) return std::string("S.PORT"); + if (val == channels) return std::string(STR_SPORT); return get_channel_text(val); }); setMax(channels); return; } else if (CH_ENABLE_SBUS == output_pin) { setTextHandler([=] (int val) { - if (val == channels) return std::string("SBUS"); + if (val == channels) return std::string(STR_SBUSOUT); return get_channel_text(val); }); setMax(channels); @@ -780,13 +780,13 @@ class OutputMappingChoice : public Choice setTextHandler([=] (int val) { switch(val) { case CH_MAP_SBUS_IN: - return std::string(STR_CHMAP_SBUSIN); + return std::string(STR_SBUSIN); case CH_MAP_SBUS_OUT: - return std::string(STR_CHMAP_SBUSOUT); + return std::string(STR_SBUSOUT); case CH_MAP_SPORT: - return std::string(STR_CHMAP_SPORT); + return std::string(STR_SPORT); case CH_MAP_FBUS: - return std::string(STR_CHMAP_FBUS); + return std::string(STR_FBUS); default: return get_channel_text(val); } diff --git a/radio/src/gui/common/stdlcd/model_receiver_options.cpp b/radio/src/gui/common/stdlcd/model_receiver_options.cpp index ae7d5cabee8..5fa6ca23564 100644 --- a/radio/src/gui/common/stdlcd/model_receiver_options.cpp +++ b/radio/src/gui/common/stdlcd/model_receiver_options.cpp @@ -238,33 +238,33 @@ void menuModelReceiverOptions(event_t event) if (isPXX2ReceiverOptionAvailable(receiverModelId, RECEIVER_OPTION_D_TELE_PORT)) { if (mapping == 0b01000000) { - lcdDrawText(7 * FW, y, STR_CHMAP_SPORT, attr); + lcdDrawText(7 * FW, y, STR_SPORT, attr); mapping = channelMax + 1; } else if (mapping == 0b10000000) { - lcdDrawText(7 * FW, y, STR_CHMAP_SBUSOUT, attr); + lcdDrawText(7 * FW, y, STR_SBUSOUT, attr); mapping = channelMax + 2; } else if (mapping == 0b11000000) { - lcdDrawText(7 * FW, y, STR_CHMAP_FBUS, attr); + lcdDrawText(7 * FW, y, STR_FBUS, attr); mapping = channelMax + 3; } if (pin == 0) { selectionMax = channelMax + 4; if (mapping == 0b10100000) { - lcdDrawText(7 * FW, y, STR_CHMAP_SBUSIN, attr); + lcdDrawText(7 * FW, y, STR_SBUSIN, attr); mapping = selectionMax; } } else if (IS_RECEIVER_CAPABILITY_ENABLED(RECEIVER_CAPABILITY_ENABLE_PWM_CH5_CH6)) { if (CH_ENABLE_SPORT == pin) { if (++selectionMax == mapping) { - lcdDrawText(7 * FW, y, STR_CHMAP_SPORT, attr); + lcdDrawText(7 * FW, y, STR_SPORT, attr); } } else if (CH_ENABLE_SBUS == pin) { if (++selectionMax == mapping) { - lcdDrawText(7 * FW, y, STR_CHMAP_SBUSOUT, attr); + lcdDrawText(7 * FW, y, STR_SBUSOUT, attr); } } } diff --git a/radio/src/translations/untranslated.h b/radio/src/translations/untranslated.h index d50383640f7..76ce405d8b9 100644 --- a/radio/src/translations/untranslated.h +++ b/radio/src/translations/untranslated.h @@ -73,12 +73,12 @@ #define TR_ISRM_RF_PROTOCOLS "ACCESS","D16","LR12" // ACCESS STUFF -#define STR_CHMAP_SBUSIN "SBUS in" -#define STR_CHMAP_SBUSOUT "SBUS out" -#define STR_CHMAP_SPORT "S.PORT" -#define STR_CHMAP_FBUS "FBUS" +#define STR_SBUSIN "SBUS in" +#define STR_SBUSOUT "SBUS out" +#define STR_SPORT "S.PORT" +#define STR_FBUS "FBUS" #define STR_SBUS24 "SBUS24" -#define TR_SPORT_MODES STR_CHMAP_SPORT,STR_CHMAP_SPORT,STR_CHMAP_FBUS +#define TR_SPORT_MODES STR_SPORT,STR_SPORT,STR_FBUS #define TR_R9M_PXX2_RF_PROTOCOLS "ACCESS","FCC","EU","Flex" #define TR_R9M_REGION "FCC","EU","868MHz","915MHz" #define TR_R9M_LITE_FCC_POWER_VALUES "(100mW)"