Merge pull request #828 from PX4/cox_cleanup

startup: cleanup of cox mixer files (Thanks Rune)
2014-04-14 22:36:04 +02:00 · 2014-04-14 22:36:04 +02:00 · c77c5c878b
parent df987f3577 9be0dcdab1
commit c77c5c878b
4 changed files with 3 additions and 3 deletions
--- 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
--- 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
--- 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
--- a/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix
+++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix