mirror of
https://gitee.com/xiaohuolufeihua/bizhang_-obav.git
synced 2026-05-21 01:12:11 +00:00
rc.interface: allow setting a custom MIXER_FILE
This commit is contained in:
@@ -128,17 +128,20 @@ then
|
|||||||
set MIXER_AUX ${MIXER}
|
set MIXER_AUX ${MIXER}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ]
|
if [ "$MIXER_FILE" == none ]
|
||||||
then
|
then
|
||||||
# Use the mixer file from the SD-card if it exists.
|
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ]
|
||||||
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix
|
|
||||||
else
|
|
||||||
# Try out the old convention, for backward compatibility.
|
|
||||||
if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.mix ]
|
|
||||||
then
|
then
|
||||||
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.mix
|
# Use the mixer file from the SD-card if it exists.
|
||||||
|
set MIXER_FILE ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix
|
||||||
else
|
else
|
||||||
set MIXER_FILE /etc/mixers/${MIXER}.main.mix
|
# Try out the old convention, for backward compatibility.
|
||||||
|
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
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -168,7 +171,6 @@ then
|
|||||||
tone_alarm ${TUNE_ERR}
|
tone_alarm ${TUNE_ERR}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
unset MIXER_FILE
|
|
||||||
else
|
else
|
||||||
if [ $MIXER != skip ]
|
if [ $MIXER != skip ]
|
||||||
then
|
then
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ set MAVLINK_COMPANION_DEVICE /dev/ttyS2
|
|||||||
set MAV_TYPE none
|
set MAV_TYPE none
|
||||||
set MIXER none
|
set MIXER none
|
||||||
set MIXER_AUX none
|
set MIXER_AUX none
|
||||||
|
set MIXER_FILE none
|
||||||
set MK_MODE none
|
set MK_MODE none
|
||||||
set MKBLCTRL_ARG ""
|
set MKBLCTRL_ARG ""
|
||||||
set OUTPUT_MODE none
|
set OUTPUT_MODE none
|
||||||
@@ -546,6 +547,7 @@ unset MAVLINK_COMPANION_DEVICE
|
|||||||
unset MAV_TYPE
|
unset MAV_TYPE
|
||||||
unset MIXER
|
unset MIXER
|
||||||
unset MIXER_AUX
|
unset MIXER_AUX
|
||||||
|
unset MIXER_FILE
|
||||||
unset MK_MODE
|
unset MK_MODE
|
||||||
unset MKBLCTRL_ARG
|
unset MKBLCTRL_ARG
|
||||||
unset OUTPUT_DEV
|
unset OUTPUT_DEV
|
||||||
|
|||||||
Reference in New Issue
Block a user