Merge remote-tracking branch 'origin/next' into bsongis/Issue713_more_custom_functions

This commit is contained in:
Bertrand Songis
2014-02-19 15:16:30 +01:00
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -167,7 +167,7 @@ void varioWakeup()
int SoundVarioBeepTime;
int SoundVarioBeepFreq;
if (verticalSpeed > 0) {
SoundVarioBeepTime = min(5, 320 - (verticalSpeed >> 2));
SoundVarioBeepTime = max(5, 320 - (verticalSpeed >> 2));
SoundVarioBeepFreq = 1000 + verticalSpeed;
}
else {