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

2014-02-19 15:16:30 +01:00
parent ad134173be 197c008937
commit 271fe6804d
2 changed files with 7 additions and 1 deletions
@@ -318,3 +318,9 @@ Robert Miller
 Aviomotive - www.aviomotive.com
 Mark Gaskievicz
 Roland Müller
+Frank Gewalt
+Remi Viard
+Leonard MacKey
+Reginald H Millsom
+Emanuel Stassar
+Pierluigi Sommaruga
@@ -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 {