diff options
| author | Anton Matosov <anton.matosov@gmail.com> | 2015-01-08 12:55:28 +0200 |
|---|---|---|
| committer | Anton Matosov <anton.matosov@gmail.com> | 2015-01-08 12:55:50 +0200 |
| commit | 25054d389a0d860664e2c3a67c180f8518876cbe (patch) | |
| tree | 4ed1c0e58eef28b21e5ebd9a6e1e0fc5165e511e | |
| parent | 08062e6546f02cb2e819f690d35b485425788cc4 (diff) | |
| download | px4-firmware-25054d389a0d860664e2c3a67c180f8518876cbe.tar.gz px4-firmware-25054d389a0d860664e2c3a67c180f8518876cbe.tar.bz2 px4-firmware-25054d389a0d860664e2c3a67c180f8518876cbe.zip | |
Broke down the elif into else and if as nsh doesn't support elif
Fix invalid set of the variable
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 80 |
1 files changed, 43 insertions, 37 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index d4880ea42..1a2d8c016 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -4,29 +4,32 @@ # set SDCARD_MIXERS_PATH /fs/microsd/etc/mixers - + if [ $MIXER != none -a $MIXER != skip ] then # # Load main mixer # - - if [ $MIXER_AUX == none ] - then - MIXER_AUX = $MIXER.aux - fi + + if [ $MIXER_AUX == none ] + then + set MIXER_AUX $MIXER.aux + fi # Use the mixer file from the SD-card if it exists if [ -f $SDCARD_MIXERS_PATH/$MIXER.main.mix ] then set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.main.mix # Try out the old convention, for backward compatibility - elif [ -f $SDCARD_MIXERS_PATH/$MIXER.mix ] - then - set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.mix - else - set MIXER_FILE /etc/mixers/$MIXER.main.mix - fi + else + + if [ -f $SDCARD_MIXERS_PATH/$MIXER.mix ] + then + set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.mix + else + set MIXER_FILE /etc/mixers/$MIXER.main.mix + fi + fi if [ $OUTPUT_MODE == mkblctrl ] then @@ -34,7 +37,7 @@ then else set OUTPUT_DEV /dev/pwm_output fi - + if [ $OUTPUT_MODE == uavcan_esc ] then set OUTPUT_DEV /dev/uavcan/esc @@ -91,31 +94,34 @@ then pwm failsafe -d $OUTPUT_DEV $FAILSAFE fi fi - + # check if should load secondary mixer if [ $MIXER_AUX != none ] then - # - # Load aux mixer - # - - set MIXER_AUX_FILE none - - if [ -f $SDCARD_MIXERS_PATH/$MIXER_AUX.mix ] - then - set MIXER_AUX_FILE $SDCARD_MIXERS_PATH/$MIXER_AUX.mix - elif [ -f /etc/mixers/$MIXER_AUX.mix ] - then - set MIXER_AUX_FILE /etc/mixers/$MIXER_AUX.mix - fi - - if [ $MIXER_AUX_FILE != none -a $FMU_MODE == pwm ] - then - if fmu mode_pwm - then - mixer load /dev/pwm_output1 $MIXER_AUX_FILE - else - tone_alarm $TUNE_ERR - fi - fi + # + # Load aux mixer + # + + set MIXER_AUX_FILE none + + if [ -f $SDCARD_MIXERS_PATH/$MIXER_AUX.mix ] + then + set MIXER_AUX_FILE $SDCARD_MIXERS_PATH/$MIXER_AUX.mix + else + + if [ -f /etc/mixers/$MIXER_AUX.mix ] + then + set MIXER_AUX_FILE /etc/mixers/$MIXER_AUX.mix + fi + fi + + if [ $MIXER_AUX_FILE != none -a $FMU_MODE == pwm ] + then + if fmu mode_pwm + then + mixer load /dev/pwm_output1 $MIXER_AUX_FILE + else + tone_alarm $TUNE_ERR + fi + fi fi
\ No newline at end of file |