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

This commit is contained in:
Lorenz Meier 2013-09-27 09:25:05 +02:00
commit d73eeded44
1 changed files with 8 additions and 1 deletions

View File

@ -69,7 +69,14 @@ att_pos_estimator_ekf start
# #
# Load mixer and start controllers (depends on px4io) # Load mixer and start controllers (depends on px4io)
# #
mixer load /dev/pwm_output /etc/mixers/FMU_RET.mix if [ -f /fs/microsd/etc/mixers/FMU_RET.mix ]
then
echo "Using FMU_RET mixer from sd card"
mixer load /dev/pwm_output /fs/microsd/etc/mixers/FMU_RET.mix
else
echo "Using standard FMU_RET mixer"
mixer load /dev/pwm_output /etc/mixers/FMU_RET.mix
fi
fw_att_control start fw_att_control start
# Not ready yet for prime-time # Not ready yet for prime-time
#fw_pos_control_l1 start #fw_pos_control_l1 start