aboutsummaryrefslogtreecommitdiff
path: root/ROMFS
diff options
context:
space:
mode:
authorJulian Oes <joes@student.ethz.ch>2012-11-03 19:44:06 -0700
committerJulian Oes <joes@student.ethz.ch>2012-11-03 19:44:06 -0700
commit87618bb9f28dcbb26a7b0c5f50b62edd53949699 (patch)
tree4521a3faac316c4985b3c5a3f5738f2db64a4fdc /ROMFS
parent487597b3859ee6bee9b0efda1069d15afb7bb29d (diff)
downloadpx4-firmware-87618bb9f28dcbb26a7b0c5f50b62edd53949699.tar.gz
px4-firmware-87618bb9f28dcbb26a7b0c5f50b62edd53949699.tar.bz2
px4-firmware-87618bb9f28dcbb26a7b0c5f50b62edd53949699.zip
Added mixer files for hex and octo
Diffstat (limited to 'ROMFS')
-rw-r--r--ROMFS/Makefile4
-rw-r--r--ROMFS/mixers/FMU_hex_+.mix7
-rw-r--r--ROMFS/mixers/FMU_hex_x.mix7
-rw-r--r--ROMFS/mixers/FMU_octo_+.mix7
-rw-r--r--ROMFS/mixers/FMU_octo_x.mix7
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