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
+20 -20
View File
@@ -13,35 +13,35 @@ 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 ] # Start the commander
if commander start
then then
echo "Commander started"
fi
# Start the commander # Start sensors
commander start sh /etc/init.d/rc.sensors
# Start sensors # Start one of the estimators
sh /etc/init.d/rc.sensors if attitude_estimator_ekf status
then
# Start one of the estimators echo "multicopter att filter running"
if attitude_estimator_ekf status else
if att_pos_estimator_ekf status
then then
echo "multicopter att filter running" echo "fixedwing att filter running"
else else
if att_pos_estimator_ekf status attitude_estimator_ekf start
then
echo "fixedwing att filter running"
else
attitude_estimator_ekf start
fi
fi fi
fi
# Start GPS # Start GPS
if gps start if gps start
then then
echo "GPS started" echo "GPS started"
fi
fi fi
echo "MAVLink started, exiting shell.." echo "MAVLink started, exiting shell.."