Merge remote-tracking branch 'origin/next' into

bsongis/vario_improvements Conflicts: radio/src/maths.cpp
2014-02-21 07:13:33 +01:00
parent 99e42ceeb2 de3e0e802f
commit 903dc152a5
415 changed files with 48952 additions and 9887 deletions
@@ -171,7 +171,7 @@ void varioWakeup()
  if (isFunctionActive(FUNCTION_VARIO)) {
 #if defined(AUDIO)
    cli();
-    int verticalSpeed = frskyData.hub.varioSpeed;
+    int16_t verticalSpeed = frskyData.hub.varioSpeed;
    sei();
    
 #if defined(PCBSTD)