feat: Add SF to mute audio amplifier on supported radios (#3753)
* SF Audio amplifier mute port to 2.10 * added missing definition STR_SF_DISABLE_AUDIO_AMP * exclude radios not able to switch audio amp off * radio/src/storage/yaml/yaml_datastructs_128x64.cpp needs to distinguish between radios with or without switchable audio amps. Expample Zorro vs X9lites * updated companion and radio language PL * - added Companion and radio language SE - removed type unfinished for translated languages * added radio and companion language JP * - reverted change to 128x64 yaml_datastructs.h - moved exclusion of SF DISABLE_AUDIO_AMP based on hw capabilities to UI level * confused FUNC_ with FUNCTION_ * confused FUNCTION_* with FUNC_*
This commit is contained in:
@@ -597,6 +597,7 @@ enum Functions {
|
||||
FUNC_DISABLE_TOUCH,
|
||||
FUNC_SET_SCREEN,
|
||||
#endif
|
||||
FUNC_DISABLE_AUDIO_AMP,
|
||||
#if defined(DEBUG)
|
||||
FUNC_TEST, // should remain the last before MAX as not added in Companion
|
||||
#endif
|
||||
|
||||
@@ -425,6 +425,11 @@ void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext
|
||||
newActiveFunctions |= (1u << FUNCTION_DISABLE_TOUCH);
|
||||
break;
|
||||
#endif
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
case FUNC_DISABLE_AUDIO_AMP:
|
||||
newActiveFunctions |= (1u << FUNCTION_DISABLE_AUDIO_AMP);
|
||||
break;
|
||||
#endif
|
||||
#if defined(COLORLCD)
|
||||
case FUNC_SET_SCREEN:
|
||||
if (isRepeatDelayElapsed(functions, functionsContext, i)) {
|
||||
@@ -533,6 +538,10 @@ const char* funcGetLabel(uint8_t func)
|
||||
case FUNC_SET_SCREEN:
|
||||
return STR_SF_SET_SCREEN;
|
||||
#endif
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
case FUNC_DISABLE_AUDIO_AMP:
|
||||
return STR_SF_DISABLE_AUDIO_AMP;
|
||||
#endif
|
||||
#if defined(DEBUG)
|
||||
case FUNC_TEST:
|
||||
return STR_SF_TEST;
|
||||
|
||||
@@ -594,7 +594,11 @@ bool isAssignableFunctionAvailable(int function, CustomFunctionData * functions)
|
||||
case FUNC_PLAY_SCRIPT:
|
||||
return false;
|
||||
#endif
|
||||
|
||||
case FUNC_DISABLE_AUDIO_AMP:
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
return true;
|
||||
#endif
|
||||
return false;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -665,6 +665,9 @@ enum FunctionsActive {
|
||||
#if defined(HARDWARE_TOUCH)
|
||||
FUNCTION_DISABLE_TOUCH,
|
||||
#endif
|
||||
#if defined(AUDIO_MUTE_GPIO)
|
||||
FUNCTION_DISABLE_AUDIO_AMP
|
||||
#endif
|
||||
};
|
||||
|
||||
#define VARIO_FREQUENCY_ZERO 700/*Hz*/
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_TimerModes[] = {
|
||||
|
||||
@@ -84,6 +84,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_TOUCH, "DISABLE_TOUCH" },
|
||||
{ FUNC_SET_SCREEN, "SET_SCREEN" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_ZoneOptionValueEnum[] = {
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_TimerModes[] = {
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ FUNC_DISABLE_TOUCH, "DISABLE_TOUCH" },
|
||||
{ FUNC_SET_SCREEN, "SET_SCREEN" },
|
||||
{ 0, NULL }
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ FUNC_DISABLE_TOUCH, "DISABLE_TOUCH" },
|
||||
{ FUNC_SET_SCREEN, "SET_SCREEN" },
|
||||
{ 0, NULL }
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_TimerModes[] = {
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_TimerModes[] = {
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_TimerModes[] = {
|
||||
|
||||
@@ -82,6 +82,7 @@ const struct YamlIdStr enum_Functions[] = {
|
||||
{ FUNC_BACKLIGHT, "BACKLIGHT" },
|
||||
{ FUNC_SCREENSHOT, "SCREENSHOT" },
|
||||
{ FUNC_RACING_MODE, "RACING_MODE" },
|
||||
{ FUNC_DISABLE_AUDIO_AMP, "DISABLE_AUDIO_AMP" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
const struct YamlIdStr enum_TimerModes[] = {
|
||||
|
||||
@@ -139,6 +139,11 @@ void audioMute()
|
||||
|
||||
void audioUnmute()
|
||||
{
|
||||
if(isFunctionActive(FUNCTION_DISABLE_AUDIO_AMP)) {
|
||||
setMutePin(true);
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined(AUDIO_UNMUTE_DELAY)
|
||||
// if muted
|
||||
if (getMutePin()) {
|
||||
|
||||
@@ -403,6 +403,11 @@ void audioMute()
|
||||
|
||||
void audioUnmute()
|
||||
{
|
||||
if(isFunctionActive(FUNCTION_DISABLE_AUDIO_AMP)) {
|
||||
setMutePin(true);
|
||||
return;
|
||||
}
|
||||
|
||||
#if defined(AUDIO_UNMUTE_DELAY)
|
||||
// if muted
|
||||
if (getMutePin()) {
|
||||
|
||||
@@ -173,6 +173,7 @@ const char STR_SF_BACKLIGHT[] = TR_SF_BACKLIGHT;
|
||||
const char STR_SF_BG_MUSIC[] = TR_SF_BG_MUSIC;
|
||||
const char STR_SF_BG_MUSIC_PAUSE[] = TR_SF_BG_MUSIC_PAUSE;
|
||||
const char STR_SF_DISABLE_TOUCH[] = TR_SF_DISABLE_TOUCH;
|
||||
const char STR_SF_DISABLE_AUDIO_AMP[] = TR_SF_DISABLE_AUDIO_AMP;
|
||||
const char STR_SF_FAILSAFE[] = TR_SF_FAILSAFE;
|
||||
const char STR_SF_HAPTIC[] = TR_SF_HAPTIC;
|
||||
const char STR_SF_INST_TRIM[] = TR_SF_INST_TRIM;
|
||||
|
||||
@@ -294,6 +294,7 @@ extern const char STR_SF_BACKLIGHT[];
|
||||
extern const char STR_SF_BG_MUSIC[];
|
||||
extern const char STR_SF_BG_MUSIC_PAUSE[];
|
||||
extern const char STR_SF_DISABLE_TOUCH[];
|
||||
extern const char STR_SF_DISABLE_AUDIO_AMP[];
|
||||
extern const char STR_SF_FAILSAFE[];
|
||||
extern const char STR_SF_HAPTIC[];
|
||||
extern const char STR_SF_INST_TRIM[];
|
||||
|
||||
@@ -108,6 +108,7 @@
|
||||
#define TR_SF_SCREENSHOT "截屏"
|
||||
#define TR_SF_RACING_MODE "竞速模式"
|
||||
#define TR_SF_DISABLE_TOUCH "禁用触摸"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "关闭音频功放"
|
||||
#define TR_SF_SET_SCREEN "选择主屏"
|
||||
#define TR_SF_RESERVE "[保留]"
|
||||
|
||||
|
||||
@@ -122,6 +122,7 @@
|
||||
#define TR_SF_SCREENSHOT "Snímek LCD"
|
||||
#define TR_SF_RACING_MODE "Závodní režim"
|
||||
#define TR_SF_DISABLE_TOUCH "Deaktivace dotyku"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Vypnutí zesilovače zvuku"
|
||||
#define TR_SF_SET_SCREEN "Vybrat hlavní obrazovku"
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Telm","Telemetrie")
|
||||
|
||||
@@ -120,6 +120,7 @@
|
||||
#define TR_SF_SCREENSHOT "Skærm klip"
|
||||
#define TR_SF_RACING_MODE "Ræs tilstand"
|
||||
#define TR_SF_DISABLE_TOUCH "Ikke berøringsaktiv"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP TR("Sluk audio amp", "Sluk audio amplifier")
|
||||
#define TR_SF_SET_SCREEN "Vælg hoved skærm"
|
||||
#define TR_SF_RESERVE "[reserve]"
|
||||
|
||||
|
||||
@@ -117,6 +117,7 @@
|
||||
#define TR_SF_SCREENSHOT "Screenshot"
|
||||
#define TR_SF_RACING_MODE "RacingMode"
|
||||
#define TR_SF_DISABLE_TOUCH "Kein Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp AUS"
|
||||
#define TR_SF_SET_SCREEN "Set Main Screen"
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Telm","Telemetrie")
|
||||
|
||||
@@ -118,6 +118,7 @@
|
||||
#define TR_SF_SCREENSHOT "Screenshot"
|
||||
#define TR_SF_RACING_MODE "RacingMode"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "Set Main Screen"
|
||||
#define TR_SF_RESERVE "[reserve]"
|
||||
|
||||
|
||||
@@ -115,6 +115,7 @@
|
||||
#define TR_SF_SCREENSHOT "Captura"
|
||||
#define TR_SF_RACING_MODE "RacingMode"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "Set Main Screen"
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Telm", "Telemetría")
|
||||
|
||||
@@ -120,6 +120,7 @@
|
||||
#define TR_SF_SCREENSHOT "Screenshot"
|
||||
#define TR_SF_RACING_MODE "RacingMode"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "Set Main Screen"
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Telm","Telemetry")
|
||||
|
||||
@@ -119,6 +119,7 @@
|
||||
#define TR_SF_SCREENSHOT "Photo Écran"
|
||||
#define TR_SF_RACING_MODE "Racing Mode"
|
||||
#define TR_SF_DISABLE_TOUCH "Non Tactile"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Désact. Ampli Audio"
|
||||
#define TR_SF_SET_SCREEN "Définir Écran Princ."
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Télem.", "Télémétrie")
|
||||
|
||||
@@ -171,6 +171,7 @@
|
||||
#define TR_SF_SCREENSHOT "צילום מסך"
|
||||
#define TR_SF_RACING_MODE "מצב תחרות"
|
||||
#define TR_SF_DISABLE_TOUCH "ללא מסך מגע"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "הגדרת מסך ראשי"
|
||||
#define TR_SF_RESERVE "[reserve]"
|
||||
|
||||
|
||||
@@ -118,6 +118,7 @@
|
||||
#define TR_SF_SCREENSHOT "Screenshot"
|
||||
#define TR_SF_RACING_MODE "Modo Racing"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "Setta Schermo Princ."
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Telm", "Telemetria")
|
||||
|
||||
@@ -113,6 +113,7 @@
|
||||
#define TR_SF_SCREENSHOT "画面キャプチャ"
|
||||
#define TR_SF_RACING_MODE "レースモード"
|
||||
#define TR_SF_DISABLE_TOUCH "非タッチ"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "オーディオアンプ OFF"
|
||||
#define TR_SF_SET_SCREEN "メインスクリーン設定"
|
||||
#define TR_SF_RESERVE "[予備]"
|
||||
|
||||
|
||||
@@ -115,6 +115,7 @@
|
||||
#define TR_SF_SCREENSHOT "Schermafdr"
|
||||
#define TR_SF_RACING_MODE "RacingMode"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "Set Main Screen"
|
||||
#define TR_SF_RESERVE "[reserve]"
|
||||
|
||||
|
||||
@@ -114,6 +114,7 @@
|
||||
#define TR_SF_SCREENSHOT "Zrzut Ekra"
|
||||
#define TR_SF_RACING_MODE "RacingMode"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP TR("Wycisz wzm.", "Wycisz wzmacniacz audio")
|
||||
#define TR_SF_SET_SCREEN "Set Main Screen"
|
||||
|
||||
#define TR_FSW_RESET_TELEM TR("Telm", "Telemetra")
|
||||
|
||||
@@ -121,6 +121,7 @@
|
||||
#define TR_SF_SCREENSHOT "Capt. Tela"
|
||||
#define TR_SF_RACING_MODE "ModCorrida"
|
||||
#define TR_SF_DISABLE_TOUCH "No Touch"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "Audio Amp Off"
|
||||
#define TR_SF_SET_SCREEN "Def Tela Princ"
|
||||
#define TR_SF_RESERVE "[reserve]"
|
||||
|
||||
|
||||
@@ -124,6 +124,7 @@
|
||||
#define TR_SF_SCREENSHOT "Skärmbild"
|
||||
#define TR_SF_RACING_MODE "Tävlingsläge"
|
||||
#define TR_SF_DISABLE_TOUCH "Ej pekskärm"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP TR("Audioförst. av","Audioförstärkare av")
|
||||
#define TR_SF_SET_SCREEN "Sätt huvudskärm"
|
||||
#define TR_SF_RESERVE "[reserv]"
|
||||
|
||||
|
||||
@@ -114,6 +114,7 @@
|
||||
#define TR_SF_SCREENSHOT "截屏"
|
||||
#define TR_SF_RACING_MODE "競速模式"
|
||||
#define TR_SF_DISABLE_TOUCH "禁用觸摸"
|
||||
#define TR_SF_DISABLE_AUDIO_AMP "關閉音頻功放"
|
||||
#define TR_SF_SET_SCREEN "選擇主屏"
|
||||
|
||||
#define TR_FSW_RESET_TELEM "回傳參數"
|
||||
|
||||
Reference in New Issue
Block a user