diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-05 19:13:08 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-05 19:13:08 +0100 |
| commit | 59701efe5e925bf53298e5d6094f729c69b547de (patch) | |
| tree | f571038466e7a5e5a60371a3cd075920647d57ae /ROMFS | |
| parent | 011e9f5a990d4328edd28c00a0bcc6d962eb414b (diff) | |
| parent | 15f021eec2042b81f286ac26a7dc9eb86cd89442 (diff) | |
| download | px4-firmware-59701efe5e925bf53298e5d6094f729c69b547de.tar.gz px4-firmware-59701efe5e925bf53298e5d6094f729c69b547de.tar.bz2 px4-firmware-59701efe5e925bf53298e5d6094f729c69b547de.zip | |
Merge pull request #639 from PX4/fix_hex_startup
Startup: Hex vs Hexa
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 2 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix (renamed from ROMFS/px4fmu_common/mixers/FMU_hex_+.mix) | 0 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix (renamed from ROMFS/px4fmu_common/mixers/FMU_hex_x.mix) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 84dc7ec64..178bcaeba 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -474,7 +474,7 @@ then set MAV_TYPE 2 # Use mixer to detect vehicle type - if [ $MIXER == FMU_hex_x -o $MIXER == FMU_hex_+ ] + if [ $MIXER == FMU_hexa_x -o $MIXER == FMU_hexa_+ ] then set MAV_TYPE 13 fi diff --git a/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix b/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix index b5e38ce9e..b5e38ce9e 100644 --- a/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_+.mix diff --git a/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix b/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix index 8e8d122ad..8e8d122ad 100644 --- a/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_hexa_x.mix |