diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-14 22:36:04 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-04-14 22:36:04 +0200 |
| commit | c77c5c878b05928d0817123e935af4941f653759 (patch) | |
| tree | 9308b4494f121538e8a518e37cc7b3afe65e7f5a /ROMFS | |
| parent | df987f35770931c5357ff4bf99ebd9fe87bc964e (diff) | |
| parent | 9be0dcdab1820cd5cc6f6fc6a447f8c5a52784cc (diff) | |
| download | px4-firmware-c77c5c878b05928d0817123e935af4941f653759.tar.gz px4-firmware-c77c5c878b05928d0817123e935af4941f653759.tar.bz2 px4-firmware-c77c5c878b05928d0817123e935af4941f653759.zip | |
Merge pull request #828 from PX4/cox_cleanup
startup: cleanup of cox mixer files (Thanks Rune)
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/11001_hexa_cox | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/12001_octo_cox | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix (renamed from ROMFS/px4fmu_common/mixers/hexa_cox.mix) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/ROMFS/px4fmu_common/init.d/11001_hexa_cox b/ROMFS/px4fmu_common/init.d/11001_hexa_cox index 38e65435b..df2e609bc 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 99f902a6d..8703f5f2f 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 0cb6d281a..2ab1e2e96 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 index 497786feb..497786feb 100644 --- a/ROMFS/px4fmu_common/mixers/hexa_cox.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_cox.mix |