From 528095a20b119f8ff50e8775b5290dfc1305003e Mon Sep 17 00:00:00 2001 From: px4dev Date: Sun, 5 Aug 2012 19:47:29 -0700 Subject: [PATCH] Add a simple passthrough mixer for testing. --- ROMFS/Makefile | 1 + ROMFS/mixers/FMU_AERT.mix | 2 +- ROMFS/mixers/FMU_AET.mix | 2 +- ROMFS/mixers/FMU_RET.mix | 2 +- ROMFS/mixers/FMU_delta.mix | 1 + ROMFS/mixers/FMU_pass.mix | 23 +++++++++++++++++++++++ 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 ROMFS/mixers/FMU_pass.mix diff --git a/ROMFS/Makefile b/ROMFS/Makefile index de49c36fc7..6437a1e974 100644 --- a/ROMFS/Makefile +++ b/ROMFS/Makefile @@ -21,6 +21,7 @@ ROMFS_FSSPEC := $(SRCROOT)/scripts/rcS~init.d/rcS \ $(SRCROOT)/scripts/rc.standalone~init.d/rc.standalone \ $(SRCROOT)/scripts/rc.PX4IO~init.d/rc.PX4IO \ $(SRCROOT)/scripts/rc.PX4IOAR~init.d/rc.PX4IOAR \ + $(SRCROOT)/mixers/FMU_pass.mix~mixers/FMU_pass.mix \ $(SRCROOT)/mixers/FMU_delta.mix~mixers/FMU_delta.mix \ $(SRCROOT)/mixers/FMU_AERT.mix~mixers/FMU_AERT.mix \ $(SRCROOT)/mixers/FMU_AET.mix~mixers/FMU_AET.mix \ diff --git a/ROMFS/mixers/FMU_AERT.mix b/ROMFS/mixers/FMU_AERT.mix index 18be38bbd4..eb46da5fa4 100644 --- a/ROMFS/mixers/FMU_AERT.mix +++ b/ROMFS/mixers/FMU_AERT.mix @@ -1,7 +1,7 @@ Aileron/rudder/elevator/throttle mixer for PX4FMU ================================================== -This file defines mixers suirable for controlling a fixed wing aircraft with +This file defines mixers suitable for controlling a fixed wing aircraft with aileron, rudder, elevator and throttle controls using PX4FMU. The configuration assumes the aileron servo(s) are connected to PX4FMU servo output 0, the elevator to output 1, the rudder to output 2 and the throttle to output 3. diff --git a/ROMFS/mixers/FMU_AET.mix b/ROMFS/mixers/FMU_AET.mix index bd038edc5d..9ae23f2646 100644 --- a/ROMFS/mixers/FMU_AET.mix +++ b/ROMFS/mixers/FMU_AET.mix @@ -1,7 +1,7 @@ Aileron/elevator/throttle mixer for PX4FMU ================================================== -This file defines mixers suirable for controlling a fixed wing aircraft with +This file defines mixers suitable for controlling a fixed wing aircraft with aileron, elevator and throttle controls using PX4FMU. The configuration assumes the aileron servo(s) are connected to PX4FMU servo output 0, the elevator to output 1 and the throttle to output 3. diff --git a/ROMFS/mixers/FMU_RET.mix b/ROMFS/mixers/FMU_RET.mix index e8762787b1..94815b48e8 100644 --- a/ROMFS/mixers/FMU_RET.mix +++ b/ROMFS/mixers/FMU_RET.mix @@ -1,7 +1,7 @@ Rudder/elevator/throttle mixer for PX4FMU ========================================= -This file defines mixers suirable for controlling a fixed wing aircraft with +This file defines mixers suitable for controlling a fixed wing aircraft with rudder, elevator and throttle controls using PX4FMU. The configuration assumes the rudder servo is connected to PX4FMU servo output 0, the elevator to output 1 and the throttle to output 3. diff --git a/ROMFS/mixers/FMU_delta.mix b/ROMFS/mixers/FMU_delta.mix index 8f2d12be3f..7b878e40b4 100644 --- a/ROMFS/mixers/FMU_delta.mix +++ b/ROMFS/mixers/FMU_delta.mix @@ -47,3 +47,4 @@ range. Inputs below zero are treated as zero. M: 2 S: 0 0 10000 10000 0 -10000 10000 S: 0 3 0 20000 -10000 -10000 10000 + diff --git a/ROMFS/mixers/FMU_pass.mix b/ROMFS/mixers/FMU_pass.mix new file mode 100644 index 0000000000..0e8e07a072 --- /dev/null +++ b/ROMFS/mixers/FMU_pass.mix @@ -0,0 +1,23 @@ +Passthrough mixer for PX4FMU +============================ + +This file defines passthrough mixers suitable for testing. + +Channel group 0, channels 0-3 are passed directly through to the outputs. + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 0 10000 10000 0 -10000 10000 + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 1 10000 10000 0 -10000 10000 + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 2 10000 10000 0 -10000 10000 + +M: 2 +S: 0 0 10000 10000 0 -10000 10000 +S: 0 3 10000 10000 0 -10000 10000 +