diff options
| author | Anton Matosov <anton.matosov@gmail.com> | 2015-01-07 00:25:06 +0200 |
|---|---|---|
| committer | Anton Matosov <anton.matosov@gmail.com> | 2015-01-08 00:53:52 +0200 |
| commit | 08062e6546f02cb2e819f690d35b485425788cc4 (patch) | |
| tree | 34707300cb69fc63bb89bdc31e3feabad08a84d1 /ROMFS/px4fmu_common/init.d/rcS | |
| parent | 74b63d08e1f2dd34b2c18be9d46d0837a9be5b9f (diff) | |
| download | px4-firmware-08062e6546f02cb2e819f690d35b485425788cc4.tar.gz px4-firmware-08062e6546f02cb2e819f690d35b485425788cc4.tar.bz2 px4-firmware-08062e6546f02cb2e819f690d35b485425788cc4.zip | |
Changed naming of the mixers to get rid of umbiguity as outputs are actually going to be driven by io, not fmu
Implemented automatic lookup for the .aux.mix file if it exists
Diffstat (limited to 'ROMFS/px4fmu_common/init.d/rcS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 924f6ebc0..31d6a8a2d 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -116,7 +116,7 @@ then set HIL no set VEHICLE_TYPE none set MIXER none - set MIXER_SEC none + set MIXER_AUX none set OUTPUT_MODE none set PWM_OUT none set PWM_RATE none @@ -482,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 ] @@ -518,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 @@ -577,11 +577,11 @@ 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 == FMU_firefly6_rotors ] + if [ $MIXER == firefly6_rotors ] then set MAV_TYPE 21 fi |