diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-10 21:08:28 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-10 21:08:28 +0100 |
| commit | f4e0e74d173ba023546622f85af068c3de81204e (patch) | |
| tree | 4f510c3356818166bf7544cbc113d78d935f3550 | |
| parent | b0c60296f58dfec02f115d0033f61e95389f5931 (diff) | |
| parent | ac653416f8f5163a4f162ab431d69129c9e1858e (diff) | |
| download | px4-firmware-f4e0e74d173ba023546622f85af068c3de81204e.tar.gz px4-firmware-f4e0e74d173ba023546622f85af068c3de81204e.tar.bz2 px4-firmware-f4e0e74d173ba023546622f85af068c3de81204e.zip | |
Merge pull request #645 from thomasgubler/x5_mixer
X5: copy content of FMU_Q.mix to FMU_X5.mix because FMU_Q was used previously by the X5 startup script
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_X5.mix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ROMFS/px4fmu_common/mixers/FMU_X5.mix b/ROMFS/px4fmu_common/mixers/FMU_X5.mix index 610868354..80e3bac09 100644 --- a/ROMFS/px4fmu_common/mixers/FMU_X5.mix +++ b/ROMFS/px4fmu_common/mixers/FMU_X5.mix @@ -23,13 +23,13 @@ for the elevons. M: 2 O: 10000 10000 0 -10000 10000 -S: 0 0 -3000 -5000 0 -10000 10000 -S: 0 1 -5000 -5000 0 -10000 10000 +S: 0 0 -8000 -8000 0 -10000 10000 +S: 0 1 6000 6000 0 -10000 10000 M: 2 O: 10000 10000 0 -10000 10000 -S: 0 0 -5000 -3000 0 -10000 10000 -S: 0 1 5000 5000 0 -10000 10000 +S: 0 0 -8000 -8000 0 -10000 10000 +S: 0 1 -6000 -6000 0 -10000 10000 Output 2 -------- @@ -48,7 +48,7 @@ M: 1 O: 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 -Gimbal / payload mixer for last four channels +Gimbal / flaps / payload mixer for last four channels ----------------------------------------------------- M: 1 @@ -66,4 +66,3 @@ S: 0 6 10000 10000 0 -10000 10000 M: 1 O: 10000 10000 0 -10000 10000 S: 0 7 10000 10000 0 -10000 10000 - |