diff options
| author | px4dev <px4@purgatory.org> | 2012-08-10 00:30:40 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-08-10 00:30:40 -0700 |
| commit | 67e0f8b1791dfffe780a5add528bbcd1358c0421 (patch) | |
| tree | a0db28b6cfe874aabbad67e8b0a270316984d963 /ROMFS/mixers | |
| parent | 04d280564cf915e73aa4bddd23cbfdd5b1c19796 (diff) | |
| download | px4-firmware-67e0f8b1791dfffe780a5add528bbcd1358c0421.tar.gz px4-firmware-67e0f8b1791dfffe780a5add528bbcd1358c0421.tar.bz2 px4-firmware-67e0f8b1791dfffe780a5add528bbcd1358c0421.zip | |
Rework the mixer architecture based on discussions about arbitrary geometry mixing and plugins.
Now the mixer is a C++ library that can be fairly easily bolted into an output driver to provide mixing services.
Teach the FMU driver how to use it as an example. More testing is still required.
Diffstat (limited to 'ROMFS/mixers')
| -rw-r--r-- | ROMFS/mixers/FMU_AET.mix | 2 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_RET.mix | 2 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_delta.mix | 2 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_multirotor.mix | 24 |
4 files changed, 27 insertions, 3 deletions
diff --git a/ROMFS/mixers/FMU_AET.mix b/ROMFS/mixers/FMU_AET.mix index 9ae23f264..1f1931861 100644 --- a/ROMFS/mixers/FMU_AET.mix +++ b/ROMFS/mixers/FMU_AET.mix @@ -46,7 +46,7 @@ Output 2 -------- This mixer is empty. -M: 0 +Z: Motor speed mixer ----------------- diff --git a/ROMFS/mixers/FMU_RET.mix b/ROMFS/mixers/FMU_RET.mix index 94815b48e..b2fff7224 100644 --- a/ROMFS/mixers/FMU_RET.mix +++ b/ROMFS/mixers/FMU_RET.mix @@ -39,7 +39,7 @@ Output 2 -------- This mixer is empty. -M: 0 +Z: Motor speed mixer ----------------- diff --git a/ROMFS/mixers/FMU_delta.mix b/ROMFS/mixers/FMU_delta.mix index 7b878e40b..b01284ef7 100644 --- a/ROMFS/mixers/FMU_delta.mix +++ b/ROMFS/mixers/FMU_delta.mix @@ -35,7 +35,7 @@ Output 2 -------- This mixer is empty. -M: 0 +Z: Motor speed mixer ----------------- diff --git a/ROMFS/mixers/FMU_multirotor.mix b/ROMFS/mixers/FMU_multirotor.mix new file mode 100644 index 000000000..6175b18e1 --- /dev/null +++ b/ROMFS/mixers/FMU_multirotor.mix @@ -0,0 +1,24 @@ +Multirotor mixer for PX4FMU +=========================== + +This file defines passthrough mixers suitable for driving ESCs over the full +input range. + +Channel group 0, channels 0-3 values 0.0 - 1.0 are scaled to the full output range. + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 0 0 20000 -10000 -10000 10000 + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 1 0 20000 -10000 -10000 10000 + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 2 0 20000 -10000 -10000 10000 + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 3 0 20000 -10000 -10000 10000 + |