diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-04 18:27:06 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-04 18:27:06 +0100 |
| commit | 4499919f76376f5f9904d672ad5fd85e465badac (patch) | |
| tree | 609b2f52ea6df93d83d60f70e28f894ad9d221df /ROMFS | |
| parent | 97c5daf924e8069d0228be03eacefc454df1c2ad (diff) | |
| download | px4-firmware-4499919f76376f5f9904d672ad5fd85e465badac.tar.gz px4-firmware-4499919f76376f5f9904d672ad5fd85e465badac.tar.bz2 px4-firmware-4499919f76376f5f9904d672ad5fd85e465badac.zip | |
Fix for hexa mixer
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/6001_hexa_x | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_hex_+.mix | 11 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_hex_x.mix | 11 |
3 files changed, 3 insertions, 23 deletions
diff --git a/ROMFS/px4fmu_common/init.d/6001_hexa_x b/ROMFS/px4fmu_common/init.d/6001_hexa_x index 270f51a58..fd5756586 100644 --- a/ROMFS/px4fmu_common/init.d/6001_hexa_x +++ b/ROMFS/px4fmu_common/init.d/6001_hexa_x @@ -9,4 +9,6 @@ sh /etc/init.d/4001_quad_x set MIXER FMU_hexa_x -set PWM_OUTPUTS 123456 +# We only can run one channel group with one rate, +# so all 8 at 400 Hz +set PWM_OUTPUTS 12345678 diff --git a/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix b/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix index f8f9f0e4d..b5e38ce9e 100644 --- a/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_hex_+.mix @@ -5,14 +5,3 @@ This file defines a single mixer for a hexacopter in the + configuration. All co are mixed 100%. R: 6+ 10000 10000 10000 0 - -Gimbal / payload mixer for last two channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix b/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix index 26b40b9e9..8e8d122ad 100644 --- a/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_hex_x.mix @@ -5,14 +5,3 @@ This file defines a single mixer for a hexacopter in the X configuration. All c are mixed 100%. R: 6x 10000 10000 10000 0 - -Gimbal / payload mixer for last two channels ------------------------------------------------------ - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 6 10000 10000 0 -10000 10000 - -M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 7 10000 10000 0 -10000 10000 |