piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1112

Browse Source
This commit is contained in:
bsongis
2014-05-19 15:44:50 +02:00
parent 89f42eab8b
commit a85ad617fc
13 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/menu_general.cpp
+9 -3
View File
@@ -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);
}
radio/src/translations.cpp
+3
View File
@@ -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
radio/src/translations.h
+6
View File
@@ -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[];
radio/src/translations/cz.h.txt
+1
View File
@@ -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"
radio/src/translations/de.h.txt
+1
View File
@@ -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"
radio/src/translations/en.h.txt
+2 -1
View File
@@ -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"
radio/src/translations/es.h.txt
+1
View File
@@ -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"
radio/src/translations/fi.h.txt
+1
View File
@@ -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"
radio/src/translations/fr.h.txt
+1
View File
@@ -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"
radio/src/translations/it.h.txt
+1
View File
@@ -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"
radio/src/translations/pl.h.txt
+1
View File
@@ -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"
radio/src/translations/pt.h.txt
+1
View File
@@ -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"
radio/src/translations/se.h.txt
+1
View File
@@ -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"