From 5ebd0116de58e75bb2ed0942f20dbaeab52e8288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beat=20K=C3=BCng?= <beat-kueng@gmx.net>
Date: Sat, 11 Aug 2018 17:59:24 +0200
Subject: [PATCH] rc.interface: allow setting a custom MIXER_FILE

---
 ROMFS/px4fmu_common/init.d/rc.interface | 20 +++++++++++---------
 ROMFS/px4fmu_common/init.d/rcS          |  2 ++
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface
index a3d2f528a9..46874df116 100644
--- a/ROMFS/px4fmu_common/init.d/rc.interface
+++ b/ROMFS/px4fmu_common/init.d/rc.interface
@@ -128,17 +128,20 @@ then
 		set MIXER_AUX ${MIXER}
 	fi
 
-	if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ]
+	if [ "$MIXER_FILE" == none ]
 	then
-		# Use the mixer file from the SD-card if it exists.
-		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 ]
+		if [ -f ${SDCARD_MIXERS_PATH}/${MIXER}.main.mix ]
 		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
-			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
 
@@ -168,7 +171,6 @@ then
 		tone_alarm ${TUNE_ERR}
 	fi
 
-	unset MIXER_FILE
 else
 	if [ $MIXER != skip ]
 	then
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index b86d1e1fb9..dd40864ead 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -65,6 +65,7 @@ set MAVLINK_COMPANION_DEVICE    /dev/ttyS2
 set MAV_TYPE                    none
 set MIXER                       none
 set MIXER_AUX                   none
+set MIXER_FILE                  none
 set MK_MODE                     none
 set MKBLCTRL_ARG                ""
 set OUTPUT_MODE                 none
@@ -546,6 +547,7 @@ unset MAVLINK_COMPANION_DEVICE
 unset MAV_TYPE
 unset MIXER
 unset MIXER_AUX
+unset MIXER_FILE
 unset MK_MODE
 unset MKBLCTRL_ARG
 unset OUTPUT_DEV