Merge beta in master

This commit is contained in:
Lorenz Meier
2015-08-23 11:21:38 +02:00
10 changed files with 134 additions and 70 deletions

View File

@@ -290,6 +290,7 @@ then
if ver hwcmp PX4FMU_V1
then
set FMU_MODE serial
set GPS no
fi
fi
unset HIL
@@ -320,6 +321,7 @@ then
gps start
fi
fi
unset GPS
unset GPS_FAKE
# Needs to be this early for in-air-restarts