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

This commit is contained in:
Lorenz Meier
2014-03-17 16:52:07 +01:00
14 changed files with 119 additions and 145 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
echo "Starting MAVLink on this USB console"
mavlink start -r 5000 -d /dev/ttyACM0
mavlink start -r 10000 -d /dev/ttyACM0
# Exit shell to make it available to MAVLink
exit
+1 -1
View File
@@ -393,7 +393,7 @@ then
if [ $HIL == yes ]
then
sleep 1
set MAVLINK_FLAGS "-r 10000 -d /dev/ttyACM0 -m hil"
set MAVLINK_FLAGS "-r 10000 -d /dev/ttyACM0"
usleep 5000
else
# Normal mode, use baudrate 57600 (default) and data rate 1000 bytes/s