diff options
author | Julian Oes <joes@student.ethz.ch> | 2012-11-13 14:20:31 -0800 |
---|---|---|
committer | Julian Oes <joes@student.ethz.ch> | 2012-11-13 14:20:31 -0800 |
commit | b7c6a11e6739d217e5df1e79b7f80399ff1fd8f8 (patch) | |
tree | cf8109028615ef5c8d216417088c373dad4dc9a4 /ROMFS/mixers | |
parent | 359cc4bb86cae716d3d47dc888c836d04e920215 (diff) | |
parent | a6294be6f076913d7b2c04e42aae1c0c93193a6f (diff) | |
download | px4-firmware-b7c6a11e6739d217e5df1e79b7f80399ff1fd8f8.tar.gz px4-firmware-b7c6a11e6739d217e5df1e79b7f80399ff1fd8f8.tar.bz2 px4-firmware-b7c6a11e6739d217e5df1e79b7f80399ff1fd8f8.zip |
Merge remote-tracking branch 'upstream/master' into io
Diffstat (limited to 'ROMFS/mixers')
-rw-r--r-- | ROMFS/mixers/FMU_AERT.mix | 4 | ||||
-rw-r--r-- | ROMFS/mixers/FMU_AET.mix | 4 | ||||
-rw-r--r-- | ROMFS/mixers/FMU_RET.mix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ROMFS/mixers/FMU_AERT.mix b/ROMFS/mixers/FMU_AERT.mix index d7e317e13..75e82bb00 100644 --- a/ROMFS/mixers/FMU_AERT.mix +++ b/ROMFS/mixers/FMU_AERT.mix @@ -36,8 +36,8 @@ factors (to reverse the servo movement) and adjust the offset, scaling and endpoints to suit. M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 1 10000 10000 0 -10000 10000 +O: 10000 10000 0 -10000 10000 +S: 0 1 -10000 -10000 0 -10000 10000 Rudder mixer ------------ diff --git a/ROMFS/mixers/FMU_AET.mix b/ROMFS/mixers/FMU_AET.mix index bd7056f7c..20cb88b91 100644 --- a/ROMFS/mixers/FMU_AET.mix +++ b/ROMFS/mixers/FMU_AET.mix @@ -39,8 +39,8 @@ factors (to reverse the servo movement) and adjust the offset, scaling and endpoints to suit. M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 1 10000 10000 0 -10000 10000 +O: 10000 10000 0 -10000 10000 +S: 0 1 -10000 -10000 0 -10000 10000 Output 2 -------- diff --git a/ROMFS/mixers/FMU_RET.mix b/ROMFS/mixers/FMU_RET.mix index 156fcb129..95beb8927 100644 --- a/ROMFS/mixers/FMU_RET.mix +++ b/ROMFS/mixers/FMU_RET.mix @@ -32,8 +32,8 @@ factors (to reverse the servo movement) and adjust the offset, scaling and endpoints to suit. M: 1 -O: 10000 10000 0 -10000 10000 -S: 0 1 10000 10000 0 -10000 10000 +O: 10000 10000 0 -10000 10000 +S: 0 1 -10000 -10000 0 -10000 10000 Output 2 -------- |