From f984c4e450ad17c598361fd4d21c21abe53b031b Mon Sep 17 00:00:00 2001
From: xdwgood <1308455330@qq.com>
Date: Mon, 11 Nov 2019 16:53:52 +0800
Subject: [PATCH] ROMS: delete caipirinha_vtol.main.mix and instead use
 vtol_tailsitter_duo.main.mix

---
 ROMFS/px4fmu_common/mixers/CMakeLists.txt     |  1 -
 .../mixers/caipirinha_vtol.main.mix           | 39 -------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 ROMFS/px4fmu_common/mixers/caipirinha_vtol.main.mix

diff --git a/ROMFS/px4fmu_common/mixers/CMakeLists.txt b/ROMFS/px4fmu_common/mixers/CMakeLists.txt
index b0c04b8961..ffa978e1f3 100644
--- a/ROMFS/px4fmu_common/mixers/CMakeLists.txt
+++ b/ROMFS/px4fmu_common/mixers/CMakeLists.txt
@@ -39,7 +39,6 @@ px4_add_romfs_files(
 	bebop.main.mix
 	blade130.main.mix
 	caipi.main.mix
-	caipirinha_vtol.main.mix
 	CCPM.main.mix
 	claire.aux.mix
 	claire.main.mix
diff --git a/ROMFS/px4fmu_common/mixers/caipirinha_vtol.main.mix b/ROMFS/px4fmu_common/mixers/caipirinha_vtol.main.mix
deleted file mode 100644
index 9cb846a627..0000000000
--- a/ROMFS/px4fmu_common/mixers/caipirinha_vtol.main.mix
+++ /dev/null
@@ -1,39 +0,0 @@
-Caipirinha tailsitter mixer
-============================
-
-This file defines a mixer for the TBS Caipirinha tailsitter edition. This vehicle
-has two motors in total, one attached to each wing. It also has two elevons which
-are located in the slipstream of the propellers. This mixer generates 4 PWM outputs
-on the main PWM ouput port, two at 400Hz for the motors, and two at 50Hz for the
-elevon servos. Channels 1-4 are configured to run at 400Hz, while channels 5-8 run
-at the default rate of 50Hz. Note that channels 3 and 4 are assigned but not used. 
-
-Motor mixer
-------------
-Channel 1 connects to the right (starboard) motor.
-Channel 2 connects to the left (port) motor.
-
-R: 2- 10000 10000 10000 0
-
-Zero mixer (2x)
----------------
-Channels 3,4 are unused.
-
-Z:
-
-Z:
-
-Elevons mixer
---------------
-Channel 5 connects to the right (starboard) elevon.
-Channel 6 connects to the left (port) elevon.
-
-M: 2
-O:        7500    7500    0 -10000  10000
-S: 1 0   10000   10000    0 -10000  10000
-S: 1 1   10000   10000    0 -10000  10000
-
-M: 2
-O:        7500    7500    0 -10000  10000
-S: 1 0   10000   10000    0 -10000  10000
-S: 1 1  -10000  -10000    0 -10000  10000