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

[Voice] Slider for the audio volume

Browse Source 
[Sky9x] Defaut audio volume is 12 (max is 23)
Issue 166 continued
This commit is contained in:
bsongis
2013-01-22 11:21:14 +00:00
parent 12ca975280
commit a626ea2ceb
17 changed files with 243 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/open9x.cpp
+6 -5
View File
@@ -2177,7 +2177,7 @@ void evalFunctions()
}
}
else if (sd->func == FUNC_VOLUME) {
requiredSpeakerVolume = ((1024 + getValue(FSW_PARAM(sd))) * NUM_VOL_LEVELS) / 2048;
requiredSpeakerVolume = ((1024 + getValue(FSW_PARAM(sd))) * VOLUME_LEVEL_MAX) / 2048;
}
#elif defined(VOICE)
else if (sd->func == FUNC_PLAY_TRACK) {
@@ -2888,7 +2888,7 @@ void doMixerCalculations()
}
#if defined(CPUARM)
requiredSpeakerVolume = g_eeGeneral.speakerVolume;
requiredSpeakerVolume = g_eeGeneral.speakerVolume + VOLUME_LEVEL_DEF;
#endif
evalFunctions();
@@ -3436,11 +3436,12 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
eeReadAll();
#if defined(VOICE)
setVolume(g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF);
#endif
#if defined(CPUARM)
setVolume(g_eeGeneral.speakerVolume);
setBacklight(g_eeGeneral.backlightBright);
#elif defined(VOICE)
SET_VOLUME(g_eeGeneral.speakerVolume+7);
#endif
#if defined(PCBSKY9X)