From 891b231215ce287de43f76d6c6e7846854699178 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lorenz@px4.io>
Date: Tue, 9 Mar 2021 16:28:55 +0100
Subject: [PATCH] Ensure that AUX mixer is loaded when 2nd bank is present

---
 ROMFS/px4fmu_common/init.d-posix/rcS     | 1 +
 ROMFS/px4fmu_common/init.d/rc.interface  | 2 +-
 boards/cuav/x7pro/init/rc.board_defaults | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ROMFS/px4fmu_common/init.d-posix/rcS b/ROMFS/px4fmu_common/init.d-posix/rcS
index 5a39f7186d..0d76fbee5e 100644
--- a/ROMFS/px4fmu_common/init.d-posix/rcS
+++ b/ROMFS/px4fmu_common/init.d-posix/rcS
@@ -21,6 +21,7 @@ fi
 
 # initialize script variables
 set AUX_MODE                    none
+set AUX_BANK2			none
 set IO_PRESENT                  no
 set MAV_TYPE                    none
 set MIXER                       none
diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface
index b35d54d881..f573d8d759 100644
--- a/ROMFS/px4fmu_common/init.d/rc.interface
+++ b/ROMFS/px4fmu_common/init.d/rc.interface
@@ -30,7 +30,7 @@ then
 fi
 
 # USE_IO is set to 'no' for all boards w/o px4io driver or SYS_USE_IO disabled
-if [ $USE_IO = no ]
+if [ $USE_IO = no -a $AUX_BANK2 = none ]
 then
 	set AUX_MODE none
 fi
diff --git a/boards/cuav/x7pro/init/rc.board_defaults b/boards/cuav/x7pro/init/rc.board_defaults
index 7491c4b0da..6969379f8b 100644
--- a/boards/cuav/x7pro/init/rc.board_defaults
+++ b/boards/cuav/x7pro/init/rc.board_defaults
@@ -3,6 +3,9 @@
 # board specific defaults
 #------------------------------------------------------------------------------
 
+# Enables the 2nd bank of mixers
+set AUX_BANK2 yes
+
 param set-default BAT_V_DIV 18
 param set-default BAT1_V_DIV 18
 param set-default BAT2_V_DIV 18