diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-08 12:45:43 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-08 12:45:43 +0100 |
| commit | aa2a00b56a0be0e20abfa54c311575f9e055f212 (patch) | |
| tree | 7c13065632d45486c31eee5c08b8de58c36335fc /ROMFS/px4fmu_common/init.d/rcS | |
| parent | 1df7939072f87a5f3f3cc05ff57f545db7c144ad (diff) | |
| parent | e405fafe882c95345ccf88ea5f372f353aa4c21f (diff) | |
| download | px4-firmware-aa2a00b56a0be0e20abfa54c311575f9e055f212.tar.gz px4-firmware-aa2a00b56a0be0e20abfa54c311575f9e055f212.tar.bz2 px4-firmware-aa2a00b56a0be0e20abfa54c311575f9e055f212.zip | |
Merge branch 'MixerNaming' of github.com:anton-matosov/Firmware
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 26b729aad..31d6a8a2d 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -116,6 +116,7 @@ then set HIL no set VEHICLE_TYPE none set MIXER none + set MIXER_AUX none set OUTPUT_MODE none set PWM_OUT none set PWM_RATE none @@ -481,7 +482,7 @@ then if [ $MIXER == none ] then # Set default mixer for fixed wing if not defined - set MIXER FMU_AERT + set MIXER AERT fi if [ $MAV_TYPE == none ] @@ -517,27 +518,27 @@ then if [ $MAV_TYPE == none ] then # Use mixer to detect vehicle type - if [ $MIXER == FMU_quad_x -o $MIXER == FMU_quad_+ ] + if [ $MIXER == quad_x -o $MIXER == quad_+ ] then set MAV_TYPE 2 fi - if [ $MIXER == FMU_quad_w ] + if [ $MIXER == quad_w ] then set MAV_TYPE 2 fi - if [ $MIXER == FMU_hexa_x -o $MIXER == FMU_hexa_+ ] + if [ $MIXER == hexa_x -o $MIXER == hexa_+ ] then set MAV_TYPE 13 fi - if [ $MIXER == FMU_hexa_cox ] + if [ $MIXER == hexa_cox ] then set MAV_TYPE 13 fi - if [ $MIXER == FMU_octo_x -o $MIXER == FMU_octo_+ ] + if [ $MIXER == octo_x -o $MIXER == octo_+ ] then set MAV_TYPE 14 fi - if [ $MIXER == FMU_octo_cox ] + if [ $MIXER == octo_cox ] then set MAV_TYPE 14 fi @@ -576,10 +577,14 @@ then if [ $MAV_TYPE == none ] then # Use mixer to detect vehicle type - if [ $MIXER == FMU_caipirinha_vtol ] + if [ $MIXER == caipirinha_vtol ] then set MAV_TYPE 19 fi + if [ $MIXER == firefly6_rotors ] + then + set MAV_TYPE 21 + fi fi # Still no MAV_TYPE found |