From fa18c3d6e6acf1659c623c7d8f6b0ef5a49e5772 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Mon, 31 Jul 2017 18:14:54 -0400
Subject: [PATCH] delete vtol_quad_x (replaced with quad_x)

---
 ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad     | 2 +-
 ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta | 2 +-
 ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad     | 2 +-
 ROMFS/px4fmu_common/init.d/13008_QuadRanger          | 2 +-
 ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger     | 2 +-
 ROMFS/px4fmu_common/init.d/13013_deltaquad           | 2 +-
 ROMFS/px4fmu_common/mixers/vtol_quad_x.main.mix      | 4 ----
 7 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 ROMFS/px4fmu_common/mixers/vtol_quad_x.main.mix

diff --git a/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad b/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad
index 64af39c71d..2ffd8c580f 100644
--- a/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad
+++ b/ROMFS/px4fmu_common/init.d/13005_vtol_AAERT_quad
@@ -62,7 +62,7 @@ then
 	param set VT_TYPE 2
 fi
 
-set MIXER vtol_quad_x
+set MIXER quad_x
 set PWM_OUT 1234
 set PWM_RATE 400
 
diff --git a/ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta b/ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta
index f4ee42a5a5..2aee278579 100644
--- a/ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta
+++ b/ROMFS/px4fmu_common/init.d/13006_vtol_standard_delta
@@ -52,7 +52,7 @@ then
 	param set VT_TYPE 2
 fi
 
-set MIXER vtol_quad_x
+set MIXER quad_x
 set PWM_OUT 1234
 set PWM_RATE 400
 
diff --git a/ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad b/ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad
index 31b984139f..4b8ad807f6 100644
--- a/ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad
+++ b/ROMFS/px4fmu_common/init.d/13007_vtol_AAVVT_quad
@@ -40,7 +40,7 @@ then
 	param set VT_TYPE 2
 fi
 
-set MIXER vtol_quad_x
+set MIXER quad_x
 set PWM_OUT 1234
 set PWM_RATE 400
 
diff --git a/ROMFS/px4fmu_common/init.d/13008_QuadRanger b/ROMFS/px4fmu_common/init.d/13008_QuadRanger
index 4a448a8bdd..4767e02ed2 100644
--- a/ROMFS/px4fmu_common/init.d/13008_QuadRanger
+++ b/ROMFS/px4fmu_common/init.d/13008_QuadRanger
@@ -60,7 +60,7 @@ then
 	param set VT_TYPE 2
 fi
 
-set MIXER vtol_quad_x
+set MIXER quad_x
 set PWM_OUT 1234
 set PWM_RATE 400
 
diff --git a/ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger b/ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger
index f99a30b608..da41a4204b 100644
--- a/ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger
+++ b/ROMFS/px4fmu_common/init.d/13009_vtol_spt_ranger
@@ -76,7 +76,7 @@ then
     param set PWM_AUX_REV4    1
 fi
 
-set MIXER vtol_quad_x
+set MIXER quad_x
 set PWM_OUT 1234
 set PWM_RATE 400
 
diff --git a/ROMFS/px4fmu_common/init.d/13013_deltaquad b/ROMFS/px4fmu_common/init.d/13013_deltaquad
index 5d7e223111..95387415c9 100644
--- a/ROMFS/px4fmu_common/init.d/13013_deltaquad
+++ b/ROMFS/px4fmu_common/init.d/13013_deltaquad
@@ -107,7 +107,7 @@ then
 	param set SYS_COMPANION 57600
 fi
 
-set MIXER vtol_quad_x
+set MIXER quad_x
 set PWM_OUT 1234
 set PWM_RATE 400
 
diff --git a/ROMFS/px4fmu_common/mixers/vtol_quad_x.main.mix b/ROMFS/px4fmu_common/mixers/vtol_quad_x.main.mix
deleted file mode 100644
index 92bfce6c8c..0000000000
--- a/ROMFS/px4fmu_common/mixers/vtol_quad_x.main.mix
+++ /dev/null
@@ -1,4 +0,0 @@
-# VTOL quad X mixer for PX4FMU
-#=============================
-
-R: 4x 10000 10000 10000 0