diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-27 10:16:59 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-27 10:16:59 +0100 |
| commit | cfe2609ab63bf88f3b251eaf35d10c664efdbd9e (patch) | |
| tree | b6ffa5d7040f0c41034326fc454d45dceac7f8fd | |
| parent | f0c87ef9cb68ec5e2b48bcfa00d9efb757c8ce4f (diff) | |
| parent | 2114683bb8116297fd8bdc9c5e31b2e5092d4fd8 (diff) | |
| download | px4-firmware-cfe2609ab63bf88f3b251eaf35d10c664efdbd9e.tar.gz px4-firmware-cfe2609ab63bf88f3b251eaf35d10c664efdbd9e.tar.bz2 px4-firmware-cfe2609ab63bf88f3b251eaf35d10c664efdbd9e.zip | |
Merge remote-tracking branch 'upstream/nuttx_bringup_expvar' into ros_messagelayer_merge_nuttx_bringup
| -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 7fde482df..b5be9bb21 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 ] 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 @@ -104,14 +104,14 @@ then set MIXER_AUX_FILE none - 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 |