diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2013-12-13 21:07:27 +0100 |
| commit | c3cbaf5deb00577efa9198f246ebc6011284ff34 (patch) | |
| tree | 8f40fef6a2230cf6be262443ac520807cc66aba2 /ROMFS | |
| parent | 54e739926d3414e29b13d2aa14ebb94fd8ffd4f4 (diff) | |
| parent | 0b9b68f0d96f59c9cd406547ee52fb52617a298f (diff) | |
| download | px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.gz px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.tar.bz2 px4-firmware-c3cbaf5deb00577efa9198f246ebc6011284ff34.zip | |
Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
src/drivers/px4io/px4io.cpp
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.custom_dji_f330_mkblctrl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.custom_dji_f330_mkblctrl b/ROMFS/px4fmu_common/init.d/rc.custom_dji_f330_mkblctrl index 8e0914d63..40b2ee68b 100644 --- a/ROMFS/px4fmu_common/init.d/rc.custom_dji_f330_mkblctrl +++ b/ROMFS/px4fmu_common/init.d/rc.custom_dji_f330_mkblctrl @@ -97,9 +97,9 @@ fi # if [ $MKBLCTRL_FRAME == x ] then - mixer load /dev/pwm_output /etc/mixers/FMU_quad_x.mix + mixer load /dev/mkblctrl /etc/mixers/FMU_quad_x.mix else - mixer load /dev/pwm_output /etc/mixers/FMU_quad_+.mix + mixer load /dev/mkblctrl /etc/mixers/FMU_quad_+.mix fi # |