diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp index 365372607..b74dcc7cc 100644 --- a/radio/src/gui/menu_general.cpp +++ b/radio/src/gui/menu_general.cpp @@ -140,10 +140,10 @@ enum menuGeneralSetupItems { CASE_BUZZER(ITEM_SETUP_BUZZER_MODE) CASE_VOICE(ITEM_SETUP_SPEAKER_VOLUME) CASE_CPUARM(ITEM_SETUP_BEEP_VOLUME) - CASE_CPUARM(ITEM_SETUP_WAV_VOLUME) - CASE_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) ITEM_SETUP_BEEP_LENGTH, CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) + CASE_CPUARM(ITEM_SETUP_WAV_VOLUME) + CASE_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH) @@ -364,13 +364,19 @@ void menuGeneralSetup(uint8_t event) #endif case ITEM_SETUP_BEEP_LENGTH: - SLIDER_5POS(y, g_eeGeneral.beepLength, STR_LENGTH, event, attr); + SLIDER_5POS(y, g_eeGeneral.beepLength, STR_BEEP_LENGTH, event, attr); break; #if defined(AUDIO) case ITEM_SETUP_SPEAKER_PITCH: lcd_putsLeft( y, STR_SPKRPITCH); +#if defined(CPUARM) + lcd_putcAtt(RADIO_SETUP_2ND_COLUMN, y, '+', attr); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT); + lcd_putsAtt(lcdLastPos, y, "Hz", attr); +#else lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.speakerPitch, attr|LEFT); +#endif if (attr) { CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20); } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index c15ac66ff..8ec2ea45b 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -196,6 +196,9 @@ const pm_char STR_BLADES[] PROGMEM = TR_BLADES; const pm_char STR_SCREEN[] PROGMEM = TR_SCREEN; const pm_char STR_SOUND_LABEL[] PROGMEM = TR_SOUND_LABEL; const pm_char STR_LENGTH[] PROGMEM = TR_LENGTH; +#if defined(CPUARM) +const pm_char STR_BEEP_LENGTH[] PROGMEM = TR_BEEP_LENGTH; +#endif #if defined(AUDIO) const pm_char STR_SPKRPITCH[] PROGMEM = TR_SPKRPITCH; #endif diff --git a/radio/src/translations.h b/radio/src/translations.h index c46dea1d8..518214687 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -362,6 +362,12 @@ extern const pm_char STR_BLADES[]; extern const pm_char STR_SCREEN[]; extern const pm_char STR_SOUND_LABEL[]; extern const pm_char STR_LENGTH[]; +extern const pm_char STR_BEEP_LENGTH[]; +#if defined(CPUARM) +extern const pm_char STR_BEEP_LENGTH[]; +#else +#define STR_BEEP_LENGTH STR_LENGTH +#endif extern const pm_char STR_SPKRPITCH[]; extern const pm_char STR_HAPTIC_LABEL[]; extern const pm_char STR_HAPTICSTRENGTH[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index ce8f9b6f7..1eb12ef7a 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -526,6 +526,7 @@ #define TR_SCREEN "Panel " #define TR_SOUND_LABEL "Zvuk" #define TR_LENGTH INDENT"Délka" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Tón" #define TR_HAPTIC_LABEL "Vibrace" #define TR_HAPTICSTRENGTH INDENT"Síla" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 796340991..6f8e3b84e 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -530,6 +530,7 @@ #define TR_SCREEN "Telm-Bild " #define TR_SOUND_LABEL "----Töne---------" #define TR_LENGTH INDENT"Dauer" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Tonhöhe" #define TR_HAPTIC_LABEL "Vibration" #define TR_HAPTICSTRENGTH INDENT"Stärke" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 753919e86..a1bdf10d5 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -534,7 +534,8 @@ #define TR_SCREEN "Screen " #define TR_SOUND_LABEL "Sound" #define TR_LENGTH INDENT "Length" -#define TR_SPKRPITCH INDENT "Pitch" +#define TR_BEEP_LENGTH INDENT "Beep Length" +#define TR_SPKRPITCH INDENT "Beep Pitch" #define TR_HAPTIC_LABEL "Haptic" #define TR_HAPTICSTRENGTH INDENT "Strength" #define TR_CONTRAST "Contrast" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index cda817d82..66a61b2a3 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -526,6 +526,7 @@ #define TR_SCREEN "Pantalla" #define TR_SOUND_LABEL "Sonido" #define TR_LENGTH INDENT"Longitud" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Tono" #define TR_HAPTIC_LABEL "Tactil" #define TR_HAPTICSTRENGTH INDENT"Intensidad" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 1b50a167b..8ec2cc7b3 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -526,6 +526,7 @@ #define TR_SCREEN "Screen " #define TR_SOUND_LABEL "Sound" #define TR_LENGTH INDENT"Length" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Pitch" #define TR_HAPTIC_LABEL "Haptic" #define TR_HAPTICSTRENGTH INDENT"Strength" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 968dee537..e790a71d3 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -528,6 +528,7 @@ #define TR_SCREEN "Ecran " #define TR_SOUND_LABEL "Son" #define TR_LENGTH INDENT "Durée" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT "Tonalité" #define TR_HAPTIC_LABEL "Vibreur" #define TR_HAPTICSTRENGTH INDENT "Force" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index d03a1e1a4..4aa109335 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -526,6 +526,7 @@ #define TR_SCREEN "Schermo " #define TR_SOUND_LABEL "Suono" #define TR_LENGTH INDENT"Durata" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Tono" #define TR_HAPTIC_LABEL "Vibraz" #define TR_HAPTICSTRENGTH INDENT"Forza" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 999c05266..43efd19ce 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -571,6 +571,7 @@ #define TR_SCREEN "Ekran " #define TR_SOUND_LABEL "Dźwięk" #define TR_LENGTH INDENT"Długość" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Dźwięk" #define TR_HAPTIC_LABEL "Wibracja" #define TR_HAPTICSTRENGTH INDENT"Siła" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 1a173b0ae..21b321795 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -526,6 +526,7 @@ #define TR_SCREEN "Tela" #define TR_SOUND_LABEL "Som" #define TR_LENGTH INDENT"Comprimento" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Pitch" #define TR_HAPTIC_LABEL "Vibrar" #define TR_HAPTICSTRENGTH INDENT"Forca" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index a302344db..a20309315 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -530,6 +530,7 @@ #define TR_SCREEN "Skärm" #define TR_SOUND_LABEL "Ljud " #define TR_LENGTH INDENT"Tid" +#define TR_BEEP_LENGTH INDENT "Beep Length" #define TR_SPKRPITCH INDENT"Ton" #define TR_HAPTIC_LABEL "Vibrator" #define TR_HAPTICSTRENGTH INDENT"Styrka"