From 15f021eec2042b81f286ac26a7dc9eb86cd89442 Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Wed, 5 Feb 2014 19:03:26 +0100
Subject: Startup: Hex vs Hexa

---
 ROMFS/px4fmu_common/init.d/rcS            | 2 +-
 ROMFS/px4fmu_common/mixers/FMU_hex_+.mix  | 7 -------
 ROMFS/px4fmu_common/mixers/FMU_hex_x.mix  | 7 -------
 ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix | 7 +++++++
 ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix | 7 +++++++
 5 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 ROMFS/px4fmu_common/mixers/FMU_hex_+.mix
 delete mode 100644 ROMFS/px4fmu_common/mixers/FMU_hex_x.mix
 create mode 100644 ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix
 create mode 100644 ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix

(limited to 'ROMFS')

diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 84dc7ec64..178bcaeba 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -474,7 +474,7 @@ then
 			set MAV_TYPE 2
 			
 			# Use mixer to detect vehicle type
-			if [ $MIXER == FMU_hex_x -o $MIXER == FMU_hex_+ ]
+			if [ $MIXER == FMU_hexa_x -o $MIXER == FMU_hexa_+ ]
 			then
 				set MAV_TYPE 13
 			fi
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix b/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix
deleted file mode 100644
index b5e38ce9e..000000000
--- a/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix
+++ /dev/null
@@ -1,7 +0,0 @@
-Multirotor mixer for PX4FMU
-===========================
-
-This file defines a single mixer for a hexacopter in the + configuration. All controls
-are mixed 100%.
-
-R: 6+ 10000 10000 10000 0
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix b/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix
deleted file mode 100644
index 8e8d122ad..000000000
--- a/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix
+++ /dev/null
@@ -1,7 +0,0 @@
-Multirotor mixer for PX4FMU
-===========================
-
-This file defines a single mixer for a hexacopter in the X configuration.  All controls
-are mixed 100%.
-
-R: 6x 10000 10000 10000 0
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix b/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix
new file mode 100644
index 000000000..b5e38ce9e
--- /dev/null
+++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix
@@ -0,0 +1,7 @@
+Multirotor mixer for PX4FMU
+===========================
+
+This file defines a single mixer for a hexacopter in the + configuration. All controls
+are mixed 100%.
+
+R: 6+ 10000 10000 10000 0
diff --git a/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix b/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix
new file mode 100644
index 000000000..8e8d122ad
--- /dev/null
+++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix
@@ -0,0 +1,7 @@
+Multirotor mixer for PX4FMU
+===========================
+
+This file defines a single mixer for a hexacopter in the X configuration.  All controls
+are mixed 100%.
+
+R: 6x 10000 10000 10000 0
-- 
cgit v1.2.3