Merge branch 'master' of github.com:PX4/Firmware into ekf_params

This commit is contained in:
Lorenz Meier
2014-04-22 01:40:27 +02:00
4 changed files with 28 additions and 27 deletions
+2 -1
View File
@@ -403,7 +403,8 @@ then
then
if [ $HIL == yes ]
then
sleep 1
# Sleep required to ensure the link is up
sleep 5
set MAVLINK_FLAGS "-r 10000 -d /dev/ttyACM0"
else
# Normal mode, use baudrate 57600 (default) and data rate 1000 bytes/s