From ff932820e341d4eae7e0764719fcbf5555c5da14 Mon Sep 17 00:00:00 2001 From: Roman Bapst Date: Tue, 6 Jan 2015 16:29:10 +0100 Subject: use two mixers, one for rotors via px4io and one for elevons via fmu outputs --- ROMFS/px4fmu_common/mixers/FMU_firefly6.mix | 15 --------------- ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix | 10 ++++++++++ ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix | 4 ++++ 3 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 ROMFS/px4fmu_common/mixers/FMU_firefly6.mix create mode 100644 ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix create mode 100644 ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix (limited to 'ROMFS') diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6.mix b/ROMFS/px4fmu_common/mixers/FMU_firefly6.mix deleted file mode 100644 index 598f9f797..000000000 --- a/ROMFS/px4fmu_common/mixers/FMU_firefly6.mix +++ /dev/null @@ -1,15 +0,0 @@ -# FireFly6 mixer for PX4FMU -# -#=========================== -R: 6c 10000 10000 10000 0 - -# mixer for the elevons -M: 2 -O: 10000 10000 0 -10000 10000 -S: 1 0 7500 7500 0 -10000 10000 -S: 1 1 8000 8000 0 -10000 10000 - -M: 2 -O: 10000 10000 0 -10000 10000 -S: 1 0 7500 7500 0 -10000 10000 -S: 1 1 -8000 -8000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix b/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix new file mode 100644 index 000000000..9ed6eeed9 --- /dev/null +++ b/ROMFS/px4fmu_common/mixers/FMU_firefly6_elevons.mix @@ -0,0 +1,10 @@ +# mixer for the FireFly6 elevons +M: 2 +O: 10000 10000 0 -10000 10000 +S: 1 0 7500 7500 0 -10000 10000 +S: 1 1 8000 8000 0 -10000 10000 + +M: 2 +O: 10000 10000 0 -10000 10000 +S: 1 0 7500 7500 0 -10000 10000 +S: 1 1 -8000 -8000 0 -10000 10000 diff --git a/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix b/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix new file mode 100644 index 000000000..3e1d9d7a3 --- /dev/null +++ b/ROMFS/px4fmu_common/mixers/FMU_firefly6_rotors.mix @@ -0,0 +1,4 @@ +# FireFly6 mixer for PX4FMU +# +#=========================== +R: 6c 10000 10000 10000 0 -- cgit v1.2.3