Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
Oliver Jowett 2016-10-14 21:35:31 +01:00
commit d3fad32d5e
6 changed files with 236 additions and 13 deletions

View file

@ -66,7 +66,7 @@ static int convert_altitude(int ft)
static int convert_speed(int kts)
{
if (Modes.metric)
return (kts / 1.852);
return (kts * 1.852);
else
return kts;
}