From 9c2fd5ab6c04c94efe1b0beb367c9caed3edc244 Mon Sep 17 00:00:00 2001 From: Chleba Date: Tue, 7 Jul 2020 14:41:23 +0200 Subject: [PATCH] Add timezone option into a tune menu (#653) * add timezone option into a tune menu * changed default sound signals volume --- src/common/sound.cpp | 2 +- src/common/sound.h | 2 +- src/gui/screen_menu_tune.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/sound.cpp b/src/common/sound.cpp index 9f81f8ac49..344d51bb8e 100644 --- a/src/common/sound.cpp +++ b/src/common/sound.cpp @@ -5,7 +5,7 @@ const uint32_t Sound::durations[eSOUND_TYPE_count] = { 100, 500, 200, 500, 10, 50, 100, 800 }; const float Sound::frequencies[eSOUND_TYPE_count] = { 900.F, 600.F, 950.F, 999.F, 800.F, 500.F, 999.F, 950.F }; -const float Sound::volumes[eSOUND_TYPE_count] = { Sound::volumeInit, Sound::volumeInit, Sound::volumeInit, Sound::volumeInit, 0.25F, 0.25F, Sound::volumeInit, Sound::volumeInit }; +const float Sound::volumes[eSOUND_TYPE_count] = { Sound::volumeInit, Sound::volumeInit, Sound::volumeInit, Sound::volumeInit, 0.175F, 0.175F, Sound::volumeInit, Sound::volumeInit }; const eSOUND_TYPE Sound::onceTypes[5] = { eSOUND_TYPE_Start, eSOUND_TYPE_ButtonEcho, eSOUND_TYPE_StandardPrompt, eSOUND_TYPE_CriticalAlert, eSOUND_TYPE_SingleBeep }; const eSOUND_TYPE Sound::loudTypes[6] = { eSOUND_TYPE_Start, eSOUND_TYPE_ButtonEcho, eSOUND_TYPE_StandardPrompt, eSOUND_TYPE_StandardAlert, eSOUND_TYPE_CriticalAlert, eSOUND_TYPE_SingleBeep }; diff --git a/src/common/sound.h b/src/common/sound.h index 4e8b667947..104174c2be 100644 --- a/src/common/sound.h +++ b/src/common/sound.h @@ -42,7 +42,7 @@ class Sound { uint32_t _delay; ///< live variable used for delay measure uint32_t delay; ///< added variable for delay betwen beeps - static constexpr float volumeInit = 0.5F; + static constexpr float volumeInit = 0.35F; /// values of sound signals - frequencies, volumes, durations static const uint32_t durations[eSOUND_TYPE_count]; static const float frequencies[eSOUND_TYPE_count]; diff --git a/src/gui/screen_menu_tune.cpp b/src/gui/screen_menu_tune.cpp index 8e718de2d8..401184904d 100644 --- a/src/gui/screen_menu_tune.cpp +++ b/src/gui/screen_menu_tune.cpp @@ -10,7 +10,7 @@ /*****************************************************************************/ //parent alias using parent = ScreenMenu