Revert "Revert "Merge branch 'next'""

This reverts commit a9f4d2185c.
This commit is contained in:
openfsguruh
2014-02-17 21:06:46 +01:00
parent a9f4d2185c
commit 76bda4f89a
127 changed files with 46890 additions and 1083 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 {