From 9be0dcdab1820cd5cc6f6fc6a447f8c5a52784cc Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Mon, 14 Apr 2014 21:44:51 +0200
Subject: [PATCH] startup: cleanup of cox mixer files (Thanks Rune)

---
 ROMFS/px4fmu_common/init.d/11001_hexa_cox                     | 2 +-
 ROMFS/px4fmu_common/init.d/12001_octo_cox                     | 2 +-
 ROMFS/px4fmu_common/init.d/rcS                                | 2 +-
 ROMFS/px4fmu_common/mixers/{hexa_cox.mix => FMU_hexa_cox.mix} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename ROMFS/px4fmu_common/mixers/{hexa_cox.mix => FMU_hexa_cox.mix} (100%)

diff --git a/ROMFS/px4fmu_common/init.d/11001_hexa_cox b/ROMFS/px4fmu_common/init.d/11001_hexa_cox
index 38e65435b6..df2e609bc8 100644
--- a/ROMFS/px4fmu_common/init.d/11001_hexa_cox
+++ b/ROMFS/px4fmu_common/init.d/11001_hexa_cox
@@ -9,7 +9,7 @@
 
 sh /etc/init.d/rc.mc_defaults
 
-set MIXER hexa_cox
+set MIXER FMU_hexa_cox
 
 # We only can run one channel group with one rate, so set all 8 channels
 set PWM_OUTPUTS 12345678
diff --git a/ROMFS/px4fmu_common/init.d/12001_octo_cox b/ROMFS/px4fmu_common/init.d/12001_octo_cox
index 99f902a6dd..8703f5f2fe 100644
--- a/ROMFS/px4fmu_common/init.d/12001_octo_cox
+++ b/ROMFS/px4fmu_common/init.d/12001_octo_cox
@@ -7,6 +7,6 @@
 
 sh /etc/init.d/rc.mc_defaults
 
-set MIXER octo_cox
+set MIXER FMU_octo_cox
 
 set PWM_OUTPUTS 12345678
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS
index 0cb6d281a2..2ab1e2e96f 100644
--- a/ROMFS/px4fmu_common/init.d/rcS
+++ b/ROMFS/px4fmu_common/init.d/rcS
@@ -514,7 +514,7 @@ then
 			then
 				set MAV_TYPE 13
 			fi
-			if [ $MIXER == hexa_cox ]
+			if [ $MIXER == FMU_hexa_cox ]
 			then
 				set MAV_TYPE 13
 			fi
diff --git a/ROMFS/px4fmu_common/mixers/hexa_cox.mix b/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix
similarity index 100%
rename from ROMFS/px4fmu_common/mixers/hexa_cox.mix
rename to ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix