From 87618bb9f28dcbb26a7b0c5f50b62edd53949699 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Sat, 3 Nov 2012 19:44:06 -0700 Subject: [PATCH] Added mixer files for hex and octo --- ROMFS/Makefile | 4 ++++ ROMFS/mixers/FMU_hex_+.mix | 7 +++++++ ROMFS/mixers/FMU_hex_x.mix | 7 +++++++ ROMFS/mixers/FMU_octo_+.mix | 7 +++++++ ROMFS/mixers/FMU_octo_x.mix | 7 +++++++ 5 files changed, 32 insertions(+) create mode 100644 ROMFS/mixers/FMU_hex_+.mix create mode 100644 ROMFS/mixers/FMU_hex_x.mix create mode 100644 ROMFS/mixers/FMU_octo_+.mix create mode 100644 ROMFS/mixers/FMU_octo_x.mix diff --git a/ROMFS/Makefile b/ROMFS/Makefile index 56ae63d271..ec4221b93a 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 0000000000..b5e38ce9ef --- /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 0000000000..8e8d122adc --- /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 0000000000..2cb70e814c --- /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 0000000000..edc71f0139 --- /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