Merged beta into master

This commit is contained in:
Lorenz Meier
2015-08-01 16:58:02 +02:00
87 changed files with 1386 additions and 545 deletions

View File

@@ -575,7 +575,7 @@ then
fi
if [ $MIXER == tri_y_yaw- -o $MIXER == tri_y_yaw+ ]
then
set MAV_TYPE 2
set MAV_TYPE 15
fi
if [ $MIXER == hexa_x -o $MIXER == hexa_+ ]
then
@@ -599,6 +599,7 @@ then
if [ $MAV_TYPE == none ]
then
echo "Unknown MAV_TYPE"
param set MAV_TYPE 2
else
param set MAV_TYPE $MAV_TYPE
fi
@@ -642,6 +643,7 @@ then
if [ $MAV_TYPE == none ]
then
echo "Unknown MAV_TYPE"
param set MAV_TYPE 19
else
param set MAV_TYPE $MAV_TYPE
fi
@@ -672,6 +674,8 @@ then
then
sh /etc/init.d/rc.axialracing_ax10_apps
fi
param set MAV_TYPE 10
fi
unset MIXER
@@ -708,7 +712,7 @@ then
fi
unset EXIT_ON_END
# Run no SD alarm last
# Run no SD alarm
if [ $LOG_FILE == /dev/null ]
then
echo "[i] No microSD card found"
@@ -716,6 +720,9 @@ then
tone_alarm error
fi
# Boot is complete, inform MAVLink app(s) that the system is now fully up and running
mavlink boot_complete
# End of autostart
fi