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

This commit is contained in:
Lorenz Meier
2013-08-02 13:56:29 +02:00
+5 -5
View File
@@ -13,13 +13,14 @@ if mavlink stop
then then
echo "stopped other MAVLink instance" echo "stopped other MAVLink instance"
fi fi
sleep 2
mavlink start -b 230400 -d /dev/ttyACM0 mavlink start -b 230400 -d /dev/ttyACM0
if [ $MODE == autostart ]
then
# Start the commander # Start the commander
commander start if commander start
then
echo "Commander started"
fi
# Start sensors # Start sensors
sh /etc/init.d/rc.sensors sh /etc/init.d/rc.sensors
@@ -42,7 +43,6 @@ then
then then
echo "GPS started" echo "GPS started"
fi fi
fi
echo "MAVLink started, exiting shell.." echo "MAVLink started, exiting shell.."