Code cleaning around vario

2014-02-11 12:32:16 +01:00
parent 7a9105dccb
commit 448a3c1b6b
1 changed files with 3 additions and 7 deletions
@@ -164,14 +164,10 @@ void varioWakeup()

    if (verticalSpeed < 0 || (int16_t)(s_varioTmr-tmr10ms) < 0) {
 #if defined(CPUARM)
-      uint16_t SoundVarioBeepTime;
-      uint16_t SoundVarioBeepFreq;
+      int SoundVarioBeepTime;
+      int SoundVarioBeepFreq;
      if (verticalSpeed > 0) {
-        if (verticalSpeed > 1276) {
-          SoundVarioBeepTime=5;
-        } else {
-          SoundVarioBeepTime = 320 - (verticalSpeed >> 2);
-        }
+        SoundVarioBeepTime = min(5, 320 - (verticalSpeed >> 2));
        SoundVarioBeepFreq = 1000 + verticalSpeed;
      }
      else {