diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-09 16:07:05 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-09 16:07:05 +0100 |
| commit | 754572f25aa7ef069e2ae61f8b3689ae9fb614ae (patch) | |
| tree | 9aec894e7993dee4461d9201b033d03f8dafaf0c /ROMFS | |
| parent | b48fc5362c9200b70bbbc17fcab195384dad9fa9 (diff) | |
| parent | 9f45770dc2987c815372bc1d3c1f9392c3eec62a (diff) | |
| download | px4-firmware-754572f25aa7ef069e2ae61f8b3689ae9fb614ae.tar.gz px4-firmware-754572f25aa7ef069e2ae61f8b3689ae9fb614ae.tar.bz2 px4-firmware-754572f25aa7ef069e2ae61f8b3689ae9fb614ae.zip | |
Merge branch 'master' of https://github.com/julianoes/Firmware into io
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/Makefile | 4 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_hex_+.mix | 7 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_hex_x.mix | 7 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_octo_+.mix | 7 | ||||
| -rw-r--r-- | ROMFS/mixers/FMU_octo_x.mix | 7 |
5 files changed, 32 insertions, 0 deletions
diff --git a/ROMFS/Makefile b/ROMFS/Makefile index 56ae63d27..ec4221b93 100644 --- a/ROMFS/Makefile +++ b/ROMFS/Makefile @@ -29,6 +29,10 @@ ROMFS_FSSPEC := $(SRCROOT)/scripts/rcS~init.d/rcS \ $(SRCROOT)/mixers/FMU_RET.mix~mixers/FMU_ERT.mix \ $(SRCROOT)/mixers/FMU_quad_x.mix~mixers/FMU_quad_x.mix \ $(SRCROOT)/mixers/FMU_quad_+.mix~mixers/FMU_quad_+.mix \ + $(SRCROOT)/mixers/FMU_hex_x.mix~mixers/FMU_hex_x.mix \ + $(SRCROOT)/mixers/FMU_hex_+.mix~mixers/FMU_hex_+.mix \ + $(SRCROOT)/mixers/FMU_octo_x.mix~mixers/FMU_octo_x.mix \ + $(SRCROOT)/mixers/FMU_octo_+.mix~mixers/FMU_octo_+.mix \ $(SRCROOT)/logging/logconv.m~logging/logconv.m # diff --git a/ROMFS/mixers/FMU_hex_+.mix b/ROMFS/mixers/FMU_hex_+.mix new file mode 100644 index 000000000..b5e38ce9e --- /dev/null +++ b/ROMFS/mixers/FMU_hex_+.mix @@ -0,0 +1,7 @@ +Multirotor mixer for PX4FMU +=========================== + +This file defines a single mixer for a hexacopter in the + configuration. All controls +are mixed 100%. + +R: 6+ 10000 10000 10000 0 diff --git a/ROMFS/mixers/FMU_hex_x.mix b/ROMFS/mixers/FMU_hex_x.mix new file mode 100644 index 000000000..8e8d122ad --- /dev/null +++ b/ROMFS/mixers/FMU_hex_x.mix @@ -0,0 +1,7 @@ +Multirotor mixer for PX4FMU +=========================== + +This file defines a single mixer for a hexacopter in the X configuration. All controls +are mixed 100%. + +R: 6x 10000 10000 10000 0 diff --git a/ROMFS/mixers/FMU_octo_+.mix b/ROMFS/mixers/FMU_octo_+.mix new file mode 100644 index 000000000..2cb70e814 --- /dev/null +++ b/ROMFS/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 diff --git a/ROMFS/mixers/FMU_octo_x.mix b/ROMFS/mixers/FMU_octo_x.mix new file mode 100644 index 000000000..edc71f013 --- /dev/null +++ b/ROMFS/mixers/FMU_octo_x.mix @@ -0,0 +1,7 @@ +Multirotor mixer for PX4FMU +=========================== + +This file defines a single mixer for a octocopter in the X configuration. All controls +are mixed 100%. + +R: 8x 10000 10000 10000 0 |