diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-08 11:38:00 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-08 11:38:00 +0400 |
| commit | 320624e995d46d80db0d219d9c61af08e1b8cadf (patch) | |
| tree | 6c41aa76675cab6c8ef6a668ee4505f913bff44e /ROMFS/px4fmu_common/init.d/rc.interface | |
| parent | 39b1f7244ce06ff89492ad6843c5fc74a30dfe67 (diff) | |
| parent | cf9fa61a39f83e6fe4611ecf9336c1fcd1faaa78 (diff) | |
| download | px4-firmware-320624e995d46d80db0d219d9c61af08e1b8cadf.tar.gz px4-firmware-320624e995d46d80db0d219d9c61af08e1b8cadf.tar.bz2 px4-firmware-320624e995d46d80db0d219d9c61af08e1b8cadf.zip | |
Merge branch 'master' into beta_mavlink2
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rc.interface')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index d25f01dde..7f793b219 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -3,7 +3,7 @@ # Script to configure control interface # -if [ $MIXER != none ] +if [ $MIXER != none -a $MIXER != skip ] then # # Load mixer @@ -33,8 +33,11 @@ then tone_alarm $TUNE_OUT_ERROR fi else - echo "[init] Mixer not defined" - tone_alarm $TUNE_OUT_ERROR + if [ $MIXER != skip ] + then + echo "[init] Mixer not defined" + tone_alarm $TUNE_OUT_ERROR + fi fi if [ $OUTPUT_MODE == fmu -o $OUTPUT_MODE == io ] |