diff options
| author | Julian Oes <julian@oes.ch> | 2013-05-17 11:24:02 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-05-17 11:24:02 +0200 |
| commit | f5c157e74df12a0cb36b7d27cdad9828d96cc534 (patch) | |
| tree | 3f758990921a7b52df8afe5131a8298b1141b6f4 /ROMFS/px4fmu_common/mixers/FMU_octo_+.mix | |
| parent | 80e8eeab2931e79e31adb17c93f5794e666c5763 (diff) | |
| parent | fa816d0fd65da461fd5bf8803cf00caebaf23c5c (diff) | |
| download | px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.tar.gz px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.tar.bz2 px4-firmware-f5c157e74df12a0cb36b7d27cdad9828d96cc534.zip | |
Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
Diffstat (limited to 'ROMFS/px4fmu_common/mixers/FMU_octo_+.mix')
| -rw-r--r-- | ROMFS/px4fmu_common/mixers/FMU_octo_+.mix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ROMFS/px4fmu_common/mixers/FMU_octo_+.mix b/ROMFS/px4fmu_common/mixers/FMU_octo_+.mix new file mode 100644 index 000000000..2cb70e814 --- /dev/null +++ b/ROMFS/px4fmu_common/mixers/FMU_octo_+.mix @@ -0,0 +1,7 @@ +Multirotor mixer for PX4FMU +=========================== + +This file defines a single mixer for a octocopter in the + configuration. All controls +are mixed 100%. + +R: 8+ 10000 10000 10000 0 |