From bccda56ed3150ef04690b3e9912023f9951d3ae6 Mon Sep 17 00:00:00 2001 From: mcsauder Date: Thu, 19 Jul 2018 02:10:06 -0600 Subject: [PATCH] Re-order hardware specific logic in rc.interface. --- ROMFS/px4fmu_common/init.d/rc.interface | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/ROMFS/px4fmu_common/init.d/rc.interface b/ROMFS/px4fmu_common/init.d/rc.interface index 9c04cd9ce7..2b08c52417 100644 --- a/ROMFS/px4fmu_common/init.d/rc.interface +++ b/ROMFS/px4fmu_common/init.d/rc.interface @@ -13,16 +13,6 @@ set MIXER_AUX_FILE none set OUTPUT_AUX_DEV /dev/pwm_output1 set SDCARD_MIXERS_PATH /fs/microsd/etc/mixers -if ver hwcmp AEROFC_V1 AV_X_V1 CRAZYFLIE MINDPX_V2 NXPHLITE_V3 PX4FMU_V4 OMNIBUS_F4SD -then - set MIXER_AUX none -fi - -if [ $USE_IO == no ] -then - set MIXER_AUX none -fi - # # If mount (gimbal) control is enabled and output mode is AUX, set the aux # mixer to mount (override the airframe-specific MIXER_AUX setting). @@ -36,6 +26,15 @@ else fi fi +if ver hwcmp AEROFC_V1 AV_X_V1 CRAZYFLIE MINDPX_V2 NXPHLITE_V3 PX4FMU_V4 OMNIBUS_F4SD +then + set MIXER_AUX none +fi + +if [ $USE_IO == no ] +then + set MIXER_AUX none +fi if [ $MIXER != none -a $MIXER != skip ] then