diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-27 09:57:07 +0100 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-07 07:18:45 -1000 |
| commit | f029a1c0226c0b53fc3e6ac733198580462bf47b (patch) | |
| tree | ef6c1d69bcc51c3242dc7930f918509aaa1f39df | |
| parent | 5cdd6b45f056d2009b3f8cb9e24b10af6115415d (diff) | |
| download | px4-firmware-f029a1c0226c0b53fc3e6ac733198580462bf47b.tar.gz px4-firmware-f029a1c0226c0b53fc3e6ac733198580462bf47b.tar.bz2 px4-firmware-f029a1c0226c0b53fc3e6ac733198580462bf47b.zip | |
rc.interface: expand mixer variables
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.interface | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 5101acc07..042abc5aa 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -13,21 +13,21 @@ then if [ $MIXER_AUX == none -a $USE_IO == yes ] then - set MIXER_AUX $MIXER.aux + 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 ] + if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ] then - set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.main.mix + set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix # Try out the old convention, for backward compatibility else - if [ -f $SDCARD_MIXERS_PATH/$MIXER.mix ] + if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.mix ] then - set MIXER_FILE $SDCARD_MIXERS_PATH/$MIXER.mix + set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.mix else - set MIXER_FILE /etc/mixers/$MIXER.main.mix + set MIXER_FILE /etc/mixers/${MIXER}.main.mix fi fi @@ -105,14 +105,14 @@ then set MIXER_AUX_FILE none set OUTPUT_AUX_DEV /dev/pwm_output1 - if [ -f $SDCARD_MIXERS_PATH/$MIXER_AUX.mix ] + if [ -f ${SDCARD_MIXERS_PATH}/${MIXER_AUX}.mix ] then - set MIXER_AUX_FILE $SDCARD_MIXERS_PATH/$MIXER_AUX.mix + set MIXER_AUX_FILE ${SDCARD_MIXERS_PATH}/${MIXER_AUX}.mix else - if [ -f /etc/mixers/$MIXER_AUX.mix ] + if [ -f /etc/mixers/${MIXER_AUX}.mix ] then - set MIXER_AUX_FILE /etc/mixers/$MIXER_AUX.mix + set MIXER_AUX_FILE /etc/mixers/${MIXER_AUX}.mix fi fi |